dshm-compat 0.1.5 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.1.7
+
+- Re-release of the 0.1.6 content. npm accepted 0.1.6 into staged publishing but
+  it never became visible (404), and npm refuses to publish over a staged
+  version. 0.1.7 is the installable build.
+- Native worker wrappers bridge the DSHM host app-files prefix
+  `/data/storage/el2/base/haps/entry/files` to the guest's `/mnt/share` 9p
+  mount. `dsh-ops` passes the host `policy.workspaceRoot` as the worker's
+  `root`; the worker canonicalizes it before doing anything, so an unmapped
+  host path made every `ops_*` call fail with `NOT_FOUND` even when the guest
+  path existed. The wrapper creates the symlink only when the guest mount
+  exists and the host prefix is absent.
+- Offline regression suite: 30/30.
+
+## 0.1.6
+
+- Native worker wrappers now bridge the DSHM host app-files prefix
+  `/data/storage/el2/base/haps/entry/files` to the guest's `/mnt/share` 9p
+  mount. `dsh-ops` passes the host `policy.workspaceRoot` as the worker's
+  `root`; the worker canonicalizes it before doing anything, so an unmapped
+  host path made every `ops_*` call fail with `NOT_FOUND` even when the guest
+  path existed. The wrapper creates the symlink only when the guest mount
+  exists and the host prefix is absent.
+- Offline regression suite: 30/30.
+
 ## 0.1.5
 
 - Spawn rewriting now uses `['bash', file]` plus a staged shell wrapper instead

package/INSTALL.md

@@ -1,6 +1,6 @@
 # Installing dshm-compat
 
-The artifact is a normal DSH bundle package: `dshm-compat-0.1.5.tgz`.
+The artifact is a normal DSH bundle package: `dshm-compat-0.1.7.tgz`.
 It is host-only, has no runtime dependencies, and adds twelve agent tools.
 
 ## A. DSHM (the tablet)
@@ -15,7 +15,7 @@ input calls `pnpm view` before installing and fails with
 `Command failed with EACCES: pnpm view ... spawn pnpm EACCES`. Use one of these
 instead:
 
-- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.5` in its bash tool (the
+- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.7` in its bash tool (the
   bundled pnpm shim routes that command to the host install queue); or
 - install from a GitHub repository URL; or
 - after any working install, use the plugin's own `compat_install` tool for
@@ -28,7 +28,7 @@ not accept local paths, `file:` or `http://` specs.
 
 ### A2. HTTPS tarball
 
-Put `dshm-compat-0.1.5.tgz` on any HTTPS host (GitHub Release, Gitee Release,
+Put `dshm-compat-0.1.7.tgz` on any HTTPS host (GitHub Release, Gitee Release,
 object storage) and paste the `.tgz` URL into the same Add plugin input. DSHM's
 installer accepts tarball specs; if the current market UI refuses a plain URL,
 use A1.
@@ -38,7 +38,7 @@ use A1.
 If `hdc` is available and the app can read the path:
 
 ```sh
-hdc file send dshm-compat-0.1.5.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.5.tgz
+hdc file send dshm-compat-0.1.7.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.7.tgz
 ```
 
 Then enter the absolute path (or `file:/...`) in the Add plugin input. This
@@ -47,7 +47,7 @@ depends on the DSHM build's local-file support; A1 is safer.
 ## B. Desktop DSH (for testing only)
 
 ```powershell
-& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.5.tgz'
+& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.7.tgz'
 ```
 
 If the profile reports `ERR_PNPM_UNEXPECTED_VIRTUAL_STORE`, its `node_modules`

package/README.md

@@ -5,12 +5,13 @@ them through the least invasive strategy that can work.
 
 ## Current phase
 
-0.1.5 adds runtime-bridge fixes (non-`-c` spawn wrappers), release asset
-fallbacks, and `compat_uninstall`; 0.1.4 added the generic S2 adapter with
-x86_64 QEMU and GitHub Release acquisition. Phase 1 ships the analyzer, the
-S0/S1 converter, the generic S2 engine, guest probing/provisioning, the DSHM
-install-queue transport, and a profile-local fallback for artifacts the host
-queue rejects:
+0.1.7 bridges the host app-files prefix to the guest `/mnt/share` mount for
+native worker roots, fixing `NOT_FOUND` from `ops_*`. 0.1.5 added non-`-c`
+spawn wrappers, release fallbacks, and `compat_uninstall`; 0.1.4 added the
+generic S2 adapter with x86_64 QEMU and GitHub Release acquisition. Phase 1
+ships the analyzer, the S0/S1 converter, the generic S2 engine, guest
+probing/provisioning, the DSHM install-queue transport, and a profile-local
+fallback for artifacts the host queue rejects:
 
 - `compat_analyze` downloads an npm/GitHub/local package and classifies it.
 - `compat_plan` returns the concrete conversion plan without changing anything.

package/docs/RECIPES.md

@@ -33,7 +33,10 @@ For each match it:
 - adds `openharmony`/target/arch to `dsh-plugin.json` component targets;
 - stages the wrapper at `runtime/<target>/<worker>` and the real binary at
   `<worker>-bin` (AArch64) or `<worker>-x64` (x86_64), with a matching
-  `provenance.json` (`version`, `target`, `executable`, `sha256`).
+  `provenance.json` (`version`, `target`, `executable`, `sha256`). The wrapper
+  also links the host app-files prefix
+  `/data/storage/el2/base/haps/entry/files` to the guest `/mnt/share` mount, so
+  a worker that canonicalizes the host `policy.workspaceRoot` sees a real path.
 
 A source package whose `main` is absent but which has a `build`/`prepack` script
 returns `needs-build` with `npm ci && npm run build && npm pack`; the produced

package/lib/s2-native.js

@@ -230,11 +230,19 @@ export async function convertS2Native(spec, options = {}) {
   let stagedWorker
   let workerSource
   try {
+    const hostFilesLink = [
+      '# DSHM host app-files prefix -> guest 9p mount',
+      'if [ -d /mnt/share ] && [ ! -e /data/storage/el2/base/haps/entry/files ] && [ ! -L /data/storage/el2/base/haps/entry/files ]; then',
+      '  mkdir -p /data/storage/el2/base/haps/entry 2>/dev/null || true',
+      '  ln -s /mnt/share /data/storage/el2/base/haps/entry/files 2>/dev/null || true',
+      'fi',
+    ]
     if (workerArch === 'x64') {
       const realName = `${workerName}-x64`
       stagedWorker = Buffer.from([
         '#!/bin/sh',
         'set -e',
+        ...hostFilesLink,
         'DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)',
         `exec "$DIR/qemu-x86_64" -L "$DIR/rootfs" "$DIR/${realName}" "$@"`,
         '',
@@ -250,6 +258,7 @@ export async function convertS2Native(spec, options = {}) {
       stagedWorker = Buffer.from([
         '#!/bin/sh',
         'set -e',
+        ...hostFilesLink,
         'DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)',
         `exec "$DIR/${realName}" "$@"`,
         '',
@@ -281,6 +290,7 @@ export async function convertS2Native(spec, options = {}) {
     workerArch === 'x64'
       ? `staged ${workerName} as a shell wrapper over qemu-x86_64 + glibc rootfs`
       : `staged ${workerName} as a shell wrapper over ${workerName}-bin`,
+    'mapped /data/storage/el2/base/haps/entry/files to the guest /mnt/share mount',
   ]
 
   const output = files.filter(file => file.path !== workerPath).map(file => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dshm-compat",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Analyze and convert DSH plugins that cannot be installed or run on HarmonyOS DSHM.",
   "type": "module",
   "main": "index.js",