cicy-code 2.1.46 → 2.1.48

package/bin/cicy-code.js

@@ -1,96 +1,105 @@
 #!/usr/bin/env node
+// Launcher for the npm distribution. Resolves the prebuilt binary that ships
+// in the platform-specific optionalDependency (cicy-code-<os>-<cpu>) and execs
+// it — no network, no postinstall download.
+//
+// Before exec it mirrors dev.py's startup: if PORT (default 8008) is already
+// held by a *cicy-code* process it kills it and waits, so a stale instance
+// never blocks the new one. A non-cicy occupant is left alone and we abort
+// with a clear message (don't clobber someone else's server).
 const { spawn, execSync } = require('child_process');
-const path = require('path');
 const fs = require('fs');
-const https = require('https');
 
-const pkg = require('../package.json');
-const binPath = path.join(__dirname, 'cicy-code');
+const PORT = process.env.PORT || '8008';
 
-const cn = process.argv.includes('--cn') || process.env.CN_MIRROR === '1';
-
-if (process.argv.includes('--cn')) {
-  process.env.CN_MIRROR = '1';
+const platformPkg = `cicy-code-${process.platform}-${process.arch}`;
+let binPath;
+try {
+  binPath = require.resolve(`${platformPkg}/cicy-code`);
+} catch {
+  console.error(`cicy-code: no prebuilt binary for ${process.platform}-${process.arch}.`);
+  console.error(`The optional dependency "${platformPkg}" is not installed.`);
+  console.error(`Supported platforms: darwin-arm64, darwin-x64, linux-x64, linux-arm64.`);
+  console.error(`Reinstall: npm install -g cicy-code` +
+    ` (in China add --registry=https://registry.npmmirror.com)`);
+  process.exit(1);
 }
+try { fs.chmodSync(binPath, 0o755); } catch {}
+
+// --- dev.py-style port hygiene on PORT (default 8008) ----------------------
 
-if (cn) {
-  console.log('  [mirror] Using Chinese mirrors (npm + GitHub proxy)');
+function pidOnPort(port) {
+  // lsof first (macOS + Linux), then ss (Linux without lsof).
+  try {
+    const out = execSync(`lsof -ti TCP:${port} -sTCP:LISTEN`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    if (out) return out.split('\n')[0].trim();
+  } catch {}
+  try {
+    const out = execSync(`ss -tlnp 'sport = :${port}'`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    const m = out.match(/pid=(\d+)/);
+    if (m) return m[1];
+  } catch {}
+  return null;
 }
 
-// Check for updates
-function checkUpdate() {
-  const registry = cn
-    ? 'https://registry.npmmirror.com/cicy-code/latest'
-    : 'https://registry.npmjs.org/cicy-code/latest';
-  if (cn) console.log(`  [mirror] Registry: registry.npmmirror.com`);
-  return new Promise((resolve) => {
-    https.get(registry, (res) => {
-      let data = '';
-      res.on('data', (c) => data += c);
-      res.on('end', () => {
-        try {
-          const latest = JSON.parse(data).version;
-          if (latest && latest !== pkg.version) {
-            resolve(latest);
-          } else {
-            resolve(null);
-          }
-        } catch { resolve(null); }
-      });
-    }).on('error', () => resolve(null));
-  });
+function processCommand(pid) {
+  try {
+    return execSync(`ps -p ${pid} -o command=`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+  } catch { return ''; }
 }
 
-async function main() {
-  // Check update (non-blocking, timeout 3s)
-  const latest = await Promise.race([
-    checkUpdate(),
-    new Promise(r => setTimeout(() => r(null), 3000))
-  ]);
+function isAlive(pid) {
+  try { process.kill(Number(pid), 0); return true; }
+  catch (e) { return e.code === 'EPERM'; }
+}
 
-  if (latest && !process.env.CICY_SKIP_UPDATE) {
-    console.log(`\n  Update available: ${pkg.version} → ${latest}`);
-    console.log(`  Updating...\n`);
-    try {
-      const npmCmd = cn
-        ? `npm install -g cicy-code@${latest} --registry=https://registry.npmmirror.com`
-        : `npm install -g cicy-code@${latest}`;
-      execSync(npmCmd, { stdio: 'inherit' });
-      console.log(`\n  Updated to ${latest}! Restarting...\n`);
-      // Re-exec with new version
-      const child = spawn('cicy-code', process.argv.slice(2), { stdio: 'inherit', env: process.env });
-      child.on('exit', (code) => process.exit(code || 0));
-      return;
-    } catch (e) {
-      console.log(`  Update failed, running current version.\n`);
-    }
+function waitExit(pid, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (!isAlive(pid)) return true;
+    try { execSync('sleep 0.2'); } catch {}
   }
+  return !isAlive(pid);
+}
 
-  // Install globally if not already
-  try {
-    const globalBin = execSync('npm prefix -g', { encoding: 'utf8' }).trim() + '/bin/cicy-code';
-    if (!fs.existsSync(globalBin)) throw new Error('not installed');
-  } catch {
-    console.log('  Installing cicy-code globally...');
-    try {
-      const npmCmd = cn
-        ? 'npm install -g cicy-code --registry=https://registry.npmmirror.com'
-        : 'npm install -g cicy-code';
-      execSync(npmCmd, { stdio: 'inherit' });
-      console.log('  Installed! You can now run: cicy-code\n');
-    } catch {}
-  }
+function killPid(pid) {
+  try { process.kill(Number(pid), 'SIGTERM'); }
+  catch (e) { if (e.code === 'ESRCH') return true; }
+  if (waitExit(pid, 6000)) return true;
+  try { process.kill(Number(pid), 'SIGKILL'); }
+  catch (e) { if (e.code === 'ESRCH') return true; }
+  return waitExit(pid, 2000);
+}
 
-  if (!fs.existsSync(binPath)) {
-    console.error('Binary not found. Reinstall: npm install -g cicy-code');
+const existing = pidOnPort(PORT);
+if (existing) {
+  const cmd = processCommand(existing);
+  if (/cicy-code/.test(cmd)) {
+    console.log(`cicy-code: stopping existing instance on :${PORT} (pid=${existing})`);
+    if (!killPid(existing) || pidOnPort(PORT)) {
+      console.error(`cicy-code: port ${PORT} still in use after kill — aborting`);
+      process.exit(1);
+    }
+  } else {
+    console.error(`cicy-code: port ${PORT} is held by a non-cicy process (pid=${existing}): ${cmd}`);
+    console.error(`cicy-code: free it or set PORT=<other> — aborting`);
     process.exit(1);
   }
-
-  const child = spawn(binPath, process.argv.slice(2), {
-    stdio: 'inherit',
-    env: process.env
-  });
-  child.on('exit', (code) => process.exit(code || 0));
 }
 
-main();
+// --- launch ----------------------------------------------------------------
+
+const child = spawn(binPath, process.argv.slice(2), {
+  stdio: 'inherit',
+  env: { ...process.env, PORT },
+});
+child.on('exit', (code, signal) => {
+  if (signal) process.kill(process.pid, signal);
+  else process.exit(code == null ? 0 : code);
+});

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.46",
+  "version": "2.1.48",
   "description": "CiCy Code - AI-powered development environment",
   "author": {
     "name": "cicybot",
@@ -12,13 +12,15 @@
   "bin": {
     "cicy-code": "bin/cicy-code.js"
   },
-  "scripts": {
-    "postinstall": "node scripts/install.js"
-  },
   "files": [
-    "bin/cicy-code.js",
-    "scripts/"
+    "bin/cicy-code.js"
   ],
+  "optionalDependencies": {
+    "cicy-code-darwin-arm64": "2.1.47",
+    "cicy-code-darwin-x64": "2.1.47",
+    "cicy-code-linux-x64": "2.1.47",
+    "cicy-code-linux-arm64": "2.1.47"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cicy-ai/cicy-code.git"

package/scripts/install.js

@@ -1,60 +0,0 @@
-const https = require('https');
-const fs = require('fs');
-const path = require('path');
-
-const VERSION = require('../package.json').version;
-const GH_URL = `https://github.com/cicy-ai/cicy-code/releases/download/v${VERSION}`;
-const CN_URL = `https://gh-proxy.com/https://github.com/cicy-ai/cicy-code/releases/download/v${VERSION}`;
-
-const cn = process.env.CN_MIRROR === '1' || process.argv.includes('--cn');
-const BASE_URL = cn ? CN_URL : GH_URL;
-
-const PLATFORMS = {
-  'darwin-arm64': 'cicy-code-darwin-arm64',
-  'darwin-x64': 'cicy-code-darwin-amd64',
-  'linux-x64': 'cicy-code-linux-amd64',
-  'linux-arm64': 'cicy-code-linux-arm64',
-};
-
-const key = `${process.platform}-${process.arch}`;
-const binName = PLATFORMS[key];
-
-if (!binName) {
-  if (process.platform === 'win32') {
-    console.error('Windows is not supported natively. Please use WSL:\n  wsl --install\n  wsl npx cicy-code');
-  } else {
-    console.error(`Unsupported platform: ${key}`);
-  }
-  process.exit(1);
-}
-
-const binDir = path.join(__dirname, '..', 'bin');
-const binPath = path.join(binDir, 'cicy-code');
-const url = `${BASE_URL}/${binName}`;
-
-console.log(`Downloading ${binName}${cn ? ' (CN mirror: gh-proxy.com)' : ''}...`);
-console.log(`  URL: ${url}`);
-
-function download(url, dest, redirects = 5) {
-  return new Promise((resolve, reject) => {
-    if (redirects === 0) return reject(new Error('Too many redirects'));
-    const proto = url.startsWith('https') ? https : require('http');
-    proto.get(url, (res) => {
-      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        return download(res.headers.location, dest, redirects - 1).then(resolve).catch(reject);
-      }
-      if (res.statusCode !== 200) return reject(new Error(`HTTP ${res.statusCode}`));
-      const file = fs.createWriteStream(dest);
-      res.pipe(file);
-      file.on('finish', () => { file.close(); fs.chmodSync(dest, 0o755); resolve(); });
-    }).on('error', reject);
-  });
-}
-
-download(url, binPath)
-  .then(() => console.log('Done!'))
-  .catch((err) => {
-    console.error('Download failed:', err.message);
-    if (!cn) console.error('Try: CN_MIRROR=1 npx cicy-code');
-    process.exit(1);
-  });