dsh-auto-open-web 0.1.13 → 0.1.19

package/README.en.md

@@ -68,7 +68,11 @@ cleanup.
 - Windows 10 1803+ / Windows 11 / Windows Server 2016+
   (Win7/8.1 reached end of support in 2023-01, see Microsoft announcements)
 - WebView2 Runtime (evergreen, usually preinstalled with Edge; verified with 151.x locally)
-- .NET 10 runtime (installed with the SDK; can be switched to a self-contained publish if needed)
+- **No .NET 10 runtime required**: since 0.1.15 the host targets **.NET Framework 4.7.2**,
+  built into Windows 10 1803+ / Windows 11 (4.8.x on Win11) — no .NET Core/10 runtime or
+  self-contained publish is needed. The build machine needs a .NET SDK and the .NET
+  Framework 4.x targeting packs (installed with VS/SDK; without them add the
+  `Microsoft.NETFramework.ReferenceAssemblies` NuGet package to the csproj).
 
 ## Configuration
 
@@ -201,8 +205,13 @@ without touching the package.
   plugin-generated DSH .ico (`~/.dsh/auto-open-web-icon.ico`), independent of browser taskbar
   identity rules. The .ico is built by fetching the local `favicon.svg` and rasterizing it with
   **sharp** (bundled with the deployment, resolved upward at runtime, not declared as a dependency)
-  into 16/32/48/64/128/256 PNGs; when sharp is unavailable the host falls back to the default window
-  icon.
+  into 16/32/48/64/128/256 PNGs.
+- **Fixed-icon policy (since 0.1.14)**: once written, the .ico is cached and reused — later
+  starts return the existing non-empty cache directly (no favicon fetch / rasterization, so the
+  icon cannot vanish on a transient favicon/sharp failure, and starts are faster); it is
+  generated only when the cache is missing. **Extra safety net**: `host/icon.ico` (same source as
+  the cache) is embedded into the host exe via `<ApplicationIcon>`, so even with a missing cache
+  the window/taskbar shows the DSH icon instead of the default one.
 
 ## Platform support
 

package/README.md

@@ -63,7 +63,11 @@ Job Object（强杀也生效）+ 退出清理结束进程树。
 - Windows 10 1803+ / Windows 11 / Windows Server 2016+
   （Win7/8.1 已于 2023-01 终止支持，见微软公告）
 - WebView2 Runtime（常青版，通常随 Edge 预装；本机已验证 151.x）
-- .NET 10 运行时（随 SDK 安装；也可改为自包含发布，需时再调）
+- **无 .NET 10 运行时要求**：宿主自 0.1.15 起目标 **.NET Framework 4.7.2**，
+  由 Windows 10 1803+ / Windows 11 **操作系统自带**（Win11 为 4.8.x），
+  无需安装任何 .NET Core/10/自包含运行时。构建机需 .NET SDK 与 .NET
+  Framework 4.x 定位包（随 VS/SDK 安装；无定位包时给 csproj 加
+  `Microsoft.NETFramework.ReferenceAssemblies` NuGet 包）。
 
 ## 配置
 
@@ -191,8 +195,12 @@ dsh plugin --profile web remove dsh-auto-open-web   # 同时移除依赖与对
 - **任务栏/窗口图标（WebView2 宿主）**：宿主进程直接设置 `Form.Icon` = 插件生成的
   DSH .ico（`~/.dsh/auto-open-web-icon.ico`），与浏览器任务栏身份机制无关。
   .ico 来源：抓取本机 `favicon.svg`，用 **sharp**（部署自带，运行时向上解析，
-  未声明为依赖）栅格化为 16/32/48/64/128/256 PNG 后组装；sharp 不可用时
-  宿主退回默认窗口图标。
+  未声明为依赖）栅格化为 16/32/48/64/128/256 PNG 后组装。
+- **图标固定策略（自 0.1.14）**：生成的 .ico 一经写盘即**缓存固定**——后续启动
+  检测到缓存存在且非空就直接复用，不再抓取 favicon/栅格化（图标不会因某次
+  favicon 或 sharp 瞬时失败而消失，启动也更快）；仅缓存缺失时生成一次。
+  另有**兜底**：`host/icon.ico`（与缓存同源）已通过 `<ApplicationIcon>`
+  嵌入宿主 exe，即使缓存文件缺失，窗口/任务栏也显示 DSH 图标而非默认图标。
 
 ## 平台支持
 

package/host-publish/DshAppWindow.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+</configuration>

package/lib/client.js

@@ -94,15 +94,26 @@ window.__ModuleLoader__.load({
     injectCss(CONTROLS_TAG, CONTROLS_CSS)
 
     // ── 共享模块 ─────────────────────────────────────────────────────────
-    // 仅 react(壳层静态模块)+ dsh-client-runtime(动态包,快照 store)。
-    // runtime 缺失或版本不含 createSnapshotStore 时退化为内置最小实现。
-    var runtime = null
+    // 快照 store 解析顺序(与 gowin 插件同款,双版本兼容):
+    //   @deepseek-ai/dsh-client-store(当前壳层静态模块,dsh >= 0.1.2-alpha.1)
+    //   → @deepseek-ai/dsh-client-runtime(rc8 动态包) → 内置最小实现。
+    // 缺失或版本不含 createSnapshotStore 时退化为内置实现,绝不抛错。
+    var createSnapshotStore = null
     try {
-      runtime = require('@deepseek-ai/dsh-client-runtime')
+      createSnapshotStore = require('@deepseek-ai/dsh-client-store').createSnapshotStore
     } catch (e) {
-      console.error('[auto-open-web] runtime require failed:', e !== null && e !== undefined && e.message !== undefined ? e.message : String(e))
+      console.error('[auto-open-web] dsh-client-store require failed:', e !== null && e !== undefined && e.message !== undefined ? e.message : String(e))
+    }
+    if (createSnapshotStore === undefined || createSnapshotStore === null) {
+      try {
+        createSnapshotStore = require('@deepseek-ai/dsh-client-runtime').createSnapshotStore
+      } catch (e) {
+        console.error('[auto-open-web] dsh-client-runtime require failed:', e !== null && e !== undefined && e.message !== undefined ? e.message : String(e))
+      }
+    }
+    if (createSnapshotStore === undefined || createSnapshotStore === null) {
+      createSnapshotStore = fallbackSnapshotStore
     }
-    var createSnapshotStore = runtime !== null && runtime.createSnapshotStore !== undefined ? runtime.createSnapshotStore : fallbackSnapshotStore
     function fallbackSnapshotStore(init) {
       let value = init
       const listeners = new Set()

package/lib/index.js

@@ -31,7 +31,7 @@
  * (WebView2 宿主例外:随 DSH 退出而关闭)。
  */
 import { spawn } from 'node:child_process';
-import { existsSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
@@ -354,8 +354,13 @@ function normalizeState(next) {
 // ── 图标栅格化(WebView2 宿主窗口图标需要 .ico;共通) ─────────────────────
 //
 // GUI 自带的 manifest 只有 SVG 图标(favicon.svg)。这里抓取本机 favicon.svg,
-// 用 sharp(部署自带,运行时向上解析,未声明为依赖)栅格化为多尺寸 PNG 并缓存,
-// 再组装成 .ico 供宿主窗口的 Form.Icon 使用;失败仅告警(宿主退回默认图标)。
+// 用 sharp(部署自带,运行时向上解析,未声明为依赖)栅格化为多尺寸 PNG,
+// 再组装成 .ico 供宿主窗口的 Form.Icon 使用;失败仅告警(宿主退回内置图标)。
+//
+// **图标固定策略**(0.1.14):生成的 .ico 缓存于 `~/.dsh/auto-open-web-icon.ico`,
+// 缓存存在且非空时**直接复用,不再每次启动抓取 favicon 并栅格化**——图标一经
+// 生成即固定不变,也不会因某次启动的 favicon/sharp 瞬时失败而消失;
+// 仅缓存缺失(首次运行/被删除)时生成一次,之后永不改写。
 let iconCache = null;
 let iconFetching = null;
 
@@ -414,13 +419,15 @@ function buildIco(pngs) {
   return Buffer.concat([header, ...entries, ...sizes.map((s) => pngs.get(s))]);
 }
 
-/** 生成宿主窗口用的 DSH .ico(缓存于 ~/.dsh/auto-open-web-icon.ico),失败返回 null。 */
+/** 生成宿主窗口用的 DSH .ico(缓存于 ~/.dsh/auto-open-web-icon.ico),失败返回 null。
+ *  缓存存在且非空时直接复用(固定图标,不再生成);仅在缓存缺失时生成并写盘。 */
 async function ensureIconFile(server) {
+  const out = join(dshHome(), 'auto-open-web-icon.ico');
   try {
+    if (existsSync(out) && statSync(out).size > 0) return out;
     const icons = await getIcons(server);
     if (icons === null) return null;
     const ico = buildIco(icons.pngs);
-    const out = join(dshHome(), 'auto-open-web-icon.ico');
     writeFileSync(out, ico);
     return out;
   } catch (error) {
@@ -474,6 +481,17 @@ export function apply(ctx, config) {
     return;
   }
 
+  // 认证 GUI 地址:当前 dsh web 的连接服务提供带进程启动令牌的 URL(browser-auth:
+  // 首次访问 /?token= 交换签名 cookie;直接打开裸地址会得到 401「authentication
+  // required」)。连接服务缺失时以裸地址兜底(旧版 dsh 无认证,行为不变)。
+  const guiUrl = () => {
+    const base = `http://127.0.0.1:${String(server.port)}`;
+    const connection = ctx.get('connection');
+    return connection !== undefined && typeof connection.authenticatedUrl === 'function'
+      ? connection.authenticatedUrl(base)
+      : base;
+  };
+
   // ---- 配置状态:行配置为种子;settings 命名空间持久化(设置卡片写入) ----
   const settingsSvc = ctx.get('settings');
   let scope = null;
@@ -566,7 +584,7 @@ export function apply(ctx, config) {
           sendJson(res, 200, { ok: false, error: 'webServer 端口不可用,请稍后重试' });
           return;
         }
-        const url = `http://127.0.0.1:${String(server.port)}`;
+        const url = guiUrl();
         const result = await testBrowserLaunch(resolved.exe, resolved.browser, url);
         if (result.ok !== true) {
           sendJson(res, 200, { ok: false, error: result.error });
@@ -590,7 +608,7 @@ export function apply(ctx, config) {
       console.error('[auto-open-web] webServer port unavailable; not opening anything');
       return;
     }
-    const url = `http://127.0.0.1:${String(server.port)}`;
+    const url = guiUrl();
 
     // 与官方相同的打开抑制:--no-open(webStartup.openBrowser === false)或
     // SSH 会话时不打开任何窗口/页面(官方同样不交接)。
@@ -660,5 +678,32 @@ export function apply(ctx, config) {
     // 行为与未安装本插件时的官方默认完全一致。
     await fallbackOpen('appWindow disabled (official default-browser handoff)');
   };
-  void attempt();
+  // 与官方 web-app 相同:等连接服务就绪后打开,URL 才携带启动令牌
+  // (browser-auth)。双版本兼容:旧版 dsh(rc8)没有连接服务或它没有
+  // authenticatedUrl——后者会走 guiUrl 的裸地址回退;前者等待数秒仍无
+  // 连接服务时以裸地址兜底打开,保持 rc8 原有的自动打开行为。
+  let opened = false;
+  const openOnce = () => {
+    if (opened) return;
+    opened = true;
+    // 与官方 web-app 的 announceReady 完全相同:等 Loader 树完全 settle 后再
+    // 打开。否则窗口会在宿主控制器(workspace/session-controller)仍未就绪时
+    // 首载,工作区/会话列表为空,必须刷新一次才能看到。
+    const settled = ctx.get('loader')?.await?.();
+    if (settled === undefined) {
+      void attempt();
+      return;
+    }
+    void settled.then(() => {
+      // 树在等待期间被退出(SIGTERM / appExit):静默跳过。
+      if (ctx.get('webServer') === undefined) return;
+      void attempt();
+    }, () => { /* 启动失败由 fail-loud 报告 */ });
+  };
+  if (ctx.get('connection') !== undefined) {
+    openOnce();
+  } else {
+    ctx.inject(['connection'], () => { openOnce(); });
+    setTimeout(() => { if (ctx.get('connection') === undefined) openOnce(); }, 5000);
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-auto-open-web",
-  "version": "0.1.13",
+  "version": "0.1.19",
   "description": "Open the DSH Web GUI in an app-style WebView2 window on profile start, with a settings card for browser paths",
   "repository": {
     "type": "git",

package/host-publish/DshAppWindow.deps.json

@@ -1,94 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v10.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v10.0": {
-      "DshAppWindow/0.1.5": {
-        "dependencies": {
-          "Microsoft.Web.WebView2": "1.0.3124.44",
-          "Microsoft.Web.WebView2.Core": "1.0.3124.44",
-          "Microsoft.Web.WebView2.WinForms": "1.0.3124.44",
-          "Microsoft.Web.WebView2.Wpf": "1.0.3124.44"
-        },
-        "runtime": {
-          "DshAppWindow.dll": {}
-        }
-      },
-      "Microsoft.Web.WebView2/1.0.3124.44": {
-        "runtimeTargets": {
-          "runtimes/win-arm64/native/WebView2Loader.dll": {
-            "rid": "win-arm64",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          },
-          "runtimes/win-x64/native/WebView2Loader.dll": {
-            "rid": "win-x64",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          },
-          "runtimes/win-x86/native/WebView2Loader.dll": {
-            "rid": "win-x86",
-            "assetType": "native",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.Core/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.Core.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.WinForms/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.WinForms.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      },
-      "Microsoft.Web.WebView2.Wpf/1.0.3124.44": {
-        "runtime": {
-          "Microsoft.Web.WebView2.Wpf.dll": {
-            "assemblyVersion": "1.0.3124.44",
-            "fileVersion": "1.0.3124.44"
-          }
-        }
-      }
-    }
-  },
-  "libraries": {
-    "DshAppWindow/0.1.5": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2/1.0.3124.44": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-sQb+ACD3ILvHxztxqCWLbhYmFNf5dH0HPhVKFYg020rpeQPkadH0nkVOSsgfSyBDMLypI9iMBeD6uVcVxsKLkg==",
-      "path": "microsoft.web.webview2/1.0.3124.44",
-      "hashPath": "microsoft.web.webview2.1.0.3124.44.nupkg.sha512"
-    },
-    "Microsoft.Web.WebView2.Core/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2.WinForms/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Web.WebView2.Wpf/1.0.3124.44": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}

package/host-publish/DshAppWindow.runtimeconfig.json

@@ -1,20 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net10.0",
-    "frameworks": [
-      {
-        "name": "Microsoft.NETCore.App",
-        "version": "10.0.0"
-      },
-      {
-        "name": "Microsoft.WindowsDesktop.App",
-        "version": "10.0.0"
-      }
-    ],
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false,
-      "CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS": false
-    }
-  }
-}