@undefineds.co/xpod 0.4.18 → 0.4.19

package/dist/tunnel/NgrokTunnelProvider.jsonld

@@ -52,30 +52,6 @@
           },
           "comment": "ngrok executable path."
         },
-        {
-          "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env",
-          "range": {
-            "@type": "ParameterRangeCollectEntries",
-            "parameterRangeCollectEntriesParameters": [
-              {
-                "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env_key"
-              },
-              {
-                "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env_value",
-                "range": {
-                  "@type": "ParameterRangeUnion",
-                  "parameterRangeElements": [
-                    "xsd:string",
-                    {
-                      "@type": "ParameterRangeUndefined"
-                    }
-                  ]
-                }
-              }
-            ]
-          },
-          "comment": "Environment used to resolve the client binary; injectable for tests."
-        },
         {
           "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_agentApiUrl",
           "range": {
@@ -223,21 +199,6 @@
                 "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_ngrokPath"
               }
             },
-            {
-              "keyRaw": "env",
-              "value": {
-                "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env__constructorArgument",
-                "fields": [
-                  {
-                    "collectEntries": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env",
-                    "key": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env_key",
-                    "value": {
-                      "@id": "undefineds:dist/tunnel/NgrokTunnelProvider.jsonld#NgrokTunnelProvider_options_env_value"
-                    }
-                  }
-                ]
-              }
-            },
             {
               "keyRaw": "agentApiUrl",
               "value": {

package/dist/tunnel/SakuraFrpTunnelProvider.d.ts

@@ -20,8 +20,6 @@ export interface SakuraFrpTunnelProviderOptions {
     publicUrl?: string;
     /** frpc 可执行文件路径 (默认 'frpc') */
     frpcPath?: string;
-    /** Environment used to resolve the client binary; injectable for tests. */
-    env?: Record<string, string | undefined>;
     /** 等待代理发布的毫秒数；超时后状态为 failed */
     connectTimeoutMs?: number;
     /** SakuraFRP 服务端地址 (如果需要自定义) */
@@ -37,7 +35,7 @@ export interface SakuraFrpTunnelProviderOptions {
  * 通过 frpc 客户端连接 SakuraFRP 服务
  */
 export declare class SakuraFrpTunnelProvider implements TunnelProvider {
-    readonly name = "sakura_frp";
+    readonly name = "sakura-frp";
     private readonly logger;
     private readonly token;
     private readonly publicUrl?;

package/dist/tunnel/SakuraFrpTunnelProvider.js

@@ -14,7 +14,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SakuraFrpTunnelProvider = void 0;
 exports.resolveSakuraAssignedLocalPort = resolveSakuraAssignedLocalPort;
 exports.parseSakuraCredential = parseSakuraCredential;
-const TunnelClientResolver_1 = require("./TunnelClientResolver");
 const node_child_process_1 = require("node:child_process");
 const global_logger_factory_1 = require("global-logger-factory");
 const TunnelLifecycle_1 = require("./TunnelLifecycle");
@@ -27,9 +26,7 @@ const DEFAULT_SAKURA_API_BASE_URL = 'https://api.natfrp.com/v4';
  */
 class SakuraFrpTunnelProvider {
     constructor(options) {
-        // The catalog id, not a hyphenated implementation name: the provider vocabulary has exactly
-        // one spelling, and this one is also what failure details embed.
-        this.name = 'sakura_frp';
+        this.name = 'sakura-frp';
         this.logger = (0, global_logger_factory_1.getLoggerFor)(this);
         /** Whether the platform terminates TLS for this entry (auto HTTPS). */
         this.autoHttpsEnabled = false;
@@ -42,8 +39,7 @@ class SakuraFrpTunnelProvider {
         this.managedByUs = false;
         this.token = options.token;
         this.publicUrl = normalizePublicEndpoint(options.publicUrl);
-        this.frpcPath = options.frpcPath
-            ?? (0, TunnelClientResolver_1.resolveTunnelClient)('sakura_frp', { env: options.env }).command;
+        this.frpcPath = options.frpcPath ?? 'frpc';
         this.connectTimeoutMs = options.connectTimeoutMs ?? 30_000;
         this.serverAddr = options.serverAddr;
         this.apiBaseUrl = (options.apiBaseUrl ?? DEFAULT_SAKURA_API_BASE_URL).replace(/\/+$/u, '');
@@ -263,7 +259,7 @@ class SakuraFrpTunnelProvider {
             this.managedByUs = false;
         });
         this.process.on('error', (error) => {
-            const described = (0, TunnelLifecycle_1.describeSpawnError)('sakura_frp', this.frpcPath, error);
+            const described = (0, TunnelLifecycle_1.describeSpawnError)('sakura-frp', this.frpcPath, error);
             this.logger.error(`Failed to start frpc: ${described}`);
             this.status = (0, TunnelLifecycle_1.createTunnelStatus)('failed', { endpoint: this.currentEndpoint(), error: described });
             this.process = null;

package/dist/tunnel/TunnelLifecycle.d.ts

@@ -10,13 +10,5 @@ import type { TunnelStage, TunnelStatus } from './TunnelProvider';
 export declare function createTunnelStatus(stage: TunnelStage, patch?: Partial<TunnelStatus>): TunnelStatus;
 /** Keeps the previous error visible while a provider transitions through a restart. */
 export declare function mergeTunnelError(previous: string | undefined, next: string | undefined): string | undefined;
-/**
- * Recognizes a missing client binary, which is a deployment fact, not a network failure.
- *
- * The prefix stays `binary-missing:<provider>:<binary>` (callers and acceptance assert on it);
- * `<provider>` is resolved to the catalog id first, so an implementation that calls itself
- * `sakura-frp` cannot put a provider id into the message that no catalog lookup resolves.
- * The install hint from the provider catalog is appended so an operator reading the failure
- * knows what to install instead of having to search (audit N16).
- */
+/** Recognizes a missing client binary, which is a deployment fact, not a network failure. */
 export declare function describeSpawnError(provider: string, binary: string, error: unknown): string;

package/dist/tunnel/TunnelLifecycle.js

@@ -1,14 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTunnelStatus = createTunnelStatus;
 exports.mergeTunnelError = mergeTunnelError;
 exports.describeSpawnError = describeSpawnError;
-const node_path_1 = __importDefault(require("node:path"));
-const TunnelClientResolver_1 = require("./TunnelClientResolver");
-const TunnelProviderCatalog_1 = require("./TunnelProviderCatalog");
 /**
  * Tunnel readiness is a sequence, not a boolean.
  *
@@ -29,27 +23,12 @@ function createTunnelStatus(stage, patch = {}) {
 function mergeTunnelError(previous, next) {
     return next ?? previous;
 }
-/**
- * Recognizes a missing client binary, which is a deployment fact, not a network failure.
- *
- * The prefix stays `binary-missing:<provider>:<binary>` (callers and acceptance assert on it);
- * `<provider>` is resolved to the catalog id first, so an implementation that calls itself
- * `sakura-frp` cannot put a provider id into the message that no catalog lookup resolves.
- * The install hint from the provider catalog is appended so an operator reading the failure
- * knows what to install instead of having to search (audit N16).
- */
+/** Recognizes a missing client binary, which is a deployment fact, not a network failure. */
 function describeSpawnError(provider, binary, error) {
     const code = typeof error === 'object' && error && 'code' in error ? String(error.code) : '';
-    // `spawn-failed` is a plain diagnostic, but its provider segment is normalized the same way
-    // so both families of message name the same provider.
-    const id = (0, TunnelProviderCatalog_1.canonicalTunnelProviderId)(provider) ?? provider;
     if (code === 'ENOENT') {
-        // The prefix stays `binary-missing:<provider>:<binary name>` because callers assert on it;
-        // when the command was an absolute path, which file was tried is appended for the operator.
-        const name = node_path_1.default.basename(binary);
-        const message = (0, TunnelClientResolver_1.describeTunnelClientMissing)(id, name);
-        return name === binary ? message : `${message} (tried: ${binary})`;
+        return `binary-missing:${provider}:${binary}`;
     }
-    return `spawn-failed:${id}:${error?.message ?? String(error)}`;
+    return `spawn-failed:${provider}:${error?.message ?? String(error)}`;
 }
 //# sourceMappingURL=TunnelLifecycle.js.map

package/dist/tunnel/TunnelProviderCatalog.d.ts

@@ -21,32 +21,9 @@ export interface TunnelProviderParameterField {
     key: string;
     label: string;
 }
-/**
- * The local client this provider needs (audit N16).
- *
- * Declared here so there is one place that knows the executable name, how an operator points at
- * a specific build, whether the artifact may ship the binary at all, and what to tell them when
- * it is missing. Providers consume it instead of each keeping its own default string.
- */
-export interface TunnelProviderClient {
-    /** Executable name; also the name reported in `binary-missing:<provider>:<binary>`. */
-    binary: string;
-    /** Env var that names an explicit path; highest precedence, and never silently ignored. */
-    envKey: string;
-    /** Where an operator can get it (shown next to a missing-binary failure). */
-    installHint: string;
-    /**
-     * Whether the release artifact may ship this binary. ngrok and the natfrp frpc fork are not
-     * ours to redistribute; cloudflared and upstream frpc are Apache-2.0 and could be bundled.
-     */
-    redistributable: boolean;
-    /** Upstream licence / redistribution note, for whoever changes that decision later. */
-    license: string;
-}
 export interface TunnelProviderDescriptor {
     id: TunnelProviderId;
     label: string;
-    client: TunnelProviderClient;
     /** Legacy provider-scoped credential key, still honoured for single-profile setups. */
     legacyCredentialEnvKey: string;
     /** Legacy env keys that used to declare this provider's public entry. */
@@ -75,15 +52,6 @@ export interface TunnelProviderDescriptor {
 export declare const TUNNEL_PROVIDERS: readonly TunnelProviderDescriptor[];
 /** Normalizes any stored/legacy spelling onto the canonical provider vocabulary. */
 export declare function parseTunnelProvider(value: unknown): ActiveTunnelProvider | undefined;
-/**
- * The one spelling of a provider that may appear in machine-readable messages.
- *
- * Provider implementations and callers historically used their own hyphenated names
- * (`sakura-frp`), which is how a failure detail ended up carrying a provider id that no
- * catalog lookup could resolve. Anything that renders a provider into a message resolves it
- * here first, so the catalog id is the only one that can reach an operator.
- */
-export declare function canonicalTunnelProviderId(value: unknown): TunnelProviderId | undefined;
 export declare function isTunnelProviderId(value: unknown): value is TunnelProviderId;
 export declare function tunnelProviderDescriptor(id: unknown): TunnelProviderDescriptor | undefined;
 export declare function tunnelProviderIds(): TunnelProviderId[];

package/dist/tunnel/TunnelProviderCatalog.js

@@ -11,7 +11,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TUNNEL_PROFILE_CREDENTIAL_PREFIX = exports.TUNNEL_PROVIDERS = exports.TUNNEL_PROVIDER_IDS = void 0;
 exports.parseTunnelProvider = parseTunnelProvider;
-exports.canonicalTunnelProviderId = canonicalTunnelProviderId;
 exports.isTunnelProviderId = isTunnelProviderId;
 exports.tunnelProviderDescriptor = tunnelProviderDescriptor;
 exports.tunnelProviderIds = tunnelProviderIds;
@@ -33,14 +32,6 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'ngrok',
         label: 'ngrok',
-        client: {
-            binary: 'ngrok',
-            envKey: 'NGROK_BIN',
-            installHint: 'install the ngrok agent and put it on PATH (or set NGROK_BIN)',
-            // ngrok's agent is proprietary: bundling it in our artifact needs their permission.
-            redistributable: false,
-            license: 'proprietary (ngrok terms of service)',
-        },
         legacyCredentialEnvKey: 'NGROK_AUTHTOKEN',
         legacyPublicUrlKeys: ['NGROK_URL'],
         endpointSource: 'discovered',
@@ -55,13 +46,6 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'cloudflare',
         label: 'Cloudflare Tunnel',
-        client: {
-            binary: 'cloudflared',
-            envKey: 'CLOUDFLARED_BIN',
-            installHint: 'install cloudflared and put it on PATH (or set CLOUDFLARED_BIN)',
-            redistributable: true,
-            license: 'Apache-2.0',
-        },
         legacyCredentialEnvKey: 'CLOUDFLARE_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['CLOUDFLARE_TUNNEL_URL', 'XPOD_TUNNEL_PUBLIC_URL'],
         // The hostname is configured in the Cloudflare dashboard and cloudflared is only
@@ -77,14 +61,6 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'sakura_frp',
         label: 'Sakura FRP',
-        client: {
-            binary: 'frpc',
-            envKey: 'FRPC_BIN',
-            // The official client is required: upstream frpc cannot express `-f <token>`.
-            installHint: 'install the natfrp client (its frpc accepts `-f <token>`) and put it on PATH',
-            redistributable: false,
-            license: 'natfrp fork (no published source; redistribution needs their permission)',
-        },
         legacyCredentialEnvKey: 'SAKURA_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['SAKURA_TUNNEL_URL', 'XPOD_TUNNEL_PUBLIC_URL'],
         // The console only asks for a node and a local port: the public entry (node host +
@@ -100,13 +76,6 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'frp',
         label: 'FRP',
-        client: {
-            binary: 'frpc',
-            envKey: 'FRPC_BIN',
-            installHint: 'install upstream frpc and put it on PATH (or set FRPC_BIN)',
-            redistributable: true,
-            license: 'Apache-2.0',
-        },
         legacyCredentialEnvKey: 'FRP_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['FRP_TUNNEL_URL'],
         endpointSource: 'declared',
@@ -132,18 +101,6 @@ function parseTunnelProvider(value) {
     }
     return PROVIDER_ALIASES[value.trim().toLowerCase()];
 }
-/**
- * The one spelling of a provider that may appear in machine-readable messages.
- *
- * Provider implementations and callers historically used their own hyphenated names
- * (`sakura-frp`), which is how a failure detail ended up carrying a provider id that no
- * catalog lookup could resolve. Anything that renders a provider into a message resolves it
- * here first, so the catalog id is the only one that can reach an operator.
- */
-function canonicalTunnelProviderId(value) {
-    const provider = parseTunnelProvider(value);
-    return provider && provider !== 'none' ? provider : undefined;
-}
 function isTunnelProviderId(value) {
     return parseTunnelProvider(value) !== undefined && parseTunnelProvider(value) !== 'none';
 }