@linxin666/dsh-ssh 0.4.3 → 0.4.4

package/lib/client.js

@@ -115,6 +115,7 @@ window.__ModuleLoader__.load({
 			"terminal.ready": "终端已连接（{alias}）",
 			"terminal.exited": "终端已退出（{alias}）",
 			"terminal.error": "终端错误：{error}",
+			"terminal.noWebSocket": "当前页面不支持 WebSocket（应用外壳只转发 HTTP），请改用浏览器打开的 Web 界面使用终端。",
 			"terminal.auth.title": "二次身份验证 (2FA / 交互式认证)",
 			"terminal.auth.submit": "提交验证码",
 			"terminal.auth.cancel": "取消",
@@ -270,6 +271,7 @@ window.__ModuleLoader__.load({
 			"terminal.ready": "Terminal connected ({alias})",
 			"terminal.exited": "Terminal exited ({alias})",
 			"terminal.error": "Terminal error: {error}",
+			"terminal.noWebSocket": "This page cannot carry a WebSocket (the application shell forwards HTTP only). Open the Web UI in a browser to use the terminal.",
 			"terminal.auth.title": "Two-Factor Authentication (2FA)",
 			"terminal.auth.submit": "Submit Code",
 			"terminal.auth.cancel": "Cancel",
@@ -447,6 +449,63 @@ window.__ModuleLoader__.load({
 			const text = search.toString();
 			return text === "" ? "" : "?" + text;
 		}
+		/**
+		* The WebSocket URL the terminal route is reached at, or undefined when this
+		* page cannot carry one.
+		*
+		* A page delivered by an application on this machine (the official DSH
+		* Desktop shell serves its Web GUI from `dsh-app://app/`) has no WebSocket
+		* transport: its scheme handler forwards HTTP requests to the local host but
+		* cannot upgrade a socket, so `ws://app/...` never connects and the terminal
+		* reports "connection error" (issue #1744). Every other page is a web page and
+		* resolves the socket against its own origin, exactly as before.
+		*
+		* A blank authority is treated the same as an application scheme: there is
+		* nothing to dial, and the caller gets the actionable reason instead of a
+		* socket that can only fail.
+		*
+		* @param location - the page location to read.
+		* @param search - the query string carrying `alias` or `session`.
+		* @returns the absolute `ws:`/`wss:` URL, or undefined when the page cannot carry one.
+		*/
+		function terminalSocketUrl(location, search) {
+			if (WEB_PAGE_PROTOCOLS.includes(location.protocol)) return (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + SSH_API.terminal + search;
+		}
+		/**
+		* Schemes a network page can be delivered with. Every other scheme belongs to
+		* an application on this machine, which is the same classification the remote
+		* channel and the update seat use (`isWebPageProtocol` / `isApplicationDeliveredPage`).
+		*/
+		const WEB_PAGE_PROTOCOLS = [
+			"http:",
+			"https:",
+			"blob:",
+			"data:",
+			"about:",
+			"filesystem:"
+		];
+		/**
+		* A terminal connection that never opened: it reports one failure once the
+		* view has attached its `onExit`, so the tab shows why instead of sitting on a
+		* spinner, and every later frame is a no-op.
+		*/
+		function failedTerminal(reason) {
+			const connection = {
+				onReady: void 0,
+				onOutput: void 0,
+				onExit: void 0,
+				onAuthPrompt: void 0,
+				send: () => void 0,
+				resize: () => void 0,
+				sendAuthResponse: () => void 0,
+				detach: () => void 0,
+				close: () => void 0
+			};
+			queueMicrotask(() => {
+				connection.onExit?.(null, reason);
+			});
+			return connection;
+		}
 		/** The browser half's only data entry point. */
 		var SshApi = class {
 			async listHosts(queryText) {
@@ -674,8 +733,14 @@ window.__ModuleLoader__.load({
 			}
 			/** One terminal socket over either an alias (open) or a session id (attach). */
 			terminalSocket(search) {
-				const url = (window.location.protocol === "https:" ? "wss" : "ws") + "://" + window.location.host + SSH_API.terminal + search;
-				const socket = new WebSocket(url);
+				const target = terminalSocketUrl(window.location, search);
+				if (target === void 0) return failedTerminal(tt("terminal.noWebSocket"));
+				let socket;
+				try {
+					socket = new WebSocket(target);
+				} catch (error) {
+					return failedTerminal(error instanceof Error ? error.message : String(error));
+				}
 				let leaving = false;
 				const sendFrame = (frame) => {
 					if (socket.readyState === WebSocket.OPEN) socket.send(JSON.stringify(frame));
@@ -16302,7 +16367,7 @@ window.__ModuleLoader__.load({
 		/** The building package's version, when the bundle carries it. */
 		function bakedVersion() {
 			try {
-				return "0.4.3";
+				return "0.4.4";
 			} catch {
 				return;
 			}
@@ -16379,7 +16444,8 @@ window.__ModuleLoader__.load({
 		const inject = [
 			"slots",
 			"locale",
-			"configForms"
+			"configForms",
+			"layout"
 		];
 		/**
 		* Mount the SSH panel.
@@ -16401,7 +16467,7 @@ window.__ModuleLoader__.load({
 				setRuntimeTranslate(ctx.locale.bind(NS));
 			} catch {}
 			const controller = new PanelController({ panel: { select: (panelId) => {
-				ctx.get("layout")?.selectPanel?.(panelId);
+				(ctx.get?.("layout"))?.selectPanel?.(panelId);
 			} } });
 			const api = new SshApi();
 			const settings = bindSettingsReader(ctx, SETTINGS_NS, TERMINAL_FONT_FIELD);
@@ -16418,7 +16484,7 @@ window.__ModuleLoader__.load({
 			const disposers = [];
 			try {
 				disposers.push(registerSshPanel(ctx, controller, api, terminalFont));
-				const layoutFace = ctx.get("layout");
+				const layoutFace = ctx.get?.("layout");
 				if (layoutFace?.panelInfo !== void 0) {
 					const sync = () => {
 						const active = layoutFace.panelInfo.getSnapshot().activePanelId;