@linxin666/dsh-ssh 0.2.4 → 0.2.5

package/lib/client.js

@@ -36,6 +36,16 @@ window.__ModuleLoader__.load({
 				this.name = "SshApiError";
 			}
 		};
+		/** Extract the `.error` message from a JSON error body; undefined when absent. */
+		function extractError(text) {
+			if (text === "") return void 0;
+			try {
+				const parsed = JSON.parse(text);
+				return typeof parsed?.error === "string" ? parsed.error : void 0;
+			} catch {
+				return;
+			}
+		}
 		/** Parse a JSON response or throw an SshApiError. */
 		async function readJson(response) {
 			let body;
@@ -159,7 +169,7 @@ window.__ModuleLoader__.load({
 					method: "POST",
 					body: file
 				});
-				if (!response.ok || response.body === null) throw new SshApiError(`upload failed: HTTP ${response.status}`);
+				if (!response.ok || response.body === null) throw new SshApiError(extractError(await response.text().catch(() => "")) ?? `upload failed: HTTP ${response.status}`);
 				const reader = response.body.getReader();
 				const decoder = new TextDecoder();
 				let buffer = "";
@@ -202,10 +212,7 @@ window.__ModuleLoader__.load({
 					alias,
 					remotePath
 				}));
-				if (!response.ok || response.body === null) {
-					const text = await response.text().catch(() => "");
-					throw new SshApiError(text !== "" && text.startsWith("{") ? text : `download failed: HTTP ${response.status}`);
-				}
+				if (!response.ok || response.body === null) throw new SshApiError(extractError(await response.text().catch(() => "")) ?? `download failed: HTTP ${response.status}`);
 				const total = Number(response.headers.get("content-length") ?? "0");
 				const disposition = response.headers.get("content-disposition") ?? "";
 				const filename = /filename="([^"]+)"/.exec(disposition)?.[1] ?? remotePath.split("/").pop() ?? "download";
@@ -365,6 +372,7 @@ window.__ModuleLoader__.load({
 			"form.passphrase": "密钥口令",
 			"form.password": "密码",
 			"form.passwordHint": "明文保存在 ~/.dsh/dsh-ssh.json（本机私有文件）",
+			"form.passwordRequired": "密码认证需要填写密码。",
 			"form.proxyJump": "跳板机别名",
 			"form.proxyJumpHint": "逗号分隔的本地主机别名，按顺序连接",
 			"form.description": "备注",
@@ -502,6 +510,7 @@ window.__ModuleLoader__.load({
 			"form.passphrase": "Key passphrase",
 			"form.password": "Password",
 			"form.passwordHint": "Stored in plaintext in ~/.dsh/dsh-ssh.json (private local file)",
+			"form.passwordRequired": "Password auth requires a password.",
 			"form.proxyJump": "Jump host aliases",
 			"form.proxyJumpHint": "Comma-separated local aliases, chained in order",
 			"form.description": "Description",
@@ -964,6 +973,10 @@ window.__ModuleLoader__.load({
 					setError(tt("form.portInvalid"));
 					return;
 				}
+				if (editing == null && form.authKind === "password" && form.password === "") {
+					setError(tt("form.passwordRequired"));
+					return;
+				}
 				const secretEmpty = form.authKind === "password" ? form.password === "" : form.keyPath.trim() === "";
 				const payload = {
 					host,