ai-fly 0.3.0 → 0.3.1-alpha.2

package/dist/ai-fly.js

@@ -61,8 +61,8 @@ async function dispatch(command, rest) {
 	const lazy = (load) => {
 		return (argv, ctx) => load().then((m) => m.run([...argv], ctx));
 	};
-	return match(command).with("serve", () => lazy(() => import("./serve-DSBlodTF.mjs"))(rest)).with("daemon", () => lazy(() => import("./daemon-ZWUSWAgM.mjs"))(rest)).with("presets", () => lazy(() => import("./presets-C73CAMZ6.mjs"))(rest)).with("secret", () => lazy(() => import("./secret-SA37VND5.mjs"))(rest)).with("settings", async () => (await import("./settings-DU0YqNDt.mjs")).runAsSettings(rest, {})).with("relay", async () => (await import("./settings-DU0YqNDt.mjs")).runAsRelay(rest, {})).with("test", () => lazy(() => import("./test-Bc0OKBAi.mjs"))(rest)).with("service", () => lazy(() => import("./service-B5uORhl3.mjs"))(rest)).with("group", () => lazy(() => import("./group-B96IKEDF.mjs"))(rest)).with("share", () => lazy(() => import("./share-Cug0944N.mjs"))(rest)).with("revoke", () => lazy(() => import("./revoke-CkpvK33Q.mjs"))(rest)).with("join", () => lazy(() => import("./join-DsKUAibH.mjs"))(rest)).with("import", () => lazy(() => import("./import-tilxdbTH.mjs"))(rest)).with("run", () => lazy(() => import("./run-bbDjqVLr.mjs"))(rest)).with("ports", () => lazy(() => import("./ports-rRppuBgo.mjs"))(rest)).with("forget", () => lazy(() => import("./forget-B17zGwj4.mjs"))(rest)).with("key", () => {
-		if (rest[0] === "add") return lazy(() => import("./key-CNufbB__.mjs"))(rest);
+	return match(command).with("serve", () => lazy(() => import("./serve-DSBlodTF.mjs"))(rest)).with("daemon", () => lazy(() => import("./daemon-ZWUSWAgM.mjs"))(rest)).with("presets", () => lazy(() => import("./presets-C73CAMZ6.mjs"))(rest)).with("secret", () => lazy(() => import("./secret-COdVHzjH.mjs"))(rest)).with("settings", async () => (await import("./settings-DU0YqNDt.mjs")).runAsSettings(rest, {})).with("relay", async () => (await import("./settings-DU0YqNDt.mjs")).runAsRelay(rest, {})).with("test", () => lazy(() => import("./test-mlaZC1y5.mjs"))(rest)).with("service", () => lazy(() => import("./service-B5uORhl3.mjs"))(rest)).with("group", () => lazy(() => import("./group-B96IKEDF.mjs"))(rest)).with("share", () => lazy(() => import("./share-Cug0944N.mjs"))(rest)).with("revoke", () => lazy(() => import("./revoke-CkpvK33Q.mjs"))(rest)).with("join", () => lazy(() => import("./join-CaFx5yoF.mjs"))(rest)).with("import", () => lazy(() => import("./import-rpBFh_pa.mjs"))(rest)).with("run", () => lazy(() => import("./run-3pdPsD8e.mjs"))(rest)).with("ports", () => lazy(() => import("./ports-BRXd5UXh.mjs"))(rest)).with("forget", () => lazy(() => import("./forget-BXL2x4Wv.mjs"))(rest)).with("key", () => {
+		if (rest[0] === "add") return lazy(() => import("./key-KcUU3yhJ.mjs"))(rest);
 		return lazy(() => import("./key-BiEp995L.mjs"))(rest);
 	}).with("status", async () => {
 		const [scope, ...tail] = rest;
@@ -71,7 +71,7 @@ async function dispatch(command, rest) {
 		const argv = scope === "provider" || scope === "consumer" ? tail : rest;
 		let code = 0;
 		if (wantProvider) code = Math.max(code, await lazy(() => import("./status-SkNsxGnk.mjs"))(argv));
-		if (wantConsumer) code = Math.max(code, await lazy(() => import("./status-B-j454u2.mjs"))(argv));
+		if (wantConsumer) code = Math.max(code, await lazy(() => import("./status-Bttb9aPj.mjs"))(argv));
 		if (!wantProvider && !wantConsumer) process.stdout.write("nothing to report: no provider storage and no imported consumers\n");
 		return code;
 	}).otherwise(() => {

package/dist/{forget-B17zGwj4.mjs → forget-BXL2x4Wv.mjs}

@@ -1,6 +1,6 @@
 import { n as UsageError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { d as removeKeyring, n as consumersRoot } from "./store-BiTS2FTl.mjs";
+import { d as removeKeyring, n as consumersRoot } from "./store-CQShpYar.mjs";
 import { n as ctxHomedir, r as ctxOut } from "./common-CgxCXeTt.mjs";
 import { homedir } from "node:os";
 //#region src/cli/commands/consumer/forget.ts

package/dist/{import-tilxdbTH.mjs → import-rpBFh_pa.mjs}

@@ -1,9 +1,9 @@
 import { n as UsageError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot, s as listKeyrings } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot, s as listKeyrings } from "./store-CQShpYar.mjs";
 import { a as ringsForRun, i as printListeners, n as ctxHomedir, o as waitForSignals, r as ctxOut, t as createSdkFabricFactory } from "./common-CgxCXeTt.mjs";
-import { a as importLink, i as formatLinkPreview, n as decodeShareLink, r as formatKeyringSummary } from "./join-hyqiwEek.mjs";
-import { n as createFabricProviderTransport, t as startEngine } from "./runtime-D_nxUEjd.mjs";
+import { a as importLink, i as formatLinkPreview, n as decodeShareLink, r as formatKeyringSummary } from "./join-u1DqTU3U.mjs";
+import { n as createFabricProviderTransport, t as startEngine } from "./runtime-DNs9GtGp.mjs";
 import { homedir } from "node:os";
 //#region src/cli/commands/consumer/import.ts
 async function run(argv, ctx = {}) {

package/dist/{join-DsKUAibH.mjs → join-CaFx5yoF.mjs}

@@ -1,8 +1,8 @@
 import { n as UsageError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot } from "./store-CQShpYar.mjs";
 import { n as ctxHomedir, r as ctxOut, t as createSdkFabricFactory } from "./common-CgxCXeTt.mjs";
-import { o as joinDevice } from "./join-hyqiwEek.mjs";
+import { o as joinDevice } from "./join-u1DqTU3U.mjs";
 import { homedir } from "node:os";
 //#region src/cli/commands/consumer/join.ts
 async function run(argv, ctx = {}) {

package/dist/{join-hyqiwEek.mjs → join-u1DqTU3U.mjs}

@@ -1,7 +1,7 @@
 import { t as CliError } from "./errors-BGtxPkM7.mjs";
 import { o as decodeZ32, s as randomZ32 } from "./rpc-contract-5qyWzT5t.mjs";
 import { l as SERVICE_ENTRY_SCHEMA } from "./frames-BDqvhB2Y.mjs";
-import { a as hasFabricIdentity, c as loadKeyring, f as saveKeyring, i as findKeyringDir, l as mergeImportView, m as upsertKey, o as keyringDir, r as fabricDir } from "./store-BiTS2FTl.mjs";
+import { a as hasFabricIdentity, c as loadKeyring, f as saveKeyring, h as upsertKey, i as findKeyringDir, l as mergeImportView, o as keyringDir, r as fabricDir } from "./store-CQShpYar.mjs";
 import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
@@ -91,7 +91,8 @@ async function joinDevice(token, root, deps) {
 				relayUrls: [],
 				keys: [],
 				services: [],
-				ports: {}
+				ports: {},
+				actualPorts: {}
 			};
 			if (existing === void 0) saveKeyring(root, ring);
 			return {
@@ -112,7 +113,8 @@ async function joinDevice(token, root, deps) {
 			relayUrls: [],
 			keys: [],
 			services: [],
-			ports: {}
+			ports: {},
+			actualPorts: {}
 		};
 		const existing = loadKeyring(root, provider.endpointId);
 		saveKeyring(root, existing ?? ring);

package/dist/{key-CNufbB__.mjs → key-KcUU3yhJ.mjs}

@@ -1,8 +1,8 @@
 import { n as UsageError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot } from "./store-CQShpYar.mjs";
 import { n as ctxHomedir, r as ctxOut } from "./common-CgxCXeTt.mjs";
-import { r as formatKeyringSummary, t as addKey } from "./join-hyqiwEek.mjs";
+import { r as formatKeyringSummary, t as addKey } from "./join-u1DqTU3U.mjs";
 import { homedir } from "node:os";
 //#region src/cli/commands/consumer/key.ts
 async function run(argv, ctx = {}) {

package/dist/{ports-rRppuBgo.mjs → ports-BRXd5UXh.mjs}

@@ -1,6 +1,6 @@
 import { n as UsageError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot, p as setPort, s as listKeyrings } from "./store-BiTS2FTl.mjs";
+import { m as setPort, n as consumersRoot, s as listKeyrings } from "./store-CQShpYar.mjs";
 import { n as ctxHomedir, r as ctxOut } from "./common-CgxCXeTt.mjs";
 import { i as validatePortArg, n as desiredPortFor } from "./ports-pI59MtmI.mjs";
 import { homedir } from "node:os";
@@ -28,7 +28,9 @@ async function run(argv, ctx = {}) {
 			if (ring.services.length === 0) out("  (no services known yet - run the gateway to fetch the catalog)");
 			for (const s of ring.services) {
 				const pinned = ring.ports[s.serviceId] !== void 0;
-				out(`  ${s.serviceId}  ${s.name}  port ${desiredPortFor(s, ring.ports)}  [${pinned ? "pinned" : `default ${s.defaultPort}`}]`);
+				const actual = ring.actualPorts[s.serviceId];
+				const note = actual !== void 0 && actual !== desiredPortFor(s, ring.ports) ? `  [LIVE: ${actual} - auto-shifted by running gateway]` : "";
+				out(`  ${s.serviceId}  ${s.name}  port ${desiredPortFor(s, ring.ports)}  [${pinned ? "pinned" : `default ${s.defaultPort}`}]${note}`);
 			}
 		}
 		return 0;

package/dist/{run-bbDjqVLr.mjs → run-3pdPsD8e.mjs}

@@ -1,8 +1,8 @@
 import { n as UsageError, r as reportCliError, t as CliError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot, s as listKeyrings } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot, s as listKeyrings } from "./store-CQShpYar.mjs";
 import { a as ringsForRun, i as printListeners, n as ctxHomedir, o as waitForSignals, r as ctxOut, t as createSdkFabricFactory } from "./common-CgxCXeTt.mjs";
-import { n as createFabricProviderTransport, t as startEngine } from "./runtime-D_nxUEjd.mjs";
+import { n as createFabricProviderTransport, t as startEngine } from "./runtime-DNs9GtGp.mjs";
 import { a as killHard, c as terminateGracefully, i as isAlive, l as writeLastStart, n as daemonDir, o as readLastStart, r as ensureDaemonDir, s as readPid, t as clearPid, u as writePid } from "./daemon-state-CYkiW3SA.mjs";
 import { openSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";

package/dist/{runtime-D_nxUEjd.mjs → runtime-DNs9GtGp.mjs}

@@ -1,5 +1,5 @@
 import { i as FRAME_TYPE, o as HTTP_METHODS } from "./frames-BDqvhB2Y.mjs";
-import { c as loadKeyring, f as saveKeyring, t as applyCatalog, u as reconcileKeyMetadata } from "./store-BiTS2FTl.mjs";
+import { c as loadKeyring, f as saveKeyring, p as setActualPorts, t as applyCatalog, u as reconcileKeyMetadata } from "./store-CQShpYar.mjs";
 import { i as splitBody, n as FabricWireAdapter, t as WireSession } from "./mux-CS1zhF4W.mjs";
 import { n as desiredPortFor, r as listenWithFallback, t as LOOPBACK_HOST } from "./ports-pI59MtmI.mjs";
 import { Hono } from "hono";
@@ -371,7 +371,12 @@ var ProviderConnection = class {
 			seen.add(s.serviceId);
 			services.push(s);
 		}
-		let ring = applyCatalog(this.ring, {
+		const persisted = loadKeyring(this.root, this.ring.endpointId);
+		const base = persisted === void 0 ? this.ring : {
+			...this.ring,
+			actualPorts: persisted.actualPorts
+		};
+		let ring = applyCatalog(base, {
 			alias: header.alias,
 			relayUrls: header.relayUrls,
 			services
@@ -1358,6 +1363,20 @@ async function startEngine(opts) {
 	});
 	managerRef.current = manager;
 	for (const ring of opts.rings) if (ring.services.length > 0) await gateway.syncProviderServices(ring.endpointId, ring.alias, ring.services, ring.ports);
+	const live = new Map(gateway.listenerInfo().map((l) => [l.serviceId, l.port]));
+	for (const ring of opts.rings) {
+		const actual = {};
+		for (const s of ring.services) {
+			const port = live.get(s.serviceId);
+			if (port !== void 0) actual[s.serviceId] = port;
+		}
+		if (Object.keys(actual).length === 0) continue;
+		try {
+			setActualPorts(opts.consumersRoot, ring.endpointId, actual);
+		} catch (err) {
+			opts.onNotice?.(`warning: could not persist actual ports for '${ring.alias}': ${err.message}`);
+		}
+	}
 	manager.start();
 	return {
 		manager,

package/dist/{secret-SA37VND5.mjs → secret-COdVHzjH.mjs}

@@ -62,7 +62,7 @@ async function set(options, positionals, home) {
 		value = (await readHidden(`value for '${name}': `)).trim();
 	}
 	if (value === "") throw new UsageError("error: secret value must not be empty");
-	const entry = SecretsStore.open(resolveDataDir(void 0, home)).set(name, value, { bearerPrefix: options["no-bearer"] !== true });
+	const entry = SecretsStore.open(resolveDataDir(str(options.data), home)).set(name, value, { bearerPrefix: options["no-bearer"] !== true });
 	process.stdout.write(`secret set: ${entry.name} (bearer prefix ${entry.bearerPrefix ? "on" : "off"}) - inject with service add --secret ${entry.name}\n`);
 	return 0;
 }

package/dist/{status-B-j454u2.mjs → status-Bttb9aPj.mjs}

@@ -1,7 +1,7 @@
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot, s as listKeyrings } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot, s as listKeyrings } from "./store-CQShpYar.mjs";
 import { a as ringsForRun, n as ctxHomedir, r as ctxOut, t as createSdkFabricFactory } from "./common-CgxCXeTt.mjs";
-import { n as createFabricProviderTransport, t as startEngine } from "./runtime-D_nxUEjd.mjs";
+import { n as createFabricProviderTransport, t as startEngine } from "./runtime-DNs9GtGp.mjs";
 import { homedir } from "node:os";
 //#region src/cli/commands/consumer/status.ts
 /** 状态显示名（spec 六态）。 */

package/dist/{store-BiTS2FTl.mjs → store-CQShpYar.mjs}

@@ -18,7 +18,8 @@ const KEYRING_SCHEMA = z.object({
 		group: z.string().max(256)
 	})),
 	services: z.array(SERVICE_ENTRY_SCHEMA),
-	ports: z.record(z.string(), z.number().int().min(0).max(65535))
+	ports: z.record(z.string(), z.number().int().min(0).max(65535)),
+	actualPorts: z.record(z.string(), z.number().int().min(0).max(65535)).default({})
 });
 /** 消费侧数据根：默认 ~/.aifly/consumers；--data <dir> 时以 <dir> 为根（CLI 语义）。 */
 function consumersRoot(dataDir, base = homedir()) {
@@ -178,7 +179,8 @@ function mergeImportView(base, payload, key) {
 		relayUrls: [],
 		keys: [],
 		services: [],
-		ports: {}
+		ports: {},
+		actualPorts: {}
 	};
 	const merged = new Map(ring.services.map((s) => [s.serviceId, s]));
 	for (const s of payload.services) merged.set(s.serviceId, s);
@@ -201,11 +203,14 @@ function applyCatalog(ring, patch) {
 	const alive = new Set(patch.services.map((s) => s.serviceId));
 	const ports = {};
 	for (const [serviceId, port] of Object.entries(ring.ports)) if (alive.has(serviceId)) ports[serviceId] = port;
+	const actualPorts = {};
+	for (const [serviceId, port] of Object.entries(ring.actualPorts ?? {})) if (alive.has(serviceId)) actualPorts[serviceId] = port;
 	const next = {
 		...ring,
 		relayUrls: [...patch.relayUrls],
 		services: [...patch.services],
-		ports
+		ports,
+		actualPorts
 	};
 	if (patch.alias !== void 0 && patch.alias !== "") next.alias = patch.alias;
 	return next;
@@ -246,6 +251,20 @@ function setPort(root, endpointId, serviceId, port) {
 	saveKeyring(root, next);
 	return next;
 }
+/** 网关实际监听端口回写（引擎启动路径；整体替换并修剪到存活服务）。 */
+function setActualPorts(root, endpointId, actual) {
+	const existing = loadKeyring(root, endpointId);
+	if (existing === void 0) throw new CliError(`error: provider '${endpointId}' not found`);
+	const alive = new Set(existing.services.map((s) => s.serviceId));
+	const actualPorts = {};
+	for (const [serviceId, port] of Object.entries(actual)) if (alive.has(serviceId)) actualPorts[serviceId] = port;
+	const next = {
+		...existing,
+		actualPorts
+	};
+	saveKeyring(root, next);
+	return next;
+}
 /** forget：整环删除（钥环 + fabric 身份目录；提供方侧撤销需提供方操作）。 */
 function removeKeyring(root, ref) {
 	const dir = findKeyringDir(root, ref);
@@ -269,9 +288,10 @@ function removeKeyring(root, ref) {
 			relayUrls: [],
 			keys: [],
 			services: [],
-			ports: {}
+			ports: {},
+			actualPorts: {}
 		}
 	};
 }
 //#endregion
-export { hasFabricIdentity as a, loadKeyring as c, removeKeyring as d, saveKeyring as f, findKeyringDir as i, mergeImportView as l, upsertKey as m, consumersRoot as n, keyringDir as o, setPort as p, fabricDir as r, listKeyrings as s, applyCatalog as t, reconcileKeyMetadata as u };
+export { hasFabricIdentity as a, loadKeyring as c, removeKeyring as d, saveKeyring as f, upsertKey as h, findKeyringDir as i, mergeImportView as l, setPort as m, consumersRoot as n, keyringDir as o, setActualPorts as p, fabricDir as r, listKeyrings as s, applyCatalog as t, reconcileKeyMetadata as u };

package/dist/{test-Bc0OKBAi.mjs → test-mlaZC1y5.mjs}

@@ -1,6 +1,6 @@
 import { n as UsageError, r as reportCliError } from "./errors-BGtxPkM7.mjs";
 import { n as parseArgv } from "./args-CSxXW9eD.mjs";
-import { n as consumersRoot, s as listKeyrings } from "./store-BiTS2FTl.mjs";
+import { n as consumersRoot, s as listKeyrings } from "./store-CQShpYar.mjs";
 import { n as desiredPortFor } from "./ports-pI59MtmI.mjs";
 import { n as testLocalService } from "./local-test-C3HGjGY3.mjs";
 import { homedir } from "node:os";
@@ -39,7 +39,7 @@ async function run(argv, ctx = {}) {
 		const serviceName = options.service === void 0 ? void 0 : String(options.service);
 		const target = serviceName === void 0 ? flat[0] : flat.find(({ svc }) => svc.name === serviceName || svc.serviceId === serviceName);
 		if (target === void 0) throw new UsageError(`error: service '${serviceName}' not found (imported: ${flat.map((f) => f.svc.name).join(", ")})`);
-		const port = desiredPortFor(target.svc, target.ring.ports);
+		const port = target.ring.actualPorts[target.svc.serviceId] ?? desiredPortFor(target.svc, target.ring.ports);
 		const result = await testLocalService({
 			port,
 			form,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-fly",
-  "version": "0.3.0",
+  "version": "0.3.1-alpha.2",
   "description": "ai-fly — peer-to-peer HTTP/WebSocket bridge with AI-ready presets, over OpenDWeb fabric",
   "license": "MIT OR Apache-2.0",
   "type": "module",