@renovatebot/pgp 1.3.1 → 1.3.3

package/dist/teavm/lib.wasm-runtime.js

@@ -30,20 +30,20 @@ let setGlobalName = function(name, value) {
     new Function("value", name + " = value;")(value);
 }
 
-function defaults(imports, userExports, options, module) {
+function defaults(imports, userExports, options, module, stringBuiltins) {
     let context = {
         exports: null,
         userExports: userExports,
         stackDeobfuscator: null
     };
-    if (!hasStringBuiltins()) {
+    if (!stringBuiltins) {
         stringImports(imports);
     }
     dateImports(imports);
     consoleImports(imports, context);
     coreImports(imports, context, options, module);
     asyncImports(imports, context);
-    jsoImports(imports, context);
+    jsoImports(imports, context, stringBuiltins);
     imports.teavmMath = Math;
     return {
         supplyExports(exports) {
@@ -212,19 +212,25 @@ function coreImports(imports, context, options, module) {
         },
         notifyHeapResized: memoryOptions.onResize || function() {}
     };
-    if (module && hasImportedMemory(module)) {
-        let memoryInstance = memoryOptions["external"];
-        if (!memoryInstance) {
-            let defaults = getMemoryDefaults(module);
-            let minSize = memoryOptions.minSize || defaults.min || 0;
-            let maxSize = memoryOptions.maxSize || defaults.max;
-            memoryInstance = new WebAssembly.Memory({
-                shared: memoryOptions.shared === true,
-                initial: minSize,
-                maximum: maxSize
-            });
+    if (module) {
+        let memDefaults = getMemoryDefaults(module);
+        let imported = memDefaults !== null ? memDefaults.imported : hasImportedMemory(module);
+        if (imported) {
+            let memoryInstance = memoryOptions["external"];
+            if (!memoryInstance) {
+                if (memDefaults === null) {
+                    memDefaults = {};
+                }
+                let minSize = memoryOptions.minSize || memDefaults.min || 0;
+                let maxSize = memoryOptions.maxSize || memDefaults.max;
+                memoryInstance = new WebAssembly.Memory({
+                    shared: memoryOptions.shared === true,
+                    initial: minSize,
+                    maximum: maxSize
+                });
+            }
+            imports.teavm.memory = memoryInstance;
         }
-        imports.teavm.memory = memoryInstance;
     }
 }
 
@@ -250,12 +256,12 @@ function hasImportedMemory(module) {
 function getMemoryDefaults(module) {
     let sections = WebAssembly.Module.customSections(module, "teavm.memoryRequirements");
     if (sections.length !== 1) {
-        return {};
+        return null;
     }
     return JSON.parse(new TextDecoder().decode(sections[0]));
 }
 
-function jsoImports(imports, context) {
+function jsoImports(imports, context, stringBuiltins) {
     let javaObjectSymbol = Symbol("javaObject");
     let functionsSymbol = Symbol("functions");
     let functionOriginSymbol = Symbol("functionOrigin");
@@ -376,7 +382,7 @@ function jsoImports(imports, context) {
         )(c);
     }
     imports.teavmJso = {
-        stringBuiltinsSupported: () => hasStringBuiltins(),
+        stringBuiltinsSupported: () => stringBuiltins,
         isUndefined: o => typeof o === "undefined",
         emptyArray: () => [],
         appendToArray: (array, e) => array.push(e),
@@ -750,7 +756,7 @@ async function load(src, options) {
 
     const importObj = {};
     let userExports = {};
-    const defaultsResult = defaults(importObj, userExports, options, module);
+    const defaultsResult = defaults(importObj, userExports, options, module, await hasStringBuiltins());
     if (typeof options.installImports !== "undefined") {
         options.installImports(importObj);
     }
@@ -793,20 +799,30 @@ async function compileModule(src, isNodeJs) {
     return result;
 }
 
+let hasStringBuiltinsPromise = null;
 function hasStringBuiltins() {
-    if (stringBuiltinsCache === null) {
-        /*
-          (module
-           (type  (func))
-           (import "wasm:js-string" "cast" (func (type 0)))
-          )
-         */
-        let bytes = new Int8Array([0, 97, 115, 109, 1, 0, 0, 0, 1, 4, 1, 96, 0, 0, 2, 23, 1, 14, 119, 97,
-            115, 109, 58, 106, 115, 45, 115, 116, 114, 105, 110, 103, 4, 99, 97, 115, 116, 0, 0, 3, 1, 0,
-            5, 4, 1, 1, 0, 0, 10, -127, -128, -128, 0, 0]);
-        stringBuiltinsCache = !WebAssembly.validate(bytes, {builtins: ["js-string"]});
-    }
-    return stringBuiltinsCache;
+    if (hasStringBuiltinsPromise === null) {
+        hasStringBuiltinsPromise = (async () => {
+            // A more sophisticated way to detect string builtins support due to bug in Safari 26.2
+            let bytes = new Int8Array([0, 97, 115, 109, 1, 0, 0, 0, 1, 7, 1, 96, 1, 127, 1, 100, 111, 2, 31, 1, 14,
+                119, 97, 115, 109, 58, 106, 115, 45, 115, 116, 114, 105, 110, 103, 12, 102, 114, 111, 109, 67, 104,
+                97, 114, 67, 111, 100, 101, 0, 0, 3, 1, 0, 5, 4, 1, 1, 0, 0, 7, 10, 1, 6, 109, 101, 109, 111, 114,
+                121, 2, 0, 10, -127, -128, -128, 0, 0]);
+            try {
+                let response = new Response(bytes, {
+                    headers: {
+                        "Content-Type": "application/wasm"
+                    }
+                });
+                let module = await WebAssembly.compileStreaming(response, { builtins: ["js-string"] });
+                await WebAssembly.instantiate(module, {}, { builtins: ["js-string"] });
+                return true;
+            } catch (e) {
+                return false;
+            }
+        })();
+    }
+    return hasStringBuiltinsPromise;
 }
 
 async function getDeobfuscator(path, options, isNodeJs) {
@@ -815,7 +831,7 @@ async function getDeobfuscator(path, options, isNodeJs) {
     }
     try {
         const importObj = {};
-        const defaultsResult = defaults(importObj, {}, {});
+        const defaultsResult = defaults(importObj, {}, {}, null, await hasStringBuiltins());
         const instance = await instantiateModule(options.path, path, isNodeJs, importObj);
         defaultsResult.supplyExports(instance.exports);
         return instance;
@@ -868,8 +884,6 @@ async function importNodeFs() {
     return await nodeFsImportObject;
 }
 
-let stringBuiltinsCache = null;
-
 function createDeobfuscator(module, externalData, deobfuscatorFactory) {
     let deobfuscator = null;
     let deobfuscatorInitialized = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renovatebot/pgp",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "PGP library for renovate",
   "keywords": [
     "renovate",
@@ -22,18 +22,18 @@
     "dist/"
   ],
   "devDependencies": {
-    "@containerbase/semantic-release-pnpm": "1.3.20",
+    "@containerbase/semantic-release-pnpm": "1.3.24",
     "@renovatebot/kbpgp": "4.0.4",
-    "@types/node": "22.19.8",
+    "@types/node": "22.19.13",
     "@vitest/coverage-v8": "4.0.18",
-    "conventional-changelog-conventionalcommits": "9.1.0",
+    "conventional-changelog-conventionalcommits": "9.2.0",
     "husky": "9.1.7",
-    "lint-staged": "16.2.7",
-    "markdownlint-cli2": "0.20.0",
+    "lint-staged": "16.3.2",
+    "markdownlint-cli2": "0.21.0",
     "npm-run-all2": "8.0.4",
     "openpgp": "6.3.0",
     "prettier": "3.8.1",
-    "prettier-plugin-packagejson": "2.5.22",
+    "prettier-plugin-packagejson": "3.0.0",
     "semantic-release": "25.0.3",
     "typescript": "5.9.3",
     "vitest": "4.0.18"