pinme 2.0.2 → 2.0.4-beta.1

package/dist/index.js

@@ -5587,6 +5587,59 @@ var init_apiClient = __esm({
   }
 });
 
+// bin/utils/domainValidator.ts
+function normalizeDomain(domain) {
+  return domain.replace(/^https?:\/\//, "").replace(/\/$/, "");
+}
+function isDnsDomain(domain) {
+  return normalizeDomain(domain).includes(".");
+}
+function validateDnsDomain(domain) {
+  const cleanDomain = normalizeDomain(domain);
+  const domainRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]*(\.[a-zA-Z0-9][a-zA-Z0-9-]*)*\.[a-zA-Z]{2,}$/;
+  const parts = cleanDomain.split(".");
+  if (parts.length < 2) {
+    return {
+      valid: false,
+      message: "Invalid domain format. Please enter a complete domain (e.g., example.com)"
+    };
+  }
+  for (const part of parts) {
+    if (part.length === 0) {
+      return {
+        valid: false,
+        message: "Invalid domain format. Consecutive dots are not allowed"
+      };
+    }
+    if (part.length > 63) {
+      return {
+        valid: false,
+        message: "Invalid domain format. Each label must be 63 characters or less"
+      };
+    }
+    if (!/^[a-zA-Z0-9-]+$/.test(part)) {
+      return {
+        valid: false,
+        message: "Invalid domain format. Domains can only contain letters, numbers, and hyphens"
+      };
+    }
+    if (/^-|-$/.test(part)) {
+      return {
+        valid: false,
+        message: "Invalid domain format. Labels cannot start or end with hyphens"
+      };
+    }
+  }
+  if (!domainRegex.test(cleanDomain)) {
+    return { valid: false, message: "Invalid domain format" };
+  }
+  return { valid: true };
+}
+var init_domainValidator = __esm({
+  "bin/utils/domainValidator.ts"() {
+  }
+});
+
 // bin/utils/pinmeApi.ts
 var pinmeApi_exports = {};
 __export(pinmeApi_exports, {
@@ -5654,9 +5707,13 @@ async function getRootDomain(forceRefresh = false) {
 }
 async function checkDomainAvailable(domainName) {
   var _a2, _b;
+  if (isDnsDomain(domainName))
+    return await {
+      is_valid: true
+    };
   const client = createPinmeApiClient();
   const configured = APP_CONFIG.pinmeCheckDomainPath;
-  const fallbacks = [configured, "/check_domain_available"];
+  const fallbacks = [configured];
   let lastRecoverableError;
   for (const p of fallbacks) {
     try {
@@ -5850,6 +5907,7 @@ var init_pinmeApi = __esm({
     import_chalk4 = __toESM(require("chalk"));
     init_apiClient();
     init_config();
+    init_domainValidator();
     TOKEN_EXPIRED_CODES = [
       401,
       403,
@@ -5919,7 +5977,7 @@ var import_chalk26 = __toESM(require("chalk"));
 var import_figlet5 = __toESM(require("figlet"));
 
 // package.json
-var version = "2.0.2";
+var version = "2.0.4-beta.1";
 
 // bin/upload.ts
 var import_path6 = __toESM(require("path"));
@@ -5930,57 +5988,7 @@ var import_fs2 = __toESM(require("fs"));
 init_pinmeApi();
 init_webLogin();
 init_config();
-
-// bin/utils/domainValidator.ts
-function normalizeDomain(domain) {
-  return domain.replace(/^https?:\/\//, "").replace(/\/$/, "");
-}
-function isDnsDomain(domain) {
-  return normalizeDomain(domain).includes(".");
-}
-function validateDnsDomain(domain) {
-  const cleanDomain = normalizeDomain(domain);
-  const domainRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]*(\.[a-zA-Z0-9][a-zA-Z0-9-]*)*\.[a-zA-Z]{2,}$/;
-  const parts = cleanDomain.split(".");
-  if (parts.length < 2) {
-    return {
-      valid: false,
-      message: "Invalid domain format. Please enter a complete domain (e.g., example.com)"
-    };
-  }
-  for (const part of parts) {
-    if (part.length === 0) {
-      return {
-        valid: false,
-        message: "Invalid domain format. Consecutive dots are not allowed"
-      };
-    }
-    if (part.length > 63) {
-      return {
-        valid: false,
-        message: "Invalid domain format. Each label must be 63 characters or less"
-      };
-    }
-    if (!/^[a-zA-Z0-9-]+$/.test(part)) {
-      return {
-        valid: false,
-        message: "Invalid domain format. Domains can only contain letters, numbers, and hyphens"
-      };
-    }
-    if (/^-|-$/.test(part)) {
-      return {
-        valid: false,
-        message: "Invalid domain format. Labels cannot start or end with hyphens"
-      };
-    }
-  }
-  if (!domainRegex.test(cleanDomain)) {
-    return { valid: false, message: "Invalid domain format" };
-  }
-  return { valid: true };
-}
-
-// bin/upload.ts
+init_domainValidator();
 init_cliError();
 
 // bin/services/uploadService.ts
@@ -7385,7 +7393,11 @@ var importCar_default = async (options) => {
       if (domainArg) {
         const check = await checkDomainAvailable(domainArg);
         if (!check.is_valid) {
-          console.log(import_chalk8.default.red(`Domain not available: ${check.error || "unknown reason"}`));
+          console.log(
+            import_chalk8.default.red(
+              `Domain not available: ${check.error || "unknown reason"}`
+            )
+          );
           return;
         }
         console.log(import_chalk8.default.green(`Domain available: ${domainArg}`));
@@ -7398,7 +7410,11 @@ var importCar_default = async (options) => {
         });
         if (result) {
           const uid = getUid2();
-          const encryptedCID = encryptHash2(result.contentHash, APP_CONFIG.secretKey, uid);
+          const encryptedCID = encryptHash2(
+            result.contentHash,
+            APP_CONFIG.secretKey,
+            uid
+          );
           console.log(
             import_chalk8.default.cyan(
               import_figlet2.default.textSync("Successful", { horizontalLayout: "full" })
@@ -7410,12 +7426,20 @@ var importCar_default = async (options) => {
             "primary"
           );
           if (domainArg) {
-            console.log(import_chalk8.default.blue(`Binding domain: ${domainArg} with CID: ${result.contentHash}`));
+            console.log(
+              import_chalk8.default.blue(
+                `Binding domain: ${domainArg} with CID: ${result.contentHash}`
+              )
+            );
             const ok = await bindPinmeDomain(domainArg, result.contentHash);
             if (ok) {
               console.log(import_chalk8.default.green(`Bind success: ${domainArg}`));
               const rootDomain = await getRootDomain();
-              console.log(import_chalk8.default.white(`Visit (Pinme subdomain example): https://${domainArg}.${rootDomain}`));
+              console.log(
+                import_chalk8.default.white(
+                  `Visit (Pinme subdomain example): https://${domainArg}.${rootDomain}`
+                )
+              );
             } else {
               console.log(import_chalk8.default.red("Binding failed. Please try again later."));
             }
@@ -7443,7 +7467,11 @@ var importCar_default = async (options) => {
       if (domainArg) {
         const check = await checkDomainAvailable(domainArg);
         if (!check.is_valid) {
-          console.log(import_chalk8.default.red(`Domain not available: ${check.error || "unknown reason"}`));
+          console.log(
+            import_chalk8.default.red(
+              `Domain not available: ${check.error || "unknown reason"}`
+            )
+          );
           return;
         }
         console.log(import_chalk8.default.green(`Domain available: ${domainArg}`));
@@ -7456,7 +7484,11 @@ var importCar_default = async (options) => {
         });
         if (result) {
           const uid = getUid2();
-          const encryptedCID = encryptHash2(result.contentHash, APP_CONFIG.secretKey, uid);
+          const encryptedCID = encryptHash2(
+            result.contentHash,
+            APP_CONFIG.secretKey,
+            uid
+          );
           console.log(
             import_chalk8.default.cyan(
               import_figlet2.default.textSync("Successful", { horizontalLayout: "full" })
@@ -7468,12 +7500,20 @@ var importCar_default = async (options) => {
             "primary"
           );
           if (domainArg) {
-            console.log(import_chalk8.default.blue(`Binding domain: ${domainArg} with CID: ${result.contentHash}`));
+            console.log(
+              import_chalk8.default.blue(
+                `Binding domain: ${domainArg} with CID: ${result.contentHash}`
+              )
+            );
             const ok = await bindPinmeDomain(domainArg, result.contentHash);
             if (ok) {
               console.log(import_chalk8.default.green(`Bind success: ${domainArg}`));
               const rootDomain = await getRootDomain();
-              console.log(import_chalk8.default.white(`Visit (Pinme subdomain example): https://${domainArg}.${rootDomain}`));
+              console.log(
+                import_chalk8.default.white(
+                  `Visit (Pinme subdomain example): https://${domainArg}.${rootDomain}`
+                )
+              );
             } else {
               console.log(import_chalk8.default.red("Binding failed. Please try again later."));
             }
@@ -8092,6 +8132,7 @@ init_pinmeApi();
 init_cliError();
 init_config();
 init_webLogin();
+init_domainValidator();
 function parseArgs() {
   const args = process.argv.slice(2);
   const res = {};
@@ -8114,12 +8155,17 @@ async function checkWalletBalanceStatus2(authConfig) {
   var _a2;
   console.log(import_chalk17.default.blue("Checking wallet balance..."));
   try {
-    const balanceResult = await getWalletBalance(authConfig.address, authConfig.token);
+    const balanceResult = await getWalletBalance(
+      authConfig.address,
+      authConfig.token
+    );
     const balance = Number(((_a2 = balanceResult.data) == null ? void 0 : _a2.wallet_balance_usd) ?? 0);
     if (!Number.isFinite(balance) || balance <= 0) {
       return false;
     }
-    console.log(import_chalk17.default.green(`Wallet balance available: $${balance.toFixed(2)}`));
+    console.log(
+      import_chalk17.default.green(`Wallet balance available: $${balance.toFixed(2)}`)
+    );
     return true;
   } catch (e) {
     if (e.message === "Token expired" || (e == null ? void 0 : e.name) === "CliError") {
@@ -8135,23 +8181,35 @@ async function bindCmd() {
     let { domain, targetPath, dns } = parseArgs();
     const authConfig = getAuthConfig();
     if (!authConfig) {
-      console.log(import_chalk17.default.red("Please login first. Run: pinme set-appkey <AppKey>"));
+      console.log(
+        import_chalk17.default.red("Please login first. Run: pinme set-appkey <AppKey>")
+      );
       return;
     }
     if (!targetPath) {
       const ans = await import_inquirer7.default.prompt([
-        { type: "input", name: "path", message: "Enter the path to upload and bind: " }
+        {
+          type: "input",
+          name: "path",
+          message: "Enter the path to upload and bind: "
+        }
       ]);
       targetPath = ans.path;
     }
     if (!domain) {
       const ans = await import_inquirer7.default.prompt([
-        { type: "input", name: "domain", message: "Enter the domain to bind (e.g., my-site or example.com): " }
+        {
+          type: "input",
+          name: "domain",
+          message: "Enter the domain to bind (e.g., my-site or example.com): "
+        }
       ]);
       domain = (_a2 = ans.domain) == null ? void 0 : _a2.trim();
     }
     if (!targetPath || !domain) {
-      console.log(import_chalk17.default.red("Missing parameters. Path and domain are required."));
+      console.log(
+        import_chalk17.default.red("Missing parameters. Path and domain are required.")
+      );
       return;
     }
     const isDns = dns || isDnsDomain(domain);
@@ -8166,7 +8224,11 @@ async function bindCmd() {
     try {
       const hasWalletBalance = await checkWalletBalanceStatus2(authConfig);
       if (!hasWalletBalance) {
-        console.log(import_chalk17.default.red("Insufficient wallet balance. Please recharge your wallet first."));
+        console.log(
+          import_chalk17.default.red(
+            "Insufficient wallet balance. Please recharge your wallet first."
+          )
+        );
         printRechargeUrl(getWalletRechargeUrl());
         return;
       }
@@ -8179,7 +8241,9 @@ async function bindCmd() {
     try {
       const check = await checkDomainAvailable(displayDomain);
       if (!check.is_valid) {
-        console.log(import_chalk17.default.red(`Domain not available: ${check.error || "unknown reason"}`));
+        console.log(
+          import_chalk17.default.red(`Domain not available: ${check.error || "unknown reason"}`)
+        );
         return;
       }
       console.log(import_chalk17.default.green(`Domain available: ${displayDomain}`));
@@ -8200,14 +8264,23 @@ async function bindCmd() {
     try {
       if (isDns) {
         console.log(import_chalk17.default.blue("Binding DNS domain..."));
-        const dnsResult = await bindDnsDomainV4(displayDomain, up.contentHash, authConfig.address, authConfig.token);
+        const dnsResult = await bindDnsDomainV4(
+          displayDomain,
+          up.contentHash,
+          authConfig.address,
+          authConfig.token
+        );
         if (dnsResult.code !== 200) {
           console.log(import_chalk17.default.red(`DNS binding failed: ${dnsResult.msg}`));
           return;
         }
         console.log(import_chalk17.default.green(`DNS bind success: ${displayDomain}`));
         console.log(import_chalk17.default.white(`Visit: https://${displayDomain}`));
-        console.log(import_chalk17.default.cyan("\n\u{1F4DA} DNS Setup Guide: https://pinme.eth.limo/#/docs?id=custom-domain"));
+        console.log(
+          import_chalk17.default.cyan(
+            "\n\u{1F4DA} DNS Setup Guide: https://pinme.eth.limo/#/docs?id=custom-domain"
+          )
+        );
       } else {
         console.log(import_chalk17.default.blue("Binding Pinme subdomain..."));
         const ok = await bindPinmeDomain(displayDomain, up.contentHash);
@@ -8217,7 +8290,9 @@ async function bindCmd() {
         }
         console.log(import_chalk17.default.green(`Bind success: ${displayDomain}`));
         const rootDomain = await getRootDomain();
-        console.log(import_chalk17.default.white(`Visit: https://${displayDomain}.${rootDomain}`));
+        console.log(
+          import_chalk17.default.white(`Visit: https://${displayDomain}.${rootDomain}`)
+        );
       }
     } catch (e) {
       if (e.message === "Token expired") {
@@ -8780,6 +8855,7 @@ init_axios2();
 var import_child_process4 = require("child_process");
 init_webLogin();
 init_pinmeApi();
+init_domainValidator();
 init_cliError();
 init_config();
 var PROJECT_DIR2 = process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinme",
-  "version": "2.0.2",
+  "version": "2.0.4-beta.1",
   "publishConfig": {
     "access": "public"
   },