cursorconnect 0.1.0 → 0.1.4

package/dist/launch.js

@@ -2,7 +2,7 @@ import { execSync, spawn, spawnSync } from 'child_process';
 import { askYesNo } from './ask.js';
 import { existsSync, openSync, readFileSync, writeFileSync } from 'fs';
 import { BRIDGE_LOG_FILE, BRIDGE_PID_FILE } from './paths.js';
-import { resolveRepoRoot } from './repo-root.js';
+import { resolveBridgeDir } from './bridge-dir.js';
 export function isBridgeRunning() {
     if (!existsSync(BRIDGE_PID_FILE))
         return false;
@@ -34,11 +34,26 @@ export function stopBridge() {
         /* ignore */
     }
 }
+function killProcessesOnBridgePort() {
+    try {
+        execSync('lsof -t -i:3847 2>/dev/null | xargs kill -TERM 2>/dev/null', {
+            stdio: 'ignore',
+            shell: '/bin/bash',
+        });
+        /* give old bridge time to exit */
+        execSync('sleep 0.5', { stdio: 'ignore', shell: '/bin/bash' });
+    }
+    catch {
+        /* port free */
+    }
+}
 export function startBridge(env) {
     stopBridge();
+    killProcessesOnBridgePort();
+    const bridgeDir = resolveBridgeDir();
     const logFd = openLogAppend();
-    const child = spawn('npm', ['run', 'start', '-w', 'bridge'], {
-        cwd: resolveRepoRoot(),
+    const child = spawn('node', ['dist/index.js'], {
+        cwd: bridgeDir,
         env: { ...process.env, ...env },
         detached: true,
         stdio: ['ignore', logFd, logFd],
@@ -50,19 +65,35 @@ export function startBridge(env) {
 function openLogAppend() {
     return openSync(BRIDGE_LOG_FILE, 'a');
 }
-export async function waitBridgeHealth(maxMs = 30_000) {
+export async function waitBridgeHealth(maxMs = 30_000, opts) {
+    const requireCdp = opts?.requireCdp === true;
     const deadline = Date.now() + maxMs;
     while (Date.now() < deadline) {
         try {
             const res = await fetch('http://127.0.0.1:3847/health');
-            if (res.ok)
-                return (await res.json());
+            if (res.ok) {
+                const j = (await res.json());
+                const ok = Boolean(j.ok);
+                const cdp = Boolean(j.cdp);
+                if (ok && (!requireCdp || cdp))
+                    return { ok, cdp };
+            }
         }
         catch {
             /* retry */
         }
         await sleep(500);
     }
+    try {
+        const res = await fetch('http://127.0.0.1:3847/health');
+        if (res.ok) {
+            const j = (await res.json());
+            return { ok: Boolean(j.ok), cdp: Boolean(j.cdp) };
+        }
+    }
+    catch {
+        /* ignore */
+    }
     return { ok: false, cdp: false };
 }
 export async function waitRelayConnector(relayUrl, maxMs = 45_000) {
@@ -145,29 +176,31 @@ export async function ensureCursorCdp(opts = {}) {
     if (!running) {
         console.log('[cursorconnect] Cursor не запущен — старт с --remote-debugging-port=9222…');
         launchCursorWithCdp();
-        return waitCdp(cdpUrl, 50);
+        if (await waitCdp(cdpUrl, 50))
+            return true;
+        printManualCdpInstructions();
+        return false;
     }
-    // Cursor запущен, CDP недоступен
-    let shouldRestart = Boolean(opts.restartCursor);
+    // Cursor запущен, порт 9222 не отвечает — обычный запуск без --remote-debugging-port
+    let shouldRestart = opts.noRestartCursor !== true;
     if (!shouldRestart) {
-        if (!process.stdin.isTTY) {
-            console.warn('[cursorconnect] Cursor без CDP (нет интерактивного терминала).');
-            printManualCdpInstructions();
-            return false;
+        shouldRestart = Boolean(opts.restartCursor);
+        if (!shouldRestart && process.stdin.isTTY) {
+            shouldRestart = await askYesNo('Cursor без CDP. Перезапустить с --remote-debugging-port=9222? (y/n): ');
         }
-        shouldRestart = await askYesNo('Cursor запущен без CDP. Перезапустить с --remote-debugging-port=9222? (y/n): ');
     }
     if (!shouldRestart) {
+        console.warn('[cursorconnect] Cursor без CDP — список чатов будет только из JSONL.');
         printManualCdpInstructions();
         return false;
     }
+    console.log('[cursorconnect] Cursor без CDP — перезапуск с --remote-debugging-port=9222…');
     const quitOk = await quitCursor();
     if (!quitOk) {
-        console.warn('[cursorconnect] Не удалось закрыть Cursor.');
+        console.warn('[cursorconnect] Не удалось закрыть Cursor (Cmd+Q вручную).');
         printManualCdpInstructions();
         return false;
     }
-    console.log('[cursorconnect] Запуск Cursor с --remote-debugging-port=9222…');
     launchCursorWithCdp();
     if (await waitCdp(cdpUrl, 50))
         return true;

package/dist/pairing-code.js

@@ -0,0 +1,18 @@
+import { randomBytes } from 'crypto';
+export const PAIRING_CODE_LENGTH = 6;
+/** Latin letters + digits (ASCII), uppercase in storage. */
+const ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+export function generatePairingCode() {
+    const bytes = randomBytes(PAIRING_CODE_LENGTH);
+    let out = '';
+    for (let i = 0; i < PAIRING_CODE_LENGTH; i++) {
+        out += ALPHABET[bytes[i] % ALPHABET.length];
+    }
+    return out;
+}
+export function normalizePairingCode(raw) {
+    const code = raw.replace(/[^a-zA-Z0-9]/g, '').toUpperCase();
+    if (code.length !== PAIRING_CODE_LENGTH)
+        return null;
+    return code;
+}

package/dist/pairing-identity.js

@@ -1,13 +1,10 @@
 import { randomBytes, randomUUID } from 'crypto';
+import { generatePairingCode } from './pairing-code.js';
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { homedir, hostname } from 'os';
 import { join } from 'path';
 const DIR = join(homedir(), '.cursorconnect');
 const FILE = join(DIR, 'identity.json');
-function formatPairingCode() {
-    const n = randomBytes(3).readUIntBE(0, 3) % 1_000_000;
-    return String(n).padStart(6, '0');
-}
 export function pairingIdentityPath() {
     return FILE;
 }
@@ -35,7 +32,7 @@ export function ensurePairingIdentity(machineLabel) {
         roomId: randomUUID(),
         clientToken: randomBytes(32).toString('hex'),
         machineLabel: machineLabel?.trim() || defaultMachineLabel(),
-        pairingCode: formatPairingCode(),
+        pairingCode: generatePairingCode(),
         pairingCodeExpiresAt: Date.now() + 10 * 60_000,
         createdAt: now,
         updatedAt: now,
@@ -47,7 +44,7 @@ export function refreshPairingCode(identity, machineLabel) {
     const next = {
         ...identity,
         machineLabel: machineLabel?.trim() || identity.machineLabel,
-        pairingCode: formatPairingCode(),
+        pairingCode: generatePairingCode(),
         pairingCodeExpiresAt: Date.now() + 10 * 60_000,
         updatedAt: new Date().toISOString(),
     };

package/dist/postinstall.js

@@ -0,0 +1,7 @@
+import { ensureUserConfig } from './bridge-dir.js';
+try {
+    ensureUserConfig();
+}
+catch {
+    /* non-fatal */
+}

package/dist/print-pairing.js

@@ -1,31 +1,35 @@
-import qrTerminal from 'qrcode-terminal';
-import { buildPairUri } from './pairing-identity.js';
-export function printPairingToTerminal(relayUrl, identity, status) {
-    const pairUri = buildPairUri(relayUrl, identity);
+export function printPairingToTerminal(identity, status) {
     const expiresIn = Math.max(0, Math.floor((identity.pairingCodeExpiresAt - Date.now()) / 1000));
-    const ok = status.bridge && status.cdp && status.connector;
+    const ready = status.bridge && status.cdp && status.connector;
+    const code = identity.pairingCode;
     console.log('\n────────────────────────────────────────');
-    console.log(`  Mac: ${identity.machineLabel}`);
-    console.log(`  Relay: ${relayUrl}`);
+    console.log('  CursorConnect');
+    console.log(`  Компьютер: ${identity.machineLabel}`);
     console.log('');
-    console.log('  Код в приложении (6 цифр):');
-    console.log(`\n       ${identity.pairingCode}\n`);
-    console.log('  QR (скан в CursorConnect → Подключить Mac):\n');
-    qrTerminal.generate(pairUri, { small: true });
+    console.log('  Введите код в приложении CursorConnect:');
     console.log('');
-    console.log(`  Ссылка (вставить вручную):\n  ${pairUri}\n`);
-    console.log(`  Код действует ~${Math.floor(expiresIn / 60)} мин`);
-    console.log(`  Статус: bridge ${dot(status.bridge)}  CDP ${dot(status.cdp)}  relay ${dot(status.connector)}`);
-    if (!ok) {
-        console.log('  Подождите 10–20 с и снова: npm run connect:status');
+    console.log(`  ${code}`);
+    console.log('');
+    console.log('  Код одноразовый — после подключения снова: cursorconnect start');
+    console.log(`  Действует ~${Math.max(1, Math.floor(expiresIn / 60))} мин`);
+    if (!ready) {
+        const parts = [];
+        if (!status.bridge)
+            parts.push('bridge');
+        if (!status.cdp)
+            parts.push('Cursor');
+        if (!status.connector)
+            parts.push('сервер');
+        console.log('');
+        console.log(`  Ожидание: ${parts.join(', ')}…`);
+        console.log('  Подождите 10–20 с и снова: cursorconnect status');
     }
     else {
-        console.log('  Готово — подключайте телефон.');
+        console.log('');
+        console.log('  Готово — введите код на телефоне.');
     }
+    console.log('');
     console.log('────────────────────────────────────────');
-    console.log('  Bridge в фоне. Остановка: npm run connect:stop');
+    console.log('  Bridge в фоне · cursorconnect stop');
     console.log('  Консоль можно закрыть.\n');
 }
-function dot(ok) {
-    return ok ? '✓' : '…';
-}

package/dist/relay-config.js

@@ -0,0 +1,49 @@
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import { resolvePackageRoot } from './bridge-dir.js';
+import { USER_CONFIG_ENV } from './bridge-dir.js';
+/** Shipped with npm package (generated at publish from bridge/.env). */
+export const BUNDLED_CONFIG_ENV = join(resolvePackageRoot(), 'config.env.defaults');
+/** Public production relay (same as app `extra.bridgeUrl`). */
+export const DEFAULT_RELAY_URL = 'https://cc.fanpay.online';
+export function loadEnvFile(path) {
+    if (!existsSync(path))
+        return {};
+    const out = {};
+    for (const line of readFileSync(path, 'utf-8').split('\n')) {
+        const t = line.trim();
+        if (!t || t.startsWith('#'))
+            continue;
+        const i = t.indexOf('=');
+        if (i < 1)
+            continue;
+        out[t.slice(0, i).trim()] = t.slice(i + 1).trim();
+    }
+    return out;
+}
+function pickNonEmpty(...values) {
+    for (const v of values) {
+        const t = v?.trim();
+        if (t)
+            return t;
+    }
+    return '';
+}
+/** Relay URL + connector token: bundled defaults → user config → bridge .env → process.env. */
+export function resolveRelayConfig(extraPaths = []) {
+    const layers = [];
+    if (existsSync(BUNDLED_CONFIG_ENV))
+        layers.push(loadEnvFile(BUNDLED_CONFIG_ENV));
+    for (const p of extraPaths) {
+        if (existsSync(p))
+            layers.push(loadEnvFile(p));
+    }
+    if (existsSync(USER_CONFIG_ENV))
+        layers.push(loadEnvFile(USER_CONFIG_ENV));
+    const merged = {};
+    for (const layer of layers)
+        Object.assign(merged, layer);
+    const relayUrl = pickNonEmpty(merged.RELAY_URL, process.env.RELAY_URL, DEFAULT_RELAY_URL);
+    const relayToken = pickNonEmpty(merged.RELAY_TOKEN, process.env.RELAY_TOKEN);
+    return { relayUrl, relayToken };
+}

package/dist/repo-root.js

@@ -59,11 +59,8 @@ export function resolveRepoRoot() {
     const fromDev = devRepoRoot();
     if (fromDev)
         return fromDev;
-    throw new Error('Не найден CursorConnect (bridge).\n' +
-        '  npm install -g cursorconnect\n' +
-        '  git clone <repo> && cd CursorConnect && npm install\n' +
-        '  cursorconnect init /path/to/CursorConnect\n' +
-        'или: export CURSORCONNECT_ROOT=/path/to/CursorConnect');
+    throw new Error('Не найден bridge.\n' +
+        '  npm install -g cursorconnect && cursorconnect start');
 }
 export function configFilePath() {
     return CONFIG_FILE;

package/dist/semver.js

@@ -0,0 +1,21 @@
+export function parseSemver(v) {
+    const m = v.trim().match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (!m)
+        return null;
+    return [Number(m[1]), Number(m[2]), Number(m[3])];
+}
+export function compareSemver(a, b) {
+    const pa = parseSemver(a);
+    const pb = parseSemver(b);
+    if (!pa || !pb)
+        return null;
+    for (let i = 0; i < 3; i++) {
+        if (pa[i] !== pb[i])
+            return pa[i] < pb[i] ? -1 : 1;
+    }
+    return 0;
+}
+export function isVersionAtLeast(current, minimum) {
+    const c = compareSemver(current, minimum);
+    return c !== null && c >= 0;
+}

package/dist/version-check.js

@@ -0,0 +1,31 @@
+import { isVersionAtLeast } from './semver.js';
+import { CLI_VERSION } from './cli-version.js';
+export async function fetchRemoteVersionPolicy(relayUrl) {
+    const base = relayUrl.replace(/\/$/, '');
+    try {
+        const res = await fetch(`${base}/api/version-policy`, {
+            signal: AbortSignal.timeout(12_000),
+        });
+        if (!res.ok)
+            return null;
+        return (await res.json());
+    }
+    catch {
+        return null;
+    }
+}
+export function assertCliVersionAllowed(policy, current = CLI_VERSION) {
+    if (isVersionAtLeast(current, policy.minCliVersion))
+        return;
+    console.error(`[cursorconnect] Версия ${current} устарела (нужна ≥ ${policy.minCliVersion}).\n` +
+        `  ${policy.updateCliCommand}`);
+    process.exit(1);
+}
+export async function ensureCliVersionForRelay(relayUrl) {
+    const policy = await fetchRemoteVersionPolicy(relayUrl);
+    if (!policy?.minCliVersion) {
+        console.warn('[cursorconnect] Не удалось проверить версию на relay — продолжаем без проверки.');
+        return;
+    }
+    assertCliVersionAllowed(policy);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cursorconnect",
-  "version": "0.1.0",
-  "description": "Mac CLI: CursorConnect bridge, relay pairing (QR + code), Cursor CDP",
+  "version": "0.1.4",
+  "description": "CLI: CursorConnect bridge + relay pairing — install once, run from anywhere",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -9,12 +9,17 @@
   },
   "files": [
     "dist/**/*.js",
+    "bridge-runtime/**",
+    "config.env.defaults",
+    "version-policy.json",
     "README.md"
   ],
   "scripts": {
     "dev": "tsx src/index.ts",
     "build": "tsc",
-    "prepublishOnly": "npm run build"
+    "bundle-bridge": "bash ../scripts/bundle-bridge-for-cli.sh",
+    "prepublishOnly": "npm run build && npm run bundle-bridge",
+    "postinstall": "node dist/postinstall.js"
   },
   "engines": {
     "node": ">=20"
@@ -27,11 +32,10 @@
     "relay"
   ],
   "dependencies": {
-    "qrcode-terminal": "^0.12.0"
+    "socket.io-client": "^4.8.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "@types/qrcode-terminal": "^0.12.2",
     "tsx": "^4.19.0",
     "typescript": "^5.9.2"
   },

package/version-policy.json

@@ -0,0 +1,8 @@
+{
+  "minCliVersion": "0.1.4",
+  "minAppVersion": "0.2.2",
+  "latestCliVersion": "0.1.4",
+  "latestAppVersion": "0.2.2",
+  "updateCliCommand": "npm install -g cursorconnect@latest",
+  "updateAppHint": "Обновите CursorConnect в App Store / TestFlight до последней сборки."
+}