@cloudbase/cli 2.1.2 → 2.1.4-beta.1

package/.vscode/settings.json

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

package/lib/commands/hosting/hosting.js

@@ -70,8 +70,8 @@ let HostingDetail = class HostingDetail extends common_1.Command {
             const res = yield (0, hosting_1.getHostingInfo)({ envId });
             const website = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a[0];
             if (!website) {
-                const link = (0, utils_1.genClickableLink)('https://console.cloud.tencent.com/tcb');
-                throw new error_1.CloudBaseError(`您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 ${link}`);
+                yield (0, hosting_1.initHosting)({ envId });
+                return;
             }
             const link = (0, utils_1.genClickableLink)(`https://${website.cdnDomain}`);
             if (website.status !== 'offline') {

package/lib/commands/lowcode/app.js

@@ -1,10 +1,33 @@
 "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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+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 __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -23,7 +46,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LowCodeWatch = void 0;
 const common_1 = require("../common");
-const lowcode_cli_1 = require("@cloudbase/lowcode-cli");
 const decorators_1 = require("../../decorators");
 let LowCodeWatch = class LowCodeWatch extends common_1.Command {
     get options() {
@@ -46,10 +68,12 @@ let LowCodeWatch = class LowCodeWatch extends common_1.Command {
     }
     execute(ctx, options) {
         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
-            });
+            Promise.resolve().then(() => __importStar(require('@cloudbase/lowcode-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
+                yield res.watchApp({
+                    watchPort: 8288,
+                    wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath,
+                });
+            }));
         });
     }
 };

package/lib/commands/lowcode/comps.js

@@ -49,10 +49,14 @@ const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 const error_1 = require("../../error");
-const lowcode_cli_1 = require("@cloudbase/lowcode-cli");
 const enquirer_1 = require("enquirer");
 const semver = __importStar(require("semver"));
+const utils_2 = require("./utils");
 const cloudService = utils_1.CloudApiService.getInstance('lowcode');
+let lowcodeCli;
+if (process.argv.includes('lowcode')) {
+    (0, utils_2.getLowcodeCli)().then(_ => lowcodeCli = _);
+}
 let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
     get options() {
         return {
@@ -94,7 +98,7 @@ let LowCodeCreateComps = class LowCodeCreateComps extends common_1.Command {
                     throw new error_1.CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`);
                 }
             }
-            yield (0, lowcode_cli_1.bootstrap)(compsName, log);
+            yield lowcodeCli.bootstrap(compsName, log);
         });
     }
 };
@@ -129,7 +133,7 @@ let LowCodeBuildComps = class LowCodeBuildComps extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield (0, lowcode_cli_1.graceBuildComps)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log }));
+                yield lowcodeCli.graceBuildComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -175,7 +179,7 @@ let LowCodeDebugComps = class LowCodeDebugComps extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield (0, lowcode_cli_1.graceDebugComps)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (options === null || options === void 0 ? void 0 : options.debugPort) || 8388, logger: log, wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath }));
+                yield lowcodeCli.graceDebugComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (options === null || options === void 0 ? void 0 : options.debugPort) || 8388, logger: log, wxDevtoolPath: options === null || options === void 0 ? void 0 : options.wxDevtoolPath }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -219,7 +223,7 @@ let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield (0, lowcode_cli_1.gracePublishComps)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: Boolean(options.admin) }));
+                yield lowcodeCli.gracePublishComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: Boolean(options.admin) }));
                 log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
                 return;
             }
@@ -287,7 +291,7 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
             if (!config) {
                 log.error('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令');
             }
-            const res = yield (0, lowcode_cli_1.publishVersion)(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin }), comment, tag);
+            const res = yield lowcodeCli.publishVersion(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin }), comment, tag);
             if (res.data.code === 200) {
                 log.success('组件库 - 已发布新版本！');
                 return;

package/lib/commands/lowcode/utils.js

@@ -1,6 +1,38 @@
 "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) {
+        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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promisifyProcess = void 0;
+exports.getLowcodeCli = exports.promisifyProcess = void 0;
 const toolbox_1 = require("@cloudbase/toolbox");
 function promisifyProcess(p, pipe = false) {
     return new Promise((resolve, reject) => {
@@ -23,3 +55,17 @@ function promisifyProcess(p, pipe = false) {
     });
 }
 exports.promisifyProcess = promisifyProcess;
+function getLowcodeCli() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const key = '@cloudbase/lowcode-cli';
+        const cache = new Map();
+        let result;
+        if (!cache.get(key)) {
+            const module = yield Promise.resolve().then(() => __importStar(require(key)));
+            cache.set(key, module);
+        }
+        result = cache.get(key);
+        return result;
+    });
+}
+exports.getLowcodeCli = getLowcodeCli;

package/lib/constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_CPU_MEM_SET = exports.CPU_MEM_OPTS = exports.ConcurrencyTaskStatus = exports.StatusMap = exports.ALL_COMMANDS = exports.STATUS_TEXT = exports.REQUEST_TIMEOUT = exports.DefaultCloudBaseConfig = exports.DefaultFunctionDeployConfig = exports.ConfigItems = void 0;
+exports.EnvType = exports.DEFAULT_CPU_MEM_SET = exports.CPU_MEM_OPTS = exports.ConcurrencyTaskStatus = exports.StatusMap = exports.ALL_COMMANDS = exports.STATUS_TEXT = exports.REQUEST_TIMEOUT = exports.DefaultCloudBaseConfig = exports.DefaultFunctionDeployConfig = exports.ConfigItems = void 0;
 class ConfigItems {
 }
 exports.ConfigItems = ConfigItems;
@@ -132,3 +132,10 @@ exports.DEFAULT_CPU_MEM_SET = [
         PolicyThreshold: 60
     },
 ];
+var EnvType;
+(function (EnvType) {
+    EnvType["BAAS"] = "baas";
+    EnvType["RUN"] = "run";
+    EnvType["HOTING"] = "hoting";
+    EnvType["WEDA"] = "weda";
+})(EnvType = exports.EnvType || (exports.EnvType = {}));

package/lib/hosting.js

@@ -12,10 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkLocalDir = exports.hostingDelete = exports.hostingDeploy = exports.destroyHosting = exports.hostingList = exports.enableHosting = exports.checkHostingStatus = exports.getHostingInfo = void 0;
+exports.walkLocalDir = exports.hostingDelete = exports.hostingDeploy = exports.destroyHosting = exports.hostingList = exports.subscribeHosting = exports.getEnvInfoByEnvId = exports.enableHosting = exports.checkHostingStatus = exports.initHosting = exports.getHostingInfo = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 const error_1 = require("./error");
+const inquirer_1 = __importDefault(require("inquirer"));
+const constant_1 = require("./constant");
 const HostingStatusMap = {
     init: '初始化中',
     process: '处理中',
@@ -37,15 +39,45 @@ function getHostingInfo(options) {
     });
 }
 exports.getHostingInfo = getHostingInfo;
-function checkHostingStatus(envId) {
+function initHosting(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const hostings = yield getHostingInfo({ envId });
-        const link = (0, utils_1.genClickableLink)('https://console.cloud.tencent.com/tcb');
-        if (!hostings.data || !hostings.data.length) {
+        const { envId } = options;
+        const envInfo = yield getEnvInfoByEnvId({ envId });
+        if (envInfo.EnvType === constant_1.EnvType.BAAS) {
+            const { confirm } = yield inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'confirm',
+                message: '您还未开通静态托管，是否立即开通？'
+            });
+            if (confirm) {
+                const res = yield subscribeHosting({ envId });
+                if (!res.code) {
+                    utils_1.logger.success('开通静态托管成功！资源正在初始化中，请稍候3~5分钟再试...');
+                    return;
+                }
+                else {
+                    throw new error_1.CloudBaseError(`开通静态托管失败\n request id: ${res.requestId}`);
+                }
+            }
+            else
+                return;
+        }
+        else {
+            const link = (0, utils_1.genClickableLink)('https://console.cloud.tencent.com/tcb');
             throw new error_1.CloudBaseError(`您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n👉 ${link}`, {
                 code: 'INVALID_OPERATION'
             });
         }
+    });
+}
+exports.initHosting = initHosting;
+function checkHostingStatus(envId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const hostings = yield getHostingInfo({ envId });
+        if (!hostings.data || !hostings.data.length) {
+            yield initHosting({ envId });
+            return;
+        }
         const website = hostings.data[0];
         if (website.status !== 'online') {
             throw new error_1.CloudBaseError(`静态网站服务【${HostingStatusMap[website.status]}】，无法进行此操作！`, {
@@ -78,6 +110,31 @@ function enableHosting(options) {
     });
 }
 exports.enableHosting = enableHosting;
+function getEnvInfoByEnvId(options) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const { envId } = options;
+        const res = yield tcbService.request('DescribeEnvs', {
+            EnvId: envId
+        });
+        return (_a = res === null || res === void 0 ? void 0 : res.EnvList) === null || _a === void 0 ? void 0 : _a.filter(item => item.EnvId === envId)[0];
+    });
+}
+exports.getEnvInfoByEnvId = getEnvInfoByEnvId;
+function subscribeHosting(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { envId } = options;
+        const res = yield tcbService.request('DescribeStaticStore', {
+            EnvId: envId
+        });
+        const code = res.Result === 'succ' ? 0 : -1;
+        return {
+            code,
+            requestId: res.RequestId
+        };
+    });
+}
+exports.subscribeHosting = subscribeHosting;
 function hostingList(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.1.2",
+    "version": "2.1.4-beta.1",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -31,7 +31,7 @@
     "license": "ISC",
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.6.1",
+        "@cloudbase/framework-core": "^1.9.6",
         "@cloudbase/lowcode-cli": "^0.16.0",
         "@cloudbase/manager-node": "4.0.1",
         "@cloudbase/toolbox": "^0.7.3",

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

@@ -1,3 +1,4 @@
 /// <reference types="node" />
 import { ChildProcess } from 'child_process';
 export declare function promisifyProcess(p: ChildProcess, pipe?: boolean): Promise<unknown>;
+export declare function getLowcodeCli(): Promise<typeof import('@cloudbase/lowcode-cli')>;

package/types/constant.d.ts

@@ -63,3 +63,9 @@ export declare const DEFAULT_CPU_MEM_SET: {
     PolicyType: 'mem' | 'cpu';
     PolicyThreshold: number;
 }[];
+export declare enum EnvType {
+    BAAS = "baas",
+    RUN = "run",
+    HOTING = "hoting",
+    WEDA = "weda"
+}

package/types/hosting.d.ts

@@ -13,11 +13,17 @@ interface IHostingCloudOptions extends IBaseOptions {
     isDir: boolean;
 }
 export declare function getHostingInfo(options: IBaseOptions): Promise<any>;
+export declare function initHosting(options: IBaseOptions): Promise<void>;
 export declare function checkHostingStatus(envId: string): Promise<any>;
 export declare function enableHosting(options: IBaseOptions): Promise<{
     code: number;
     requestId: any;
 }>;
+export declare function getEnvInfoByEnvId(options: IBaseOptions): Promise<any>;
+export declare function subscribeHosting(options: IBaseOptions): Promise<{
+    code: number;
+    requestId: any;
+}>;
 export declare function hostingList(options: IBaseOptions): Promise<import("@cloudbase/manager-node/types/interfaces").IListFileInfo[]>;
 export declare function destroyHosting(options: IBaseOptions): Promise<{
     code: number;