@cloudbase/cli 2.6.13 → 2.6.14

package/bin/tcb.js

@@ -1,10 +1,7 @@
 #!/usr/bin/env node
-const os = require('os')
 const yargsParser = require('yargs-parser')
 const chalk = require('chalk')
-const address = require('address')
 const { program } = require('commander')
-const Sentry = require('@sentry/node')
 const logSymbols = require('log-symbols')
 const didYouMean = require('didyoumean')
 const updateNotifier = require('update-notifier')
@@ -17,11 +14,11 @@ const execa = require('execa')
 const semver = require('semver')
 
 const pkg = require('../package.json')
-const store = require('../lib/utils/store')
 const { ALL_COMMANDS } = require('../lib/constant')
 const { getProxy } = require('../lib/utils/net')
 const { getCloudBaseConfig, getPrivateSettings } = require('../lib/utils/config')
 const { registerCommands } = require('../lib')
+const { beaconAction } = require('../lib/utils/report')
 
 const regionSupported = ['ap-shanghai', 'ap-beijing', 'ap-guangzhou']
 const regionSupportedMap = {
@@ -53,18 +50,6 @@ async function main() {
         process.exit(1)
     }
 
-    // Sentry 错误上报
-    Sentry.init({
-        release: pkg.version,
-        dsn: 'https://fff0077d06624655ad70d1ee25df419e@report.url.cn/sentry/1782',
-        httpsProxy: getProxy() || '',
-        serverName: os.hostname(),
-        integrations: [
-            new Sentry.Integrations.OnUnhandledRejection({
-                mode: 'none'
-            })
-        ]
-    })
 
     // 输出版本信息
     console.log(chalk.gray(`CloudBase CLI ${pkg.version}`))
@@ -84,19 +69,6 @@ async function main() {
     // 注册命令
     await registerCommands()
 
-    // 设置 Sentry 上报的用户 uin
-    Sentry.configureScope((scope) => {
-        try {
-            const credential = store.authStore.get('credential') || {}
-            scope.setUser({
-                uin: credential.uin || '',
-                ip: address.ip() || ''
-            })
-        } catch (e) {
-            Sentry.captureException(e)
-        }
-    })
-
     // 设置 options 选项
     program.storeOptionsAsProperties(false)
     program.option('--verbose', '打印出内部运行信息')
@@ -173,6 +145,13 @@ async function main() {
      * 处理异常
      */
     async function errorHandler(err) {
+        beaconAction.report('tcb_cli_error', {
+            name: err.name,
+            message: err.message,
+            stack: err.stack,
+            requestId: err.requestId,
+            canIgnore: 'false'
+        })
         process.emit('tcbError')
         const stackIngoreErrors = ['TencentCloudSDKHttpException', 'CloudBaseError']
         // 忽略自定义错误的错误栈

package/lib/commands/common.js

@@ -1,27 +1,4 @@
 "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;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = exports.registerCommands = exports.ICommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const Sentry = __importStar(require("@sentry/node"));
 const events_1 = require("events");
 const commander_1 = require("commander");
 const yargs_parser_1 = __importDefault(require("yargs-parser"));
@@ -45,6 +21,7 @@ const error_1 = require("../error");
 const toolbox_1 = require("@cloudbase/toolbox");
 const utils_1 = require("../utils");
 const auth_1 = require("../auth");
+const report_1 = require("../utils/report");
 const registrableCommands = [];
 const cmdMap = new Map();
 const defaultCmdDecoratorOpts = {
@@ -136,7 +113,7 @@ class Command extends events_1.EventEmitter {
         }
     }
     createProgram(instance, deprecate, newCmd) {
-        const { cmd, desc, options, requiredEnvId = true, withoutAuth = false, autoRunLogin = false } = this.options;
+        const { cmd, childCmd, desc, options, requiredEnvId = true, withoutAuth = false, autoRunLogin = false } = this.options;
         instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
             const { hideHelp } = option;
@@ -165,10 +142,11 @@ class Command extends events_1.EventEmitter {
             if (!withoutAuth && !loginState) {
                 if (autoRunLogin) {
                     console.log(chalk_1.default.bold.yellowBright('无有效身份信息，将自动为您打开授权页面。'));
-                    yield (0, toolbox_1.execWithLoading)(() => (0, auth_1.login)(), {
+                    const execResult = yield (0, toolbox_1.execWithLoading)(() => (0, auth_1.login)(), {
                         startTip: '请在浏览器中打开的授权页面进行授权...',
                         successTip: '授权登录成功！'
                     });
+                    loginState = execResult.credential;
                 }
                 else {
                     throw new error_1.CloudBaseError('无有效身份信息，请使用 cloudbase login 登录');
@@ -177,6 +155,15 @@ class Command extends events_1.EventEmitter {
             if (!envId && requiredEnvId) {
                 throw new error_1.CloudBaseError('未识别到有效的环境 Id，请使用 cloudbaserc 配置文件进行操作或通过 -e 参数指定环境 Id');
             }
+            report_1.beaconAction.addAdditionalParams({
+                login_uin: loginState === null || loginState === void 0 ? void 0 : loginState['uin'],
+                envId: envId || (loginState === null || loginState === void 0 ? void 0 : loginState['envId'])
+            });
+            report_1.beaconAction.report('tcb_cli_exec_command', {
+                cmd,
+                childCmd,
+                desc
+            });
             const ctx = {
                 cmd,
                 envId,
@@ -210,7 +197,6 @@ class Command extends events_1.EventEmitter {
             }
             catch (e) {
                 loading.stop();
-                Sentry.captureException(e);
             }
         });
     }
@@ -224,7 +210,6 @@ class Command extends events_1.EventEmitter {
                 yield (0, utils_1.collectUsage)(cmd);
             }
             catch (e) {
-                Sentry.captureException(e);
             }
         });
     }

package/lib/utils/report.js

@@ -0,0 +1,72 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.beaconAction = void 0;
+const os_1 = __importDefault(require("os"));
+const crypto_1 = __importDefault(require("crypto"));
+const net_1 = require("./net");
+class BeaconAction {
+    constructor() {
+        this.additionalParams = {};
+        this.deviceId = this.getDeviceId();
+        this.userAgent = this.getUserAgent();
+    }
+    getUserAgent() {
+        const osType = os_1.default.type();
+        const osRelease = os_1.default.release();
+        const nodeVersion = process.version;
+        const arch = os_1.default.arch();
+        const cliVersion = require('../../package.json').version || 'unknown';
+        return `Node/${nodeVersion} (${osType} ${osRelease}; ${arch}) CLI/${cliVersion}`;
+    }
+    getDeviceId() {
+        const deviceInfo = [
+            os_1.default.hostname(),
+            os_1.default
+                .cpus()
+                .map((cpu) => cpu.model)
+                .join(','),
+            Object.values(os_1.default.networkInterfaces())
+                .reduce((acc, val) => acc.concat(val), [])
+                .filter((nic) => nic && !nic.internal && nic.mac)
+                .map((nic) => nic.mac)
+                .join(',')
+        ].join('|');
+        return crypto_1.default.createHash('sha256').update(deviceInfo).digest('hex').substring(0, 32);
+    }
+    report(eventCode, eventData = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now();
+            return (0, net_1.postFetch)('https://otheve.beacon.qq.com/analytics/v2_upload', {
+                appVersion: '',
+                sdkId: 'js',
+                sdkVersion: '4.5.14-web',
+                mainAppKey: '0WEB0AD0GM4PUUU1',
+                platformId: 3,
+                common: Object.assign({ A2: this.deviceId, A101: this.userAgent, from: 'tcb-cli', xDeployEnv: process.env.NODE_ENV }, this.additionalParams),
+                events: [
+                    {
+                        eventCode,
+                        eventTime: String(now),
+                        mapValue: Object.assign({}, eventData)
+                    }
+                ]
+            });
+        });
+    }
+    addAdditionalParams(params) {
+        this.additionalParams = Object.assign(Object.assign({}, this.additionalParams), params);
+    }
+}
+exports.beaconAction = new BeaconAction();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.13",
+    "version": "2.6.14",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -34,11 +34,10 @@
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
         "@cloudbase/functions-framework": "^1.5.0",
-        "@cloudbase/iac-core": "^0.0.3-alpha.8",
+        "@cloudbase/iac-core": "^0.0.3-alpha.9",
         "@cloudbase/lowcode-cli": "^0.22.2",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
-        "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
         "camelcase-keys": "^7.0.2",
         "chalk": "^2.4.2",

package/types/utils/report.d.ts

@@ -0,0 +1,16 @@
+declare class BeaconAction {
+    private deviceId;
+    private userAgent;
+    private additionalParams;
+    constructor();
+    private getUserAgent;
+    private getDeviceId;
+    report(eventCode: string, eventData?: {
+        [key: string]: any;
+    }): Promise<any>;
+    addAdditionalParams(params: {
+        [key: string]: any;
+    }): void;
+}
+export declare const beaconAction: BeaconAction;
+export {};