dsh-moli 1.0.6 → 1.1.1

package/README.md

@@ -255,6 +255,32 @@ capabilities always visible to the model.
    resolves against the plugin directory instead of the profile's `node_modules` and the plugin
    fails to load. This plugin imports only `node:` builtins and its own files.
 
+## Platform support
+
+Works on **Windows, Linux and macOS** (x64 / arm64).
+
+> **Linux and macOS support was contributed by [@nd002723](https://github.com/nd002723)** in
+> [PR #1](https://github.com/27painter/dsh-moli/pull/1): engine discovery in the standard POSIX
+> locations, the `sh` installer route, and the per-platform gating of the PowerShell paths.
+
+| Platform | Status |
+|---|---|
+| **Windows** | Verified by the maintainer |
+| **Linux** | Verified by the contributor on Ubuntu 24.04 LTS, Node v24.21.0, DSH 0.2.1-alpha.2, dsh-moli 1.1.0, Moli 1.1.17 |
+| **macOS** | Implemented, not yet verified on a real host |
+
+- **Windows** — the engine is located at the official installer paths (`%LOCALAPPDATA%\Moli\bin\moli.exe`,
+  `%USERPROFILE%\.local\bin\moli.exe`) with a recursive scan of `%LOCALAPPDATA%\Moli` as a fallback.
+  `moli_probe action=install` runs the official PowerShell installer.
+- **Linux / macOS** — the engine is found in the standard locations (`~/.local/bin/moli`,
+  `~/.local/share/moli/bin/moli`, `~/.local/share/moli/moli`, `~/.moli/bin/moli`) and on `$PATH`.
+  `moli_probe action=install` runs the official `moli-installer.sh` via `sh`.
+
+On Linux, `moli_probe` discovered `~/.local/bin/moli` unaided, and `moli_fetch` rendered a
+region-gated storefront end to end — through a local forward proxy, with a Netscape `cookieFile` —
+returning a 500+ KB page whose final URL carried the cookie-driven query parameters. That run
+exercised the proxy download route as well as the engine paths.
+
 ## Configuration
 
 Override any field under the plugin's `config` entry in the profile patch layer. All are optional.
@@ -277,9 +303,12 @@ installation under a versioned subdirectory is still found.
 
 ## Known limitations
 
-- **Windows-only targeting.** Developed and tested on Windows; the executable discovery, the
-  file-descriptor workaround, and the Schannel notes are Windows-specific. Nothing prevents a
-  POSIX port, but it is untested.
+- **macOS is untested, and Linux was tested by the contributor rather than the maintainer.** The
+  maintainer is a student with no macOS or Linux machine, so Linux was verified independently by
+  [@nd002723](https://github.com/nd002723) on Ubuntu 24.04 (see [Platform support](#platform-support));
+  macOS has not been run on a real host at all. **If something fails on either, please open an
+  [issue](https://github.com/27painter/dsh-moli/issues) with the error output** — that is the only way
+  these paths get fixed.
 - **Moli itself is not bundled.** Install it separately or let `moli_probe action=install` fetch it.
 - **Only `fetch` is wrapped.** `moli serve` (CDP/WebDriver server) and `moli import` (session
   import) are not exposed as tools yet.

package/README.zh.md

@@ -236,6 +236,29 @@ Moli 仓库自带官方 agent skill：[`moli-webfetch`](https://github.com/lexmo
    导入（例如 `@deepseek-ai/schemastery`）都会解析到插件目录而非 profile 的 `node_modules`，导致
    插件加载失败。本插件只导入 `node:` 内置模块和自己的文件。
 
+## 平台支持
+
+支持 **Windows、Linux、macOS**（x64 / arm64）。
+
+> **Linux 与 macOS 支持由 [@nd002723](https://github.com/nd002723) 贡献**，见
+> [PR #1](https://github.com/27painter/dsh-moli/pull/1)：POSIX 标准位置的引擎探测、`sh` 安装器路径，
+> 以及把 PowerShell 相关路径按平台门控。
+
+| 平台 | 状态 |
+|---|---|
+| **Windows** | 由维护者验证 |
+| **Linux** | 由贡献者在 Ubuntu 24.04 LTS、Node v24.21.0、DSH 0.2.1-alpha.2、dsh-moli 1.1.0、Moli 1.1.17 上验证通过 |
+| **macOS** | 已实现，尚未在真机验证 |
+
+- **Windows** —— 引擎在官方安装位置查找（`%LOCALAPPDATA%\Moli\bin\moli.exe` 与 `%USERPROFILE%\.local\bin\moli.exe`），
+  并以 `%LOCALAPPDATA%\Moli` 递归扫描兜底；`moli_probe action=install` 走官方 PowerShell 安装器。
+- **Linux / macOS** —— 引擎在标准位置（`~/.local/bin/moli`、`~/.local/share/moli/bin/moli`、
+  `~/.local/share/moli/moli`、`~/.moli/bin/moli`）与 `$PATH` 中查找；`moli_probe action=install` 通过 `sh` 执行官方 `moli-installer.sh`。
+
+在 Linux 上，`moli_probe` 无需干预就找到了 `~/.local/bin/moli`；`moli_fetch` 端到端渲染了一个地区限制的
+电商站——经由本地正向代理、并带上 Netscape 格式的 `cookieFile`——返回 500+ KB 的页面，最终 URL 带上了
+cookie 驱动的查询参数。那次实测同时覆盖了代理下载路由与引擎探测路径。
+
 ## 配置
 
 在 profile 的补丁层里覆盖 `config`，全部可选：
@@ -258,8 +281,10 @@ Moli 仓库自带官方 agent skill：[`moli-webfetch`](https://github.com/lexmo
 
 ## 已知限制
 
-- **面向 Windows。** 开发与验证都在 Windows 上；可执行文件探测、文件描述符绕坑、Schannel 说明都
-  与 Windows 相关。移植到 POSIX 没有障碍，但未经验证。
+- **macOS 未经验证，Linux 是由贡献者而非维护者验证的。** 维护者是一名**没有 macOS / Linux 电脑**的
+  大学生；Linux 由 [@nd002723](https://github.com/nd002723) 在 Ubuntu 24.04 上独立验证通过（见
+  [平台支持](#平台支持)），而 macOS 从未在真机运行过。**任一平台出问题，都请带上报错信息开
+  [issue](https://github.com/27painter/dsh-moli/issues)**——那是这些路径能被打通的唯一途径。
 - **不包含 Moli 本体。** 需自行安装，或让 `moli_probe action=install` 替你拉取。
 - **只封装了 `fetch`。** `moli serve`（CDP/WebDriver 服务器）与 `moli import`（会话导入）尚未做成工具。
 - **不支持单次取消。** 引擎是同步执行的，被中断的回合无法中途终止抓取；已在进行的调用会跑完并

package/index.js

@@ -1,4 +1,4 @@
-/** Host half of dsh-moli: expose the local `moli.exe` headless browser as callable tools. */
+/** Host half of dsh-moli: expose the local `moli` headless browser as callable tools. */
 import { MANUAL_INSTALL, installMoli } from './lib/install.js';
 import { findMoli, moliCandidates, probe, runFetch } from './lib/moli.js';
 
@@ -198,7 +198,7 @@ function renderProbe(_args, value) {
     return [{ type: 'text', text: lines.join('\n') }];
   }
   if (value.installed !== true) {
-    const lines = ['moli.exe was not found. Call moli_probe with action "install", or set the plugin config field `exePath`.'];
+    const lines = ['moli was not found. Call moli_probe with action "install", or set the plugin config field `exePath`.'];
     lines.push(`Manual install — PowerShell: ${MANUAL_INSTALL.powershell}`);
     lines.push(`Manual install — Linux/macOS: ${MANUAL_INSTALL.shell}`);
     return [{ type: 'text', text: lines.join('\n') }];
@@ -239,7 +239,7 @@ export function apply(ctx, config) {
   const insecureTls = options.insecureTls ?? DEFAULTS.insecureTls;
 
   if (cachedExe === undefined) {
-    ctx.logger?.warn?.('dsh-moli: moli.exe not found; moli_probe can install it, or set config.exePath');
+    ctx.logger?.warn?.('dsh-moli: moli not found; moli_probe can install it, or set config.exePath');
   }
 
   ctx.tools.register({
@@ -247,7 +247,7 @@ export function apply(ctx, config) {
     description: 'Fetch a URL with the local Moli headless browser: rendered HTML or Markdown, the semantic'
       + ' tree, a JSON envelope with status and final_url, a JavaScript expression result, a PNG screenshot, or a'
       + ' PDF. Use it for pages that need real rendering or JavaScript; prefer web_fetch for plain text. Screenshot'
-      + ' and pdf dumps require writeTo. If moli.exe is missing, run moli_probe with action "install" first.',
+      + ' and pdf dumps require writeTo. If moli is missing, run moli_probe with action "install" first.',
     parameters: FETCH_PARAMETERS,
     output: { schema: FETCH_OUTPUT_SCHEMA, render: renderFetch },
     isConcurrencySafe: args => args.writeTo === undefined || args.writeTo === '',
@@ -258,9 +258,9 @@ export function apply(ctx, config) {
         return {
           ok: false,
           url: args.url,
-          error: 'moli.exe was not found',
+          error: 'moli was not found',
           sandboxTlsBlock: false,
-          hint: 'Call moli_probe with action "install" to download it, or set the dsh-moli config field `exePath` to the absolute moli.exe path.',
+          hint: 'Call moli_probe with action "install" to download it, or set the dsh-moli config field `exePath` to the absolute moli path.',
           manualInstall: MANUAL_INSTALL,
         };
       }
@@ -279,7 +279,7 @@ export function apply(ctx, config) {
     description: 'Report the local Moli install: version, executable path, and whether HTTPS fetching works from'
       + ' this process. With action "install" it downloads and runs the official Moli installer instead, then'
       + ' reports the executable and the SHA256 of the installer it ran. Use "install" only when moli_fetch'
-      + ' reports that moli.exe is missing; it downloads and executes third-party code.',
+      + ' reports that moli is missing; it downloads and executes third-party code.',
     parameters: {
       type: 'object',
       additionalProperties: false,
@@ -321,7 +321,7 @@ export function apply(ctx, config) {
 
       const exe = engine();
       if (exe === undefined) {
-        return { installed: false, detail: 'moli.exe not found. Re-run with action "install" to download it.', manualInstall: MANUAL_INSTALL };
+        return { installed: false, detail: 'moli not found. Re-run with action "install" to download it.', manualInstall: MANUAL_INSTALL };
       }
       const result = probe(exe, 'https://example.com', insecureTls);
       return {
@@ -336,5 +336,5 @@ export function apply(ctx, config) {
     },
   });
 
-  ctx.logger?.info?.(`dsh-moli: registered moli_fetch and moli_probe (${cachedExe ?? 'moli.exe missing'})`);
+  ctx.logger?.info?.(`dsh-moli: registered moli_fetch and moli_probe (${cachedExe ?? 'moli missing'})`);
 }

package/lib/install.js

@@ -30,7 +30,9 @@ import { join } from 'node:path';
 import { findMoli, moliVersion } from './moli.js';
 
 /** Official installer for the latest release. */
-export const INSTALLER_URL = 'https://github.com/lexmount/moli/releases/latest/download/moli-installer.ps1';
+export const INSTALLER_URL = process.platform === 'win32'
+  ? 'https://github.com/lexmount/moli/releases/latest/download/moli-installer.ps1'
+  : 'https://github.com/lexmount/moli/releases/latest/download/moli-installer.sh';
 
 /** Moli's own README instructions, for the manual path. */
 export const MANUAL_INSTALL = {
@@ -136,7 +138,7 @@ export async function downloadInstaller(options) {
   const url = options.installerUrl ?? INSTALLER_URL;
   const configured = typeof options.proxy === 'string' && options.proxy.length > 0 ? options.proxy : undefined;
   const timeoutMs = options.timeoutMs ?? 60000;
-  const powershell = options.powershell ?? 'powershell.exe';
+  const powershell = options.powershell ?? (process.platform === 'win32' ? 'powershell.exe' : 'powershell');
 
   // Never hand a loopback URL to a proxy — with a stale system proxy setting the
   // request would go to a dead port and wait out the connect timeout. Windows
@@ -152,20 +154,22 @@ export async function downloadInstaller(options) {
     `${TLS_PRELUDE}${bypass} Invoke-WebRequest -UseBasicParsing ${extra} -Uri '${url}' -OutFile $env:MOLI_DL_TARGET -TimeoutSec ${String(Math.ceil(timeoutMs / 1000))}`,
   ];
 
-  const routes = [
-    {
-      method: 'Invoke-WebRequest (direct)',
-      command: powershell,
-      args: iwr(''),
-    },
-  ];
+  const routes = process.platform === 'win32'
+    ? [
+      {
+        method: 'Invoke-WebRequest (direct)',
+        command: powershell,
+        args: iwr(''),
+      },
+    ]
+    : [];
 
   // Only attempt proxy routes when something is actually listening there.
   let proxyAlive = false;
   if (configured !== undefined) {
     proxyAlive = await proxyListens(configured);
   }
-  if (configured !== undefined && proxyAlive) {
+  if (process.platform === 'win32' && configured !== undefined && proxyAlive) {
     routes.push({
       method: `Invoke-WebRequest (proxy ${configured})`,
       command: powershell,
@@ -173,14 +177,14 @@ export async function downloadInstaller(options) {
     });
   }
   routes.push({
-    method: 'curl.exe (direct)',
-    command: 'curl.exe',
+    method: 'curl (direct)',
+    command: process.platform === 'win32' ? 'curl.exe' : 'curl',
     args: ['-sSL', ...curlBypass, '--max-time', String(Math.ceil(timeoutMs / 1000)), '-o', target, url],
   });
   if (configured !== undefined && proxyAlive) {
     routes.push({
-      method: `curl.exe (proxy ${configured})`,
-      command: 'curl.exe',
+      method: `curl (proxy ${configured})`,
+      command: process.platform === 'win32' ? 'curl.exe' : 'curl',
       args: ['-sSL', ...curlBypass, '--max-time', String(Math.ceil(timeoutMs / 1000)), '--proxy', configured, '-o', target, url],
     });
   }
@@ -242,7 +246,7 @@ export async function downloadInstaller(options) {
 export async function installMoli(options = {}) {
   const timeoutMs = options.timeoutMs ?? 180000;
   const workDir = mkdtempSync(join(tmpdir(), 'dsh-moli-install-'));
-  const target = join(workDir, 'moli-installer.ps1');
+  const target = join(workDir, process.platform === 'win32' ? 'moli-installer.ps1' : 'moli-installer.sh');
   try {
     const download = await downloadInstaller({
       target,
@@ -279,9 +283,11 @@ export async function installMoli(options = {}) {
       }
     }
 
-    const run = spawnSync(options.powershell ?? 'powershell.exe',
-      ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', target],
-      { stdio: ['ignore', 'ignore', 'ignore'], timeout: timeoutMs, windowsHide: true });
+    const run = process.platform === 'win32'
+      ? spawnSync(options.powershell ?? 'powershell.exe',
+          ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', target],
+          { stdio: ['ignore', 'ignore', 'ignore'], timeout: timeoutMs, windowsHide: true })
+      : spawnSync('sh', [target], { stdio: ['ignore', 'ignore', 'ignore'], timeout: timeoutMs });
     const runFailed = run.error !== undefined && run.error !== null;
     const runStatus = runFailed ? null : (run.status ?? 0);
 
@@ -294,7 +300,7 @@ export async function installMoli(options = {}) {
         ok: false,
         error: runFailed
           ? `running the installer failed: ${run.error.message}`
-          : `the installer ${runStatus === 0 ? 'reported success' : `exited ${String(runStatus)}`}, but no working moli.exe was found afterwards`,
+          : `the installer ${runStatus === 0 ? 'reported success' : `exited ${String(runStatus)}`}, but no working moli binary was found afterwards`,
         installerSha256: download.sha256,
         installerBytes: download.bytes,
         method: download.method,

package/lib/moli.js

@@ -16,7 +16,7 @@
 import { spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { closeSync, existsSync, mkdtempSync, openSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
+import { homedir, tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 
 /** Output formats that are bytes, not text. */
@@ -42,27 +42,44 @@ const WAIT_STAGES = new Set(['domcontentloaded', 'load', 'networkidle', 'domstab
  * @returns candidate paths, in probe order.
  */
 export function moliCandidates(override) {
+  const isWin = process.platform === 'win32';
+  const home = process.env.HOME ?? homedir();
   const listed = [
     override,
     process.env.MOLI_BIN,
-    process.env.LOCALAPPDATA === undefined ? undefined : join(process.env.LOCALAPPDATA, 'Moli', 'bin', 'moli.exe'),
-    process.env.USERPROFILE === undefined ? undefined : join(process.env.USERPROFILE, '.local', 'bin', 'moli.exe'),
+    // Windows: official installer location.
+    isWin && process.env.LOCALAPPDATA !== undefined ? join(process.env.LOCALAPPDATA, 'Moli', 'bin', 'moli.exe') : undefined,
+    isWin && process.env.USERPROFILE !== undefined ? join(process.env.USERPROFILE, '.local', 'bin', 'moli.exe') : undefined,
+    // Linux/macOS: installer.sh default ~/.local/bin/moli, plus versioned/shared dirs.
+    !isWin ? join(home, '.local', 'bin', 'moli') : undefined,
+    !isWin ? join(home, '.local', 'share', 'moli', 'bin', 'moli') : undefined,
+    !isWin ? join(home, '.local', 'share', 'moli', 'moli') : undefined,
+    !isWin ? join(home, '.moli', 'bin', 'moli') : undefined,
   ].filter(candidate => typeof candidate === 'string' && candidate.length > 0);
 
   const discovered = [];
-  const root = process.env.LOCALAPPDATA === undefined ? undefined : join(process.env.LOCALAPPDATA, 'Moli');
-  if (root !== undefined && existsSync(root)) {
-    let entries = [];
-    try {
-      entries = readdirSync(root, { recursive: true, withFileTypes: true });
-    } catch {
-      entries = [];
-    }
-    for (const entry of entries) {
-      if (entry.isFile() && entry.name.toLowerCase() === 'moli.exe') {
-        discovered.push(join(entry.parentPath ?? root, entry.name));
+  if (isWin) {
+    const root = process.env.LOCALAPPDATA === undefined ? undefined : join(process.env.LOCALAPPDATA, 'Moli');
+    if (root !== undefined && existsSync(root)) {
+      let entries = [];
+      try {
+        entries = readdirSync(root, { recursive: true, withFileTypes: true });
+      } catch {
+        entries = [];
+      }
+      for (const entry of entries) {
+        if (entry.isFile() && entry.name.toLowerCase() === 'moli.exe') {
+          discovered.push(join(entry.parentPath ?? root, entry.name));
+        }
       }
     }
+  } else {
+    const seen = new Set(listed);
+    for (const dir of String(process.env.PATH ?? '').split(':')) {
+      if (dir === '') continue;
+      const candidate = join(dir, 'moli');
+      if (existsSync(candidate) && !seen.has(candidate)) discovered.push(candidate);
+    }
   }
   return [...listed, ...discovered];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-moli",
-  "version": "1.0.6",
+  "version": "1.1.1",
   "type": "module",
   "description": "DeepSeek Harness tools for the local Moli headless browser: rendered fetches, markdown, semantic trees, screenshots, and PDFs.",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "url": "https://github.com/27painter/dsh-moli/issues"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=20.12"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",