@dong-victor/dsh-better-sidebar-starter 0.1.8 → 0.1.10

package/lib/client.js

@@ -108,6 +108,14 @@ window.__ModuleLoader__.load({
 		function FolderIcon({ size }) {
 			return svg(size, `<path d="M10 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z" fill="currentColor" opacity="0.7"/>`);
 		}
+		/** 👁 Eye — hidden entries are shown (Material visibility). */
+		function EyeIcon({ size }) {
+			return svg(size, `<path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" fill="currentColor"/>`);
+		}
+		/** 🙈 Eye off — hidden entries are concealed (Material visibility_off). */
+		function EyeOffIcon({ size }) {
+			return svg(size, `<path d="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7zM2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3 2 4.27zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2zm4.31-.78l3.15 3.15.02-.16c0-1.66-1.34-3-3-3l-.17.01z" fill="currentColor"/>`);
+		}
 		/** 📋 Clipboard — bulk paste env. */
 		function ClipboardIcon({ size }) {
 			return svg(size, `<path d="M19 3h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm2 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z" fill="currentColor"/>`);
@@ -1089,29 +1097,34 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/DirChooser.tsx
 		/**
-		* Shared directory chooser: a filesystem folder tree (backed by the sidebar
-		* fs.tree API, which can list any absolute path) plus a browse button that
-		* opens a modal popup. Browsing starts at the user's home directory and can
-		* navigate up to any drive/root, so runtime tool paths (JDK/Maven/...) that
-		* live outside the workspace can be selected.
+		* Shared directory chooser: a filesystem folder tree (backed by the starter
+		* plugin's own fs-dirs host route) plus a browse button that opens a modal
+		* popup. Browsing starts at the user's home directory and can navigate up to
+		* any drive/root, so runtime tool paths (JDK/Maven/...) that live outside the
+		* workspace can be selected. The sidebar fs.tree API cannot be used here — it
+		* is workspace-confined since dsh-better-sidebar 0.16 (403 outside the
+		* session workspace).
 		* @module dsh-better-sidebar-starter/client/DirChooser
 		*/
-		/** Call the sidebar fs.tree API directly via fetch. Returns directories only. */
-		async function fsTree$1(scope, path) {
-			const payload = {
-				sessionId: scope.sessionId,
-				path
-			};
-			if (scope.cwd !== void 0 && scope.cwd !== "") payload.cwd = scope.cwd;
-			const resp = await fetch("/sidebar/api/fs.tree", {
+		/** Call the starter fs-dirs host route via fetch. Returns directories only,
+		*  INCLUDING hidden ones (flagged via `hidden`) — visibility is decided at
+		*  render time so the show-hidden toggle works without refetching. */
+		async function fsTree(scope, path) {
+			const resp = await fetch("/api/dsh-better-sidebar-starter/fs-dirs", {
 				method: "POST",
 				headers: { "content-type": "application/json" },
-				body: JSON.stringify(payload)
+				body: JSON.stringify({
+					sessionId: scope.sessionId,
+					path
+				})
 			});
-			if (!resp.ok) throw new Error(`fs.tree ${path}: ${resp.status}`);
-			const parsed = await resp.json();
-			if (!parsed.ok || parsed.value === void 0) throw new Error(`fs.tree ${path}: ${parsed.error?.message ?? "unknown error"}`);
-			return parsed.value.entries.filter((e) => e.isDir && !e.hidden);
+			const parsed = await resp.json().catch(() => void 0);
+			if (!resp.ok) throw new Error(`fs-dirs ${path}: ${parsed?.error ?? resp.status}`);
+			return (parsed?.entries ?? []).filter((e) => e.isDir);
+		}
+		/** Render-time hidden-entry filter shared by the tree components. */
+		function visibleDirs(entries, showHidden) {
+			return showHidden ? entries : entries.filter((e) => !e.hidden);
 		}
 		/** Fetch the user's home directory from the host. Falls back to cwd. */
 		async function fetchHomeDefault(scope) {
@@ -1139,6 +1152,7 @@ window.__ModuleLoader__.load({
 			const [loading, setLoading] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)(null);
 			const [expanded, setExpanded] = (0, react.useState)(/* @__PURE__ */ new Set());
+			const [showHidden, setShowHidden] = (0, react.useState)(false);
 			const scopeRef = (0, react.useRef)(scope);
 			const initDoneRef = (0, react.useRef)(false);
 			const initialValueRef = (0, react.useRef)(selectedPath);
@@ -1163,7 +1177,7 @@ window.__ModuleLoader__.load({
 			const loadDir = (s, path) => {
 				setLoading(true);
 				setError(null);
-				fsTree$1(s, path).then((dirs) => {
+				fsTree(s, path).then((dirs) => {
 					setEntries(dirs);
 					setLoading(false);
 				}).catch((err) => {
@@ -1200,7 +1214,15 @@ window.__ModuleLoader__.load({
 				className: "sts-dirtree-home",
 				onClick: () => loadDir(scopeRef.current, cur),
 				title: "刷新"
-			}, "↻"), (0, react.createElement)("span", {
+			}, "↻"), (0, react.createElement)("button", {
+				className: "sts-dirtree-home",
+				onClick: () => setShowHidden(!showHidden),
+				title: showHidden ? "隐藏隐藏目录" : "显示隐藏目录",
+				style: showHidden ? {
+					color: "#61afef",
+					opacity: 1
+				} : { opacity: .6 }
+			}, (0, react.createElement)(showHidden ? EyeIcon : EyeOffIcon, { size: 13 })), (0, react.createElement)("span", {
 				className: "sts-dirtree-cur",
 				title: cur
 			}, cur || "(.)")), (0, react.createElement)("div", {
@@ -1213,13 +1235,14 @@ window.__ModuleLoader__.load({
 			}, "加载中...") : error !== null ? (0, react.createElement)("div", {
 				className: "sts-tree-error",
 				style: { paddingLeft: "16px" }
-			}, error) : entries !== null && entries.length > 0 ? (0, react.createElement)("div", { className: "sts-dirtree-sub" }, ...entries.map((entry) => (0, react.createElement)(DirRow, {
+			}, error) : entries !== null && visibleDirs(entries, showHidden).length > 0 ? (0, react.createElement)("div", { className: "sts-dirtree-sub" }, ...visibleDirs(entries, showHidden).map((entry) => (0, react.createElement)(DirRow, {
 				key: entry.path,
 				scope,
 				entry,
 				depth: 1,
 				selectedPath,
 				expanded,
+				showHidden,
 				onToggleExpand: toggleExpand,
 				onPick,
 				onNavigate: navigateInto
@@ -1230,7 +1253,7 @@ window.__ModuleLoader__.load({
 		}
 		/** One directory row with recursive expansion + click into. */
 		function DirRow(props) {
-			const { scope, entry, depth, selectedPath, expanded, onToggleExpand, onPick, onNavigate } = props;
+			const { scope, entry, depth, selectedPath, expanded, showHidden, onToggleExpand, onPick, onNavigate } = props;
 			const [children, setChildren] = (0, react.useState)(null);
 			const [loading, setLoading] = (0, react.useState)(false);
 			const isExpanded = expanded.has(entry.path);
@@ -1244,7 +1267,7 @@ window.__ModuleLoader__.load({
 				onToggleExpand(entry.path);
 				if (children === null) {
 					setLoading(true);
-					fsTree$1(scope, entry.path).then((dirs) => {
+					fsTree(scope, entry.path).then((dirs) => {
 						setChildren(dirs);
 						setLoading(false);
 					}).catch(() => {
@@ -1260,13 +1283,14 @@ window.__ModuleLoader__.load({
 			}, (0, react.createElement)("span", { className: `sts-tree-chevron${isExpanded ? " expanded" : ""}` }, (0, react.createElement)(isExpanded ? ChevronDownIcon : ChevronRightIcon, { size: 12 })), (0, react.createElement)("span", { className: "sts-tree-icon" }, (0, react.createElement)(FolderIcon, { size: 14 })), (0, react.createElement)("span", { className: "sts-tree-label" }, entry.name)), isExpanded ? loading ? (0, react.createElement)("div", {
 				className: "sts-tree-loading",
 				style: { paddingLeft: `${(depth + 1) * 16 + 8}px` }
-			}, "加载中...") : children !== null && children.length > 0 ? (0, react.createElement)("div", null, ...children.map((child) => (0, react.createElement)(DirRow, {
+			}, "加载中...") : children !== null && visibleDirs(children, showHidden).length > 0 ? (0, react.createElement)("div", null, ...visibleDirs(children, showHidden).map((child) => (0, react.createElement)(DirRow, {
 				key: child.path,
 				scope,
 				entry: child,
 				depth: depth + 1,
 				selectedPath,
 				expanded,
+				showHidden,
 				onToggleExpand,
 				onPick,
 				onNavigate: props.onNavigate
@@ -1356,23 +1380,6 @@ window.__ModuleLoader__.load({
 		* and environment variables.
 		* @module dsh-better-sidebar-starter/client/ConfigEditorModal
 		*/
-		/** Call the sidebar fs.tree API directly via fetch. Returns directories only.
-		*  If path is omitted, the server uses the session cwd (root listing).
-		*  The sidebar API wraps responses in { ok: true, value: ... } envelope. */
-		async function fsTree(scope, path) {
-			const payload = { sessionId: scope.sessionId };
-			if (scope.cwd !== void 0 && scope.cwd !== "") payload.cwd = scope.cwd;
-			if (path !== void 0) payload.path = path;
-			const resp = await fetch("/sidebar/api/fs.tree", {
-				method: "POST",
-				headers: { "content-type": "application/json" },
-				body: JSON.stringify(payload)
-			});
-			if (!resp.ok) throw new Error(`fs.tree ${path ?? "(root)"}: ${resp.status}`);
-			const parsed = await resp.json();
-			if (!parsed.ok || parsed.value === void 0) throw new Error(`fs.tree ${path ?? "(root)"}: ${parsed.error?.message ?? "unknown error"}`);
-			return parsed.value.entries.filter((e) => e.isDir && !e.hidden);
-		}
 		/** Recursive tree node: loads its own children on expand. */
 		function TreeNode(props) {
 			const { scope, entry, depth, selectedPath, onSelect } = props;
@@ -1383,7 +1390,7 @@ window.__ModuleLoader__.load({
 				if (!expanded && children === null) {
 					setLoading(true);
 					fsTree(scope, entry.path).then((dirs) => {
-						setChildren(dirs);
+						setChildren(dirs.filter((d) => !d.hidden));
 						setLoading(false);
 					}).catch(() => {
 						setChildren([]);
@@ -1426,8 +1433,9 @@ window.__ModuleLoader__.load({
 				if (!expanded && children === null) {
 					setLoading(true);
 					setError(null);
-					fsTree(scope).then((dirs) => {
-						setChildren(dirs);
+					const root = scope.cwd ?? "";
+					(root === "" ? Promise.reject(/* @__PURE__ */ new Error("fs-dirs: 会话工作目录不可用")) : fsTree(scope, root)).then((dirs) => {
+						setChildren(dirs.filter((d) => !d.hidden));
 						setLoading(false);
 					}).catch((err) => {
 						setError(err instanceof Error ? err.message : String(err));
@@ -3104,39 +3112,7 @@ window.__ModuleLoader__.load({
 				icon: (size) => (0, react.createElement)(RocketIcon, { size }),
 				order: 50,
 				single: true,
-				settings: {
-					pluginToggles: [
-						{
-							key: "autoSelectOnStart",
-							type: "switch",
-							title: "启动后自动选中日志"
-						},
-						{
-							key: "autoScroll",
-							type: "switch",
-							title: "自动滚动到最新日志"
-						},
-						{
-							key: "javaHome",
-							type: "text",
-							title: "Java 主目录 (JAVA_HOME)",
-							desc: "Spring Boot 用的 JDK 路径，留空则自动查找"
-						},
-						{
-							key: "nodePath",
-							type: "text",
-							title: "Node.js 路径",
-							desc: "npm 命令用的 Node 路径，留空则用系统默认"
-						},
-						{
-							key: "pythonPath",
-							type: "text",
-							title: "Python 路径",
-							desc: "Python 命令用的解释器路径，留空则用系统默认"
-						}
-					],
-					render: (props) => (0, react.createElement)(SettingsPanel, props)
-				},
+				settings: { render: (props) => (0, react.createElement)(SettingsPanel, props) },
 				component: (props) => (0, react.createElement)(ServicesTab, props)
 			}), "dsh-better-sidebar-starter: services tab");
 		}