@fedify/cli 2.0.7 → 2.0.9

package/dist/relay.js

@@ -1,24 +1,21 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { configContext } from "./config.js";
 import { configureLogging } from "./log.js";
 import { createTunnelOption } from "./options.js";
 import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { colors, matchesActor } from "./utils.js";
-import { SqliteKvStore } from "@fedify/sqlite";
-import process from "node:process";
-import { DatabaseSync } from "node:sqlite";
 import { command, constant, group, integer, merge, message, multiple, object, option, optionName, optional, string, value } from "@optique/core";
+import process from "node:process";
 import { bindConfig } from "@optique/config";
 import { MemoryKvStore } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import Table from "cli-table3";
 import ora from "ora";
 import { createRelay } from "@fedify/relay";
+import { SqliteKvStore } from "@fedify/sqlite";
 import { choice as choice$1 } from "@optique/core/valueparser";
-
+import { DatabaseSync } from "node:sqlite";
 //#region src/relay.ts
 const logger = getLogger([
 	"fedify",
@@ -66,17 +63,16 @@ const relayCommand = command("relay", merge(object("Relay options", {
 
 By default, the server is tunneled to the public internet for external access. Use ${optionName("--no-tunnel")} to run locally only.`
 });
-async function runRelay(command$1) {
-	if (command$1.debug) await configureLogging();
+async function runRelay(command) {
+	if (command.debug) await configureLogging();
 	const spinner = ora({
 		text: "Starting relay server...",
 		discardStdin: false
 	}).start();
 	let kv;
-	if (command$1.persistent) {
-		logger.debug("Using SQLite storage at {path}.", { path: command$1.persistent });
-		const db = new DatabaseSync(command$1.persistent);
-		kv = new SqliteKvStore(db);
+	if (command.persistent) {
+		logger.debug("Using SQLite storage at {path}.", { path: command.persistent });
+		kv = new SqliteKvStore(new DatabaseSync(command.persistent));
 	} else {
 		logger.debug("Using in-memory storage.");
 		kv = new MemoryKvStore();
@@ -85,18 +81,18 @@ async function runRelay(command$1) {
 	let server = null;
 	const acceptFollows = [];
 	const rejectFollows = [];
-	if (command$1.acceptFollow != null && command$1.acceptFollow.length > 0) acceptFollows.push(...command$1.acceptFollow ?? []);
-	if (command$1.rejectFollow != null && command$1.rejectFollow.length > 0) rejectFollows.push(...command$1.rejectFollow ?? []);
+	if (command.acceptFollow != null && command.acceptFollow.length > 0) acceptFollows.push(...command.acceptFollow ?? []);
+	if (command.rejectFollow != null && command.rejectFollow.length > 0) rejectFollows.push(...command.rejectFollow ?? []);
 	server = await spawnTemporaryServer(async (request) => {
 		return await relay.fetch(request);
 	}, {
-		noTunnel: !command$1.tunnel,
-		port: command$1.port,
-		...command$1.tunnel && { service: command$1.tunnelService }
+		noTunnel: !command.tunnel,
+		port: command.port,
+		...command.tunnel && { service: command.tunnelService }
 	});
-	relay = createRelay(command$1.protocol, {
+	relay = createRelay(command.protocol, {
 		origin: server?.url.origin,
-		name: command$1.name,
+		name: command.name,
 		kv,
 		subscriptionHandler: async (_ctx, actor) => {
 			const isInAcceptList = await matchesActor(actor, acceptFollows);
@@ -106,9 +102,9 @@ async function runRelay(command$1) {
 	});
 	spinner.succeed(`Relay server is running: ${colors.green(server.url.href)}`);
 	await printRelayInfo(relay, {
-		protocol: command$1.protocol,
-		name: command$1.name,
-		persistent: command$1.persistent
+		protocol: command.protocol,
+		name: command.name,
+		persistent: command.persistent
 	});
 	process.on("SIGINT", async () => {
 		spinner.start("Shutting down relay server...");
@@ -131,6 +127,5 @@ async function printRelayInfo(relay, options) {
 	console.log(table.toString());
 	console.log("\nPress ^C to stop the relay server.");
 }
-
 //#endregion
-export { relayCommand, runRelay };
+export { relayCommand, runRelay };

package/dist/table.js

@@ -1,6 +1,4 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 //#region src/table.ts
 const tableStyle = {
 	top: "─",
@@ -19,6 +17,5 @@ const tableStyle = {
 	rightMid: "┤",
 	middle: "│"
 };
-
 //#endregion
-export { tableStyle };
+export { tableStyle };

package/dist/tempserver.js

@@ -1,10 +1,7 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
 import { openTunnel } from "@hongminhee/localtunnel";
 import { serve } from "srvx";
-
 //#region src/tempserver.ts
 const logger = getLogger([
 	"fedify",
@@ -14,28 +11,27 @@ const logger = getLogger([
 async function spawnTemporaryServer(fetch, options = {}) {
 	const serverPort = options.port ?? 0;
 	if (options.noTunnel) {
-		const server$1 = serve({
+		const server = serve({
 			port: serverPort,
 			hostname: "::",
 			silent: true,
 			fetch
 		});
-		await server$1.ready();
-		const url$1 = new URL(server$1.url);
-		const port$1 = url$1.port;
-		logger.debug("Temporary server is listening on port {port}.", { port: port$1 });
+		await server.ready();
+		const port = new URL(server.url).port;
+		logger.debug("Temporary server is listening on port {port}.", { port });
 		return {
-			url: new URL(`http://localhost:${port$1}`),
+			url: new URL(`http://localhost:${port}`),
 			async close() {
-				await server$1.close();
+				await server.close();
 			}
 		};
 	}
 	const server = serve({
 		fetch: "Deno" in globalThis ? (request) => {
-			const url$1 = new URL(request.url);
-			url$1.protocol = "https:";
-			const newRequest = new Request(url$1, {
+			const url = new URL(request.url);
+			url.protocol = "https:";
+			return fetch(new Request(url, {
 				method: request.method,
 				headers: request.headers,
 				body: request.method === "GET" || request.method === "HEAD" ? null : request.body,
@@ -48,8 +44,7 @@ async function spawnTemporaryServer(fetch, options = {}) {
 				integrity: request.integrity,
 				keepalive: request.keepalive,
 				signal: request.signal
-			});
-			return fetch(newRequest);
+			}));
 		} : fetch,
 		port: serverPort,
 		hostname: "::",
@@ -57,8 +52,7 @@ async function spawnTemporaryServer(fetch, options = {}) {
 		protocol: "https"
 	});
 	await server.ready();
-	const url = new URL(server.url);
-	const port = url.port;
+	const port = new URL(server.url).port;
 	logger.debug("Temporary server is listening on port {port}.", { port });
 	const tun = await openTunnel({
 		port: parseInt(port),
@@ -73,6 +67,5 @@ async function spawnTemporaryServer(fetch, options = {}) {
 		}
 	};
 }
-
 //#endregion
-export { spawnTemporaryServer };
+export { spawnTemporaryServer };

package/dist/tunnel.js

@@ -1,14 +1,11 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { configureLogging } from "./log.js";
 import { createTunnelServiceOption } from "./options.js";
-import process from "node:process";
 import { argument, command, constant, integer, merge, message, object } from "@optique/core";
 import { print, printError } from "@optique/run";
+import process from "node:process";
 import ora from "ora";
 import { openTunnel } from "@hongminhee/localtunnel";
-
 //#region src/tunnel.ts
 const tunnelCommand = command("tunnel", merge("Tunnel options", object({ command: constant("tunnel") }), object({
 	port: argument(integer({
@@ -23,12 +20,12 @@ const tunnelCommand = command("tunnel", merge("Tunnel options", object({ command
 
 Note that the HTTP requests through the tunnel have X-Forwarded-* headers.`
 });
-async function runTunnel(command$1, deps = {
+async function runTunnel(command, deps = {
 	openTunnel,
 	ora,
 	exit: process.exit
 }) {
-	if (command$1.debug) await configureLogging();
+	if (command.debug) await configureLogging();
 	const spinner = deps.ora({
 		text: "Creating a secure tunnel...",
 		discardStdin: false
@@ -36,21 +33,20 @@ async function runTunnel(command$1, deps = {
 	let tunnel;
 	try {
 		tunnel = await deps.openTunnel({
-			port: command$1.port,
-			service: command$1.service
+			port: command.port,
+			service: command.service
 		});
 	} catch (error) {
-		if (command$1.debug) printError(message`${String(error)}`);
+		if (command.debug) printError(message`${String(error)}`);
 		spinner.fail("Failed to create a secure tunnel.");
 		deps.exit(1);
 	}
-	spinner.succeed(`Your local server at ${command$1.port} is now publicly accessible:\n`);
+	spinner.succeed(`Your local server at ${command.port} is now publicly accessible:\n`);
 	print(message`${tunnel.url.href}`);
 	print(message`\nPress ^C to close the tunnel.`);
 	process.on("SIGINT", async () => {
 		await tunnel.close();
 	});
 }
-
 //#endregion
-export { runTunnel, tunnelCommand };
+export { runTunnel, tunnelCommand };

package/dist/utils.js

@@ -1,23 +1,18 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
-import "node:fs/promises";
-import process from "node:process";
+import "@js-temporal/polyfill";
 import { message } from "@optique/core";
 import { print, printError } from "@optique/run";
 import { flow } from "es-toolkit";
+import process from "node:process";
 import { getActorHandle } from "@fedify/vocab";
 import util from "node:util";
 import "@fxts/core";
 import { Chalk } from "chalk";
 import { highlight } from "cli-highlight";
-import "node:child_process";
-
 //#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 });
-function formatObject(obj, colors$1, json) {
-	const enableColors = colors$1 ?? colorEnabled;
+function formatObject(obj, colors, json) {
+	const enableColors = colors ?? colorEnabled;
 	if (!json) return util.inspect(obj, { colors: enableColors });
 	const formatted = JSON.stringify(obj, null, 2);
 	if (enableColors) return highlight(formatted, { language: "json" });
@@ -38,8 +33,7 @@ async function matchesActor(actor, actorList) {
 	}
 	return false;
 }
-const printMessage = flow(message, print);
-const printErrorMessage = flow(message, printError);
-
+flow(message, print);
+flow(message, printError);
 //#endregion
-export { colorEnabled, colors, formatObject, matchesActor };
+export { colorEnabled, colors, formatObject, matchesActor };

package/dist/webfinger/action.js

@@ -1,6 +1,4 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { formatObject } from "../utils.js";
 import { NotFoundError, getErrorMessage } from "./error.js";
 import { convertUrlIfHandle } from "./lib.js";
@@ -8,18 +6,15 @@ 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
-async function runWebFinger({ command: _, resources,...options }) {
+async function runWebFinger({ command: _, resources, ...options }) {
 	await Array.fromAsync(resources.map((resource) => ({
 		resource,
 		...options
 	})), spinnerWrapper(lookupSingleWebFinger));
 }
-async function lookupSingleWebFinger({ resource,...options }) {
-	const url = convertUrlIfHandle(resource);
-	const webFinger = await lookupWebFinger(url, options) ?? new NotFoundError(resource).throw();
-	return webFinger;
+async function lookupSingleWebFinger({ resource, ...options }) {
+	return await lookupWebFinger(convertUrlIfHandle(resource), options) ?? new NotFoundError(resource).throw();
 }
 function spinnerWrapper(func) {
 	return async (...args) => {
@@ -39,6 +34,5 @@ function spinnerWrapper(func) {
 		}
 	};
 }
-
 //#endregion
-export { runWebFinger };
+export { runWebFinger as default };

package/dist/webfinger/command.js

@@ -1,11 +1,8 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { configContext } from "../config.js";
 import { userAgentOption } from "../options.js";
 import { argument, command, constant, flag, group, integer, merge, message, multiple, object, option, string } from "@optique/core";
 import { bindConfig } from "@optique/config";
-
 //#region src/webfinger/command.ts
 const allowPrivateAddresses = bindConfig(flag("-p", "--allow-private-address", { description: message`Allow private IP addresses in the URL.` }), {
 	context: configContext,
@@ -28,6 +25,5 @@ const webFingerCommand = command("webfinger", merge("Network options", object({
 
 The argument can be multiple.`
 });
-
 //#endregion
-export { webFingerCommand };
+export { webFingerCommand };

package/dist/webfinger/error.js

@@ -1,8 +1,5 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { message } from "@optique/core";
-
 //#region src/webfinger/error.ts
 /**
 * Generates a user-friendly error message based on the type of error
@@ -42,6 +39,5 @@ var NotFoundError = class extends Error {
 		throw this;
 	}
 };
-
 //#endregion
-export { InvalidHandleError, NotFoundError, getErrorMessage };
+export { InvalidHandleError, NotFoundError, getErrorMessage };

package/dist/webfinger/lib.js

@@ -1,12 +1,8 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
+import "@js-temporal/polyfill";
 import { InvalidHandleError } from "./error.js";
 import { toAcctUrl } from "@fedify/vocab";
 import { getLogger } from "@logtape/logtape";
-
-//#region src/webfinger/lib.ts
-const logger = getLogger([
+getLogger([
 	"fedify",
 	"cli",
 	"webfinger"
@@ -40,6 +36,5 @@ function convertUrlIfHandle(handleOrUrl) {
 function convertHandleToUrl(handle) {
 	return toAcctUrl(handle) ?? new InvalidHandleError(handle).throw();
 }
-
 //#endregion
-export { convertUrlIfHandle };
+export { convertUrlIfHandle };

package/dist/webfinger/mod.js

@@ -1,5 +1,4 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-    
-import { runWebFinger } from "./action.js";
-import { webFingerCommand } from "./command.js";
+import "@js-temporal/polyfill";
+import "./action.js";
+import "./command.js";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "type": "module",
   "files": [
     "README.md",
@@ -86,20 +86,20 @@
     "smol-toml": "^1.6.0",
     "srvx": "^0.8.7",
     "valibot": "^1.2.0",
-    "@fedify/fedify": "2.0.7",
-    "@fedify/init": "2.0.7",
-    "@fedify/relay": "2.0.7",
-    "@fedify/sqlite": "2.0.7",
-    "@fedify/vocab": "2.0.7",
-    "@fedify/webfinger": "2.0.7",
-    "@fedify/vocab-tools": "2.0.7",
-    "@fedify/vocab-runtime": "2.0.7"
+    "@fedify/fedify": "2.0.9",
+    "@fedify/sqlite": "2.0.9",
+    "@fedify/relay": "2.0.9",
+    "@fedify/init": "2.0.9",
+    "@fedify/vocab": "2.0.9",
+    "@fedify/vocab-tools": "2.0.9",
+    "@fedify/vocab-runtime": "2.0.9",
+    "@fedify/webfinger": "2.0.9"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",
     "@types/node": "^22.17.0",
-    "tsdown": "^0.12.9",
-    "typescript": "^5.9.3"
+    "tsdown": "^0.21.6",
+    "typescript": "^5.9.2"
   },
   "scripts": {
     "build:self": "tsdown",