@nextclaw/server 0.14.7 → 0.14.8

package/dist/index.js

@@ -2986,9 +2986,7 @@ async function normalizeSessionProjectRoot(value) {
 function isSessionProjectRootValidationError(error) {
 	return error instanceof SessionProjectRootValidationError;
 }
-//#endregion
-//#region src/features/marketplace/configs/marketplace.constants.config.ts
-const DEFAULT_MARKETPLACE_API_BASE = "https://marketplace-api.nextclaw.io";
+const DEFAULT_MARKETPLACE_READ_API_BASES = ["https://api.nextclaw.net", "https://marketplace-api.nextclaw.io"];
 const MARKETPLACE_ZH_COPY_BY_SLUG = {
 	weather: {
 		summary: "NextClaw 内置技能，用于天气查询工作流。",
@@ -3040,6 +3038,33 @@ const MARKETPLACE_ZH_COPY_BY_SLUG = {
 	}
 };
 //#endregion
+//#region src/features/marketplace/utils/marketplace-read-source.utils.ts
+const MARKETPLACE_FETCH_TIMEOUT_MS = 12e3;
+const DOMESTIC_MARKETPLACE_FETCH_TIMEOUT_MS = 2e3;
+const DOMESTIC_MARKETPLACE_RETRY_ATTEMPTS = 2;
+function resolveMarketplaceBaseUrls(options) {
+	const configured = options.marketplace?.apiBaseUrl?.trim();
+	if (configured) return [configured.replace(/\/$/, "")];
+	return DEFAULT_MARKETPLACE_READ_API_BASES;
+}
+function normalizeMarketplaceBaseUrls(baseUrls, baseUrl) {
+	const candidates = baseUrls && baseUrls.length > 0 ? baseUrls : [baseUrl ?? "https://marketplace-api.nextclaw.io"];
+	return [...new Set(candidates.map((candidate) => candidate.trim().replace(/\/$/, "")).filter(Boolean))];
+}
+function getMarketplaceFetchOptions(baseUrl) {
+	if (baseUrl.replace(/\/$/, "") !== "https://api.nextclaw.net") return {
+		timeoutMs: MARKETPLACE_FETCH_TIMEOUT_MS,
+		retryAttempts: 5
+	};
+	return {
+		timeoutMs: DOMESTIC_MARKETPLACE_FETCH_TIMEOUT_MS,
+		retryAttempts: DOMESTIC_MARKETPLACE_RETRY_ATTEMPTS
+	};
+}
+function shouldFallbackMarketplaceResult(status) {
+	return status === 408 || status === 429 || status >= 500;
+}
+//#endregion
 //#region src/features/marketplace/utils/marketplace-network-retry.utils.ts
 const MARKETPLACE_NETWORK_RETRY_ATTEMPTS = 5;
 const MARKETPLACE_NETWORK_RETRY_BASE_MS = 350;
@@ -3059,39 +3084,56 @@ function isRetryableMarketplaceNetworkError(error) {
 	if (error instanceof TypeError && error.message === "fetch failed") return true;
 	return false;
 }
-async function runWithMarketplaceNetworkRetry(action) {
+async function runWithMarketplaceNetworkRetry(action, options = {}) {
+	const attempts = options.attempts ?? MARKETPLACE_NETWORK_RETRY_ATTEMPTS;
+	const baseDelayMs = options.baseDelayMs ?? MARKETPLACE_NETWORK_RETRY_BASE_MS;
 	let lastError;
-	for (let attempt = 1; attempt <= MARKETPLACE_NETWORK_RETRY_ATTEMPTS; attempt += 1) try {
+	for (let attempt = 1; attempt <= attempts; attempt += 1) try {
 		return await action();
 	} catch (error) {
 		lastError = error;
-		if (attempt === MARKETPLACE_NETWORK_RETRY_ATTEMPTS || !isRetryableMarketplaceNetworkError(error)) throw error;
-		await sleepMs(MARKETPLACE_NETWORK_RETRY_BASE_MS * 2 ** (attempt - 1));
+		if (attempt === attempts || !isRetryableMarketplaceNetworkError(error)) throw error;
+		await sleepMs(baseDelayMs * 2 ** (attempt - 1));
 	}
 	throw lastError;
 }
 //#endregion
 //#region src/features/marketplace/utils/marketplace-catalog.utils.ts
-const MARKETPLACE_FETCH_TIMEOUT_MS = 12e3;
-function normalizeMarketplaceBaseUrl(options) {
-	const configured = options.marketplace?.apiBaseUrl?.trim();
-	if (!configured) return DEFAULT_MARKETPLACE_API_BASE;
-	return configured.replace(/\/$/, "");
-}
 function toMarketplaceUrl(baseUrl, path, query = {}) {
 	const url = new URL(path, `${baseUrl.replace(/\/$/, "")}/`);
 	for (const [key, value] of Object.entries(query)) if (typeof value === "string" && value.length > 0) url.searchParams.set(key, value);
 	return url.toString();
 }
 async function fetchMarketplaceData(params) {
-	const endpoint = toMarketplaceUrl(params.baseUrl, params.path, params.query);
+	const { baseUrl, baseUrls: rawBaseUrls, path, query } = params;
+	const baseUrls = normalizeMarketplaceBaseUrls(rawBaseUrls, baseUrl);
+	let lastError = null;
+	for (const sourceBaseUrl of baseUrls) {
+		const result = await fetchMarketplaceDataFromBase({
+			baseUrl: sourceBaseUrl,
+			path,
+			query
+		});
+		if (result.ok || !shouldFallbackMarketplaceResult(result.status)) return result;
+		lastError = result;
+	}
+	return lastError ?? {
+		ok: false,
+		status: 503,
+		message: "marketplace source is not configured"
+	};
+}
+async function fetchMarketplaceDataFromBase(params) {
+	const { baseUrl, path, query } = params;
+	const endpoint = toMarketplaceUrl(baseUrl, path, query);
+	const fetchOptions = getMarketplaceFetchOptions(baseUrl);
 	let response;
 	try {
 		response = await runWithMarketplaceNetworkRetry(() => fetch(endpoint, {
 			method: "GET",
 			headers: { Accept: "application/json" },
-			signal: AbortSignal.timeout(MARKETPLACE_FETCH_TIMEOUT_MS)
-		}));
+			signal: AbortSignal.timeout(fetchOptions.timeoutMs)
+		}), { attempts: fetchOptions.retryAttempts });
 	} catch (error) {
 		return {
 			ok: false,
@@ -3186,15 +3228,17 @@ function toPositiveInt(raw, fallback) {
 	return parsed;
 }
 async function fetchAllMarketplaceItems(params) {
+	const { baseUrl, baseUrls, path, query: rawQuery } = params;
 	const items = [];
 	let sort = "relevance";
 	let query;
 	for (let page = 1; page <= 20; page += 1) {
 		const result = await fetchMarketplaceData({
-			baseUrl: params.baseUrl,
-			path: params.path,
+			baseUrl,
+			baseUrls,
+			path,
 			query: {
-				...params.query,
+				...rawQuery,
 				page: String(page),
 				pageSize: String(100)
 			}
@@ -3220,6 +3264,7 @@ async function fetchAllMarketplaceItems(params) {
 async function fetchAllMcpMarketplaceItems(params) {
 	return fetchAllMarketplaceItems({
 		baseUrl: params.baseUrl,
+		baseUrls: params.baseUrls,
 		path: "/api/v1/mcp/items",
 		query: params.query
 	});
@@ -3233,9 +3278,9 @@ function sanitizeMarketplaceItemView(item) {
 //#endregion
 //#region src/features/marketplace/controllers/mcp-marketplace.controller.ts
 var McpMarketplaceController = class {
-	constructor(options, marketplaceBaseUrl) {
+	constructor(options, marketplaceBaseUrls) {
 		this.options = options;
-		this.marketplaceBaseUrl = marketplaceBaseUrl;
+		this.marketplaceBaseUrls = marketplaceBaseUrls;
 	}
 	getInstalled = (c) => {
 		const records = new McpInstalledViewService({ getConfig: () => loadConfigOrDefault(this.options.configPath) }).listInstalled().map((record) => ({
@@ -3270,7 +3315,7 @@ var McpMarketplaceController = class {
 	listItems = async (c) => {
 		const query = c.req.query();
 		const result = await fetchAllMcpMarketplaceItems({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			query: {
 				q: query.q,
 				tag: query.tag,
@@ -3298,7 +3343,7 @@ var McpMarketplaceController = class {
 	getItem = async (c) => {
 		const slug = encodeURIComponent(c.req.param("slug"));
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/mcp/items/${slug}`
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
@@ -3307,7 +3352,7 @@ var McpMarketplaceController = class {
 	getItemContent = async (c) => {
 		const slug = encodeURIComponent(c.req.param("slug"));
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/mcp/items/${slug}/content`
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
@@ -3322,7 +3367,7 @@ var McpMarketplaceController = class {
 		const installer = this.options.marketplace?.installer;
 		if (!installer?.installMcp) return c.json(err("NOT_AVAILABLE", "mcp installer is not configured"), 503);
 		const itemResult = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/mcp/items/${encodeURIComponent(slug)}`
 		});
 		if (!itemResult.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", itemResult.message), itemResult.status);
@@ -3386,7 +3431,7 @@ var McpMarketplaceController = class {
 	getRecommendations = async (c) => {
 		const query = c.req.query();
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: "/api/v1/mcp/recommendations",
 			query: {
 				scene: query.scene,
@@ -3539,9 +3584,9 @@ async function manageMarketplaceSkill(params) {
 	};
 }
 var SkillMarketplaceController = class {
-	constructor(options, marketplaceBaseUrl) {
+	constructor(options, marketplaceBaseUrls) {
 		this.options = options;
-		this.marketplaceBaseUrl = marketplaceBaseUrl;
+		this.marketplaceBaseUrls = marketplaceBaseUrls;
 	}
 	getInstalled = (c) => {
 		return c.json(ok(collectSkillMarketplaceInstalledView(this.options)));
@@ -3566,7 +3611,7 @@ var SkillMarketplaceController = class {
 	};
 	loadSupportedListPage = async (query) => {
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: "/api/v1/skills/items",
 			query
 		});
@@ -3578,7 +3623,7 @@ var SkillMarketplaceController = class {
 	};
 	listScenes = async (c) => {
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: "/api/v1/skills/scenes"
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
@@ -3600,7 +3645,7 @@ var SkillMarketplaceController = class {
 	getItem = async (c) => {
 		const slug = encodeURIComponent(c.req.param("slug"));
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/skills/items/${slug}`
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
@@ -3614,7 +3659,7 @@ var SkillMarketplaceController = class {
 	getItemContent = async (c) => {
 		const slug = encodeURIComponent(c.req.param("slug"));
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/skills/items/${slug}`
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
@@ -3624,7 +3669,7 @@ var SkillMarketplaceController = class {
 		if (unsupportedKind) return c.json(err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`), 502);
 		if (!isSupportedMarketplaceSkillItem(sanitized, knownSkillNames)) return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
 		const contentResult = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: `/api/v1/skills/items/${slug}/content`
 		});
 		if (!contentResult.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", contentResult.message), contentResult.status);
@@ -3667,7 +3712,7 @@ var SkillMarketplaceController = class {
 	getRecommendations = async (c) => {
 		const query = c.req.query();
 		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
+			baseUrls: this.marketplaceBaseUrls,
 			path: "/api/v1/skills/recommendations",
 			query: {
 				scene: query.scene,
@@ -4849,7 +4894,7 @@ var ServerPathRoutesController = class {
 //#region src/app/router.ts
 const NCP_AGENT_BASE_PATH = "/api/ncp/agent";
 const AGENT_RUNS_BASE_PATH = "/api/agent-runs";
-function createUiRouteControllers(options, authService, marketplaceBaseUrl) {
+function createUiRouteControllers(options, authService, marketplaceBaseUrls) {
 	const { kernel, panelAppClientSdkScript, remoteAccess, runtimeControl, runtimeUpdate } = options;
 	return {
 		app: new AppRoutesController(options),
@@ -4869,8 +4914,8 @@ function createUiRouteControllers(options, authService, marketplaceBaseUrl) {
 		remote: remoteAccess ? new RemoteRoutesController(remoteAccess) : null,
 		runtimeControl: runtimeControl ? new RuntimeControlRoutesController(runtimeControl) : null,
 		runtimeUpdate: runtimeUpdate ? new RuntimeUpdateRoutesController(runtimeUpdate) : null,
-		skillMarketplace: new SkillMarketplaceController(options, marketplaceBaseUrl),
-		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrl)
+		skillMarketplace: new SkillMarketplaceController(options, marketplaceBaseUrls),
+		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrls)
 	};
 }
 function isRecord(value) {
@@ -5493,9 +5538,9 @@ var UiRouteRegistry = class {
 };
 function createUiRouter(options, authServiceOverride) {
 	const app = new Hono();
-	const marketplaceBaseUrl = normalizeMarketplaceBaseUrl(options);
+	const marketplaceBaseUrls = resolveMarketplaceBaseUrls(options);
 	const authService = authServiceOverride ?? options.authService ?? new UiAuthService(options.kernel.accessManager ?? new AccessManager({ configPath: options.configPath }));
-	const controllers = createUiRouteControllers(options, authService, marketplaceBaseUrl);
+	const controllers = createUiRouteControllers(options, authService, marketplaceBaseUrls);
 	app.notFound((c) => c.json(err("NOT_FOUND", "endpoint not found"), 404));
 	app.use("/api/*", async (c, next) => {
 		const path = c.req.path;