Merge pull request emscripten-core#12 from rstz/add-storagefoundation…

…-quota-checks Add safeguards against QuotaExceededErrors in SFA
tlively · Sep 28, 2021 · 8d9ab82 · 8d9ab82
2 parents e79d6da + 76bb000
commit 8d9ab82
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/pthreadfs/library_pthreadfs.js b/pthreadfs/library_pthreadfs.js
@@ -3164,8 +3164,18 @@ mergeInto(LibraryManager.library, {
               }
               fileHandle = await storageFoundation.open(SFAFS.encodedPath(node));
             }
-            await fileHandle.setLength(attr.size);
-
+            try {
+              await fileHandle.setLength(attr.size);
+            }
+            catch (e) {
+              if (e.name == 'QuotaExceededError') {
+                await storageFoundation.requestCapacity(2*1024*1024*1024);
+                await fileHandle.setLength(attr.size);
+              }
+              else {
+                throw e;
+              }
+            }
           } catch (e) {
             if (!('code' in e)) throw e;
             throw new PThreadFS.ErrnoError(-e.errno);
@@ -3402,9 +3412,17 @@ mergeInto(LibraryManager.library, {
         SFAFS.debug('write', arguments);
         stream.node.timestamp = Date.now();
         let data = new Uint8Array(buffer.slice(offset, offset+length));
-        let result = await stream.handle.write(data, position);
-        SFAFS.debug('end write');
-        return result.writtenBytes;
+        let writeResult;
+        try {
+          writeResult = await stream.handle.write(data, position);
+        }
+        catch (e) {
+          if (e.name == 'QuotaExceededError') {
+            await storageFoundation.requestCapacity(2*1024*1024*1024);
+            writeResult = await stream.handle.write(data, position);
+          }
+        }
+        return writeResult.writtenBytes;
       },
 
       llseek: async function (stream, offset, whence) {

diff --git a/pthreadfs/src/js/library_sfafs_async.js b/pthreadfs/src/js/library_sfafs_async.js
@@ -224,8 +224,18 @@ mergeInto(LibraryManager.library, {
               }
               fileHandle = await storageFoundation.open(SFAFS.encodedPath(node));
             }
-            await fileHandle.setLength(attr.size);
-
+            try {
+              await fileHandle.setLength(attr.size);
+            }
+            catch (e) {
+              if (e.name == 'QuotaExceededError') {
+                await storageFoundation.requestCapacity(2*1024*1024*1024);
+                await fileHandle.setLength(attr.size);
+              }
+              else {
+                throw e;
+              }
+            }
           } catch (e) {
             if (!('code' in e)) throw e;
             throw new PThreadFS.ErrnoError(-e.errno);
@@ -462,9 +472,17 @@ mergeInto(LibraryManager.library, {
         SFAFS.debug('write', arguments);
         stream.node.timestamp = Date.now();
         let data = new Uint8Array(buffer.slice(offset, offset+length));
-        let result = await stream.handle.write(data, position);
-        SFAFS.debug('end write');
-        return result.writtenBytes;
+        let writeResult;
+        try {
+          writeResult = await stream.handle.write(data, position);
+        }
+        catch (e) {
+          if (e.name == 'QuotaExceededError') {
+            await storageFoundation.requestCapacity(2*1024*1024*1024);
+            writeResult = await stream.handle.write(data, position);
+          }
+        }
+        return writeResult.writtenBytes;
       },
 
       llseek: async function (stream, offset, whence) {