dsh-mobile-access 1.0.2 → 1.1.0

package/package.json

@@ -1,9 +1,17 @@
 {
   "name": "dsh-mobile-access",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Independent DSH bundle that pairs iPhones and iPads with the official DeepSeek Harness Web GUI over the local network.",
   "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/abbaababa/dsh-mobile-access.git"
+  },
+  "homepage": "https://github.com/abbaababa/dsh-mobile-access#readme",
+  "bugs": {
+    "url": "https://github.com/abbaababa/dsh-mobile-access/issues"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -20,6 +28,7 @@
     "index.js",
     "service.js",
     "routes.js",
+    "gateway.js",
     "html.js",
     "types.js",
     "client.js",
@@ -48,5 +57,9 @@
         "@deepseek-ai/dsh-client-ui-sidebar"
       ]
     }
+  },
+  "devDependencies": {
+    "@types/node": "^26.6.5",
+    "typescript": "6.0.3"
   }
 }

package/routes.js

@@ -4,6 +4,7 @@
  * can reach it; every state and rotation call stays inside Connection's fence.
  */
 import { contentSecurityPolicy, renderMessagePage, renderPairingPage } from './html.js';
+import { EMPTY_GATEWAY_STATUS } from './gateway.js';
 import { constantTimeEqual, isLoopbackHost, } from './service.js';
 const PAIR_PATH = '/m';
 const STATE_PATH = '/api/mobile-access/state';
@@ -182,27 +183,36 @@ function jsonResponse(payload, status = 200) {
         },
     });
 }
-function statePayload(ctx, service) {
+function publicOriginOf(gateway) {
+    const status = gateway?.status();
+    return status?.running === true && status.publicOrigin !== null ? status.publicOrigin : null;
+}
+function statePayload(ctx, service, gateway) {
     const origin = originOf(ctx);
+    const gatewayStatus = gateway?.status() ?? EMPTY_GATEWAY_STATUS;
+    const publicOrigin = publicOriginOf(gateway) ?? origin;
     const snapshot = service.snapshot();
     return {
         ...snapshot,
         ok: true,
         version: 1,
         origin,
+        publicOrigin,
         pairPath: PAIR_PATH,
-        pairUrl: new URL(PAIR_PATH, origin).href,
+        pairUrl: new URL(PAIR_PATH, publicOrigin).href,
         bindHost: ctx.webServer.host,
         protocol: protocolOf(ctx),
         port: ctx.webServer.port,
         loopback: isLoopbackHost(ctx.webServer.host),
+        gateway: gatewayStatus,
     };
 }
-function pairingPage(ctx, service, request, nonce, error) {
+function pairingPage(ctx, service, request, nonce, gateway, error) {
     const snapshot = service.snapshot();
+    const publicOrigin = publicOriginOf(gateway);
     return renderPairingPage({
         ...(error === undefined ? {} : { error }),
-        host: requestHost(ctx, request),
+        host: publicOrigin === null ? requestHost(ctx, request) : new URL(publicOrigin).host,
         expiresAt: snapshot.expiresAt,
         expired: snapshot.expired,
         locked: snapshot.locked,
@@ -211,10 +221,10 @@ function pairingPage(ctx, service, request, nonce, error) {
         nonce,
     });
 }
-function sendPairing(ctx, service, request, response, error, status = 200, extraHeaders = {}) {
+function sendPairing(ctx, service, request, response, gateway, error, status = 200, extraHeaders = {}) {
     const nonce = pairingNonce();
     response.setHeader('set-cookie', pairingCookie(nonce));
-    sendHtml(response, status, pairingPage(ctx, service, request, nonce, error), extraHeaders);
+    sendHtml(response, status, pairingPage(ctx, service, request, nonce, gateway, error), extraHeaders);
 }
 function refusalPage(title, message, detail) {
     return renderMessagePage({
@@ -296,7 +306,7 @@ function failureMessage(reason) {
             return '尝试过于频繁，请稍后再试。';
     }
 }
-async function handleGet(ctx, service, request, response) {
+async function handleGet(ctx, service, request, response, gateway) {
     const captured = new CapturedResponse();
     const allowed = ctx.connection.authorizeIndex({
         method: request.method,
@@ -309,9 +319,9 @@ async function handleGet(ctx, service, request, response) {
     }
     if (replayCaptured(response, captured))
         return;
-    sendPairing(ctx, service, request, response);
+    sendPairing(ctx, service, request, response, gateway);
 }
-async function handlePost(ctx, service, request, response) {
+async function handlePost(ctx, service, request, response, gateway) {
     const contentType = (firstHeader(request.headers, 'content-type') ?? '').toLowerCase();
     if (!contentType.startsWith('application/x-www-form-urlencoded')) {
         sendHtml(response, 415, refusalPage('无法处理请求', '配对请求必须使用表单提交。'));
@@ -333,7 +343,7 @@ async function handlePost(ctx, service, request, response) {
     const nonce = params.get('nonce') ?? '';
     const expectedNonce = cookieValue(request.headers, PAIR_COOKIE) ?? '';
     if (nonce === '' || expectedNonce === '' || !constantTimeEqual(nonce, expectedNonce)) {
-        sendPairing(ctx, service, request, response, '配对页已过期，请刷新后重试。', 403);
+        sendPairing(ctx, service, request, response, gateway, '配对页已过期，请刷新后重试。', 403);
         return;
     }
     const code = params.get('code') ?? '';
@@ -342,7 +352,7 @@ async function handlePost(ctx, service, request, response) {
         const extra = result.reason === 'rate'
             ? { 'retry-after': String(Math.max(1, Math.ceil((result.retryAfterMs ?? 1000) / 1000))) }
             : {};
-        sendPairing(ctx, service, request, response, failureMessage(result.reason), result.reason === 'rate' ? 429 : 200, extra);
+        sendPairing(ctx, service, request, response, gateway, failureMessage(result.reason), result.reason === 'rate' ? 429 : 200, extra);
         return;
     }
     const minted = mintIndexCookie(ctx, request);
@@ -364,7 +374,7 @@ async function handlePost(ctx, service, request, response) {
  * Build the single exact `/m` handler. Exported for route-level tests, which do
  * not need a live DSH process.
  */
-export function createPairingHandler(ctx, service) {
+export function createPairingHandler(ctx, service, gateway) {
     return async (request, response) => {
         if (!pairingHostAllowed(ctx, request)) {
             sendHtml(response, 403, refusalPage('请求被拒绝', '此请求未通过 Host 校验。'));
@@ -372,11 +382,11 @@ export function createPairingHandler(ctx, service) {
         }
         const method = (request.method ?? 'GET').toUpperCase();
         if (method === 'GET') {
-            await handleGet(ctx, service, request, response);
+            await handleGet(ctx, service, request, response, gateway);
             return;
         }
         if (method === 'POST') {
-            await handlePost(ctx, service, request, response);
+            await handlePost(ctx, service, request, response, gateway);
             return;
         }
         response.setHeader('allow', 'GET, POST');
@@ -387,7 +397,7 @@ export function createPairingHandler(ctx, service) {
  * Register all three routes. The returned disposer removes them in reverse
  * order; every registration is attempted only once.
  */
-export function registerMobileAccess(ctx, service) {
+export function registerMobileAccess(ctx, service, gateway) {
     let pairing;
     let state;
     let rotate;
@@ -395,7 +405,7 @@ export function registerMobileAccess(ctx, service) {
         path: STATE_PATH,
         methods: ['GET'],
         requestBody: 'buffered',
-        fetch: () => Promise.resolve(jsonResponse(statePayload(ctx, service))),
+        fetch: () => Promise.resolve(jsonResponse(statePayload(ctx, service, gateway))),
     };
     const rotateRoute = {
         path: ROTATE_PATH,
@@ -403,14 +413,14 @@ export function registerMobileAccess(ctx, service) {
         requestBody: 'buffered',
         fetch: () => {
             service.rotate();
-            return Promise.resolve(jsonResponse(statePayload(ctx, service)));
+            return Promise.resolve(jsonResponse(statePayload(ctx, service, gateway)));
         },
     };
     try {
         pairing = ctx.webServer.register({
             kind: 'exact',
             path: PAIR_PATH,
-            handler: createPairingHandler(ctx, service),
+            handler: createPairingHandler(ctx, service, gateway),
         });
         state = ctx.connection.fetch.register(stateRoute);
         rotate = ctx.connection.fetch.register(rotateRoute);