bdy 1.22.56-master → 1.22.57-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.56-master",
+  "version": "1.22.57-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/command/sandbox/endpoint/get.js

@@ -38,8 +38,7 @@ commandSandboxEndpointGet.action(async (identifier, endpointName, options) => {
             ['Endpoint', endpoint.endpoint || '-'],
             ['Type', endpoint.type || '-'],
             ['Region', endpoint.region || '-'],
-            ['Active', endpoint.active ? output_1.default.getOkSign() : output_1.default.getCancelSign()],
-            ['Target Latency', typeof endpoint.target_latency === 'number' && endpoint.target_latency >= 0 ? `${endpoint.target_latency}ms` : '-'],
+            ['Status', (0, utils_1.isSandboxEndpointActive)(endpoint) ? 'Online' : 'Offline'],
             ['URL', endpoint.endpoint_url || '-'],
             ['Timeout', endpoint.timeout?.toString() || '-'],
         ];
@@ -47,18 +46,18 @@ commandSandboxEndpointGet.action(async (identifier, endpointName, options) => {
             data.push(['Whitelist', endpoint.whitelist?.join(', ')]);
         }
         if (endpoint.http) {
-            data.push(['HTTP2', endpoint.http.http2 ? 'TRUE' : 'FALSE']);
+            data.push(['HTTP2', endpoint.http.http2 ? output_1.default.getOkSign() : output_1.default.getCancelSign()]);
             data.push([
                 'Verify certificate',
-                endpoint.http.verify_certificate ? 'TRUE' : 'FALSE',
+                endpoint.http.verify_certificate ? output_1.default.getOkSign() : output_1.default.getCancelSign(),
             ]);
             data.push([
                 'Compression',
-                endpoint.http.compression ? 'TRUE' : 'FALSE',
+                endpoint.http.compression ? output_1.default.getOkSign() : output_1.default.getCancelSign(),
             ]);
             data.push([
                 'Log requests',
-                endpoint.http.log_requests ? 'TRUE' : 'FALSE',
+                endpoint.http.log_requests ? output_1.default.getOkSign() : output_1.default.getCancelSign(),
             ]);
             data.push(['Auth type', endpoint.http.auth_type]);
             if (endpoint.http.serve_path) {
@@ -76,21 +75,23 @@ commandSandboxEndpointGet.action(async (identifier, endpointName, options) => {
             if (endpoint.http.rewrite_host_header) {
                 data.push(['Rewrite host header', endpoint.http.rewrite_host_header]);
             }
-            let headers = Object.keys(endpoint.http.request_headers || {});
-            if (headers.length) {
+            const requestHeaders = endpoint.http.request_headers || {};
+            const requestHeadersKeys = Object.keys(requestHeaders);
+            if (requestHeadersKeys.length) {
                 data.push([
                     'Request headers',
-                    headers
-                        .map((key) => `${key}: ${endpoint.http.request_headers[key]}`)
+                    requestHeadersKeys
+                        .map((key) => `${key}: ${requestHeaders[key]}`)
                         .join('\n '),
                 ]);
             }
-            headers = Object.keys(endpoint.http.response_headers || {});
-            if (headers.length) {
+            const responseHeaders = endpoint.http.response_headers || {};
+            const responseHeadersKeys = Object.keys(responseHeaders);
+            if (responseHeadersKeys.length) {
                 data.push([
                     'Request headers',
-                    headers
-                        .map((key) => `${key}: ${endpoint.http.response_headers[key]}`)
+                    responseHeadersKeys
+                        .map((key) => `${key}: ${responseHeaders[key]}`)
                         .join('\n '),
                 ]);
             }

package/distTs/src/command/sandbox/endpoint/list.js

@@ -31,15 +31,16 @@ commandSandboxEndpointList.action(async (identifier, options) => {
         if (endpoints.length === 0) {
             output_1.default.exitError(texts_1.ERR_SANDBOX_ENDPOINTS_NOT_FOUND);
         }
-        const data = [['Name', 'Endpoint', 'Type', 'Region', 'Active', 'Target Latency', 'URL']];
+        const data = [
+            ['Name', 'Endpoint', 'Type', 'Region', 'Status', 'URL'],
+        ];
         for (const ep of endpoints) {
             data.push([
                 ep.name || '-',
                 ep.endpoint || '-',
                 ep.type || '-',
                 ep.region || '-',
-                ep.active ? output_1.default.getOkSign() : output_1.default.getCancelSign(),
-                typeof ep.target_latency === 'number' && ep.target_latency >= 0 ? `${ep.target_latency}ms` : '-',
+                (0, utils_1.isSandboxEndpointActive)(ep) ? 'Online' : 'Offline',
                 ep.endpoint_url || '-',
             ]);
         }

package/distTs/src/texts.js

@@ -854,7 +854,7 @@ exports.TXT_LOGIN_PROVIDE_CODE = 'Paste code here if prompted >';
 exports.TXT_LOGIN_ENTER_BASE_URL = 'Enter your Buddy instance URL (e.g., buddy.company.com):';
 exports.TXT_LOGIN_SELECT_WORKSPACE = 'Select workspace:';
 exports.TXT_LOGIN_SUCCESS = 'Logged in successfully!';
-exports.TXT_REGISTER_SUCCESS = 'Signed up successfully!';
+exports.TXT_REGISTER_SUCCESS = 'Account created. Logged in successfully!';
 exports.ERR_LOGIN_HTTP_SERVER_PORT_TAKEN = 'Cant start local http server to authorize';
 exports.ERR_LOGIN_HTTP_FAILED = 'Buddy CLI failed to authorize. Try again...';
 exports.ERR_LOGIN_HTTP_CANCEL = 'Login canceled';
@@ -1145,13 +1145,19 @@ exports.EXAMPLE_SANDBOX_CREATE = `
   bdy sb create -vf path/to/env/file
   ### create sandbox from yaml file:
   bdy sb create --yaml @./test.yml"`;
-const EXAMPLE_TUNNEL_HTTP = (agent) => `
+const EXAMPLE_TUNNEL_HTTP = (agent) => {
+    let r = `
   ### start http tunnel on port 80:
   bdy ${agent ? 'agent ' : ''}tunnel http 80
-  ### start named http tunnel and serve local directory:
-  bdy ${agent ? 'agent ' : ''}tunnel http -n name -s /path/to/dir
   ### start http tunnel, whitelist ip and turn on on basic auth:
   bdy ${agent ? 'agent ' : ''}tunnel http https://myhost.com -w 1.1.1.1 -a user:pass`;
+    if (!agent) {
+        r += `
+  ### start named http tunnel and serve local directory:
+  bdy tunnel http -n name -s /path/to/dir`;
+    }
+    return r;
+};
 exports.EXAMPLE_TUNNEL_HTTP = EXAMPLE_TUNNEL_HTTP;
 exports.EXAMPLE_AGENT_TUNNEL_LIST = `
   ### list agent tunnels:

package/distTs/src/tunnel/output/interactive/tunnel.js

@@ -600,12 +600,19 @@ class OutputInteractiveTunnel {
     updateSpriteStatus(y) {
         let text;
         let color;
-        if (this.tunnel.status === tunnel_1.TUNNEL_STATUS.OPEN) {
-            text = 'OPEN  ';
+        let isActive = true;
+        if (this.tunnel.status !== tunnel_1.TUNNEL_STATUS.OPEN) {
+            isActive = false;
+        }
+        else if (this.tunnel.type !== tunnel_1.TUNNEL_TYPE.SSH && !(this.tunnel.type === tunnel_1.TUNNEL_TYPE.HTTP && this.tunnel.serve) && this.tunnel.targetLatency?.latency < 0) {
+            isActive = false;
+        }
+        if (isActive) {
+            text = 'ONLINE  ';
             color = COLOR_GREEN;
         }
         else {
-            text = 'CLOSED';
+            text = 'OFFLINE';
             color = COLOR_RED;
         }
         this.sprites.status.put({

package/distTs/src/tunnel/output/noninteractive/agent/tunnels.js

@@ -26,15 +26,22 @@ class OutputNoninteractiveAgentTunnels {
                 let status;
                 if (tunnel.serve)
                     target = format_1.default.serve(tunnel.serve) + ' / 0ms';
+                else {
+                    target = format_1.default.target(tunnel.type, tunnel.target);
+                    target += ` / ${format_1.default.latency(tunnel.targetLatency)}`;
+                }
+                let entry = format_1.default.entry(tunnel);
+                entry += ` / ${format_1.default.latency(tunnel.regionLatency)}`;
+                if (tunnel.status !== tunnel_1.TUNNEL_STATUS.OPEN)
+                    status = 'Offline';
+                else if (tunnel.type === tunnel_1.TUNNEL_TYPE.SSH)
+                    status = 'Online';
+                else if (tunnel.type === tunnel_1.TUNNEL_TYPE.HTTP && tunnel.serve)
+                    status = 'Online';
+                else if (tunnel.targetLatency < 0)
+                    status = 'Offline';
                 else
-                    target =
-                        format_1.default.target(tunnel.type, tunnel.target) +
-                            ` / ${format_1.default.latency(tunnel.targetLatency)}`;
-                const entry = format_1.default.entry(tunnel) + ` / ${format_1.default.latency(tunnel.regionLatency)}`;
-                if (tunnel.status === tunnel_1.TUNNEL_STATUS.OPEN)
-                    status = 'Open';
-                else
-                    status = 'Closed';
+                    status = 'Online';
                 tunnels.push([tunnel.id, tunnel.type, target, entry, status]);
             });
             output.table(tunnels);

package/distTs/src/utils.js

@@ -51,6 +51,7 @@ exports.isInSandbox = isInSandbox;
 exports.isValidSubdomain = isValidSubdomain;
 exports.isValidEmail = isValidEmail;
 exports.isValidName = isValidName;
+exports.isSandboxEndpointActive = isSandboxEndpointActive;
 exports.getSubdomain = getSubdomain;
 exports.getDomainTld = getDomainTld;
 exports.getPopularTlds = getPopularTlds;
@@ -62,6 +63,7 @@ const node_sea_1 = require("node:sea");
 const commander_1 = require("commander");
 const node_os_1 = __importStar(require("node:os"));
 const node_child_process_1 = require("node:child_process");
+const tunnel_1 = require("./types/tunnel");
 exports.TUNNEL_HTTP_RATE_LIMIT = 2000;
 exports.TUNNEL_HTTP_RATE_WINDOW = 60000;
 exports.TUNNEL_HTTP_LOG_MAX_BODY = 5242880; // 5MB
@@ -728,6 +730,15 @@ function isValidEmail(email) {
 function isValidName(name) {
     return name.length > 0 && name.length <= 100;
 }
+function isSandboxEndpointActive(ep) {
+    if (!ep.active)
+        return false;
+    if (ep.type === tunnel_1.TUNNEL_TYPE.HTTP && ep.http?.serve_path)
+        return true;
+    if (ep.type === tunnel_1.TUNNEL_TYPE.SSH)
+        return true;
+    return ep.target_latency >= 0;
+}
 const getGitEmail = async () => {
     try {
         const out = await (0, exports.execLocally)('git config user.email', {}, true);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.56-master",
+  "version": "1.22.57-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {