bdy 1.22.18-dev → 1.22.20-dev

package/distTs/package.json

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

package/distTs/src/agent/agent.js

@@ -7,10 +7,9 @@ const events_1 = __importDefault(require("events"));
 const logger_1 = __importDefault(require("../logger"));
 const texts_1 = require("../texts");
 const utils_1 = require("../utils");
-const tunnel_1 = __importDefault(require("../tunnel/tunnel"));
 const output_1 = __importDefault(require("../output"));
 const client_1 = __importDefault(require("./socket/client"));
-const tunnel_2 = require("../types/tunnel");
+const tunnel_1 = require("../types/tunnel");
 class Agent extends events_1.default {
     id;
     host;
@@ -44,12 +43,12 @@ class Agent extends events_1.default {
         this.manager = null;
         this.onRefresh = null;
         this.socket = new client_1.default(host, id, token);
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.FETCH_SUCCESS, (data) => this._onSocketFetch(data));
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.FETCH_FAILED, (err) => this._onSocketFetchFailed(err));
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.CONNECTED, () => this._onSocketConnected());
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.DISCONNECTED, () => this._onSocketDisconnected());
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.TUNNEL, (tunnel, action) => this._onSocketTunnel(tunnel, action));
-        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.AGENT, (agent, action) => this._onSocketAgent(agent, action));
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.FETCH_SUCCESS, (data) => this._onSocketFetch(data));
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.FETCH_FAILED, (err) => this._onSocketFetchFailed(err));
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.CONNECTED, () => this._onSocketConnected());
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.DISCONNECTED, () => this._onSocketDisconnected());
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.TUNNEL, (tunnel, action) => this._onSocketTunnel(tunnel, action));
+        this.socket.on(tunnel_1.TUNNEL_SOCKET_EVENT.AGENT, (agent, action) => this._onSocketAgent(agent, action));
     }
     destroy() {
         if (this.socket) {
@@ -245,7 +244,7 @@ class Agent extends events_1.default {
         }
     }
     async makeAction(action) {
-        if (action === tunnel_2.TUNNEL_AGENT_ACTION.DELETE) {
+        if (action === tunnel_1.TUNNEL_AGENT_ACTION.DELETE) {
             if (this.manager) {
                 return this.manager.disableAgentAndExit(texts_1.ERR_AGENT_REMOVED);
             }
@@ -270,7 +269,8 @@ class Agent extends events_1.default {
                     sshHostKey = this.manager.sshHostKey;
                 const tunnel = tt.find((tunnel) => data.id === tunnel.id);
                 if (!tunnel) {
-                    this.addTunnel(new tunnel_1.default({
+                    const TunnelImpl = require('../tunnel/tunnel').default;
+                    this.addTunnel(new TunnelImpl({
                         ...data,
                         sshHostKey,
                         agent: {
@@ -298,7 +298,7 @@ class Agent extends events_1.default {
         this.tunnels.forEach((t) => {
             update.push({
                 id: t.id,
-                active: t.status === tunnel_2.TUNNEL_STATUS.OPEN && !forceInactive,
+                active: t.status === tunnel_1.TUNNEL_STATUS.OPEN && !forceInactive,
                 regionLatency: t.regionLatency ? t.regionLatency.latency : -1,
                 targetLatency: t.targetLatency ? t.targetLatency.latency : -1,
                 totalConnections: t.totalConnections,
@@ -311,25 +311,25 @@ class Agent extends events_1.default {
     canStartTunnel(tunnel) {
         if (this.disabled)
             return false;
-        if (!this.proxy && !this.target && tunnel.type === tunnel_2.TUNNEL_TYPE.SSH)
+        if (!this.proxy && !this.target && tunnel.type === tunnel_1.TUNNEL_TYPE.SSH)
             return false;
-        return !(!this.tunneling && tunnel.type !== tunnel_2.TUNNEL_TYPE.SSH);
+        return !(!this.tunneling && tunnel.type !== tunnel_1.TUNNEL_TYPE.SSH);
     }
     addTunnel(tunnel) {
         this.tunnels.push(tunnel);
         if (this.canStartTunnel(tunnel))
             tunnel.start();
-        tunnel.on(tunnel_2.TUNNEL_EVENT.OPEN, () => this.update(true));
-        tunnel.on(tunnel_2.TUNNEL_EVENT.CLOSED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.TCP_OPEN, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.TCP_CLOSED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.TLS_OPEN, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.TLS_CLOSED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_IDENTIFIED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_OPEN, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_CLOSED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.STOPPED, () => this.update());
-        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_REQUEST, (t, logRequest) => this.httpRequest(t.id, logRequest));
+        tunnel.on(tunnel_1.TUNNEL_EVENT.OPEN, () => this.update(true));
+        tunnel.on(tunnel_1.TUNNEL_EVENT.CLOSED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.TCP_OPEN, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.TCP_CLOSED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.TLS_OPEN, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.TLS_CLOSED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.HTTP_IDENTIFIED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.HTTP_OPEN, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.HTTP_CLOSED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.STOPPED, () => this.update());
+        tunnel.on(tunnel_1.TUNNEL_EVENT.HTTP_REQUEST, (t, logRequest) => this.httpRequest(t.id, logRequest));
     }
     destroyTunnel(id) {
         const tunnel = this.tunnels.find((t) => t.id === id);

package/distTs/src/command/pre.js

@@ -42,13 +42,13 @@ const commandPre = async (_, command) => {
     if (command.hideVersionUpdate) {
         return;
     }
-    const newCli = command.currentVersion !== command.latestVersion;
-    const newAgent = command.agentStatus &&
+    const newCli = !!command.latestVersion && command.currentVersion !== command.latestVersion;
+    const newAgent = !!command.agentStatus && !!command.latestVersion &&
         command.agentStatus.version !== command.latestVersion;
-    if ((0, utils_1.isDocker)() && newCli) {
+    if ((0, utils_1.isDocker)() && newCli && command.latestVersion) {
         output_1.default.newCliDockerVersion(command.latestVersion);
     }
-    else if (newCli) {
+    else if (newCli && command.latestVersion) {
         output_1.default.newCliVersion(command.latestVersion);
     }
     else if (newAgent) {

package/distTs/src/output.js

@@ -3,14 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const tunnel_1 = __importDefault(require("./tunnel/output/noninteractive/tunnel"));
-const tunnel_2 = __importDefault(require("./tunnel/output/noninteractive/config/tunnel"));
-const tunnels_1 = __importDefault(require("./tunnel/output/noninteractive/config/tunnels"));
 const texts_1 = require("./texts");
-const tunnels_2 = __importDefault(require("./tunnel/output/noninteractive/agent/tunnels"));
 const utils_1 = require("./utils");
 const chalk_1 = __importDefault(require("chalk"));
-const undici_1 = __importDefault(require("undici"));
 let _terminal = null;
 function getTerminal() {
     if (!_terminal) {
@@ -178,7 +173,8 @@ class Output {
         }
     }
     static agentTunnels(tunnels) {
-        const on = new tunnels_2.default(getTerminal(), tunnels);
+        const OutputNoninteractiveAgentTunnels = require('./tunnel/output/noninteractive/agent/tunnels').default;
+        const on = new OutputNoninteractiveAgentTunnels(getTerminal(), tunnels);
         on.start(this);
     }
     static tunnelInteractive(tunnel) {
@@ -189,7 +185,8 @@ class Output {
     }
     static tunnelNonInteractive(tunnel) {
         this.killSpinner();
-        const on = new tunnel_1.default(getTerminal(), tunnel);
+        const OutputNoninteractiveTunnel = require('./tunnel/output/noninteractive/tunnel').default;
+        const on = new OutputNoninteractiveTunnel(getTerminal(), tunnel);
         on.start();
     }
     static newCliVersion(version) {
@@ -241,11 +238,13 @@ class Output {
         });
     }
     static configTunnels(tunnels) {
-        const on = new tunnels_1.default(getTerminal(), tunnels);
+        const OutputNoninteractiveConfigTunnels = require('./tunnel/output/noninteractive/config/tunnels').default;
+        const on = new OutputNoninteractiveConfigTunnels(getTerminal(), tunnels);
         on.start(this);
     }
     static configTunnel(tunnel) {
-        const on = new tunnel_2.default(getTerminal(), tunnel);
+        const OutputNoninteractiveConfigTunnel = require('./tunnel/output/noninteractive/config/tunnel').default;
+        const on = new OutputNoninteractiveConfigTunnel(getTerminal(), tunnel);
         on.start(this);
     }
     static handleSignals() {
@@ -409,7 +408,8 @@ class Output {
     }
     static getUndiciUnauthorizedAgent() {
         if (!this._a) {
-            this._a = new undici_1.default.Agent({
+            const undici = require('undici');
+            this._a = new undici.Agent({
                 connect: {
                     rejectUnauthorized: false,
                 },
@@ -418,7 +418,8 @@ class Output {
         return this._a;
     }
     static clearUndici() {
-        undici_1.default.getGlobalDispatcher().destroy(() => { });
+        const undici = require('undici');
+        undici.getGlobalDispatcher().destroy(() => { });
         if (this._a)
             this._a.destroy(() => { });
     }

package/distTs/src/texts.js

@@ -1151,23 +1151,23 @@ EXAMPLES:
 exports.EXAMPLE_ARTIFACT_PUBLISH = `
 EXAMPLES:
   # publish new version of file artifact:
-  bdy art pub artifact-identifier@version /path/to/dir
+  bdy art pub artifact-identifier:version /path/to/dir
   
   # create new file artifact:
   bdy art pub artifact-identifier --create
   
   # overwrite existing version:
-  bdy art pub artifact-identifier@version /path/to/dir -f`;
+  bdy art pub artifact-identifier:version /path/to/dir -f`;
 exports.EXAMPLE_ARTIFACT_DOWNLOAD = `
 EXAMPLES:
   # download file artifact version to local directory:
-  bdy art dd artifact-identifier@version /path/to/dir
+  bdy art dd artifact-identifier:version /path/to/dir
   
   # download latest file artifact version and replace contents of existing local directory:
   bdy art dd artifact-identifier /path/to/dir --replace
   
   # download file artifact version and merge it with existing local directory:
-  bdy art dd artifact-identifier@version /path/to/dir --merge`;
+  bdy art dd artifact-identifier:version /path/to/dir --merge`;
 exports.EXAMPLE_ARTIFACT_DELETE = `
 EXAMPLES:
   # delete artifact:

package/distTs/src/tunnel/http/log.js

@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelHttpLogRequest = void 0;
 const events_1 = __importDefault(require("events"));
-const uuid_1 = require("uuid");
 const stream_1 = __importDefault(require("./stream"));
-const isbinaryfile_1 = require("isbinaryfile");
 const utils_1 = require("../../utils");
 const tunnel_1 = require("../../types/tunnel");
 class TunnelHttpLogRequest extends events_1.default {
@@ -32,7 +30,7 @@ class TunnelHttpLogRequest extends events_1.default {
         this.status = 'NEW';
         this.start = process.hrtime();
         this.finished = false;
-        this.id = (0, uuid_1.v4)();
+        this.id = require('uuid').v4();
         this.requestBody = new stream_1.default(utils_1.TUNNEL_HTTP_LOG_MAX_BODY);
         this.requestBody.once('close', () => {
             this.emit(tunnel_1.TUNNEL_EVENT_HTTP.NEW_REQUEST_END);
@@ -62,7 +60,7 @@ class TunnelHttpLogRequest extends events_1.default {
             requestBodyLength = this.requestBody.realLength;
             requestBodyTooLarge =
                 requestBodyLength >= utils_1.TUNNEL_MAX_REQUEST_SIZE_TO_SYNC;
-            requestBodyBinary = (0, isbinaryfile_1.isBinaryFileSync)(this.requestBody.data);
+            requestBodyBinary = require('isbinaryfile').isBinaryFileSync(this.requestBody.data);
             if (!requestBodyTooLarge && !requestBodyBinary) {
                 requestBody = this.requestBody.data.toString('base64');
             }
@@ -71,7 +69,7 @@ class TunnelHttpLogRequest extends events_1.default {
             responseBodyLength = this.responseBody.realLength;
             responseBodyTooLarge =
                 requestBodyLength >= utils_1.TUNNEL_MAX_REQUEST_SIZE_TO_SYNC;
-            responseBodyBinary = (0, isbinaryfile_1.isBinaryFileSync)(this.responseBody.data);
+            responseBodyBinary = require('isbinaryfile').isBinaryFileSync(this.responseBody.data);
             if (!responseBodyTooLarge && !responseBodyBinary) {
                 responseBody = this.responseBody.data.toString('base64');
             }

package/distTs/src/tunnel/http/stream.js

@@ -3,24 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = require("stream");
 class TunnelHttpStream extends stream_1.Transform {
     maxSize;
-    data;
+    chunks;
+    chunksLength;
     realLength;
     tooLarge;
     constructor(maxSize) {
         super();
         this.maxSize = maxSize;
-        this.data = Buffer.alloc(0);
+        this.chunks = [];
+        this.chunksLength = 0;
         this.realLength = 0;
         this.tooLarge = false;
     }
+    get data() {
+        if (this.chunks.length === 0)
+            return Buffer.alloc(0);
+        if (this.chunks.length === 1)
+            return this.chunks[0];
+        const buf = Buffer.concat(this.chunks, this.chunksLength);
+        this.chunks = [buf];
+        return buf;
+    }
     _transform(chunk, _, callback) {
         if (!this.tooLarge) {
-            if (this.data.length + chunk.length > this.maxSize) {
+            if (this.chunksLength + chunk.length > this.maxSize) {
                 this.tooLarge = true;
-                this.data = Buffer.alloc(0);
+                this.chunks = [];
+                this.chunksLength = 0;
             }
             else {
-                this.data = Buffer.concat([this.data, chunk]);
+                this.chunks.push(chunk);
+                this.chunksLength += chunk.length;
             }
         }
         this.realLength += chunk.length;

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

@@ -251,9 +251,21 @@ class ServerSsh extends events_1.default {
         session.on('close', () => closeSession());
         session.on('end', () => closeSession());
         session.on('eof', () => {
-            // @ts-ignore fix for sftp channel not ending properly https://github.com/mscdex/ssh2/pull/1111
-            if (session._channel)
-                session._channel.end();
+            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
+                    session._channel.end();
+                }
+            }
+            catch {
+                // do nothing
+            }
         });
         session.on('pty', (accept, reject, info) => {
             logger_1.default.debug('ssh pty');

package/distTs/src/tunnel/tunnel.js

@@ -1,42 +1,8 @@
 "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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const basic_auth_1 = __importDefault(require("basic-auth"));
 const utils_1 = require("../utils");
 const latency_1 = __importDefault(require("./latency"));
 const events_1 = __importDefault(require("events"));
@@ -49,10 +15,6 @@ const http1_1 = __importDefault(require("./server/http1"));
 const log_1 = __importDefault(require("./http/log"));
 const format_1 = __importDefault(require("../format"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
-const cookie = __importStar(require("cookie"));
-const uuid_1 = require("uuid");
-const jsonwebtoken_1 = require("jsonwebtoken");
-const undici_1 = require("undici");
 const texts_1 = require("../texts");
 const dns_1 = __importDefault(require("./dns"));
 const tunnel_1 = require("../types/tunnel");
@@ -669,7 +631,7 @@ class Tunnel extends events_1.default {
     }
     async httpBasicAuth(req, res) {
         if (this.authType === tunnel_1.TUNNEL_HTTP_AUTH_TYPE.BASIC) {
-            const user = (0, basic_auth_1.default)(req);
+            const user = require('basic-auth')(req);
             if (user && user.name === this.login && user.pass === this.password) {
                 return true;
             }
@@ -686,7 +648,7 @@ class Tunnel extends events_1.default {
         return true;
     }
     async _checkHttpPat(req, res, setCookie) {
-        const user = (0, basic_auth_1.default)(req);
+        const user = require('basic-auth')(req);
         if (!user || !user.name || !user.pass)
             return false;
         const client = this._getHttpAuthClient();
@@ -722,7 +684,8 @@ class Tunnel extends events_1.default {
     _getHttpAuthClient() {
         const host = this.agent.host;
         if (!this.httpAuthClient[host]) {
-            this.httpAuthClient[host] = new undici_1.Pool(host, {
+            const { Pool: UndiciPool } = require('undici');
+            this.httpAuthClient[host] = new UndiciPool(host, {
                 connect: {
                     rejectUnauthorized: false,
                 },
@@ -761,7 +724,7 @@ class Tunnel extends events_1.default {
                 reject(new Error(msg));
                 return;
             }
-            const data = (0, jsonwebtoken_1.decode)(token);
+            const data = require('jsonwebtoken').decode(token);
             if (!data || !data.iss) {
                 reject(new Error(msg));
                 return;
@@ -771,7 +734,7 @@ class Tunnel extends events_1.default {
                 cert = ISSUERS[data.iss];
             else
                 cert = ISSUERS['*'];
-            (0, jsonwebtoken_1.verify)(token, cert, {
+            require('jsonwebtoken').verify(token, cert, {
                 complete: true,
                 issuer: data.iss,
             }, (err, data) => {
@@ -796,7 +759,7 @@ class Tunnel extends events_1.default {
         });
     }
     _httpSetAuthCookie(res, token) {
-        res.setHeader('set-cookie', cookie.serialize(COOKIE_NAME, token, {
+        res.setHeader('set-cookie', require('cookie').serialize(COOKIE_NAME, token, {
             maxAge: 3600,
             path: '/',
             secure: true,
@@ -810,7 +773,7 @@ class Tunnel extends events_1.default {
             token = await this._httpExchangeAuthCode(code, verifier);
         }
         if (!token) {
-            const cookies = cookie.parse(req.headers.cookie || '');
+            const cookies = require('cookie').parse(req.headers.cookie || '');
             token = cookies[COOKIE_NAME] || '';
             fromCookie = true;
         }
@@ -877,7 +840,7 @@ class Tunnel extends events_1.default {
         if (/^https:\/\/\d+\.\d+\.\d+\.\d+$/.test(host)) {
             host = 'https://app.local.io';
         }
-        const verifier = (0, uuid_1.v4)();
+        const verifier = require('uuid').v4();
         const challenge = node_crypto_1.default
             .createHash('sha256')
             .update(verifier)
@@ -929,7 +892,7 @@ class Tunnel extends events_1.default {
                 this.httpEndFast(req, res, 404, 'Not found');
                 return false;
             }
-            const auth = (0, basic_auth_1.default)(req);
+            const auth = require('basic-auth')(req);
             if (auth) {
                 const authorized = await this._checkHttpPat(req, res, true);
                 if (authorized) {

package/distTs/src/utils.js

@@ -54,7 +54,6 @@ exports.getPopularTlds = getPopularTlds;
 exports.getAppHostByApiBaseUrl = getAppHostByApiBaseUrl;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = require("node:fs");
-const undici_1 = __importDefault(require("undici"));
 const texts_1 = require("./texts");
 const node_sea_1 = require("node:sea");
 const commander_1 = require("commander");
@@ -461,7 +460,7 @@ const getLatestVersion = async () => {
         setTimeout(() => {
             c.abort();
         }, 10000);
-        const response = await undici_1.default.fetch(`https://es.buddy.works/bdy/${env}/latest`, {
+        const response = await require('undici').fetch(`https://es.buddy.works/bdy/${env}/latest`, {
             method: 'GET',
             signal: c.signal,
         });

package/package.json

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