dsh-auto-open-web 0.1.2 → 0.1.3

package/README.en.md

@@ -86,14 +86,14 @@ whole config; fields not listed fall back to defaults):
 
 This package is a **bundle**: an npm package carrying a configuration layer — `dsh.bundle` in
 `package.json` declares the patch file (`cordis.patch.yml`), and a profile activates the plugin row
-by package name when installed. Published to the **npm registry** (`dsh-auto-open-web@0.1.2`) and
+by package name when installed. Published to the **npm registry** (`dsh-auto-open-web@0.1.3`) and
 **GitHub** (https://github.com/jinsiyu/dsh-auto-open-web, `main` branch).
 
 ### Packaging
 
 ```bash
 cd dsh-auto-open-web
-pnpm pack          # the prepack hook compiles the WebView2 host first (dotnet publish), producing dsh-auto-open-web-0.1.2.tgz
+pnpm pack          # the prepack hook compiles the WebView2 host first (dotnet publish), producing dsh-auto-open-web-0.1.3.tgz
 ```
 
 ### Installation (pick one)
@@ -108,7 +108,7 @@ dsh plugin --profile web add C:\path\to\dsh-auto-open-web
 **Option 2: tarball (published artifact, recommended for delivery; no build permission needed)**
 
 ```bash
-dsh plugin --profile web add ./dsh-auto-open-web-0.1.2.tgz
+dsh plugin --profile web add ./dsh-auto-open-web-0.1.3.tgz
 ```
 
 **Option 3: npm registry (after publishing)**
@@ -150,9 +150,24 @@ without touching the package.
   `host-publish/` (build artifacts are .gitignore'd): for webview2 mode, run
   `pnpm run build:host` inside `node_modules/dsh-auto-open-web` first (requires the .NET SDK);
   browser mode needs no build.
+- This package does not depend on `@deepseek-ai/cordis` (zero code references; the plugin identity
+  comes from the `dsh.bundle` / `dsh.client` fields, and Cordis is provided by the DSH deployment
+  at runtime), so installation produces no peer warnings.
+- **Zero koffi dependency declared**: koffi (driving Windows Job Object / process verification /
+  native file dialog) ships with the **DSH deployment itself** (the official native picker
+  `@deepseek-ai/dsh-host-directory-picker-native` depends on koffi, so the deployment always has
+  it). The plugin resolves it at runtime: normal resolution (profile-installed or manual
+  `pnpm add koffi`) first, then the DSH deployment copy under the Windows global npm layout; if
+  resolution fails, capabilities only degrade (Job Object unavailable → exit / pre-launch cleanup
+  still apply; process verification skipped; native dialog unavailable) with a log entry.
+  **Therefore no platform ever hits koffi build-script blocking** — HarmonyOS and other
+  environments without koffi prebuilds install out of the box, with no `pnpm-workspace.yaml` or
+  other configuration needed; posix platforms use the posix fallback adapter (browser mode works;
+  webview2 / native dialog unavailable), and the platform adapter is loaded conditionally so
+  win32.js is never evaluated on posix.
 - If installing by editing `package.json` manually (not via the `dsh plugin` command), you must add
   both the `dependencies` entry and `dsh.profile.bundles`; when using a local `file:` dependency,
-  `dsh web` normalizes `file:` to `^0.1.2` at startup, which does not affect runtime.
+  `dsh web` normalizes `file:` to `^0.1.3` at startup, which does not affect runtime.
 
 ## Icons
 

package/README.md

@@ -79,14 +79,14 @@ Job Object（强杀也生效）+ 退出清理结束进程树。
 
 本包是**组合包(bundle)**:一个附带配置层的 npm 包——`package.json` 的
 `dsh.bundle` 声明配置层文件(`cordis.patch.yml`),profile 安装它时按包名激活
-插件行。已发布到 **npm registry**(`dsh-auto-open-web@0.1.2`)与 **GitHub**
+插件行。已发布到 **npm registry**(`dsh-auto-open-web@0.1.3`)与 **GitHub**
 （https://github.com/jinsiyu/dsh-auto-open-web，main 分支）。
 
 ### 打包
 
 ```bash
 cd dsh-auto-open-web
-pnpm pack          # prepack 钩子自动先编译 WebView2 宿主(dotnet publish),产出 dsh-auto-open-web-0.1.2.tgz
+pnpm pack          # prepack 钩子自动先编译 WebView2 宿主(dotnet publish),产出 dsh-auto-open-web-0.1.3.tgz
 ```
 
 ### 安装方式(任选其一)
@@ -101,7 +101,7 @@ dsh plugin --profile web add C:\path\to\dsh-auto-open-web
 **方式二:tarball(发布产物,推荐交付;无需构建授权)**
 
 ```bash
-dsh plugin --profile web add ./dsh-auto-open-web-0.1.2.tgz
+dsh plugin --profile web add ./dsh-auto-open-web-0.1.3.tgz
 ```
 
 **方式三:npm 注册表(发布后)**
@@ -141,9 +141,19 @@ dsh plugin --profile web remove dsh-auto-open-web   # 同时移除依赖与对
   main 分支与源码 checkout 方式不含** `host-publish/`(构建产物被
   .gitignore 忽略):webview2 模式需先在 `node_modules/dsh-auto-open-web`
   下执行 `pnpm run build:host` 生成(需 .NET SDK);browser 模式无需构建。
+- **本包零 koffi 依赖声明**:koffi(驱动 Windows 的 Job Object / 进程校验 /
+  原生对话框)由 **DSH 部署自带**(官方原生选择器
+  `@deepseek-ai/dsh-host-directory-picker-native` 依赖 koffi,部署必带),
+  插件运行时解析:常规解析(profile 已装/手动 `pnpm add koffi`)优先,
+  其次 Windows 全局 npm 布局下的 DSH 部署副本;解析失败仅降级(Job
+  Object 不可用 → 退出/预清理兜底;进程校验跳过;对话框不可用)并记录
+  日志。**因此任何平台安装都无 koffi 构建拦截**——鸿蒙等无 koffi
+  预编译的环境开箱即装,无需 `pnpm-workspace.yaml` 等额外配置;posix
+  平台走 posix 降级适配器(browser 模式可用;webview2 / 原生对话框
+  不可用),且平台适配器按平台条件加载,posix 上完全不求值 win32.js。
 - 若手动编辑 `package.json` 安装(不经 dsh plugin 命令),需同时追加
   `dependencies` 与 `dsh.profile.bundles` 两项;使用本地 `file:` 依赖时
-  `dsh web` 启动会把 `file:` 规范化成 `^0.1.2`,运行时不受影响。
+  `dsh web` 启动会把 `file:` 规范化成 `^0.1.3`,运行时不受影响。
 
 ## 图标
 

package/host-publish/DshAppWindow.deps.json

@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v10.0": {
-      "DshAppWindow/0.1.2": {
+      "DshAppWindow/0.1.3": {
         "dependencies": {
           "Microsoft.Web.WebView2": "1.0.3124.44",
           "Microsoft.Web.WebView2.Core": "1.0.3124.44",
@@ -63,7 +63,7 @@
     }
   },
   "libraries": {
-    "DshAppWindow/0.1.2": {
+    "DshAppWindow/0.1.3": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

package/lib/platform.js

@@ -10,12 +10,12 @@
 //   pickBrowserExe()             → Promise<string | null>
 //   resolveHostExe()             → string | null
 //
-// Windows 用 win32.js 全量实现;其余平台用 posix.js 降级实现。
-// 静态 import 两个实现是安全的:两者顶层均无平台副作用。
-import * as win32 from './win32.js';
-import * as posix from './posix.js';
-
-const impl = process.platform === 'win32' ? win32 : posix;
+// 按平台**条件加载**适配器(ESM 顶层 await):
+//   - Windows:加载 win32.js(koffi 驱动 Job Object / 进程校验 / 原生对话框)
+//   - 其他平台(含鸿蒙等无 koffi 预编译的环境):加载 posix.js 降级实现,
+//     完全不求值 win32.js——koffi 仅 Windows 需要(optionalDependencies),
+//     posix 平台不安装、不加载、不依赖。
+const impl = process.platform === 'win32' ? await import('./win32.js') : await import('./posix.js');
 
 export const isWindows = impl.isWindows;
 export const resolveBrowserExe = impl.resolveBrowserExe;

package/lib/win32.js

@@ -11,30 +11,65 @@
 //
 // 平台选择由 platform.js 完成;本文件顶层无平台副作用,非 Windows 上
 // 静态 import 也安全,各函数在 process.platform !== 'win32' 时自行降级。
+//
+// koffi 依赖策略:本包**不声明任何 koffi 依赖**(鸿蒙等无 koffi 的环境
+// 因此安装零拦截),koffi 由 DSH 部署自带(官方原生选择器
+// @deepseek-ai/dsh-host-directory-picker-native 依赖 koffi),运行时经
+// getKoffi() 解析:常规解析(profile 已装/手动安装)优先,其次 Windows
+// 全局 npm 布局下的 DSH 部署副本;解析失败仅降级(Job Object 不可用、
+// 进程校验跳过、对话框不可用),不崩溃。
 import { spawn, spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { join, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { instanceStateFile } from './paths.js';
 
 export const isWindows = process.platform === 'win32';
 
+/**
+ * 解析 koffi(异步):常规 import → Windows 全局 npm 布局的 DSH 部署副本。
+ * 返回 koffi 模块对象(含 .default 时返回 .default),失败返回 null。
+ */
+async function getKoffi() {
+  try {
+    const mod = await import('koffi');
+    return mod && mod.default !== undefined ? mod.default : mod;
+  } catch {
+    /* 常规解析失败,尝试部署副本 */
+  }
+  try {
+    const globalRoot = process.env.APPDATA ? join(process.env.APPDATA, 'npm', 'node_modules') : '';
+    const dshEntry = join(globalRoot, '@deepseek-ai', 'dsh', 'package.json');
+    if (existsSync(dshEntry)) {
+      const koffi = createRequire(dshEntry)('koffi');
+      if (koffi !== null && koffi !== undefined) return koffi;
+    }
+  } catch {
+    /* 部署解析失败 */
+  }
+  console.warn('[auto-open-web] koffi not found (neither local nor DSH deployment); win32 capabilities degraded');
+  return null;
+}
+
 // koffi 在模块求值时预载(ESM 顶层 await):后续所有函数——包括
 // process 'exit' 处理器——都能同步使用,无需异步 import。
 // 加载失败不致命:进程身份校验降级为保守跳过(见 verifyInstancePid)。
 let koffiLib = null;
 let procApi = null;
 try {
-  koffiLib = (await import('koffi')).default;
-  const kernel32 = koffiLib.load('kernel32.dll');
-  const psapi = koffiLib.load('psapi.dll');
-  procApi = {
-    openProcess: kernel32.func('__stdcall', 'OpenProcess', 'void *', ['uint32', 'int', 'uint32']),
-    getImageName: psapi.func('__stdcall', 'GetProcessImageFileNameW', 'uint32', ['void *', 'void *', 'uint32']),
-    getProcessTimes: kernel32.func('__stdcall', 'GetProcessTimes', 'int', ['void *', 'void *', 'void *', 'void *', 'void *']),
-    closeHandle: kernel32.func('__stdcall', 'CloseHandle', 'int', ['void *']),
-    fileTime: koffiLib.struct('DshFileTime', { dwLowDateTime: 'uint32', dwHighDateTime: 'uint32' }),
-  };
+  koffiLib = await getKoffi();
+  if (koffiLib !== null) {
+    const kernel32 = koffiLib.load('kernel32.dll');
+    const psapi = koffiLib.load('psapi.dll');
+    procApi = {
+      openProcess: kernel32.func('__stdcall', 'OpenProcess', 'void *', ['uint32', 'int', 'uint32']),
+      getImageName: psapi.func('__stdcall', 'GetProcessImageFileNameW', 'uint32', ['void *', 'void *', 'uint32']),
+      getProcessTimes: kernel32.func('__stdcall', 'GetProcessTimes', 'int', ['void *', 'void *', 'void *', 'void *', 'void *']),
+      closeHandle: kernel32.func('__stdcall', 'CloseHandle', 'int', ['void *']),
+      fileTime: koffiLib.struct('DshFileTime', { dwLowDateTime: 'uint32', dwHighDateTime: 'uint32' }),
+    };
+  }
 } catch {
   procApi = null;
 }
@@ -103,7 +138,8 @@ let jobExtType = null;
 export async function ensureBrowserJob() {
   if (browserJob !== null) return browserJob;
   try {
-    const koffi = (await import('koffi')).default;
+    const koffi = await getKoffi();
+    if (koffi === null) throw new Error('koffi unavailable');
     const kernel32 = koffi.load('kernel32.dll');
     const createJob = kernel32.func('__stdcall', 'CreateJobObjectW', 'void *', ['void *', 'void *']);
     const setInfo = kernel32.func('__stdcall', 'SetInformationJobObject', 'int', ['void *', 'uint32', 'void *', 'uint32']);

package/lib/worker.cjs

@@ -46,8 +46,31 @@ function guidBytes(text) {
 const CLSID_FILE_OPEN_DIALOG = guidBytes('dc1c5a9c-e88a-4dde-a5a1-60f82a20aef7');
 const IID_IFILE_OPEN_DIALOG = guidBytes('d57c7288-d4ad-4768-be02-9d969532d960');
 
+/**
+ * 解析 koffi(与 win32.js getKoffi 同一策略):常规 import → Windows 全局
+ * npm 布局下的 DSH 部署副本(官方原生选择器依赖 koffi,部署必带)。
+ * 本包不声明 koffi 依赖,失败即抛出(由调用方转为错误消息)。
+ */
+async function loadKoffi() {
+  try {
+    const mod = await import('koffi');
+    if (mod && mod.default !== undefined) return mod.default;
+    return mod;
+  } catch {
+    /* 常规解析失败,尝试部署副本 */
+  }
+  const path = require('node:path');
+  const fs = require('node:fs');
+  const globalRoot = process.env.APPDATA ? path.join(process.env.APPDATA, 'npm', 'node_modules') : '';
+  const koffiDir = path.join(globalRoot, '@deepseek-ai', 'dsh', 'node_modules', 'koffi');
+  if (fs.existsSync(path.join(koffiDir, 'package.json'))) {
+    return require(koffiDir);
+  }
+  throw new Error('koffi not found (neither local nor DSH deployment)');
+}
+
 async function loadWin32DialogBindings() {
-  const koffi = (await import('koffi')).default;
+  const koffi = await loadKoffi();
   const ole32 = koffi.load('ole32.dll');
   const user32 = koffi.load('user32.dll');
   const kernel32 = koffi.load('kernel32.dll');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-auto-open-web",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Open the DSH Web GUI in an app-style WebView2 window on profile start, with a settings card for browser paths",
   "type": "module",
   "main": "lib/index.js",
@@ -40,8 +40,7 @@
     "README.en.md"
   ],
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "koffi": "^3.1.4"
+    "@deepseek-ai/schemastery": "^3.18.1"
   },
   "license": "MIT"
 }