dsh-bridge-gateway 0.1.3 → 0.1.4

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 本项目 `dsh-bridge-gateway` 是基于 [dsh-bridge](https://github.com/wenbin-wb/dsh-bridge) 的移植增强分支，在保留原版能力之外，重点新增「公网直连网关」。
 
+## [0.1.4] - 待发布
+
+### 修复
+- 修复「远程访问」面板在宿主连接未建立时无限卡在「加载中」的问题：为状态拉取增加兜底超时（15s），超时后释放 in-flight 锁并给出可用的「🔄 重试」按钮，避免面板永远无法自行恢复。
+
 ## [0.1.3] - 待发布
 
 ### 修复

package/client/client.js

@@ -2920,18 +2920,29 @@ function BridgePanel({ rpcCall }) {
   }, [rpcCall, adminToken]);
   const loadInFlightRef = React.useRef(false);
   const loadSeqRef = React.useRef(0);
+  const LOAD_TIMEOUT_MS = 15e3;
   const load = React.useCallback(async (quiet = false) => {
     if (loadInFlightRef.current) return;
     loadInFlightRef.current = true;
     const currentSeq = ++loadSeqRef.current;
+    const timedOut = { done: false };
     try {
-      const r = await authRpcCall(BRIDGE_ENDPOINTS.getStatus, {});
+      const result = await Promise.race([
+        authRpcCall(BRIDGE_ENDPOINTS.getStatus, {}),
+        new Promise((resolve) => {
+          setTimeout(() => {
+            timedOut.done = true;
+            resolve(null);
+          }, LOAD_TIMEOUT_MS);
+        })
+      ]);
+      if (timedOut.done) throw new Error("\u52A0\u8F7D\u8D85\u65F6\uFF08\u5BBF\u4E3B\u8FDE\u63A5\u53EF\u80FD\u5728\u5207\u6362\u6216\u672A\u5EFA\u7ACB\uFF09\u3002\u8BF7\u70B9\u51FB\u300C\u{1F504} \u91CD\u8BD5\u300D\u5237\u65B0\u3002");
       if (currentSeq !== loadSeqRef.current) return;
-      if (!r?.ok) throw new Error(r?.error?.message ?? "RPC failed");
-      setStatus(r.value);
+      if (!result?.ok) throw new Error(result?.error?.message ?? "RPC failed");
+      setStatus(result.value);
       if (!quiet) setErr(null);
     } catch (e) {
-      if (currentSeq === loadSeqRef.current) setErr(e.message);
+      if (currentSeq === loadSeqRef.current) setErr(e.message || "\u52A0\u8F7D\u5931\u8D25");
     } finally {
       loadInFlightRef.current = false;
     }
@@ -3345,6 +3356,11 @@ function BridgePanel({ rpcCall }) {
         }
       },
       React.createElement("span", { style: { flex: "1 1 auto" } }, err),
+      !isInterceptionErr && React.createElement("button", {
+        type: "button",
+        style: { ...s.btnGhost, height: 26, fontSize: 12, padding: "0 10px", flexShrink: 0 },
+        onClick: () => load()
+      }, "\u{1F504} \u91CD\u8BD5"),
       isInterceptionErr && React.createElement("button", {
         type: "button",
         style: { ...s.btnPri, background: "#dc2626", color: "#ffffff", height: 26, fontSize: 12, padding: "0 10px", flexShrink: 0 },

package/client/index.js

@@ -2597,18 +2597,28 @@ function BridgePanel({ rpcCall }) {
 
   const loadInFlightRef = React.useRef(false);
   const loadSeqRef = React.useRef(0);
+  // 兜底超时：RPC 若一直不返回（连接打不开/宿主未响应），强制结束「加载中」，
+  // 释放 in-flight 锁并提示重试，避免面板无限卡在加载态
+  const LOAD_TIMEOUT_MS = 15000;
   const load = React.useCallback(async (quiet = false) => {
     if (loadInFlightRef.current) return;
     loadInFlightRef.current = true;
     const currentSeq = ++loadSeqRef.current;
+    const timedOut = { done: false };
     try {
-      const r = await authRpcCall(BRIDGE_ENDPOINTS.getStatus, {});
+      const result = await Promise.race([
+        authRpcCall(BRIDGE_ENDPOINTS.getStatus, {}),
+        new Promise((resolve) => {
+          setTimeout(() => { timedOut.done = true; resolve(null); }, LOAD_TIMEOUT_MS);
+        }),
+      ]);
+      if (timedOut.done) throw new Error('加载超时（宿主连接可能在切换或未建立）。请点击「🔄 重试」刷新。');
       if (currentSeq !== loadSeqRef.current) return;
-      if (!r?.ok) throw new Error(r?.error?.message ?? 'RPC failed');
-      setStatus(r.value);
+      if (!result?.ok) throw new Error(result?.error?.message ?? 'RPC failed');
+      setStatus(result.value);
       if (!quiet) setErr(null);
     } catch (e) {
-      if (currentSeq === loadSeqRef.current) setErr(e.message);
+      if (currentSeq === loadSeqRef.current) setErr(e.message || '加载失败');
     } finally {
       loadInFlightRef.current = false;
     }
@@ -2977,6 +2987,11 @@ function BridgePanel({ rpcCall }) {
       },
     },
       React.createElement('span', { style: { flex: '1 1 auto' } }, err),
+      !isInterceptionErr && React.createElement('button', {
+        type: 'button',
+        style: { ...s.btnGhost, height: 26, fontSize: 12, padding: '0 10px', flexShrink: 0 },
+        onClick: () => load(),
+      }, '🔄 重试'),
       isInterceptionErr && React.createElement('button', {
         type: 'button',
         style: { ...s.btnPri, background: '#dc2626', color: '#ffffff', height: 26, fontSize: 12, padding: '0 10px', flexShrink: 0 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bridge-gateway",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "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",