@shelby-protocol/cli 0.0.5 → 0.0.7

package/bin/entry.js

@@ -4,7 +4,7 @@
 import { Command } from "commander";
 
 // package.json
-var version = "0.0.5";
+var version = "0.0.7";
 
 // src/commands/init.tsx
 import { render } from "ink";
@@ -1168,15 +1168,7 @@ var require2 = createRequire(import.meta.url);
 var __dirname = dirname(fileURLToPath(import.meta.url));
 var RS;
 try {
-  try {
-    RS = require2(join(__dirname, "binding.node"));
-  } catch {
-    try {
-      RS = require2(join(dirname(process.execPath), "binding.node"));
-    } catch {
-      RS = require2(join(process.cwd(), "bin", "binding.node"));
-    }
-  }
+  RS = require2(join(__dirname, "binding.node"));
 } catch {
   RS = require2("@ronomon/reed-solomon");
 }
@@ -1271,12 +1263,11 @@ async function generateCommitments(fullData, onChunk, options) {
   };
 }
 
-// ../../packages/sdk/dist/chunk-OR3AKY3F.mjs
+// ../../packages/sdk/dist/chunk-AASWNUSM.mjs
 import { Readable as Readable3 } from "stream";
 import {
   AccountAddress as AccountAddress3,
   Aptos as Aptos2,
-  AptosApiError,
   Hex,
   MoveVector
 } from "@aptos-labs/ts-sdk";
@@ -1317,7 +1308,8 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
         expirationMicros: metadata.expiration_micros
       };
     } catch (error) {
-      if (error instanceof AptosApiError && error.data?.message?.includes("sub_status: Some(404)")) {
+      if (error instanceof Error && // Depending on the network, the error message may show up differently.
+      (error.message?.includes("sub_status: Some(404)") || error.message?.includes("EBLOB_NOT_FOUND"))) {
         return void 0;
       }
       throw error;
@@ -2174,6 +2166,76 @@ import { Box as Box5, Text as Text5, render as render4 } from "ink";
 import SelectInput2 from "ink-select-input";
 import ora2 from "ora";
 import { z as z9 } from "zod";
+
+// src/utils/errors.ts
+var ERROR_CODES = {
+  UNKNOWN_ERROR: "UNKNOWN_ERROR",
+  EBLOB_WRITE_INSUFFICIENT_FUNDS: "EBLOB_WRITE_INSUFFICIENT_FUNDS",
+  EBLOB_WRITE_CHUNKSET_ALREADY_EXISTS: "EBLOB_WRITE_CHUNKSET_ALREADY_EXISTS",
+  ECONNREFUSED: "ECONNREFUSED",
+  ENOTFOUND: "ENOTFOUND"
+};
+var DEFAULT_ERROR_RESPONSE = {
+  displayMessage: "An unknown error occurred",
+  code: ERROR_CODES.UNKNOWN_ERROR
+};
+var formatHostInfo = (error) => {
+  if (error instanceof Error) {
+    if ("hostname" in error) {
+      return `(${error.hostname})`;
+    }
+    if ("address" in error && "port" in error) {
+      return `(${error.address}:${error.port})`;
+    }
+  }
+  return void 0;
+};
+var handleError = (error) => {
+  if (error instanceof Error) {
+    if (error.message.includes(ERROR_CODES.EBLOB_WRITE_INSUFFICIENT_FUNDS)) {
+      return {
+        displayMessage: "Insufficient Shelby tokens. Please fund your account with Shelby tokens to continue.",
+        code: ERROR_CODES.EBLOB_WRITE_INSUFFICIENT_FUNDS
+      };
+    }
+    if (error.message.includes(ERROR_CODES.EBLOB_WRITE_CHUNKSET_ALREADY_EXISTS)) {
+      return {
+        displayMessage: "The blob already exists on L1.",
+        code: ERROR_CODES.EBLOB_WRITE_CHUNKSET_ALREADY_EXISTS
+      };
+    }
+    if ("code" in error) {
+      if (error.code === ERROR_CODES.ECONNREFUSED) {
+        return {
+          displayMessage: `Could not connect to the Shelby RPC endpoint. Please check that the endpoint you are using is correct ${formatHostInfo(error) ?? ""}.`,
+          code: ERROR_CODES.ECONNREFUSED
+        };
+      }
+      if (error.code === ERROR_CODES.ENOTFOUND) {
+        return {
+          displayMessage: `Could not connect to the Shelby RPC endpoint. Please check that the endpoint you are using is correct ${formatHostInfo(error) ?? ""}.`,
+          code: ERROR_CODES.ENOTFOUND
+        };
+      }
+    }
+    if (error.cause instanceof AggregateError) {
+      const firstKnownError = error.cause.errors.find((error2) => {
+        const handledError = handleError(error2);
+        return handledError.code !== ERROR_CODES.UNKNOWN_ERROR;
+      });
+      if (firstKnownError) return handleError(firstKnownError);
+    }
+    if (error.cause instanceof Error) {
+      return handleError(error.cause);
+    }
+  }
+  return {
+    displayMessage: `An unknown error occurred ${error instanceof Error ? `: ${error.message}` : ""}`,
+    code: ERROR_CODES.UNKNOWN_ERROR
+  };
+};
+
+// src/commands/upload.tsx
 import { jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
 var normBlobName2 = (i, f, b) => normBlobName(path4, i, f, b);
 var flexibleDateSchema = z9.string().transform((val) => {
@@ -2374,60 +2436,66 @@ function uploadCommand(program) {
     let hasUploadedBlob = false;
     for (const entry of filelist) {
       spinner.text = `Reading ${entry.filename}.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
-      const blobData = await fs3.readFile(entry.filename);
-      if (blobData.length !== entry.sizeBytes) {
-        throw new Error(
-          `Size of file ${entry.filename} changed after initial scan. Original size was ${entry.sizeBytes} but it is now ${blobData.length}`
-        );
-      }
-      spinner.text = `Committing ${entry.filename} to L1.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
-      const existingBlobMetadata = await shelbyBlobClient.getBlobMetadata({
-        account: activeAccount.accountAddress,
-        name: entry.blobname
-      });
-      const blobCommitments = await generateCommitments(
-        Readable4.from(blobData)
-      );
-      if (!existingBlobMetadata) {
-        const { transaction: pendingWriteBlobCommitmentsTransaction } = await shelbyBlobClient.writeBlobCommitments({
-          account: activeAccount,
-          blobName: entry.blobname,
-          lifetime: validatedOptions.expiration.getTime() * 1e3,
-          blobCommitments
-        });
-        await aptos.waitForTransaction({
-          transactionHash: pendingWriteBlobCommitmentsTransaction.hash
+      try {
+        const blobData = await fs3.readFile(entry.filename);
+        if (blobData.length !== entry.sizeBytes) {
+          throw new Error(
+            `Size of file ${entry.filename} changed after initial scan. Original size was ${entry.sizeBytes} but it is now ${blobData.length}`
+          );
+        }
+        spinner.text = `Committing ${entry.filename} to L1.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
+        const existingBlobMetadata = await shelbyBlobClient.getBlobMetadata({
+          account: activeAccount.accountAddress,
+          name: entry.blobname
         });
-      } else {
-        spinner.text = `Blob ${entry.blobname} already exists on L1, skipping commitments and uploading to Shelby RPC...`;
-      }
-      if (validatedOptions.outputCommitments) {
-        outputCommitments[entry.filename] = blobCommitments;
-      }
-      const existingBlobChunks = await shelbyBlobClient.getBlobChunks({
-        account: activeAccount.accountAddress,
-        name: entry.blobname
-      });
-      if (existingBlobChunks.length === 0) {
-        console.error(
-          `Blob ${entry.blobname} does not exist on L1, an error occurred when uploading commitments...`
+        const blobCommitments = await generateCommitments(
+          Readable4.from(blobData)
         );
+        if (!existingBlobMetadata) {
+          const { transaction: pendingWriteBlobCommitmentsTransaction } = await shelbyBlobClient.writeBlobCommitments({
+            account: activeAccount,
+            blobName: entry.blobname,
+            lifetime: validatedOptions.expiration.getTime() * 1e3,
+            blobCommitments
+          });
+          await aptos.waitForTransaction({
+            transactionHash: pendingWriteBlobCommitmentsTransaction.hash
+          });
+        } else {
+          spinner.text = `Blob ${entry.blobname} already exists on L1, skipping commitments and uploading to Shelby RPC...`;
+        }
+        if (validatedOptions.outputCommitments) {
+          outputCommitments[entry.filename] = blobCommitments;
+        }
+        const existingBlobChunks = await shelbyBlobClient.getBlobChunks({
+          account: activeAccount.accountAddress,
+          name: entry.blobname
+        });
+        if (existingBlobChunks.length === 0) {
+          console.error(
+            `Blob ${entry.blobname} does not exist on L1, an error occurred when uploading commitments...`
+          );
+          process.exit(1);
+        }
+        if (!existingBlobChunks.every(
+          (chunk) => chunk.location.variant === "stored"
+        )) {
+          spinner.text = `Uploading ${entry.filename} to Shelby RPC.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
+          await shelbyNodeClient.putBlob(
+            activeAccount.accountAddress,
+            entry.blobname,
+            blobData
+          );
+          hasUploadedBlob = true;
+        } else {
+          spinner.text = "All blob chunks have been stored on L1, skipping upload to Shelby RPC...";
+        }
+        amountUploaded += blobData.length;
+      } catch (error) {
+        const { displayMessage } = handleError(error);
+        spinner.fail(displayMessage);
         process.exit(1);
       }
-      if (!existingBlobChunks.every(
-        (chunk) => chunk.location.variant === "stored"
-      )) {
-        spinner.text = `Uploading ${entry.filename} to Shelby RPC.. (Overall: ${formatProgressPercent()}%, ${formatProgressRate()} MiB/s)`;
-        await shelbyNodeClient.putBlob(
-          activeAccount.accountAddress,
-          entry.blobname,
-          blobData
-        );
-        hasUploadedBlob = true;
-      } else {
-        spinner.text = "All blob chunks have been stored on L1, skipping upload to Shelby RPC...";
-      }
-      amountUploaded += blobData.length;
     }
     if (validatedOptions.outputCommitments) {
       await fs3.writeFile(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shelby-protocol/cli",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "private": false,
   "bin": {
     "shelby": "bin/entry.js"