bailian-cli-core 1.0.3 → 1.1.0

package/LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -137,8 +138,8 @@
 
    6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
-      except as required for describing the origin of the Work and
-      reproducing the content of the NOTICE file.
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
@@ -163,15 +164,15 @@
       has been advised of the possibility of such damages.
 
    9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may accept and charge a
-      fee for, acceptance of support, warranty, indemnity, or other
-      liability obligations and/or rights consistent with this License.
-      However, in accepting such obligations, You may act only on Your
-      own behalf and on the sole responsibility of Your contributors,
-      and only if You agree to indemnify, defend, and hold each Contributor
-      harmless for any liability incurred by, or claims asserted against,
-      such Contributor by reason of your accepting any such warranty or
-      additional liability.
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
 

package/dist/index.d.mts

@@ -711,6 +711,7 @@ interface RequestOpts {
   stream?: boolean;
   noAuth?: boolean;
   async?: boolean;
+  signal?: AbortSignal;
 }
 declare function request(config: Config, opts: RequestOpts): Promise<Response>;
 declare function requestJson<T>(config: Config, opts: RequestOpts): Promise<T>;
@@ -772,9 +773,11 @@ interface ConsoleGatewayRequest {
 }
 /**
  * Invoke a Bailian **console** OpenAPI via the CLI gateway (`/cli/api.json`).
- * Requires a console `access_token` (from `bl auth login --console`), not a DashScope API key.
+ * `token` is the console `access_token` (from `bl auth login --console`); when
+ * omitted the request is sent without an Authorization header, which works for
+ * public console APIs that don't require a login session.
  */
-declare function callConsoleGateway(config: Config, token: string, {
+declare function callConsoleGateway(config: Config, token: string | undefined, {
   api,
   data,
   region
@@ -825,6 +828,7 @@ interface UploadOptions {
   apiKey: string;
   model: string;
   filePath: string;
+  signal?: AbortSignal;
 }
 /**
  * Upload a local file to DashScope temporary storage and return the oss:// URL.
@@ -839,7 +843,9 @@ declare function isLocalFile(input: string): boolean;
  * Resolve a file argument: if it's a local path, upload it and return the oss:// URL.
  * If it's already a URL, return as-is.
  */
-declare function resolveFileUrl(input: string, apiKey: string, model: string): Promise<string>;
+declare function resolveFileUrl(input: string, apiKey: string, model: string, opts?: {
+  signal?: AbortSignal;
+}): Promise<string>;
 //#endregion
 //#region src/types/command.d.ts
 interface OptionDef {
@@ -855,7 +861,7 @@ interface Command {
   options?: OptionDef[];
   examples?: string[];
   apiDocs?: string;
-  execute(config: Config, flags: GlobalFlags): Promise<void>;
+  execute: (config: Config, flags: GlobalFlags) => Promise<void>;
 }
 interface CommandSpec {
   name: string;
@@ -864,7 +870,7 @@ interface CommandSpec {
   options?: OptionDef[];
   examples?: string[];
   apiDocs?: string;
-  run(config: Config, flags: GlobalFlags): Promise<void>;
+  run: (config: Config, flags: GlobalFlags) => Promise<void>;
 }
 declare function defineCommand(spec: CommandSpec): Command;
 /** Global flags shared by all commands — drives the parser's type resolution. */

package/dist/index.mjs

@@ -486,13 +486,13 @@ async function request(config, opts) {
 			console.error(`> x-dashscope-source-config: ${SOURCE_CONFIG}`);
 		}
 	}
-	const timeoutMs = (opts.timeout ?? config.timeout) * 1e3;
+	const requestSignal = createRequestSignal((opts.timeout ?? config.timeout) * 1e3, opts.signal);
 	const res = await fetch(opts.url, {
 		method: opts.method ?? "GET",
 		headers,
 		body: opts.body ? isFormData ? opts.body : JSON.stringify(opts.body) : void 0,
-		signal: AbortSignal.timeout(timeoutMs)
-	});
+		signal: requestSignal.signal
+	}).finally(requestSignal.cleanup);
 	if (config.verbose) {
 		console.error(`< ${res.status} ${res.statusText}`);
 		const reqId = res.headers.get("x-request-id");
@@ -507,6 +507,22 @@ async function request(config, opts) {
 	}
 	return res;
 }
+function createRequestSignal(timeoutMs, parentSignal) {
+	const controller = new AbortController();
+	const timeout = setTimeout(() => controller.abort(), timeoutMs);
+	const abortFromParent = () => controller.abort(parentSignal?.reason);
+	const cleanup = () => {
+		clearTimeout(timeout);
+		parentSignal?.removeEventListener("abort", abortFromParent);
+	};
+	if (parentSignal?.aborted) abortFromParent();
+	else parentSignal?.addEventListener("abort", abortFromParent, { once: true });
+	controller.signal.addEventListener("abort", cleanup, { once: true });
+	return {
+		signal: controller.signal,
+		cleanup
+	};
+}
 async function requestJson(config, opts) {
 	const res = await request(config, opts);
 	let data;
@@ -694,7 +710,9 @@ function buildGatewayParams(api, data) {
 }
 /**
 * Invoke a Bailian **console** OpenAPI via the CLI gateway (`/cli/api.json`).
-* Requires a console `access_token` (from `bl auth login --console`), not a DashScope API key.
+* `token` is the console `access_token` (from `bl auth login --console`); when
+* omitted the request is sent without an Authorization header, which works for
+* public console APIs that don't require a login session.
 */
 async function callConsoleGateway(config, token, { api, data, region = "cn-beijing" }) {
 	const params = buildGatewayParams(api, data);
@@ -704,13 +722,14 @@ async function callConsoleGateway(config, token, { api, data, region = "cn-beiji
 	});
 	const timeoutMs = config.timeout * 1e3;
 	const gatewayBase = config.consoleGatewayUrl;
+	const headers = {
+		Accept: "*/*",
+		"Content-Type": "application/x-www-form-urlencoded"
+	};
+	if (token) headers.Authorization = `Bearer ${token}`;
 	const res = await fetch(`${gatewayBase}/cli/api.json?action=${GATEWAY_ACTION}&product=${GATEWAY_PRODUCT}&api=${encodeURIComponent(api)}`, {
 		method: "POST",
-		headers: {
-			Accept: "*/*",
-			Authorization: `Bearer ${token}`,
-			"Content-Type": "application/x-www-form-urlencoded"
-		},
+		headers,
 		body: body.toString(),
 		signal: AbortSignal.timeout(timeoutMs)
 	});
@@ -733,16 +752,17 @@ const UPLOAD_API = `${REGIONS.cn}/api/v1/uploads`;
 /**
 * Step 1: Fetch the upload policy (presigned credentials) from DashScope.
 */
-async function getUploadPolicy(apiKey, model) {
+async function getUploadPolicy(apiKey, model, signal) {
 	const url = `${UPLOAD_API}?action=getPolicy&model=${encodeURIComponent(model)}`;
+	const policySignal = combineWithTimeout(15e3, signal);
 	const res = await fetch(url, {
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
 			"Content-Type": "application/json",
 			...trackingHeaders()
 		},
-		signal: AbortSignal.timeout(15e3)
-	});
+		signal: policySignal.signal
+	}).finally(policySignal.cleanup);
 	if (!res.ok) {
 		const text = await res.text().catch(() => "");
 		throw new BailianError(`Failed to get upload policy (HTTP ${res.status}): ${text}`, ExitCode.GENERAL);
@@ -752,7 +772,7 @@ async function getUploadPolicy(apiKey, model) {
 /**
 * Step 2: Upload the file to OSS using the policy.
 */
-async function uploadToOSS(policy, filePath) {
+async function uploadToOSS(policy, filePath, signal) {
 	const fileName = basename(filePath);
 	const key = `${policy.upload_dir}/${fileName}`;
 	const fileData = readFileSync(filePath);
@@ -765,12 +785,13 @@ async function uploadToOSS(policy, filePath) {
 	form.append("key", key);
 	form.append("success_action_status", "200");
 	form.append("file", new Blob([fileData]), fileName);
+	const uploadSignal = combineWithTimeout(12e4, signal);
 	const res = await fetch(policy.upload_host, {
 		method: "POST",
 		headers: { ...trackingHeaders() },
 		body: form,
-		signal: AbortSignal.timeout(12e4)
-	});
+		signal: uploadSignal.signal
+	}).finally(uploadSignal.cleanup);
 	if (!res.ok) {
 		const text = await res.text().catch(() => "");
 		throw new BailianError(`Failed to upload file to OSS (HTTP ${res.status}): ${text}`, ExitCode.GENERAL);
@@ -782,10 +803,10 @@ async function uploadToOSS(policy, filePath) {
 * The URL is valid for 48 hours.
 */
 async function uploadFile(opts) {
-	const { apiKey, model, filePath } = opts;
+	const { apiKey, model, filePath, signal } = opts;
 	if (!existsSync(filePath)) throw new BailianError(`File not found: ${filePath}`, ExitCode.USAGE);
 	if (!statSync(filePath).isFile()) throw new BailianError(`Not a file: ${filePath}`, ExitCode.USAGE);
-	return uploadToOSS(await getUploadPolicy(apiKey, model), filePath);
+	return uploadToOSS(await getUploadPolicy(apiKey, model, signal), filePath, signal);
 }
 /**
 * Check if a string looks like a local file path (not a URL).
@@ -800,14 +821,31 @@ function isLocalFile(input) {
 * Resolve a file argument: if it's a local path, upload it and return the oss:// URL.
 * If it's already a URL, return as-is.
 */
-async function resolveFileUrl(input, apiKey, model) {
+async function resolveFileUrl(input, apiKey, model, opts = {}) {
 	if (!isLocalFile(input)) return input;
 	return uploadFile({
 		apiKey,
 		model,
-		filePath: input
+		filePath: input,
+		signal: opts.signal
 	});
 }
+function combineWithTimeout(timeoutMs, parentSignal) {
+	const controller = new AbortController();
+	const timeout = setTimeout(() => controller.abort(), timeoutMs);
+	const abortFromParent = () => controller.abort(parentSignal?.reason);
+	const cleanup = () => {
+		clearTimeout(timeout);
+		parentSignal?.removeEventListener("abort", abortFromParent);
+	};
+	if (parentSignal?.aborted) abortFromParent();
+	else parentSignal?.addEventListener("abort", abortFromParent, { once: true });
+	controller.signal.addEventListener("abort", cleanup, { once: true });
+	return {
+		signal: controller.signal,
+		cleanup
+	};
+}
 //#endregion
 //#region src/types/command.ts
 function defineCommand(spec) {
@@ -1969,6 +2007,7 @@ const PARAM_ALLOWLIST = new Set([
 	"pitch",
 	"rate",
 	"volume",
+	"api",
 	"mode",
 	"download",
 	"noWait",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bailian-cli-core",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Core SDK for bailian-cli. See https://www.npmjs.com/package/bailian-cli for usage.",
   "homepage": "https://bailian.console.aliyun.com/cli",
   "license": "Apache-2.0",