bdy 1.18.8-dev → 1.18.9-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.8-dev",
+  "version": "1.18.9-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/command/api/request.js

@@ -77,12 +77,34 @@ const prepareMultipartBody = async (params) => {
     }
     return form;
 };
+const parseUrl = (url) => {
+    const query = {};
+    let path = url;
+    let host = '';
+    try {
+        const u = new URL(url, 'https://example.com');
+        if (u.host !== 'example.com')
+            host = u.host;
+        path = decodeURIComponent(u.pathname);
+        u.searchParams.forEach((v, k) => {
+            query[k] = v;
+        });
+    }
+    catch {
+        // do nothing
+    }
+    return {
+        host,
+        path,
+        query,
+    };
+};
 const request = async (method, url, options) => {
     output_1.default.handleSignals();
+    const { query, path, host } = parseUrl(url);
     const workspace = input_1.default.restApiWorkspace(options.workspace, true);
     const project = input_1.default.restApiProject(options.project, true);
-    const client = input_1.default.restApiTokenClient();
-    const query = {};
+    const client = input_1.default.restApiTokenClient(false, host);
     if (options.query) {
         options.query.forEach((q) => {
             const s = q.split(':');
@@ -92,7 +114,7 @@ const request = async (method, url, options) => {
             query[s[0]] = s[1];
         });
     }
-    let preparedUrl = url;
+    let preparedUrl = path;
     if (workspace) {
         preparedUrl = preparedUrl.replaceAll('{workspace_domain}', encodeURIComponent(workspace));
     }

package/distTs/src/command/login.js

@@ -40,8 +40,7 @@ async function oauthServer(api, clientId, clientSecret) {
             const urlCode = url.searchParams.get('code');
             if (!urlCode) {
                 res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
-                s.close();
-                output_1.default.exitError(texts_1.ERR_LOGIN_HTTP_FAILED);
+                return;
             }
             const client = new ApiClient(new URL(`https://${api}`));
             try {

package/distTs/src/output.js

@@ -401,14 +401,19 @@ class Output {
         terminal.fullscreen(false);
         terminal.hideCursor(false);
         terminal.grabInput(false);
+        const isDebug = process.env.DEBUG === '1';
         let msg;
         if (err instanceof Error) {
             msg = err.message;
-            if (process.env.DEBUG === '1')
+            if (isDebug)
                 msg += `\n${err.stack}`;
         }
-        else
+        else {
+            const e = new Error();
             msg = err;
+            if (isDebug)
+                msg += `\n${e.stack}`;
+        }
         terminal.red.error(`${msg}\n`);
         process.exit(1);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.8-dev",
+  "version": "1.18.9-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {