ali-skills 0.0.22 → 0.0.23

package/node_modules/@ali/cli-skills/dist/cli.mjs

@@ -2205,7 +2205,7 @@ function logSkillParseFailures(failures) {
 		if (f.hint) M.message(import_picocolors.default.yellow(`  提示: ${f.hint}`));
 	}
 }
-var version$1 = "2.0.22";
+var version$1 = "2.0.23";
 const isCancelled$1 = (value) => typeof value === "symbol";
 function redactSensitiveText(text) {
 	return text.replace(/(https?:\/\/)([^/\s:@]+)(?::([^@/\s]*))?@/gi, "$1").replace(/([?&](?:private_token|access_token|token|api_key|access_key|secret|password)=)[^&\s]+/gi, "$1***");
@@ -5373,6 +5373,14 @@ function openBrowser$1(url) {
 		stdio: "ignore"
 	});
 }
+const REDIRECT_STATUS_CODES = new Set([
+	301,
+	302,
+	303,
+	307,
+	308
+]);
+const MAX_REDIRECTS = 5;
 function detectAuthMode(platformKey, platform, hostname) {
 	if (platform.authType === "private_token") return "private_token";
 	if (platformKey === "o2") return "auto";
@@ -5561,14 +5569,8 @@ async function sendDirectRequest(targetUrl, platform, token, options) {
 	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
 	const timeoutId = setTimeout(() => controller.abort(), timeout);
-	const response = await fetch(targetUrl, {
-		method: options.method.toUpperCase(),
-		headers: requestHeaders,
-		body: body || void 0,
-		signal: controller.signal
-	});
+	const { response, responseBody } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
 	clearTimeout(timeoutId);
-	const responseBody = await response.text();
 	if (!options.quiet) {
 		const statusColor = response.ok ? GREEN$1 : RED$2;
 		console.log(`${statusColor}${response.status} ${response.statusText}${RESET$2}`);
@@ -5630,15 +5632,8 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
 	const timeoutId = setTimeout(() => controller.abort(), timeout);
-	const response = await fetch(targetUrl, {
-		method: options.method.toUpperCase(),
-		headers: requestHeaders,
-		body: body || void 0,
-		signal: controller.signal,
-		redirect: "manual"
-	});
+	const { response, responseBody } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
 	clearTimeout(timeoutId);
-	const responseBody = await response.text();
 	if (!options.quiet) {
 		const statusColor = response.ok ? GREEN$1 : RED$2;
 		console.log(`${statusColor}${response.status} ${response.statusText}${RESET$2}`);
@@ -5663,6 +5658,133 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 	} else console.log(outputBody);
 	if (!response.ok) process.exit(1);
 }
+async function sendSsoTicketDirectRequest(targetUrl, options) {
+	let ssoTicket = null;
+	try {
+		await ensureLogin();
+		ssoTicket = await ensureSsoTicket();
+	} catch (error) {
+		console.error(`${RED$2}Error: ${error.message}${RESET$2}`);
+		process.exit(1);
+	}
+	if (!ssoTicket) {
+		console.error(`${RED$2}Error: 缺少 SSO_TICKET，无法进行直连请求${RESET$2}`);
+		console.log(`${TEXT$2}建议执行: npx ali-skills login${RESET$2}`);
+		process.exit(1);
+	}
+	const requestHeaders = {
+		"User-Agent": "ali-skills-cli/1.0",
+		SSO_TICKET: ssoTicket
+	};
+	if (options.headers) Object.entries(options.headers).forEach(([key, value]) => {
+		if (key.toLowerCase() !== "sso_ticket") requestHeaders[key] = value;
+	});
+	let body;
+	if (options.body) {
+		body = options.body;
+		if (!requestHeaders["Content-Type"]) requestHeaders["Content-Type"] = "application/json";
+	}
+	if (!options.quiet) {
+		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
+		console.log(`${DIM$2}→ 直接请求 (Header: SSO_TICKET)${RESET$2}`);
+	}
+	const controller = new AbortController();
+	const timeout = options.timeout || 3e4;
+	const timeoutId = setTimeout(() => controller.abort(), timeout);
+	const { response, responseBody } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
+	clearTimeout(timeoutId);
+	if (!options.quiet) {
+		const statusColor = response.ok ? GREEN$1 : RED$2;
+		console.log(`${statusColor}${response.status} ${response.statusText}${RESET$2}`);
+	}
+	let outputBody = responseBody;
+	if (!options.raw && options.pretty !== false) try {
+		const json = JSON.parse(responseBody);
+		outputBody = JSON.stringify(json, null, 2);
+	} catch {}
+	if (options.output) {
+		const { writeFileSync } = __require("fs");
+		writeFileSync(options.output, outputBody);
+		console.log(`${GREEN$1}✓ 已保存到 ${options.output}${RESET$2}`);
+	} else console.log(outputBody);
+	if (!response.ok) process.exit(1);
+}
+async function sendPlainDirectRequest(targetUrl, options) {
+	const requestHeaders = { "User-Agent": "ali-skills-cli/1.0" };
+	if (options.headers) Object.entries(options.headers).forEach(([key, value]) => {
+		requestHeaders[key] = value;
+	});
+	let body;
+	if (options.body) {
+		body = options.body;
+		if (!requestHeaders["Content-Type"]) requestHeaders["Content-Type"] = "application/json";
+	}
+	if (!options.quiet) {
+		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
+		console.log(`${DIM$2}→ 直接请求 (No Auth)${RESET$2}`);
+	}
+	const controller = new AbortController();
+	const timeout = options.timeout || 3e4;
+	const timeoutId = setTimeout(() => controller.abort(), timeout);
+	const { response, responseBody } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
+	clearTimeout(timeoutId);
+	if (!options.quiet) {
+		const statusColor = response.ok ? GREEN$1 : RED$2;
+		console.log(`${statusColor}${response.status} ${response.statusText}${RESET$2}`);
+		if (options.includeHeaders) {
+			console.log();
+			console.log(`${TEXT$2}Response Headers:${RESET$2}`);
+			response.headers.forEach((value, key) => {
+				console.log(`  ${key}: ${value}`);
+			});
+			console.log();
+		}
+	}
+	let outputBody = responseBody;
+	if (!options.raw && options.pretty !== false) try {
+		const json = JSON.parse(responseBody);
+		outputBody = JSON.stringify(json, null, 2);
+	} catch {}
+	if (options.output) {
+		const { writeFileSync } = __require("fs");
+		writeFileSync(options.output, outputBody);
+		console.log(`${GREEN$1}✓ 已保存到 ${options.output}${RESET$2}`);
+	} else console.log(outputBody);
+	if (!response.ok) process.exit(1);
+}
+async function fetchWithRedirects(initialUrl, method, headers, body, timeout, quiet) {
+	const controller = new AbortController();
+	const timeoutId = setTimeout(() => controller.abort(), timeout);
+	let currentUrl = initialUrl;
+	let redirects = 0;
+	try {
+		while (true) {
+			const response = await fetch(currentUrl, {
+				method,
+				headers,
+				body: body || void 0,
+				signal: controller.signal,
+				redirect: "manual"
+			});
+			if (!REDIRECT_STATUS_CODES.has(response.status)) return {
+				response,
+				responseBody: await response.text()
+			};
+			const location = response.headers.get("location");
+			if (!location) return {
+				response,
+				responseBody: await response.text()
+			};
+			if (redirects >= MAX_REDIRECTS) throw new Error(`重定向次数超过上限(${MAX_REDIRECTS})`);
+			const nextUrl = new URL(location, currentUrl).toString();
+			redirects += 1;
+			if (!quiet) console.log(`${DIM$2}↪ 重定向 ${redirects}: ${response.status} ${response.statusText} -> ${nextUrl}${RESET$2}`);
+			currentUrl = nextUrl;
+		}
+	} finally {
+		clearTimeout(timeoutId);
+	}
+}
 async function sendGatewayRequest(targetUrl, platformKey, options, authMode = "gateway") {
 	let credentials;
 	try {
@@ -5744,31 +5866,76 @@ async function proxyRequest(targetUrl, options) {
 	try {
 		url = new URL(targetUrl);
 	} catch {
-		console.error(`${RED$2}Error: 无效的 URL "${targetUrl}"${RESET$2}`);
+		console.error(`${RED$2}Error: URL 必须是绝对地址，收到 "${targetUrl}"${RESET$2}`);
+		console.log(`${DIM$2}未传 platform 时，请使用完整 URL（包含协议和域名）${RESET$2}`);
+		console.log(`${DIM$2}示例:${RESET$2}`);
+		console.log(`${DIM$2}  npx ali-skills req "https://jarvis.alitrip.com/api/xxx" --auth sso_cookie${RESET$2}`);
+		console.log(`${DIM$2}  npx ali-skills req o2 /v1.0/work/apps${RESET$2}`);
 		process.exit(1);
 	}
 	const platformResult = detectPlatformWithKey(url.hostname);
+	const hasExplicitAuthMode = Boolean(options.authMode && options.authMode !== "auto");
 	const isAlibabaIncRootDomain = url.hostname.endsWith(".alibaba-inc.com") || url.hostname === "alibaba-inc.com";
-	if (!platformResult && !isAlibabaIncRootDomain) {
-		console.error(`${RED$2}Error: 无法识别平台 "${url.hostname}"${RESET$2}`);
-		console.log(`${DIM$2}支持的平台:${RESET$2}`);
-		console.log(`${DIM$2}  - code.alibaba-inc.com (GitLab)${RESET$2}`);
-		console.log(`${DIM$2}  - aliyuque.antfin.com (语雀)${RESET$2}`);
-		console.log(`${DIM$2}  - o2.alibaba-inc.com${RESET$2}`);
-		console.log(`${DIM$2}  - aone.alibaba-inc.com${RESET$2}`);
-		process.exit(1);
-	}
-	const platformKey = platformResult?.key || "alibaba-inc";
+	const isKnownPlatform = Boolean(platformResult) || isAlibabaIncRootDomain;
+	const platformKey = platformResult?.key || (isAlibabaIncRootDomain ? "alibaba-inc" : url.hostname);
 	const platform = platformResult?.config || {
-		name: "Alibaba Inc Domain",
-		host: "alibaba-inc.com",
+		name: isAlibabaIncRootDomain ? "Alibaba Inc Domain" : "Custom Host",
+		host: isAlibabaIncRootDomain ? "alibaba-inc.com" : url.hostname,
 		authType: "buc_sso_refresh",
 		ssoType: "refresh_token"
 	};
-	if (!options.quiet) console.log(`${DIM$2}平台: ${platform.name}${RESET$2}`);
-	const authMode = options.authMode === "auto" || !options.authMode ? detectAuthMode(platformKey, platform, url.hostname) : options.authMode;
-	if (!options.quiet && authMode !== "auto") console.log(`${DIM$2}认证方式: ${getAuthModeDescription(authMode)}${RESET$2}`);
 	try {
+		if (!isKnownPlatform && !hasExplicitAuthMode) {
+			if (!options.quiet) {
+				console.log(`${DIM$2}平台: Custom Host${RESET$2}`);
+				console.log(`${DIM$2}认证方式: Auto (未知平台默认直连，无鉴权)${RESET$2}`);
+			}
+			await sendPlainDirectRequest(targetUrl, options);
+			return;
+		}
+		if (!options.quiet) console.log(`${DIM$2}平台: ${platform.name}${RESET$2}`);
+		const authMode = options.authMode === "auto" || !options.authMode ? detectAuthMode(platformKey, platform, url.hostname) : options.authMode;
+		if (!options.quiet && authMode !== "auto") console.log(`${DIM$2}认证方式: ${getAuthModeDescription(authMode)}${RESET$2}`);
+		if (hasExplicitAuthMode) {
+			if (platformKey === "o2") {
+				if (authMode !== "auto" && authMode !== "sso_ticket") {
+					console.error(`${RED$2}Error: o2 仅支持 --auth auto 或 --auth sso_ticket${RESET$2}`);
+					process.exit(1);
+				}
+				await sendO2SdkRequest(targetUrl, options, authMode === "sso_ticket");
+				return;
+			}
+			switch (authMode) {
+				case "private_token": {
+					let token = getPlatformPrivateToken(platformKey, options.token, targetUrl);
+					if (!token) {
+						token = await promptConfigureToken(platformKey, platform);
+						if (!token) {
+							console.error(`${RED$2}Error: ${platform.name} 需要配置 Private Token 才能访问${RESET$2}`);
+							console.log(`${DIM$2}您可以通过以下方式配置:${RESET$2}`);
+							console.log(`${DIM$2}  【推荐】一次配置，持续使用:${RESET$2}`);
+							console.log(`    npx ali-skills login ${platformKey}`);
+							console.log(`${DIM$2}  【临时】请求时传入:${RESET$2}`);
+							console.log(`    环境变量: ALI_SKILLS_${platformKey.toUpperCase()}_TOKEN=<your_token>`);
+							console.log(`    参数: --token <your_token>`);
+							process.exit(1);
+						}
+					}
+					await sendDirectRequest(targetUrl, platform, token, options);
+					return;
+				}
+				case "sso_cookie":
+					await sendSsoCookieDirectRequest(targetUrl, options);
+					return;
+				case "sso_ticket":
+					await sendSsoTicketDirectRequest(targetUrl, options);
+					return;
+				case "gateway":
+					await sendGatewayRequest(targetUrl, platformKey, options, "gateway");
+					return;
+				default: break;
+			}
+		}
 		if (platformKey === "o2") {
 			if (authMode !== "auto" && authMode !== "sso_ticket") {
 				console.error(`${RED$2}Error: o2 仅支持 --auth auto 或 --auth sso_ticket${RESET$2}`);

package/node_modules/@ali/cli-skills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/cli-skills",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ali-skills",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ali/cli-skills": "^2.0.22"
+    "@ali/cli-skills": "^2.0.23"
   },
   "bundleDependencies": [
     "@ali/cli-skills"