dsh-bridge-gateway 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 本项目 `dsh-bridge-gateway` 是基于 [dsh-bridge](https://github.com/wenbin-wb/dsh-bridge) 的移植增强分支，在保留原版能力之外，重点新增「公网直连网关」。
 
+## [0.1.2] - 待发布
+
+### 新增
+- 公网直连网关新增插件 host 反向代理：`/points-checkin/*` 路径转发到本机 points-checkin bridge，使积分签到插件在公网 HTTPS 网关页面下同步可用。
+
+### 修复
+- 修复移动端模型/权限选择下拉在底部输入栏被挤出视口、仅剩右下角横条的问题：改为固定在输入栏上方的底部浮层。
+
 ## [0.1.1] - 待发布
 
 ### 修复

package/client/client.js

@@ -3963,7 +3963,7 @@ function injectMobileStyles() {
         min-width: 0 !important;
       }
 
-      /* \u79FB\u52A8\u7AEF\uFF1A\u6A21\u578B/\u6743\u9650\u9009\u62E9\u5F39\u5C42\u4E0D\u8D85\u51FA\u5C4F\u5E55\uFF08\u4ECE 180px \u89E6\u53D1\u5668\u4E2D\u5F39\u51FA\u65F6\u5F3A\u5236\u7EA6\u675F\u89C6\u53E3\u3001\u6A2A\u5411\u53EF\u6EDA\u52A8\u515C\u5E95\uFF09 */
+      /* \u79FB\u52A8\u7AEF\uFF1A\u6A21\u578B/\u6743\u9650\u9009\u62E9\u5F39\u5C42\u56FA\u5B9A\u4E3A\u8F93\u5165\u680F\u4E0A\u65B9\u7684\u5E95\u90E8\u6D6E\u5C42\uFF0C\u4FDD\u8BC1\u5B8C\u6574\u53EF\u89C1\uFF08\u4FEE\u590D\u771F\u673A\u4E0B\u62C9\u53EA\u5269\u53F3\u4E0B\u89D2\u6A2A\u6761\u3001\u5185\u5BB9\u88AB\u6324\u51FA\u89C6\u53E3\uFF09 */
       div[class*="_7KE1Ra_root"] > div[class*="dropdown"],
       div[class*="_7KE1Ra_root"] > div[class*="listbox"],
       div[class*="_7KE1Ra_root"] > div[class*="popup"],
@@ -3973,15 +3973,20 @@ function injectMobileStyles() {
       div[class*="Sh0Q9G_root"] > div[class*="listbox"],
       div[class*="Sh0Q9G_root"] > div[class*="popup"],
       div[class*="Sh0Q9G_root"] > div[class*="menu"] {
+        position: fixed !important;
+        left: 8px !important;
+        right: 8px !important;
+        top: auto !important;
+        bottom: calc(64px + var(--dsh-mobile-safe-bottom)) !important;
+        width: auto !important;
         min-width: 0 !important;
         max-width: calc(100vw - 16px) !important;
-        width: auto !important;
-        max-height: 55vh !important;
+        max-height: 48vh !important;
         overflow-x: auto !important;
         overflow-y: auto !important;
-        left: auto !important;
-        right: auto !important;
-        top: calc(100% + 6px) !important;
+        z-index: 10005 !important;
+        transform: none !important;
+        margin: 0 !important;
         box-sizing: border-box !important;
         -webkit-overflow-scrolling: touch !important;
       }
@@ -4233,7 +4238,7 @@ function injectMobileStyles() {
         pointer-events: auto !important;
       }
 
-      /* \u515C\u5E95\uFF1APortal \u6E32\u67D3\u5230 overlayAnchor \u91CC\u7684\u6A21\u578B/\u6743\u9650\u9009\u62E9\u5F39\u5C42\u4E5F\u5F3A\u5236\u7EA6\u675F\u5728\u5C4F\u5E55\u5185\uFF0C\u675C\u7EDD\u6574\u4F53\u8DD1\u51FA\u89C6\u53E3 */
+      /* \u515C\u5E95\uFF1APortal \u6E32\u67D3\u5230 overlayAnchor \u91CC\u7684\u6A21\u578B/\u6743\u9650\u9009\u62E9\u5F39\u5C42\u4E5F\u56FA\u5B9A\u4E3A\u5E95\u90E8\u6D6E\u5C42\uFF0C\u675C\u7EDD\u6574\u4F53\u8DD1\u51FA\u89C6\u53E3\u53EA\u5269\u6A2A\u6761 */
       div[class*="uV2eYG_overlayAnchor"] > div[class*="dropdown"],
       div[class*="uV2eYG_overlayAnchor"] > div[class*="popup"],
       div[class*="uV2eYG_overlayAnchor"] > div[class*="menu"],
@@ -4241,13 +4246,22 @@ function injectMobileStyles() {
       div[class*="uV2eYG_overlayAnchor"] > div[role="listbox"],
       div[class*="overlayLayer"] > div[class*="dropdown"],
       div[class*="overlayLayer"] > div[class*="popup"] {
-        max-width: calc(100vw - 16px) !important;
+        position: fixed !important;
+        left: 8px !important;
+        right: 8px !important;
+        top: auto !important;
+        bottom: calc(64px + var(--dsh-mobile-safe-bottom)) !important;
+        width: auto !important;
         min-width: 0 !important;
-        max-height: 60vh !important;
+        max-width: calc(100vw - 16px) !important;
+        max-height: 50vh !important;
         overflow-x: auto !important;
         overflow-y: auto !important;
+        z-index: 10005 !important;
+        transform: none !important;
+        margin: 0 !important;
         box-sizing: border-box !important;
-        transform-origin: left top !important;
+        transform-origin: left bottom !important;
       }
     }
 

package/client/index.js

@@ -3561,7 +3561,7 @@ function injectMobileStyles() {
         min-width: 0 !important;
       }
 
-      /* 移动端：模型/权限选择弹层不超出屏幕（从 180px 触发器中弹出时强制约束视口、横向可滚动兜底） */
+      /* 移动端：模型/权限选择弹层固定为输入栏上方的底部浮层，保证完整可见（修复真机下拉只剩右下角横条、内容被挤出视口） */
       div[class*="_7KE1Ra_root"] > div[class*="dropdown"],
       div[class*="_7KE1Ra_root"] > div[class*="listbox"],
       div[class*="_7KE1Ra_root"] > div[class*="popup"],
@@ -3571,15 +3571,20 @@ function injectMobileStyles() {
       div[class*="Sh0Q9G_root"] > div[class*="listbox"],
       div[class*="Sh0Q9G_root"] > div[class*="popup"],
       div[class*="Sh0Q9G_root"] > div[class*="menu"] {
+        position: fixed !important;
+        left: 8px !important;
+        right: 8px !important;
+        top: auto !important;
+        bottom: calc(64px + var(--dsh-mobile-safe-bottom)) !important;
+        width: auto !important;
         min-width: 0 !important;
         max-width: calc(100vw - 16px) !important;
-        width: auto !important;
-        max-height: 55vh !important;
+        max-height: 48vh !important;
         overflow-x: auto !important;
         overflow-y: auto !important;
-        left: auto !important;
-        right: auto !important;
-        top: calc(100% + 6px) !important;
+        z-index: 10005 !important;
+        transform: none !important;
+        margin: 0 !important;
         box-sizing: border-box !important;
         -webkit-overflow-scrolling: touch !important;
       }
@@ -3831,7 +3836,7 @@ function injectMobileStyles() {
         pointer-events: auto !important;
       }
 
-      /* 兜底：Portal 渲染到 overlayAnchor 里的模型/权限选择弹层也强制约束在屏幕内，杜绝整体跑出视口 */
+      /* 兜底：Portal 渲染到 overlayAnchor 里的模型/权限选择弹层也固定为底部浮层，杜绝整体跑出视口只剩横条 */
       div[class*="uV2eYG_overlayAnchor"] > div[class*="dropdown"],
       div[class*="uV2eYG_overlayAnchor"] > div[class*="popup"],
       div[class*="uV2eYG_overlayAnchor"] > div[class*="menu"],
@@ -3839,13 +3844,22 @@ function injectMobileStyles() {
       div[class*="uV2eYG_overlayAnchor"] > div[role="listbox"],
       div[class*="overlayLayer"] > div[class*="dropdown"],
       div[class*="overlayLayer"] > div[class*="popup"] {
-        max-width: calc(100vw - 16px) !important;
+        position: fixed !important;
+        left: 8px !important;
+        right: 8px !important;
+        top: auto !important;
+        bottom: calc(64px + var(--dsh-mobile-safe-bottom)) !important;
+        width: auto !important;
         min-width: 0 !important;
-        max-height: 60vh !important;
+        max-width: calc(100vw - 16px) !important;
+        max-height: 50vh !important;
         overflow-x: auto !important;
         overflow-y: auto !important;
+        z-index: 10005 !important;
+        transform: none !important;
+        margin: 0 !important;
         box-sizing: border-box !important;
-        transform-origin: left top !important;
+        transform-origin: left bottom !important;
       }
     }
 

package/lib/index.js

@@ -223,6 +223,9 @@ function getDshLoopbackCookie(targetPort) {
   }
 }
 
+/** points-checkin 本机 host bridge 的候选端口（与其 client 端探测顺序一致） */
+const POINTS_CHECKIN_PORTS = [27182, 27183, 27184, 27185, 27186, 27187, 27188, 27189, 27190, 27191];
+
 /** 把请求头中的 Host 和 Origin 改写成 loopback，让 DSH 的安全栅栏放行 */
 function loopbackHeaders(headers, targetPort) {
   const authority = `127.0.0.1:${targetPort}`;
@@ -260,14 +263,16 @@ class ProxyServer {
    * @param {object} [opts.logger]
    * @param {{ key: string|Buffer, cert: string|Buffer }} [opts.tls] 若提供则启用 HTTPS（公网直连网关）
    * @param {string} [opts.tag] 日志标签（如 '网关'）
+   * @param {Array<{prefix:string,targetPort:number,stripPrefix?:boolean}>} [opts.extraTargets] 额外的本机插件 host 反代目标（如 points-checkin 的本地 bridge），鉴权通过后按前缀转发
    */
-  constructor({ localPort, targetPort, authManager, logger, tls, tag = '' }) {
+  constructor({ localPort, targetPort, authManager, logger, tls, tag = '', extraTargets = [] }) {
     this.localPort = localPort;
     this.targetPort = targetPort;
     this.authManager = authManager;
     this.logger = logger;
     this.tls = tls ?? null;
     this.tag = tag ? `[${tag}] ` : '';
+    this.extraTargets = Array.isArray(extraTargets) ? extraTargets : [];
     this.server = null;
     this.clientSockets = new Set();
     this.activeConnections = 0;
@@ -417,6 +422,55 @@ class ProxyServer {
         }
       }
 
+      // 4.3 认证通过：可选插件 host 反向代理（如 points-checkin 本地 bridge，供远程 HTTPS 网关的页面同源调用）
+      if (this.extraTargets && this.extraTargets.length) {
+        const extra = this.extraTargets.find(
+          (t) => pathname === t.prefix || pathname.startsWith(`${t.prefix}/`)
+        );
+        if (extra) {
+          const qIndex = (req.url || '').indexOf('?');
+          const qs = qIndex >= 0 ? (req.url || '').slice(qIndex) : '';
+          const upstreamPath = extra.stripPrefix
+            ? (pathname.slice(extra.prefix.length) || '/') + qs
+            : req.url;
+          const headers = loopbackHeaders(req.headers, extra.targetPort);
+          const extraReq = httpRequest(
+            {
+              host: '127.0.0.1',
+              port: extra.targetPort,
+              method: req.method,
+              path: upstreamPath,
+              headers,
+              agent: false,
+            },
+            (extraRes) => {
+              const out = { ...extraRes.headers };
+              delete out['transfer-encoding'];
+              delete out['content-length'];
+              res.writeHead(extraRes.statusCode ?? 502, out);
+              extraRes.pipe(res);
+              res.on('close', () => extraRes.destroy());
+              extraRes.on('error', () => {
+                if (!res.writableEnded) res.destroy();
+              });
+            }
+          );
+          extraReq.on('error', (err) => {
+            this.logger.error('插件 host 代理请求失败(%s): %s', extra.prefix, err.message);
+            if (!res.headersSent) {
+              res.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' });
+              res.end(
+                `dsh-bridge: 无法连接插件 host 服务 (127.0.0.1:${extra.targetPort}) — ${err.message}`
+              );
+            } else {
+              res.destroy();
+            }
+          });
+          req.pipe(extraReq);
+          return;
+        }
+      }
+
       // 5. 认证通过：正常执行反向代理转发
       const headers = loopbackHeaders(req.headers, this.targetPort);
       const proxyReq = httpRequest(
@@ -577,14 +631,53 @@ class BridgeService {
     return this.getStatus();
   }
 
+  // 探测 points-checkin 本机 host bridge 端口（供网关反代 /points-checkin/*，实现远程 HTTPS 下积分签到可用）
+  async _resolvePointsCheckinPort() {
+    if (this._pcPortResolved) return this._pcPort ?? null;
+    this._pcPortResolved = true;
+    this._pcPort = null;
+    for (const port of POINTS_CHECKIN_PORTS) {
+      const ok = await new Promise((resolve) => {
+        const req = httpGet(
+          { host: '127.0.0.1', port, path: '/ping', timeout: 500, headers: { 'User-Agent': 'dsh-bridge-gateway' } },
+          (res) => {
+            const chunks = [];
+            res.on('data', (c) => chunks.push(c));
+            res.on('end', () => {
+              try {
+                const body = JSON.parse(Buffer.concat(chunks).toString());
+                resolve(body?.ok === true && body.plugin === 'points-checkin');
+              } catch {
+                resolve(false);
+              }
+            });
+          }
+        );
+        req.on('error', () => resolve(false));
+        req.on('timeout', () => {
+          req.destroy();
+          resolve(false);
+        });
+      });
+      if (ok) {
+        this._pcPort = port;
+        this.logger?.info?.('已发现 points-checkin host bridge: 127.0.0.1:%d', port);
+        break;
+      }
+    }
+    return this._pcPort ?? null;
+  }
+
   async startProxy() {
     if (this.proxy) return this.proxy;
 
+    const pcPort = await this._resolvePointsCheckinPort();
     this.proxy = new ProxyServer({
       localPort: this.proxyPort,
       targetPort: this.dshPort,
       authManager: this.authManager,
       logger: this.logger,
+      extraTargets: pcPort ? [{ prefix: '/points-checkin', targetPort: pcPort, stripPrefix: true }] : [],
     });
 
     await this.proxy.start();
@@ -886,6 +979,7 @@ class BridgeService {
     }
 
     const gatewayAuth = this._refreshGatewayAuth();
+    const pcPort = await this._resolvePointsCheckinPort();
     this.gateway = new ProxyServer({
       localPort: port,
       targetPort: this.dshPort,
@@ -893,6 +987,7 @@ class BridgeService {
       logger: this.logger,
       tls: { key: tls.key, cert: tls.cert },
       tag: '公网直连',
+      extraTargets: pcPort ? [{ prefix: '/points-checkin', targetPort: pcPort, stripPrefix: true }] : [],
     });
 
     await this.gateway.start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bridge-gateway",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "以 dsh-bridge 为根基、融合 remote-gateway 能力的 DSH 远程访问网关：局域网 / Cloudflare 隧道 / 自建隧道之外，新增「公网直连网关」（0.0.0.0 监听 + 自带 HTTPS 自签证书 + 强制登录门禁），解决移动端外网直连操控电脑。",
   "releaseNotes": "【dsh-bridge-gateway】以 dsh-bridge 为根基、融合 remote-gateway 能力的 DSH 远程访问网关\n• ➕ 公网访问区：隧道 / 直连网关 二选一，网关全部配置项可在界面配置\n• ➕ 直连网关：0.0.0.0:<端口> 自带 HTTPS(自签证书) + 强制 public_only 门禁，复用 AuthManager，链路打通到 DSH loopback\n• 📱 修复移动端选择模型时界面溢出屏幕的问题\n• 默认不启用，安装后原有局域网/隧道/IM 行为完全不变",
   "type": "module",