@dbx-tools/tunnel 0.6.130 → 0.6.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,6 +11,8 @@
11
11
  */
12
12
  import { spawn } from "node:child_process";
13
13
  import { type ProcessSupervisor } from "./supervisor.ts";
14
+ /** Remove pictographs from third-party process output before forwarding it. */
15
+ export declare function normalizePortrOutput(value: string): string;
14
16
  /** Options for installing the portr executable. */
15
17
  export interface PortrInstallOptions {
16
18
  /** Home directory containing `.portr`; defaults to the OS home directory. */
package/lib/src/portr.js CHANGED
@@ -13,6 +13,8 @@ import { execFile, spawn } from "node:child_process";
13
13
  import { writeFile } from "node:fs/promises";
14
14
  import os from "node:os";
15
15
  import { delimiter, join } from "node:path";
16
+ import { Transform } from "node:stream";
17
+ import { StringDecoder } from "node:string_decoder";
16
18
  import { promisify } from "node:util";
17
19
  import { bin, config } from "@dbx-tools/core";
18
20
  import { log } from "@dbx-tools/shared-core";
@@ -23,6 +25,24 @@ const PORTR_VERSION = "1.0.15-sse.2";
23
25
  const PORTR_RELEASE_URL = `https://github.com/reggie-db/portr/releases/download/v${PORTR_VERSION}`;
24
26
  const PORTR_MIN_VERSION = "v1.0.15";
25
27
  const execFileAsync = promisify(execFile);
28
+ const EMOJI = /\p{Extended_Pictographic}\uFE0F?/gu;
29
+ /** Remove pictographs from third-party process output before forwarding it. */
30
+ export function normalizePortrOutput(value) {
31
+ return value.replace(EMOJI, "").replace(/^[ \t]+/gm, "");
32
+ }
33
+ function normalizedOutput(destination) {
34
+ const decoder = new StringDecoder("utf8");
35
+ return new Transform({
36
+ transform(chunk, _encoding, callback) {
37
+ destination.write(normalizePortrOutput(decoder.write(chunk)));
38
+ callback();
39
+ },
40
+ flush(callback) {
41
+ destination.write(normalizePortrOutput(decoder.end()));
42
+ callback();
43
+ },
44
+ });
45
+ }
26
46
  /**
27
47
  * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an
28
48
  * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.
@@ -101,7 +121,10 @@ export async function startPortr(config, childEnv) {
101
121
  // Reclaim the subdomain from any portr left by a previous boot in this container.
102
122
  await execFileAsync("pkill", ["-x", "portr"]).catch(() => undefined);
103
123
  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);
104
- return spawn("portr", ["start"], { env: childEnv, stdio: "inherit" });
124
+ const child = spawn("portr", ["start"], { env: childEnv, stdio: ["inherit", "pipe", "pipe"] });
125
+ child.stdout?.pipe(normalizedOutput(process.stdout));
126
+ child.stderr?.pipe(normalizedOutput(process.stderr));
127
+ return child;
105
128
  }
106
129
  export function supervisePortr(config, childEnv) {
107
130
  return superviseProcessForever({
@@ -110,4 +133,4 @@ export function supervisePortr(config, childEnv) {
110
133
  start: () => startPortr(config, childEnv),
111
134
  });
112
135
  }
113
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portr.js","sourceRoot":"","sources":["../../src/portr.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * portr install, config, and launch support for the tunnel runtime.\n *\n * The binary and config use portr's conventional `$HOME/.portr` tree. The\n * install is idempotent (the installer skips an existing executable). The\n * config is rendered from `TUNNEL_PUBLIC_DOMAIN`\n * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port\n * (the proxy listens there).\n *\n * @module\n */\nimport { execFile, spawn } from \"node:child_process\";\nimport { writeFile } from \"node:fs/promises\";\nimport os from \"node:os\";\nimport { delimiter, join } from \"node:path\";\nimport { promisify } from \"node:util\";\n\nimport { bin, config } from \"@dbx-tools/core\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { TUNNEL_CONFIG } from \"./_config.ts\";\nimport { superviseProcessForever, type ProcessSupervisor } from \"./supervisor.ts\";\n\nconst logger = log.logger(\"tunnel:portr\");\nconst PORTR_VERSION = \"1.0.15-sse.2\";\nconst PORTR_RELEASE_URL = `https://github.com/reggie-db/portr/releases/download/v${PORTR_VERSION}`;\nconst PORTR_MIN_VERSION = \"v1.0.15\";\nconst execFileAsync = promisify(execFile);\n\n/** Options for installing the portr executable. */\nexport interface PortrInstallOptions {\n  /** Home directory containing `.portr`; defaults to the OS home directory. */\n  homeDir?: string;\n}\n\n/** Resolved portr wiring, or `undefined` when no tunnel is configured. */\nexport interface PortrConfig {\n  subdomain: string;\n  server: string;\n  token: string;\n  port: number;\n}\n\n/**\n * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an\n * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.\n * `demo.apps.dbx.tools`). Returns `undefined` (no tunnel) when the token or a\n * usable domain is absent.\n */\nexport function resolvePortrConfig(opts: {\n  publicDomain?: string;\n  subdomain?: string;\n  token?: string;\n  port: number;\n}): PortrConfig | undefined {\n  // PORTR_* is upstream portr's own namespace, so it keeps its name.\n  const token = config.string(opts.token, \"PORTR_TOKEN\");\n  const domain = config.string(opts.publicDomain, \"PUBLIC_DOMAIN\", TUNNEL_CONFIG);\n  if (!token) return undefined;\n  let subdomain = opts.subdomain;\n  let server: string | undefined;\n  if (domain) {\n    subdomain ??= domain.split(\".\")[0];\n    server = domain.slice(domain.indexOf(\".\") + 1);\n  }\n  server ??= config.text(\"PORTR_SERVER\");\n  if (!subdomain || !server || server === domain) return undefined;\n  return { subdomain, server, token, port: opts.port };\n}\n\n/** GitHub release asset name for the current or supplied OS/architecture. */\nexport function portrAssetName(\n  version: string,\n  platform: NodeJS.Platform = process.platform,\n  arch: string = process.arch,\n): string {\n  const osName = platform === \"darwin\" ? \"Darwin\" : platform === \"linux\" ? \"Linux\" : undefined;\n  const archName = arch === \"arm64\" ? \"arm64\" : arch === \"x64\" ? \"x86_64\" : undefined;\n  if (!osName || !archName) {\n    throw new Error(`portr has no supported release asset for ${platform}/${arch}`);\n  }\n  return `portr_${version}_${osName}_${archName}.zip`;\n}\n\nfunction portrDownloadUrl(): string {\n  const assetName = portrAssetName(PORTR_VERSION);\n  logger.info(\"installing portr\", { version: PORTR_VERSION, asset: assetName });\n  return `${PORTR_RELEASE_URL}/${assetName}`;\n}\n\n/** Install portr when absent and return the environment used by its process. */\nexport async function installPortr(options: PortrInstallOptions = {}): Promise<NodeJS.ProcessEnv> {\n  const homeDir = options.homeDir ?? os.homedir();\n  const context = await bin.ensure(\"portr\", portrDownloadUrl, {\n    autoUnpackage: true,\n    homeDir,\n    minVersion: PORTR_MIN_VERSION,\n    selector: ({ source }) => join(source, \"portr\"),\n    versionParser: (output) => {\n      const version = bin.parseVersion(output);\n      return version === PORTR_VERSION ? version : undefined;\n    },\n  });\n  return {\n    ...process.env,\n    HOME: homeDir,\n    PORTR_AUTO_ADD_PATH: \"no\",\n    PATH: [context.binDir, process.env.PATH ?? \"\"].join(delimiter),\n  };\n}\n\n/** Render `~/.portr/config.yaml` for the resolved tunnel. */\nexport async function writePortrConfig(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<void> {\n  const path = join(childEnv.HOME ?? os.homedir(), \".portr\", \"config.yaml\");\n  await writeFile(\n    path,\n    [\n      `server_url: ${config.server}`,\n      `ssh_url: ${config.server}:4444`,\n      `secret_key: ${config.token}`,\n      \"disable_dashboard: true\",\n      \"disable_tui: true\",\n      \"tunnels:\",\n      `  - name: ${config.subdomain}`,\n      `    subdomain: ${config.subdomain}`,\n      `    port: ${config.port}`,\n      \"\",\n    ].join(\"\\n\"),\n  );\n}\n\n/** Launch `portr start` as a child process (caller supervises + kills it). */\nexport async function startPortr(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<ReturnType<typeof spawn>> {\n  // Reclaim the subdomain from any portr left by a previous boot in this container.\n  await execFileAsync(\"pkill\", [\"-x\", \"portr\"]).catch(() => undefined);\n\n  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);\n  return spawn(\"portr\", [\"start\"], { env: childEnv, stdio: \"inherit\" });\n}\n\nexport function supervisePortr(config: PortrConfig, childEnv: NodeJS.ProcessEnv): ProcessSupervisor {\n  return superviseProcessForever({\n    name: \"portr\",\n    logger,\n    start: () => startPortr(config, childEnv),\n  });\n}\n"]}
136
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portr.js","sourceRoot":"","sources":["../../src/portr.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * portr install, config, and launch support for the tunnel runtime.\n *\n * The binary and config use portr's conventional `$HOME/.portr` tree. The\n * install is idempotent (the installer skips an existing executable). The\n * config is rendered from `TUNNEL_PUBLIC_DOMAIN`\n * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port\n * (the proxy listens there).\n *\n * @module\n */\nimport { execFile, spawn } from \"node:child_process\";\nimport { writeFile } from \"node:fs/promises\";\nimport os from \"node:os\";\nimport { delimiter, join } from \"node:path\";\nimport { Transform } from \"node:stream\";\nimport { StringDecoder } from \"node:string_decoder\";\nimport { promisify } from \"node:util\";\n\nimport { bin, config } from \"@dbx-tools/core\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { TUNNEL_CONFIG } from \"./_config.ts\";\nimport { superviseProcessForever, type ProcessSupervisor } from \"./supervisor.ts\";\n\nconst logger = log.logger(\"tunnel:portr\");\nconst PORTR_VERSION = \"1.0.15-sse.2\";\nconst PORTR_RELEASE_URL = `https://github.com/reggie-db/portr/releases/download/v${PORTR_VERSION}`;\nconst PORTR_MIN_VERSION = \"v1.0.15\";\nconst execFileAsync = promisify(execFile);\n\nconst EMOJI = /\\p{Extended_Pictographic}\\uFE0F?/gu;\n\n/** Remove pictographs from third-party process output before forwarding it. */\nexport function normalizePortrOutput(value: string): string {\n  return value.replace(EMOJI, \"\").replace(/^[ \\t]+/gm, \"\");\n}\n\nfunction normalizedOutput(destination: NodeJS.WriteStream): Transform {\n  const decoder = new StringDecoder(\"utf8\");\n  return new Transform({\n    transform(chunk, _encoding, callback) {\n      destination.write(normalizePortrOutput(decoder.write(chunk)));\n      callback();\n    },\n    flush(callback) {\n      destination.write(normalizePortrOutput(decoder.end()));\n      callback();\n    },\n  });\n}\n\n/** Options for installing the portr executable. */\nexport interface PortrInstallOptions {\n  /** Home directory containing `.portr`; defaults to the OS home directory. */\n  homeDir?: string;\n}\n\n/** Resolved portr wiring, or `undefined` when no tunnel is configured. */\nexport interface PortrConfig {\n  subdomain: string;\n  server: string;\n  token: string;\n  port: number;\n}\n\n/**\n * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an\n * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.\n * `demo.apps.dbx.tools`). Returns `undefined` (no tunnel) when the token or a\n * usable domain is absent.\n */\nexport function resolvePortrConfig(opts: {\n  publicDomain?: string;\n  subdomain?: string;\n  token?: string;\n  port: number;\n}): PortrConfig | undefined {\n  // PORTR_* is upstream portr's own namespace, so it keeps its name.\n  const token = config.string(opts.token, \"PORTR_TOKEN\");\n  const domain = config.string(opts.publicDomain, \"PUBLIC_DOMAIN\", TUNNEL_CONFIG);\n  if (!token) return undefined;\n  let subdomain = opts.subdomain;\n  let server: string | undefined;\n  if (domain) {\n    subdomain ??= domain.split(\".\")[0];\n    server = domain.slice(domain.indexOf(\".\") + 1);\n  }\n  server ??= config.text(\"PORTR_SERVER\");\n  if (!subdomain || !server || server === domain) return undefined;\n  return { subdomain, server, token, port: opts.port };\n}\n\n/** GitHub release asset name for the current or supplied OS/architecture. */\nexport function portrAssetName(\n  version: string,\n  platform: NodeJS.Platform = process.platform,\n  arch: string = process.arch,\n): string {\n  const osName = platform === \"darwin\" ? \"Darwin\" : platform === \"linux\" ? \"Linux\" : undefined;\n  const archName = arch === \"arm64\" ? \"arm64\" : arch === \"x64\" ? \"x86_64\" : undefined;\n  if (!osName || !archName) {\n    throw new Error(`portr has no supported release asset for ${platform}/${arch}`);\n  }\n  return `portr_${version}_${osName}_${archName}.zip`;\n}\n\nfunction portrDownloadUrl(): string {\n  const assetName = portrAssetName(PORTR_VERSION);\n  logger.info(\"installing portr\", { version: PORTR_VERSION, asset: assetName });\n  return `${PORTR_RELEASE_URL}/${assetName}`;\n}\n\n/** Install portr when absent and return the environment used by its process. */\nexport async function installPortr(options: PortrInstallOptions = {}): Promise<NodeJS.ProcessEnv> {\n  const homeDir = options.homeDir ?? os.homedir();\n  const context = await bin.ensure(\"portr\", portrDownloadUrl, {\n    autoUnpackage: true,\n    homeDir,\n    minVersion: PORTR_MIN_VERSION,\n    selector: ({ source }) => join(source, \"portr\"),\n    versionParser: (output) => {\n      const version = bin.parseVersion(output);\n      return version === PORTR_VERSION ? version : undefined;\n    },\n  });\n  return {\n    ...process.env,\n    HOME: homeDir,\n    PORTR_AUTO_ADD_PATH: \"no\",\n    PATH: [context.binDir, process.env.PATH ?? \"\"].join(delimiter),\n  };\n}\n\n/** Render `~/.portr/config.yaml` for the resolved tunnel. */\nexport async function writePortrConfig(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<void> {\n  const path = join(childEnv.HOME ?? os.homedir(), \".portr\", \"config.yaml\");\n  await writeFile(\n    path,\n    [\n      `server_url: ${config.server}`,\n      `ssh_url: ${config.server}:4444`,\n      `secret_key: ${config.token}`,\n      \"disable_dashboard: true\",\n      \"disable_tui: true\",\n      \"tunnels:\",\n      `  - name: ${config.subdomain}`,\n      `    subdomain: ${config.subdomain}`,\n      `    port: ${config.port}`,\n      \"\",\n    ].join(\"\\n\"),\n  );\n}\n\n/** Launch `portr start` as a child process (caller supervises + kills it). */\nexport async function startPortr(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<ReturnType<typeof spawn>> {\n  // Reclaim the subdomain from any portr left by a previous boot in this container.\n  await execFileAsync(\"pkill\", [\"-x\", \"portr\"]).catch(() => undefined);\n\n  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);\n  const child = spawn(\"portr\", [\"start\"], { env: childEnv, stdio: [\"inherit\", \"pipe\", \"pipe\"] });\n  child.stdout?.pipe(normalizedOutput(process.stdout));\n  child.stderr?.pipe(normalizedOutput(process.stderr));\n  return child;\n}\n\nexport function supervisePortr(config: PortrConfig, childEnv: NodeJS.ProcessEnv): ProcessSupervisor {\n  return superviseProcessForever({\n    name: \"portr\",\n    logger,\n    start: () => startPortr(config, childEnv),\n  });\n}\n"]}
package/package.json CHANGED
@@ -23,16 +23,16 @@
23
23
  "typescript": "^5.9.3"
24
24
  },
25
25
  "peerDependencies": {
26
- "@dbx-tools/email": "0.6.130"
26
+ "@dbx-tools/email": "0.6.131"
27
27
  },
28
28
  "dependencies": {
29
29
  "@databricks/appkit": "^0.60.0",
30
- "@dbx-tools/appkit": "0.6.130",
31
- "@dbx-tools/auth": "0.6.130",
32
- "@dbx-tools/core": "0.6.130",
33
- "@dbx-tools/email": "0.6.130",
34
- "@dbx-tools/shared-auth": "0.6.130",
35
- "@dbx-tools/shared-core": "0.6.130",
30
+ "@dbx-tools/appkit": "0.6.131",
31
+ "@dbx-tools/auth": "0.6.131",
32
+ "@dbx-tools/core": "0.6.131",
33
+ "@dbx-tools/email": "0.6.131",
34
+ "@dbx-tools/shared-auth": "0.6.131",
35
+ "@dbx-tools/shared-core": "0.6.131",
36
36
  "http-proxy-3": "^1.23.1"
37
37
  },
38
38
  "main": "./lib/index.js",
@@ -49,7 +49,7 @@
49
49
  "./package.json": "./package.json"
50
50
  }
51
51
  },
52
- "version": "0.6.130",
52
+ "version": "0.6.131",
53
53
  "types": "./lib/index.d.ts",
54
54
  "type": "module",
55
55
  "exports": {
package/src/portr.ts CHANGED
@@ -13,6 +13,8 @@ import { execFile, spawn } from "node:child_process";
13
13
  import { writeFile } from "node:fs/promises";
14
14
  import os from "node:os";
15
15
  import { delimiter, join } from "node:path";
16
+ import { Transform } from "node:stream";
17
+ import { StringDecoder } from "node:string_decoder";
16
18
  import { promisify } from "node:util";
17
19
 
18
20
  import { bin, config } from "@dbx-tools/core";
@@ -26,6 +28,27 @@ const PORTR_RELEASE_URL = `https://github.com/reggie-db/portr/releases/download/
26
28
  const PORTR_MIN_VERSION = "v1.0.15";
27
29
  const execFileAsync = promisify(execFile);
28
30
 
31
+ const EMOJI = /\p{Extended_Pictographic}\uFE0F?/gu;
32
+
33
+ /** Remove pictographs from third-party process output before forwarding it. */
34
+ export function normalizePortrOutput(value: string): string {
35
+ return value.replace(EMOJI, "").replace(/^[ \t]+/gm, "");
36
+ }
37
+
38
+ function normalizedOutput(destination: NodeJS.WriteStream): Transform {
39
+ const decoder = new StringDecoder("utf8");
40
+ return new Transform({
41
+ transform(chunk, _encoding, callback) {
42
+ destination.write(normalizePortrOutput(decoder.write(chunk)));
43
+ callback();
44
+ },
45
+ flush(callback) {
46
+ destination.write(normalizePortrOutput(decoder.end()));
47
+ callback();
48
+ },
49
+ });
50
+ }
51
+
29
52
  /** Options for installing the portr executable. */
30
53
  export interface PortrInstallOptions {
31
54
  /** Home directory containing `.portr`; defaults to the OS home directory. */
@@ -140,7 +163,10 @@ export async function startPortr(
140
163
  await execFileAsync("pkill", ["-x", "portr"]).catch(() => undefined);
141
164
 
142
165
  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);
143
- return spawn("portr", ["start"], { env: childEnv, stdio: "inherit" });
166
+ const child = spawn("portr", ["start"], { env: childEnv, stdio: ["inherit", "pipe", "pipe"] });
167
+ child.stdout?.pipe(normalizedOutput(process.stdout));
168
+ child.stderr?.pipe(normalizedOutput(process.stderr));
169
+ return child;
144
170
  }
145
171
 
146
172
  export function supervisePortr(config: PortrConfig, childEnv: NodeJS.ProcessEnv): ProcessSupervisor {