@intentic/providers 1.326.0 → 1.327.0

package/dist/komodo/komodo.js

@@ -1,16 +1,8 @@
-import { HOST_STATE_ROOT } from "@intentic/constants";
-import { pollUntil } from "@intentic/base/async";
-import { HASH_KEY } from "@intentic/graph";
-import { envLine, shellQuote } from "@intentic/sandbox-run/quote";
 import { z } from "zod";
-import { guardedUpdate } from "../core/guarded-update.js";
-import { gitProvider, hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
-import { containerLabel } from "../core/backing-ssh.js";
-import { listStampedContainers } from "../core/list-stamped.js";
-import { sshExecutor } from "../core/ssh.js";
-const komodoSchema = sshSchema.extend({
-    internalIp: z.string(),
-    domain: z.string(),
+import { gitProvider } from "../core/inputs.js";
+import { stampLabels } from "../core/stamp.js";
+import { createComposeServiceProvider, serviceSchema } from "../services/compose-service.js";
+const komodoSchema = serviceSchema.extend({
     adminUser: z.string(),
     adminPassword: z.string(),
     gitUrl: z.string().optional(),
@@ -26,38 +18,15 @@ const komodoSchema = sshSchema.extend({
     guardRepo: z.string().optional(),
     resticImage: z.string().optional(),
 });
-const parse = (inputs) => parseInputs(komodoSchema, inputs, "komodo");
 const CORE = "intentic-komodo-core";
 export const KOMODO_CORE_PORT = 9120;
-const STATE_DIR = `${HOST_STATE_ROOT}/komodo`;
-const READY_TIMEOUT_MS = 90_000;
-const READY_INTERVAL_MS = 3_000;
-const internalUrl = (parsed) => `http://${parsed.internalIp}:${KOMODO_CORE_PORT}`;
-const outputsFor = (parsed) => ({ url: `https://${parsed.domain}`, internalUrl: internalUrl(parsed) });
-const running = async (session, id) => {
-    const result = await session.exec(`docker ps --filter "label=intentic.id=${id}" --format '{{.Names}}'`);
-    return result.stdout.trim() !== "";
-};
-const PROJECT = "komodo";
-const runningImages = async (session) => {
-    const result = await session.exec(`ids=$(docker ps -q --filter "label=com.docker.compose.project=${PROJECT}"); ` +
-        `[ -n "$ids" ] && docker inspect --format '{{index .Config.Labels "com.docker.compose.service"}}={{.Config.Image}}' $ids || true`);
-    const images = {};
-    for (const line of result.stdout.trim().split("\n")) {
-        const eq = line.indexOf("=");
-        if (eq > 0) {
-            images[line.slice(0, eq)] = line.slice(eq + 1);
-        }
-    }
-    return images;
-};
 const desiredImages = (parsed) => ({
     postgres: parsed.postgresImage,
     ferretdb: parsed.ferretdbImage,
     core: parsed.coreImage,
     periphery: parsed.peripheryImage,
 });
-const composeYaml = (images, id, hash) => [
+const composeYaml = (images, stamp) => [
     "services:",
     "  postgres:",
     `    image: ${images["postgres"]}`,
@@ -77,7 +46,7 @@ const composeYaml = (images, id, hash) => [
     `    ports: [ "${KOMODO_CORE_PORT}:9120" ]`,
     "    env_file: ./.env",
     "    volumes: [ keys:/config/keys, ./config.toml:/config/config.toml:ro ]",
-    `    labels: [ "intentic.id=${id}", "intentic.type=komodo", "intentic.hash=${hash}" ]`,
+    stampLabels("komodo", stamp),
     "  periphery:",
     `    image: ${images["periphery"]}`,
     "    restart: unless-stopped",
@@ -95,127 +64,40 @@ const configToml = (parsed) => {
     lines.push("[[docker_registry]]", `domain = "${parsed.registry}"`, `accounts = [{ username = "${parsed.registryUser}", token = "${parsed.registryToken}" }]`, "");
     return lines.join("\n");
 };
-const ensureFiles = async (session, parsed, images, id, hash) => {
-    await session.exec(`mkdir -p ${STATE_DIR}`);
-    await session.exec(`cat > ${STATE_DIR}/compose.yaml <<'COMPOSE_EOF'\n${composeYaml(images, id, hash)}COMPOSE_EOF`);
-    await session.exec(`cat > ${STATE_DIR}/config.toml <<'CONFIG_EOF'\n${configToml(parsed)}CONFIG_EOF`);
-    const envPairs = [
-        ["TZ", "Etc/UTC"],
-        ["KOMODO_LOCAL_AUTH", "true"],
-        ["KOMODO_CONFIG_PATH", "/config/config.toml"],
-        ["KOMODO_INIT_ADMIN_USERNAME", parsed.adminUser],
-        ["KOMODO_DATABASE_ADDRESS", "ferretdb:27017"],
-        ["KOMODO_FIRST_SERVER_NAME", "Local"],
-        ["KOMODO_FIRST_SERVER_ADDRESS", "https://periphery:8120"],
-        ["KOMODO_RESOURCE_POLL_INTERVAL", "1-min"],
-        ["KOMODO_HOST", `https://${parsed.domain}`],
-        ["KOMODO_INIT_ADMIN_PASSWORD", parsed.adminPassword],
-        ["KOMODO_DATABASE_USERNAME", "komodo"],
-    ];
-    const staticEnv = envPairs.map(([key, value]) => shellQuote(envLine(key, value))).join(" ");
-    const generated = [
-        `printf "KOMODO_PASSKEY='%s'\\n" "$(openssl rand -hex 32)"`,
-        `printf "KOMODO_JWT_SECRET='%s'\\n" "$(openssl rand -hex 32)"`,
-        `printf "KOMODO_DATABASE_PASSWORD='%s'\\n" "$(openssl rand -hex 16)"`,
-    ].join("; ");
-    await session.exec(`test -f ${STATE_DIR}/.env || { printf '%s' ${staticEnv} > ${STATE_DIR}/.env; { ${generated}; } >> ${STATE_DIR}/.env; }`);
-};
-const healthy = async (session, parsed) => {
-    const result = await session.exec(`wget -q -T 10 -O /dev/null ${internalUrl(parsed)}`);
-    return result.code === 0;
-};
-const waitHealthy = async (session, parsed) => {
-    const up = await pollUntil(() => healthy(session, parsed), { timeoutMs: READY_TIMEOUT_MS, intervalMs: READY_INTERVAL_MS });
-    if (!up) {
-        throw new Error(`komodo did not become healthy within ${READY_TIMEOUT_MS}ms`);
-    }
-};
-export const createKomodoProvider = (executor = sshExecutor) => ({
-    read: async (inputs, ctx) => {
-        if (hasPendingRef(inputs, "internalIp", "gitUrl", "gitAccount", "gitToken", "registry", "registryUser", "registryToken")) {
-            return undefined;
-        }
-        const parsed = parse(inputs);
-        let session;
-        try {
-            session = await executor.connect(sshTarget(parsed));
-        }
-        catch (error) {
-            ctx.log(`komodo "${ctx.id}": host not reachable over SSH, treating as not-yet-created: ${String(error)}`);
-            return undefined;
-        }
-        try {
-            if (!(await running(session, ctx.id)) || !(await healthy(session, parsed))) {
-                return undefined;
-            }
-            const stampHash = await containerLabel(session, ctx.id, HASH_KEY);
-            return { outputs: outputsFor(parsed), detail: { images: await runningImages(session) }, ...(stampHash === "" ? {} : { stampHash }) };
-        }
-        finally {
-            await session.dispose();
-        }
-    },
-    diff: (inputs, observed) => {
-        const parsed = parse(inputs);
-        const images = (observed.detail?.["images"] ?? {});
-        for (const [service, desired] of Object.entries(desiredImages(parsed))) {
-            if (images[service] !== desired) {
-                return { action: "update", reason: `komodo ${service} image differs (running ${String(images[service])}, want ${desired})` };
-            }
-        }
-        return { action: "noop" };
-    },
-    apply: async (inputs, observed, ctx) => {
-        const parsed = parse(inputs);
-        const session = await executor.connect(sshTarget(parsed));
-        try {
-            const bringUp = async (images) => {
-                await ensureFiles(session, parsed, images, ctx.id, ctx.inputsHash ?? "");
-                const up = await session.exec(`docker compose -p komodo --project-directory ${STATE_DIR} --env-file ${STATE_DIR}/.env -f ${STATE_DIR}/compose.yaml up -d`);
-                if (up.code !== 0) {
-                    throw new Error(`failed to bring up komodo stack: exited ${up.code}: ${up.stderr.trim()}`);
-                }
-                await waitHealthy(session, parsed);
-            };
-            const oldImages = observed?.detail?.["images"];
-            if (observed !== undefined &&
-                parsed.guardRepo !== undefined &&
-                parsed.resticImage !== undefined &&
-                typeof oldImages === "object" &&
-                oldImages !== null) {
-                await guardedUpdate({
-                    session,
-                    repo: parsed.guardRepo,
-                    resticImage: parsed.resticImage,
-                    volumes: ["komodo_postgres-data", "komodo_keys", "komodo_ferretdb-state"],
-                    tag: `intentic-preupdate-${CORE}`,
-                    recreate: () => bringUp(desiredImages(parsed)),
-                    stop: async () => {
-                        await session.exec('ids=$(docker ps -aq -f label=com.docker.compose.project=komodo); [ -n "$ids" ] && docker rm -f $ids || true');
-                    },
-                    rollback: () => bringUp(oldImages),
-                    log: ctx.log,
-                });
-            }
-            else {
-                await bringUp(desiredImages(parsed));
-            }
-            return outputsFor(parsed);
-        }
-        finally {
-            await session.dispose();
-        }
-    },
-    delete: async (inputs) => {
-        const session = await executor.connect(sshTarget(parseInputs(sshSchema, inputs, "komodo")));
-        try {
-            await session.exec(`docker compose -p komodo --project-directory ${STATE_DIR} --env-file ${STATE_DIR}/.env -f ${STATE_DIR}/compose.yaml down -v 2>/dev/null || true`);
-            await session.exec(`rm -rf ${STATE_DIR}`);
-        }
-        finally {
-            await session.dispose();
-        }
-    },
-    list: (sources, ctx) => listStampedContainers(executor, "komodo", sources, ctx.log),
-});
+const envEntries = (parsed) => [
+    { key: "TZ", value: "Etc/UTC" },
+    { key: "KOMODO_LOCAL_AUTH", value: "true" },
+    { key: "KOMODO_CONFIG_PATH", value: "/config/config.toml" },
+    { key: "KOMODO_INIT_ADMIN_USERNAME", value: parsed.adminUser },
+    { key: "KOMODO_DATABASE_ADDRESS", value: "ferretdb:27017" },
+    { key: "KOMODO_FIRST_SERVER_NAME", value: "Local" },
+    { key: "KOMODO_FIRST_SERVER_ADDRESS", value: "https://periphery:8120" },
+    { key: "KOMODO_RESOURCE_POLL_INTERVAL", value: "1-min" },
+    { key: "KOMODO_HOST", value: `https://${parsed.domain}` },
+    { key: "KOMODO_INIT_ADMIN_PASSWORD", value: parsed.adminPassword },
+    { key: "KOMODO_DATABASE_USERNAME", value: "komodo" },
+    { key: "KOMODO_PASSKEY" },
+    { key: "KOMODO_JWT_SECRET" },
+    { key: "KOMODO_DATABASE_PASSWORD" },
+];
+export const createKomodoProvider = (executor) => createComposeServiceProvider({
+    kind: "komodo",
+    schema: komodoSchema,
+    port: KOMODO_CORE_PORT,
+    healthPath: "",
+    readyTimeoutMs: 90_000,
+    pendingRefs: ["internalIp", "gitUrl", "gitAccount", "gitToken", "registry", "registryUser", "registryToken"],
+    adoptsOwner: false,
+    files: (parsed, stamp, images) => ({ "compose.yaml": composeYaml(images, stamp), "config.toml": { content: configToml(parsed), secret: true } }),
+    env: envEntries,
+    images: desiredImages,
+    guard: (parsed) => parsed.guardRepo === undefined || parsed.resticImage === undefined
+        ? undefined
+        : {
+            repo: parsed.guardRepo,
+            resticImage: parsed.resticImage,
+            volumes: ["komodo_postgres-data", "komodo_keys", "komodo_ferretdb-state"],
+            tag: `intentic-preupdate-${CORE}`,
+        },
+}, executor);
 //# sourceMappingURL=komodo.js.map

package/dist/komodo/komodo.js.map

@@ -1 +1 @@
-{"version":3,"file":"komodo.js","sourceRoot":"","sources":["../../src/komodo/komodo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"komodo.js","sourceRoot":"","sources":["../../src/komodo/komodo.ts"],"names":[],"mappings":"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"}

package/dist/network/cf-route.d.ts

@@ -1,5 +1,12 @@
 import type { Provider } from "@intentic/engine";
 import type { CloudflareApi } from "./cloudflare-api.js";
 export type DnsPropagationWait = (hostname: string, log: (message: string) => void) => Promise<void>;
+export declare const upsertCname: (api: CloudflareApi, args: {
+    readonly apiToken: string;
+    readonly zoneId: string;
+    readonly name: string;
+    readonly content: string;
+    readonly comment: string;
+}) => Promise<void>;
 export declare const createCfRouteProvider: (api?: CloudflareApi, awaitPropagation?: DnsPropagationWait) => Provider;
 //# sourceMappingURL=cf-route.d.ts.map

package/dist/network/cf-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cf-route.d.ts","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWzD,MAAM,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AA2BrG,eAAO,MAAM,qBAAqB,SACzB,aAAa,qBACA,kBAAkB,KACrC,QAgED,CAAC"}
+{"version":3,"file":"cf-route.d.ts","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAqBzD,MAAM,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AA2BrG,eAAO,MAAM,WAAW,QACf,aAAa,QACZ;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,KACxI,OAAO,CAAC,IAAI,CAQd,CAAC;AAIF,eAAO,MAAM,qBAAqB,SACzB,aAAa,qBACA,kBAAkB,KACrC,QA8ED,CAAC"}

package/dist/network/cf-route.js

@@ -1,11 +1,16 @@
 import { pollUntil } from "@intentic/base/async";
-import { formatStamp, parseStamp, STAMP_KEY } from "@intentic/graph";
+import { formatStamp, OWNER_KEY, parseStamp, STAMP_KEY } from "@intentic/graph";
 import { z } from "zod";
 import { parseInputs } from "../core/inputs.js";
 import { cloudflareApi } from "./cloudflare-api.js";
 const cfRouteSchema = z.object({ hostname: z.string(), zoneId: z.string(), apiToken: z.string(), cname: z.string() });
 const parse = (inputs) => parseInputs(cfRouteSchema, inputs, "cf-route");
 const deleteSchema = cfRouteSchema.omit({ cname: true });
+const COMMENT_LIMIT = 100;
+const stampComment = (id, owner) => {
+    const owned = owner === undefined ? undefined : formatStamp(id, owner);
+    return owned !== undefined && owned.length <= COMMENT_LIMIT ? { comment: owned, owned: true } : { comment: formatStamp(id), owned: false };
+};
 const dohResolves = async (hostname) => {
     try {
         const response = await fetch(`https://cloudflare-dns.com/dns-query?name=${encodeURIComponent(hostname)}&type=A`, {
@@ -27,8 +32,18 @@ const waitForDnsPropagation = async (hostname, log) => {
         log(`cf-route: ${hostname} not yet observable via DoH after 90s; proceeding (downstream calls may need a retry)`);
     }
 };
+export const upsertCname = async (api, args) => {
+    const { apiToken, zoneId, name, content, comment } = args;
+    const record = await api.findDnsRecord({ apiToken, zoneId, name });
+    if (record === undefined) {
+        await api.createDnsRecord({ apiToken, zoneId, name, content, comment });
+    }
+    else {
+        await api.updateDnsRecord({ apiToken, zoneId, recordId: record.id, name, content, comment });
+    }
+};
 export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = waitForDnsPropagation) => ({
-    read: async (inputs) => {
+    read: async (inputs, ctx) => {
         if (typeof inputs["zoneId"] !== "string") {
             return undefined;
         }
@@ -37,7 +52,12 @@ export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = wa
         if (record === undefined) {
             return undefined;
         }
-        return { outputs: { url: `https://${hostname}` }, detail: { content: record.content } };
+        const owned = stampComment(ctx.id, ctx.owner).owned;
+        return {
+            outputs: { url: `https://${hostname}` },
+            detail: { content: record.content },
+            ...(owned ? { stampOwner: parseStamp(record.comment ?? "")?.owner ?? "" } : {}),
+        };
     },
     diff: (inputs, observed) => {
         if (typeof inputs["cname"] !== "string") {
@@ -52,14 +72,8 @@ export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = wa
     },
     apply: async (inputs, _observed, ctx) => {
         const { hostname, zoneId, apiToken, cname } = parse(inputs);
-        const comment = formatStamp(ctx.id);
-        const record = await api.findDnsRecord({ apiToken, zoneId, name: hostname });
-        if (record === undefined) {
-            await api.createDnsRecord({ apiToken, zoneId, name: hostname, content: cname, comment });
-        }
-        else {
-            await api.updateDnsRecord({ apiToken, zoneId, recordId: record.id, name: hostname, content: cname, comment });
-        }
+        const { comment } = stampComment(ctx.id, ctx.owner);
+        await upsertCname(api, { apiToken, zoneId, name: hostname, content: cname, comment });
         await awaitPropagation(hostname, ctx.log);
         return { url: `https://${hostname}` };
     },
@@ -80,12 +94,24 @@ export const createCfRouteProvider = (api = cloudflareApi, awaitPropagation = wa
         const found = await api.getZone({ apiToken, zone });
         if (found === undefined) {
             ctx.log(`cf-route list: zone "${zone}" not found, skipping scan`);
+            ctx.skipped?.(account.id, `zone "${zone}" not found`);
             return [];
         }
-        const records = await api.listStampedDnsRecords({ apiToken, zoneId: found.id, commentPrefix: `${STAMP_KEY}=` });
+        const records = [
+            ...(await api.listStampedDnsRecords({ apiToken, zoneId: found.id, commentPrefix: `${STAMP_KEY}=` })),
+            ...(await api.listStampedDnsRecords({ apiToken, zoneId: found.id, commentPrefix: `${OWNER_KEY}=` })),
+        ];
         return records.flatMap((record) => {
-            const id = parseStamp(record.comment);
-            return id === undefined ? [] : [{ id, inputs: { hostname: record.name, zoneId: found.id, apiToken } }];
+            const stamp = parseStamp(record.comment);
+            return stamp === undefined
+                ? []
+                : [
+                    {
+                        id: stamp.id,
+                        inputs: { hostname: record.name, zoneId: found.id, apiToken },
+                        ...(stamp.owner !== undefined ? { owner: stamp.owner } : {}),
+                    },
+                ];
         });
     },
 });

package/dist/network/cf-route.js.map

@@ -1 +1 @@
-{"version":3,"file":"cf-route.js","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACtH,MAAM,KAAK,GAAG,CAAC,MAAsB,EAAiC,EAAE,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAExH,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAOzD,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAoB,EAAE;IAC7D,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,6CAA6C,kBAAkB,CAAC,QAAQ,CAAC,SAAS,EAAE;YAC7G,OAAO,EAAE,EAAE,MAAM,EAAE,sBAAsB,EAAE;YAE3C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;SACtC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAuE,CAAC;QAC3G,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACrF,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAuB,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE;IACtE,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QAC3F,GAAG,CAAC,aAAa,QAAQ,uFAAuF,CAAC,CAAC;IACtH,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACjC,GAAG,GAAkB,aAAa,EAClC,gBAAgB,GAAuB,qBAAqB,EACpD,EAAE,CAAC,CAAC;IACZ,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAEnB,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,WAAW,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;IAC5F,CAAC;IACD,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;QAEvB,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,oDAAoD,EAAE,CAAC;QAC9F,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,MAAM,CAAC,OAAO,CAAC,mBAAmB,KAAK,GAAG,EAAE,CAAC;IACrG,CAAC;IACD,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE;QACpC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAClH,CAAC;QACD,MAAM,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1C,OAAO,EAAE,GAAG,EAAE,WAAW,QAAQ,EAAE,EAAE,CAAC;IAC1C,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QACD,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC;IAGD,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;QACvE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC3H,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,GAAG,CAAC,GAAG,CAAC,wBAAwB,IAAI,4BAA4B,CAAC,CAAC;YAClE,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,SAAS,GAAG,EAAE,CAAC,CAAC;QAChH,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC,CAAC"}
+{"version":3,"file":"cf-route.js","sourceRoot":"","sources":["../../src/network/cf-route.ts"],"names":[],"mappings":"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"}

package/dist/network/cloudflare-api.d.ts

@@ -59,6 +59,7 @@ export interface CloudflareApi {
     }) => Promise<{
         readonly id: string;
         readonly content: string;
+        readonly comment?: string;
     } | undefined>;
     readonly listStampedDnsRecords: (args: {
         readonly apiToken: string;

package/dist/network/cloudflare-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare-api.d.ts","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloudflare-api.d.ts","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}

package/dist/network/cloudflare-api.js

@@ -1,44 +1,8 @@
-import { errorMessage } from "@intentic/base/errors";
+import { cloudflareCall, cloudflarePages } from "@intentic/base/cloudflare";
 import { z } from "zod";
 import { parseResponse } from "../core/inputs.js";
 const ingressRuleSchema = z.object({ hostname: z.string().optional(), service: z.string() });
-const BASE = "https://api.cloudflare.com/client/v4";
-const envelopeSchema = z.object({
-    success: z.boolean(),
-    errors: z.array(z.object({ code: z.number(), message: z.string() })),
-    result: z.unknown(),
-    result_info: z.unknown().optional(),
-});
-const request = async (apiToken, path, init) => {
-    const label = `Cloudflare API ${init?.method ?? "GET"} ${path}`;
-    const started = Date.now();
-    let response;
-    try {
-        response = await fetch(`${BASE}${path}`, {
-            ...init,
-            headers: {
-                Authorization: `Bearer ${apiToken}`,
-                ...(init?.body !== undefined ? { "Content-Type": "application/json" } : {}),
-            },
-            signal: AbortSignal.timeout(30_000),
-        });
-    }
-    catch (error) {
-        throw new Error(`${label} transport failed after ${Date.now() - started}ms: ${errorMessage(error)}`, {
-            cause: error,
-        });
-    }
-    const envelope = parseResponse(envelopeSchema, await response.json(), label);
-    if (!response.ok || !envelope.success) {
-        const detail = envelope.errors.map((error) => `${error.code} ${error.message}`).join("; ");
-        throw new Error(`${label} failed (HTTP ${response.status}): ${detail}`);
-    }
-    return envelope;
-};
-const call = async (apiToken, path, resultSchema, init) => {
-    const envelope = await request(apiToken, path, init);
-    return parseResponse(resultSchema, envelope.result, `Cloudflare API ${init?.method ?? "GET"} ${path}`);
-};
+const call = async (apiToken, path, resultSchema, init) => parseResponse(resultSchema, await cloudflareCall(apiToken, path, init), `Cloudflare API ${init?.method ?? "GET"} ${path}`);
 export const cloudflareApi = {
     getZone: async ({ apiToken, zone }) => {
         const zones = await call(apiToken, `/zones?name=${encodeURIComponent(zone)}`, z.array(z.object({ id: z.string(), account: z.object({ id: z.string() }) })));
@@ -49,19 +13,8 @@ export const cloudflareApi = {
         return { id: found.id, accountId: found.account.id };
     },
     listZones: async ({ apiToken }) => {
-        const zones = [];
-        let page = 1;
-        let totalPages = 1;
-        do {
-            const envelope = await request(apiToken, `/zones?per_page=50&page=${page}`);
-            const parsed = parseResponse(z.array(z.object({ id: z.string(), name: z.string(), account: z.object({ id: z.string() }) })), envelope.result, `Cloudflare API GET /zones?per_page=50&page=${page}`);
-            for (const zone of parsed) {
-                zones.push({ id: zone.id, name: zone.name, accountId: zone.account.id });
-            }
-            totalPages = z.object({ total_pages: z.number() }).safeParse(envelope.result_info).data?.total_pages ?? 1;
-            page += 1;
-        } while (page <= totalPages);
-        return zones;
+        const zones = parseResponse(z.array(z.object({ id: z.string(), name: z.string(), account: z.object({ id: z.string() }) })), await cloudflarePages(apiToken, "/zones"), "Cloudflare API GET /zones");
+        return zones.map((zone) => ({ id: zone.id, name: zone.name, accountId: zone.account.id }));
     },
     findTunnel: async ({ accountId, apiToken, name }) => {
         const tunnels = await call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel?name=${encodeURIComponent(name)}&is_deleted=false`, z.array(z.object({ id: z.string() })));
@@ -73,7 +26,7 @@ export const cloudflareApi = {
     },
     createTunnel: ({ accountId, apiToken, name }) => call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel`, z.object({ id: z.string() }), {
         method: "POST",
-        body: JSON.stringify({ name, config_src: "cloudflare" }),
+        body: { name, config_src: "cloudflare" },
     }),
     getTunnelToken: ({ accountId, apiToken, tunnelId }) => call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel/${encodeURIComponent(tunnelId)}/token`, z.string()),
     getTunnelStatus: async ({ accountId, apiToken, tunnelId }) => {
@@ -88,16 +41,16 @@ export const cloudflareApi = {
     putTunnelIngress: async ({ accountId, apiToken, tunnelId, ingress }) => {
         await call(apiToken, `/accounts/${encodeURIComponent(accountId)}/cfd_tunnel/${encodeURIComponent(tunnelId)}/configurations`, z.unknown(), {
             method: "PUT",
-            body: JSON.stringify({ config: { ingress } }),
+            body: { config: { ingress } },
         });
     },
     findDnsRecord: async ({ apiToken, zoneId, name }) => {
-        const records = await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records?type=CNAME&name=${encodeURIComponent(name)}`, z.array(z.object({ id: z.string(), content: z.string() })));
+        const records = await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records?type=CNAME&name=${encodeURIComponent(name)}`, z.array(z.object({ id: z.string(), content: z.string(), comment: z.string().nullish() })));
         const found = records[0];
         if (found === undefined) {
             return undefined;
         }
-        return { id: found.id, content: found.content };
+        return { id: found.id, content: found.content, ...(typeof found.comment === "string" ? { comment: found.comment } : {}) };
     },
     listStampedDnsRecords: async ({ apiToken, zoneId, commentPrefix }) => {
         const records = await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records?comment.startswith=${encodeURIComponent(commentPrefix)}&per_page=1000`, z.array(z.object({ name: z.string(), comment: z.string() })));
@@ -106,13 +59,13 @@ export const cloudflareApi = {
     createDnsRecord: async ({ apiToken, zoneId, name, content, comment }) => {
         await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records`, z.unknown(), {
             method: "POST",
-            body: JSON.stringify({ type: "CNAME", name, content, proxied: true, comment }),
+            body: { type: "CNAME", name, content, proxied: true, comment },
         });
     },
     updateDnsRecord: async ({ apiToken, zoneId, recordId, name, content, comment }) => {
         await call(apiToken, `/zones/${encodeURIComponent(zoneId)}/dns_records/${encodeURIComponent(recordId)}`, z.unknown(), {
             method: "PUT",
-            body: JSON.stringify({ type: "CNAME", name, content, proxied: true, comment }),
+            body: { type: "CNAME", name, content, proxied: true, comment },
         });
     },
     deleteTunnel: async ({ accountId, apiToken, tunnelId }) => {

package/dist/network/cloudflare-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare-api.js","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloudflare-api.js","sourceRoot":"","sources":["../../src/network/cloudflare-api.ts"],"names":[],"mappings":"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"}

package/dist/network/tunnel.d.ts

@@ -1,5 +1,12 @@
 import type { Provider } from "@intentic/engine";
 import type { SshExecutor } from "../core/ssh.js";
 import type { CloudflareApi } from "./cloudflare-api.js";
-export declare const createTunnelProvider: (api?: CloudflareApi, executor?: SshExecutor) => Provider;
+export declare const findOrCreateTunnel: (api: CloudflareApi, args: {
+    readonly accountId: string;
+    readonly apiToken: string;
+    readonly name: string;
+}) => Promise<{
+    readonly id: string;
+}>;
+export declare const createTunnelProvider: (api: CloudflareApi, executor: SshExecutor) => Provider;
 //# sourceMappingURL=tunnel.d.ts.map

package/dist/network/tunnel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAmC,MAAM,kBAAkB,CAAC;AAGlF,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,qBAAqB,CAAC;AAoHtE,eAAO,MAAM,oBAAoB,SAAS,aAAa,aAA4B,WAAW,KAAiB,QAyE7G,CAAC"}
+{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAmC,MAAM,kBAAkB,CAAC;AAGlF,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,qBAAqB,CAAC;AAmHtE,eAAO,MAAM,kBAAkB,QACtB,aAAa,QACZ;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KACvF,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAmE,CAAC;AAItG,eAAO,MAAM,oBAAoB,QAAS,aAAa,YAAY,WAAW,KAAG,QAwE/E,CAAC"}