bdy 1.22.43-dev-distro → 1.22.44-dev-distro

package/distTs/package.json

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

package/distTs/src/command/domain/buy.js

@@ -43,20 +43,41 @@ commandDomainBuy.action(async (text, options) => {
     }
     output_1.default.exitNormal();
 });
+const outputRouteExample = (domain) => {
+    output_1.default.normal('\nRoute this zone to an artifact:');
+    output_1.default.dim('bdy distro route create <distro-identifier> \\');
+    output_1.default.dim(`  --domain="${domain}" \\`);
+    output_1.default.dim('  --target "artifact=<artifact-identifier>:<version>"');
+    output_1.default.normal(`\nRoute a NEW sub-name within the zone (e.g. api.${domain}):`);
+    output_1.default.dim('bdy distro route create <distro-identifier> \\');
+    output_1.default.dim('  --subdomain="api" \\');
+    output_1.default.dim(`  --domain="${domain}" \\`);
+    output_1.default.dim('  --target "artifact=<artifact-identifier>:<version>"');
+};
+const outputClaimed = (domain) => {
+    output_1.default.okSign();
+    output_1.default.cyan(domain, false);
+    output_1.default.normal(' claimed');
+    outputRouteExample(domain);
+};
+const outputBought = (domain) => {
+    output_1.default.okSign();
+    output_1.default.cyan(domain, false);
+    output_1.default.normal(' bought');
+    outputRouteExample(domain);
+};
 const claimNonInteractive = async (client, workspace, domain, onOwnerBehalf) => {
     output_1.default.arrowSign();
     output_1.default.normal(`Matched: ${output_1.default.formatDomainClaim(domain, true)}`);
     await client.domainClaim(workspace, domain, onOwnerBehalf);
-    output_1.default.okSign();
-    output_1.default.normal(`${domain} claimed`);
+    outputClaimed(domain);
 };
 const buyNonInteractive = async (client, workspace, domain, onOwnerBehalf) => {
     output_1.default.arrowSign();
     output_1.default.normal(`Matched: ${output_1.default.formatDomain(domain)}`);
     if (domain.available && !domain.premium) {
         await client.domainBuy(workspace, domain.name, onOwnerBehalf, true);
-        output_1.default.okSign();
-        output_1.default.normal(`${domain.name} bought`);
+        outputBought(domain.name);
     }
 };
 const interactive = async (client, workspace, prompt, tlds, onOwnerBehalf, onlyAvailable, sort) => {
@@ -235,13 +256,11 @@ const interactive = async (client, workspace, prompt, tlds, onOwnerBehalf, onlyA
     }
     else if (type === 'claim') {
         await client.domainClaim(workspace, name, onOwnerBehalf);
-        output_1.default.okSign();
-        output_1.default.normal(`${name} claimed`);
+        outputClaimed(name);
     }
     else {
         await client.domainBuy(workspace, name, onOwnerBehalf);
-        output_1.default.okSign();
-        output_1.default.normal(`${name} bought`);
+        outputBought(name);
     }
 };
 const nonInteractive = async (client, workspace, prompt, tlds, onOwnerBehalf) => {

package/distTs/src/texts.js

@@ -869,13 +869,13 @@ exports.DESC_COMMAND_DISTRO_DELETE = 'Delete distribution. Required scopes: DIST
 exports.DESC_COMMAND_DISTRO_LIST = 'List distributions. Required scopes: DISTRIBUTION_INFO';
 exports.DESC_COMMAND_ROUTE_LIST = 'List routes. Required scopes: DISTRIBUTION_INFO';
 exports.DESC_COMMAND_ROUTE_DELETE = 'Delete route. Required scopes: DISTRIBUTION_MANAGE';
-exports.DESC_COMMAND_ROUTE = 'Manage distribution routes. Required scopes: DISTRIBUTION_INFO';
+exports.DESC_COMMAND_ROUTE = 'Manage distribution routes';
 exports.OPT_COMMAND_DISTRO_SCOPE = 'Force distribution scope (WORKSPACE, PROJECT). By default calculated by provided options and environmental variables';
 exports.OPT_COMMAND_DISTRO_IDENTIFIER = 'Human-readable ID of the distribution';
 exports.OPT_COMMAND_ROUTE_ID = 'ID of the route (find via "bdy distro route ls")';
 exports.OPT_COMMAND_ROUTE_TYPE = 'Type of the route. Allowed: PROXY, PROXY_NO_CACHE, REDIRECT, CLOAKING';
-exports.OPT_COMMAND_ROUTE_SUBDOMAIN = 'Subdomain of the route';
-exports.OPT_COMMAND_ROUTE_DOMAIN = 'Domain of the route';
+exports.OPT_COMMAND_ROUTE_SUBDOMAIN = 'Optional sub-name prepended to --domain (e.g. --subdomain=api --domain=example.com → api.example.com). Omit to route the zone itself. Do NOT use this to peel a label off a multi-level zone — the zone always goes whole into --domain';
+exports.OPT_COMMAND_ROUTE_DOMAIN = 'Zone for the route — pass the WHOLE string from `bdy domain ls` (e.g. "example.com" or "my-app.example.dev"). Do NOT split a multi-level zone into subdomain+domain; the entire bought/claimed string is one zone and goes here as-is. Use --subdomain only to route a sub-name within this zone';
 exports.OPT_COMMAND_ROUTE_PATH = 'Path of the route';
 exports.OPT_COMMAND_ROUTE_TARGET = `Target of the route (can be used multiple times).
 Format: "region=default,url=https://example.com,artifact=artifact:version,sandbox=sandbox:endpoint"
@@ -905,7 +905,7 @@ const ERR_WRONG_ROUTE_TARGET = (v, msg) => `Target has wrong format: ${v}. ${msg
 exports.ERR_WRONG_ROUTE_TARGET = ERR_WRONG_ROUTE_TARGET;
 exports.ERR_ROUTE_NO_DEFAULT = 'Target in Default region is mandatory';
 // domain commands
-exports.DESC_COMMAND_DOMAIN = 'Manage domains';
+exports.DESC_COMMAND_DOMAIN = 'Manage zones (called "domains" in Buddy). A zone can be used in distribution routes. Zones can be apex (example.com) or multi-level (my-app.example.dev) — the whole string is one zone';
 exports.DESC_COMMAND_DOMAIN_BUY = 'Buy domain';
 exports.DESC_COMMAND_DOMAIN_SEARCH = 'Search domain';
 exports.DESC_COMMAND_DOMAIN_LIST = 'List domains';
@@ -1058,13 +1058,19 @@ exports.EXAMPLE_ROUTE_LIST = `
   ### list routes
   bdy distro route ls distro-identifier`;
 exports.EXAMPLE_ROUTE_CREATE = `
-  ### create proxy route to external url with domain
-  bdy distro route create distro-identifier --subdomain="test" --domain="abc.com" --target "url=https://example.com"
-  ### create proxy route to sandbox endpoint
+  ### --domain is the WHOLE zone string from \`bdy domain ls\` (apex like "example.com" or multi-level like "my-app.example.dev").
+  ### --subdomain is OPTIONAL and only prepends a NEW sub-name to that zone. Never split a multi-level zone — it goes whole into --domain.
+  ### route an apex zone you bought ("example.com") to an artifact
+  bdy distro route create distro-identifier --domain="example.com" --target "artifact=artifact-identifier:version"
+  ### route a multi-level zone you claimed ("my-app.example.dev") to an artifact — pass it WHOLE, do NOT split
+  bdy distro route create distro-identifier --domain="my-app.example.dev" --target "artifact=artifact-identifier:version"
+  ### route a NEW sub-name within a zone ("api.example.com") — subdomain is "api", zone is "example.com"
+  bdy distro route create distro-identifier --subdomain="api" --domain="example.com" --target "url=https://backend.internal"
+  ### route to a sandbox endpoint (no zone, distro's default domain is used)
   bdy distro route create distro-identifier --subdomain="sandbox" --target "sandbox=sandbox-identifier:endpoint-name"
-  ### create proxy route to artifact version in two locations
+  ### route to an artifact in two locations (default + Europe override)
   bdy distro route create distro-identifier --subdomain="artifact" --target "artifact=artifact-identifier:version" --target "region=Europe,artifact=artifact-identifier:version2"
-  ### create proxy route only for js files
+  ### route only for js files under a sub-name
   bdy distro route create distro-identifier --path="*.js" --subdomain="cdn" --target "artifact=artifact-identifier:version"
   ### create redirect route
   bdy distro route create distro-identifier --type="REDIRECT" --path="/my-url" --target "url=https://example.com/page"`;

package/distTs/src/tunnel/tunnel.js

@@ -652,6 +652,13 @@ class Tunnel extends events_1.default {
         if (!user || !user.name || !user.pass)
             return false;
         const client = this._getHttpAuthClient();
+        let ipAddress;
+        if (req.httpVersion === '2.0') {
+            ipAddress = req.socket.stream ? req.socket.stream.remoteAddress : '::1';
+        }
+        else {
+            ipAddress = req.socket.remoteAddress;
+        }
         try {
             const { statusCode, body } = await client.request({
                 path: `/tunnel/auth/pat`,
@@ -664,6 +671,7 @@ class Tunnel extends events_1.default {
                     agentId: this.agent.id,
                     login: user.name,
                     password: user.pass,
+                    ipAddress,
                 }),
             });
             if (statusCode !== 200) {

package/package.json

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