pinme 2.0.0-rc.1 → 2.0.1-beta.1

package/dist/index.js

@@ -1523,7 +1523,7 @@ var import_chalk23 = __toESM(require("chalk"));
 var import_figlet5 = __toESM(require("figlet"));
 
 // package.json
-var version = "2.0.0-rc.1";
+var version = "2.0.1-beta.1";
 
 // bin/upload.ts
 var import_path7 = __toESM(require("path"));
@@ -7113,14 +7113,6 @@ var ENV_URLS = {
 };
 async function loginCmd(options = {}) {
   try {
-    const existingAuth = getAuthConfig2();
-    if (existingAuth) {
-      console.log(import_chalk15.default.yellow("Already logged in"));
-      console.log(import_chalk15.default.gray(`   Address: ${existingAuth.address}`));
-      console.log(import_chalk15.default.gray("   To re-login, please run: pinme logout\n"));
-      process.exit(0);
-      return;
-    }
     let webBaseUrl;
     const env = (options.env || "prod").toLowerCase();
     if (ENV_URLS[env]) {
@@ -7308,6 +7300,7 @@ var API_BASE = "https://pinme.dev/api/v4";
 var TEMPLATE_REPO = "glitternetwork/pinme-worker-template";
 var TEMPLATE_ZIP_URL = `https://github.com/${TEMPLATE_REPO}/archive/refs/heads/main.zip`;
 async function createCmd(options) {
+  var _a, _b;
   try {
     const headers = getAuthHeaders();
     if (!headers["authentication-tokens"] || !headers["token-address"]) {
@@ -7378,7 +7371,6 @@ Directory "${projectName}" already exists.`));
       console.log(import_chalk17.default.gray(`   API Response: ${JSON.stringify(workerData)}`));
       console.log(import_chalk17.default.green(`   API Domain: ${workerData.api_domain}`));
       console.log(import_chalk17.default.green(`   Project Name: ${workerData.project_name}`));
-      console.log(import_chalk17.default.green(`   D1 UUID: ${workerData.uuid}`));
     } catch (error) {
       throw createApiError("project creation", error, [
         `Project name: ${normalizedProjectName}`,
@@ -7418,6 +7410,24 @@ Directory "${projectName}" already exists.`));
         import_fs_extra6.default.removeSync(subDir);
       }
       import_fs_extra6.default.removeSync(zipPath);
+      const nodeModulesPath = import_path11.default.join(targetDir, "node_modules");
+      const packageLockPath = import_path11.default.join(targetDir, "package-lock.json");
+      if (import_fs_extra6.default.existsSync(nodeModulesPath)) {
+        console.log(import_chalk17.default.gray("   Removing existing node_modules..."));
+        import_fs_extra6.default.removeSync(nodeModulesPath);
+      }
+      if (import_fs_extra6.default.existsSync(packageLockPath)) {
+        console.log(import_chalk17.default.gray("   Removing existing package-lock.json..."));
+        import_fs_extra6.default.removeSync(packageLockPath);
+      }
+      const frontendNodeModules = import_path11.default.join(targetDir, "frontend", "node_modules");
+      const backendNodeModules = import_path11.default.join(targetDir, "backend", "node_modules");
+      const frontendPackageLock = import_path11.default.join(targetDir, "frontend", "package-lock.json");
+      const backendPackageLock = import_path11.default.join(targetDir, "backend", "package-lock.json");
+      if (import_fs_extra6.default.existsSync(frontendNodeModules)) import_fs_extra6.default.removeSync(frontendNodeModules);
+      if (import_fs_extra6.default.existsSync(backendNodeModules)) import_fs_extra6.default.removeSync(backendNodeModules);
+      if (import_fs_extra6.default.existsSync(frontendPackageLock)) import_fs_extra6.default.removeSync(frontendPackageLock);
+      if (import_fs_extra6.default.existsSync(backendPackageLock)) import_fs_extra6.default.removeSync(backendPackageLock);
       console.log(import_chalk17.default.green(`   Template downloaded to: ${targetDir}`));
     } catch (error) {
       throw createCommandError("template extraction", `unzip -o "${zipPath}" -d "${PROJECT_DIR}"`, error, [
@@ -7466,7 +7476,7 @@ Directory "${projectName}" already exists.`));
       import_fs_extra6.default.writeFileSync(envPath, envContent);
       console.log(import_chalk17.default.green(`   Created frontend/.env file`));
     }
-    console.log(import_chalk17.default.blue("\n4. Building frontend..."));
+    console.log(import_chalk17.default.blue("\n4. Installing dependencies..."));
     try {
       (0, import_child_process2.execSync)("npm install", {
         cwd: targetDir,
@@ -7474,11 +7484,135 @@ Directory "${projectName}" already exists.`));
       });
       console.log(import_chalk17.default.green("   Project dependencies installed"));
     } catch (error) {
+      const errorMsg = error.message || "";
+      if (errorMsg.includes("EACCES") || errorMsg.includes("EPERM") || errorMsg.includes("permission denied")) {
+        throw createCommandError("project dependency install", "npm install", error, [
+          "Permission error detected. Here are some solutions:",
+          "",
+          "Option 1: Fix npm permissions (Recommended)",
+          "  mkdir -p ~/.npm-global",
+          "  npm config set prefix ~/.npm-global",
+          "  Then add ~/.npm-global/bin to your PATH in ~/.bashrc or ~/.zshrc",
+          "",
+          "Option 2: Use npx to avoid global installs",
+          "  npx npm install",
+          "",
+          "Option 3: Check if you have write permissions",
+          "  ls -la " + targetDir,
+          "",
+          "For more help: https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally"
+        ]);
+      }
+      if (errorMsg.includes("ENOTFOUND") || errorMsg.includes("ETIMEDOUT") || errorMsg.includes("network")) {
+        throw createCommandError("project dependency install", "npm install", error, [
+          "Network error detected. Please check:",
+          "  1. Internet connection is available",
+          "  2. npm registry is accessible (https://registry.npmjs.org)",
+          "  3. Try using a mirror: npm config set registry https://registry.npmmirror.com"
+        ]);
+      }
       throw createCommandError("project dependency install", "npm install", error, [
+        "Dependency installation failed.",
         "Check network connectivity and npm registry availability.",
-        "Inspect the generated workspace `package.json` files for dependency conflicts."
+        "Inspect the generated workspace `package.json` files for dependency conflicts.",
+        "",
+        "If this is a permission issue, try:",
+        "  sudo chown -R $(whoami) ~/.npm",
+        "  sudo chown -R $(whoami) " + targetDir + "/node_modules"
       ]);
     }
+    console.log(import_chalk17.default.blue("\n5. Building backend worker..."));
+    try {
+      (0, import_child_process2.execSync)("npm run build:worker", {
+        cwd: targetDir,
+        stdio: "inherit"
+      });
+      console.log(import_chalk17.default.green("   Worker built"));
+    } catch (error) {
+      throw createCommandError("worker build", "npm run build:worker", error, [
+        "Fix the build error shown above, then rerun `pinme create`."
+      ]);
+    }
+    const distWorkerDir = import_path11.default.join(targetDir, "dist-worker");
+    const workerJsPath = import_path11.default.join(distWorkerDir, "worker.js");
+    if (!import_fs_extra6.default.existsSync(distWorkerDir) || !import_fs_extra6.default.existsSync(workerJsPath)) {
+      throw createConfigError("Built worker output not found: `dist-worker/worker.js`.", [
+        "Make sure `npm run build:worker` completed successfully."
+      ]);
+    }
+    const modulePaths = [];
+    const files = import_fs_extra6.default.readdirSync(distWorkerDir);
+    for (const file of files) {
+      if (file.endsWith(".js") && file !== "worker.js") {
+        modulePaths.push(import_path11.default.join(distWorkerDir, file));
+      }
+    }
+    const sqlDir = import_path11.default.join(targetDir, "db");
+    const sqlFiles = [];
+    if (import_fs_extra6.default.existsSync(sqlDir)) {
+      const sqlFileNames = import_fs_extra6.default.readdirSync(sqlDir).filter((f) => f.endsWith(".sql")).sort();
+      for (const filename of sqlFileNames) {
+        sqlFiles.push(import_path11.default.join(sqlDir, filename));
+        console.log(import_chalk17.default.gray(`   Including SQL: ${filename}`));
+      }
+    }
+    console.log(import_chalk17.default.blue("\n6. Deploying backend worker..."));
+    const saveApiUrl = `${API_BASE}/save_worker?project_name=${encodeURIComponent(workerData.project_name)}`;
+    console.log(import_chalk17.default.gray(`   API URL: ${saveApiUrl}`));
+    try {
+      const FormData4 = (await import("formdata-node")).FormData;
+      const Blob2 = (await import("formdata-node")).Blob;
+      const formData = new FormData4();
+      const metadataContent = typeof workerData.metadata === "string" ? workerData.metadata : JSON.stringify(workerData.metadata, null, 2);
+      formData.append("metadata", new Blob2([metadataContent], {
+        type: "application/json"
+      }), "metadata.json");
+      const workerCode = import_fs_extra6.default.readFileSync(workerJsPath, "utf-8");
+      formData.append("worker.js", new Blob2([workerCode], {
+        type: "application/javascript+module"
+      }), "worker.js");
+      for (const modulePath of modulePaths) {
+        const filename = import_path11.default.basename(modulePath);
+        const content = import_fs_extra6.default.readFileSync(modulePath, "utf-8");
+        formData.append(filename, new Blob2([content], {
+          type: "application/javascript+module"
+        }), filename);
+      }
+      for (const sqlFile of sqlFiles) {
+        const filename = import_path11.default.basename(sqlFile);
+        const content = import_fs_extra6.default.readFileSync(sqlFile, "utf-8");
+        formData.append("sql_file", new Blob2([content], {
+          type: "application/sql"
+        }), filename);
+      }
+      const response = await axios_default.put(saveApiUrl, formData, {
+        headers: { ...headers },
+        timeout: 12e4
+      });
+      if (response.data) {
+        console.log(import_chalk17.default.green("   Worker deployed"));
+        if ((_b = (_a = response.data) == null ? void 0 : _a.data) == null ? void 0 : _b.sql_results) {
+          for (const result of response.data.data.sql_results) {
+            console.log(import_chalk17.default.gray(`   SQL ${result.filename}: ${result.status}`));
+          }
+        }
+      } else {
+        throw createApiError("worker save", { response: { data: response.data } }, [
+          `Project: ${workerData.project_name}`,
+          `Endpoint: ${saveApiUrl}`
+        ], [
+          "Verify the project exists and your account has permission to update it."
+        ]);
+      }
+    } catch (error) {
+      throw createApiError("worker save", error, [
+        `Project: ${workerData.project_name}`,
+        `Endpoint: ${saveApiUrl}`
+      ], [
+        "Check whether backend metadata, SQL files, or worker bundle contains invalid content."
+      ]);
+    }
+    console.log(import_chalk17.default.blue("\n7. Building frontend..."));
     const frontendDir = import_path11.default.join(targetDir, "frontend");
     if (import_fs_extra6.default.existsSync(frontendDir)) {
       try {
@@ -7493,16 +7627,40 @@ Directory "${projectName}" already exists.`));
         ]);
       }
       console.log(import_chalk17.default.blue("   Uploading to IPFS..."));
+      let frontendUrl = "";
       try {
-        (0, import_child_process2.execSync)("pinme upload ./dist", {
+        const uploadOutput = (0, import_child_process2.execSync)("pinme upload ./dist", {
           cwd: frontendDir,
-          stdio: "inherit",
+          encoding: "utf-8",
           env: {
             ...process.env,
             PINME_PROJECT_NAME: workerData.project_name
           }
         });
-        console.log(import_chalk17.default.green("   Frontend uploaded to IPFS"));
+        console.log(uploadOutput);
+        const urlMatch = uploadOutput.match(/https:\/\/[\w-]+\.pinme\.dev/);
+        if (urlMatch) {
+          frontendUrl = urlMatch[0];
+          console.log(import_chalk17.default.green(`   Frontend uploaded to IPFS: ${frontendUrl}`));
+          const configPath2 = import_path11.default.join(targetDir, "pinme.toml");
+          let config2 = import_fs_extra6.default.readFileSync(configPath2, "utf-8");
+          if (config2.includes("frontend_url")) {
+            config2 = config2.replace(
+              /frontend_url\s*=\s*"[^"]*"/,
+              `frontend_url = "${frontendUrl}"`
+            );
+          } else {
+            config2 = config2.replace(
+              /(project_name\s*=\s*"[^"]*"\n)/,
+              `$1frontend_url = "${frontendUrl}"
+`
+            );
+          }
+          import_fs_extra6.default.writeFileSync(configPath2, config2);
+          console.log(import_chalk17.default.green("   Updated pinme.toml with frontend URL"));
+        } else {
+          console.log(import_chalk17.default.green("   Frontend uploaded to IPFS"));
+        }
       } catch (error) {
         console.log(import_chalk17.default.yellow("   Warning: IPFS upload failed, you can upload manually later"));
       }
@@ -7575,9 +7733,41 @@ function installDependencies() {
     });
     console.log(import_chalk18.default.green("Project dependencies installed"));
   } catch (error) {
+    const errorMsg = error.message || "";
+    if (errorMsg.includes("EACCES") || errorMsg.includes("EPERM") || errorMsg.includes("permission denied")) {
+      throw createCommandError("project dependency install", "npm install", error, [
+        "Permission error detected. Here are some solutions:",
+        "",
+        "Option 1: Fix npm permissions (Recommended)",
+        "  mkdir -p ~/.npm-global",
+        "  npm config set prefix ~/.npm-global",
+        "  Then add ~/.npm-global/bin to your PATH in ~/.bashrc or ~/.zshrc",
+        "",
+        "Option 2: Use npx to avoid global installs",
+        "  npx npm install",
+        "",
+        "Option 3: Check if you have write permissions",
+        "  ls -la " + PROJECT_DIR2,
+        "",
+        "For more help: https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally"
+      ]);
+    }
+    if (errorMsg.includes("ENOTFOUND") || errorMsg.includes("ETIMEDOUT") || errorMsg.includes("network")) {
+      throw createCommandError("project dependency install", "npm install", error, [
+        "Network error detected. Please check:",
+        "  1. Internet connection is available",
+        "  2. npm registry is accessible (https://registry.npmjs.org)",
+        "  3. Try using a mirror: npm config set registry https://registry.npmmirror.com"
+      ]);
+    }
     throw createCommandError("project dependency install", "npm install", error, [
+      "Dependency installation failed.",
       "Check network connectivity and npm registry availability.",
-      "If `package-lock.json` is stale or conflicted, resolve that before retrying."
+      "If `package-lock.json` is stale or conflicted, resolve that before retrying.",
+      "",
+      "If this is a permission issue, try:",
+      "  sudo chown -R $(whoami) ~/.npm",
+      "  sudo chown -R $(whoami) " + PROJECT_DIR2 + "/node_modules"
     ]);
   }
 }
@@ -7694,15 +7884,38 @@ function buildFrontend() {
 function deployFrontend(projectName) {
   console.log(import_chalk18.default.blue("Deploying frontend to IPFS..."));
   try {
-    (0, import_child_process3.execSync)("pinme upload ./frontend/dist", {
+    const uploadOutput = (0, import_child_process3.execSync)("pinme upload ./frontend/dist", {
       cwd: PROJECT_DIR2,
-      stdio: "inherit",
+      encoding: "utf-8",
       env: {
         ...process.env,
         PINME_PROJECT_NAME: projectName
       }
     });
-    console.log(import_chalk18.default.green("Frontend deployed to IPFS"));
+    console.log(uploadOutput);
+    const urlMatch = uploadOutput.match(/https:\/\/[\w-]+\.pinme\.dev/);
+    if (urlMatch) {
+      const frontendUrl = urlMatch[0];
+      console.log(import_chalk18.default.green(`Frontend deployed to IPFS: ${frontendUrl}`));
+      const configPath = import_path12.default.join(PROJECT_DIR2, "pinme.toml");
+      let config = import_fs_extra7.default.readFileSync(configPath, "utf-8");
+      if (config.includes("frontend_url")) {
+        config = config.replace(
+          /frontend_url\s*=\s*"[^"]*"/,
+          `frontend_url = "${frontendUrl}"`
+        );
+      } else {
+        config = config.replace(
+          /(project_name\s*=\s*"[^"]*"\n)/,
+          `$1frontend_url = "${frontendUrl}"
+`
+        );
+      }
+      import_fs_extra7.default.writeFileSync(configPath, config);
+      console.log(import_chalk18.default.green("Updated pinme.toml with frontend URL"));
+    } else {
+      console.log(import_chalk18.default.green("Frontend deployed to IPFS"));
+    }
   } catch (error) {
     throw createCommandError("frontend deploy", "pinme upload ./frontend/dist", error, [
       "Make sure `frontend/dist` exists and `pinme upload` works in this environment."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinme",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.1-beta.1",
   "publishConfig": {
     "access": "public"
   },