@synopackageland/cli 0.10.6 → 0.10.8

package/CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## 0.10.8 (2026-10-15)
+
+Builds with SDK 0.10.7 and templates 0.10.8, as 0.10.7 did: `init` still
+writes SDK v0.10.7, `@synopackageland/sdk` 0.10.7 and `@synopackageland/ui`
+0.9.8, and the executor digest table is unchanged, so an App rebuilt on it
+keeps its approval unless its executor or policy changes. Only the DSM
+window's `ctx.call` changes. The CLI still needs SDK 0.10.5 or later: the
+SDK's Gate, `useLifecycleRetry`, `appLifecycle` and `ExecutorApproval` already
+read an `APP_STOPPED` that arrives at once and check again; SDK 0.10.7 changed
+only its protocol README's wording, and nothing in the CLI depends on it.
+
+繁中摘要：搭配 SDK 0.10.7、templates 0.10.8（UI 0.9.8），digest 不變；SDK 下限維持 0.10.5
+（SDK 的 Gate／`useLifecycleRetry`／`appLifecycle`／`ExecutorApproval` 本來就處理立即回的
+`APP_STOPPED`）。只改 DSM window 的 `ctx.call`。
+
+- `ctx.call` rejects `APP_STOPPED` at once: a stopped package waits for the
+  user to start it in Package Center, so the SDK's stopped copy shows within a
+  page's next read instead of 30 s later (Download Hub 29.3 s, t-0527; Reclaim
+  showed its old content or loading, t-0528). `APP_STARTING` and
+  `EXECUTOR_STARTING` repeat for 4 s of waiting (0.5, 1, 2, 0.5 s), so a short
+  start still shows the page nothing and the SDK's starting copy follows a
+  longer one within its own 4 s recheck. `executor.control`, which the window's
+  approval starts the executor with, still repeats a start for 30 s; the SDK's
+  status reads are still not repeated.
+  繁中：套件停止時 `ctx.call` 立即回 `APP_STOPPED`；啟動中最多重試 4 s（`executor.control` 維持 30 s）。
+
+### Behavior changes
+
+- An App rebuilt with CLI 0.10.8 shows a stopped package's copy within its
+  page's next read: `ctx.call` rejects `APP_STOPPED` at once instead of after
+  about 30 s, and repeats `APP_STARTING` and `EXECUTOR_STARTING` for at most
+  about 4 s. The App's code needs no change; only its devDependency
+  `@synopackageland/cli` 0.10.8 and its lockfile, then a rebuild.
+- An e2e test that waits only for the Gate's stopped title
+  (`authorization.stopped.title`) can miss it: `ExecutorApproval` now takes
+  over first and shows its own stopped copy. Accept either of the SDK's stopped
+  copies.
+  繁中：App 升到 CLI 0.10.8 重新 build 後，套件停止時頁面立即收到 `APP_STOPPED`（不再等 30 s），
+  啟動中最多重試約 4 s；App 不需改程式。E2E 若只等 Gate 的停止標題，應接受 SDK 的任一停止文案。
+
+## 0.10.7 (2026-10-15)
+
+Builds with SDK 0.10.7 and templates 0.10.8: `init` writes SDK v0.10.7 (Go
+module, Rust crate tag and `backend.sdk`), `@synopackageland/sdk` 0.10.7 and
+`@synopackageland/ui` 0.9.8. The executor digest table adds SDK 0.10.7, whose
+executor and lifecycle digests equal 0.10.6, so an App rebuilt on it keeps its
+approval unless its executor or policy changes. The CLI still needs SDK
+0.10.5 or later: `ctx.portal.lastStatus()` is new and optional, SDK 0.10.7's
+`PortalSettings` keeps its placeholder rows without it, and older SDKs do not
+read it; nothing in the CLI depends on SDK 0.10.7. An App gets the settings
+page without placeholder movement only with both SDK 0.10.7 and a DSM window
+built by CLI 0.10.7.
+
+繁中摘要：搭配 SDK 0.10.7、templates 0.10.8（UI 0.9.8）；digest 與 0.10.6 相同；SDK 下限維持
+0.10.5（`ctx.portal.lastStatus()` 是選用的新增，舊 SDK 不讀、SDK 0.10.7 沒有它就畫佔位列）。
+e2e 新增 `openUntilLoaded`（`signIn` 遇 `net::ERR_ABORTED` 最多重開約 30 s）、遮蔽 socket.io `sid=`。
+
+- `signIn` and `dsmLoginSetup` keep reopening DSM's login page while the
+  navigation fails with `net::ERR_ABORTED`, for up to about 30 s, after a saved
+  profile is refused (error 119); they then fail with a clear error. Any other
+  error still fails at once. The helper is exported as
+  `openUntilLoaded(app, path, {timeoutMs, pauseMs})`.
+- e2e output and report masking also masks the `sid=` query parameter of DSM's
+  socket.io URLs, which carries the connection id.
+- `ctx.portal` reads the portal status when the DSM window opens and keeps
+  the newest one it read (`lastStatus()`); a `status()` asked for while a read
+  runs shares it. The SDK's `PortalSettings` starts from it, so a settings
+  page no longer moves when its placeholder rows become the real section
+  (Reclaim: 100 px, t-0520).
+
 ## 0.10.6 (2026-10-15)
 
 Builds with SDK 0.10.6 and templates 0.10.7: `init` writes SDK v0.10.6 (Go

package/dist/e2e/dsm.d.ts

@@ -32,7 +32,7 @@ export declare function freePort(): Promise<number>;
  * command's exit code.
  */
 export declare function runWithTunnel(command: readonly string[], outer?: Env): Promise<number>;
-/** `text` with DSM's session cookies, X-SYNO-TOKEN, SynoToken and _sid values replaced by ***. */
+/** `text` with DSM's session cookies, X-SYNO-TOKEN, SynoToken, _sid and sid values replaced by ***. */
 export declare function redactDsmSecrets(text: string): string;
 /**
  * Makes an e2e output directory private (directories 700, files 600) and masks
@@ -140,6 +140,18 @@ export declare function dsmSessionLive(page: Pick<SessionPage, "evaluate">): Pro
  * thrown.
  */
 export declare function openPath(app: Pick<App, "open">, path: string): Promise<void>;
+/**
+ * `app.open(path)`, repeated while it fails with net::ERR_ABORTED: a refused
+ * session's old desktop JS keeps navigating and aborted several opens in a row.
+ * Gives up with a clear error after `timeoutMs` (30 s); any other failure is
+ * thrown at once.
+ */
+export declare function openUntilLoaded(app: Pick<App, "open">, path: string, { timeoutMs, pauseMs, now, sleep }?: {
+    timeoutMs?: number | undefined;
+    pauseMs?: number | undefined;
+    now?: (() => number) | undefined;
+    sleep?: ((ms: number) => Promise<void>) | undefined;
+}): Promise<void>;
 /**
  * Restores the saved profile of `user`; signs in with the account file only
  * when that profile is missing, no longer reaches the desktop, or gives a

package/dist/e2e/dsm.js

@@ -138,10 +138,10 @@ const mask = "***";
 const cookieHeader = /(\bcookie"?\s*[:=]\s*"?)([^"\\\r\n]*)/gi;
 const sessionCookieNames = ["id", "did", "_SSID"];
 const sessionCookie = new RegExp(`(^|;\\s*)(${sessionCookieNames.join("|")})=[^;\\s]*`, "gi");
-// The X-SYNO-TOKEN header, a SynoToken parameter or field, and a web API's _sid parameter.
+// The X-SYNO-TOKEN header, a SynoToken parameter or field, a web API's _sid parameter and a socket.io connection's sid parameter.
 const tokenValue = /(\b(?:x-syno-token|synotoken)"?\s*[:=]\s*"?)[^"\\\s,;&}]+/gi;
-const sidParameter = /([?&]_sid=)[^&"\\\s]+/gi;
-/** `text` with DSM's session cookies, X-SYNO-TOKEN, SynoToken and _sid values replaced by ***. */
+const sidParameter = /([?&]_?sid=)[^&"\\\s]+/gi;
+/** `text` with DSM's session cookies, X-SYNO-TOKEN, SynoToken, _sid and sid values replaced by ***. */
 export function redactDsmSecrets(text) {
     return text
         .replace(cookieHeader, (_match, header, cookies) => header + cookies.replace(sessionCookie, `$1$2=${mask}`))
@@ -419,6 +419,30 @@ export async function openPath(app, path) {
         await app.open(path);
     }
 }
+/**
+ * `app.open(path)`, repeated while it fails with net::ERR_ABORTED: a refused
+ * session's old desktop JS keeps navigating and aborted several opens in a row.
+ * Gives up with a clear error after `timeoutMs` (30 s); any other failure is
+ * thrown at once.
+ */
+export async function openUntilLoaded(app, path, { timeoutMs = 30_000, pauseMs = 1_000, now = Date.now, sleep = (ms) => new Promise(done => setTimeout(done, ms)) } = {}) {
+    const deadline = now() + timeoutMs;
+    for (;;) {
+        try {
+            await app.open(path);
+            return;
+        }
+        catch (error) {
+            const message = String(error?.message ?? error);
+            if (!/net::ERR_ABORTED/.test(message))
+                throw error;
+            if (now() + pauseMs >= deadline) {
+                throw new Error(`Opening ${path} still aborted after ${Math.round(timeoutMs / 1000)} s of retries: ${message}`);
+            }
+            await sleep(pauseMs);
+        }
+    }
+}
 async function restoredSessionLive(page) {
     return await desktopOrLogin(page) === "desktop" && await dsmSessionLive(page);
 }
@@ -442,7 +466,7 @@ export async function signIn(app, user = "admin", env = process.env) {
         // A refused session still shows the desktop; dropping its cookies shows the login form.
         if (profile) {
             await context.clearCookies();
-            await openPath(app, "/");
+            await openUntilLoaded(app, "/");
         }
         const account = readAccount(accountFile(user, env), user);
         await page.locator(loginSelector).fill(account.username);

package/dist/runtime/executor-digests.json

@@ -75,5 +75,16 @@
             "armv7": "cafc97c89f5645c14a8cf31d6d9f258394ed6f2d086478a7aebd04d57c274b4e"
         },
         "goToolchain": "go1.26.9"
+    },
+    "0.10.7": {
+        "x86_64": "4ba7040761a719e74d6b047ef68b9415e658ebb8b373b69555b8c307524e26ba",
+        "aarch64": "ba80b389e3291419389b66be7b0a0e1085d3dfec55c9c651fecae427279bb3d5",
+        "armv7": "49474467b9c9a7f31b30b5053b70eb4f71a95f2c06fbf3566e8de8f16972a299",
+        "lifecycle": {
+            "x86_64": "d65500c4f04713a32b45d360059281391acfa5e00ee24895fdd2de7b82735372",
+            "aarch64": "94f6cd119186ff482b8aea56541dd1f9d53c147566bc1efdca6f5a1c86198331",
+            "armv7": "cafc97c89f5645c14a8cf31d6d9f258394ed6f2d086478a7aebd04d57c274b4e"
+        },
+        "goToolchain": "go1.26.9"
     }
 }

package/dist/standalone/dsm-window.js

@@ -192,17 +192,21 @@ ${ns}.callOnce = function (method, params, options, requestTimeout) {
 };
 
 // APP_STOPPED, APP_STARTING and EXECUTOR_STARTING mean the executor op was not
-// sent: the package is stopped, or starting. The call repeats on its own, half a
-// second, then doubling up to 8 s, for 30 s of waiting in all; each attempt keeps
-// its own deadline. Past that it rejects with the last refusal, and leaving the
+// sent. A stopped package waits for the user to start it in Package Center, so
+// APP_STOPPED rejects at once (t-0529). A start ends by itself: a call repeats
+// half a second, then doubling, for 4 s of waiting in all, so a short start
+// shows the page nothing and the SDK's starting copy follows a long one within
+// its own 4 s recheck; executor.control, which the window's approval starts the
+// executor with, repeats up to 8 s apart for 30 s. Each attempt keeps its own
+// deadline; past the wait it rejects with the last refusal, and leaving the
 // page during a wait rejects request_canceled at once. The SDK's status reads
 // are not repeated: its panels show the stopped or starting package and check
-// again on their own, and a page waiting here shows nothing (t-0503 R1).
-${ns}.retryCodes = ["APP_STOPPED", "APP_STARTING", "EXECUTOR_STARTING"];
+// again on their own (t-0503 R1).
+${ns}.retryCodes = ["APP_STARTING", "EXECUTOR_STARTING"];
 ${ns}.statusReads = ["delegate.status", "authorization.status", "executor.status"];
 ${ns}.call = function (method, params, options, requestTimeout) {
   var signal = options && options.signal;
-  var left = ${ns}.statusReads.indexOf(method) < 0 ? 30000 : 0;
+  var left = ${ns}.statusReads.indexOf(method) >= 0 ? 0 : method === "executor.control" ? 30000 : 4000;
   var delay = 500;
   var attempt = function () {
     return ${ns}.callOnce(method, params, options, requestTimeout).catch(function (error) {

package/dist/standalone/portal-window.d.ts

@@ -17,6 +17,9 @@ export declare function portalCatalogs(sdkDir: string): PortalCatalogs;
  * status or reject `{code}`. With `options.entry` (below DSM 7.2) the
  * backend's `portal.status` also reports the executor's entry, and
  * administrators get `register()` and `unregister()`; `openControlPanel()` opens Login Portal > Applications.
+ * `lastStatus()` is the newest status read; the access reads one when it is
+ * created, as the window opens, and a `status()` asked for while a read runs
+ * shares it.
  * `messages` is the SDK's panel text in the window's locale; `mountPanel(element)`
  * renders a plain panel for UIs without their own.
  */

package/dist/standalone/portal-window.js

@@ -24,6 +24,9 @@ export function portalCatalogs(sdkDir) {
  * status or reject `{code}`. With `options.entry` (below DSM 7.2) the
  * backend's `portal.status` also reports the executor's entry, and
  * administrators get `register()` and `unregister()`; `openControlPanel()` opens Login Portal > Applications.
+ * `lastStatus()` is the newest status read; the access reads one when it is
+ * created, as the window opens, and a `status()` asked for while a read runs
+ * shares it.
  * `messages` is the SDK's panel text in the window's locale; `mountPanel(element)`
  * renders a plain panel for UIs without their own.
  */
@@ -88,29 +91,49 @@ export const portalRuntime = (catalogs) => `function createPortalAccess(options)
   // The backend reports cleanup-required while a register or unregister runs,
   // so a status read waits for the change, whatever its result.
   var changing = Promise.resolve();
-  function status() {
+  // last: the newest status read, which the SDK's PortalSettings shows before it
+  // reads again. A read that runs serves every status() asked for meanwhile,
+  // until a change starts; the change reads afresh.
+  var last, pending, reads = 0;
+  function read() {
+    var n = ++reads;
     return changing.then(function () {
       if (options.entry) return fromEntry();
       return options.isAdmin() ? fromDsm() : fromBackend();
+    }).then(function (out) {
+      if (n === reads) last = out;
+      return out;
     });
   }
+  function status() {
+    if (!pending) {
+      pending = read();
+      var done = function () { pending = undefined; };
+      pending.then(done, done);
+    }
+    return pending;
+  }
   function change(method) {
     if (!options.isAdmin()) return Promise.reject({ code: "admin_required" });
     var call = options.call(method, {});
     changing = call.then(function () {}, function () {});
-    return call.then(status, function (error) {
+    pending = undefined;
+    return call.then(read, function (error) {
       throw { code: error && error.code === "ADMIN_REQUIRED" ? "admin_required" : "PORTAL_FAILED" };
     });
   }
   function set(alias) {
     if (!options.isAdmin()) return Promise.reject({ code: "admin_required" });
-    return options.send("SYNO.Core.AppPortal", "set", 2, { id: options.appId, alias: alias }).then(status, function (error) {
+    return options.send("SYNO.Core.AppPortal", "set", 2, { id: options.appId, alias: alias }).then(read, function (error) {
       throw { code: ERRORS[error && error.code] || "portal_unavailable" };
     });
   }
   var access = {
     messages: messages,
     status: status,
+    lastStatus: function () {
+      return last;
+    },
     apply: function (alias) {
       if (typeof alias !== "string" || !ALIAS.test(alias)) return Promise.reject({ code: "portal_alias_invalid" });
       if (RESERVED.indexOf(alias) >= 0) return Promise.reject({ code: "portal_alias_reserved" });
@@ -180,5 +203,8 @@ export const portalRuntime = (catalogs) => `function createPortalAccess(options)
       dispose: function () { disposed = true; element.replaceChildren(); }
     };
   }
+  // The window reads the status when it opens, so a settings page shows the
+  // portal section as it is (t-0520).
+  status();
   return access;
 }`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synopackageland/cli",
-  "version": "0.10.6",
+  "version": "0.10.8",
   "description": "Syno Package Land Developer Kit CLI",
   "type": "module",
   "bin": {
@@ -25,7 +25,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@synopackageland/templates": "0.10.7",
+    "@synopackageland/templates": "0.10.8",
     "ajv": "^8.17.1",
     "commander": "^13.1.0",
     "tar": "^7.4.3",