@cloudbase/cli 2.7.6 → 2.7.7

package/lib/commands/cloudrun/base.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);
 };
@@ -32,6 +55,7 @@ const toolbox_1 = require("@cloudbase/toolbox");
 const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const chalk_1 = __importDefault(require("chalk"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
+const execa_1 = __importDefault(require("execa"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const nodemon_1 = __importDefault(require("nodemon"));
@@ -786,12 +810,14 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                     },
                     env: {
                         FROM_NODEMON: 'true'
-                    }
+                    },
+                    ext: 'js,mjs,cjs,json,ts,yaml,yml'
                 })
                     .on('start', () => __awaiter(this, void 0, void 0, function* () {
                     logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
                     if (!nodemonInstance._firstStartDone) {
                         nodemonInstance._firstStartDone = true;
+                        this.checkAndRunTsc();
                         this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
                     }
                 }))
@@ -816,14 +842,35 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
             }
             else {
                 (0, functions_framework_1.runCLI)();
-                if (!process.env.FROM_NODEMON && openDebugPanel) {
-                    this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
+                if (!process.env.FROM_NODEMON) {
+                    this.checkAndRunTsc();
+                    if (openDebugPanel) {
+                        this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
+                    }
                 }
             }
         });
     }
+    checkAndRunTsc() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const tsConfigPath = path_1.default.join(process.cwd(), 'tsconfig.json');
+            if (yield fs_extra_1.default.exists(tsConfigPath)) {
+                const child = (0, execa_1.default)('npx', ['tsc', '-w'], {
+                    cwd: process.cwd(),
+                    stdio: 'pipe'
+                });
+                (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                    console.log(data.toString());
+                });
+                child.on('exit', (code) => {
+                    console.log(`子进程退出，退出码 ${code}`);
+                });
+            }
+        });
+    }
     openDebugApp(type, port, envId, agentId, isOpen = true) {
-        setTimeout(() => {
+        return __awaiter(this, void 0, void 0, function* () {
             let url = `http://127.0.0.1:${port}/cloudrun-run-ui/index.html?type=${type}&envId=${envId}&port=${port}`;
             if (type === 'agent') {
                 url += `&agentId=${agentId}`;
@@ -832,8 +879,32 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
             else {
                 console.log(chalk_1.default.green(`点击 [${url}] 可以打开函数调试面板`));
             }
-            isOpen && (0, open_1.default)(url, { wait: false });
-        }, 3000);
+            if (isOpen) {
+                yield this.waitForPort(url);
+                (0, open_1.default)(url, { wait: false });
+            }
+        });
+    }
+    waitForPort(url, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const startTime = Date.now();
+            const { default: fetch } = yield Promise.resolve().then(() => __importStar(require('node-fetch')));
+            while (Date.now() - startTime < timeout) {
+                try {
+                    const response = yield fetch(url, {
+                        timeout: 1000,
+                        method: 'HEAD'
+                    });
+                    if (response.ok) {
+                        return;
+                    }
+                }
+                catch (e) {
+                }
+                yield new Promise((resolve) => setTimeout(resolve, 500));
+            }
+            throw new Error(`等待服务${url}就绪超时`);
+        });
     }
 };
 __decorate([

package/package.json

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

package/types/commands/cloudrun/base.d.ts

@@ -151,5 +151,7 @@ export declare class CloudRunRunCommand extends Command {
         desc: string;
     };
     execute(envId: string, logger: Logger, ctx: any, options: any): Promise<void>;
+    private checkAndRunTsc;
     private openDebugApp;
+    private waitForPort;
 }