pinme 2.0.2-beta.0 → 2.0.2-beta.1

package/dist/index.js

@@ -1775,7 +1775,7 @@ var import_chalk24 = __toESM(require("chalk"));
 var import_figlet5 = __toESM(require("figlet"));
 
 // package.json
-var version = "2.0.2-beta.0";
+var version = "2.0.2-beta.1";
 
 // bin/upload.ts
 var import_path7 = __toESM(require("path"));
@@ -8499,8 +8499,43 @@ Error: ${cliError.message}`));
 // bin/create.ts
 var PROJECT_DIR = process.cwd();
 var API_BASE = "https://pinme.benny1996.win/api/v4";
+var TEMPLATE_BRANCH = "feat/auth";
 var TEMPLATE_REPO = "glitternetwork/pinme-worker-template";
-var TEMPLATE_ZIP_URL = `https://github.com/${TEMPLATE_REPO}/archive/refs/heads/main.zip`;
+var TEMPLATE_REPO_NAME = TEMPLATE_REPO.split("/").pop() || "pinme-worker-template";
+function getTemplateZipUrl(branch) {
+  return `https://github.com/${TEMPLATE_REPO}/archive/refs/heads/${encodeURIComponent(branch)}.zip`;
+}
+function buildAuthConfigExport(authConfig) {
+  return `export const auth_config = ${JSON.stringify(authConfig, null, 2)};
+`;
+}
+function injectAuthConfigIntoFile(fileContent, authConfig) {
+  const authConfigExport = buildAuthConfigExport(authConfig).trimEnd();
+  const authConfigPattern = /export\s+const\s+auth_config\s*=\s*\{[\s\S]*?\};?/m;
+  if (authConfigPattern.test(fileContent)) {
+    return fileContent.replace(authConfigPattern, authConfigExport);
+  }
+  const trimmed = fileContent.trimEnd();
+  if (!trimmed) {
+    return `${authConfigExport}
+`;
+  }
+  return `${trimmed}
+
+${authConfigExport}
+`;
+}
+function resolveExtractedTemplateDir(extractDir) {
+  const entries = import_fs_extra7.default.readdirSync(extractDir, { withFileTypes: true });
+  const templateDir = entries.find((entry) => entry.isDirectory() && entry.name.startsWith(`${TEMPLATE_REPO_NAME}-`));
+  if (!templateDir) {
+    throw createConfigError("Downloaded template archive structure is invalid.", [
+      `Expected a directory starting with \`${TEMPLATE_REPO_NAME}-\` inside the extracted archive.`,
+      `Template branch: ${TEMPLATE_BRANCH}`
+    ]);
+  }
+  return import_path12.default.join(extractDir, templateDir.name);
+}
 async function createCmd(options) {
   var _a, _b;
   try {
@@ -8581,11 +8616,14 @@ Directory "${projectName}" already exists.`));
     }
     console.log(import_chalk18.default.blue("\n2. Downloading template from repository..."));
     const zipPath = import_path12.default.join(PROJECT_DIR, "template.zip");
+    const extractDir = import_path12.default.join(PROJECT_DIR, `.pinme-template-${Date.now()}`);
+    const templateZipUrl = getTemplateZipUrl(TEMPLATE_BRANCH);
     let downloadSuccess = false;
+    console.log(import_chalk18.default.gray(`   Template branch: ${TEMPLATE_BRANCH}`));
     for (let attempt = 1; attempt <= 3 && !downloadSuccess; attempt++) {
       try {
         console.log(import_chalk18.default.gray(`   Download attempt ${attempt}/3...`));
-        (0, import_child_process3.execSync)(`curl -L --retry 3 --retry-delay 2 -o "${zipPath}" "${TEMPLATE_ZIP_URL}"`, {
+        (0, import_child_process3.execSync)(`curl -L --retry 3 --retry-delay 2 -o "${zipPath}" "${templateZipUrl}"`, {
           stdio: "inherit"
         });
         if (!import_fs_extra7.default.existsSync(zipPath) || import_fs_extra7.default.statSync(zipPath).size < 100) {
@@ -8603,15 +8641,14 @@ Directory "${projectName}" already exists.`));
       }
     }
     try {
-      (0, import_child_process3.execSync)(`unzip -o "${zipPath}" -d "${PROJECT_DIR}"`, {
+      import_fs_extra7.default.ensureDirSync(extractDir);
+      (0, import_child_process3.execSync)(`unzip -o "${zipPath}" -d "${extractDir}"`, {
         stdio: "inherit"
       });
-      const subDir = import_path12.default.join(PROJECT_DIR, "pinme-worker-template-main");
-      if (import_fs_extra7.default.existsSync(subDir)) {
-        import_fs_extra7.default.copySync(subDir, targetDir);
-        import_fs_extra7.default.removeSync(subDir);
-      }
+      const subDir = resolveExtractedTemplateDir(extractDir);
+      import_fs_extra7.default.copySync(subDir, targetDir);
       import_fs_extra7.default.removeSync(zipPath);
+      import_fs_extra7.default.removeSync(extractDir);
       const nodeModulesPath = import_path12.default.join(targetDir, "node_modules");
       const packageLockPath = import_path12.default.join(targetDir, "package-lock.json");
       if (import_fs_extra7.default.existsSync(nodeModulesPath)) {
@@ -8665,6 +8702,16 @@ Directory "${projectName}" already exists.`));
       import_fs_extra7.default.writeFileSync(wranglerPath, wranglerContent);
       console.log(import_chalk18.default.green(`   Updated backend/wrangler.toml API_KEY`));
     }
+    const frontendConfigPath = import_path12.default.join(targetDir, "frontend", "src", "utils", "config.ts");
+    if (workerData.auth_config) {
+      const frontendConfigContent = import_fs_extra7.default.existsSync(frontendConfigPath) ? import_fs_extra7.default.readFileSync(frontendConfigPath, "utf-8") : "";
+      import_fs_extra7.default.ensureDirSync(import_path12.default.dirname(frontendConfigPath));
+      import_fs_extra7.default.writeFileSync(
+        frontendConfigPath,
+        injectAuthConfigIntoFile(frontendConfigContent, workerData.auth_config)
+      );
+      console.log(import_chalk18.default.green(`   Updated frontend/src/utils/config.ts auth_config`));
+    }
     const envExamplePath = import_path12.default.join(targetDir, "frontend", ".env.example");
     const envPath = import_path12.default.join(targetDir, "frontend", ".env");
     if (import_fs_extra7.default.existsSync(envExamplePath)) {

package/package.json

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