portless-studio 0.1.3 → 0.1.5

package/dist/server/infrastructure/system/system-port-scanner.js

@@ -1,7 +1,7 @@
 import { request } from "node:http";
 import { STUDIO_HEADER } from "../../../core/api/contract.js";
 import { isDebuggerVersionInfo } from "../../../core/ports/helper-ports.js";
-import { listLinuxPorts } from "./linux-ports.js";
+import { listLinuxPorts, readClockTicks } from "./linux-ports.js";
 import { listMacosPorts } from "./macos-ports.js";
 import { nodeSystemIo } from "./system-io.js";
 import { listWindowsPorts } from "./windows-ports.js";
@@ -18,9 +18,12 @@ export function listPortsFor(platform, io) {
         const cache = new Map();
         return () => listWindowsPorts(io, cache);
     }
-    if (platform === "darwin")
-        return () => listMacosPorts(io);
-    return () => listLinuxPorts(io);
+    if (platform === "darwin") {
+        const starts = new Map();
+        return () => listMacosPorts(io, starts);
+    }
+    let ticks = null;
+    return () => listLinuxPorts(io, () => (ticks ??= readClockTicks(io)));
 }
 /**
  * Wraps a platform lister with the HTTP check. A port is probed once per process that owns it,

package/dist/server/infrastructure/system/system-process-control.js

@@ -1,6 +1,8 @@
 import { err, ok } from "../../../core/result.js";
 import { appError } from "../../application/app-error.js";
 import { isProcessAlive } from "../portless/state-files.js";
+import { parseStatParent } from "../terminal/process-tree.js";
+import { devProcessTree, parseProcessTable } from "./dev-process-tree.js";
 /** How long a dev server gets to shut down cleanly before it is forced. */
 const GRACE_MS = 5000;
 const POLL_MS = 100;
@@ -40,6 +42,48 @@ export class SystemProcessControl {
     constructor(options) {
         this.#options = options;
     }
+    async devTree(pid) {
+        const { platform, io } = this.#options;
+        let table;
+        if (platform === "linux") {
+            table = io
+                .readDir("/proc")
+                .filter((name) => /^\d+$/.test(name))
+                .flatMap((name) => {
+                const stat = io.readFile(`/proc/${name}/stat`);
+                const command = io.readFile(`/proc/${name}/cmdline`);
+                const parent = stat === null ? null : parseStatParent(stat);
+                return parent === null || !command
+                    ? []
+                    : [{ pid: Number(name), parent, command: command.replaceAll("\0", " ").trim() }];
+            });
+        }
+        else if (platform === "darwin") {
+            const answer = await io.run("ps", ["-ww", "-axo", "pid=,ppid=,args="]);
+            table = answer.exitCode === 0 ? parseProcessTable(answer.stdout) : [];
+        }
+        else {
+            const answer = await io.run("powershell.exe", [
+                "-NoProfile",
+                "-NonInteractive",
+                "-Command",
+                "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,CommandLine | ConvertTo-Json -Compress",
+            ]);
+            try {
+                const rows = JSON.parse(answer.stdout);
+                table = (Array.isArray(rows) ? rows : [rows]).flatMap((row) => row &&
+                    typeof row.ProcessId === "number" &&
+                    typeof row.ParentProcessId === "number" &&
+                    typeof row.CommandLine === "string"
+                    ? [{ pid: row.ProcessId, parent: row.ParentProcessId, command: row.CommandLine }]
+                    : []);
+            }
+            catch {
+                table = [];
+            }
+        }
+        return devProcessTree(pid, table);
+    }
     async ownerOf(pid) {
         const { platform, io, uid, userName } = this.#options;
         if (platform === "win32") {

package/dist/server/infrastructure/system/windows-ports.js

@@ -58,10 +58,12 @@ export function parseWin32Processes(text) {
             continue;
         const executable = Reflect.get(item, "ExecutablePath");
         const commandLine = Reflect.get(item, "CommandLine");
+        const startedAt = Reflect.get(item, "StartedAt");
         processes.set(pid, {
             name: name.replace(/\.exe$/i, ""),
             executable: typeof executable === "string" && executable !== "" ? executable : null,
             commandLine: typeof commandLine === "string" && commandLine !== "" ? commandLine : null,
+            ...(typeof startedAt === "number" && startedAt > 0 ? { startedAt } : {}),
         });
     }
     return processes;
@@ -159,6 +161,9 @@ export async function listWindowsPorts(io, cache = new Map(), now = Date.now) {
             processName: system ?? info?.name ?? "",
             cwd: folderFromCommandLine(info?.commandLine ?? null),
             executable: info?.executable ?? null,
+            ...(system === undefined && info?.startedAt !== undefined
+                ? { startedAt: info.startedAt }
+                : {}),
         });
     }
     return [...byPort.values()].sort((a, b) => a.port - b.port);
@@ -181,7 +186,10 @@ async function readProcesses(io, pids) {
         return { processes: new Map(), complete: true };
     const filter = pids.map((pid) => `ProcessId=${pid}`).join(" OR ");
     const script = `Get-CimInstance Win32_Process -Filter '${filter}' | ` +
-        "Select-Object ProcessId, Name, ExecutablePath, CommandLine | ConvertTo-Json -Compress";
+        "Select-Object ProcessId, Name, ExecutablePath, CommandLine, " +
+        // A plain number, because ConvertTo-Json writes dates differently in each PowerShell version.
+        "@{n='StartedAt';e={if ($_.CreationDate) { [DateTimeOffset]::new($_.CreationDate).ToUnixTimeMilliseconds() }}} | " +
+        "ConvertTo-Json -Compress";
     const queried = await io.run("powershell", powershellArgs(script));
     const processes = queried.exitCode === 0 ? parseWin32Processes(queried.stdout) : new Map();
     if (processes.size > 0)

package/dist/server/interface/http/http-server.js

@@ -172,7 +172,7 @@ export function createHttpServer(options) {
         if (stop?.[1] && method === "POST") {
             if (!options.stopProcess)
                 return sendAppError(res, unsupported);
-            const result = await options.stopProcess(stop[1]);
+            const result = await options.stopProcess(stop[1], query.get("scope") === "tree");
             if (!result.ok)
                 return sendAppError(res, result.error);
             res.writeHead(204, { "Cache-Control": "no-store" }).end();
@@ -243,6 +243,10 @@ export function createHttpServer(options) {
                 return sendAppError(res, created.error);
             return sendJson(res, 201, created.value);
         }
+        if (pathname === API_PATHS.terminalsRecentCommands && method === "GET") {
+            const body = { recentCommands: terminals.recentCommands() };
+            return sendJson(res, 200, body);
+        }
         if (pathname === API_PATHS.terminalsEvents && method === "GET") {
             terminalStreams.list(res);
             return;

package/dist/server/interface/http/static-files.js

@@ -23,9 +23,13 @@ const CONTENT_TYPES = {
 };
 const COMPRESSIBLE = new Set([".html", ".js", ".mjs", ".css", ".json", ".map", ".svg", ".txt"]);
 const MIN_COMPRESS_BYTES = 1024;
-/** No inline scripts, no third parties, never framed. Vite builds need nothing more. */
+/**
+ * No inline scripts, no third parties, never framed. Inline styles are allowed because the
+ * terminal (xterm.js) paints ANSI colors through <style> elements it creates at runtime; scripts
+ * stay locked to the page's own files.
+ */
 const HTML_HEADERS = {
-    "Content-Security-Policy": "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; " +
+    "Content-Security-Policy": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; " +
         "font-src 'self'; connect-src 'self'; object-src 'none'; base-uri 'none'; " +
         "form-action 'none'; frame-ancestors 'none'",
     "X-Frame-Options": "DENY",

package/dist/server/main.js

@@ -18,6 +18,7 @@ import { createDetachedLauncher } from "./infrastructure/apps/detached-launcher.
 import { JsonCustomAppStore, JsonRouteProjectStore, openWithPathFor, routeProjectsPathFor, } from "./infrastructure/apps/json-stores.js";
 import { autoNamedPathFor, JsonAutoNamedStore, } from "./infrastructure/config/json-auto-named-store.js";
 import { defaultConfigPath, JsonConfigStore } from "./infrastructure/config/json-config-store.js";
+import { JsonTerminalHistoryStore, terminalHistoryPathFor, } from "./infrastructure/config/json-terminal-history-store.js";
 import { JsonUpdateCache, updateCheckPathFor } from "./infrastructure/config/json-update-cache.js";
 import { proxyStartRecordPathFor, readProxyStartRecord, recordProxyStarts, } from "./infrastructure/config/proxy-start-record.js";
 import { PortlessRegistry } from "./infrastructure/portless/portless-registry.js";
@@ -28,6 +29,7 @@ import { ephemeralRangeReader } from "./infrastructure/system/ephemeral-ports.js
 import { FaviconFetcher } from "./infrastructure/system/favicon-fetcher.js";
 import { fetchLatestVersion } from "./infrastructure/system/npm-registry.js";
 import { OsNotifier } from "./infrastructure/system/os-notifier.js";
+import { portClosed } from "./infrastructure/system/port-closed.js";
 import { startForwarder } from "./infrastructure/system/port-forwarder.js";
 import { ProjectInfoReader } from "./infrastructure/system/project-info.js";
 import { nodeSystemIo } from "./infrastructure/system/system-io.js";
@@ -96,6 +98,7 @@ export function createStudioServices(options = {}) {
         folders: nodeTerminalFolders(),
         processTree: systemProcessTree(),
         homeDir: os.homedir(),
+        history: new JsonTerminalHistoryStore(terminalHistoryPathFor(configPath)),
         workspace: {
             openableFolders: () => runtime.openableFolders(),
             snapshot: () => runtime.readSnapshot(),
@@ -152,11 +155,14 @@ export function createStudioServices(options = {}) {
         detectPorts: () => runtime.detectPorts(),
         doctor,
         controlProxy: proxy,
-        stopProcess: (pid) => stopProcess(pid, {
+        stopProcess: (pid, all) => stopProcess(pid, {
             processes,
             stoppablePids: () => runtime.stoppablePids(),
             selfPid: process.pid,
-        }),
+            listeners: () => scanner.scan(),
+            portClosed,
+            refresh: () => runtime.refreshProcesses(),
+        }, all),
         stopContainer: (name) => stopContainer(name, containers),
         studioService,
         openWith,
@@ -178,6 +184,7 @@ export function createUninstallServices(configPath = defaultConfigPath()) {
         routeProjectsPathFor(configPath),
         openWithPathFor(configPath),
         updateCheckPathFor(configPath),
+        terminalHistoryPathFor(configPath),
     ];
     const processes = new SystemProcessControl({
         platform: process.platform,
@@ -238,6 +245,11 @@ export async function startServer(options) {
     studio.start();
     // The short-URL forwarder settles before anyone prints or registers a URL.
     await studio.ready();
+    // Terminals that were running when Studio stopped; never holds up the start.
+    void studio
+        .settings()
+        .then((config) => services.terminals?.restore(config.restoreTerminals))
+        .catch(() => { });
     return {
         url: `http://${LOOPBACK}:${port}`,
         port,