bulletin-deploy 0.6.6 → 0.6.7-rc.0

package/bin/bulletin-deploy

@@ -16,6 +16,7 @@ for (let i = 0; i < args.length; i++) {
   else if (args[i] === "--rpc") { flags.rpc = args[++i]; }
   else if (args[i] === "--password") { flags.password = args[++i]; }
   else if (args[i] === "--playground") { flags.playground = true; }
+  else if (args[i] === "--js-merkle") { flags.jsMerkle = true; }
   else if (args[i] === "--version" || args[i] === "-V") { flags.version = true; }
   else if (args[i] === "--help" || args[i] === "-h") { flags.help = true; }
   else { positional.push(args[i]); }
@@ -39,6 +40,7 @@ Options:
   --pool-size N       Number of pool accounts (default: 10)
   --password "..."    Encrypt SPA content (users will be prompted to decrypt)
   --playground        Publish to the playground remix registry
+  --js-merkle         Use pure-JS merkleization (no IPFS Kubo binary required)
   --version           Show version
   --help              Show this help`);
   process.exit(0);
@@ -61,6 +63,7 @@ try {
       rpc: flags.rpc,
       poolSize: flags.poolSize,
       password: flags.password,
+      jsMerkle: flags.jsMerkle,
     });
 
     const output = process.env.GITHUB_OUTPUT;

package/dist/{chunk-YB4HKYPR.js → chunk-5B6UCUSH.js}

@@ -4,7 +4,10 @@ import {
   TX_TIMEOUT_MS,
   fetchNonce,
   validateDomainLabel
-} from "./chunk-7FNQBFFQ.js";
+} from "./chunk-HMCNHEMO.js";
+import {
+  merkleizeJS
+} from "./chunk-GZ5UUECB.js";
 import {
   derivePoolAccounts,
   ensureAuthorized,
@@ -18,7 +21,7 @@ import {
   setDeployAttribute,
   withDeploySpan,
   withSpan
-} from "./chunk-BYYVSN7E.js";
+} from "./chunk-DOBGWPA3.js";
 
 // src/deploy.ts
 import { Buffer } from "buffer";
@@ -778,12 +781,23 @@ async function merkleize(directoryPath, outputCarPath) {
   console.log(`   CAR: ${(size / 1024 / 1024).toFixed(2)} MB`);
   return { carPath: outputCarPath, cid };
 }
-async function storeDirectory(directoryPath, provider = {}, password) {
-  const carPath = path.join(path.dirname(directoryPath), `${path.basename(directoryPath)}.car`);
-  const { cid: ipfsCid } = await withSpan("deploy.merkleize", "1a. merkleize", { "deploy.directory": directoryPath }, async () => {
-    return merkleize(directoryPath, carPath);
-  });
-  let carContent = new Uint8Array(fs.readFileSync(carPath));
+async function storeDirectory(directoryPath, provider = {}, password, jsMerkle) {
+  let carContent;
+  let ipfsCid;
+  if (jsMerkle) {
+    const result = await withSpan("deploy.merkleize", "1a. merkleize (js)", { "deploy.directory": directoryPath }, async () => {
+      return merkleizeJS(directoryPath);
+    });
+    carContent = result.carBytes;
+    ipfsCid = result.cid;
+  } else {
+    const carPath = path.join(path.dirname(directoryPath), `${path.basename(directoryPath)}.car`);
+    const { cid } = await withSpan("deploy.merkleize", "1a. merkleize", { "deploy.directory": directoryPath }, async () => {
+      return merkleize(directoryPath, carPath);
+    });
+    ipfsCid = cid;
+    carContent = new Uint8Array(fs.readFileSync(carPath));
+  }
   if (password) {
     console.log(`   Encrypting CAR file...`);
     carContent = await encryptContent(carContent, password);
@@ -867,7 +881,7 @@ Or deploy with the original account, or use a different domain name.`);
             console.log(`
    Mode: Directory`);
             console.log(`   Path: ${contentPath}`);
-            const dirResult = await storeDirectory(contentPath, providerWithReconnect, options.password);
+            const dirResult = await storeDirectory(contentPath, providerWithReconnect, options.password, options.jsMerkle);
             cid = dirResult.storageCid;
             ipfsCid = dirResult.ipfsCid;
           } else {
@@ -907,6 +921,11 @@ Or deploy with the original account, or use a different domain name.`);
         }
       });
       setDeployAttribute("deploy.cid", cid);
+      if (options.attributes) {
+        for (const [key, value] of Object.entries(options.attributes)) {
+          setDeployAttribute(key, value);
+        }
+      }
       console.log("\n" + "=".repeat(60));
       console.log("DotNS");
       console.log("=".repeat(60));

package/dist/{chunk-BYYVSN7E.js → chunk-DOBGWPA3.js}

@@ -6,7 +6,7 @@ import * as path from "path";
 // package.json
 var package_default = {
   name: "bulletin-deploy",
-  version: "0.6.6",
+  version: "0.6.7-rc.0",
   private: false,
   repository: {
     type: "git",
@@ -34,12 +34,13 @@ var package_default = {
     "cdm.json"
   ],
   scripts: {
-    build: "tsup src/index.ts src/deploy.ts src/dotns.ts src/pool.ts src/telemetry.ts --format esm --dts --clean --target node22",
+    build: "tsup src/index.ts src/deploy.ts src/dotns.ts src/pool.ts src/telemetry.ts src/merkle.ts --format esm --dts --clean --target node22",
     test: "npm run build && node --test test/test.js",
     benchmark: "npm run build && node benchmark.js"
   },
   dependencies: {
     "@dotdm/cdm": "^0.5.1",
+    "@ipld/car": "^5.4.3",
     "@ipld/dag-pb": "^4.1.3",
     "@noble/hashes": "^1.7.2",
     "@polkadot-api/substrate-bindings": "^0.16.5",
@@ -48,7 +49,9 @@ var package_default = {
     "@polkadot/keyring": "^13.0.0",
     "@polkadot/util-crypto": "^13.0.0",
     "@sentry/node": "^9.14.0",
+    "blockstore-core": "^6.1.3",
     "ipfs-unixfs": "^11.2.0",
+    "ipfs-unixfs-importer": "^16.1.4",
     multiformats: "^13.4.1",
     "polkadot-api": "^1.23.1",
     viem: "^2.30.5"

package/dist/chunk-GZ5UUECB.js

@@ -0,0 +1,77 @@
+// src/merkle.ts
+import * as fs from "fs";
+import * as path from "path";
+import { importer } from "ipfs-unixfs-importer";
+import { MemoryBlockstore } from "blockstore-core/memory";
+import { CarWriter } from "@ipld/car/writer";
+function walkDirectory(dirPath, prefix = "") {
+  let dirents;
+  try {
+    dirents = fs.readdirSync(dirPath, { withFileTypes: true });
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") throw new Error(`Directory not found: ${dirPath}`);
+    if (code === "ENOTDIR") throw new Error(`Not a directory: ${dirPath}`);
+    throw err;
+  }
+  const entries = [];
+  for (const entry of dirents) {
+    const fullPath = path.join(dirPath, entry.name);
+    const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
+    if (entry.isDirectory()) {
+      entries.push(...walkDirectory(fullPath, relativePath));
+    } else if (entry.isFile()) {
+      entries.push({ path: relativePath, content: fs.readFileSync(fullPath) });
+    }
+  }
+  return entries;
+}
+async function collectBytes(iter) {
+  const parts = [];
+  for await (const chunk of iter) {
+    parts.push(chunk);
+  }
+  const totalLength = parts.reduce((sum, p) => sum + p.length, 0);
+  const result = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const part of parts) {
+    result.set(part, offset);
+    offset += part.length;
+  }
+  return result;
+}
+async function merkleizeJS(directoryPath) {
+  console.log(`   Merkleizing (JS): ${directoryPath}`);
+  const files = walkDirectory(directoryPath);
+  const blockstore = new MemoryBlockstore();
+  const source = files.map((file) => ({
+    path: file.path,
+    content: (async function* () {
+      yield file.content;
+    })()
+  }));
+  let rootCid;
+  for await (const entry of importer(source, blockstore, {
+    cidVersion: 1,
+    rawLeaves: true,
+    wrapWithDirectory: true
+  })) {
+    rootCid = entry.cid;
+  }
+  if (!rootCid) {
+    throw new Error("Merkleization produced no root CID");
+  }
+  const { writer, out } = CarWriter.create([rootCid]);
+  const collectPromise = collectBytes(out);
+  for await (const { cid, bytes } of blockstore.getAll()) {
+    await writer.put({ cid, bytes: await collectBytes(bytes) });
+  }
+  await writer.close();
+  const carBytes = await collectPromise;
+  console.log(`   CAR (JS): ${(carBytes.length / 1024 / 1024).toFixed(2)} MB`);
+  return { carBytes, cid: rootCid.toString() };
+}
+
+export {
+  merkleizeJS
+};

package/dist/{chunk-7FNQBFFQ.js → chunk-HMCNHEMO.js}

@@ -1,7 +1,7 @@
 import {
   captureWarning,
   withSpan
-} from "./chunk-BYYVSN7E.js";
+} from "./chunk-DOBGWPA3.js";
 
 // src/dotns.ts
 import crypto from "crypto";

package/dist/deploy.d.ts

@@ -49,7 +49,7 @@ declare function merkleize(directoryPath: string, outputCarPath: string): Promis
     carPath: string;
     cid: string;
 }>;
-declare function storeDirectory(directoryPath: string, provider?: ExistingProvider, password?: string): Promise<{
+declare function storeDirectory(directoryPath: string, provider?: ExistingProvider, password?: string, jsMerkle?: boolean): Promise<{
     storageCid: string;
     ipfsCid: string;
 }>;
@@ -63,6 +63,10 @@ interface DeployOptions {
     rpc?: string;
     poolSize?: number;
     password?: string;
+    /** Use pure-JS merkleization instead of Kubo CLI. Required for WebContainer environments. */
+    jsMerkle?: boolean;
+    /** Custom telemetry attributes, merged into the deploy span. Overrides auto-detected values. */
+    attributes?: Record<string, string>;
 }
 declare function deploy(content: DeployContent, domainName?: string | null, options?: DeployOptions): Promise<DeployResult>;
 

package/dist/deploy.js

@@ -21,10 +21,11 @@ import {
   storeChunkedContent,
   storeDirectory,
   storeFile
-} from "./chunk-YB4HKYPR.js";
-import "./chunk-7FNQBFFQ.js";
+} from "./chunk-5B6UCUSH.js";
+import "./chunk-HMCNHEMO.js";
+import "./chunk-GZ5UUECB.js";
 import "./chunk-LGPTJYA3.js";
-import "./chunk-BYYVSN7E.js";
+import "./chunk-DOBGWPA3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DEFAULT_BULLETIN_RPC,

package/dist/dotns.js

@@ -19,8 +19,8 @@ import {
   sanitizeDomainLabel,
   stripTrailingDigits,
   validateDomainLabel
-} from "./chunk-7FNQBFFQ.js";
-import "./chunk-BYYVSN7E.js";
+} from "./chunk-HMCNHEMO.js";
+import "./chunk-DOBGWPA3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   CONNECTION_TIMEOUT_MS,

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { DeployContent, DeployOptions, DeployResult, deploy } from './deploy.js';
 export { PoolAccount, PoolAuthorization, bootstrapPool, derivePoolAccounts, ensureAuthorized, fetchPoolAuthorizations, selectAccount } from './pool.js';
 export { DotNS, DotNSConnectOptions, OwnershipResult, PriceValidationResult } from './dotns.js';
+export { MerkleizeResult, merkleizeJS } from './merkle.js';
 import 'multiformats/cid';
 import 'polkadot-api';

package/dist/index.js

@@ -1,9 +1,12 @@
 import {
   deploy
-} from "./chunk-YB4HKYPR.js";
+} from "./chunk-5B6UCUSH.js";
 import {
   DotNS
-} from "./chunk-7FNQBFFQ.js";
+} from "./chunk-HMCNHEMO.js";
+import {
+  merkleizeJS
+} from "./chunk-GZ5UUECB.js";
 import {
   bootstrapPool,
   derivePoolAccounts,
@@ -11,7 +14,7 @@ import {
   fetchPoolAuthorizations,
   selectAccount
 } from "./chunk-LGPTJYA3.js";
-import "./chunk-BYYVSN7E.js";
+import "./chunk-DOBGWPA3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   DotNS,
@@ -20,5 +23,6 @@ export {
   derivePoolAccounts,
   ensureAuthorized,
   fetchPoolAuthorizations,
+  merkleizeJS,
   selectAccount
 };

package/dist/merkle.d.ts

@@ -0,0 +1,7 @@
+interface MerkleizeResult {
+    carBytes: Uint8Array;
+    cid: string;
+}
+declare function merkleizeJS(directoryPath: string): Promise<MerkleizeResult>;
+
+export { type MerkleizeResult, merkleizeJS };

package/dist/merkle.js

@@ -0,0 +1,7 @@
+import {
+  merkleizeJS
+} from "./chunk-GZ5UUECB.js";
+import "./chunk-QGM4M3NI.js";
+export {
+  merkleizeJS
+};

package/dist/telemetry.js

@@ -8,7 +8,7 @@ import {
   setDeployAttribute,
   withDeploySpan,
   withSpan
-} from "./chunk-BYYVSN7E.js";
+} from "./chunk-DOBGWPA3.js";
 import "./chunk-QGM4M3NI.js";
 export {
   VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulletin-deploy",
-  "version": "0.6.6",
+  "version": "0.6.7-rc.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -28,12 +28,13 @@
     "cdm.json"
   ],
   "scripts": {
-    "build": "tsup src/index.ts src/deploy.ts src/dotns.ts src/pool.ts src/telemetry.ts --format esm --dts --clean --target node22",
+    "build": "tsup src/index.ts src/deploy.ts src/dotns.ts src/pool.ts src/telemetry.ts src/merkle.ts --format esm --dts --clean --target node22",
     "test": "npm run build && node --test test/test.js",
     "benchmark": "npm run build && node benchmark.js"
   },
   "dependencies": {
     "@dotdm/cdm": "^0.5.1",
+    "@ipld/car": "^5.4.3",
     "@ipld/dag-pb": "^4.1.3",
     "@noble/hashes": "^1.7.2",
     "@polkadot-api/substrate-bindings": "^0.16.5",
@@ -42,7 +43,9 @@
     "@polkadot/keyring": "^13.0.0",
     "@polkadot/util-crypto": "^13.0.0",
     "@sentry/node": "^9.14.0",
+    "blockstore-core": "^6.1.3",
     "ipfs-unixfs": "^11.2.0",
+    "ipfs-unixfs-importer": "^16.1.4",
     "multiformats": "^13.4.1",
     "polkadot-api": "^1.23.1",
     "viem": "^2.30.5"