ic-mops 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next
 
+## 2.5.0
+- Add support for `MOPS_REGISTRY_HOST` and `MOPS_REGISTRY_CANISTER_ID` environment variables for custom registry endpoints
+- Fix `mops build` crashing with `__wbindgen_malloc` error in bundled CLI distribution
+- Fix `parallel()` swallowing errors from concurrent tasks (e.g. `mops publish` uploads), which could hang or leave failures unreported
+
 ## 2.4.0
 - Support `[build].outputDir` config in `mops.toml` for custom build output directory
 - Fix `mops build --output` CLI option being silently ignored

package/api/network.ts

@@ -3,20 +3,28 @@ export function getNetwork() {
 }
 
 export function getEndpoint(network: string) {
+  let endpoint: { host: string; canisterId: string };
   if (network === "staging") {
-    return {
+    endpoint = {
       host: "https://icp-api.io",
       canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
     };
   } else if (network === "ic") {
-    return {
+    endpoint = {
       host: "https://icp-api.io",
       canisterId: "oknww-riaaa-aaaam-qaf6a-cai",
     };
   } else {
-    return {
+    endpoint = {
       host: "http://127.0.0.1:4943",
       canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
     };
   }
+
+  const hostOverride = process.env["MOPS_REGISTRY_HOST"]?.trim();
+  const canisterOverride = process.env["MOPS_REGISTRY_CANISTER_ID"]?.trim();
+  return {
+    host: hostOverride || endpoint.host,
+    canisterId: canisterOverride || endpoint.canisterId,
+  };
 }

package/dist/api/network.js

@@ -2,22 +2,29 @@ export function getNetwork() {
     return globalThis.MOPS_NETWORK || "ic";
 }
 export function getEndpoint(network) {
+    let endpoint;
     if (network === "staging") {
-        return {
+        endpoint = {
             host: "https://icp-api.io",
             canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
         };
     }
     else if (network === "ic") {
-        return {
+        endpoint = {
             host: "https://icp-api.io",
             canisterId: "oknww-riaaa-aaaam-qaf6a-cai",
         };
     }
     else {
-        return {
+        endpoint = {
             host: "http://127.0.0.1:4943",
             canisterId: "2d2zu-vaaaa-aaaak-qb6pq-cai",
         };
     }
+    const hostOverride = process.env["MOPS_REGISTRY_HOST"]?.trim();
+    const canisterOverride = process.env["MOPS_REGISTRY_CANISTER_ID"]?.trim();
+    return {
+        host: hostOverride || endpoint.host,
+        canisterId: canisterOverride || endpoint.canisterId,
+    };
 }

package/dist/environments/web/cli.js

@@ -1,4 +1,13 @@
 import * as wasm from "../../wasm/pkg/web/wasm.js";
 import { setWasmBindings } from "../../wasm.js";
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+// Web wasm-pack target requires explicit initialization (unlike the nodejs
+// target which auto-inits on require). Load the CLI's own WASM binary and
+// call initSync before exposing the bindings.
+// In the bundle __dirname is defined as import.meta.dirname and the binary
+// sits next to cli.js; bundle:fix rewrites the path accordingly.
+const wasmBytes = readFileSync(resolve(__dirname, "../../wasm/pkg/web/wasm_bg.wasm"));
+wasm.initSync({ module: wasmBytes });
 setWasmBindings(wasm);
 export * from "../../cli.js";

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/dist/parallel.js

@@ -1,8 +1,12 @@
 export async function parallel(threads, items, fn) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
         let busyThreads = 0;
+        let failed = false;
         items = items.slice();
         let loop = () => {
+            if (failed) {
+                return;
+            }
             if (!items.length) {
                 if (busyThreads === 0) {
                     resolve();
@@ -16,6 +20,10 @@ export async function parallel(threads, items, fn) {
             fn(items.shift()).then(() => {
                 busyThreads--;
                 loop();
+            }, (err) => {
+                busyThreads--;
+                failed = true;
+                reject(err);
             });
             loop();
         };

package/dist/tests/build.test.js

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "@jest/globals";
+import { describe, expect, jest, test } from "@jest/globals";
 import { execa } from "execa";
 import { existsSync, rmSync } from "node:fs";
 import path from "path";
@@ -11,6 +11,8 @@ function cleanFixture(cwd, ...extras) {
     }
 }
 describe("build", () => {
+    // Several dfx/pocket-ic builds per test; slow CI (e.g. node 20 matrix) can exceed 60s default.
+    jest.setTimeout(120_000);
     test("ok", async () => {
         const cwd = path.join(import.meta.dirname, "build/success");
         try {

package/environments/web/cli.ts

@@ -1,5 +1,17 @@
 import * as wasm from "../../wasm/pkg/web/wasm.js";
 import { setWasmBindings } from "../../wasm.js";
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+
+// Web wasm-pack target requires explicit initialization (unlike the nodejs
+// target which auto-inits on require). Load the CLI's own WASM binary and
+// call initSync before exposing the bindings.
+// In the bundle __dirname is defined as import.meta.dirname and the binary
+// sits next to cli.js; bundle:fix rewrites the path accordingly.
+const wasmBytes = readFileSync(
+  resolve(__dirname, "../../wasm/pkg/web/wasm_bg.wasm"),
+);
+wasm.initSync({ module: wasmBytes });
 
 setWasmBindings(wasm);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -36,8 +36,8 @@
     "build:wasm:web": "wasm-pack build wasm --target web --out-dir pkg/web && rm wasm/pkg/web/.gitignore",
     "dist": "npm run build:wasm && tsc && mkdir -p dist/wasm && cp -r wasm/pkg dist/wasm",
     "bundle": "rm -rf ./bundle && bun build ./environments/web/cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && run-s bundle:fix bundle:copy bundle:package-json bundle:tar",
-    "bundle:fix": "rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js && rexreplace 'resolve\\(\".*?/xhr-sync-worker\\.js\"\\)' 'resolve(\"./xhr-sync-worker.js\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"wasm_bg.wasm\"' bundle/cli.js && rexreplace 'resolve\\(\"import.meta.dirname\",\".*?/default-stylesheet\\.css\"\\)' 'resolve(import.meta.dirname,\"./default-stylesheet.css\")' bundle/cli.js",
-    "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle && cp -r node_modules/prettier-plugin-motoko/wasm/pkg/nodejs/wasm_bg.wasm node_modules/jsdom/lib/jsdom/living/xhr/xhr-sync-worker.js node_modules/jsdom/lib/jsdom/browser/default-stylesheet.css bundle",
+    "bundle:fix": "rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js && rexreplace 'resolve\\(\".*?/xhr-sync-worker\\.js\"\\)' 'resolve(\"./xhr-sync-worker.js\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"wasm_bg.wasm\"' bundle/cli.js && rexreplace 'resolve\\(\"import.meta.dirname\",\".*?/default-stylesheet\\.css\"\\)' 'resolve(import.meta.dirname,\"./default-stylesheet.css\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"../../wasm/pkg/web/wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"mops_wasm_bg.wasm\"' bundle/cli.js",
+    "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle && cp wasm/pkg/web/wasm_bg.wasm bundle/mops_wasm_bg.wasm && cp -r node_modules/prettier-plugin-motoko/wasm/pkg/nodejs/wasm_bg.wasm node_modules/jsdom/lib/jsdom/living/xhr/xhr-sync-worker.js node_modules/jsdom/lib/jsdom/browser/default-stylesheet.css bundle",
     "bundle:package-json": "tsx bundle-package-json.ts",
     "bundle:tar": "rm -f bundle/cli.tgz && touch -t 200101010101 bundle/cli.tgz && find bundle -exec touch -d '1970-01-01 00:00:00' {} + && tar --sort name --exclude bundle/cli.tgz -cvf - bundle | gzip -n > bundle/cli.tgz",
     "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",

package/parallel.ts

@@ -3,11 +3,15 @@ export async function parallel<T>(
   items: T[],
   fn: (item: T) => Promise<void>,
 ) {
-  return new Promise<void>((resolve) => {
+  return new Promise<void>((resolve, reject) => {
     let busyThreads = 0;
+    let failed = false;
     items = items.slice();
 
     let loop = () => {
+      if (failed) {
+        return;
+      }
       if (!items.length) {
         if (busyThreads === 0) {
           resolve();
@@ -18,10 +22,17 @@ export async function parallel<T>(
         return;
       }
       busyThreads++;
-      fn(items.shift() as T).then(() => {
-        busyThreads--;
-        loop();
-      });
+      fn(items.shift() as T).then(
+        () => {
+          busyThreads--;
+          loop();
+        },
+        (err) => {
+          busyThreads--;
+          failed = true;
+          reject(err);
+        },
+      );
       loop();
     };
     loop();

package/tests/build.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "@jest/globals";
+import { describe, expect, jest, test } from "@jest/globals";
 import { execa } from "execa";
 import { existsSync, rmSync } from "node:fs";
 import path from "path";
@@ -14,6 +14,9 @@ function cleanFixture(cwd: string, ...extras: string[]) {
 }
 
 describe("build", () => {
+  // Several dfx/pocket-ic builds per test; slow CI (e.g. node 20 matrix) can exceed 60s default.
+  jest.setTimeout(120_000);
+
   test("ok", async () => {
     const cwd = path.join(import.meta.dirname, "build/success");
     try {