@calimero-network/registry-cli 1.14.1 → 1.15.1

package/dist/index.js

@@ -8,7 +8,7 @@ import axios from 'axios';
 import fs9, { existsSync, writeFileSync } from 'fs';
 import path7 from 'path';
 import os from 'os';
-import crypto from 'crypto';
+import crypto2 from 'crypto';
 import fastify from 'fastify';
 import cors from '@fastify/cors';
 import * as tar from 'tar';
@@ -817,7 +817,7 @@ var LocalArtifactServer = class {
     }
     const stats = fs9.statSync(filePath);
     const fileBuffer = fs9.readFileSync(filePath);
-    const sha256 = crypto.createHash("sha256").update(fileBuffer).digest("hex");
+    const sha256 = crypto2.createHash("sha256").update(fileBuffer).digest("hex");
     return {
       size: stats.size,
       sha256
@@ -826,7 +826,7 @@ var LocalArtifactServer = class {
   // Calculate file hash
   async calculateFileHash(filePath) {
     const fileBuffer = fs9.readFileSync(filePath);
-    return crypto.createHash("sha256").update(fileBuffer).digest("hex");
+    return crypto2.createHash("sha256").update(fileBuffer).digest("hex");
   }
   // Get artifact URL for local serving
   getArtifactUrl(appId, version2, filename) {
@@ -1888,6 +1888,111 @@ var RemoteConfig = class {
   }
 };
 
+// src/lib/services.ts
+var SERVICE_NAME_RE = /^[a-z0-9][a-z0-9_-]*$/;
+function validateServiceName(name) {
+  if (typeof name !== "string" || !SERVICE_NAME_RE.test(name)) {
+    throw new Error(
+      `Invalid service name "${name}". Use lowercase letters, digits, "-" or "_" (must start alphanumeric).`
+    );
+  }
+  if (name.length > 64) {
+    throw new Error(
+      `Invalid service name "${name}": must be at most 64 characters.`
+    );
+  }
+  if (name === "app") {
+    throw new Error(
+      'Service name "app" is reserved for the main application. Choose another name.'
+    );
+  }
+}
+function parseServiceSpec(spec) {
+  const eq = spec.indexOf("=");
+  if (eq === -1) {
+    throw new Error(
+      `Invalid --service "${spec}". Expected "name=path.wasm" or "name=path.wasm,abi=path.json".`
+    );
+  }
+  const name = spec.slice(0, eq).trim();
+  let rest = spec.slice(eq + 1).trim();
+  let abi;
+  const abiMatch = rest.match(/,\s*abi\s*=\s*([^,]*)$/);
+  if (abiMatch) {
+    abi = abiMatch[1].trim();
+    rest = rest.slice(0, abiMatch.index).trim();
+    if (!abi) {
+      throw new Error(`Invalid --service "${spec}": empty abi path.`);
+    }
+  }
+  const wasm = rest;
+  if (!wasm) {
+    throw new Error(`Invalid --service "${spec}": missing WASM path.`);
+  }
+  if (wasm.includes(",")) {
+    throw new Error(
+      `Invalid --service "${spec}": unexpected comma in WASM path. Use "name=path.wasm,abi=path.json"; commas in paths are not supported.`
+    );
+  }
+  validateServiceName(name);
+  return abi ? { name, wasm, abi } : { name, wasm };
+}
+function serviceWasmPath(name) {
+  return `services/${name}.wasm`;
+}
+function serviceAbiPath(name) {
+  return `services/${name}.abi.json`;
+}
+function isUnderServicesDir(p) {
+  return typeof p === "string" && /^services[\\/]/.test(p);
+}
+function assertUniqueServiceNames(services) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const s of services) {
+    if (seen.has(s.name)) {
+      throw new Error(`Duplicate service name "${s.name}".`);
+    }
+    seen.add(s.name);
+  }
+}
+function assertSafeBundlePath(p) {
+  const segments = p.split(/[\\/]/);
+  if (!p || p.startsWith("/") || /^[a-zA-Z]:/.test(p) || segments.includes("..") || segments.includes(".") || segments.includes("")) {
+    throw new Error(
+      `Unsafe bundle path "${p}": must be a non-empty relative path with no "." or ".." segments.`
+    );
+  }
+}
+function collectBundleFiles(manifest) {
+  const files = ["manifest.json"];
+  if (manifest.wasm?.path) files.push(manifest.wasm.path);
+  if (manifest.abi?.path) files.push(manifest.abi.path);
+  for (const svc of manifest.services ?? []) {
+    const label = svc?.name ?? "<unnamed>";
+    if (!svc.wasm?.path) {
+      throw new Error(
+        `Service "${label}" has no wasm.path; cannot pack the bundle.`
+      );
+    }
+    if (!isUnderServicesDir(svc.wasm.path)) {
+      throw new Error(
+        `Service "${label}" wasm.path "${svc.wasm.path}" must be under services/.`
+      );
+    }
+    files.push(svc.wasm.path);
+    if (svc.abi?.path) {
+      if (!isUnderServicesDir(svc.abi.path)) {
+        throw new Error(
+          `Service "${label}" abi.path "${svc.abi.path}" must be under services/.`
+        );
+      }
+      files.push(svc.abi.path);
+    }
+  }
+  files.forEach(assertSafeBundlePath);
+  return [...new Set(files)];
+}
+
 // src/commands/bundle.ts
 var bundleCommand = new Command("bundle").description("Manage application bundles (V2)").addCommand(createCreateCommand()).addCommand(createPushCommand()).addCommand(createGetCommand()).addCommand(createEditCommand());
 function createCreateCommand() {
@@ -1906,7 +2011,13 @@ function createCreateCommand() {
     (value, prev) => {
       return [...prev || [], value];
     }
-  ).option("--abi <path>", "Path to ABI JSON file to include in bundle").addHelpText(
+  ).option("--abi <path>", "Path to ABI JSON file to include in bundle").option(
+    "--service <spec>",
+    'Add a service WASM alongside the main app: "name=path.wasm" or "name=path.wasm,abi=path.json" (repeatable)',
+    (value, prev) => {
+      return [...prev || [], parseServiceSpec(value)];
+    }
+  ).addHelpText(
     "after",
     `
 Examples:
@@ -1916,6 +2027,7 @@ Examples:
   $ calimero-registry bundle create app.wasm com.calimero.myapp 1.0.0 --name "My App" --frontend https://app.example.com
   $ calimero-registry bundle create app.wasm com.calimero.myapp 1.0.0 --abi abi.json
   $ calimero-registry bundle create app.wasm --manifest manifest.json --abi res/abi.json
+  $ calimero-registry bundle create tictactoe.wasm com.calimero.ttt 1.0.0 --service lobby=lobby.wasm,abi=lobby-abi.json
 
 Manifest File Format (JSON):
   {
@@ -1930,7 +2042,10 @@ Manifest File Format (JSON):
     "docs": "https://docs.example.com",
     "exports": ["interface1", "interface2"],
     "uses": ["interface3"],
-    "abi": "res/abi.json"
+    "abi": "res/abi.json",
+    "services": [
+      { "name": "lobby", "wasm": "res/lobby.wasm", "abi": "res/lobby-abi.json" }
+    ]
   }
 
 Note:
@@ -1940,6 +2055,8 @@ Note:
   - The -o/--output option overrides manifest.output if both are provided
   - ABI can be provided via --abi flag or manifest.abi field (file path string)
   - ABI file will be included in the bundle and referenced in the manifest
+  - The main app is always packed as app.wasm; services are packed under services/<name>.wasm
+  - Services merge from --service flags and manifest.services; names must be unique
 `
   ).action(async (wasmFile, pkg, version2, options) => {
     try {
@@ -1988,6 +2105,10 @@ Note:
         console.error('\u274C Invalid manifest: "uses" must be an array');
         process.exit(1);
       }
+      if (manifestConfig.services !== void 0 && !Array.isArray(manifestConfig.services)) {
+        console.error('\u274C Invalid manifest: "services" must be an array');
+        process.exit(1);
+      }
       const finalExports = options.export && options.export.length > 0 ? options.export : manifestExports || [];
       const finalUses = options.use && options.use.length > 0 ? options.use : manifestUses || [];
       if (!wasmFile) {
@@ -2026,7 +2147,7 @@ Note:
       console.log(`\u{1F4E6} Creating MPK bundle from: ${path7.basename(wasmPath)}`);
       const wasmContent = fs9.readFileSync(wasmPath);
       const wasmSize = wasmContent.length;
-      const wasmHash = crypto.createHash("sha256").update(wasmContent).digest("hex");
+      const wasmHash = crypto2.createHash("sha256").update(wasmContent).digest("hex");
       let abiArtifact = void 0;
       let abiContent = null;
       const abiPathFromOption = options.abi;
@@ -2045,7 +2166,7 @@ Note:
         try {
           abiContent = fs9.readFileSync(abiResolvedPath);
           JSON.parse(abiContent.toString("utf8"));
-          const abiHash = crypto.createHash("sha256").update(abiContent).digest("hex");
+          const abiHash = crypto2.createHash("sha256").update(abiContent).digest("hex");
           abiArtifact = {
             path: "abi.json",
             hash: abiHash,
@@ -2072,6 +2193,105 @@ Note:
         );
         process.exit(1);
       }
+      const cliServices = options.service || [];
+      const manifestServices = Array.isArray(
+        manifestConfig.services
+      ) ? manifestConfig.services : [];
+      const manifestDir = options.manifest ? path7.dirname(path7.resolve(options.manifest)) : process.cwd();
+      const allServiceSources = [
+        ...cliServices.map((src) => ({ src, baseDir: process.cwd() })),
+        ...manifestServices.map((src) => ({ src, baseDir: manifestDir }))
+      ];
+      const serviceArtifacts = [];
+      const serviceFilesToWrite = [];
+      for (const { src } of allServiceSources) {
+        try {
+          validateServiceName(src.name);
+        } catch (e) {
+          console.error(`\u274C ${e instanceof Error ? e.message : String(e)}`);
+          process.exit(1);
+        }
+      }
+      try {
+        assertUniqueServiceNames(allServiceSources.map((s) => s.src));
+      } catch (e) {
+        console.error(`\u274C ${e instanceof Error ? e.message : String(e)}`);
+        process.exit(1);
+      }
+      for (const { src, baseDir } of allServiceSources) {
+        if (typeof src.wasm !== "string" || src.wasm.length === 0) {
+          console.error(
+            `\u274C Service "${src.name}" wasm must be a file path string.`
+          );
+          process.exit(1);
+        }
+        if (src.abi !== void 0 && (typeof src.abi !== "string" || src.abi.length === 0)) {
+          console.error(
+            `\u274C Service "${src.name}" abi must be a file path string.`
+          );
+          process.exit(1);
+        }
+        const svcWasmPath = path7.resolve(baseDir, src.wasm);
+        if (!fs9.existsSync(svcWasmPath)) {
+          console.error(
+            `\u274C Service "${src.name}" WASM not found: ${src.wasm}`
+          );
+          console.error(`   Resolved path: ${svcWasmPath}`);
+          process.exit(1);
+        }
+        const svcWasmContent = fs9.readFileSync(svcWasmPath);
+        const svcWasmHash = crypto2.createHash("sha256").update(svcWasmContent).digest("hex");
+        const wasmArchivePath = serviceWasmPath(src.name);
+        const entry = {
+          name: src.name,
+          wasm: {
+            path: wasmArchivePath,
+            hash: svcWasmHash,
+            size: svcWasmContent.length
+          }
+        };
+        serviceFilesToWrite.push({
+          relPath: wasmArchivePath,
+          content: svcWasmContent
+        });
+        if (src.abi) {
+          const svcAbiPath = path7.resolve(baseDir, src.abi);
+          if (!fs9.existsSync(svcAbiPath)) {
+            console.error(
+              `\u274C Service "${src.name}" ABI not found: ${src.abi}`
+            );
+            console.error(`   Resolved path: ${svcAbiPath}`);
+            process.exit(1);
+          }
+          const svcAbiContent = fs9.readFileSync(svcAbiPath);
+          try {
+            JSON.parse(svcAbiContent.toString("utf8"));
+          } catch (error) {
+            console.error(
+              `\u274C Service "${src.name}" ABI is not valid JSON: ${src.abi}`
+            );
+            console.error(
+              error instanceof Error ? error.message : "Invalid JSON"
+            );
+            process.exit(1);
+          }
+          const svcAbiHash = crypto2.createHash("sha256").update(svcAbiContent).digest("hex");
+          const abiArchivePath = serviceAbiPath(src.name);
+          entry.abi = {
+            path: abiArchivePath,
+            hash: svcAbiHash,
+            size: svcAbiContent.length
+          };
+          serviceFilesToWrite.push({
+            relPath: abiArchivePath,
+            content: svcAbiContent
+          });
+        }
+        serviceArtifacts.push(entry);
+        console.log(
+          `   Including service: ${src.name} (${path7.basename(svcWasmPath)})`
+        );
+      }
       const metadata = {
         name: finalName || finalPackage,
         description: finalDescription || "",
@@ -2097,6 +2317,7 @@ Note:
           size: wasmSize
         },
         abi: abiArtifact || void 0,
+        services: serviceArtifacts.length > 0 ? serviceArtifacts : void 0,
         migrations: [],
         links: Object.keys(links).length > 0 ? links : void 0,
         signature: void 0
@@ -2113,6 +2334,19 @@ Note:
       if (abiContent) {
         fs9.writeFileSync(path7.join(outputDir, "abi.json"), abiContent);
       }
+      const servicesDir = path7.join(outputDir, "services");
+      for (const { relPath, content } of serviceFilesToWrite) {
+        const dest = path7.join(outputDir, relPath);
+        const rel = path7.relative(servicesDir, dest);
+        if (rel.startsWith("..") || path7.isAbsolute(rel)) {
+          console.error(
+            `\u274C Refusing to write service file outside services/: ${relPath}`
+          );
+          process.exit(1);
+        }
+        fs9.mkdirSync(path7.dirname(dest), { recursive: true });
+        fs9.writeFileSync(dest, content);
+      }
       console.log(`\u2705 Bundle files written to: ${outputDir}`);
       console.log(`   Package: ${finalPackage}`);
       console.log(`   Version: ${finalVersion}`);
@@ -2120,6 +2354,11 @@ Note:
       if (abiArtifact) {
         console.log(`   ABI Hash: ${abiArtifact.hash}`);
       }
+      if (serviceArtifacts.length > 0) {
+        console.log(
+          `   Services: ${serviceArtifacts.map((s) => s.name).join(", ")}`
+        );
+      }
       console.log("");
       console.log("Next steps:");
       console.log(
@@ -2212,16 +2451,57 @@ Note:
           process.exit(1);
         }
         tempMpk = path7.join(fullPath, `.temp-push-${Date.now()}.mpk`);
-        const archiveFiles = ["manifest.json", "app.wasm"];
-        if (fs9.existsSync(path7.join(fullPath, "abi.json"))) {
-          archiveFiles.push("abi.json");
+        let dirManifest;
+        try {
+          dirManifest = JSON.parse(
+            fs9.readFileSync(manifestInDir, "utf8")
+          );
+        } catch (e) {
+          console.error(
+            `\u274C Failed to parse manifest.json in ${fullPath}: ${e instanceof Error ? e.message : String(e)}`
+          );
+          console.error(
+            "   Fix the manifest JSON and retry (service files would otherwise be silently omitted)."
+          );
+          process.exit(1);
+        }
+        if (!dirManifest.wasm?.path) {
+          console.error(
+            "\u274C manifest.json has no main wasm (wasm.path). A bundle must include its main application."
+          );
+          process.exit(1);
+        }
+        for (const svc of dirManifest.services ?? []) {
+          if (!svc?.wasm?.path) {
+            console.error(
+              `\u274C Service "${svc?.name ?? "<unnamed>"}" in manifest.json has no wasm.path.`
+            );
+            process.exit(1);
+          }
+        }
+        let archiveFiles;
+        try {
+          archiveFiles = collectBundleFiles(dirManifest);
+        } catch (e) {
+          console.error(`\u274C ${e instanceof Error ? e.message : String(e)}`);
+          process.exit(1);
+        }
+        for (const f of archiveFiles) {
+          if (!fs9.existsSync(path7.join(fullPath, f))) {
+            console.error(
+              `\u274C Bundle file referenced by manifest not found: ${f}`
+            );
+            process.exit(1);
+          }
         }
         await tar.create(
           { gzip: true, file: tempMpk, cwd: fullPath },
           archiveFiles
         );
         mpkPath = tempMpk;
-        console.log(`\u{1F4E6} Packed directory into temporary bundle`);
+        console.log(
+          `\u{1F4E6} Packed directory into temporary bundle (${archiveFiles.length} files)`
+        );
       }
       console.log(`\u{1F4E6} Processing bundle: ${path7.basename(mpkPath)}`);
       const manifest = await extractManifest(mpkPath);
@@ -2476,6 +2756,9 @@ async function pushToRemote(bundlePath, manifest, registryUrl, apiKey) {
     if (manifest.abi !== void 0) {
       payload.abi = manifest.abi;
     }
+    if (manifest.services !== void 0) {
+      payload.services = manifest.services;
+    }
     payload.migrations = manifest.migrations ?? [];
     if (manifest.links) {
       payload.links = manifest.links;