@fedify/cli 2.4.0-dev.1661 → 2.4.0-dev.1666

package/dist/config.js

@@ -1,4 +1,5 @@
 import "temporal-polyfill";
+import { TUNNEL_SERVICE_NAMES } from "./tunnelservice.js";
 import { message } from "@optique/core";
 import { printError } from "@optique/run";
 import { readFileSync } from "node:fs";
@@ -92,11 +93,7 @@ const benchSchema = object$1({ format: optional$1(picklist([
 const configContext = createConfigContext({ schema: object$1({
 	debug: optional$1(boolean()),
 	userAgent: optional$1(string$1()),
-	tunnelService: optional$1(picklist([
-		"localhost.run",
-		"serveo.net",
-		"pinggy.io"
-	])),
+	tunnelService: optional$1(picklist(TUNNEL_SERVICE_NAMES)),
 	webfinger: optional$1(webfingerSchema),
 	lookup: optional$1(lookupSchema),
 	inbox: optional$1(inboxSchema),

package/dist/deno.js

@@ -1,5 +1,5 @@
 import "temporal-polyfill";
 //#region deno.json
-var version = "2.4.0-dev.1661+30f329d9";
+var version = "2.4.0-dev.1666+690d9b28";
 //#endregion
 export { version };

package/dist/options.js

@@ -1,4 +1,5 @@
 import "temporal-polyfill";
+import { TUNNEL_SERVICE_NAMES } from "./tunnelservice.js";
 import { configContext } from "./config.js";
 import { choice, constant, flag, map, merge, message, object, option, optional, or, string, withDefault } from "@optique/core";
 import { bindConfig } from "@optique/config";
@@ -7,11 +8,7 @@ import { getUserAgent } from "@fedify/vocab-runtime";
 /**
 * Available tunneling services for exposing local servers to the public internet.
 */
-const TUNNEL_SERVICES = [
-	"localhost.run",
-	"serveo.net",
-	"pinggy.io"
-];
+const TUNNEL_SERVICES = TUNNEL_SERVICE_NAMES;
 /**
 * Creates a tunnel service option with customizable option names.
 */

package/dist/tempserver.js

@@ -1,6 +1,7 @@
 import "temporal-polyfill";
-import { getLogger } from "@logtape/logtape";
+import { TUNNEL_SERVICE_REGISTRY } from "./tunnelservice.js";
 import { openTunnel } from "@hongminhee/localtunnel";
+import { getLogger } from "@logtape/logtape";
 import { serve } from "srvx";
 //#region src/tempserver.ts
 const logger = getLogger([
@@ -56,6 +57,7 @@ async function spawnTemporaryServer(fetch, options = {}) {
 	logger.debug("Temporary server is listening on port {port}.", { port });
 	const tun = await openTunnel({
 		port: parseInt(port),
+		services: TUNNEL_SERVICE_REGISTRY,
 		service: options.service
 	});
 	logger.debug("Temporary server is tunneled to {url}.", { url: tun.url.href });

package/dist/tunnel.js

@@ -1,11 +1,12 @@
 import "temporal-polyfill";
+import { TUNNEL_SERVICE_REGISTRY } from "./tunnelservice.js";
 import { createTunnelServiceOption } from "./options.js";
 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";
+import ora from "ora";
 //#region src/tunnel.ts
 const tunnelOptions = merge("Tunnel options", object({ command: constant("tunnel") }), object({
 	port: argument(integer({
@@ -36,6 +37,7 @@ async function runTunnel(command, deps = {
 	try {
 		tunnel = await deps.openTunnel({
 			port: command.port,
+			services: TUNNEL_SERVICE_REGISTRY,
 			service: command.service
 		});
 	} catch (error) {

package/dist/tunnelservice.js

@@ -0,0 +1,40 @@
+import "temporal-polyfill";
+import { SERVICES } from "@hongminhee/localtunnel";
+//#region src/tunnelservice.ts
+/**
+* The Fedify-operated public tunneling service.
+*/
+const FEDIFY_TUNNEL_SERVICE = {
+	host: "fedify.com.es:2222",
+	port: 80,
+	urlPattern: /https:\/\/[a-z0-9]{16}\.fedify\.com\.es(?=[/\s]|$)/,
+	extraOptions: [
+		"-o",
+		"PubkeyAuthentication=no",
+		"-o",
+		"PasswordAuthentication=no",
+		"-o",
+		"KbdInteractiveAuthentication=no",
+		"-o",
+		"ExitOnForwardFailure=yes",
+		"-o",
+		"ServerAliveInterval=30",
+		"-o",
+		"ServerAliveCountMax=3"
+	],
+	knownHosts: { "[fedify.com.es]:2222": ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOepK/E2PANumZNFCicc/zv4EkyraFwqV8qveMtDC5b+"] }
+};
+/**
+* Available tunneling services for exposing local servers to the public
+* internet.
+*/
+const TUNNEL_SERVICE_REGISTRY = {
+	...SERVICES,
+	"fedify.com.es": FEDIFY_TUNNEL_SERVICE
+};
+/**
+* Available tunneling service names.
+*/
+const TUNNEL_SERVICE_NAMES = Object.freeze(Object.keys(TUNNEL_SERVICE_REGISTRY));
+//#endregion
+export { TUNNEL_SERVICE_NAMES, TUNNEL_SERVICE_REGISTRY };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.4.0-dev.1661+30f329d9",
+  "version": "2.4.0-dev.1666+690d9b28",
   "type": "module",
   "files": [
     "README.md",
@@ -61,7 +61,7 @@
     "@optique/discover": "^1.1.0",
     "@optique/run": "^1.1.0",
     "@standard-schema/spec": "^1.1.0",
-    "@hongminhee/localtunnel": "^0.3.0",
+    "@hongminhee/localtunnel": "^0.5.0",
     "@inquirer/prompts": "^7.8.4",
     "@jimp/core": "^1.6.1",
     "@jimp/wasm-webp": "^1.6.1",
@@ -88,14 +88,14 @@
     "temporal-polyfill": "^1.0.1",
     "valibot": "^1.4.0",
     "yaml": "^2.9.0",
-    "@fedify/fedify": "2.4.0-dev.1661+30f329d9",
-    "@fedify/relay": "2.4.0-dev.1661+30f329d9",
-    "@fedify/init": "2.4.0-dev.1661+30f329d9",
-    "@fedify/sqlite": "2.4.0-dev.1661+30f329d9",
-    "@fedify/vocab": "2.4.0-dev.1661+30f329d9",
-    "@fedify/webfinger": "2.4.0-dev.1661+30f329d9",
-    "@fedify/vocab-runtime": "2.4.0-dev.1661+30f329d9",
-    "@fedify/vocab-tools": "2.4.0-dev.1661+30f329d9"
+    "@fedify/fedify": "2.4.0-dev.1666+690d9b28",
+    "@fedify/sqlite": "2.4.0-dev.1666+690d9b28",
+    "@fedify/vocab": "2.4.0-dev.1666+690d9b28",
+    "@fedify/relay": "2.4.0-dev.1666+690d9b28",
+    "@fedify/vocab-runtime": "2.4.0-dev.1666+690d9b28",
+    "@fedify/vocab-tools": "2.4.0-dev.1666+690d9b28",
+    "@fedify/webfinger": "2.4.0-dev.1666+690d9b28",
+    "@fedify/init": "2.4.0-dev.1666+690d9b28"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",