@cloudbase/node-sdk 3.17.0 → 3.17.1

package/dist/utils/tcbapirequester.js

@@ -226,7 +226,7 @@ class TcbApiHttpRequester {
         return params;
     }
     makeReqOpts(params) {
-        var _a;
+        var _a, _b;
         const config = this.config;
         const args = this.args;
         const url = (0, tcbapiendpoint_1.buildUrl)({
@@ -245,7 +245,8 @@ class TcbApiHttpRequester {
             timeout,
             // 优先取config，其次取模块，最后取默认
             headers: this.getHeaders(method, url, params),
-            proxy: config.proxy
+            proxy: config.proxy,
+            type: ((_b = this.opts) === null || _b === void 0 ? void 0 : _b.type) || 'json'
         };
         if (typeof config.keepalive === 'undefined' && !(0, cloudplatform_1.checkIsInScf)()) {
             // 非云函数环境下，默认开启 keepalive

package/dist/wx/index.js

@@ -96,7 +96,7 @@ async function callCompatibleWxOpenApi(cloudbase, { apiName, apiOptions, cgiName
         headers: { 'content-type': 'multipart/form-data' },
         params,
         isFormData: true,
-        opts
+        opts: Object.assign({ type: 'raw' }, opts)
     }).then(res => res);
 }
 exports.callCompatibleWxOpenApi = callCompatibleWxOpenApi;
@@ -121,7 +121,7 @@ async function callWxPayApi(cloudbase, { apiName, apiOptions, cgiName, requestDa
         headers: { 'content-type': 'multipart/form-data' },
         params,
         isFormData: true,
-        opts
+        opts: Object.assign({ type: 'raw' }, opts)
     });
 }
 exports.callWxPayApi = callWxPayApi;
@@ -146,7 +146,7 @@ async function wxCallContainerApi(cloudbase, { apiName, apiOptions, cgiName, req
         headers: { 'content-type': 'multipart/form-data' },
         params,
         isFormData: true,
-        opts
+        opts: Object.assign({ type: 'raw' }, opts)
     });
 }
 exports.wxCallContainerApi = wxCallContainerApi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/node-sdk",
-  "version": "3.17.0",
+  "version": "3.17.1",
   "description": "tencent cloud base server sdk for node.js",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",

package/src/utils/tcbapirequester.ts

@@ -287,7 +287,8 @@ export class TcbApiHttpRequester {
       timeout,
       // 优先取config，其次取模块，最后取默认
       headers: this.getHeaders(method, url, params),
-      proxy: config.proxy
+      proxy: config.proxy,
+      type: this.opts?.type || 'json'
     }
 
     if (typeof config.keepalive === 'undefined' && !checkIsInScf()) {

package/src/wx/index.ts

@@ -89,7 +89,7 @@ export async function callCompatibleWxOpenApi(
     headers: { 'content-type': 'multipart/form-data' },
     params,
     isFormData: true,
-    opts
+    opts: { type: 'raw', ...opts }
   }).then(res => res)
 }
 
@@ -120,7 +120,7 @@ export async function callWxPayApi(
     headers: { 'content-type': 'multipart/form-data' },
     params,
     isFormData: true,
-    opts
+    opts: { type: 'raw', ...opts }
   })
 }
 
@@ -151,6 +151,6 @@ export async function wxCallContainerApi(
     headers: { 'content-type': 'multipart/form-data' },
     params,
     isFormData: true,
-    opts
+    opts: { type: 'raw', ...opts }
   })
 }

package/types/index.d.ts

@@ -3,6 +3,7 @@ import fs from 'fs'
 import { Db } from '@cloudbase/database'
 import { OrmClient, OrmRawQueryClient } from '@cloudbase/wx-cloud-client-sdk'
 import { AI } from '@cloudbase/ai'
+import { IReqOpts } from './internal'
 
 type IKeyValue = Record<string, any>
 
@@ -242,6 +243,7 @@ export interface ICustomReqOpts {
      * 获取跨帐号调用信息
      */
   getCrossAccountInfo?: () => Promise<ICrossAccountInfo>
+  type?: IReqOpts['type']
 }
 
 export interface IBaseResult {

package/dist/ai/index.js

@@ -1,58 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAI = void 0;
-const ai_1 = require("@cloudbase/ai");
-const request_adapter_1 = require("./request-adapter");
-const tcbopenapiendpoint_1 = require("../utils/tcbopenapiendpoint");
-const symbol_1 = require("../const/symbol");
-const openapicommonrequester = __importStar(require("../utils/tcbopenapicommonrequester"));
-const app_1 = require("@cloudbase/app");
-/**
- * 创建 AI 实例
- * @param cloudbase CloudBase 实例
- * @returns AI 实例
- */
-function createAI(cloudbase) {
-    const config = cloudbase.config;
-    // 获取环境 ID
-    const envId = config.envName === symbol_1.SYMBOL_CURRENT_ENV ? openapicommonrequester.getEnvIdFromContext() : config.envName;
-    // 构建 AI 基础 URL
-    const baseUrl = (0, tcbopenapiendpoint_1.buildCommonOpenApiUrlWithPath)({
-        serviceUrl: config.serviceUrl,
-        envId,
-        path: '/v1',
-        region: config.region
-    });
-    // 创建请求适配器
-    const requestAdapter = new request_adapter_1.AIRequestAdapter(config, async () => {
-        const credential = await cloudbase.auth().getClientCredential();
-        return credential.access_token;
-    });
-    // 创建 AI 实例
-    const ai = new ai_1.AI(requestAdapter, baseUrl, { t: (s) => s, lang: app_1.LANGS.ZH, LANG_HEADER_KEY: 'Accept-Language' });
-    return ai;
-}
-exports.createAI = createAI;

package/dist/ai/request-adapter.js

@@ -1,259 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AIRequestAdapter = void 0;
-const openapicommonrequester = __importStar(require("../utils/tcbopenapicommonrequester"));
-const web_streams_polyfill_1 = require("web-streams-polyfill");
-const utils_1 = require("../utils/utils");
-class AIRequestAdapter {
-    constructor(config, getAccessToken) {
-        this.config = config;
-        this.getAccessToken = getAccessToken;
-    }
-    async fetch(options) {
-        var _a, _b;
-        const { url, stream = false, timeout, method = 'POST', headers, body } = options;
-        const headersObj = {};
-        if (isHeaders(headers)) {
-            headers.forEach((value, key) => {
-                headersObj[key] = value;
-            });
-        }
-        else if (Array.isArray(headers)) {
-            headers.forEach(([k, v]) => (headersObj[k] = v));
-        }
-        else {
-            Object.assign(headersObj, headers);
-        }
-        let parsedBody;
-        if (typeof body === 'string') {
-            try {
-                parsedBody = JSON.parse(body);
-            }
-            catch (_c) {
-                parsedBody = body;
-            }
-        }
-        else {
-            parsedBody = body;
-        }
-        const token = await this.getAccessToken();
-        const result = await openapicommonrequester.request({
-            config: this.config,
-            data: parsedBody,
-            method: (method === null || method === void 0 ? void 0 : method.toUpperCase()) || 'POST',
-            url,
-            headers: Object.assign({ 'Content-Type': 'application/json' }, headersObj),
-            token,
-            opts: {
-                timeout: timeout || this.config.timeout,
-                stream
-            }
-        });
-        const { body: bodyData, headers: responseHeaders, statusCode } = result;
-        if (statusCode < 200 || statusCode >= 300) {
-            let errorMessage = `Request failed with status code ${statusCode}`;
-            let errorCode = `${statusCode}`;
-            let requestId = '';
-            let errorBody = null;
-            if (typeof bodyData === 'string') {
-                errorBody = bodyData;
-            }
-            else if (Buffer.isBuffer(bodyData)) {
-                errorBody = bodyData.toString('utf-8');
-            }
-            else if (bodyData && typeof bodyData === 'object' && typeof bodyData.on === 'function') {
-                errorBody = await readStreamToString(bodyData);
-            }
-            if (errorBody) {
-                try {
-                    const errorData = JSON.parse(errorBody);
-                    if ((_a = errorData.error) === null || _a === void 0 ? void 0 : _a.message) {
-                        errorMessage = errorData.error.message;
-                    }
-                    else if (errorData.message) {
-                        errorMessage = errorData.message;
-                    }
-                    if ((_b = errorData.error) === null || _b === void 0 ? void 0 : _b.code) {
-                        errorCode = errorData.error.code;
-                    }
-                    else if (errorData.code) {
-                        errorCode = errorData.code;
-                    }
-                    if (errorData.requestId) {
-                        requestId = errorData.requestId;
-                    }
-                }
-                catch (_d) {
-                    errorMessage = errorBody || errorMessage;
-                }
-            }
-            // 从响应头中获取 requestId
-            if (!requestId && responseHeaders) {
-                const headerRequestId = responseHeaders['x-cloudbase-request-id'] || responseHeaders['x-request-id'] || '';
-                requestId = Array.isArray(headerRequestId) ? headerRequestId[0] : headerRequestId;
-            }
-            throw (0, utils_1.E)({
-                code: errorCode,
-                message: errorMessage,
-                requestId
-            });
-        }
-        if (stream) {
-            // 对于流式响应,将 Node.js 原生流转换为 Web ReadableStream
-            let readableStream;
-            if (bodyData && typeof bodyData === 'object' && 'on' in bodyData && typeof bodyData.on === 'function') {
-                const nodeStream = bodyData;
-                // Node 12 兼容: 使用标志位追踪 stream 状态,避免重复 close 导致异常
-                let streamClosed = false;
-                readableStream = new web_streams_polyfill_1.ReadableStream({
-                    start(controller) {
-                        nodeStream.on('data', (chunk) => {
-                            if (streamClosed)
-                                return;
-                            controller.enqueue(new Uint8Array(chunk));
-                        });
-                        nodeStream.on('end', () => {
-                            if (streamClosed)
-                                return;
-                            streamClosed = true;
-                            controller.close();
-                        });
-                        nodeStream.on('error', (err) => {
-                            if (streamClosed)
-                                return;
-                            streamClosed = true;
-                            controller.error(err);
-                        });
-                    },
-                    cancel() {
-                        streamClosed = true;
-                        nodeStream.destroy();
-                    }
-                });
-            }
-            else if (bodyData instanceof Buffer) {
-                readableStream = new web_streams_polyfill_1.ReadableStream({
-                    start(controller) {
-                        controller.enqueue(new Uint8Array(bodyData));
-                        controller.close();
-                    }
-                });
-            }
-            else if (typeof bodyData === 'string') {
-                const encoder = new TextEncoder();
-                readableStream = new web_streams_polyfill_1.ReadableStream({
-                    start(controller) {
-                        controller.enqueue(encoder.encode(bodyData));
-                        controller.close();
-                    }
-                });
-            }
-            else {
-                readableStream = new web_streams_polyfill_1.ReadableStream({
-                    start(controller) {
-                        controller.close();
-                    }
-                });
-            }
-            return {
-                data: readableStream,
-                statusCode,
-                header: responseHeaders
-            };
-        }
-        let responseData;
-        if (typeof bodyData === 'string') {
-            try {
-                responseData = JSON.parse(bodyData);
-            }
-            catch (_e) {
-                responseData = bodyData;
-            }
-        }
-        else if (bodyData instanceof Buffer) {
-            const bodyString = bodyData.toString('utf-8');
-            try {
-                responseData = JSON.parse(bodyString);
-            }
-            catch (_f) {
-                responseData = bodyString;
-            }
-        }
-        else {
-            responseData = bodyData;
-        }
-        return {
-            data: Promise.resolve(responseData),
-            statusCode,
-            header: responseHeaders
-        };
-    }
-    /**
-     * post 方法 - AI 模块可能不使用,但需要实现接口
-     */
-    async post() {
-        throw new Error('post method is not supported in AI module');
-    }
-    /**
-     * upload 方法 - AI 模块可能不使用,但需要实现接口
-     */
-    async upload() {
-        throw new Error('upload method is not supported in AI module');
-    }
-    /**
-     * download 方法 - AI 模块可能不使用,但需要实现接口
-     */
-    async download() {
-        throw new Error('download method is not supported in AI module');
-    }
-}
-exports.AIRequestAdapter = AIRequestAdapter;
-function isHeaders(h) {
-    try {
-        // Node.js 低版本可能没有 Headers
-        return h instanceof Headers;
-    }
-    catch (_) {
-        return false;
-    }
-}
-/**
- * 从 Node.js 流中读取完整内容为字符串
- */
-async function readStreamToString(stream) {
-    return await new Promise((resolve, reject) => {
-        const chunks = [];
-        stream.on('data', (chunk) => {
-            chunks.push(chunk);
-        });
-        stream.on('end', () => {
-            resolve(Buffer.concat(chunks).toString('utf-8'));
-        });
-        stream.on('error', (err) => {
-            reject(err);
-        });
-    });
-}