@shiplens/cli 1.2.9 → 1.3.0

package/lib/commands/init.js

@@ -44,13 +44,21 @@ async function handleInit(args, flags, ctx) {
       ctx.output(result);
       process.exitCode = 1;
       return;
+    } else if (!process.stdin.isTTY) {
+      console.log(`\n⚠️  Existing Shiplens project detected!`);
+      console.log(`📌 App ID: ${existing.app_id} (Source: ${existing.source_file})`);
+      console.log(`📊 Dashboard: ${ctx.client.baseURL}/dashboard/${existing.app_id}`);
+      console.log(`🛑 Non-interactive terminal detected (CI/Agent). Existing configuration preserved.`);
+      console.log(`💡 To overwrite and create a new project, run with --force:`);
+      console.log(`   npx @shiplens/cli init --force\n`);
+      return;
     } else {
       console.log(`\n⚠️  Existing Shiplens project detected!`);
       console.log(`📌 App ID: ${existing.app_id} (Source: ${existing.source_file})`);
       console.log(`📊 Dashboard: ${ctx.client.baseURL}/dashboard/${existing.app_id}`);
       console.log(`\n💡 Option 1 [Recommended]: Keep existing setup and reuse App ID.`);
       console.log(`💡 Option 2: Run with --force to overwrite and create a new project:`);
-      console.log(`   npx shiplens-cli init --force\n`);
+      console.log(`   npx @shiplens/cli init --force\n`);
 
       const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
       const confirmed = await new Promise((resolve) => {
@@ -124,9 +132,9 @@ async function handleInit(args, flags, ctx) {
   // 6. Install SDK dependency
   let installResult = { success: true, manager: 'skipped' };
   if (!flags['no-install'] && detected.package_manager) {
-    installResult = installSDKDependency(wd, detected.package_manager);
+    installResult = await installSDKDependency(wd, detected.package_manager);
     if (!installResult.success) {
-      const errMsg = `SDK installation failed: Unable to download @shiplens/sdk from official npm registry, Alibaba Cloud mirror (npmmirror), GitHub mirror, or Shiplens CDN mirror (after 5s x 2 retries on each tier).\n` +
+      const errMsg = `SDK installation failed: Unable to download @shiplens/sdk across all download sources (official npm registry, Alibaba Cloud npmmirror, GitHub mirror, and Shiplens CDN mirror).\n` +
         `Troubleshooting steps:\n` +
         `  1. Check your local network connection or HTTP proxy / VPN settings;\n` +
         `  2. Try running manually with Alibaba mirror: npm install @shiplens/sdk --registry=https://registry.npmmirror.com;\n` +

package/lib/injector.js

@@ -1,10 +1,11 @@
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
+const { execSync, spawn } = require('child_process');
 
 const FRAMEWORKS = {
   NEXT_APP: 'nextjs-app',
   NEXT_PAGES: 'nextjs-pages',
+  CRA: 'cra',
   VITE: 'vite',
   VUE: 'vue',
   HTML: 'html',
@@ -57,6 +58,8 @@ function detectProject(dir = process.cwd()) {
         } else {
           result.framework = FRAMEWORKS.NEXT_PAGES;
         }
+      } else if (deps['react-scripts'] || deps['react-app-rewired'] || deps['craco'] || deps['@craco/craco']) {
+        result.framework = FRAMEWORKS.CRA;
       } else if (deps['vue'] || deps['nuxt']) {
         result.framework = FRAMEWORKS.VUE;
       } else if (deps['vite'] || deps['react'] || deps['svelte']) {
@@ -271,6 +274,26 @@ function injectHTML(dir, appId) {
   return injectFallback(dir, appId);
 }
 
+function injectCRA(dir, appId) {
+  const candidates = [
+    'src/index.tsx', 'src/index.ts',
+    'src/index.jsx', 'src/index.js',
+  ];
+  for (const cand of candidates) {
+    const p = path.join(dir, cand);
+    if (fs.existsSync(p)) {
+      let content = fs.readFileSync(p, 'utf8');
+      if (content.includes('@shiplens/sdk') || content.includes('initShiplens') || content.includes(appId)) {
+        return cand;
+      }
+      const injection = `\n// Shiplens SDK - User Analytics\nconst { initShiplens } = require('@shiplens/sdk');\ninitShiplens({ appId: '${appId}' });\n`;
+      fs.writeFileSync(p, content + injection, 'utf8');
+      return cand;
+    }
+  }
+  return injectFallback(dir, appId);
+}
+
 function injectFallback(dir, appId) {
   const configFile = path.join(dir, 'shiplens.config.ts');
   const content = `import { initShiplens } from '@shiplens/sdk';\n\nexport function setupShiplens() {\n  if (typeof window !== 'undefined') {\n    initShiplens({\n      appId: '${appId}',\n    });\n  }\n}\n`;
@@ -284,6 +307,8 @@ function injectSDK(dir, framework, appId) {
       return injectNextApp(dir, appId);
     case FRAMEWORKS.NEXT_PAGES:
       return injectNextPages(dir, appId);
+    case FRAMEWORKS.CRA:
+      return injectCRA(dir, appId);
     case FRAMEWORKS.VUE:
       return injectVue(dir, appId);
     case FRAMEWORKS.VITE:
@@ -292,23 +317,40 @@ function injectSDK(dir, framework, appId) {
       return injectHTML(dir, appId);
     default:
       try { return injectNextApp(dir, appId); } catch (e) {}
+      try { return injectCRA(dir, appId); } catch (e) {}
       try { return injectVite(dir, appId); } catch (e) {}
       try { return injectHTML(dir, appId); } catch (e) {}
       return injectFallback(dir, appId);
   }
 }
 
-function installSDKDependency(dir, pkgManager = 'npm') {
+function killProcess(child) {
+  if (!child || child.killed) return;
+  try {
+    if (process.platform === 'win32' && child.pid) {
+      try {
+        execSync(`taskkill /pid ${child.pid} /T /F`, { stdio: 'ignore' });
+      } catch (e) {
+        try { child.kill('SIGKILL'); } catch (err) {}
+      }
+    } else {
+      try { child.kill('SIGTERM'); } catch (e) {}
+      setTimeout(() => {
+        try { child.kill('SIGKILL'); } catch (e) {}
+      }, 500);
+    }
+  } catch (e) {
+    try { child.kill(); } catch (err) {}
+  }
+}
+
+async function installSDKDependency(dir, pkgManager = 'npm') {
   const isWindows = process.platform === 'win32';
   const ext = isWindows ? '.cmd' : '';
-  
-  // 1. Define 4-Tier Download Sources with 5s timeout & 2 retries per tier
-  // Tier 1: NPM official/default registry
-  // Tier 2: Alibaba Cloud / Taobao npm mirror (https://registry.npmmirror.com)
-  // Tier 3: GitHub repository mirror
-  // Tier 4: Shiplens official CDN mirror
+
   const sources = [
     {
+      id: 'npmjs',
       name: 'npm registry',
       getCommand: (pm) => {
         if (pm === 'pnpm') return `pnpm${ext} add @shiplens/sdk`;
@@ -318,6 +360,7 @@ function installSDKDependency(dir, pkgManager = 'npm') {
       },
     },
     {
+      id: 'npmmirror',
       name: 'Alibaba Cloud mirror (npmmirror)',
       getCommand: (pm) => {
         const mirror = '--registry=https://registry.npmmirror.com';
@@ -328,6 +371,7 @@ function installSDKDependency(dir, pkgManager = 'npm') {
       },
     },
     {
+      id: 'github',
       name: 'GitHub mirror',
       getCommand: (pm) => {
         const repoUrl = 'https://github.com/Hyperlong/shiplens-sdk.git';
@@ -338,6 +382,7 @@ function installSDKDependency(dir, pkgManager = 'npm') {
       },
     },
     {
+      id: 'cdn',
       name: 'Shiplens CDN mirror',
       getCommand: (pm) => {
         const cdnUrl = 'https://cdn.shiplens.dev/packages/shiplens-sdk.tgz';
@@ -349,42 +394,107 @@ function installSDKDependency(dir, pkgManager = 'npm') {
     },
   ];
 
-  let lastError = null;
-  const RETRIES_PER_TIER = 2;
-  const TIMEOUT_MS = 5000; // 5 seconds per attempt
-
-  for (const source of sources) {
-    const cmd = source.getCommand(pkgManager);
-    
-    // Attempt with primary package manager (up to 2 retries, 5s timeout each)
-    for (let attempt = 1; attempt <= RETRIES_PER_TIER; attempt++) {
+  const TIER1_DELAY_MS = 20 * 1000; // 20s
+  const TOTAL_TIMEOUT_MS = 5 * 60 * 1000; // 5min
+
+  return new Promise((resolve) => {
+    let isDone = false;
+    const activeChildren = new Set();
+    let tier2Timer = null;
+    let totalTimer = null;
+    let startedCount = 0;
+    let finishedFailureCount = 0;
+
+    const cleanupAndFinish = (result) => {
+      if (isDone) return;
+      isDone = true;
+      if (tier2Timer) clearTimeout(tier2Timer);
+      if (totalTimer) clearTimeout(totalTimer);
+      for (const child of activeChildren) {
+        killProcess(child);
+      }
+      activeChildren.clear();
+      resolve(result);
+    };
+
+    const runSource = (source) => {
+      if (isDone) return;
+      startedCount++;
+      const cmd = source.getCommand(pkgManager);
+      let child;
       try {
-        execSync(cmd, { cwd: dir, stdio: 'ignore', timeout: TIMEOUT_MS });
-        return { success: true, manager: pkgManager, source: source.name, attempt };
-      } catch (err) {
-        lastError = err;
+        child = spawn(cmd, { cwd: dir, shell: true, stdio: 'ignore' });
+      } catch (e) {
+        finishedFailureCount++;
+        checkAllFailed();
+        return;
       }
-    }
 
-    // If primary package manager failed and isn't npm, attempt npm fallback on this source (up to 2 retries, 5s timeout each)
-    if (pkgManager !== 'npm') {
-      const npmCmd = source.getCommand('npm');
-      for (let attempt = 1; attempt <= RETRIES_PER_TIER; attempt++) {
-        try {
-          execSync(npmCmd, { cwd: dir, stdio: 'ignore', timeout: TIMEOUT_MS });
-          return { success: true, manager: 'npm (fallback)', source: source.name, attempt };
-        } catch (npmErr) {
-          lastError = npmErr;
+      activeChildren.add(child);
+
+      const onExit = (code) => {
+        activeChildren.delete(child);
+        if (isDone) return;
+        if (code === 0) {
+          cleanupAndFinish({
+            success: true,
+            manager: pkgManager,
+            source: source.name,
+          });
+        } else {
+          finishedFailureCount++;
+          if (source.id === 'npmjs' && tier2Timer) {
+            clearTimeout(tier2Timer);
+            tier2Timer = null;
+            startBackupSources();
+          }
+          checkAllFailed();
         }
-      }
-    }
-  }
+      };
 
-  return {
-    success: false,
-    manager: pkgManager,
-    error: lastError ? lastError.message : 'All 4 download sources timed out or failed (5s x 2 retries each)',
-  };
+      child.on('close', onExit);
+      child.on('error', () => onExit(1));
+    };
+
+    const startBackupSources = () => {
+      if (isDone) return;
+      if (tier2Timer) {
+        clearTimeout(tier2Timer);
+        tier2Timer = null;
+      }
+      for (let i = 1; i < sources.length; i++) {
+        runSource(sources[i]);
+      }
+    };
+
+    const checkAllFailed = () => {
+      if (isDone) return;
+      if (startedCount === sources.length && finishedFailureCount === sources.length) {
+        cleanupAndFinish({
+          success: false,
+          manager: pkgManager,
+          error: 'All 4 download sources failed or timed out',
+        });
+      }
+    };
+
+    // t = 0s: Start Tier 1 (npmjs)
+    runSource(sources[0]);
+
+    // t = 20s: If still running, keep npmjs alive and start npmmirror + GitHub + CDN
+    tier2Timer = setTimeout(() => {
+      startBackupSources();
+    }, TIER1_DELAY_MS);
+
+    // t = 5min: Total timeout across all sources
+    totalTimer = setTimeout(() => {
+      cleanupAndFinish({
+        success: false,
+        manager: pkgManager,
+        error: 'SDK installation timed out after 5 minutes across all download sources',
+      });
+    }, TOTAL_TIMEOUT_MS);
+  });
 }
 
 function getGitEmail() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shiplens/cli",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "Shiplens CLI (In Development) - 15-second zero-config analytics initialization and full telemetry analysis engine",
   "main": "lib/index.js",
   "bin": {