@linxin666/dsh-ssh 0.1.3 → 0.1.7

package/lib/index.js

@@ -1052,17 +1052,17 @@ function validateHostPayload(payload) {
 		if (typeof auth !== "object" || auth === null) return "auth must be an object";
 		if (auth.kind !== "key" && auth.kind !== "password") return "auth.kind must be key or password";
 		if (auth.kind === "key" && (typeof auth.keyPath !== "string" || auth.keyPath.trim() === "")) return "auth.keyPath is required for key auth";
-		if (auth.kind === "password" && (typeof auth.password !== "string" || auth.password === "")) return "auth.password is required for password auth";
+		if (auth.kind === "password" && auth.password !== void 0 && typeof auth.password !== "string") return "auth.password must be a string when provided";
 	}
 	if (p.port !== void 0 && (typeof p.port !== "number" || !Number.isInteger(p.port) || p.port < 1 || p.port > 65535)) return "port must be an integer in 1..65535";
 	if (p.proxyJump !== void 0 && (!Array.isArray(p.proxyJump) || p.proxyJump.some((x) => typeof x !== "string" || x === ""))) return "proxyJump must be an array of alias strings";
 	if (p.tags !== void 0 && (!Array.isArray(p.tags) || p.tags.some((x) => typeof x !== "string"))) return "tags must be an array of strings";
 }
-/** The alias grammar (same as the scaffold rule: lowercase, digits, single hyphens). */
-const ALIAS_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/;
+/** Alias grammar: letters/digits plus dots, hyphens, underscores (IP/domain aliases included). */
+const ALIAS_RE = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;
 /** Validate an alias for creation. */
 function validateAlias(alias) {
-	if (!ALIAS_RE.test(alias)) return "alias must be lowercase letters, digits and single hyphens";
+	if (!ALIAS_RE.test(alias)) return "alias must be letters, digits, dots, hyphens or underscores";
 }
 /**
 * The host store. Pure file I/O — no cordis dependency, unit-testable.
@@ -1160,7 +1160,7 @@ var HostStore = class {
 			const auth = patch.auth;
 			if (auth.kind !== "key" && auth.kind !== "password") throw new Error("auth.kind must be key or password");
 			if (auth.kind === "key" && (typeof auth.keyPath !== "string" || auth.keyPath.trim() === "")) throw new Error("auth.keyPath is required for key auth");
-			if (auth.kind === "password" && (typeof auth.password !== "string" || auth.password === "")) throw new Error("auth.password is required for password auth");
+			if (auth.kind === "password" && auth.password !== void 0 && typeof auth.password !== "string") throw new Error("auth.password must be a string when provided");
 			const keyChanged = auth.kind === "key" && auth.keyPath !== void 0 && expandHome(auth.keyPath.trim()) !== entry.auth.keyPath;
 			entry.auth = {
 				kind: auth.kind,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-ssh",
   "description": "Remote SSH operations for the dsh web GUI: host config store (~/.dsh/dsh-ssh.json, import from ~/.ssh/config), a persistent ssh2 connection pool with jump-host support, exec / PTY web terminal / SFTP transfer / local port-forward tunnels / cluster execution, plus agent tools (ssh_list, ssh_exec, ssh_upload, ssh_download, ssh_tunnel, ssh_cluster). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules symlink, no dsh source changes.",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/client/sidebar-entry.ts

@@ -92,25 +92,37 @@ export function mountSidebarEntry(controller: PanelController): () => void {
   let placed = false
 
   const tryPlace = (): void => {
-    if (placed) return
     if (root !== undefined && !root.isConnected) {
-      // The shell re-created the sidebar pane; re-query from scratch.
+      // The shell rebuilt the sidebar pane (whole-tree teardown); the root
+      // observer is gone with the old tree, so detach it and re-query from
+      // scratch. The new pane is later noticed by the body-level watcher.
       rootObserver.disconnect()
       root = undefined
+      placed = false
+    }
+    if (placed) {
+      // Cheap short-circuit: entry still lives in a mountable subtree.
+      if (document.body.contains(entry)) return
+      // Entry was torn down together with the old tree; reset and re-place.
+      rootObserver.disconnect()
+      root = undefined
+      placed = false
     }
     root ??= sidebarRoot()
     if (root === undefined) return
     placed = placeEntry(root, entry)
     if (placed) {
       rootObserver.observe(root, { childList: true, subtree: true })
-      // Placement done; the root observer alone keeps the entry healed.
-      // Disconnect the body-wide watcher so unrelated app mutations (e.g.
-      // chat streaming) no longer churn every plugin's self-heal loop.
-      waitObserver.disconnect()
     }
   }
 
-  // The shell renders after boot settlement; watch for its arrival.
+  // Body-level watcher retained as the "whole rebuild" fallback: when the shell
+  // tears down the whole sidebar pane, the root observer is gone with it and
+  // only this body observation can notice the new pane mounting. It is no
+  // longer disconnected after placement; the placed-and-still-mounted case
+  // short-circuits through the cheap document.body.contains(entry) check, so
+  // unrelated app mutations (e.g. chat streaming) cost one contains check
+  // instead of churning the full re-query.
   const waitObserver = new MutationObserver(() => { tryPlace() })
   waitObserver.observe(document.body, { childList: true, subtree: true })
 

package/src/store.ts

@@ -42,8 +42,8 @@ export function validateHostPayload(payload: unknown): string | undefined {
     if (auth.kind === 'key' && (typeof auth.keyPath !== 'string' || auth.keyPath.trim() === '')) {
       return 'auth.keyPath is required for key auth'
     }
-    if (auth.kind === 'password' && (typeof auth.password !== 'string' || auth.password === '')) {
-      return 'auth.password is required for password auth'
+    if (auth.kind === 'password' && auth.password !== undefined && typeof auth.password !== 'string') {
+      return 'auth.password must be a string when provided'
     }
   }
   if (p.port !== undefined && (typeof p.port !== 'number' || !Number.isInteger(p.port) || p.port < 1 || p.port > 65535)) {
@@ -58,12 +58,12 @@ export function validateHostPayload(payload: unknown): string | undefined {
   return undefined
 }
 
-/** The alias grammar (same as the scaffold rule: lowercase, digits, single hyphens). */
-const ALIAS_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/
+/** Alias grammar: letters/digits plus dots, hyphens, underscores (IP/domain aliases included). */
+const ALIAS_RE = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/
 
 /** Validate an alias for creation. */
 export function validateAlias(alias: string): string | undefined {
-  if (!ALIAS_RE.test(alias)) return 'alias must be lowercase letters, digits and single hyphens'
+  if (!ALIAS_RE.test(alias)) return 'alias must be letters, digits, dots, hyphens or underscores'
   return undefined
 }
 
@@ -188,8 +188,8 @@ export class HostStore {
       if (auth.kind === 'key' && (typeof auth.keyPath !== 'string' || auth.keyPath.trim() === '')) {
         throw new Error('auth.keyPath is required for key auth')
       }
-      if (auth.kind === 'password' && (typeof auth.password !== 'string' || auth.password === '')) {
-        throw new Error('auth.password is required for password auth')
+      if (auth.kind === 'password' && auth.password !== undefined && typeof auth.password !== 'string') {
+        throw new Error('auth.password must be a string when provided')
       }
       // A changed key path with no passphrase means the new key has none;
       // only keep the old passphrase when the key path is unchanged.