surgio 4.0.0-beta.5 → 4.0.0-beta.7

package/build/cache/configured-store.js

@@ -1,5 +1,6 @@
 import { getConfig } from '../config.js';
 import { createFilesystemStore } from './stores/filesystem.js';
+import { createRedisStore } from './stores/redis.js';
 import { createUpstashStore } from './stores/upstash.js';
 export const createConfiguredStore = () => {
     const config = getConfig().cache;
@@ -21,6 +22,13 @@ export const createConfiguredStore = () => {
             }
             return { store: createUpstashStore(url, token), type: 'upstash' };
         }
+        case 'redis': {
+            const redisUrl = config.redisUrl ?? process.env.REDIS_URL;
+            if (!redisUrl) {
+                throw new Error('Redis cache requires cache.redisUrl or REDIS_URL');
+            }
+            return { store: createRedisStore(redisUrl), type: 'redis' };
+        }
     }
 };
 //# sourceMappingURL=configured-store.js.map

package/build/cache/configured-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"configured-store.js","sourceRoot":"","sources":["../../src/cache/configured-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAIxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAoB,EAAE;IACzD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC,KAAK,CAAA;IAEhC,IACE,CAAC,MAAM;QACP,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,IAAI,KAAK,YAAY,EAC5B,CAAC;QACD,OAAO;YACL,KAAK,EAAE,qBAAqB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC9D,IAAI,EAAE,YAAY;SACnB,CAAA;IACH,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;YACvE,MAAM,KAAK,GACT,MAAM,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAA;YAEjE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAA;YACH,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;QACnE,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"configured-store.js","sourceRoot":"","sources":["../../src/cache/configured-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAIxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAoB,EAAE;IACzD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC,KAAK,CAAA;IAEhC,IACE,CAAC,MAAM;QACP,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,IAAI,KAAK,YAAY,EAC5B,CAAC;QACD,OAAO;YACL,KAAK,EAAE,qBAAqB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC9D,IAAI,EAAE,YAAY;SACnB,CAAA;IACH,CAAC;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;YACvE,MAAM,KAAK,GACT,MAAM,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAA;YAEjE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAA;YACH,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;QACnE,CAAC;QACD,KAAK,OAAO,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAA;YAEzD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;YACrE,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;QAC7D,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}

package/build/cache/index.d.ts

@@ -2,5 +2,6 @@ export * from './types.js';
 export * from './ttl-cache.js';
 export * from './stores/filesystem.js';
 export * from './stores/upstash.js';
+export * from './stores/redis.js';
 export * from './stores/cloudflare-kv.js';
 export { unifiedCache as cache, cleanCaches } from './singleton.js';

package/build/cache/index.js

@@ -2,6 +2,7 @@ export * from './types.js';
 export * from './ttl-cache.js';
 export * from './stores/filesystem.js';
 export * from './stores/upstash.js';
+export * from './stores/redis.js';
 export * from './stores/cloudflare-kv.js';
 export { unifiedCache as cache, cleanCaches } from './singleton.js';
 //# sourceMappingURL=index.js.map

package/build/cache/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}

package/build/cache/redis.d.ts

@@ -0,0 +1 @@
+export * from './stores/redis.js';

package/build/cache/redis.js

@@ -0,0 +1,2 @@
+export * from './stores/redis.js';
+//# sourceMappingURL=redis.js.map

package/build/cache/redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}

package/build/cache/stores/redis.d.ts

@@ -0,0 +1,25 @@
+import type { KvStore, KvStorePutOptions } from '../types.js';
+export interface RedisClient {
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<unknown>;
+    set(key: string, value: string, unixTimeMillisecondsToken: 'PXAT', unixTimeMilliseconds: number): Promise<unknown>;
+    del(...keys: string[]): Promise<unknown>;
+    scan(cursor: string, patternToken: 'MATCH', pattern: string, countToken: 'COUNT', count: number): Promise<[cursor: string, keys: string[]]>;
+    quit(): Promise<unknown>;
+}
+export type RedisClientFactory = (redisUrl: string) => RedisClient | Promise<RedisClient>;
+export interface RedisStoreOptions {
+    namespace?: string;
+    client?: RedisClient;
+    createClient?: RedisClientFactory;
+}
+export declare class RedisKvStore implements KvStore {
+    #private;
+    constructor(redisUrl: string, options?: RedisStoreOptions);
+    get(key: string): Promise<string | undefined>;
+    put(key: string, value: string, options?: KvStorePutOptions): Promise<void>;
+    delete(key: string): Promise<void>;
+    list(prefix?: string): AsyncIterable<string>;
+    close(): Promise<void>;
+}
+export declare const createRedisStore: (redisUrl: string, options?: RedisStoreOptions) => KvStore;

package/build/cache/stores/redis.js

@@ -0,0 +1,103 @@
+import { createPhysicalKey, createPhysicalPrefix, DEFAULT_CACHE_NAMESPACE, removePhysicalPrefix, } from './utils.js';
+// ioredis emits connection causes as events and rejects commands with a generic retry error.
+const connectionErrors = new WeakMap();
+// The host names the target without exposing credentials from the URL.
+const describeTarget = (redisUrl) => URL.canParse(redisUrl) && new URL(redisUrl).host
+    ? `Redis cache request to ${new URL(redisUrl).host}`
+    : 'Redis cache request';
+// Node reports a dual-stack connection failure as an AggregateError with an empty message.
+const describeError = (error) => {
+    if (error instanceof AggregateError && !error.message) {
+        return error.errors.map(describeError).join('; ');
+    }
+    return error instanceof Error ? error.message : String(error);
+};
+const createIoredisClient = async (redisUrl) => {
+    const { Redis } = await import('ioredis');
+    // family 0 lets hostnames resolve to IPv6, which private networks such as Railway require.
+    // One retry per command fails fast while ioredis keeps reconnecting in the background.
+    const client = new Redis(redisUrl, {
+        family: 0,
+        lazyConnect: true,
+        maxRetriesPerRequest: 1,
+    });
+    client.on('error', (error) => connectionErrors.set(client, error));
+    client.on('ready', () => connectionErrors.delete(client));
+    return client;
+};
+export class RedisKvStore {
+    #namespace;
+    #redisUrl;
+    #target;
+    #ownsClient;
+    #createClient;
+    #client;
+    #clientPromise;
+    constructor(redisUrl, options = {}) {
+        this.#namespace = options.namespace ?? DEFAULT_CACHE_NAMESPACE;
+        this.#redisUrl = redisUrl;
+        this.#target = describeTarget(redisUrl);
+        this.#client = options.client;
+        this.#ownsClient = !options.client;
+        this.#createClient = options.createClient ?? createIoredisClient;
+    }
+    async get(key) {
+        const value = await this.#run((client) => client.get(this.#physicalKey(key)));
+        return value ?? undefined;
+    }
+    async put(key, value, options) {
+        const physicalKey = this.#physicalKey(key);
+        const expiresAt = options?.expiresAt;
+        await this.#run((client) => expiresAt === undefined
+            ? client.set(physicalKey, value)
+            : client.set(physicalKey, value, 'PXAT', expiresAt));
+    }
+    async delete(key) {
+        await this.#run((client) => client.del(this.#physicalKey(key)));
+    }
+    async *list(prefix = '') {
+        const physicalPrefix = createPhysicalPrefix(this.#namespace, prefix);
+        let cursor = '0';
+        do {
+            const [nextCursor, keys] = await this.#run((client) => client.scan(cursor, 'MATCH', `${physicalPrefix}*`, 'COUNT', 1000));
+            cursor = nextCursor;
+            for (const key of keys) {
+                yield removePhysicalPrefix(this.#namespace, key);
+            }
+        } while (cursor !== '0');
+    }
+    async close() {
+        if (!this.#ownsClient) {
+            return;
+        }
+        const client = this.#client ?? (await this.#clientPromise);
+        if (client) {
+            await client.quit();
+        }
+    }
+    async #run(command) {
+        const client = await this.#getClient();
+        try {
+            return await command(client);
+        }
+        catch (error) {
+            const reason = describeError(connectionErrors.get(client) ?? error);
+            throw new Error(`${this.#target} failed: ${reason}`, { cause: error });
+        }
+    }
+    #physicalKey(key) {
+        return createPhysicalKey(this.#namespace, key);
+    }
+    async #getClient() {
+        if (this.#client) {
+            return this.#client;
+        }
+        this.#clientPromise ??= Promise.resolve(this.#createClient(this.#redisUrl)).then((client) => {
+            this.#client = client;
+            return client;
+        });
+        return this.#clientPromise;
+    }
+}
+export const createRedisStore = (redisUrl, options) => new RedisKvStore(redisUrl, options);
+//# sourceMappingURL=redis.js.map

package/build/cache/stores/redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/cache/stores/redis.ts"],"names":[],"mappings":"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"}

package/build/cache/types.d.ts

@@ -9,7 +9,7 @@ export interface KvStore {
     list(prefix?: string): AsyncIterable<string>;
     close(): Promise<void>;
 }
-export type CacheType = 'filesystem' | 'upstash' | 'custom';
+export type CacheType = 'filesystem' | 'upstash' | 'redis' | 'custom';
 export interface PreparedKvStore {
     store: KvStore;
     type: CacheType;

package/build/config-normalize.d.ts

@@ -46,6 +46,9 @@ export declare const normalizeCommonConfig: (input: Partial<CommandConfigBeforeN
         type: "upstash";
         upstashRestUrl?: string | undefined;
         upstashRestToken?: string | undefined;
+    } | {
+        type: "redis";
+        redisUrl?: string | undefined;
     } | undefined;
     artifacts: {
         name: string;

package/build/generator/artifact.js

@@ -4,7 +4,8 @@ import { logger as defaultLogger } from '@surgio/logger';
 import fs from 'fs-extra';
 import { createProvider, getProvider, } from '../provider/index.js';
 import { createArtifactRenderContext, mapConcurrent, mergeObjects, prepareProvider, } from '../runtime/artifact.js';
-import { isError, isSurgioError, SurgioError, getNetworkConcurrency, } from '../utils/index.js';
+import { withProviderError } from '../runtime/provider-error.js';
+import { getNetworkConcurrency } from '../utils/index.js';
 import { resolveDomain } from '../utils/dns.js';
 import { loadModuleSync } from '../utils/module-loader.js';
 import { ArtifactValidator } from '../validators/index.js';
@@ -107,59 +108,27 @@ export class Artifact extends EventEmitter {
         if (!definition && !fs.existsSync(filePath)) {
             throw new Error(`文件 ${filePath} 不存在`);
         }
-        let provider;
-        try {
+        const provider = await withProviderError({ providerName, providerPath: filePath }, async () => {
             const providerDefinition = definition ?? loadModuleSync(filePath);
-            provider = this.options.providerRuntime
+            const provider = this.options.providerRuntime
                 ? await createProvider(providerName, providerDefinition, this.options.providerRuntime)
                 : await getProvider(providerName, providerDefinition);
             this.providerMap.set(providerName, provider);
-        }
-        catch (_err) /* istanbul ignore next -- @preserve */ {
-            const err = _err;
-            if (isSurgioError(err)) {
-                err.providerName = providerName;
-                err.providerPath = filePath;
-                throw err;
-            }
-            else {
-                throw new SurgioError(isError(err) ? err.message : '处理 Provider 失败', {
-                    cause: err,
-                    providerName,
-                    providerPath: filePath,
-                });
-            }
-        }
-        let result;
-        try {
-            result = await prepareProvider({
-                provider,
-                providerName,
-                providerPath: filePath,
-                params: this.getMergedCustomParams(getNodeListParams),
-                config,
-                concurrency: getNetworkConcurrency(),
-                resolveDomain,
-                logger: this.options.logger ??
-                    this.options.providerRuntime?.logger ??
-                    defaultLogger,
-                providerRuntime: this.options.providerRuntime,
-            });
-        }
-        catch (err) /* istanbul ignore next -- @preserve */ {
-            if (isSurgioError(err)) {
-                err.providerName = providerName;
-                err.providerPath = filePath;
-                throw err;
-            }
-            else {
-                throw new SurgioError(isError(err) ? err.message : '处理 Provider 失败', {
-                    cause: err,
-                    providerName,
-                    providerPath: filePath,
-                });
-            }
-        }
+            return provider;
+        });
+        const result = await withProviderError({ providerName, providerPath: filePath }, () => prepareProvider({
+            provider,
+            providerName,
+            providerPath: filePath,
+            params: this.getMergedCustomParams(getNodeListParams),
+            config,
+            concurrency: getNetworkConcurrency(),
+            resolveDomain,
+            logger: this.options.logger ??
+                this.options.providerRuntime?.logger ??
+                defaultLogger,
+            providerRuntime: this.options.providerRuntime,
+        }));
         const { nodeList: nodeConfigList, subscriptionUserInfo } = result;
         this.nodeConfigListMap.set(providerName, nodeConfigList);
         // Filter 仅使用第一个 Provider 中的定义

package/build/generator/artifact.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/generator/artifact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/generator/artifact.ts"],"names":[],"mappings":"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"}

package/build/runtime/core.d.ts

@@ -0,0 +1,20 @@
+import type { ProjectProviderDefinition } from '../project/types.js';
+import type { CommandConfigAfterNormalize, RemoteSnippet } from '../types.js';
+import type { CacheKeyScope } from './cache-key.js';
+import type { RuntimeOptions, SurgioRuntime } from './public.js';
+import type { Renderer } from './renderer.js';
+export type RuntimeConfig = CommandConfigAfterNormalize & {
+    readonly publicUrl: string;
+    readonly urlBase: string;
+};
+/** 平台 adapter 只需提供配置来源、Provider 查找、本地片段和渲染器。 */
+export interface RuntimePlatform {
+    readonly config: RuntimeConfig;
+    readonly version: string;
+    readonly renderer: Renderer;
+    readonly cacheScope: CacheKeyScope;
+    listProviders(): ReadonlyArray<string>;
+    getProviderDefinition(name: string): ProjectProviderDefinition | undefined;
+    loadSnippet(name: string): RemoteSnippet;
+}
+export declare const createRuntimeCore: (platform: RuntimePlatform, options: RuntimeOptions) => SurgioRuntime;

package/build/runtime/core.js

@@ -0,0 +1,176 @@
+import { logger as defaultLogger } from '@surgio/logger';
+import { createProvider } from '../provider/create-provider.js';
+import { ArtifactValidator } from '../validators/index.js';
+import { createArtifactRenderContext, mapConcurrent, mergeObjects, prepareProvider, } from './artifact.js';
+import { buildRenderedArtifactCacheKey } from './cache-key.js';
+import { createDefaultDomainResolver } from './dns.js';
+import { formatProviderNodes } from './format.js';
+import { createHttpClient } from './http-client.js';
+import { withProviderError } from './provider-error.js';
+import { loadRemoteSnippets } from './remote-snippet.js';
+export const createRuntimeCore = (platform, options) => {
+    const { config, renderer } = platform;
+    const { cache } = options;
+    const logger = options.logger ?? defaultLogger;
+    const network = options.network ?? {};
+    const concurrency = network.concurrency ?? 5;
+    const resolveDomain = options.resolveDomain ?? createDefaultDomainResolver();
+    const providerRuntime = {
+        cache,
+        config,
+        httpClient: createHttpClient({
+            fetch: options.fetch,
+            retry: network.retry ?? 1,
+            timeout: network.timeout ?? 10_000,
+        }),
+        logger,
+        providerCacheTtl: network.providerCacheTtl ?? 10 * 60_000,
+        version: platform.version,
+    };
+    const getArtifact = (name) => {
+        const artifact = config.artifacts.find((item) => item.name === name);
+        if (!artifact)
+            throw new Error(`Artifact ${name} 不存在`);
+        return artifact;
+    };
+    const getProvider = async (name) => {
+        const definition = platform.getProviderDefinition(name);
+        return definition
+            ? createProvider(name, definition, providerRuntime)
+            : undefined;
+    };
+    const requireProvider = async (name) => {
+        const provider = await getProvider(name);
+        if (!provider)
+            throw new Error(`Provider ${name} 不存在`);
+        return provider;
+    };
+    const loadProviders = (artifact, renderOptions) => mapConcurrent([artifact.provider, ...(artifact.combineProviders ?? [])], concurrency, (providerName) => withProviderError({ providerName }, async () => prepareProvider({
+        provider: await requireProvider(providerName),
+        providerName,
+        params: mergeObjects(config.customParams, artifact.customParams, renderOptions.getNodeListParams),
+        config,
+        concurrency,
+        resolveDomain: (domain) => resolveDomain(domain, network.timeout),
+        logger,
+        providerRuntime,
+    })));
+    const renderFresh = async (artifact, renderOptions) => {
+        const providerResults = await loadProviders(artifact, renderOptions);
+        const nodeList = providerResults.flatMap((result) => result.nodeList);
+        const mainProvider = providerResults.find((result) => result.provider.name === artifact.provider).provider;
+        const customFilters = {
+            ...config.customFilters,
+            ...mainProvider.config.customFilters,
+            ...artifact.customFilters,
+        };
+        const subscriptionUserInfoMap = Object.fromEntries(providerResults.flatMap((result) => result.subscriptionUserInfo
+            ? [[result.provider.name, result.subscriptionUserInfo]]
+            : []));
+        const subscriptionUserInfo = subscriptionUserInfoMap[artifact.subscriptionUserInfoProvider ?? artifact.provider];
+        const selectedFilter = typeof renderOptions.filter === 'string'
+            ? customFilters[renderOptions.filter]
+            : renderOptions.filter;
+        if (typeof renderOptions.filter === 'string' && !selectedFilter) {
+            throw new Error(`Filter ${renderOptions.filter} 不存在`);
+        }
+        if (renderOptions.format) {
+            const body = formatProviderNodes(renderOptions.format, nodeList, selectedFilter, { logger });
+            return { body, subscriptionUserInfo, subscriptionUserInfoMap };
+        }
+        const renderContext = createArtifactRenderContext({
+            artifact,
+            config,
+            nodeList,
+            mainProvider,
+            customFilters,
+            customParams: mergeObjects(config.customParams, artifact.customParams, renderOptions.customParams),
+            remoteSnippetList: await loadRemoteSnippets(config.remoteSnippets ?? [], {
+                cache,
+                cacheTtl: network.remoteSnippetCacheTtl ?? 12 * 60 * 60_000,
+                concurrency,
+                httpClient: providerRuntime.httpClient,
+                logger,
+            }),
+            downloadUrl: renderOptions.downloadUrl,
+            loadSnippet: platform.loadSnippet,
+            logger,
+        });
+        const body = renderer.renderArtifact(artifact, renderContext);
+        return { body, subscriptionUserInfo, subscriptionUserInfoMap };
+    };
+    const render = async (artifact, renderOptions = {}) => {
+        const cacheKey = buildRenderedArtifactCacheKey(platform.cacheScope, artifact, renderOptions);
+        if (!cacheKey.cacheable) {
+            logger.debug('Artifact %s 跳过渲染缓存：%s', artifact.name, cacheKey.reason);
+            return { ...(await renderFresh(artifact, renderOptions)), artifact };
+        }
+        const data = await cache.wrap(cacheKey.key, () => renderFresh(artifact, renderOptions), network.artifactCacheTtl ?? 7 * 24 * 60 * 60_000);
+        return { ...data, artifact };
+    };
+    return {
+        renderArtifact(name, renderOptions) {
+            return render(getArtifact(name), renderOptions);
+        },
+        renderProviders(renderOptions) {
+            const providers = Array.isArray(renderOptions.providers)
+                ? renderOptions.providers
+                : [renderOptions.providers];
+            if (!providers.length)
+                throw new Error('至少需要一个 Provider');
+            const artifact = ArtifactValidator.parse({
+                name: `providers:${providers.join(',')}`,
+                provider: providers[0],
+                combineProviders: providers.slice(1),
+                template: renderOptions.template ?? '',
+            });
+            return render(artifact, {
+                ...renderOptions,
+                format: renderOptions.template
+                    ? renderOptions.format
+                    : (renderOptions.format ?? 'clash'),
+            });
+        },
+        async renderTemplate(name, context = {}) {
+            return renderer.renderTemplate(name.endsWith('.tpl') ? name : `${name}.tpl`, context);
+        },
+        listArtifacts() {
+            return [...config.artifacts];
+        },
+        listProviders() {
+            return platform.listProviders();
+        },
+        async getProviderInfo(name) {
+            const provider = await getProvider(name);
+            if (!provider)
+                return undefined;
+            return {
+                name: provider.name,
+                type: provider.type,
+                ...('url' in provider && typeof provider.url === 'string'
+                    ? { url: provider.url }
+                    : null),
+                supportGetSubscriptionUserInfo: provider.supportGetSubscriptionUserInfo,
+            };
+        },
+        async getProviderSubscription(name, params = {}) {
+            const provider = await requireProvider(name);
+            return provider.getSubscriptionUserInfo(params);
+        },
+        getGatewayConfig() {
+            return {
+                urlBase: config.urlBase,
+                publicUrl: config.publicUrl,
+                coreVersion: platform.version,
+                ...config.gateway,
+            };
+        },
+        resetCache() {
+            return cache.reset();
+        },
+        close() {
+            return cache.close();
+        },
+    };
+};
+//# sourceMappingURL=core.js.map

package/build/runtime/core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/runtime/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,EACL,2BAA2B,EAC3B,aAAa,EACb,YAAY,EACZ,eAAe,GAChB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAmDxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAyB,EACzB,OAAuB,EACR,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;IACrC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IACzB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAA;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAA;IACrC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,CAAC,CAAA;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,2BAA2B,EAAE,CAAA;IAC5E,MAAM,eAAe,GAA2B;QAC9C,KAAK;QACL,MAAM;QACN,UAAU,EAAE,gBAAgB,CAAC;YAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;YACzB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,MAAM;SACnC,CAAC;QACF,MAAM;QACN,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,EAAE,GAAG,MAAM;QACzD,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAA;IAED,MAAM,WAAW,GAAG,CAAC,IAAY,EAAkB,EAAE;QACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,CAAA;QACtD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,KAAK,EACvB,IAAY,EAC+B,EAAE;QAC7C,MAAM,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QACvD,OAAO,UAAU;YACf,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC;YACnD,CAAC,CAAC,SAAS,CAAA;IACf,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,KAAK,EAC3B,IAAY,EACmB,EAAE;QACjC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,CAAA;QACtD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,CACpB,QAAwB,EACxB,aAAoC,EACP,EAAE,CAC/B,aAAa,CACX,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,EACzD,WAAW,EACX,CAAC,YAAY,EAAE,EAAE,CACf,iBAAiB,CAAC,EAAE,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE,CAC7C,eAAe,CAAC;QACd,QAAQ,EAAE,MAAM,eAAe,CAAC,YAAY,CAAC;QAC7C,YAAY;QACZ,MAAM,EAAE,YAAY,CAClB,MAAM,CAAC,YAAY,EACnB,QAAQ,CAAC,YAAY,EACrB,aAAa,CAAC,iBAAiB,CACX;QACtB,MAAM;QACN,WAAW;QACX,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC;QACjE,MAAM;QACN,eAAe;KAChB,CAAC,CACH,CACJ,CAAA;IAEH,MAAM,WAAW,GAAG,KAAK,EACvB,QAAwB,EACxB,aAAoC,EACf,EAAE;QACvB,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QACpE,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACrE,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CACvC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,QAAQ,CACtD,CAAC,QAAQ,CAAA;QACX,MAAM,aAAa,GAAG;YACpB,GAAG,MAAM,CAAC,aAAa;YACvB,GAAG,YAAY,CAAC,MAAM,CAAC,aAAa;YACpC,GAAG,QAAQ,CAAC,aAAa;SAC1B,CAAA;QACD,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAChD,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACjC,MAAM,CAAC,oBAAoB;YACzB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,oBAAoB,CAAU,CAAC;YAChE,CAAC,CAAC,EAAE,CACP,CACF,CAAA;QACD,MAAM,oBAAoB,GACxB,uBAAuB,CACrB,QAAQ,CAAC,4BAA4B,IAAI,QAAQ,CAAC,QAAQ,CAC3D,CAAA;QACH,MAAM,cAAc,GAClB,OAAO,aAAa,CAAC,MAAM,KAAK,QAAQ;YACtC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC;YACrC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAA;QAC1B,IAAI,OAAO,aAAa,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,cAAc,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,UAAU,aAAa,CAAC,MAAM,MAAM,CAAC,CAAA;QACvD,CAAC;QAED,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,mBAAmB,CAC9B,aAAa,CAAC,MAAM,EACpB,QAAQ,EACR,cAAmE,EACnE,EAAE,MAAM,EAAE,CACX,CAAA;YACD,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,CAAA;QAChE,CAAC;QAED,MAAM,aAAa,GAAG,2BAA2B,CAAC;YAChD,QAAQ;YACR,MAAM;YACN,QAAQ;YACR,YAAY;YACZ,aAAa;YACb,YAAY,EAAE,YAAY,CACxB,MAAM,CAAC,YAAY,EACnB,QAAQ,CAAC,YAAY,EACrB,aAAa,CAAC,YAAY,CAC3B;YACD,iBAAiB,EAAE,MAAM,kBAAkB,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE;gBACvE,KAAK;gBACL,QAAQ,EAAE,OAAO,CAAC,qBAAqB,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM;gBAC3D,WAAW;gBACX,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,MAAM;aACP,CAAC;YACF,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,MAAM;SACP,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC7D,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,CAAA;IAChE,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,KAAK,EAClB,QAAwB,EACxB,aAAa,GAA0B,EAAE,EACX,EAAE;QAChC,MAAM,QAAQ,GAAG,6BAA6B,CAC5C,QAAQ,CAAC,UAAU,EACnB,QAAQ,EACR,aAAa,CACd,CAAA;QACD,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CACV,uBAAuB,EACvB,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,MAAM,CAChB,CAAA;YACD,OAAO,EAAE,GAAG,CAAC,MAAM,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAA;QACtE,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAC3B,QAAQ,CAAC,GAAG,EACZ,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,EAC1C,OAAO,CAAC,gBAAgB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CACjD,CAAA;QACD,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAA;IAC9B,CAAC,CAAA;IAED,OAAO;QACL,cAAc,CAAC,IAAI,EAAE,aAAa;YAChC,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,CAAA;QACjD,CAAC;QACD,eAAe,CAAC,aAAqC;YACnD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC;gBACtD,CAAC,CAAC,aAAa,CAAC,SAAS;gBACzB,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAC7B,IAAI,CAAC,SAAS,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;YACzD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC;gBACvC,IAAI,EAAE,aAAa,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACxC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;gBACtB,gBAAgB,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpC,QAAQ,EAAE,aAAa,CAAC,QAAQ,IAAI,EAAE;aACvC,CAAC,CAAA;YACF,OAAO,MAAM,CAAC,QAAQ,EAAE;gBACtB,GAAG,aAAa;gBAChB,MAAM,EAAE,aAAa,CAAC,QAAQ;oBAC5B,CAAC,CAAC,aAAa,CAAC,MAAM;oBACtB,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC;aACtC,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,EAAE;YACrC,OAAO,QAAQ,CAAC,cAAc,CAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,EAC5C,OAAO,CACR,CAAA;QACH,CAAC;QACD,aAAa;YACX,OAAO,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;QAC9B,CAAC;QACD,aAAa;YACX,OAAO,QAAQ,CAAC,aAAa,EAAE,CAAA;QACjC,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,IAAI;YACxB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,CAAC,QAAQ;gBAAE,OAAO,SAAS,CAAA;YAC/B,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,GAAG,CAAC,KAAK,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,GAAG,KAAK,QAAQ;oBACvD,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE;oBACvB,CAAC,CAAC,IAAI,CAAC;gBACT,8BAA8B,EAAE,QAAQ,CAAC,8BAA8B;aACxE,CAAA;QACH,CAAC;QACD,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE;YAC7C,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAA;YAC5C,OAAO,QAAQ,CAAC,uBAAuB,CAAC,MAA2B,CAAC,CAAA;QACtE,CAAC;QACD,gBAAgB;YACd,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW,EAAE,QAAQ,CAAC,OAAO;gBAC7B,GAAG,MAAM,CAAC,OAAO;aAClB,CAAA;QACH,CAAC;QACD,UAAU;YACR,OAAO,KAAK,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;QACD,KAAK;YACH,OAAO,KAAK,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}