@ours.network/cli 0.5.0 → 1.0.0

package/dist/service-instance.d.ts

@@ -1,4 +1,5 @@
 export declare const DEFAULT_SYSTEMD_UNIT = "ours.service";
+export declare const DEFAULT_LAUNCHD_LABEL = "solutions.adaptframework.ours";
 export interface InstanceResult {
     ok: boolean;
     /** '' means "the default, unnamed daemon" — the historical single-unit behaviour. */
@@ -7,6 +8,8 @@ export interface InstanceResult {
 }
 export declare function normalizeInstanceName(raw: unknown): InstanceResult;
 export declare function systemdUnitName(instance?: string): string;
+export declare function launchdLabel(instance?: string): string;
 export declare function serviceDescription(instance?: string): string;
 export declare function instanceNameFromStateDir(stateDir: string): InstanceResult;
 export declare function unitNameForStateDir(stateDir: string): string;
+export declare function labelForStateDir(stateDir: string): string;

package/dist/service-instance.js

@@ -1,14 +1,20 @@
 import {
+  DEFAULT_LAUNCHD_LABEL,
   DEFAULT_SYSTEMD_UNIT,
   instanceNameFromStateDir,
+  labelForStateDir,
+  launchdLabel,
   normalizeInstanceName,
   serviceDescription,
   systemdUnitName,
   unitNameForStateDir
-} from "./chunk-3RLAHOPS.js";
+} from "./chunk-UZQWSOUB.js";
 export {
+  DEFAULT_LAUNCHD_LABEL,
   DEFAULT_SYSTEMD_UNIT,
   instanceNameFromStateDir,
+  labelForStateDir,
+  launchdLabel,
   normalizeInstanceName,
   serviceDescription,
   systemdUnitName,

package/dist/service.d.ts

@@ -47,6 +47,12 @@ export interface ServiceContext {
 export interface ServiceDeps {
     platform: NodeJS.Platform;
     run(command: string, args: string[]): Promise<void>;
+    /**
+     * launchd only — the uid whose GUI domain the agent is bootstrapped into.
+     * Injected rather than read from `process.getuid()` so the domain a plan
+     * targets is assertable off macOS, where the rest of this file is developed.
+     */
+    uid?: number;
 }
 export interface ServiceAdapter {
     readonly name: string;
@@ -58,4 +64,28 @@ export interface ServiceAdapter {
  * unit written before this CLI baked one in.
  */
 export declare function bakedStateDir(unit: string): string | undefined;
+/**
+ * What an already-present service definition says about itself, in the terms
+ * the guard needs: did this CLI write it, and which daemon is it for. Reading
+ * it is per-format; judging it is not, which is what keeps the systemd and
+ * launchd guards from drifting into two different sets of refusals.
+ */
+export interface ExistingDefinition {
+    managed: boolean;
+    /** The baked state directory, or undefined for a definition that bakes none. */
+    owner?: string;
+}
 export declare function createLinuxUserSystemdAdapter(deps?: ServiceDeps): ServiceAdapter;
+/**
+ * The state directory a CLI-managed launchd agent was installed for. The plist
+ * counterpart of `bakedStateDir`, and the reason a label — which is not
+ * injective over state directories — is still enough to find its daemon.
+ */
+export declare function bakedStateDirFromPlist(plist: string): string | undefined;
+export declare function createMacosUserLaunchdAdapter(deps?: ServiceDeps): ServiceAdapter;
+/**
+ * The adapter for the platform this CLI is running on. The two factories keep
+ * refusing every platform but their own — the selector is the only thing that
+ * is allowed to know which platform maps to which service manager.
+ */
+export declare function createServiceAdapter(deps?: ServiceDeps): ServiceAdapter;

package/dist/service.js

@@ -1,11 +1,17 @@
 import {
   SERVICE_NAME,
   bakedStateDir,
-  createLinuxUserSystemdAdapter
-} from "./chunk-227DBTDK.js";
-import "./chunk-3RLAHOPS.js";
+  bakedStateDirFromPlist,
+  createLinuxUserSystemdAdapter,
+  createMacosUserLaunchdAdapter,
+  createServiceAdapter
+} from "./chunk-TNNBVUKK.js";
+import "./chunk-UZQWSOUB.js";
 export {
   SERVICE_NAME,
   bakedStateDir,
-  createLinuxUserSystemdAdapter
+  bakedStateDirFromPlist,
+  createLinuxUserSystemdAdapter,
+  createMacosUserLaunchdAdapter,
+  createServiceAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/cli",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "description": "Transport-neutral operator CLI for the ours shared daemon",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",
@@ -23,6 +23,8 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@ours.network/sdk": "^1.0.2"
+    "@adapt-toolkit/sdk": "0.10.12",
+    "@adapt-toolkit/sdk-native": "0.10.12",
+    "@ours.network/sdk": "^2.0.0"
   }
 }

package/dist/chunk-227DBTDK.js

@@ -1,132 +0,0 @@
-import {
-  instanceNameFromStateDir,
-  serviceDescription,
-  unitNameForStateDir
-} from "./chunk-3RLAHOPS.js";
-
-// src/service.ts
-import { execFile as nodeExecFile } from "node:child_process";
-import { promisify } from "node:util";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-var execFile = promisify(nodeExecFile);
-var MARKER = "# Managed by @ours.network/cli";
-var SERVICE_NAME = "ours.service";
-var defaultDeps = {
-  platform: process.platform,
-  run: async (command, args) => {
-    await execFile(command, args, { windowsHide: true });
-  }
-};
-function systemdEscapeArgument(value) {
-  if (/[\n\r]/.test(value)) throw new Error("service arguments must not contain newlines");
-  return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%")}"`;
-}
-function systemdUnescapeArgument(value) {
-  const trimmed = value.trim();
-  if (!trimmed.startsWith('"') || !trimmed.endsWith('"') || trimmed.length < 2) return void 0;
-  return trimmed.slice(1, -1).replaceAll("%%", "%").replaceAll('\\"', '"').replaceAll("\\\\", "\\");
-}
-function bakedStateDir(unit) {
-  for (const line of unit.split("\n")) {
-    if (!line.startsWith("Environment=OURS_STATE_DIR=")) continue;
-    return systemdUnescapeArgument(line.slice("Environment=OURS_STATE_DIR=".length));
-  }
-  return void 0;
-}
-function describeConflict(previous, serviceFile, stateDir, verb = "overwrite") {
-  if (!previous.startsWith(MARKER)) {
-    return {
-      kind: "unmanaged",
-      serviceFile,
-      message: verb === "remove" ? `${serviceFile} is not managed by @ours.network/cli; refusing to remove it` : `${serviceFile} is not managed by @ours.network/cli; refusing to overwrite it without --force`
-    };
-  }
-  const owner = bakedStateDir(previous);
-  if (owner !== void 0 && owner !== stateDir) {
-    return {
-      kind: "other-state-dir",
-      serviceFile,
-      owner,
-      message: `${serviceFile} is the boot service for the daemon at ${owner}, not ${stateDir}; refusing to ${verb} it without --force`
-    };
-  }
-  return void 0;
-}
-function resolveStateDir(context) {
-  return resolve(context.stateDir ?? join(context.homeDir ?? homedir(), ".ours"));
-}
-function createLinuxUserSystemdAdapter(deps = defaultDeps) {
-  if (deps.platform !== "linux") throw new Error(`service management is not supported on ${deps.platform}; use an external launcher for \`ours daemon serve\``);
-  return {
-    name: "systemd-user",
-    async install(context) {
-      const home = context.homeDir ?? homedir();
-      const stateDir = resolveStateDir(context);
-      const unitName = unitNameForStateDir(stateDir);
-      const serviceFile = join(home, ".config", "systemd", "user", unitName);
-      const unitConfig = context.configPath ? resolve(context.configPath) : void 0;
-      const args = [process.execPath, resolve(context.cliPath), "daemon", "serve"];
-      if (unitConfig) args.push("--config", unitConfig);
-      const environment = `Environment=OURS_STATE_DIR=${systemdEscapeArgument(stateDir)}
-`;
-      const unit = `${MARKER}
-[Unit]
-Description=${serviceDescription(instanceNameFromStateDir(stateDir).name)}
-After=network-online.target
-
-[Service]
-Type=simple
-ExecStart=${args.map(systemdEscapeArgument).join(" ")}
-${environment}Restart=on-failure
-RestartSec=2
-
-[Install]
-WantedBy=default.target
-`;
-      if (existsSync(serviceFile)) {
-        const previous = readFileSync(serviceFile, "utf8");
-        const conflict = describeConflict(previous, serviceFile, stateDir);
-        if (conflict && !context.force) {
-          if (!context.dryRun) throw new Error(conflict.message);
-          return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: true, conflict };
-        }
-        if (previous === unit) return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands: [], changed: false, dryRun: context.dryRun === true };
-      }
-      const commands = [["systemctl", "--user", "daemon-reload"], ["systemctl", "--user", "enable", "--now", unitName]];
-      if (!context.dryRun) {
-        mkdirSync(dirname(serviceFile), { recursive: true });
-        writeFileSync(serviceFile, unit, { mode: 420 });
-        for (const [command, ...args2] of commands) await deps.run(command, args2);
-      }
-      return { adapter: this.name, action: "install", serviceFile, unitName, stateDir, configPath: unitConfig, commands, changed: true, dryRun: context.dryRun === true };
-    },
-    async uninstall(context) {
-      const home = context.homeDir ?? homedir();
-      const stateDir = resolveStateDir(context);
-      const unitName = unitNameForStateDir(stateDir);
-      const serviceFile = join(home, ".config", "systemd", "user", unitName);
-      if (!existsSync(serviceFile)) return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: context.dryRun === true };
-      const previous = readFileSync(serviceFile, "utf8");
-      const conflict = describeConflict(previous, serviceFile, stateDir, "remove");
-      if (conflict && !(context.force && previous.startsWith(MARKER))) {
-        if (!context.dryRun) throw new Error(conflict.message);
-        return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands: [], changed: false, dryRun: true, conflict };
-      }
-      const commands = [["systemctl", "--user", "disable", "--now", unitName], ["systemctl", "--user", "daemon-reload"]];
-      if (!context.dryRun) {
-        await deps.run(commands[0][0], commands[0].slice(1));
-        unlinkSync(serviceFile);
-        await deps.run(commands[1][0], commands[1].slice(1));
-      }
-      return { adapter: this.name, action: "uninstall", serviceFile, unitName, stateDir, commands, changed: true, dryRun: context.dryRun === true };
-    }
-  };
-}
-
-export {
-  SERVICE_NAME,
-  bakedStateDir,
-  createLinuxUserSystemdAdapter
-};