@cloudbase/cli 2.0.12-alpha.1 → 2.0.13

package/.vscode/launch.json

@@ -4,16 +4,6 @@
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Launch Program",
-            "program": "${workspaceFolder}/bin/tcb.js",
-            "request": "launch",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "args": ["lowcode", "watch"],
-            "type": "node"
-        },
         {
             "type": "node",
             "request": "launch",

package/.vscode/settings.json

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

package/lib/commands/lowcode/app.js

@@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DanielWatch = exports.LowCodeWatch = void 0;
+exports.LowCodeWatch = void 0;
 const common_1 = require("../common");
 const lowcode_cli_1 = require("@cloudbase/lowcode-cli");
 const decorators_1 = require("../../decorators");
@@ -48,7 +48,7 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             yield (0, lowcode_cli_1.watchApp)({
                 watchPort: 8288,
-                wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath
+                wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
             });
         });
     }
@@ -65,31 +65,3 @@ LowCodeWatch = __decorate([
     (0, common_1.ICommand)()
 ], LowCodeWatch);
 exports.LowCodeWatch = LowCodeWatch;
-let DanielWatch = class DanielWatch extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch-ws',
-            options: [],
-            desc: '开启云开发低码的本地开发模式',
-            requiredEnvId: false
-        };
-    }
-    execute(ctx, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log('>>> 启动啦');
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.CmdContext)()),
-    __param(1, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], DanielWatch.prototype, "execute", null);
-DanielWatch = __decorate([
-    (0, common_1.ICommand)()
-], DanielWatch);
-exports.DanielWatch = DanielWatch;

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/checkTcbrEnv.js

@@ -15,8 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logEnvCheck = exports.checkTcbrEnv = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const error_1 = require("../error");
-const net_1 = require("./net");
-const tcbService = net_1.CloudApiService.getInstance('tcb');
+const tcbrApi_1 = require("./tcbrApi");
 const oldCmdSet = `
 服务列表：tcb run:deprecated list --envId <envId>
 创建服务：tcb run:deprecated create --envId <envId> --name <name>
@@ -45,11 +44,13 @@ function checkTcbrEnv(envId, isTcbr) {
         if (envId === undefined) {
             throw new error_1.CloudBaseError('请使用 -e 或 --envId 指定环境 ID');
         }
-        const { EnvList: [envInfo] } = yield tcbService.request('DescribeEnvs', {
+        const { data: res } = yield (0, tcbrApi_1.callTcbrApi)('DescribeCloudRunEnvs', {
             EnvId: envId
         });
+        const { EnvList } = res;
+        const envInfo = EnvList === null || EnvList === void 0 ? void 0 : EnvList.find((item) => (item === null || item === void 0 ? void 0 : item.EnvId) === envId);
         if (envInfo === undefined) {
-            throw new error_1.CloudBaseError('无法读取到有效的环境信息，请检查环境 ID 是否正确');
+            throw new error_1.CloudBaseError(`无法读取到有效的环境信息，请检查环境 ID 是否正确\nrequestId: ${res === null || res === void 0 ? void 0 : res.RequestId}`);
         }
         if ((envInfo.EnvType === 'tcbr' && isTcbr) || (envInfo.EnvType !== 'tcbr' && !isTcbr)) {
             return 0;

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-alpha.1",
+    "version": "2.0.13",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -11,7 +11,8 @@
         "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
         "tsc": "tsc",
         "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
+        "postinstall": "node ./post-install.js || exit 0",
+        "prepublishOnly": "npm run build"
     },
     "repository": {
         "type": "git",
@@ -23,7 +24,7 @@
     },
     "husky": {
         "hooks": {
-            "pre-commit": "npm run build && git add ."
+            "pre-commit": "npm run build"
         }
     },
     "author": "cwuyiqing@gmail.com",
@@ -31,7 +32,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "0.14.5-alpha.1",
+        "@cloudbase/lowcode-cli": "^0.14.3",
         "@cloudbase/manager-node": "4.0.1",
         "@cloudbase/toolbox": "^0.7.3",
         "@sentry/node": "^5.10.2",

package/types/commands/lowcode/app.d.ts

@@ -12,13 +12,3 @@ export declare class LowCodeWatch extends Command {
     };
     execute(ctx: any, options: any): Promise<void>;
 }
-export declare class DanielWatch extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        options: any[];
-        desc: string;
-        requiredEnvId: boolean;
-    };
-    execute(ctx: any, options: any): Promise<void>;
-}

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/.history/.gitignore_20220624162613

@@ -1,84 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-yarn.lock
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-dist
-
-example/**/tcb.json
-
-node_modules
-
-.idea
-.vscode/*
-!.vscode/launch.json
-
-# Test api Key
-test/api-key.js
-
-pkg/
-
-.DS_Store
-
-# Build files
-/lib
-/types

package/.history/.gitignore_20220627114054

@@ -1,86 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-yarn.lock
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-dist
-
-example/**/tcb.json
-
-node_modules
-
-.idea
-.vscode/*
-!.vscode/launch.json
-
-# Test api Key
-test/api-key.js
-
-pkg/
-
-.DS_Store
-
-# Build files
-/lib
-/types
-
-.history

package/.history/package_20220711204706.json

@@ -1,88 +0,0 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "2.0.11",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "tsc": "tsc",
-        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build && git add ."
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.14.3",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.3",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.2",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^5.0.1",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.28",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.7",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^21.0.1"
-    },
-    "devDependencies": {
-        "@types/jest": "^27",
-        "@types/koa__router": "^8.0.11",
-        "@types/lodash": "^4.14.182",
-        "@types/node": "^12.12.38",
-        "@types/node-fetch": "^2.5.4",
-        "@types/react": "^17.0.37",
-        "@types/semver": "^7.3.9",
-        "@types/webpack-dev-server": "^3.11.1",
-        "@typescript-eslint/eslint-plugin": "^4.8.1",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^27",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^27",
-        "typescript": "^4.7.2"
-    }
-}

package/.history/package_20220711204818.json

@@ -1,88 +0,0 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "2.0.11",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "tsc": "tsc",
-        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build && git add ."
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "0.14.5-alpha.0",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.3",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.2",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^5.0.1",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.28",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.7",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^21.0.1"
-    },
-    "devDependencies": {
-        "@types/jest": "^27",
-        "@types/koa__router": "^8.0.11",
-        "@types/lodash": "^4.14.182",
-        "@types/node": "^12.12.38",
-        "@types/node-fetch": "^2.5.4",
-        "@types/react": "^17.0.37",
-        "@types/semver": "^7.3.9",
-        "@types/webpack-dev-server": "^3.11.1",
-        "@typescript-eslint/eslint-plugin": "^4.8.1",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^27",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^27",
-        "typescript": "^4.7.2"
-    }
-}