@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.15 → 0.1.6-BETA.16

package/core.cjs

@@ -951,7 +951,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.6-BETA.15");
+      if (true) return String("0.1.6-BETA.16");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -7128,15 +7128,42 @@ var require_browser = __commonJS({
       if (bin.includes("/") || bin.includes("\\") || /^[A-Za-z]:[\\/]/.test(bin)) return isExecutableFile(bin);
       return resolveExecutable(bin) !== null;
     }
+    function logOpen(lg, run, res) {
+      const ev = res.evidence || {};
+      const tier = res.ok ? res.confirmed ? "confirmed" : "handedOff" : "failed";
+      const exit = ev.exitSignal ? " signal=" + ev.exitSignal : ev.exitCode === null || ev.exitCode === void 0 ? "" : " exit=" + ev.exitCode;
+      const line = "[open] intent=" + run.intent + " via=" + (ev.via || "-") + " engine=" + (ev.engine || "-") + " bin=" + (ev.bin || "-") + " isolated=" + (ev.isolated === true) + " argv=" + (run.args || []).map(redactArg).join(" ") + " => " + tier + (res.reason ? " reason=" + res.reason : "") + exit + (ev.error ? " error=" + ev.error : "");
+      const fn = lg.info || lg.warn;
+      if (typeof fn !== "function") return;
+      try {
+        fn.call(lg, line);
+      } catch {
+      }
+    }
+    function redactArg(a) {
+      const s = String(a);
+      let cut = -1;
+      for (const ch of ["?", "#"]) {
+        const i = s.indexOf(ch);
+        if (i >= 0 && (cut < 0 || i < cut)) cut = i;
+      }
+      return cut < 0 ? s : s.slice(0, cut) + "[trimmed]";
+    }
     async function openBrowser(url, o) {
       const opts = o || {};
       const pl = opts.platform || process.platform;
       const intent = opts.intent === "isolated-login" ? "isolated-login" : "plain";
+      const run = { intent, args: null };
+      const out = (p) => {
+        const res = outcome(p);
+        if (opts.logger) logOpen(opts.logger, run, res);
+        return res;
+      };
       if (!isSafeHttpUrl(url)) {
-        return outcome({ ok: false, reason: "unsafe-url", url: String(url || ""), evidence: null });
+        return out({ ok: false, reason: "unsafe-url", url: String(url || ""), evidence: null });
       }
       if (!SUPPORTED_OPEN_PLATFORMS.includes(pl)) {
-        return outcome({ ok: false, reason: "unsupported-platform", url, evidence: { platform: pl } });
+        return out({ ok: false, reason: "unsupported-platform", url, evidence: { platform: pl } });
       }
       const observeMs = opts.observeMs === void 0 ? OPEN_OBSERVE_MS : opts.observeMs;
       const spawnWith = typeof opts.spawn === "function" ? opts.spawn : intent === "isolated-login" ? _spawnDetached : _spawnDetachedIgnored;
@@ -7161,6 +7188,7 @@ var require_browser = __commonJS({
         }
       }
       const plan = intent === "isolated-login" ? isolatedPlan(pl, url, { inventory: inv, pick: picked, profileDir: profile, size: login.size, lang: login.lang }) : openPlan(pl, url, { inventory: inv, pick: picked });
+      run.args = plan.args;
       const diagnostics = launchDiagnostics(inv, plan, picked);
       const evidence = {
         bin: plan.bin,
@@ -7181,7 +7209,7 @@ var require_browser = __commonJS({
       const deferredRemove = typeof opts.rmTree === "function" ? opts.rmTree : removeTreeDeferred;
       const fail = (reason, patch) => {
         if (profile) deferredRemove(profile, 0);
-        return outcome(Object.assign({ ok: false, reason, url, evidence }, patch));
+        return out(Object.assign({ ok: false, reason, url, evidence }, patch));
       };
       const desktopAvailable = typeof opts.desktopAvailable === "function" ? opts.desktopAvailable : desktop.sessionAvailable;
       if (pl === "linux" && !desktopAvailable()) {
@@ -7206,10 +7234,10 @@ var require_browser = __commonJS({
       evidence.error = seen.stage === "error" ? String(seen.code) : null;
       evidence.exitCode = seen.code === void 0 ? null : seen.code;
       evidence.exitSignal = seen.signal === void 0 ? null : seen.signal;
-      if (seen.stage === "error") return outcome({ ok: false, reason: "spawn-failed", url, evidence });
+      if (seen.stage === "error") return out({ ok: false, reason: "spawn-failed", url, evidence });
       const exitDecides = seen.stage === "exit" && plan.exitIsEvidence === true;
       if (exitDecides && (seen.code !== 0 || seen.signal)) {
-        return outcome({
+        return out({
           ok: false,
           reason: seen.signal ? "killed-by-signal" : "exit-nonzero",
           url,
@@ -7217,7 +7245,7 @@ var require_browser = __commonJS({
           error: FAILURE_TEXT[seen.signal ? "killed-by-signal" : "exit-nonzero"] + "\uFF08" + (seen.signal || seen.code) + "\uFF09"
         });
       }
-      return outcome({
+      return out({
         ok: true,
         confirmed: exitDecides,
         handedOff: !exitDecides,
@@ -14498,14 +14526,25 @@ var require_capture = __commonJS({
   "src/platform/service/token/capture.js"(exports2, module2) {
     "use strict";
     var ex2 = require_exec();
+    var service = require_service();
     var persist = require_persist();
     var kinds = require_kinds();
     function parseDshTokenLine(line) {
       const m = /(?:dsh web:)?\s*(?:https?:\/\/127\.0\.0\.1:\d+\/\?token=)([A-Za-z0-9_-]+)/.exec(String(line || ""));
       return m ? m[1] : null;
     }
+    var _channelNoticed = /* @__PURE__ */ new Set();
     async function captureJournal(unit, opts) {
-      const logger = opts && opts.logger || console;
+      const o = opts || {};
+      const logger = o.logger || console;
+      const kind = (typeof o.providerKind === "function" ? o.providerKind : service.kind)();
+      if (kind !== "systemd") {
+        if (!_channelNoticed.has(unit)) {
+          _channelNoticed.add(unit);
+          logger.info && logger.info("[token] journald \u6863\u5BF9 " + unit + " \u505C\u7528\uFF1A\u672C\u673A\u670D\u52A1\u6863=" + kind + "\uFF0C\u6CA1\u6709 systemd \u5355\u5143\u53EF\u67E5");
+        }
+        return null;
+      }
       const out = await ex2.runOutAsync("journalctl", ["--user", "-u", unit + ".service", "--no-pager", "-o", "cat", "-g", "127\\.0\\.0\\.1:.*token=", "-n", "1"], {
         timeoutMs: 5e3,
         logger
@@ -20073,7 +20112,7 @@ var require_router_ops = __commonJS({
     function createAuxCore(deps) {
       const d = deps || {};
       const getProviders = d.getProviders || (() => []);
-      const openInBrowser = (url, onExit) => platform.browser.openBrowser(url, { intent: "isolated-login", onExit });
+      const openInBrowser = (url, onExit) => platform.browser.openBrowser(url, { intent: "isolated-login", onExit, logger: d.logger });
       const oauth = createOAuthOps({ ports, openInBrowser });
       const apps = createAppsRegistryOps({
         getProviders,
@@ -21144,10 +21183,18 @@ var require_sandbox = __commonJS({
     function defaultCommand(dshBin, inst) {
       return [process.execPath, dshBin, "web", "--port", String(inst.port), "--host", "127.0.0.1", "--trusted-host", "127.0.0.1", "--no-open"];
     }
+    function withoutAutoOpen(cmd2) {
+      const arr = (Array.isArray(cmd2) ? cmd2 : []).map(String);
+      const webAt = arr.indexOf("web");
+      if (webAt < 0 || arr.includes("--no-open") || arr.includes("--open")) return cmd2;
+      const sep = arr.indexOf("--", webAt);
+      if (sep < 0) return arr.concat(["--no-open"]);
+      return arr.slice(0, sep).concat(["--no-open"], arr.slice(sep));
+    }
     function effectiveCommand(rootDir, dshBin, inst) {
-      if (inst.domain === "sandbox" && (!inst.command || !inst.command.length)) return sandboxCommand(rootDir, inst);
-      if (inst.command && inst.command.length) return inst.command;
-      return defaultCommand(dshBin, inst);
+      if (inst.domain === "sandbox" && (!inst.command || !inst.command.length)) return withoutAutoOpen(sandboxCommand(rootDir, inst));
+      if (inst.command && inst.command.length) return withoutAutoOpen(inst.command);
+      return withoutAutoOpen(defaultCommand(dshBin, inst));
     }
     function unitProps(inst, alloc) {
       const props = [
@@ -27253,7 +27300,7 @@ var require_guard = __commonJS({
           } catch {
           }
           if (!url) return send(400, { ok: false, error: '\u9700\u8981 {"url":"http(s)://\u2026"}' });
-          return Promise.resolve(browser.openBrowser(url)).then((r) => send(r.ok ? 200 : 500, r)).catch((e) => send(500, { ok: false, reason: "spawn-failed", error: "\u6253\u5F00\u6D4F\u89C8\u5668\u5931\u8D25\uFF1A" + (e && e.message || e), url }));
+          return Promise.resolve(browser.openBrowser(url, { logger: sup.logger })).then((r) => send(r.ok ? 200 : 500, r)).catch((e) => send(500, { ok: false, reason: "spawn-failed", error: "\u6253\u5F00\u6D4F\u89C8\u5668\u5931\u8D25\uFF1A" + (e && e.message || e), url }));
         });
         return;
       }
@@ -27854,7 +27901,7 @@ var require_instances = __commonJS({
     function handle(ctx) {
       const { sup, req, res, pathname, identity, send, collectBody, originAllowed, tokOf, browser } = ctx;
       function openInSystemBrowser(url) {
-        return browser.openBrowser(url);
+        return browser.openBrowser(url, { logger: sup.logger });
       }
       if (req.method === "GET" && pathname === "/open") return handleOpen(ctx);
       if (req.method === "GET" && pathname === "/instances") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-sup/dsh-core-linux-x64",
-  "version": "0.1.6-BETA.15",
+  "version": "0.1.6-BETA.16",
   "description": "DSH lifecycle guard core (Node launcher) for linux-x64 — requires Node >=18.",
   "license": "UNLICENSED",
   "repository": {