bdy 1.22.20-dev → 1.22.23-dev

package/distTs/package.json

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

package/distTs/src/texts.js

@@ -20,7 +20,7 @@ const utils_1 = require("./utils");
 exports.ERR_REST_API_GENERAL_ERROR = 'Something went wrong';
 exports.ERR_REST_API_NOT_RESPONDING = 'Api endpoint not responding. Try again later...';
 exports.ERR_REST_API_CONNECT_ERROR = 'Connection refused. Check selected endpoint';
-exports.ERR_REST_API_WRONG_TOKEN = 'Valid token with proper scopes is required or run bdy login';
+exports.ERR_REST_API_WRONG_TOKEN = "Unauthorized (401): Invalid or missing token. Run 'buddy login' to authenticate";
 exports.ERR_REST_API_RESOURCE_NOT_FOUND = 'Resource not found';
 const ERR_REST_API_RATE_LIMIT = (rateLimitReset) => {
     if (rateLimitReset) {
@@ -812,6 +812,9 @@ const ERR_API_MESSAGE_REPLACER = (message, path, baseUrl, rateLimitTs) => {
             workspaceUrl = (0, utils_1.getAppWorkspaceSettingsUrl)(baseUrl, m[1]);
         }
     }
+    if (message === 'Rate limit exceeded') {
+        return (0, exports.ERR_REST_API_RATE_LIMIT)(rateLimitTs);
+    }
     if (message === 'API is disabled in this workspace') {
         message =
             'API is disabled in this workspace. To enable it, ask a workspace admin to update the settings';
@@ -819,8 +822,8 @@ const ERR_API_MESSAGE_REPLACER = (message, path, baseUrl, rateLimitTs) => {
             message += `: ${workspaceUrl}`;
         }
     }
-    if (message === 'Rate limit exceeded') {
-        return (0, exports.ERR_REST_API_RATE_LIMIT)(rateLimitTs);
+    else if (message === 'Access denied') {
+        message = "You don't have permission to perform this action";
     }
     return message;
 };

package/distTs/src/tunnel/server/sftp.js

@@ -46,6 +46,22 @@ class ServerSftp {
         this.count = 0;
         this.sftp = sftp;
         this.home = (0, node_os_1.homedir)();
+        // fix for sftp/scp exit status -1: send exit-status and EOF before channel close
+        // https://github.com/mscdex/ssh2/pull/1492
+        const s = sftp;
+        const origDestroy = s.destroy.bind(s);
+        s.destroy = () => {
+            try {
+                if (s.outgoing?.state === 'open') {
+                    s._protocol.exitStatus(s.outgoing.id, 0);
+                    s._protocol.channelEOF(s.outgoing.id);
+                }
+            }
+            catch {
+                // do nothing
+            }
+            return origDestroy();
+        };
         this.sftp.on('OPEN', (reqId, fileName, flags, attrs) => this.open(reqId, fileName, flags, attrs));
         this.sftp.on('READ', (reqId, handle, offset, length) => this.read(reqId, handle, offset, length));
         this.sftp.on('WRITE', (reqId, handle, offset, data) => this.write(reqId, handle, offset, data));

package/distTs/src/tunnel/server/ssh.js

@@ -40,7 +40,7 @@ class ServerSsh extends events_1.default {
         this.password = password;
         this.server = new ssh2_1.default.Server({
             hostKeys: [hostKey],
-            highWaterMark: 16 * 1024 * 1024,
+            highWaterMark: 65536,
             ident: 'ssh2 server',
         }, (client) => this.processClient(client));
         this.server.listen();
@@ -251,20 +251,15 @@ class ServerSsh extends events_1.default {
         session.on('close', () => closeSession());
         session.on('end', () => closeSession());
         session.on('eof', () => {
-            try {
-                // @ts-ignore fix for sftp channel not ending properly https://github.com/mscdex/ssh2/pull/1111
-                if (session._channel) {
-                    // fix for sftp/scp exit status -1: send exit-status before EOF https://github.com/mscdex/ssh2/pull/1492
-                    if (sftp) {
-                        // @ts-ignore
-                        session._channel.exit(0);
-                    }
+            // @ts-ignore fix for sftp channel not ending properly https://github.com/mscdex/ssh2/pull/1111
+            if (session._channel) {
+                try {
                     // @ts-ignore
                     session._channel.end();
                 }
-            }
-            catch {
-                // do nothing
+                catch {
+                    // do nothing
+                }
             }
         });
         session.on('pty', (accept, reject, info) => {

package/package.json

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