@artenx/dshb 0.1.33 → 0.1.35

package/cordis.patch.yml

@@ -1,10 +1,14 @@
-- id: web-startup
-  disabled: true
+# DSHB 的补丁层：仅插入各功能条目。
+#
+# 注意：不要在这里禁用或替换上游 `web-startup`（dsh-web-app）。webserver 行
+# `inject: [webStartup]`，运行时启用/停用插件的补丁重载一旦更换 webStartup
+# 提供者，webServer 会被连带销毁重建，拆断桌面端正在使用的连接（0.1.33 及
+# 之前桌面端"启用即断连、左下角重连横幅"的根因）。上游 web-startup 与历史
+# 替换版功能等价（--host/--port/--trusted-host/--no-open），凭据重置已改为
+# 独立命令 `dshb-auth-reset`（见 src/auth/reset-cli.ts）。
 - insert:
     - id: dshb-auth
       name: "@artenx/dshb/auth"
-    - id: dshb-web-startup
-      name: "@artenx/dshb/auth/startup"
     - id: dshb-core
       name: "@artenx/dshb/core"
     - id: dshb-router

package/lib/auth/reset-cli.d.ts

@@ -0,0 +1,15 @@
+//#region src/auth/reset-cli.d.ts
+/**
+ * 独立的凭据重置 CLI（`dshb-auth-reset`）。
+ *
+ * 历史上它是 `dsh --profile web auth-reset` 子命令，由 dshb-web-startup 替换
+ * 上游 web-startup 实现。该替换会让 webServer 行（inject: [webStartup]）在
+ * 运行时启用/停用插件的补丁重载中连带重建，拆断桌面端正在使用的连接
+ * （0.1.33 及之前桌面端"启用即断连"的根因）。上游 web-startup 与本替换版
+ * 功能等价（--host/--port/--trusted-host/--no-open 全部一致），因此 0.1.34
+ * 起不再替换，auth-reset 降级为本独立命令。
+ */
+declare function runAuthResetCli(argv: readonly string[]): never;
+//#endregion
+export { runAuthResetCli };
+//# sourceMappingURL=reset-cli.d.ts.map

package/lib/auth/reset-cli.js

@@ -0,0 +1,47 @@
+import { sanitizeUsername, sharedCredentialStore } from "./credentials.js";
+//#region src/auth/reset-cli.ts
+/**
+* 独立的凭据重置 CLI（`dshb-auth-reset`）。
+*
+* 历史上它是 `dsh --profile web auth-reset` 子命令，由 dshb-web-startup 替换
+* 上游 web-startup 实现。该替换会让 webServer 行（inject: [webStartup]）在
+* 运行时启用/停用插件的补丁重载中连带重建，拆断桌面端正在使用的连接
+* （0.1.33 及之前桌面端"启用即断连"的根因）。上游 web-startup 与本替换版
+* 功能等价（--host/--port/--trusted-host/--no-open 全部一致），因此 0.1.34
+* 起不再替换，auth-reset 降级为本独立命令。
+*/
+function runAuthResetCli(argv) {
+	const store = sharedCredentialStore();
+	if (!store.isInitialized()) {
+		console.error("dshb-auth-reset: 尚未初始化管理员账号");
+		process.exit(1);
+	}
+	let password;
+	let username;
+	for (let i = 0; i < argv.length; i += 1) if (argv[i] === "--password") password = argv[++i];
+	else if (argv[i] === "--username") username = argv[++i];
+	if (password === void 0 && username === void 0) {
+		console.error("dshb-auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>");
+		process.exit(1);
+	}
+	if (password !== void 0 && password.length < 8) {
+		console.error("dshb-auth-reset: 密码至少 8 个字符");
+		process.exit(1);
+	}
+	if (username !== void 0) {
+		username = sanitizeUsername(username);
+		if (!username) {
+			console.error("dshb-auth-reset: 用户名不能为空");
+			process.exit(1);
+		}
+	}
+	if (password !== void 0) store.changePassword(username ?? store.username, password);
+	else store.changeUsername(username);
+	console.log("dshb-auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废");
+	process.exit(0);
+}
+if (process.argv[1]?.endsWith("reset-cli.js") === true || process.argv[1]?.endsWith("dshb-auth-reset") === true) runAuthResetCli(process.argv.slice(2));
+//#endregion
+export { runAuthResetCli };
+
+//# sourceMappingURL=reset-cli.js.map

package/lib/auth/reset-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reset-cli.js","names":[],"sources":["../../src/auth/reset-cli.ts"],"sourcesContent":["import { sanitizeUsername, sharedCredentialStore } from './credentials.js'\n\n/**\n * 独立的凭据重置 CLI（`dshb-auth-reset`）。\n *\n * 历史上它是 `dsh --profile web auth-reset` 子命令，由 dshb-web-startup 替换\n * 上游 web-startup 实现。该替换会让 webServer 行（inject: [webStartup]）在\n * 运行时启用/停用插件的补丁重载中连带重建，拆断桌面端正在使用的连接\n * （0.1.33 及之前桌面端\"启用即断连\"的根因）。上游 web-startup 与本替换版\n * 功能等价（--host/--port/--trusted-host/--no-open 全部一致），因此 0.1.34\n * 起不再替换，auth-reset 降级为本独立命令。\n */\nexport function runAuthResetCli(argv: readonly string[]): never {\n  const store = sharedCredentialStore()\n  if (!store.isInitialized()) {\n    console.error('dshb-auth-reset: 尚未初始化管理员账号')\n    process.exit(1)\n  }\n  let password: string | undefined\n  let username: string | undefined\n  for (let i = 0; i < argv.length; i += 1) {\n    if (argv[i] === '--password') password = argv[++i]\n    else if (argv[i] === '--username') username = argv[++i]\n  }\n  if (password === undefined && username === undefined) {\n    console.error('dshb-auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>')\n    process.exit(1)\n  }\n  if (password !== undefined && password.length < 8) {\n    console.error('dshb-auth-reset: 密码至少 8 个字符')\n    process.exit(1)\n  }\n  if (username !== undefined) {\n    username = sanitizeUsername(username)\n    if (!username) {\n      console.error('dshb-auth-reset: 用户名不能为空')\n      process.exit(1)\n    }\n  }\n  if (password !== undefined) store.changePassword(username ?? store.username!, password)\n  else store.changeUsername(username!)\n  console.log('dshb-auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废')\n  process.exit(0)\n}\n\nconst invokedDirectly = process.argv[1]?.endsWith('reset-cli.js') === true\n  || process.argv[1]?.endsWith('dshb-auth-reset') === true\nif (invokedDirectly) runAuthResetCli(process.argv.slice(2))\n"],"mappings":";;;;;;;;;;;;AAYA,SAAgB,gBAAgB,MAAgC;CAC9D,MAAM,QAAQ,sBAAsB;CACpC,IAAI,CAAC,MAAM,cAAc,GAAG;EAC1B,QAAQ,MAAM,6BAA6B;EAC3C,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI;CACJ,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK,GACpC,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;MAC3C,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;CAEvD,IAAI,aAAa,KAAA,KAAa,aAAa,KAAA,GAAW;EACpD,QAAQ,MAAM,4DAA4D;EAC1E,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,KAAa,SAAS,SAAS,GAAG;EACjD,QAAQ,MAAM,6BAA6B;EAC3C,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,GAAW;EAC1B,WAAW,iBAAiB,QAAQ;EACpC,IAAI,CAAC,UAAU;GACb,QAAQ,MAAM,0BAA0B;GACxC,QAAQ,KAAK,CAAC;EAChB;CACF;CACA,IAAI,aAAa,KAAA,GAAW,MAAM,eAAe,YAAY,MAAM,UAAW,QAAQ;MACjF,MAAM,eAAe,QAAS;CACnC,QAAQ,IAAI,yCAAyC;CACrD,QAAQ,KAAK,CAAC;AAChB;AAIA,IAFwB,QAAQ,KAAK,EAAE,EAAE,SAAS,cAAc,MAAM,QACjE,QAAQ,KAAK,EAAE,EAAE,SAAS,iBAAiB,MAAM,MACjC,gBAAgB,QAAQ,KAAK,MAAM,CAAC,CAAC"}

package/lib/client.js

@@ -2395,6 +2395,7 @@ window.__ModuleLoader__.load({
 			const [probingRemote, setProbingRemote] = (0, react.useState)(false);
 			const [remoteProbe, setRemoteProbe] = (0, react.useState)(void 0);
 			const [syncing, setSyncing] = (0, react.useState)(false);
+			const [stopping, setStopping] = (0, react.useState)(false);
 			const [notice, setNotice] = (0, react.useState)(void 0);
 			const [hostKeyChallenge, setHostKeyChallenge] = (0, react.useState)(void 0);
 			(0, react.useEffect)(() => {
@@ -2432,6 +2433,7 @@ window.__ModuleLoader__.load({
 				const status = peer.progress?.lastRunStatus;
 				if (!peer.enabled) return "已停用";
 				if (status === "running") return "同步中";
+				if (status === "stopped") return "上次已停止（未完成批次已丢弃）";
 				if (status === "failed") return "上次失败";
 				if (status === "succeeded") return "上次成功";
 				return "尚未同步";
@@ -2609,6 +2611,34 @@ window.__ModuleLoader__.load({
 					setSyncing(false);
 				}
 			};
+			const stopSync = async () => {
+				if (selectedId === "new") return;
+				setStopping(true);
+				try {
+					const response = await fetch(`/api/dshb/sync/peers/${selectedId}/stop`, { method: "POST" });
+					const data = await readJsonResponse(response, "停止同步失败");
+					if (!response.ok || !data.ok) throw new Error(data.error ?? "停止同步失败");
+					setPeers((current) => current.map((peer) => peer.id === selectedId ? {
+						...peer,
+						progress: {
+							...peer.progress,
+							lastRunStatus: data.stopped ? "running" : peer.progress?.lastRunStatus
+						}
+					} : peer));
+					setNotice({
+						kind: "ok",
+						text: data.stopped ? "已请求停止：将在最近的安全边界中止，未完成的批次会被丢弃，已完成的会话保留" : "当前没有运行中的同步作业"
+					});
+					reload();
+				} catch (error) {
+					setNotice({
+						kind: "error",
+						text: error instanceof Error ? error.message : "停止同步失败"
+					});
+				} finally {
+					setStopping(false);
+				}
+			};
 			const restoreArchive = async (branchId) => {
 				const archive = archives.find((entry) => entry.branchId === branchId);
 				if (!archive || !window.confirm(`恢复会话 ${archive.originSessionId} 的归档版本？当前版本将保留在归档中。`)) return;
@@ -2633,6 +2663,7 @@ window.__ModuleLoader__.load({
 			};
 			const progressLabel = (peer) => {
 				if (peer.progress?.lastRunStatus === "running") return "同步中";
+				if (peer.progress?.lastRunStatus === "stopped") return "上次已停止：未完成的批次已丢弃，已完成的会话保留";
 				if (peer.progress?.lastRunStatus === "failed") return `上次失败：${peer.progress.lastErrorMessage ?? "同步失败"}`;
 				if (peer.progress?.lastSuccessAt) return `上次成功：${new Date(peer.progress.lastSuccessAt).toLocaleString()}`;
 				return "尚未同步";
@@ -3256,10 +3287,10 @@ window.__ModuleLoader__.load({
 								}),
 								!isNew && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
-									onClick: () => void runSync(),
-									disabled: busy || probing || syncInProgress || !selectedPeer?.enabled,
+									onClick: () => void (syncInProgress ? stopSync() : runSync()),
+									disabled: busy || probing || stopping || !selectedPeer?.enabled && !syncInProgress,
 									style: secondaryBtn,
-									children: syncInProgress ? "同步中…" : "立即同步"
+									children: stopping ? "正在停止…" : syncInProgress ? "停止同步" : "立即同步"
 								}),
 								!isNew && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",