@fxz26284407/yuanma-gateway 0.1.3 → 0.1.5

package/dist/antigravity-native.js

@@ -11,11 +11,34 @@ const binary = '/Applications/Antigravity.app/Contents/Resources/bin/language_se
 export class AntigravityNative {
     #authority;
     #checked = 0;
+    #connecting;
+    #epoch = 0;
     ready = false;
     get generation() { return this.#authority ? this.#authority.pid + ':' + this.#authority.port : ''; }
     async connect() {
-        if (this.ready && Date.now() - this.#checked < 1000)
+        // ponytail: recheck ownership every 30s; failures invalidate sooner, without replaying requests.
+        if (this.ready && Date.now() - this.#checked < 30000)
             return;
+        if (this.#connecting)
+            return this.#connecting;
+        const epoch = this.#epoch, pending = this.discover(epoch);
+        this.#connecting = pending;
+        try {
+            await pending;
+        }
+        catch (error) {
+            if (epoch === this.#epoch) {
+                this.ready = false;
+                this.#checked = 0;
+            }
+            throw error;
+        }
+        finally {
+            if (this.#connecting === pending)
+                this.#connecting = undefined;
+        }
+    }
+    async discover(epoch) {
         requireValue(process.platform === 'darwin', 'BACKEND_UNAVAILABLE', 'Antigravity 桌面接入需要 macOS', 503);
         const version = JSON.parse(await readFile(app + '/package.json', 'utf8')).version;
         requireValue(version === '2.29.0', 'PROTOCOL_INCOMPATIBLE', '当前仅适配 Antigravity App 2.29.0，请核对桌面版本', 503);
@@ -34,7 +57,7 @@ export class AntigravityNative {
         const desktop = processes[0];
         const { stdout: listeners } = await exec('/usr/sbin/lsof', ['-nP', '-a', '-p', String(desktop.pid), '-iTCP', '-sTCP:LISTEN', '-Fn'], { maxBuffer: 65536 });
         const ports = [...new Set([...listeners.matchAll(/^n(?:127\.0\.0\.1|\*|\[::1\]):(\d+)$/gm)].map(m => Number(m[1])))];
-        requireValue(ports.length > 0 && ports.length <= 4, 'BACKEND_UNAVAILABLE', '无法核实 Antigravity 桌面监听地址', 503);
+        requireValue(ports.length > 0, 'BACKEND_UNAVAILABLE', '无法核实 Antigravity 桌面监听地址', 503);
         const executable = await stat(binary);
         requireValue(executable.isFile() && !(executable.mode & 0o002), 'UNSAFE_STORAGE', 'Antigravity 可执行文件权限异常', 403);
         let found;
@@ -50,6 +73,7 @@ export class AntigravityNative {
             catch { /* Only ports owned by the verified desktop process are considered. */ }
         }
         requireValue(found, 'BACKEND_UNAVAILABLE', 'Antigravity 桌面会话接口未就绪', 503);
+        requireValue(epoch === this.#epoch, 'BACKEND_UNAVAILABLE', 'Antigravity 连接已关闭', 503);
         this.#authority = found;
         this.#checked = Date.now();
         this.ready = true;
@@ -61,7 +85,7 @@ export class AntigravityNative {
             return await this.rpc(authority, method, params, timeout, signal);
         }
         catch (error) {
-            if (!signal?.aborted) {
+            if (!signal?.aborted && this.#authority === authority) {
                 this.ready = false;
                 this.#checked = 0;
             }
@@ -91,7 +115,10 @@ export class AntigravityNative {
         payload.copy(frame, 5);
         let ended = false, received = false;
         const finish = (error) => { if (ended)
-            return; ended = true; clearTimeout(first); req.destroy(); onEnd(error); };
+            return; ended = true; clearTimeout(first); req.destroy(); if (error && this.#authority === authority) {
+            this.ready = false;
+            this.#checked = 0;
+        } onEnd(error); };
         const req = request({ hostname: '127.0.0.1', port: authority.port, path: '/exa.language_server_pb.LanguageServerService/' + method, method: 'POST', rejectUnauthorized: false, headers: { 'content-type': 'application/connect+json', 'connect-protocol-version': '1', 'x-codeium-csrf-token': authority.token } }, res => {
             if (res.statusCode !== 200) {
                 finish(new Error('Antigravity 状态订阅不可用（HTTP ' + res.statusCode + '）'));
@@ -180,5 +207,5 @@ export class AntigravityNative {
             req.end(payload);
         });
     }
-    close() { this.#authority = undefined; this.#checked = 0; this.ready = false; }
+    close() { this.#epoch++; this.#connecting = undefined; this.#authority = undefined; this.#checked = 0; this.ready = false; }
 }

package/dist/server.js

@@ -1,3 +1,4 @@
+import { GATEWAY_VERSION } from './version.js';
 import Database from 'better-sqlite3';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { ProjectAccess } from './project-access.js';
@@ -173,7 +174,7 @@ export async function startGateway(options) {
     }
     await projectAccess.sync(true);
     const supports = (key) => requireValue(current().backend.capabilities[key], 'UNSUPPORTED_COMMAND', 'Backend does not support ' + key, 400);
-    const backendStatus = () => ({ protocolVersion: 1, backendReady: current().backend.ready, backendKind: current().backend.kind, readOnly: current().backend.readOnly === true, uploadLimits, capabilities: { ...current().backend.capabilities, createThreads: !!current().backend.createThread }, availableBackends: [...contexts.keys()] });
+    const backendStatus = () => ({ gatewayVersion: GATEWAY_VERSION, protocolVersion: 1, backendReady: current().backend.ready, backendKind: current().backend.kind, readOnly: current().backend.readOnly === true, uploadLimits, capabilities: { ...current().backend.capabilities, createThreads: !!current().backend.createThread }, availableBackends: [...contexts.keys()] });
     let stopping = false;
     const pending = new Set();
     const track = (p) => { pending.add(p); void p.finally(() => pending.delete(p)).catch(() => { }); return p; };
@@ -511,6 +512,8 @@ export async function startGateway(options) {
     async function secureRequest(req, binding) {
         const data = req.body ?? {};
         const path = req.path;
+        if (req.method === 'GET' && path === '/v1/gateway-info')
+            return { gatewayVersion: GATEWAY_VERSION };
         const value = (prefix) => req.authorization?.startsWith(prefix) ? req.authorization.slice(prefix.length) : '';
         if (req.method === 'POST' && path === '/v1/pairings/claim')
             return auth.claim(data, binding);
@@ -687,7 +690,7 @@ export async function startGateway(options) {
                 if (req.method === 'POST' && url.pathname === '/local/pairings/open') {
                     await projectAccess.sync(true);
                     const b = await body(req);
-                    send(res, 200, { requestId, data: { ...auth.openPairing(b.grants), publicKey: identity.publicKey.toString('base64url'), profile: NOISE_PROFILE, relayUrl: options.relayUrl ?? null } });
+                    send(res, 200, { requestId, data: { ...auth.openPairing(b.grants), publicKey: identity.publicKey.toString('base64url'), profile: NOISE_PROFILE, gatewayVersion: GATEWAY_VERSION, relayUrl: options.relayUrl ?? null } });
                     return;
                 }
                 if (req.method === 'GET' && url.pathname === '/local/pairings') {

package/dist/version.js

@@ -0,0 +1,2 @@
+import { readFileSync } from 'node:fs';
+export const GATEWAY_VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fxz26284407/yuanma-gateway",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "engines": {
     "node": "22.x"
@@ -55,3 +55,4 @@
     "registry": "https://registry.npmjs.org"
   }
 }
+