@srouter/cli 0.1.3-rc.1 → 0.1.3-rc.3

package/bin/srouter.js

@@ -2,48 +2,14 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { spawn } from "node:child_process";
-import { createRequire } from "node:module";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const distEntry = path.join(__dirname, "../dist/index.js");
-const srcEntry = path.join(__dirname, "../src/index.ts");
 
 if (fs.existsSync(distEntry)) {
     await import("../dist/index.js");
 } else {
-    const require = createRequire(import.meta.url);
-    let tsxCli = "";
-    try {
-        const tsxPkg = require.resolve("tsx/package.json");
-        const distCli = path.join(path.dirname(tsxPkg), "dist/cli.mjs");
-        if (fs.existsSync(distCli)) {
-            tsxCli = distCli;
-        }
-    } catch {
-        const localBin = path.join(__dirname, "../node_modules/.bin/tsx");
-        if (fs.existsSync(localBin)) {
-            tsxCli = localBin;
-        }
-    }
-
-    if (tsxCli && fs.existsSync(tsxCli)) {
-        const child = spawn(process.execPath, [tsxCli, srcEntry, ...process.argv.slice(2)], {
-            stdio: "inherit"
-        });
-        child.on("exit", (code) => {
-            process.exit(code ?? 0);
-        });
-    } else {
-        const child = spawn(
-            "pnpm",
-            ["--filter", "@srouter/cli", "exec", "tsx", srcEntry, ...process.argv.slice(2)],
-            {
-                stdio: "inherit"
-            }
-        );
-        child.on("exit", (code) => {
-            process.exit(code ?? 0);
-        });
-    }
+    console.error("Error: @srouter/cli distribution entry not found at " + distEntry);
+    process.exit(1);
 }
+

package/dist/index.js

@@ -2307,6 +2307,56 @@ function backupDb(source, label) {
   p.log.step(`Backed up to ${pc.dim(backupPath)}`);
   return backupPath;
 }
+function getDownloadDirs() {
+  const home = os5.homedir();
+  const dirs = [
+    path6.join(home, "Downloads"),
+    path6.join(home, "download"),
+    path6.join(home, "downloads"),
+    path6.join(home, "Desktop")
+  ];
+  if (process.platform === "win32") {
+    if (process.env.USERPROFILE) {
+      dirs.push(path6.join(process.env.USERPROFILE, "Downloads"));
+      dirs.push(path6.join(process.env.USERPROFILE, "Desktop"));
+    }
+  }
+  return Array.from(new Set(dirs.filter((d) => fs6.existsSync(d))));
+}
+function scanFor9RouterFiles() {
+  const results = [];
+  const seen = /* @__PURE__ */ new Set();
+  const addFile = (filePath, label) => {
+    const resolved = path6.resolve(filePath);
+    if (!seen.has(resolved) && fs6.existsSync(resolved)) {
+      try {
+        const stat = fs6.statSync(resolved);
+        if (stat.isFile()) {
+          seen.add(resolved);
+          results.push({ path: resolved, label, mtime: stat.mtimeMs });
+        }
+      } catch {
+      }
+    }
+  };
+  for (const loc of NineRouterDbLocations) {
+    addFile(loc, "Installed Database");
+  }
+  for (const downloadDir of getDownloadDirs()) {
+    try {
+      const files = fs6.readdirSync(downloadDir);
+      for (const file of files) {
+        const lower = file.toLowerCase();
+        const fullPath = path6.join(downloadDir, file);
+        if (lower.includes("9router") || lower.includes("srouter-backup") || lower.endsWith(".db") || lower.endsWith(".json") && lower.includes("backup")) {
+          addFile(fullPath, path6.basename(downloadDir));
+        }
+      }
+    } catch {
+    }
+  }
+  return results.sort((a, b) => b.mtime - a.mtime);
+}
 function findDatabase(candidates, label) {
   for (const candidate of candidates) {
     const fullPath = path6.resolve(candidate);
@@ -2351,11 +2401,56 @@ async function migrateDb(options) {
 }
 async function migrateNineRouter(options) {
   p.intro("9Router \u2192 SRouter Database Migration");
-  const source = options.source && fs6.existsSync(options.source) ? path6.resolve(options.source) : findDatabase(NineRouterDbLocations, "9Router");
+  let source = options.source && fs6.existsSync(options.source) ? path6.resolve(options.source) : null;
+  if (!source) {
+    const foundFiles = scanFor9RouterFiles();
+    if (foundFiles.length === 1) {
+      source = foundFiles[0].path;
+      p.log.info(`Found 9Router file: ${pc.bold(source)} (${fileKb(source)}) [${foundFiles[0].label}]`);
+    } else if (foundFiles.length > 1) {
+      if (options.yes) {
+        source = foundFiles[0].path;
+        p.log.info(`Auto-selected latest 9Router file: ${pc.bold(source)} (${fileKb(source)})`);
+      } else {
+        const choice = await p.select({
+          message: "Multiple 9Router database/backup files found. Select one to migrate:",
+          options: [
+            ...foundFiles.map((f) => ({
+              value: f.path,
+              label: `${path6.basename(f.path)} (${fileKb(f.path)})`,
+              hint: `${f.label} \u2022 ${f.path}`
+            })),
+            { value: "custom", label: "Enter custom path manually..." }
+          ]
+        });
+        if (p.isCancel(choice)) {
+          p.outro("Migration cancelled.");
+          return;
+        }
+        if (choice === "custom") {
+          const customPath = await p.text({
+            message: "Enter path to 9Router .db or .json backup file:",
+            validate: (val) => {
+              if (!val || !fs6.existsSync(path6.resolve(val))) {
+                return "File does not exist. Please check the path.";
+              }
+            }
+          });
+          if (p.isCancel(customPath) || !customPath) {
+            p.outro("Migration cancelled.");
+            return;
+          }
+          source = path6.resolve(customPath);
+        } else {
+          source = choice;
+        }
+      }
+    }
+  }
   if (!source) {
-    p.log.error("No 9Router database found.");
+    p.log.error("No 9Router database or backup file found.");
     p.outro(
-      "Pass the location explicitly: srouter migrate 9router --source /path/to/9router.db"
+      "Pass the location explicitly: srouter migrate 9router --source /path/to/9router-backup.json"
     );
     process.exitCode = 1;
     return;
@@ -2566,10 +2661,14 @@ function createCli() {
   });
   return program;
 }
-if (process.argv[1]?.endsWith("srouter.js") || process.argv[1]?.endsWith("index.ts") || process.argv[1]?.endsWith("index.js")) {
-  const program = createCli();
-  program.parse(process.argv);
+function runCli() {
+  const isEntrypoint = process.argv[1]?.endsWith("srouter.js") || process.argv[1]?.endsWith("index.js") || process.argv[1]?.endsWith("index.ts") || process.argv[1]?.includes("/.bin/srouter") || process.argv[1]?.includes("/bin/srouter");
+  if (isEntrypoint) {
+    const program = createCli();
+    program.parse(process.argv);
+  }
 }
+runCli();
 export {
   createCli
 };