@fedify/cli 2.3.0-dev.1219 → 2.3.0-dev.1273

package/dist/relay.js

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
+import { colors, matchesActor } from "./utils.js";
 import { configureLogging } from "./log.js";
 import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
-import { colors, matchesActor } from "./utils.js";
 import process from "node:process";
 import { MemoryKvStore } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";

package/dist/runner.js

@@ -1,10 +1,12 @@
 import "@js-temporal/polyfill";
-import generateVocabCommand from "./generate-vocab/command.js";
-import "./generate-vocab/mod.js";
+import { describeError } from "./utils.js";
 import { version } from "./deno.js";
-import { initCommand } from "./init/mod.js";
 import { configContext, tryLoadToml } from "./config.js";
 import { globalOptions } from "./options.js";
+import { benchCommand } from "./bench/command.js";
+import generateVocabCommand from "./generate-vocab/command.js";
+import "./generate-vocab/mod.js";
+import { initCommand } from "./init/mod.js";
 import { nodeInfoCommand } from "./nodeinfo.js";
 import { lookupCommand } from "./lookup.js";
 import { inboxCommand } from "./inbox/command.js";
@@ -12,14 +14,14 @@ import { relayCommand } from "./relay/command.js";
 import { tunnelCommand } from "./tunnel.js";
 import { webFingerCommand } from "./webfinger/command.js";
 import "./webfinger/mod.js";
-import { printError, run } from "@optique/run";
 import process from "node:process";
 import { group, merge, message, or } from "@optique/core";
-import { join } from "node:path";
+import { printError, run } from "@optique/run";
 import { merge as merge$1 } from "es-toolkit";
+import { homedir } from "node:os";
 import { readFileSync } from "node:fs";
 import { parse } from "smol-toml";
-import { homedir } from "node:os";
+import { join } from "node:path";
 //#region src/runner.ts
 /**
 * Returns the system-wide configuration file paths.
@@ -39,7 +41,7 @@ function getUserConfigPath() {
 	if (process.platform === "win32") return join(process.env.APPDATA || join(homedir(), "AppData", "Roaming"), "fedify", "config.toml");
 	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "fedify", "config.toml");
 }
-const command$1 = merge(or(group("Generating code", or(initCommand, generateVocabCommand)), group("ActivityPub tools", or(webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, relayCommand)), group("Network tools", tunnelCommand)), globalOptions);
+const command$1 = merge(or(group("Generating code", or(initCommand, generateVocabCommand)), group("ActivityPub tools", or(webFingerCommand, lookupCommand, inboxCommand, nodeInfoCommand, relayCommand, benchCommand)), group("Network tools", tunnelCommand)), globalOptions);
 function loadConfig(parsed) {
 	if (parsed.ignoreConfig) return void 0;
 	const system = getSystemConfigPaths().map(tryLoadToml).reduce((acc, config) => merge$1(acc, config), {});
@@ -49,7 +51,7 @@ function loadConfig(parsed) {
 	if (parsed.configPath) try {
 		custom = parse(readFileSync(parsed.configPath, "utf-8"));
 	} catch (error) {
-		printError(message`Could not load config file at ${parsed.configPath}: ${error instanceof Error ? error.message : String(error)}`);
+		printError(message`Could not load config file at ${parsed.configPath}: ${describeError(error)}`);
 		process.exit(1);
 	}
 	return {

package/dist/tempserver.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
-import { openTunnel } from "@hongminhee/localtunnel";
 import { serve } from "srvx";
+import { openTunnel } from "@hongminhee/localtunnel";
 //#region src/tempserver.ts
 const logger = getLogger([
 	"fedify",

package/dist/tunnel.js

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
-import { configureLogging } from "./log.js";
 import { createTunnelServiceOption } from "./options.js";
-import { print, printError } from "@optique/run";
+import { configureLogging } from "./log.js";
 import process from "node:process";
 import { argument, command, constant, integer, merge, message, object } from "@optique/core";
+import { print, printError } from "@optique/run";
 import ora from "ora";
 import { openTunnel } from "@hongminhee/localtunnel";
 //#region src/tunnel.ts

package/dist/utils.js

@@ -1,13 +1,14 @@
 import "@js-temporal/polyfill";
-import { print, printError } from "@optique/run";
+import "node:fs/promises";
 import process from "node:process";
-import { message } from "@optique/core";
 import { getActorHandle } from "@fedify/vocab";
-import util from "node:util";
 import "@fxts/core";
+import { message } from "@optique/core";
+import { print, printError } from "@optique/run";
 import { Chalk } from "chalk";
 import { highlight } from "cli-highlight";
 import { flow } from "es-toolkit";
+import util from "node:util";
 //#region src/utils.ts
 const colorEnabled = process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "");
 const colors = new Chalk(colorEnabled ? {} : { level: 0 });
@@ -33,7 +34,10 @@ async function matchesActor(actor, actorList) {
 	}
 	return false;
 }
+function describeError(error) {
+	return error instanceof Error ? error.message : String(error);
+}
 flow(message, print);
 flow(message, printError);
 //#endregion
-export { colorEnabled, colors, formatObject, matchesActor };
+export { colorEnabled, colors, describeError, formatObject, matchesActor };

package/dist/webfinger/action.js

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import { formatObject } from "../utils.js";
 import { NotFoundError, getErrorMessage } from "./error.js";
 import { convertUrlIfHandle } from "./lib.js";
-import { formatMessage, message } from "@optique/core/message";
 import { print } from "@optique/run";
+import { formatMessage, message } from "@optique/core/message";
 import ora from "ora";
 import { lookupWebFinger } from "@fedify/webfinger";
 //#region src/webfinger/action.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.3.0-dev.1219+e9ad1fa3",
+  "version": "2.3.0-dev.1273+6b46a8b5",
   "type": "module",
   "files": [
     "README.md",
@@ -57,6 +57,7 @@
     }
   },
   "dependencies": {
+    "@cfworker/json-schema": "^4.1.1",
     "@fxts/core": "^1.20.0",
     "@optique/config": "^1.0.2",
     "@optique/core": "^1.0.2",
@@ -87,14 +88,15 @@
     "smol-toml": "^1.6.1",
     "srvx": "^0.8.7",
     "valibot": "^1.4.0",
-    "@fedify/fedify": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/init": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/relay": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/sqlite": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/vocab": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/webfinger": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/vocab-runtime": "2.3.0-dev.1219+e9ad1fa3",
-    "@fedify/vocab-tools": "2.3.0-dev.1219+e9ad1fa3"
+    "yaml": "^2.9.0",
+    "@fedify/fedify": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/init": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/vocab": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/sqlite": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/relay": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/webfinger": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/vocab-runtime": "2.3.0-dev.1273+6b46a8b5",
+    "@fedify/vocab-tools": "2.3.0-dev.1273+6b46a8b5"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",
@@ -110,7 +112,7 @@
     "test": "node --test --experimental-transform-types 'src/**/*.test.ts' '!src/init/test/**'",
     "test-init": "deno task test-init",
     "pretest:bun": "pnpm build",
-    "test:bun": "bun test",
+    "test:bun": "bun test --timeout 60000",
     "run": "pnpm build && node --disable-warning=ExperimentalWarning dist/mod.js",
     "runi": "tsdown && node --disable-warning=ExperimentalWarning dist/mod.js",
     "run:bun": "pnpm build && bun dist/mod.js",