bulletin-deploy 0.4.5 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulletin-deploy",
-  "version": "0.4.5",
+  "version": "0.5.1",
   "private": false,
   "repository": {
     "type": "git",

package/src/deploy.js

@@ -268,12 +268,12 @@ export async function merkleize(directoryPath, outputCarPath) {
 
 export async function storeDirectory(directoryPath) {
   const carPath = path.join(path.dirname(directoryPath), `${path.basename(directoryPath)}.car`);
-  const { cid: ipfsCid } = await withSpan("deploy.merkleize", "merkleize", { "deploy.directory": directoryPath }, async () => {
+  const { cid: ipfsCid } = await withSpan("deploy.merkleize", "1a. merkleize", { "deploy.directory": directoryPath }, async () => {
     return merkleize(directoryPath, carPath);
   });
   const carBuffer = fs.readFileSync(carPath);
   const carChunks = chunk(carBuffer, CHUNK_SIZE);
-  const storageCid = await withSpan("deploy.chunk-upload", "chunk-upload", { "deploy.chunks.total": carChunks.length, "deploy.car.bytes": carBuffer.length }, async () => {
+  const storageCid = await withSpan("deploy.chunk-upload", "1b. chunk-upload", { "deploy.chunks.total": carChunks.length, "deploy.car.bytes": carBuffer.length }, async () => {
     return storeChunkedContent(carChunks);
   });
   return { storageCid, ipfsCid };
@@ -296,7 +296,7 @@ export async function deploy(content, domainName = null) {
     console.log("Storage");
     console.log("=".repeat(60));
 
-    await withSpan("deploy.storage", "storage", {}, async () => {
+    await withSpan("deploy.storage", "1. storage", {}, async () => {
       if (process.env.IPFS_CID) {
         cid = process.env.IPFS_CID;
         ipfsCid = cid;
@@ -344,7 +344,7 @@ export async function deploy(content, domainName = null) {
     console.log("DotNS");
     console.log("=".repeat(60));
 
-    await withSpan("deploy.dotns", "dotns", { "deploy.domain": name }, async () => {
+    await withSpan("deploy.dotns", "2. dotns", { "deploy.domain": name }, async () => {
       const dotns = new DotNS();
       await dotns.connect();
       const { owned, owner } = await dotns.checkOwnership(name);

package/src/dotns.js

@@ -160,7 +160,7 @@ export function computeDomainTokenId(label) {
   return BigInt(node);
 }
 export function countTrailingDigits(label) { let count = 0; for (let i = label.length - 1; i >= 0; i--) { const code = label.charCodeAt(i); if (code >= 48 && code <= 57) count++; else break; } return count; }
-export function stripTrailingDigits(label) { return label.replace(/\d+$/, ""); }
+export function stripTrailingDigits(label) { return label.replace(/\d+$/, "").replace(/-$/, ""); }
 
 export function validateDomainLabel(label) {
   if (!/^[a-z0-9-]{3,}$/.test(label)) throw new Error("Invalid domain label: must contain only lowercase letters, digits, and hyphens, min 3 chars");
@@ -492,7 +492,7 @@ export class DotNS {
   }
 
   async setContenthash(domainName, contenthashHex) {
-    return withSpan("deploy.dotns.set-contenthash", "set-contenthash", {}, async () => {
+    return withSpan("deploy.dotns.set-contenthash", "2b. set-contenthash", {}, async () => {
       this.ensureConnected();
       const node = namehash(`${domainName}.dot`);
       let ipfsCid = null;
@@ -512,7 +512,7 @@ export class DotNS {
   }
 
   async register(label, options = {}) {
-    return withSpan("deploy.dotns.register", `register ${label}.dot`, {}, async () => {
+    return withSpan("deploy.dotns.register", `2a. register ${label}.dot`, {}, async () => {
       const status = parseProofOfPersonhoodStatus(options.status || process.env.DOTNS_STATUS);
       const reverse = options.reverse ?? (process.env.DOTNS_REVERSE ?? "false").toLowerCase() === "true";
       if (!this.connected) await this.connect(options);
@@ -523,10 +523,10 @@ export class DotNS {
         this.setUserPopStatus(status),
       ]);
       const { commitment, registration } = await this.generateCommitment(label, reverse);
-      await withSpan("deploy.dotns.submit-commitment", "submit-commitment", {}, () => this.submitCommitment(commitment));
-      await withSpan("deploy.dotns.wait-commitment-age", "wait-commitment-age", {}, () => this.waitForCommitmentAge());
+      await withSpan("deploy.dotns.submit-commitment", "2a-i. submit-commitment", {}, () => this.submitCommitment(commitment));
+      await withSpan("deploy.dotns.wait-commitment-age", "2a-ii. wait-commitment-age", {}, () => this.waitForCommitmentAge());
       const pricing = await this.getPriceAndValidate(label);
-      await withSpan("deploy.dotns.finalize-registration", "finalize-registration", {}, () => this.finalizeRegistration(registration, pricing.priceWei));
+      await withSpan("deploy.dotns.finalize-registration", "2a-iii. finalize-registration", {}, () => this.finalizeRegistration(registration, pricing.priceWei));
       await this.verifyOwnership(label);
       console.log(`\n   Registration complete!`);
       return { label, owner: this.evmAddress };

package/test/test.js

@@ -1,7 +1,7 @@
 import { test, describe } from "node:test";
 import assert from "node:assert/strict";
 import { createCID, encodeContenthash } from "../src/deploy.js";
-import { validateDomainLabel, fetchNonce, TX_TIMEOUT_MS } from "../src/dotns.js";
+import { validateDomainLabel, stripTrailingDigits, fetchNonce, TX_TIMEOUT_MS } from "../src/dotns.js";
 
 // ---------------------------------------------------------------------------
 // 1. createCID
@@ -86,7 +86,28 @@ describe("validateDomainLabel", () => {
 });
 
 // ---------------------------------------------------------------------------
-// 4. fetchNonce timeout
+// 4. stripTrailingDigits
+// ---------------------------------------------------------------------------
+describe("stripTrailingDigits", () => {
+  test("strips trailing digits", () => {
+    assert.strictEqual(stripTrailingDigits("my-app00"), "my-app");
+  });
+
+  test("strips trailing hyphen after digits", () => {
+    assert.strictEqual(stripTrailingDigits("t3rminal-app-88-pr-80"), "t3rminal-app-88-pr");
+  });
+
+  test("handles no trailing digits", () => {
+    assert.strictEqual(stripTrailingDigits("my-app"), "my-app");
+  });
+
+  test("handles all digits suffix", () => {
+    assert.strictEqual(stripTrailingDigits("app-123"), "app");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// 5. fetchNonce timeout
 // ---------------------------------------------------------------------------
 describe("fetchNonce", () => {
   test(