quotacap 0.0.24 → 0.0.26

package/dist/service/macos.js

@@ -66,6 +66,28 @@ export async function defaultWaitReady(port, timeoutMs = 15000) {
     }
     return false;
 }
+/**
+ * `launchctl bootout` and `systemctl --user stop` both return before the job
+ * has actually gone, so a restart that starts immediately races the dying
+ * process for the port: the replacement fails to bind and the restart reports
+ * "did not become ready". Wait until nothing answers on the port.
+ *
+ * Resolves true as soon as the port is free, false if it never frees.
+ */
+export async function defaultWaitReleased(port, timeoutMs = 10000) {
+    const deadline = Date.now() + timeoutMs;
+    const client = createServiceClient({ port, timeoutMs: 500 });
+    while (Date.now() < deadline) {
+        try {
+            await client.get("/health");
+        }
+        catch {
+            return true;
+        }
+        await new Promise((r) => setTimeout(r, 250));
+    }
+    return false;
+}
 const TRANSIENT_PATTERNS = ["/_npx/", "/.npm/_npx/", "/.worktrees/"];
 export function resolveServiceExec(deps) {
     const execPath = deps?.execPath ?? process.execPath;
@@ -258,6 +280,7 @@ export async function install(deps = {}) {
         return;
     }
     const { home, uid, dataDir, print, run, lint, sleep, bootstrapTimeoutMs } = resolved(deps);
+    const version = deps.version ?? VERSION;
     // Provision beside the data dir the service will use (identical to the
     // QUOTACAP_HOME path in production; hermetic under injected test dirs).
     await ensureConfig(path.join(dataDir, "config.json"));
@@ -300,7 +323,7 @@ export async function install(deps = {}) {
         const samePlist = existing === plist;
         const samePaths = !!meta &&
             PROVIDER_BINS.every((bin) => (meta.providerPaths?.[bin] ?? null) === providerPaths[bin]);
-        if (samePlist && samePaths && meta?.version === VERSION) {
+        if (samePlist && samePaths && meta?.version === version) {
             await bootstrapWithRetry(run, uid, plistFile, {
                 expectReplace: false,
                 sleep,
@@ -312,7 +335,7 @@ export async function install(deps = {}) {
         }
         // Upgrade: refresh metadata, stop the old job, replace, load.
         writeServiceMetadata({
-            version: VERSION,
+            version,
             exec: argv[0],
             ...(entry ? { entry } : {}),
             providerPaths,
@@ -322,7 +345,7 @@ export async function install(deps = {}) {
     }
     else {
         writeServiceMetadata({
-            version: VERSION,
+            version,
             exec: argv[0],
             ...(entry ? { entry } : {}),
             providerPaths,
@@ -405,6 +428,14 @@ export async function restart(deps = {}) {
         return;
     }
     await stop(deps);
+    // bootout is asynchronous: without this the replacement races the dying
+    // process for the port and start() fails its readiness check.
+    // deps.port keeps tests off the real daemon's port.
+    const port = deps.port ?? (await readConfig()).port;
+    const waitReleased = deps.waitReleased ?? defaultWaitReleased;
+    if (!(await waitReleased(port))) {
+        (deps.print ?? console.log)(`port ${port} is still in use after stopping; starting anyway`);
+    }
     await start(deps);
 }
 function parsePrintOutput(out) {

package/dist/service/systemd.d.ts

@@ -13,9 +13,11 @@ export interface SystemdDeps {
     runSystemctl?: (args: string[]) => string;
     which?: (bin: string) => string | null;
     waitReady?: (port: number) => Promise<boolean>;
+    waitReleased?: (port: number) => Promise<boolean>;
     print?: (msg: string) => void;
     error?: (msg: string) => void;
     now?: () => Date;
+    version?: string;
 }
 export declare function formatSystemctlError(args: string[], detail: string): Error;
 export declare function defaultRunSystemctl(args: string[]): string;

package/dist/service/systemd.js

@@ -11,7 +11,7 @@ import { VERSION } from "../version.js";
 import { getDbPath, readServiceMetadata, writeServiceMetadata, } from "../config.js";
 import { ensureConfig, readConfig } from "../config.js";
 import { createServiceClient } from "../runtime/client.js";
-import { SERVICE_LABEL, PROVIDER_BINS, buildChildPath, defaultWaitReady, defaultWhich, formatMissingProviders, formatStatus, foregroundGuidance, resolveProviderPaths, resolveServiceExec, } from "./macos.js";
+import { SERVICE_LABEL, PROVIDER_BINS, buildChildPath, defaultWaitReady, defaultWaitReleased, defaultWhich, formatMissingProviders, formatStatus, foregroundGuidance, resolveProviderPaths, resolveServiceExec, } from "./macos.js";
 export const SERVICE_UNIT = `${SERVICE_LABEL}.service`;
 export function serviceSupported(platform = process.platform) {
     return platform === "linux";
@@ -107,6 +107,7 @@ export async function install(deps = {}) {
         return;
     }
     const { home, dataDir, print, run } = resolved(deps);
+    const version = deps.version ?? VERSION;
     // Provision beside the data dir the service will use (identical to the
     // QUOTACAP_HOME path in production; hermetic under injected test dirs).
     await ensureConfig(path.join(dataDir, "config.json"));
@@ -141,7 +142,7 @@ export async function install(deps = {}) {
         const sameUnit = existing === unit;
         const samePaths = !!meta &&
             PROVIDER_BINS.every((bin) => (meta.providerPaths?.[bin] ?? null) === providerPaths[bin]);
-        if (sameUnit && samePaths && meta?.version === VERSION) {
+        if (sameUnit && samePaths && meta?.version === version) {
             run(["enable", "--now", SERVICE_UNIT]);
             const port = await waitForReady(deps, dataDir);
             print(`service already installed and up to date; ready on port ${port}`);
@@ -149,7 +150,7 @@ export async function install(deps = {}) {
         }
         // Upgrade: refresh metadata, stop the old job, replace, load.
         writeServiceMetadata({
-            version: VERSION,
+            version,
             exec: argv[0],
             ...(entry ? { entry } : {}),
             providerPaths,
@@ -159,7 +160,7 @@ export async function install(deps = {}) {
     }
     else {
         writeServiceMetadata({
-            version: VERSION,
+            version,
             exec: argv[0],
             ...(entry ? { entry } : {}),
             providerPaths,
@@ -240,6 +241,13 @@ export async function restart(deps = {}) {
         return;
     }
     await stop(deps);
+    // systemctl stop can return before the port is released; same race as launchd.
+    // deps.port mirrors start(): tests must never probe the real daemon's port.
+    const port = deps.port ?? (await readConfig()).port;
+    const waitReleased = deps.waitReleased ?? defaultWaitReleased;
+    if (!(await waitReleased(port))) {
+        (deps.print ?? console.log)(`port ${port} is still in use after stopping; starting anyway`);
+    }
     await start(deps);
 }
 function parseShowOutput(out) {

package/dist/version.js

@@ -1,2 +1,2 @@
 // generated by scripts/build-embed.mjs — do not edit
-export const VERSION = "0.0.24";
+export const VERSION = "0.0.26";

package/dist/web/src/components/ResetRail.js

@@ -175,7 +175,7 @@ export function ResetRail({ providers, asOf, onSelectProvider, }) {
                             return (_jsxs("button", { "data-testid": "pin", type: "button", className: `pin ${pin.band} ${tierClass} ${alignClass}`, style: {
                                     left: `${pin.positionPct}%`,
                                     "--dot-color": paceColor,
-                                }, "aria-label": `${name}: ${pace}, resets ${when}`, onClick: () => onSelectProvider(pin.id), children: [pin.band === "above" ? (_jsxs(_Fragment, { children: [_jsx("span", { className: "pin-when", children: when }), _jsxs("span", { className: `pin-label ${paceCls}`, style: pinBorder, children: [name.split(" ")[0], pin.estimated ? " (est.)" : ""] }), _jsx("span", { className: "pin-stem" }), _jsx("span", { className: "pin-dot" })] })) : (_jsxs(_Fragment, { children: [_jsx("span", { className: "pin-dot" }), _jsx("span", { className: "pin-stem" }), _jsxs("span", { className: `pin-label ${paceCls}`, style: pinBorder, children: [name.split(" ")[0], pin.estimated ? " (est.)" : ""] }), _jsx("span", { className: "pin-when", children: when })] })), _jsxs("span", { className: "pin-tooltip", role: "tooltip", children: [_jsx("b", { children: name }), _jsx("span", { className: "pt-sep", children: "\u00B7" }), provider?.quota ? `${provider.quota.usedPct}% used` : "no readings", _jsx("span", { className: "pt-sep", children: "\u00B7" }), left ? `${left} left` : when, pin.estimated ? " (est.)" : ""] })] }, pin.id));
+                                }, "aria-label": `${name}: ${pace}, resets ${when}`, onClick: () => onSelectProvider(pin.id), children: [pin.band === "above" ? (_jsxs(_Fragment, { children: [_jsx("span", { className: "pin-when", children: pin.estimated ? `${when} (est.)` : when }), _jsx("span", { className: `pin-label ${paceCls}`, style: pinBorder, children: name }), _jsx("span", { className: "pin-stem" }), _jsx("span", { className: "pin-dot" })] })) : (_jsxs(_Fragment, { children: [_jsx("span", { className: "pin-dot" }), _jsx("span", { className: "pin-stem" }), _jsx("span", { className: `pin-label ${paceCls}`, style: pinBorder, children: name }), _jsx("span", { className: "pin-when", children: pin.estimated ? `${when} (est.)` : when })] })), _jsxs("span", { className: "pin-tooltip", role: "tooltip", children: [_jsx("b", { children: name }), _jsx("span", { className: "pt-sep", children: "\u00B7" }), provider?.quota ? `${provider.quota.usedPct}% used` : "no readings", _jsx("span", { className: "pt-sep", children: "\u00B7" }), left ? `${left} left` : when, pin.estimated ? " (est.)" : ""] })] }, pin.id));
                         }), placement.clusters.map((cluster, index) => {
                             const alignClass = cluster.positionPct < 12 ? "pin-start" : cluster.positionPct > 88 ? "pin-end" : "";
                             const tierClass = cluster.tier > 0 ? `tier${cluster.tier + 1}` : "tier1";