@cloudbase/cli 2.0.12 → 2.0.13

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/lib/run/service/deployPackage.js

@@ -38,13 +38,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageDeploy = void 0;
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
-const utils_1 = require("../../utils");
 const __1 = require("..");
 const toolbox_1 = require("@cloudbase/toolbox");
 function packageDeploy(options) {
     return __awaiter(this, void 0, void 0, function* () {
         let { envId, serviceName, filePath, fileToIgnore } = options;
-        let { PackageName, PackageVersion, UploadUrl } = yield (0, __1.createBuild)({
+        let { PackageName, PackageVersion, UploadUrl, UploadHeaders } = yield (0, __1.createBuild)({
             envId,
             serviceName
         });
@@ -68,13 +67,7 @@ function packageDeploy(options) {
         }
         try {
             return yield (0, toolbox_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-                yield (0, utils_1.fetch)(UploadUrl, {
-                    method: 'PUT',
-                    body: fs.createReadStream(zipFile),
-                    headers: {
-                        'content-type': 'application/zip'
-                    }
-                });
+                yield (0, __1.uploadZip)(zipFile, UploadUrl, UploadHeaders[0]);
                 return { PackageName, PackageVersion };
             }), {
                 startTip: '\n正在上传代码包...',

package/lib/utils/debug-logger.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debugLogger = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const fs_1 = __importDefault(require("fs"));
+function debugLogger(req, resp, startTime, endTime, writeToLocal = true) {
+    if (process.env.NODE_ENV !== 'DEBUG') {
+        return;
+    }
+    const cost = endTime.valueOf() - startTime.valueOf();
+    const startTimeFormatted = startTime.toISOString();
+    const endTimeFormatted = endTime.toISOString();
+    console.log(chalk_1.default.underline('\n[DEBUG]', startTimeFormatted));
+    console.log(chalk_1.default.cyan(JSON.stringify(req)), '\n');
+    console.log(chalk_1.default.underline('[DEBUG]', endTimeFormatted));
+    console.log(chalk_1.default.magenta(JSON.stringify(resp)), '\n');
+    if (writeToLocal) {
+        const filePath = `${process.cwd()}/cloudbase-cli.debug.log`;
+        const logContent = `\n{start:${startTimeFormatted}, req: ${JSON.stringify(req)}, end:${endTimeFormatted}, resp: ${JSON.stringify(resp)}, cost: ${cost}}`;
+        fs_1.default.appendFile(filePath, logContent, (err) => {
+            if (err) {
+                console.error(chalk_1.default.red(`\n写入日志失败：${JSON.stringify(err)}`));
+            }
+        });
+    }
+}
+exports.debugLogger = debugLogger;

package/lib/utils/net/cloud-api-request.js

@@ -14,6 +14,7 @@ const toolbox_1 = require("@cloudbase/toolbox");
 const cloud_api_1 = require("@cloudbase/cloud-api");
 const error_1 = require("../../error");
 const constant_1 = require("../../constant");
+const debug_logger_1 = require("../debug-logger");
 let commonCredential;
 const isTokenExpired = (credential, gap = 120) => credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000;
 class CloudApiService {
@@ -49,7 +50,12 @@ class CloudApiService {
     request(action, data = {}, method = 'POST') {
         return __awaiter(this, void 0, void 0, function* () {
             const region = this.region || (yield (0, toolbox_1.getRegion)());
-            return this.apiService.request({ action, data, method, region });
+            const reqOptions = { action, data, method, region };
+            const startTime = new Date();
+            const res = yield this.apiService.request(reqOptions);
+            const endTime = new Date();
+            (0, debug_logger_1.debugLogger)(reqOptions, res, startTime, endTime);
+            return res;
         });
     }
 }

package/lib/utils/net/http-request.js

@@ -18,6 +18,7 @@ const https_proxy_agent_1 = require("https-proxy-agent");
 const constant_1 = require("../../constant");
 const error_1 = require("../../error");
 const proxy_1 = require("./proxy");
+const debug_logger_1 = require("../debug-logger");
 function handleTimeout(e) {
     if (e.type === 'request-timeout') {
         throw new error_1.CloudBaseError('请求超时，请检查你的网络，如果终端无法直接访问公网，请设置终端 HTTP 请求代理！');
@@ -26,6 +27,16 @@ function handleTimeout(e) {
         throw e;
     }
 }
+function fetchWithDebugLogger(useTextTransform, ...args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const startTime = new Date();
+        const rawRes = yield (0, node_fetch_1.default)(...args);
+        const res = useTextTransform ? yield rawRes.text() : rawRes;
+        const endTime = new Date();
+        (0, debug_logger_1.debugLogger)(args, res, startTime, endTime);
+        return res;
+    });
+}
 function fetch(url, config = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const proxy = (0, proxy_1.getProxy)();
@@ -36,8 +47,8 @@ function fetch(url, config = {}) {
         let json;
         let text;
         try {
-            const res = yield (0, node_fetch_1.default)(url, config);
-            text = yield res.text();
+            const res = yield fetchWithDebugLogger(true, url, config);
+            text = res;
             json = JSON.parse(text);
         }
         catch (e) {
@@ -65,8 +76,8 @@ function postFetch(url, data) {
         let json;
         let text;
         try {
-            const res = yield (0, node_fetch_1.default)(url, config);
-            text = yield res.text();
+            const res = yield fetchWithDebugLogger(true, url, config);
+            text = res;
             json = JSON.parse(text);
         }
         catch (e) {
@@ -85,7 +96,7 @@ function fetchStream(url, config = {}) {
         }
         config.timeout = constant_1.REQUEST_TIMEOUT;
         try {
-            const res = yield (0, node_fetch_1.default)(url, config);
+            const res = yield fetchWithDebugLogger(false, url, config);
             return res;
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.0.12",
+    "version": "2.0.13",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/types/utils/debug-logger.d.ts

@@ -0,0 +1 @@
+export declare function debugLogger(req: unknown, resp: unknown, startTime: Date, endTime: Date, writeToLocal?: boolean): void;

package/types/utils/net/http-request.d.ts

@@ -1,4 +1,8 @@
-import { RequestInit } from 'node-fetch';
+import _fetch, { RequestInit } from 'node-fetch';
+declare type fetchReturnType = ReturnType<typeof _fetch>;
+declare type UnPromisify<T> = T extends PromiseLike<infer U> ? U : T;
+declare type fetchReturnTypeExtracted = UnPromisify<fetchReturnType>;
 export declare function fetch(url: string, config?: RequestInit): Promise<any>;
 export declare function postFetch(url: string, data?: Record<string, any>): Promise<any>;
-export declare function fetchStream(url: any, config?: Record<string, any>): Promise<import("node-fetch").Response>;
+export declare function fetchStream(url: any, config?: Record<string, any>): Promise<fetchReturnTypeExtracted>;
+export {};

package/src/auth/index.ts

@@ -1,2 +0,0 @@
-export * from './login'
-export * from './logout'

package/src/auth/login.ts

@@ -1,91 +0,0 @@
-import _ from 'lodash'
-import { Credential } from '@cloudbase/toolbox'
-import { authSupevisor, checkAndGetCredential, execWithLoading, checkEnvAvaliable } from '../utils'
-import { ILoginOptions } from '../types'
-import { ENV_STATUS } from '../constant'
-import { Logger } from '../decorators'
-import { getEnvInfo } from '../env'
-
-const log = new Logger()
-
-// 登录返回 code 与信息
-const LoginRes = {
-    SUCCESS: {
-        code: 'SUCCESS',
-        msg: '登录成功！'
-    },
-    INVALID_TOKEN: {
-        code: 'INVALID_TOKEN',
-        msg: '无效的身份信息！'
-    },
-    CHECK_LOGIN_FAILED: {
-        code: 'CHECK_LOGIN_FAILED',
-        msg: '检查登录态失败'
-    },
-    INVALID_PARAM(msg) {
-        return {
-            code: 'INVALID_PARAM',
-            msg: `参数无效：${msg}`
-        }
-    }
-}
-
-// 打开腾讯云-云开发控制台，通过获取临时密钥登录，临时密钥可续期，最长时间为 1 个月
-export async function loginByWebAuth() {
-    const credential = await authSupevisor.loginByWebAuth()
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return {
-        credential,
-        ...LoginRes.SUCCESS
-    }
-}
-
-// 使用密钥登录
-export async function loginWithKey(secretId?: string, secretKey?: string, token?: string) {
-    if (!secretId || !secretKey) {
-        return LoginRes.INVALID_PARAM('SecretID 或 SecretKey 不能为空')
-    }
-
-    const credential = await authSupevisor.loginByApiSecret(secretId, secretKey, token)
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return LoginRes.SUCCESS
-}
-
-export async function login(
-    options: ILoginOptions = {}
-): Promise<{ code: string; msg: string; credential?: Credential }> {
-    const { secretId, secretKey, key, token } = options
-    return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth()
-}
-
-// 检查是否登录，没有登录时，自动拉起浏览器授权
-export async function checkLogin() {
-    const credential = await checkAndGetCredential()
-    // 没有登录，拉起 Web 登录
-    if (_.isEmpty(credential)) {
-        log.info('你还没有登录，请在控制台中授权登录')
-
-        const res = await execWithLoading(() => login(), {
-            startTip: '获取授权中...',
-            successTip: '授权登录成功！'
-        })
-
-        const envId = res?.credential?.envId
-
-        // 登录返回 envId，检查环境初始化
-        if (envId) {
-            const env = await getEnvInfo(envId)
-            if (env.Status === ENV_STATUS.UNAVAILABLE) {
-                await checkEnvAvaliable(envId)
-            }
-        }
-    }
-}

package/src/auth/logout.ts

@@ -1,7 +0,0 @@
-import { authSupevisor } from '../utils'
-
-// 注销登录信息
-export async function logout() {
-    process.emit('logout')
-    await authSupevisor.logout()
-}

package/src/commands/account/index.ts

@@ -1,2 +0,0 @@
-export * from './login'
-export * from './logout'

package/src/commands/account/login.ts

@@ -1,192 +0,0 @@
-import _ from 'lodash'
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { Command, ICommand } from '../common'
-import { login } from '../../auth'
-import { listEnvs } from '../../env'
-import { CloudBaseError } from '../../error'
-import { InjectParams, ArgsOptions, Log, Logger } from '../../decorators'
-import {
-    loadingFactory,
-    usageStore,
-    collectAgree,
-    genClickableLink,
-    checkAndGetCredential
-} from '../../utils'
-
-function printSuggestion() {
-    const tips = `可使用下面命令继续操作：
-
-${chalk.gray('–')} 创建免费环境
-
-  ${chalk.cyan('$ tcb env create envName')}
-
-${chalk.gray('–')} 初始化云开发项目
-
-  ${chalk.cyan('$ tcb new')}
-
-${chalk.gray('–')} 部署云函数
-
-  ${chalk.cyan('$ tcb fn deploy')}
-
-${chalk.gray('–')} 查看命令使用介绍
-
-  ${chalk.cyan('$ tcb -h')}
-
-Tips：可以使用简写命令 tcb 代替 cloudbase`
-    console.log(tips)
-}
-
-async function askForCollectDataConfirm() {
-    const agree = await usageStore.get('agreeCollect')
-    if (agree) return
-    // 询问
-    const { confirm } = await inquirer.prompt({
-        type: 'confirm',
-        name: 'confirm',
-        message: '是否同意 Cloudbase CLI 收集您的使用数据以改进产品？',
-        default: true
-    })
-
-    if (confirm) {
-        await usageStore.set('agreeCollect', true)
-    }
-
-    await collectAgree(confirm)
-}
-
-@ICommand()
-export class LoginCommand extends Command {
-    get options() {
-        return {
-            cmd: 'login',
-            options: [
-                {
-                    flags: '-k, --key',
-                    desc: '使用永久密钥登录'
-                },
-                {
-                    flags: '--apiKeyId <apiKeyId>',
-                    desc: '腾讯云 API 秘钥 Id'
-                },
-                {
-                    flags: '--apiKey <apiKey>',
-                    desc: '腾讯云 API 秘钥 Key'
-                },
-                {
-                    flags: '--token [token]',
-                    desc: '腾讯云 API 临时秘钥 Token'
-                }
-            ],
-            desc: '登录腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsOptions() options, @Log() log: Logger) {
-        log.verbose(options)
-        const { apiKeyId, apiKey, token } = options
-        const loading = loadingFactory()
-        loading.start('检验登录状态')
-
-        const credential = await checkAndGetCredential()
-
-        if (!_.isEmpty(credential)) {
-            loading.succeed('您已登录，无需再次登录！')
-            return
-        } else {
-            loading.stop()
-        }
-
-        // 通过参数传入 API Key，适用于 CI 场景
-        if (apiKey && apiKeyId) {
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                token,
-                key: true,
-                secretKey: apiKey,
-                secretId: apiKeyId
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else if (options.key) {
-            // 兼容临时密钥和永久密钥登录
-            const clickableLink = genClickableLink('https://console.cloud.tencent.com/cam/capi')
-            console.log(`您可以访问 ${clickableLink} 获取 API 秘钥`)
-
-            // 使用永久密钥登录
-            const { secretId } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretId',
-                message: '请输入腾讯云 SecretID：'
-            })
-
-            const { secretKey } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretKey',
-                message: '请输入腾讯云 SecretKey：'
-            })
-
-            if (!secretId || !secretKey) {
-                throw new CloudBaseError('SecretID 或 SecretKey 不能为空')
-            }
-
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                key: true,
-                secretId,
-                secretKey
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else {
-            // 使用临时密钥登录-支持自动续期
-            loading.start('获取授权中...')
-            const res = await login()
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail(res.msg)
-                console.log('Web 授权登录失败，秘钥校验失败！')
-                return process.exit(1)
-            }
-        }
-
-        // 检测用户是否存在，不存在则初始化
-        try {
-            const envs = await listEnvs()
-            if (!envs.length) {
-                log.warn('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境')
-            }
-        } catch (e) {
-            // 用户不存在
-            // 主账户可以直接使用 env:create 完成初始化工作
-            if (e.code === 'ResourceNotFound.UserNotExists') {
-                log.error('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境！')
-            } else {
-                console.error(e)
-                throw e
-            }
-        }
-    }
-}

package/src/commands/account/logout.ts

@@ -1,24 +0,0 @@
-import { ICommand, Command } from '../common'
-
-import { logout } from '../../auth'
-import { InjectParams, Log, Logger } from '../../decorators'
-
-@ICommand()
-export class LogoutCommand extends Command {
-    get options() {
-        return {
-            cmd: 'logout',
-            options: [],
-            desc: '登出腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@Log() log: Logger) {
-        await logout()
-
-        log.success('注销登录成功！')
-    }
-}