@irtio/cli 0.5.1 → 0.6.0

package/dist/api.d.ts

@@ -0,0 +1,52 @@
+/**
+ * A thin typed `fetch` wrapper around `@irtio/control`'s `/v1` API (contract.ts). Two things
+ * earn this its own module rather than inlined `fetch` calls in every command:
+ *
+ * 1. **`ApiError` becomes a real thrown error.** The control plane's error bodies (`code`,
+ *    `message`, and — on `E_BREAKING_SCHEMA` — `changes`/`hint`) are exactly what `irtio deploy`
+ *    needs to print verbatim; `ApiClientError` carries them through instead of a generic
+ *    "request failed" the command layer would have to re-parse.
+ * 2. **401 is a command, not an error.** Every command that hits the control plane wants the same
+ *    "run: irtio login" line and exit code 1, so it lives here once.
+ */
+declare class ApiClientError extends Error {
+    readonly name = "ApiClientError";
+    readonly status: number;
+    readonly code: string;
+    readonly changes: readonly unknown[] | undefined;
+    readonly hint: string | undefined;
+    constructor(status: number, body: {
+        code: string;
+        message: string;
+        changes?: readonly unknown[];
+        hint?: string;
+    });
+}
+/** Thrown by `requireApiClient`/callers when there is no stored token: the login nudge. */
+declare class NotLoggedInError extends Error {
+    readonly controlUrl: string;
+    readonly name = "NotLoggedInError";
+    constructor(controlUrl: string);
+}
+interface ApiClient {
+    readonly controlUrl: string;
+    get<T>(path: string, query?: Record<string, string | undefined>): Promise<T>;
+    post<T>(path: string, body?: unknown): Promise<T>;
+    patch<T>(path: string, body?: unknown): Promise<T>;
+    /**
+     * `DELETE`, with the same query-string handling as `get`. The one route that needs it today is
+     * `DELETE /v1/projects/:id/origins`, which names the origin to remove in the query rather than
+     * the body, so a client without this method cannot remove an origin at all.
+     */
+    del<T>(path: string, query?: Record<string, string | undefined>): Promise<T>;
+    /** Uploads raw bytes (a bundle) rather than JSON. */
+    postBytes<T>(path: string, bytes: Uint8Array): Promise<T>;
+}
+/** Builds a client bound to one control URL, using whatever token `irtio login` last stored. */
+declare function createApiClient(controlUrl: string): Promise<ApiClient>;
+/** Same as `createApiClient`, but with an explicit token — what tests use. */
+declare function createApiClientWithToken(controlUrl: string, token: string): ApiClient;
+/** True when `err` is the "please log in" case — the shape every command checks for. */
+declare function isLoginRequired(err: unknown): boolean;
+
+export { type ApiClient, ApiClientError, NotLoggedInError, createApiClient, createApiClientWithToken, isLoginRequired };

package/dist/api.js

@@ -0,0 +1,15 @@
+import {
+  ApiClientError,
+  NotLoggedInError,
+  createApiClient,
+  createApiClientWithToken,
+  isLoginRequired
+} from "./chunk-RNAH5T4W.js";
+import "./chunk-UPHQM6NZ.js";
+export {
+  ApiClientError,
+  NotLoggedInError,
+  createApiClient,
+  createApiClientWithToken,
+  isLoginRequired
+};

package/dist/bundle.js

@@ -3,7 +3,7 @@ import {
   BundleError,
   EXTERNAL_IMPORTS,
   bundleRoom
-} from "./chunk-KRQUAEN2.js";
+} from "./chunk-OTSFRVJN.js";
 export {
   ALLOWED_IMPORTS,
   BundleError,

package/dist/{static-deploy-BP3MDXCP.js → chunk-3HQMVCYA.js}

@@ -1,33 +1,66 @@
-import {
-  readIrtioJsonName
-} from "./chunk-D7CDJRFF.js";
 import {
   STATIC_LIMITS,
   staticPathProblem
-} from "./chunk-BPE452KF.js";
+} from "./chunk-RQSJZWQC.js";
+import {
+  ensureProject,
+  readProjectConfig
+} from "./chunk-DKWG7MGO.js";
+import {
+  HelpRequested,
+  helpFor,
+  helpRequested
+} from "./chunk-ZD4ND6X6.js";
 import {
-  ApiClientError,
   createApiClient,
   isLoginRequired
-} from "./chunk-I37DLT7K.js";
+} from "./chunk-RNAH5T4W.js";
 import {
   resolveControlUrlForUser
-} from "./chunk-NVUKSP5U.js";
+} from "./chunk-UPHQM6NZ.js";
 
 // src/static-deploy.ts
 import { existsSync } from "fs";
 import { lstat, readFile, readdir } from "fs/promises";
 import * as path from "path";
+import pc2 from "picocolors";
+
+// src/deploy-log.ts
 import pc from "picocolors";
+function logEnsured(log, projectId, ensured) {
+  if (ensured.action === "created") log(pc.dim(`created project ${projectId} (${ensured.name})`));
+  if (ensured.action === "renamed") {
+    log(pc.dim(`renamed project ${projectId}: ${ensured.from} -> ${ensured.name}`));
+  }
+}
+
+// src/static-deploy.ts
+var USAGE = `usage: irtio deploy --static [<dir>] [options]
+
+Uploads a BUILT client directory to the project's static site and prints the playable link. There
+is no build step: point it at the output your bundler already produced.
+
+options:
+  [<dir>]            the directory to upload (default: the project file's "static")
+  --label <label>    the site's hostname label (<label>.irt-serve.com)
+  --project <id>     project id (default: the project file)
+  --name <name>      the name a first deploy registers the project under
+  -c, --config <f>   the project file to read (default irtio.json)
+  --url <control>    control plane (default: your stored login)
+  -h, --help         print this
+`;
 function parseStaticDeployArgs(args) {
+  if (helpRequested(args)) throw helpFor(USAGE);
   const parsed = {};
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     switch (arg) {
       case "--static": {
-        const value = args[++i];
-        if (value === void 0) throw new Error("irtio deploy: --static needs a directory");
-        parsed.dir = value;
+        const value = args[i + 1];
+        if (value !== void 0 && !value.startsWith("-")) {
+          parsed.dir = value;
+          i++;
+        }
         break;
       }
       case "--project": {
@@ -56,11 +89,19 @@ function parseStaticDeployArgs(args) {
         parsed.name = value;
         break;
       }
+      case "-c":
+      case "--config": {
+        const value = args[++i];
+        if (value === void 0 || value === "") {
+          throw new Error("irtio deploy: --config needs a value");
+        }
+        parsed.config = value;
+        break;
+      }
       default:
         throw new Error(`irtio deploy --static: unknown option ${JSON.stringify(arg)}`);
     }
   }
-  if (parsed.dir === void 0) throw new Error("irtio deploy: --static needs a directory");
   return parsed;
 }
 async function walkStaticDir(dir) {
@@ -95,41 +136,27 @@ async function walkStaticDir(dir) {
   await walk(dir, "");
   return { files, skipped };
 }
-async function readIrtioJsonProject(cwd) {
-  const file = path.join(cwd, "irtio.json");
-  if (!existsSync(file)) return void 0;
-  let parsed;
-  try {
-    parsed = JSON.parse(await readFile(file, "utf8"));
-  } catch {
-    throw new Error(`irtio deploy: ${file} is not valid JSON`);
-  }
-  return typeof parsed.project === "string" && parsed.project.length > 0 ? parsed.project : void 0;
-}
-async function ensureProject(client, projectId, cwd, explicitName, log) {
-  try {
-    await client.get(`/v1/projects/${projectId}`);
-    return;
-  } catch (err) {
-    if (!(err instanceof ApiClientError && err.status === 404)) throw err;
-  }
-  const name = explicitName ?? await readIrtioJsonName(cwd, "irtio deploy") ?? path.basename(cwd);
-  await client.post("/v1/projects", { name, id: projectId });
-  log(pc.dim(`created project ${projectId} (${name})`));
-}
 async function runStaticDeploy(options) {
   const log = options.log ?? ((line) => console.log(line));
   const cwd = path.resolve(options.cwd ?? process.cwd());
-  const dir = path.resolve(cwd, options.dir);
+  const config = await readProjectConfig(cwd, "irtio deploy", options.config);
+  const relativeDir = options.dir ?? config.static?.dir;
+  if (relativeDir === void 0) {
+    throw new Error(
+      `irtio deploy: no directory to upload \u2014 pass --static <dir> or add "static" to ${path.basename(config.file)}`
+    );
+  }
+  const dir = path.resolve(cwd, relativeDir);
   if (!existsSync(dir)) throw new Error(`irtio deploy: ${dir} does not exist`);
-  const project = options.project ?? await readIrtioJsonProject(cwd);
+  const project = options.project ?? config.project;
   if (project === void 0) {
     throw new Error(
-      "irtio deploy: no project id \u2014 pass --project or run from a project with irtio.json"
+      `irtio deploy: no project id \u2014 pass --project or run from a project with ${path.basename(config.file)}`
     );
   }
+  const label = options.label ?? config.static?.label;
   const { files, skipped } = await walkStaticDir(dir);
-  for (const line of skipped) log(pc.yellow(`skipped ${line}`));
+  for (const line of skipped) log(pc2.yellow(`skipped ${line}`));
   if (files.length === 0) throw new Error(`irtio deploy: ${dir} has no files to upload`);
   if (files.length > STATIC_LIMITS.maxFiles) {
     throw new Error(
@@ -150,15 +177,21 @@ async function runStaticDeploy(options) {
   }
   if (!files.some((f) => f.rel === "index.html")) {
     log(
-      pc.yellow("note: no index.html at the top level \u2014 the site link will 404 until one exists")
+      pc2.yellow("note: no index.html at the top level \u2014 the site link will 404 until one exists")
     );
   }
   const controlUrl = await resolveControlUrlForUser(options.controlUrl);
   const client = options.client ?? await createApiClient(controlUrl);
-  await ensureProject(client, project, cwd, options.name, log);
+  const ensured = await ensureProject(client, project, {
+    cwd,
+    config,
+    command: "irtio deploy",
+    ...options.name !== void 0 ? { name: options.name } : {}
+  });
+  logEnsured(log, project, ensured);
   const begin = await client.post(
     `/v1/projects/${project}/static/begin`,
-    options.label !== void 0 ? { label: options.label } : {}
+    label !== void 0 ? { label } : {}
   );
   for (const file of files) {
     const bytes = await readFile(file.abs);
@@ -173,13 +206,13 @@ async function runStaticDeploy(options) {
     label: begin.label
   });
   if (activated.url !== void 0) {
-    log(pc.green(`live: ${activated.url}`));
+    log(pc2.green(`live: ${activated.url}`));
     if (activated.origin !== void 0) {
-      log(pc.dim(`allowed origin: ${activated.origin} (localhost is always allowed)`));
+      log(pc2.dim(`allowed origin: ${activated.origin} (localhost is always allowed)`));
     }
   } else {
     log(
-      pc.green(
+      pc2.green(
         `activated ${activated.label} v${activated.version} (this control plane has no static domain configured; nothing serves it yet)`
       )
     );
@@ -200,29 +233,37 @@ async function staticDeploy(args, deps = {}) {
   try {
     const parsed = parseStaticDeployArgs(args);
     await runStaticDeploy({
-      dir: parsed.dir,
       log,
+      ...parsed.dir !== void 0 ? { dir: parsed.dir } : {},
       ...parsed.project !== void 0 ? { project: parsed.project } : {},
       ...parsed.url !== void 0 ? { controlUrl: parsed.url } : {},
       ...parsed.label !== void 0 ? { label: parsed.label } : {},
       ...parsed.name !== void 0 ? { name: parsed.name } : {},
+      ...parsed.config !== void 0 ? { config: parsed.config } : {},
       ...deps.client !== void 0 ? { client: deps.client } : {},
       ...deps.cwd !== void 0 ? { cwd: deps.cwd } : {}
     });
   } catch (err) {
+    if (err instanceof HelpRequested) {
+      log(err.usage);
+      return;
+    }
     if (isLoginRequired(err)) {
-      errorLog(pc.red("not logged in"));
+      errorLog(pc2.red("not logged in"));
       errorLog("run: irtio login");
       process.exitCode = 1;
       return;
     }
-    errorLog(pc.red(err instanceof Error ? err.message : String(err)));
+    errorLog(pc2.red(err instanceof Error ? err.message : String(err)));
     process.exitCode = 1;
   }
 }
+
 export {
+  logEnsured,
+  USAGE,
   parseStaticDeployArgs,
+  walkStaticDir,
   runStaticDeploy,
-  staticDeploy,
-  walkStaticDir
+  staticDeploy
 };

package/dist/chunk-DKWG7MGO.js

@@ -0,0 +1,93 @@
+import {
+  ApiClientError
+} from "./chunk-RNAH5T4W.js";
+
+// src/project-file.ts
+import { existsSync } from "fs";
+import { readFile } from "fs/promises";
+import * as path from "path";
+var DEFAULT_CONFIG_FILE = "irtio.json";
+function configPath(cwd, configFile) {
+  return path.resolve(cwd, configFile ?? DEFAULT_CONFIG_FILE);
+}
+async function readProjectConfig(cwd, command, configFile) {
+  const file = configPath(cwd, configFile);
+  if (!existsSync(file)) {
+    if (configFile !== void 0) throw new Error(`${command}: no config file at ${file}`);
+    return { file, exists: false };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(await readFile(file, "utf8"));
+  } catch (err) {
+    throw new Error(`${command}: ${file} is not valid JSON: ${String(err)}`);
+  }
+  const raw = typeof parsed === "object" && parsed !== null ? parsed : {};
+  const str = (key) => {
+    const value = raw[key];
+    if (value === void 0) return void 0;
+    if (typeof value !== "string" || value.length === 0) {
+      throw new Error(`${command}: ${file} has a "${key}" that is not a non-empty string`);
+    }
+    return value;
+  };
+  const project = str("project");
+  const name = str("name");
+  const client = str("client");
+  const staticSite = readStatic(raw.static, file, command);
+  return {
+    file,
+    exists: true,
+    ...project !== void 0 ? { project } : {},
+    ...name !== void 0 ? { name } : {},
+    ...client !== void 0 ? { client } : {},
+    ...staticSite !== void 0 ? { static: staticSite } : {}
+  };
+}
+function readStatic(value, file, command) {
+  if (value === void 0) return void 0;
+  if (typeof value === "string") {
+    if (value.length === 0) {
+      throw new Error(`${command}: ${file} has a "static" that is an empty string`);
+    }
+    return { dir: value };
+  }
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new Error(
+      `${command}: ${file} has a "static" that is neither a directory string nor an object`
+    );
+  }
+  const { dir, label } = value;
+  if (typeof dir !== "string" || dir.length === 0) {
+    throw new Error(`${command}: ${file} has a "static" with no "dir"`);
+  }
+  if (label !== void 0 && (typeof label !== "string" || label.length === 0)) {
+    throw new Error(`${command}: ${file} has a "static.label" that is not a non-empty string`);
+  }
+  return label === void 0 ? { dir } : { dir, label };
+}
+async function ensureProject(client, projectId, options) {
+  const config = options.config ?? await readProjectConfig(options.cwd, options.command);
+  const declared = options.name ?? config.name;
+  let existing;
+  try {
+    existing = await client.get(`/v1/projects/${projectId}`);
+  } catch (err) {
+    if (!(err instanceof ApiClientError && err.status === 404)) throw err;
+  }
+  if (existing === void 0) {
+    const name = declared ?? path.basename(options.cwd);
+    await client.post("/v1/projects", { name, id: projectId });
+    return { action: "created", name };
+  }
+  if (declared !== void 0 && declared !== existing.name) {
+    await client.patch(`/v1/projects/${projectId}`, { name: declared });
+    return { action: "renamed", name: declared, from: existing.name };
+  }
+  return { action: "unchanged", name: existing.name };
+}
+
+export {
+  readProjectConfig,
+  ensureProject
+};

package/dist/{chunk-KRQUAEN2.js → chunk-OTSFRVJN.js}

@@ -5,8 +5,14 @@ import * as path from "path";
 import { pathToFileURL } from "url";
 import { Worker } from "worker_threads";
 import * as esbuild from "esbuild";
-var ALLOWED_IMPORTS = ["@irtio/server", "@irtio/schema", "@dimforge/rapier3d-compat"];
-var EXTERNAL_IMPORTS = ["@dimforge/rapier3d-compat"];
+var ALLOWED_IMPORTS = [
+  "@irtio/server",
+  "@irtio/schema",
+  "@dimforge/rapier3d-compat",
+  // D45: the second blessed engine. Exactly one import added, as the decision says.
+  "matter-js"
+];
+var EXTERNAL_IMPORTS = ["@dimforge/rapier3d-compat", "matter-js"];
 var BundleError = class extends Error {
   name = "BundleError";
 };
@@ -85,8 +91,8 @@ async function bundleRoom(options) {
   const out = result.outputFiles[0];
   if (!out) throw new BundleError("esbuild produced no output");
   const warnings = result.warnings.map((w) => w.text);
-  const importsRapier = Object.values(result.metafile?.outputs ?? {}).some(
-    (o) => o.imports.some((i) => i.path === "@dimforge/rapier3d-compat")
+  const importsEngine = Object.values(result.metafile?.outputs ?? {}).some(
+    (o) => o.imports.some((i) => i.path === "@dimforge/rapier3d-compat" || i.path === "matter-js")
   );
   const hash = createHash("sha256").update(out.contents).digest("hex");
   const file = path.join(options.outDir, `room.${hash.slice(0, 16)}.mjs`);
@@ -108,9 +114,9 @@ async function bundleRoom(options) {
   }
   if (options.verify === false) return { file, hash, warnings };
   const verified = await verifyBundle(file);
-  if (importsRapier && !verified.physics) {
+  if (importsEngine && !verified.physics) {
     throw new BundleError(
-      "irtio: this room imports @dimforge/rapier3d-compat but declares no physics. Add\n  physics: { engine: 'rapier3d', gravity: { x: 0, y: -9.81, z: 0 }, bodies: { ... } }\nto defineRoom(...), and mark the body-backed fields with the schema's physics option. Without it the runtime never creates a world, and nothing you build with the engine steps."
+      "irtio: this room imports a physics engine but declares no physics. Add\n  physics: { engine: 'rapier3d', gravity: { x: 0, y: -9.81, z: 0 }, bodies: { ... } }\nor, for the 2D engine,\n  physics: { engine: 'matter2d', gravity: { x: 0, y: 1 }, bodies: { ... } }\nto defineRoom(...), and mark the body-backed fields with the schema's physics option. Without it the runtime never creates a world, and nothing you build with the engine steps."
     );
   }
   const fullHash = createHash("sha256").update(out.contents).update(verified.canonical).digest("hex");

package/dist/{chunk-I37DLT7K.js → chunk-RNAH5T4W.js}

@@ -1,6 +1,6 @@
 import {
   readCredential
-} from "./chunk-NVUKSP5U.js";
+} from "./chunk-UPHQM6NZ.js";
 
 // src/api-client.ts
 var ApiClientError = class extends Error {
@@ -60,15 +60,24 @@ function createApiClientWithToken(controlUrl, token) {
     }
     return parsed;
   }
+  function withQuery(path, query) {
+    const qs = query ? Object.entries(query).filter((e) => e[1] !== void 0).map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`).join("&") : "";
+    return qs ? `${path}?${qs}` : path;
+  }
   return {
     controlUrl,
     get(path, query) {
-      const qs = query ? Object.entries(query).filter((e) => e[1] !== void 0).map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`).join("&") : "";
-      return request("GET", qs ? `${path}?${qs}` : path);
+      return request("GET", withQuery(path, query));
+    },
+    del(path, query) {
+      return request("DELETE", withQuery(path, query));
     },
     post(path, body) {
       return request("POST", path, { body });
     },
+    patch(path, body) {
+      return request("PATCH", path, { body });
+    },
     postBytes(path, bytes) {
       return request("POST", path, { bytes });
     }
@@ -80,6 +89,8 @@ function isLoginRequired(err) {
 
 export {
   ApiClientError,
+  NotLoggedInError,
   createApiClient,
+  createApiClientWithToken,
   isLoginRequired
 };