pinme 2.0.0-beta.6 → 2.0.0-beta.8

package/dist/index.js

@@ -1523,7 +1523,7 @@ var import_chalk22 = __toESM(require("chalk"));
 var import_figlet5 = __toESM(require("figlet"));
 
 // package.json
-var version = "2.0.0-beta.6";
+var version = "2.0.0-beta.8";
 
 // bin/upload.ts
 var import_path7 = __toESM(require("path"));
@@ -7112,7 +7112,8 @@ var import_inquirer8 = __toESM(require("inquirer"));
 var import_child_process2 = require("child_process");
 var PROJECT_DIR = process.cwd();
 var API_BASE = "https://pinme.dev/api/v4";
-var TEMPLATE_REPO = "https://github.com/glitternetwork/pinme-worker-template.git";
+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, _c, _d, _e, _f;
   try {
@@ -7188,19 +7189,42 @@ Directory "${projectName}" already exists.`));
       const errorMsg = ((_d = (_c = (_b = error.response) == null ? void 0 : _b.data) == null ? void 0 : _c.data) == null ? void 0 : _d.error) || ((_f = (_e = error.response) == null ? void 0 : _e.data) == null ? void 0 : _f.msg) || error.message || "Failed to create worker";
       throw new Error(errorMsg);
     }
-    console.log(import_chalk16.default.blue("\n2. Cloning template from repository..."));
+    console.log(import_chalk16.default.blue("\n2. Downloading template from repository..."));
+    const zipPath = import_path11.default.join(PROJECT_DIR, "template.zip");
+    let downloadSuccess = false;
+    for (let attempt = 1; attempt <= 3 && !downloadSuccess; attempt++) {
+      try {
+        console.log(import_chalk16.default.gray(`   Download attempt ${attempt}/3...`));
+        (0, import_child_process2.execSync)(`curl -L --retry 3 --retry-delay 2 -o "${zipPath}" "${TEMPLATE_ZIP_URL}"`, {
+          stdio: "inherit"
+        });
+        if (!import_fs_extra6.default.existsSync(zipPath) || import_fs_extra6.default.statSync(zipPath).size < 100) {
+          throw new Error("Downloaded file is too small or empty");
+        }
+        downloadSuccess = true;
+      } catch (downloadError) {
+        console.log(import_chalk16.default.yellow(`   Attempt ${attempt} failed: ${downloadError.message}`));
+        if (import_fs_extra6.default.existsSync(zipPath)) {
+          import_fs_extra6.default.removeSync(zipPath);
+        }
+        if (attempt === 3) {
+          throw new Error(`Failed to download template after 3 attempts: ${downloadError.message}`);
+        }
+      }
+    }
     try {
-      (0, import_child_process2.execSync)(`git clone --depth 1 ${TEMPLATE_REPO} ${targetDir}`, {
+      (0, import_child_process2.execSync)(`unzip -o "${zipPath}" -d "${PROJECT_DIR}"`, {
         stdio: "inherit"
       });
-      console.log(import_chalk16.default.green(`   Template cloned to: ${targetDir}`));
-      const gitDir = import_path11.default.join(targetDir, ".git");
-      if (import_fs_extra6.default.existsSync(gitDir)) {
-        import_fs_extra6.default.removeSync(gitDir);
-        console.log(import_chalk16.default.gray("   .git directory removed"));
+      const subDir = import_path11.default.join(PROJECT_DIR, "pinme-worker-template-main");
+      if (import_fs_extra6.default.existsSync(subDir)) {
+        import_fs_extra6.default.copySync(subDir, targetDir);
+        import_fs_extra6.default.removeSync(subDir);
       }
+      import_fs_extra6.default.removeSync(zipPath);
+      console.log(import_chalk16.default.green(`   Template downloaded to: ${targetDir}`));
     } catch (error) {
-      throw new Error(`Failed to clone template: ${error.message}`);
+      throw new Error(`Failed to extract template: ${error.message}`);
     }
     console.log(import_chalk16.default.blue("\n3. Updating configuration..."));
     const configPath = import_path11.default.join(targetDir, "pinme.toml");
@@ -7209,29 +7233,6 @@ Directory "${projectName}" already exists.`));
       /project_name = ".*"/,
       `project_name = "${workerData.project_name}"`
     );
-    updatedConfig = updatedConfig.replace(
-      /^VITE_WORKER_URL = ".*"$/m,
-      `VITE_WORKER_URL = "${workerData.api_domain}"`
-    );
-    updatedConfig = updatedConfig.replace(
-      /# database_id = ".*"/,
-      `database_id = "${workerData.uuid}"`
-    );
-    if (workerData.api_key) {
-      console.log(import_chalk16.default.gray(`   API Key: ${workerData.api_key.slice(0, 8)}...`));
-      updatedConfig = updatedConfig.replace(
-        /^# api_key = ".*"$/m,
-        `api_key = "${workerData.api_key}"`
-      );
-      if (!updatedConfig.includes(`api_key = "${workerData.api_key}"`)) {
-        updatedConfig = updatedConfig.replace(
-          /^api_key = ".*"$/m,
-          `api_key = "${workerData.api_key}"`
-        );
-      }
-    } else {
-      console.log(import_chalk16.default.yellow("   Warning: No API Key returned from API"));
-    }
     import_fs_extra6.default.writeFileSync(configPath, updatedConfig);
     console.log(import_chalk16.default.green(`   Updated pinme.toml`));
     console.log(import_chalk16.default.gray(`   metadata: ${workerData.metadata}`));
@@ -7249,8 +7250,8 @@ Directory "${projectName}" already exists.`));
     if (import_fs_extra6.default.existsSync(wranglerPath) && workerData.api_key) {
       let wranglerContent = import_fs_extra6.default.readFileSync(wranglerPath, "utf-8");
       wranglerContent = wranglerContent.replace(
-        /^API_KEY = ".*"$/m,
-        `API_KEY = "${workerData.api_key}"`
+        /^name = ".*"$/m,
+        `name = "${workerData.project_name}"`
       );
       import_fs_extra6.default.writeFileSync(wranglerPath, wranglerContent);
       console.log(import_chalk16.default.green(`   Updated backend/wrangler.toml API_KEY`));
@@ -7260,18 +7261,10 @@ Directory "${projectName}" already exists.`));
     if (import_fs_extra6.default.existsSync(envExamplePath)) {
       let envContent = import_fs_extra6.default.readFileSync(envExamplePath, "utf-8");
       envContent = envContent.replace(/your-project/g, workerData.project_name);
-      envContent = envContent.replace(
-        /^VITE_WORKER_URL=.*$/m,
-        `VITE_WORKER_URL=${workerData.api_domain}`
-      );
       envContent = envContent.replace(
         /^VITE_API_URL=.*$/m,
         `VITE_API_URL=${workerData.api_domain}`
       );
-      envContent = envContent.replace(
-        /^VITE_API_URL=.*$/m,
-        `VITE_API_KEY=${workerData.api_key}`
-      );
       import_fs_extra6.default.writeFileSync(envPath, envContent);
       console.log(import_chalk16.default.green(`   Created frontend/.env file`));
     }

package/package.json

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