loopable-cli 0.2.0 → 0.3.0

package/dist/cli.mjs

@@ -14,68 +14,17 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/lib/callback.ts
-var callback_exports = {};
-__export(callback_exports, {
-  appOrigin: () => appOrigin,
-  callbackUrl: () => callbackUrl,
-  isLoopbackHost: () => isLoopbackHost,
+// src/lib/lan.ts
+var lan_exports = {};
+__export(lan_exports, {
   lanIPv4: () => lanIPv4,
-  loopableOrigin: () => loopableOrigin,
-  registrableCallbackUrl: () => registrableCallbackUrl
+  loopableOrigin: () => loopableOrigin
 });
 import { networkInterfaces } from "node:os";
 function configuredOrigin() {
   const base = process.env.LOOPABLE_BASE_URL?.replace(/\/$/, "");
   return base || null;
 }
-function isLoopbackHost(hostname) {
-  return hostname === "127.0.0.1" || hostname === "localhost" || hostname === "::1";
-}
-function isPrivateHostname(hostname) {
-  if (isLoopbackHost(hostname)) return true;
-  const v4 = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(hostname);
-  if (v4) {
-    const a = Number(v4[1]);
-    const b = Number(v4[2]);
-    if (a === 10) return true;
-    if (a === 127) return true;
-    if (a === 192 && b === 168) return true;
-    if (a === 172 && b >= 16 && b <= 31) return true;
-    if (a === 169 && b === 254) return true;
-    return false;
-  }
-  const host = hostname.toLowerCase();
-  if (host.includes(":")) {
-    if (host.startsWith("fe80:") || host.startsWith("fc") || host.startsWith("fd")) return true;
-  }
-  return false;
-}
-function publicConfiguredOrigin() {
-  const base = configuredOrigin();
-  if (!base) return null;
-  try {
-    const url = new URL(base);
-    if (isPrivateHostname(url.hostname)) return null;
-    return base;
-  } catch {
-    return null;
-  }
-}
-function appOrigin(requestUrl) {
-  const hosted = publicConfiguredOrigin();
-  if (hosted) return hosted;
-  const url = new URL(requestUrl);
-  return `http://127.0.0.1${url.port ? `:${url.port}` : ""}`;
-}
-function callbackUrl(requestUrl, connectorId) {
-  return `${appOrigin(requestUrl)}/api/connectors/${connectorId}/callback`;
-}
-function registrableCallbackUrl(connectorId) {
-  const hosted = publicConfiguredOrigin();
-  if (hosted) return `${hosted}/api/connectors/${connectorId}/callback`;
-  return `http://127.0.0.1/api/connectors/${connectorId}/callback`;
-}
 function lanIPv4(nics = networkInterfaces()) {
   const found = [];
   for (const addrs of Object.values(nics)) {
@@ -96,8 +45,8 @@ function loopableOrigin(nics = networkInterfaces()) {
   const port = process.env.PORT ?? process.env.NITRO_PORT ?? "4321";
   return `http://${lanIPv4(nics) ?? "127.0.0.1"}:${port}`;
 }
-var init_callback = __esm({
-  "src/lib/callback.ts"() {
+var init_lan = __esm({
+  "src/lib/lan.ts"() {
     "use strict";
   }
 });
@@ -2240,6 +2189,130 @@ var init_drizzle_orm = __esm({
   }
 });
 
+// package.json
+var package_default;
+var init_package = __esm({
+  "package.json"() {
+    package_default = {
+      name: "loopable-cli",
+      version: "0.2.1",
+      description: "CLI to run Loopable: App, Dispatcher, and Runner.",
+      license: "MIT",
+      type: "module",
+      bin: {
+        loopable: "./dist/cli.mjs"
+      },
+      files: [
+        ".output",
+        "dist",
+        "drizzle"
+      ],
+      engines: {
+        node: ">=22"
+      },
+      packageManager: "pnpm@11.22.0",
+      repository: {
+        type: "git",
+        url: "git+https://github.com/imsobear/loopable.git"
+      },
+      bugs: {
+        url: "https://github.com/imsobear/loopable/issues"
+      },
+      homepage: "https://github.com/imsobear/loopable#readme",
+      publishConfig: {
+        access: "public"
+      },
+      imports: {
+        "#/*": "./src/*"
+      },
+      scripts: {
+        dev: "node --experimental-strip-types scripts/dev.ts",
+        start: "node dist/cli.mjs start",
+        dispatcher: "LOOPABLE_DEV=1 node --experimental-strip-types src/cli.ts dispatcher",
+        runner: "LOOPABLE_DEV=1 node --experimental-strip-types src/cli.ts runner",
+        "generate-routes": "tsr generate",
+        build: "vite build && node scripts/build-cli.mjs",
+        preview: "vite preview",
+        test: "vitest run",
+        "test:watch": "vitest",
+        "db:generate": "drizzle-kit generate",
+        "db:studio": "LOOPABLE_DEV=1 drizzle-kit studio",
+        typecheck: "tsc --noEmit",
+        release: "node scripts/release.mjs",
+        deploy: "LOOPABLE_CF=1 vite build && wrangler deploy",
+        "site:dev": "pnpm --filter loopable-site dev",
+        "site:build": "pnpm --filter loopable-site build",
+        "site:deploy": "pnpm --filter loopable-site deploy",
+        prepublishOnly: "pnpm typecheck && pnpm test && pnpm build"
+      },
+      dependencies: {
+        "@libsql/client": "^0.18.0"
+      },
+      devDependencies: {
+        "@base-ui/react": "^1.7.0",
+        "@cloudflare/containers": "^0.3.7",
+        "@cloudflare/vite-plugin": "^1.54.10",
+        "@fontsource-variable/geist": "^5.3.0",
+        "@tailwindcss/vite": "4.1.18",
+        "@tanstack/devtools-vite": "0.8.5",
+        "@tanstack/react-devtools": "0.10.12",
+        "@tanstack/react-router": "1.170.32",
+        "@tanstack/react-router-devtools": "1.167.1",
+        "@tanstack/react-start": "1.168.49",
+        "@tanstack/router-cli": "1.167.33",
+        "@types/node": "^22.10.2",
+        "@types/qrcode": "^1.5.6",
+        "@types/react": "^19.2.0",
+        "@types/react-dom": "^19.2.0",
+        "@vitejs/plugin-react": "^6.0.1",
+        "class-variance-authority": "^0.7.1",
+        clsx: "^2.1.1",
+        "drizzle-kit": "^0.31.10",
+        "drizzle-orm": "^0.45.2",
+        esbuild: "^0.28.2",
+        "lucide-react": "^1.39.0",
+        "next-themes": "^0.4.6",
+        nitro: "3.0.260610-beta",
+        qrcode: "^1.5.4",
+        react: "19.2.0",
+        "react-dom": "19.2.0",
+        shadcn: "^4.19.1",
+        sonner: "^2.0.8",
+        "tailwind-merge": "^3.6.0",
+        tailwindcss: "4.1.18",
+        "tw-animate-css": "^1.4.0",
+        typescript: "^6.0.2",
+        vite: "^8.0.0",
+        vitest: "^4.1.11",
+        wrangler: "^4.132.0"
+      }
+    };
+  }
+});
+
+// src/lib/version.ts
+function olderThan(a, b) {
+  if (!a) return true;
+  const pa = a.split(".").map((part) => Number.parseInt(part, 10));
+  const pb = b.split(".").map((part) => Number.parseInt(part, 10));
+  for (let i = 0; i < 3; i++) {
+    const x = pa[i] ?? 0;
+    const y = pb[i] ?? 0;
+    if (Number.isNaN(x)) return true;
+    if (x !== y) return x < y;
+  }
+  return false;
+}
+var VERSION, RUNNER_PROTOCOL, LEGACY_RUNNER_PROTOCOL;
+var init_version2 = __esm({
+  "src/lib/version.ts"() {
+    init_package();
+    VERSION = package_default.version;
+    RUNNER_PROTOCOL = 2;
+    LEGACY_RUNNER_PROTOCOL = 1;
+  }
+});
+
 // node_modules/.pnpm/drizzle-orm@0.45.2_@libsql+client@0.18.0_@types+better-sqlite3@9.6.0_better-sqlite3@13.0.3/node_modules/drizzle-orm/selection-proxy.js
 var SelectionProxyHandler;
 var init_selection_proxy = __esm({
@@ -6756,6 +6829,10 @@ var init_schema = __esm({
       status: text("status").$type().notNull().default("offline"),
       inventory: text("inventory", { mode: "json" }).$type().notNull().default([]),
       lastSeenAt: integer("last_seen_at", { mode: "timestamp_ms" }),
+      /** The runner's loopable-cli version. Null for runners before 0.3. */
+      version: text("version"),
+      /** What jobs it understands; see RUNNER_PROTOCOL. Null means the first. */
+      protocol: integer("protocol"),
       createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull().default(sql`(unixepoch() * 1000)`)
     });
   }
@@ -6963,11 +7040,21 @@ __export(runners_exports, {
   listRunners: () => listRunners,
   onlineRunnerCount: () => onlineRunnerCount,
   pickRunner: () => pickRunner,
+  protocolOf: () => protocolOf,
   rotateJoinToken: () => rotateJoinToken,
   runnerIdForToken: () => runnerIdForToken
 });
 import { randomBytes, randomUUID } from "node:crypto";
 import { hostname as osHostname } from "node:os";
+function protocolOf(row) {
+  return row.protocol ?? LEGACY_RUNNER_PROTOCOL;
+}
+function buildFields(build) {
+  return {
+    version: typeof build.version === "string" && build.version ? build.version : null,
+    protocol: typeof build.protocol === "number" ? build.protocol : null
+  };
+}
 function isRunnerOnline(row, now = Date.now()) {
   if (row.status !== "online") return false;
   if (!row.lastSeenAt) return false;
@@ -6981,7 +7068,10 @@ function toView(row, now = Date.now()) {
     hostname: row.hostname,
     status: online ? "online" : "offline",
     inventory: row.inventory,
-    lastSeenAt: row.lastSeenAt?.toISOString() ?? null
+    lastSeenAt: row.lastSeenAt?.toISOString() ?? null,
+    version: row.version,
+    protocol: protocolOf(row),
+    outdated: protocolOf(row) < RUNNER_PROTOCOL || olderThan(row.version, VERSION)
   };
 }
 async function listRunners() {
@@ -7011,11 +7101,13 @@ async function busyRunnerIds() {
     )
   );
 }
-async function availableAgentIds(requiresHost = false) {
+async function availableAgentIds(requiresHost = false, minProtocol = 0) {
   const local = osHostname();
   return [
     ...new Set(
-      (await listRunners()).filter((row) => row.status === "online" && (!requiresHost || row.hostname === local)).flatMap(
+      (await listRunners()).filter(
+        (row) => row.status === "online" && (!requiresHost || row.hostname === local) && row.protocol >= minProtocol
+      ).flatMap(
         (row) => row.inventory.filter((entry) => entry.installed && entry.signedIn).map((entry) => entry.agentId)
       )
     )
@@ -7024,9 +7116,11 @@ async function availableAgentIds(requiresHost = false) {
 async function pickRunner(input) {
   const now = Date.now();
   const local = osHostname();
-  let candidates = (await db().select().from(runners).all()).filter(
+  const minProtocol = input.minProtocol ?? 0;
+  const capable = (await db().select().from(runners).all()).filter(
     (row) => isRunnerOnline(row, now) && runnerCanRun(row, input.agentId)
   );
+  let candidates = capable.filter((row) => protocolOf(row) >= minProtocol);
   if (input.requiresHost) {
     candidates = candidates.filter((row) => row.hostname === local);
   }
@@ -7037,6 +7131,11 @@ async function pickRunner(input) {
   if (input.requiresHost) {
     throw new Error("This job needs a runner on the same host as Loopable.");
   }
+  if (capable.length > 0) {
+    throw new Error(
+      "Every runner with this agent is too old for this job. Upgrade them with npm install -g loopable-cli."
+    );
+  }
   throw new Error("No runner is online that can run this agent.");
 }
 async function getJoinToken() {
@@ -7051,10 +7150,10 @@ async function rotateJoinToken() {
   await secretStore().set(joinTokenKey(), token);
   return token;
 }
-async function heartbeatRunner(runnerId, inventory) {
+async function heartbeatRunner(runnerId, inventory, build = {}) {
   const row = await getRunner(runnerId);
   if (!row) throw new Error("Unknown runner.");
-  await db().update(runners).set({ status: "online", inventory, lastSeenAt: /* @__PURE__ */ new Date() }).where(eq(runners.id, runnerId)).run();
+  await db().update(runners).set({ status: "online", inventory, lastSeenAt: /* @__PURE__ */ new Date(), ...buildFields(build) }).where(eq(runners.id, runnerId)).run();
   return toView(await getRunner(runnerId));
 }
 async function joinRunner(input) {
@@ -7073,7 +7172,8 @@ async function joinRunner(input) {
       status: "online",
       inventory: input.inventory,
       lastSeenAt: now,
-      hostname: input.hostname
+      hostname: input.hostname,
+      ...buildFields(input)
     }).where(eq(runners.id, id)).run();
   } else {
     await db().insert(runners).values({
@@ -7082,7 +7182,8 @@ async function joinRunner(input) {
       hostname: input.hostname,
       status: "online",
       inventory: input.inventory,
-      lastSeenAt: now
+      lastSeenAt: now,
+      ...buildFields(input)
     }).run();
   }
   const token = randomBytes(24).toString("base64url");
@@ -7113,6 +7214,7 @@ var init_runners = __esm({
   "src/server/runners.ts"() {
     "use strict";
     init_drizzle_orm();
+    init_version2();
     init_client();
     init_schema();
     init_secrets();
@@ -7122,7 +7224,7 @@ var init_runners = __esm({
 
 // src/cli.ts
 import { spawn } from "node:child_process";
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { dirname, join as join3 } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -7141,8 +7243,18 @@ function usage() {
 
   loopable dispatcher
       Dispatcher only.
+
+  loopable --version
 `;
 }
+function cliVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync2(join3(root, "package.json"), "utf8"));
+    return pkg.version;
+  } catch {
+    return "unknown";
+  }
+}
 function fail(message) {
   process.stderr.write(`${message}
 `);
@@ -7162,6 +7274,7 @@ function parse(argv) {
       return value;
     };
     if (arg === "-h" || arg === "--help") return { command: "help", flags };
+    if (arg === "-v" || arg === "--version") return { command: "version", flags };
     if (arg === "--host") flags.host = next();
     else if (arg === "--port") flags.port = next();
     else if (arg === "--url") flags.url = next();
@@ -7248,7 +7361,7 @@ async function waitForApp(port) {
 }
 async function printRunnerHint(flags) {
   await waitForApp(flags.port);
-  const { lanIPv4: lanIPv42 } = await Promise.resolve().then(() => (init_callback(), callback_exports));
+  const { lanIPv4: lanIPv42 } = await Promise.resolve().then(() => (init_lan(), lan_exports));
   const { getJoinToken: getJoinToken2 } = await Promise.resolve().then(() => (init_runners(), runners_exports));
   const ip = lanIPv42() ?? "127.0.0.1";
   const url = `http://${ip}:${flags.port}`;
@@ -7279,6 +7392,11 @@ async function main() {
     process.stdout.write(usage());
     return;
   }
+  if (command === "version") {
+    process.stdout.write(`${cliVersion()}
+`);
+    return;
+  }
   if (command === "runner") {
     if (flags.url) process.env.LOOPABLE_URL = flags.url;
     if (flags.token) process.env.LOOPABLE_RUNNER_TOKEN = flags.token;