orbit-codex-bridge 0.1.0 → 0.1.2

package/lib/connector-service.mjs

@@ -0,0 +1,259 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import http from 'node:http';
+import path from 'node:path';
+import {spawn} from 'node:child_process';
+import {createRequire} from 'node:module';
+
+const stateFile = home => path.join(home,'service.json');
+const pause = milliseconds => new Promise(resolve => setTimeout(resolve,milliseconds));
+
+async function serviceRequest(home, action = 'status') {
+  let saved;
+  try { saved = JSON.parse(await fs.readFile(stateFile(home),'utf8')); }
+  catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+  if (!Number.isInteger(saved.port) || saved.port < 1 || saved.port > 65535 || !/^[a-f0-9]{64}$/.test(saved.token)) return null;
+  try {
+    const response = await fetch(`http://127.0.0.1:${saved.port}/${action}`,{
+      method:action === 'stop' ? 'POST' : 'GET',
+      headers:{Authorization:`Bearer ${saved.token}`},
+      signal:AbortSignal.timeout(1500)
+    });
+    if (!response.ok) return null;
+    const result = await response.json();
+    return result.product === 'Orbit connector' ? result : null;
+  } catch { return null; }
+}
+
+export const connectorStatus = home => serviceRequest(home);
+
+export async function stopConnector(home) {
+  if (!await serviceRequest(home,'stop')) return false;
+  for (let attempt = 0; attempt < 50; attempt++) {
+    const locked = await fs.access(path.join(home,'connector.lock')).then(() => true,() => false);
+    if (!await connectorStatus(home) && !locked) return true;
+    await pause(100);
+  }
+  throw new Error('后台连接器尚未停止，请稍后重试。');
+}
+
+async function packageRoot(resolver, name) {
+  let directory = path.dirname(resolver.resolve(name));
+  while (true) {
+    try {
+      const manifest = JSON.parse(await fs.readFile(path.join(directory,'package.json'),'utf8'));
+      if (manifest.name === name) return directory;
+    } catch (error) { if (error.code !== 'ENOENT') throw error; }
+    const parent = path.dirname(directory);
+    if (parent === directory) throw new Error(`找不到依赖：${name}`);
+    directory = parent;
+  }
+}
+
+export async function installConnectorRuntime(source, home) {
+  const manifest = JSON.parse(await fs.readFile(path.join(source,'package.json'),'utf8'));
+  const target = path.join(home,'runtime',manifest.version);
+  try { await fs.access(path.join(target,'ready')); return {cliPath:path.join(target,'cli.mjs'),version:manifest.version}; }
+  catch {}
+  const temporary = `${target}.${crypto.randomBytes(6).toString('hex')}.tmp`;
+  await fs.mkdir(temporary,{recursive:true,mode:0o700});
+  const copied = new Map();
+  async function copyDependency(name, resolver) {
+    const original = await packageRoot(resolver,name);
+    if (copied.has(name)) {
+      if (copied.get(name) !== original) throw new Error(`依赖 ${name} 存在多个版本，无法安装后台运行时。`);
+      return;
+    }
+    copied.set(name,original);
+    const destination = path.join(temporary,'node_modules',name);
+    await fs.cp(original,destination,{recursive:true,filter:entry => path.basename(entry) !== 'node_modules'});
+    const dependency = JSON.parse(await fs.readFile(path.join(original,'package.json'),'utf8'));
+    for (const child of Object.keys(dependency.dependencies || {})) {
+      await copyDependency(child,createRequire(path.join(original,'package.json')));
+    }
+  }
+  try {
+    for (const filename of ['package.json',...manifest.files]) {
+      await fs.cp(path.join(source,filename),path.join(temporary,filename),{recursive:true});
+    }
+    for (const name of Object.keys(manifest.dependencies || {})) await copyDependency(name,createRequire(path.join(source,'package.json')));
+    await fs.writeFile(path.join(temporary,'ready'),manifest.version,{mode:0o600});
+    try { await fs.rename(temporary,target); }
+    catch (error) {
+      if (!['EEXIST','ENOTEMPTY','EPERM'].includes(error.code)) throw error;
+      await fs.access(path.join(target,'ready'));
+    }
+  } finally {
+    const resolved = path.resolve(temporary);
+    if (path.dirname(resolved) !== path.join(path.resolve(home),'runtime') || !path.basename(resolved).endsWith('.tmp')) throw new Error('无效的临时运行时路径。');
+    await fs.rm(resolved,{recursive:true,force:true});
+  }
+  return {cliPath:path.join(target,'cli.mjs'),version:manifest.version};
+}
+
+export async function startConnector({home,cliPath,version}) {
+  const running = await connectorStatus(home);
+  if (running?.version === version && running.workerReady) return running;
+  if (running) await stopConnector(home);
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const startupLog = path.join(home,'service-startup.log');
+  const diagnostic = await fs.open(startupLog,'w',0o600);
+  let child;
+  try {
+    child = spawn(process.execPath,[cliPath,'__service'],{
+      detached:true,windowsHide:true,stdio:['ignore',diagnostic.fd,diagnostic.fd],env:{...process.env,ORBIT_HOME:home}
+    });
+    await new Promise((resolve,reject) => {
+      child.once('spawn',resolve);
+      child.once('error',reject);
+    });
+  } finally {await diagnostic.close();}
+  let exited = false;
+  child.once('exit',() => {exited = true;});
+  child.unref();
+  for (let attempt = 0; attempt < 100; attempt++) {
+    const current = await connectorStatus(home);
+    if (current?.version === version && current.workerReady) return current;
+    if (exited) {
+      const diagnostic = (await fs.readFile(startupLog,'utf8').catch(() => '')).slice(-1500);
+      throw new Error(`后台连接器启动失败。${diagnostic}\n诊断日志：${startupLog}`);
+    }
+    await pause(150);
+  }
+  throw new Error(`后台连接器未就绪。诊断日志：${path.join(home,'connector.log')}`);
+}
+
+export async function superviseConnector(options) {
+  const {home} = options;
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const lockfile = path.join(home,'connector.lock');
+  async function acquire() {
+    try {
+      const handle = await fs.open(lockfile,'wx',0o600);
+      try {await handle.writeFile(String(process.pid));}
+      finally {await handle.close();}
+    } catch (error) {
+      if (error.code !== 'EEXIST') throw error;
+      const owner = Number(await fs.readFile(lockfile,'utf8'));
+      if (!Number.isInteger(owner) || owner < 1) throw new Error('另一个后台连接器正在启动，请稍后重试。');
+      try {process.kill(owner,0);}
+      catch (check) {
+        if (check.code !== 'ESRCH') throw check;
+        await fs.unlink(lockfile);
+        await acquire();
+        return;
+      }
+      throw new Error('Orbit 后台连接器已经运行。');
+    }
+  }
+  await acquire();
+  try {await runSupervisor(options);}
+  finally {
+    if ((await fs.readFile(lockfile,'utf8').catch(() => '')) === String(process.pid)) await fs.unlink(lockfile);
+  }
+}
+
+async function runSupervisor({home,cliPath,version,restartDelay = 1000}) {
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const token = crypto.randomBytes(32).toString('hex');
+  const logfile = path.join(home,'connector.log');
+  let logBytes = (await fs.stat(logfile).catch(() => ({size:0}))).size;
+  let writes = Promise.resolve();
+  function log(text) {
+    writes = writes.then(async () => {
+      const line = `${new Date().toISOString()} ${text.toString().trimEnd()}\n`;
+      if (logBytes > 2 * 1024 * 1024) {
+        await fs.rename(logfile,`${logfile}.1`);
+        logBytes = 0;
+      }
+      await fs.appendFile(logfile,line,{mode:0o600});
+      logBytes += Buffer.byteLength(line);
+    }).catch(() => {});
+  }
+  let worker = null;
+  let stopped = false;
+  let restartTimer;
+  let failures = 0;
+  let state = {product:'Orbit connector',version,pid:process.pid,workerReady:false,status:'starting',startedAt:Date.now()};
+  const finished = Promise.withResolvers();
+  async function stop() {
+    if (stopped) return;
+    stopped = true;
+    clearTimeout(restartTimer);
+    if (worker) {
+      const previous = worker;
+      const exited = new Promise(resolve => previous.once('exit',resolve));
+      const force = setTimeout(() => previous.kill(),3000);
+      if (previous.connected) previous.send({type:'stop'},() => {});
+      else previous.kill();
+      await exited;
+      clearTimeout(force);
+    }
+    await new Promise(resolve => control.close(resolve));
+    try {
+      const saved = JSON.parse(await fs.readFile(stateFile(home),'utf8'));
+      if (saved.token === token) await fs.unlink(stateFile(home));
+    } catch {}
+    log('连接器已停止。');
+    await writes;
+    finished.resolve();
+  }
+  const control = http.createServer((request,response) => {
+    response.setHeader('Content-Type','application/json');
+    response.setHeader('Cache-Control','no-store');
+    if (request.headers.origin || request.headers.authorization !== `Bearer ${token}`) {
+      response.writeHead(403);response.end('{}');return;
+    }
+    if (request.method === 'GET' && request.url === '/status') return response.end(JSON.stringify(state));
+    if (request.method === 'POST' && request.url === '/stop') {
+      response.end(JSON.stringify({...state,stopping:true}));
+      void stop();return;
+    }
+    response.writeHead(404);response.end('{}');
+  });
+  control.requestTimeout = 5000;
+  control.headersTimeout = 5000;
+  control.keepAliveTimeout = 1000;
+  await new Promise((resolve,reject) => {
+    control.once('error',reject);
+    control.listen(0,'127.0.0.1',resolve);
+  });
+  try {
+    const temporary = `${stateFile(home)}.${token}.tmp`;
+    await fs.writeFile(temporary,JSON.stringify({port:control.address().port,token}),{mode:0o600});
+    await fs.rename(temporary,stateFile(home));
+  } catch (error) {
+    await new Promise(resolve => control.close(resolve));throw error;
+  }
+  function launchWorker() {
+    if (stopped) return;
+    const started = Date.now();
+    state = {...state,workerReady:false,status:'starting'};
+    worker = spawn(process.execPath,[cliPath,'__worker'],{
+      windowsHide:true,stdio:['ignore','pipe','pipe','ipc'],env:{...process.env,ORBIT_HOME:home}
+    });
+    state.workerPid = worker.pid;
+    worker.stdout.on('data',log);
+    worker.stderr.on('data',log);
+    worker.on('error',error => log(error.message));
+    worker.on('message',message => {
+      if (message?.type === 'connector-state') state = {...state,...message.state};
+    });
+    worker.once('exit',(code,signal) => {
+      worker = null;
+      state = {...state,workerReady:false,status:'restarting'};
+      if (stopped) return;
+      failures = Date.now() - started > 60000 ? 0 : failures + 1;
+      const delay = Math.min(30000,restartDelay * 2 ** Math.min(failures - 1,5));
+      log(`工作进程退出 (${code ?? signal})，${delay}ms 后自动恢复。`);
+      restartTimer = setTimeout(launchWorker,delay);
+    });
+  }
+  process.once('SIGINT',stop);
+  process.once('SIGTERM',stop);
+  log(`Orbit ${version} 后台连接器启动。`);
+  launchWorker();
+  await finished.promise;
+  process.off('SIGINT',stop);
+  process.off('SIGTERM',stop);
+}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "orbit-codex-bridge",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Connect your original Codex desktop conversations to Orbit on the web.",
-  "engines": { "node": ">=24" },
+  "engines": {
+    "node": ">=24"
+  },
   "bin": {
     "orbit": "orbit"
   },
@@ -23,8 +25,9 @@
     "relay:agent": "node --env-file-if-exists=.env.local relay-agent.mjs",
     "prepublishOnly": "npm run check && npm test",
     "test": "node --test test/*.test.mjs",
+    "test:browser": "node --test test/browser/*.test.mjs",
     "test:native": "node test/native-smoke.mjs",
-    "check": "node --check cli.mjs && node --check server.mjs && node --check lib/store.mjs && node --check lib/rpc.mjs && node --check lib/desktop.mjs && node --check lib/device-auth.mjs && node --check public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
+    "check": "node --check cli.mjs && node --check server.mjs && node --check lib/store.mjs && node --check lib/rpc.mjs && node --check lib/desktop.mjs && node --check lib/device-auth.mjs && node --check lib/connector-service.mjs && node --check public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
   },
   "dependencies": {
     "dompurify": "^3.3.0",

package/public/admin.html

@@ -11,7 +11,7 @@
     <section class="overview"><div><span>用户总数</span><strong id="overview-users">0</strong></div><div><span>有效用户</span><strong id="overview-active-users">0</strong></div><div><span>已停用</span><strong id="overview-suspended-users">0</strong></div><div><span>已到期</span><strong id="overview-expired-users">0</strong></div><div><span>有效电脑</span><strong id="overview-devices">0</strong></div><div><span>在线电脑</span><strong id="overview-online">0</strong></div></section>
     <section class="content-section"><div class="section-heading"><div><span class="eyebrow">TENANTS</span><h2>用户与设备</h2></div><button id="refresh-admin" type="button">刷新</button></div>
       <div class="user-filters"><label for="user-search">搜索用户</label><input id="user-search" type="search" maxlength="100" placeholder="用户名或显示名称"><label for="user-status">账户状态</label><select id="user-status"><option value="all">全部状态</option><option value="active">有效</option><option value="suspended">已停用</option><option value="expired">已到期</option></select><span id="user-count" role="status"></span></div>
-      <form id="create-user-form" class="create-user-form"><label>登录名<input name="username" minlength="3" maxlength="64" autocomplete="off" required></label><label>显示名称<input name="displayName" maxlength="120"></label><label>初始密码<input name="password" type="password" minlength="12" autocomplete="new-password" placeholder="留空则自动生成"></label><label>套餐<input name="plan" value="standard" maxlength="40" required></label><label>设备上限<input name="maxDevices" type="number" min="1" max="50" value="2" required></label><label>账号到期<input name="expiresAt" type="datetime-local"></label><button class="primary" type="submit">创建账号</button></form>
+      <form id="create-user-form" class="create-user-form"><label>登录名<input name="username" minlength="3" maxlength="64" autocomplete="off" required></label><label>显示名称<input name="displayName" maxlength="120"></label><label>初始密码<input name="password" type="password" minlength="6" maxlength="256" autocomplete="new-password" placeholder="留空则自动生成"></label><label>套餐<input name="plan" value="standard" maxlength="40" required></label><label>设备上限<input name="maxDevices" type="number" min="1" max="50" value="2" required></label><label>账号到期<input name="expiresAt" type="datetime-local"></label><button class="primary" type="submit">创建账号</button></form>
       <div id="admin-message" role="status" hidden></div><div id="users-list" class="users-list"></div>
       <nav class="pagination" aria-label="用户列表分页"><button id="users-previous" type="button">上一页</button><span id="users-page">第 1 页</span><button id="users-next" type="button">下一页</button></nav>
     </section>

package/public/admin.js

@@ -148,7 +148,7 @@ document.addEventListener('click',async event=>{
       showSecret('电脑代理密钥',`只显示一次。把密钥写入电脑的 ORBIT_RELAY_AGENT_TOKEN。设备 ID：${result.device.id}`,result.agentToken);
       await refresh();
     }else if(reset){
-      const password=window.prompt('输入新密码（至少 12 个字符）；留空则自动生成');
+      const password=window.prompt('输入新密码（至少 6 个字符）；留空则自动生成');
       if(password===null)return;
       const result=await api(`/api/admin/users/${encodeURIComponent(reset.dataset.reset)}/reset-password`,password?{password}:{});
       showSecret('新密码已签发','旧用户会话已撤销，请通过安全渠道交付新密码。',result.initialPassword);