cursorconnect 0.1.2 → 0.1.5

package/dist/print-pairing.js

@@ -1,33 +1,26 @@
 import { renderBigCode } from './big-code.js';
-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 code = identity.pairingCode;
-    console.log('\n────────────────────────────────────────');
-    console.log(`  ${identity.machineLabel}`);
+import { PAIRING_CODE_TTL_MINUTES } from './pairing-ttl.js';
+/** Pairing code: plain ASCII (A–Z, 0–9) for app input. */
+function pairingCodeAscii(code) {
+    return code.replace(/[^A-Z0-9]/g, '').slice(0, 6);
+}
+export function printPairingToTerminal(identity) {
+    const code = pairingCodeAscii(identity.pairingCode);
+    console.log('Cursor Connect запущен в фоне');
+    console.log('');
+    console.log('────────────────────────────────────────');
     console.log('');
-    console.log('  Введите код в приложении CursorConnect:');
+    console.log(`  Компьютер: ${identity.machineLabel}`);
+    console.log('');
+    console.log('  Введите код в приложении Cursor Connect:');
     console.log('');
     console.log(renderBigCode(code));
     console.log('');
-    console.log(`  Код: ${code.split('').join(' ')}`);
-    console.log(`  Действует ~${Math.max(1, Math.floor(expiresIn / 60))} мин`);
+    console.log('  Код одноразовый');
+    console.log(`  Действует ${PAIRING_CODE_TTL_MINUTES} мин`);
     console.log('');
-    if (!ok) {
-        const parts = [];
-        if (!status.bridge)
-            parts.push('bridge');
-        if (!status.cdp)
-            parts.push('Cursor');
-        if (!status.connector)
-            parts.push('сервер');
-        console.log(`  Ожидание: ${parts.join(', ')}…`);
-        console.log('  Подождите 10–20 с и снова: cursorconnect status');
-    }
-    else {
-        console.log('  Готово — введите код на телефоне.');
-    }
     console.log('────────────────────────────────────────');
-    console.log('  Bridge в фоне · cursorconnect stop');
-    console.log('  Консоль можно закрыть.\n');
+    console.log('  Для остановки Cursor Connect введите cursorconnect stop');
+    console.log('  Консоль можно закрыть.');
+    console.log('');
 }

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

@@ -20,7 +20,7 @@ export function loadInstallConfig() {
 export function saveInstallConfig(repoRoot) {
     const abs = resolve(repoRoot);
     if (!isValidRepoRoot(abs)) {
-        throw new Error(`Не найден bridge в ${abs} (ожидается …/bridge/package.json)`);
+        throw new Error(`Не найден Cursor Connect (bridge) в ${abs} (ожидается …/bridge/package.json)`);
     }
     mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
     writeFileSync(CONFIG_FILE, JSON.stringify({ repoRoot: abs }, null, 2), { mode: 0o600 });
@@ -59,7 +59,7 @@ export function resolveRepoRoot() {
     const fromDev = devRepoRoot();
     if (fromDev)
         return fromDev;
-    throw new Error('Не найден bridge.\n' +
+    throw new Error('Не найден Cursor Connect (bridge).\n' +
         '  npm install -g cursorconnect && cursorconnect start');
 }
 export function configFilePath() {

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.2",
-  "description": "CLI: CursorConnect bridge + relay pairing — install once, run from anywhere",
+  "version": "0.1.5",
+  "description": "CLI: Cursor Connect on Mac + relay pairing — install once, run from anywhere",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -10,6 +10,8 @@
   "files": [
     "dist/**/*.js",
     "bridge-runtime/**",
+    "config.env.defaults",
+    "version-policy.json",
     "README.md"
   ],
   "scripts": {
@@ -29,7 +31,9 @@
     "bridge",
     "relay"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "socket.io-client": "^4.8.0"
+  },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "tsx": "^4.19.0",

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 до последней сборки."
+}