@cloudbase/toolbox 0.7.16-beta.0 → 0.7.16-beta.2

package/lib/web/web.js

@@ -16,10 +16,10 @@ exports.getDataFromWeb = void 0;
 const open_1 = __importDefault(require("open"));
 const query_string_1 = __importDefault(require("query-string"));
 const http_1 = __importDefault(require("http"));
+const child_process_1 = require("child_process");
 const system_1 = require("../system");
 const error_1 = require("../error");
 const html_1 = require("../html");
-const child_process_1 = require("child_process");
 // 创建本地 Web 服务器，接受 Web 控制台传入的信息
 function createLocalServer() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -60,21 +60,62 @@ function isTruthyFlag(value) {
     return ['1', 'true', 'yes', 'on'].includes(String(value).trim().toLowerCase());
 }
 function isVSCodeEnvironment() {
-    return !!(process.env.VSCODE_PID || process.env.VSCODE_CWD || process.env.TERM_PROGRAM === 'vscode');
+    return Boolean(process.env.VSCODE_IPC_HOOK_CLI
+        || process.env.VSCODE_PID
+        || process.env.TERM_PROGRAM === 'vscode');
+}
+function parseBrowserCommand(browser) {
+    const parts = browser.match(/(?:[^\s"]+|"[^"]*")+/g) || [];
+    return parts.map((item) => item.replace(/^"(.*)"$/, '$1'));
 }
-function openUrlByVSCode(url) {
+function openUrlByBrowserEnv(url) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            (0, child_process_1.execFile)('code', ['--open-url', url], (error) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve();
+        const browser = (_a = process.env.BROWSER) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!browser) {
+            return false;
+        }
+        const [command, ...args] = parseBrowserCommand(browser);
+        if (!command) {
+            return false;
+        }
+        const finalArgs = args.map((arg) => (arg === '%s' ? url : arg));
+        if (!args.includes('%s')) {
+            finalArgs.push(url);
+        }
+        return new Promise((resolve) => {
+            (0, child_process_1.execFile)(command, finalArgs, (error) => {
+                resolve(!error);
             });
         });
     });
 }
+function shouldUseBrowserEnvFallback() {
+    return process.platform === 'linux' && isVSCodeEnvironment();
+}
+function openUrl(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const child = yield (0, open_1.default)(url, { url: true });
+            if (child === null || child === void 0 ? void 0 : child.once) {
+                child.once('error', (error) => __awaiter(this, void 0, void 0, function* () {
+                    const code = (error === null || error === void 0 ? void 0 : error.code) || 'UNKNOWN';
+                    console.warn(`自动打开浏览器失败(${code})。`);
+                    if (shouldUseBrowserEnvFallback()) {
+                        yield openUrlByBrowserEnv(url);
+                    }
+                }));
+            }
+            return true;
+        }
+        catch (e) {
+            if (shouldUseBrowserEnvFallback()) {
+                return openUrlByBrowserEnv(url);
+            }
+            return false;
+        }
+    });
+}
 // 从 Web 页面中获取数据
 function getDataFromWeb(getUrl, type, options = {}) {
     var _a, _b;
@@ -86,27 +127,13 @@ function getDataFromWeb(getUrl, type, options = {}) {
             throw new error_1.CloudBaseError('callbackTimeout must be a positive number');
         }
         const url = getUrl(port);
-        console.log('若链接未自动打开，请手动复制此链接至浏览器，或尝试使用其他登录方式:');
+        console.log('\n\n若链接未自动打开，请手动复制此链接至浏览器，或尝试使用其他登录方式:');
         console.log(`\n${url}`);
         if (!noBrowser) {
             // 对 url 转码, 避免 wsl 无法正常打开地址
             // https://www.npmjs.com/package/open#url
             // https://github.com/sindresorhus/open/blob/master/index.js#L48
-            try {
-                yield (0, open_1.default)(url, { url: true });
-            }
-            catch (e) {
-                const code = (e === null || e === void 0 ? void 0 : e.code) || 'UNKNOWN';
-                console.warn(`自动打开浏览器失败(${code})。`);
-                if (isVSCodeEnvironment()) {
-                    try {
-                        yield openUrlByVSCode(url);
-                    }
-                    catch (vscodeError) {
-                        // ignore error
-                    }
-                }
-            }
+            yield openUrl(url);
         }
         return new Promise((resolve, reject) => {
             let finished = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/toolbox",
-    "version": "0.7.16-beta.0",
+    "version": "0.7.16-beta.2",
     "description": "The toolbox for cloudbase",
     "main": "lib/index.js",
     "scripts": {