Merge branch 'master' of https://github.com/TurboWarp/packager

Author: CubesterYT

.github/workflows/build.yml

@@ -10,11 +10,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+    - uses: actions/checkout@v4
       with:
         persist-credentials: false
     - name: Install Node.js
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+      uses: actions/setup-node@v4
       with:
         node-version: 22
         cache: 'npm'
@@ -27,7 +27,7 @@ jobs:
     - name: Build standalone
       run: npm run build-standalone-prod
     - name: Upload standalone artifact
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
+      uses: actions/upload-artifact@v4
       with:
         name: standalone
         path: dist/standalone.html

.github/workflows/deploy.yml

@@ -14,17 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - name: Setup GitHub Pages
-      id: pages
-      uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b
     - name: Install Node.js
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+      uses: actions/setup-node@v4
       with:
         node-version: 22
-        cache: 'npm'
     - name: Install dependencies
       run: npm ci
     - name: Test
@@ -41,7 +37,7 @@ jobs:
         npm run build-standalone-prod
         cp dist/standalone.html web
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
+      uses: actions/upload-pages-artifact@v3
       with:
         path: ./web/
 
@@ -57,4 +53,4 @@ jobs:
     steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e
+      uses: actions/deploy-pages@v4

.github/workflows/generate-electron-binaries.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+    - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+    - uses: actions/setup-node@v4
       with:
         node-version: 22
     - name: Install dependencies
@@ -33,7 +33,7 @@ jobs:
         node generate-macos.js
     - name: Upload macOS
       if: runner.os == 'macOS'
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
+      uses: actions/upload-artifact@v4
       with:
         name: electron-macos
         path: electron-bin/temp/macos/*.zip
@@ -48,13 +48,13 @@ jobs:
         node generate-windows.js
     - name: Upload Windows
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
+      uses: actions/upload-artifact@v4
       with:
         name: electron-windows
         path: electron-bin/temp/windows/*.zip
     - name: Upload Windows Crossbuild
       if: runner.os == 'Linux'
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
+      uses: actions/upload-artifact@v4
       with:
         name: electron-windows-crossbuild
         path: electron-bin/temp/windows/*.zip

.github/workflows/wkwebview-build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+    - uses: actions/checkout@v4
       with:
         persist-credentials: false
     - name: Build

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrobolt/packager",
-  "version": "3.4.3",
+  "version": "3.6.1",
   "description": "Converts projects into HTML files, zip archives, or executable programs for Windows, macOS, and Linux.",
   "main": "dist/packager.js",
   "scripts": {
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
-    "@turbowarp/scratch-storage": "^0.0.202502192258",
+    "@turbowarp/scratch-storage": "^0.0.202505311821",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202401111326-62c0f26",
     "babel-jest": "^27.4.5",
     "babel-loader": "^8.2.3",

package.json

@@ -1,3 +1,5 @@
+const TRANSACTION_TIMEOUT_MS = 10 * 1000;
+
 // https://github.com/jakearchibald/safari-14-idb-fix/blob/582bbdc7230891113bfb5743391550cbf29d21f2/src/index.ts
 const idbReady = () => {
   const isSafari =
@@ -28,6 +30,9 @@ class Database {
     allDatabases.push(this);
   }
 
+  /**
+   * @returns {IDBDatabase|Promise<IDBDatabase>}
+   */
   open () {
     if (this.db) {
       return this.db;
@@ -110,11 +115,21 @@ class Database {
  * @param {function} reject
  */
 Database.setTransactionErrorHandler = (transaction, reject) => {
-  transaction.onerror = () => {
-    reject(new Error(`Transaction error: ${transaction.error}`))
+  const timeoutId = setTimeout(() => {
+    reject(new Error('Transaction timed out'));
+    transaction.abort();
+  }, TRANSACTION_TIMEOUT_MS);
+
+  transaction.oncomplete = () => {
+    clearTimeout(timeoutId);
+  };
+  transaction.onerror = (e) => {
+    clearTimeout(timeoutId);
+    reject(new Error(`Transaction error: ${e.target.error}`))
   };
   transaction.onabort = () => {
-    reject(new Error(`Transaction aborted: ${transaction.error}`));
+    clearTimeout(timeoutId);
+    reject(new Error('Transaction aborted'));
   };
 };
 

src/common/idb.js

@@ -40,7 +40,10 @@ module.exports = function (input, isSprite, callback) {
 
     // If not legacy or zip, convert buffer to UTF-8 string and return
     if (!isZip && !isLegacy) {
-        return callback(null, [input.toString('utf-8'), null]);
+        // In browsers, the native TextDecoder can handle much larger values than the JavaScript polyfill for
+        // Buffer.toString('utf-8'), particularly in Chrome.
+        const decoder = new TextDecoder();
+        return callback(null, [decoder.decode(input), null]);
     }
 
     // Return error if legacy encoding detected