@dbx-tools/cli-tunnel 0.6.105 → 0.6.107
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.
- package/README.md +26 -14
- package/lib/src/cli.js +31 -11
- package/lib/src/options.d.ts +10 -1
- package/lib/src/options.js +14 -2
- package/package.json +8 -8
- package/src/cli.ts +29 -11
- package/src/options.ts +22 -1
package/README.md
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
# @dbx-tools/cli-tunnel
|
|
2
2
|
|
|
3
|
-
Wrap any command in a public [
|
|
4
|
-
|
|
3
|
+
Wrap any command in a public [Portr](https://github.com/amalshaji/portr),
|
|
4
|
+
[FRP](https://github.com/fatedier/frp), or combined tunnel fronted by
|
|
5
|
+
[`@dbx-tools/auth`](../../node/auth) email OTP and passkeys.
|
|
5
6
|
|
|
6
7
|
Run `dbx tunnel -- <command>` when a local or self-hosted process needs a public
|
|
7
8
|
URL that only approved email addresses can reach. The wrapper claims the public
|
|
@@ -11,12 +12,12 @@ about.
|
|
|
11
12
|
|
|
12
13
|
Key features:
|
|
13
14
|
|
|
14
|
-
-
|
|
15
|
+
- Portr, FRP, or both tunnel clients + a Better Auth passwordless gate around a command the
|
|
15
16
|
wrapper does not have to modify, import, or even be written in the same
|
|
16
17
|
language as.
|
|
17
18
|
- A reverse proxy that answers the login routes itself and forwards only
|
|
18
19
|
verified traffic to the wrapped process.
|
|
19
|
-
- Flag → environment → `databricks.yml` resolution for every gate and
|
|
20
|
+
- Flag → environment → `databricks.yml` resolution for every gate and tunnel
|
|
20
21
|
setting, delegated to [`@dbx-tools/tunnel`](../../node/tunnel) so the CLI
|
|
21
22
|
cannot drift from the in-process plugin.
|
|
22
23
|
- The same server-less `appkit.createApp` lifecycle as plugin mode. It can
|
|
@@ -75,16 +76,20 @@ subcommand, so `dbx tunnel -- cmd` and `dbx tunnel run -- cmd` are equivalent.
|
|
|
75
76
|
dbx tunnel status --allow databricks.com
|
|
76
77
|
```
|
|
77
78
|
|
|
78
|
-
The most common failure is a tunnel that silently does nothing because
|
|
79
|
-
|
|
80
|
-
config, and
|
|
79
|
+
The most common failure is a tunnel that silently does nothing because its
|
|
80
|
+
credentials or public domain did not resolve. `status` prints the fully resolved
|
|
81
|
+
ports, gate config, and client configs as JSON without starting a process.
|
|
81
82
|
|
|
82
83
|
```sh
|
|
83
84
|
dbx tunnel install
|
|
84
85
|
```
|
|
85
86
|
|
|
86
|
-
`install`
|
|
87
|
-
|
|
87
|
+
`install` defaults to Portr. Pass `frp` or `both` to preinstall those clients:
|
|
88
|
+
|
|
89
|
+
```sh
|
|
90
|
+
dbx tunnel install frp
|
|
91
|
+
dbx tunnel install both
|
|
92
|
+
```
|
|
88
93
|
|
|
89
94
|
## Commands And Flags
|
|
90
95
|
|
|
@@ -92,7 +97,7 @@ the download.
|
|
|
92
97
|
dbx tunnel [options] -- <command...> # wrap a command (default)
|
|
93
98
|
dbx tunnel run [options] -- <command...>
|
|
94
99
|
dbx tunnel status [options]
|
|
95
|
-
dbx tunnel install
|
|
100
|
+
dbx tunnel install [portr|frp|both]
|
|
96
101
|
```
|
|
97
102
|
|
|
98
103
|
Every flag below is accepted on the root command and on `run` / `status`.
|
|
@@ -101,8 +106,15 @@ Omitted values fall back to the environment, a `.env` file, then
|
|
|
101
106
|
|
|
102
107
|
| Flag | Meaning |
|
|
103
108
|
| ----------------------------- | ---------------------------------------------------------- |
|
|
104
|
-
| `--
|
|
109
|
+
| `--transport <mode>` | `portr` (default), `frp`, or `both` |
|
|
110
|
+
| `--public-domain <host>` | Portr public domain (`<subdomain>.<server>`) |
|
|
105
111
|
| `--subdomain <name>` | portr subdomain, else derived from the public domain |
|
|
112
|
+
| `--frp-public-domain <host>` | FRP public HTTP domain |
|
|
113
|
+
| `--frp-server <host>` | frps control host, else the FRP public domain |
|
|
114
|
+
| `--frp-server-port <port>` | frps control port (default `443`) |
|
|
115
|
+
| `--frp-protocol <protocol>` | frpc transport protocol (default `wss`) |
|
|
116
|
+
| `--frp-token <token>` | optional frps auth token |
|
|
117
|
+
| `--frp-proxy-name <name>` | frp proxy name, else the domain's first label |
|
|
106
118
|
| `--port <port>` | public port the wrapper listens on (`DATABRICKS_APP_PORT`) |
|
|
107
119
|
| `--app-port <port>` | private port the wrapped app binds, else a free one |
|
|
108
120
|
| `--allow <patterns...>` | email allow-list (domain, glob, or `/regex/`) |
|
|
@@ -126,7 +138,7 @@ local debugging, not for anything reachable.
|
|
|
126
138
|
|
|
127
139
|
## How A Request Flows
|
|
128
140
|
|
|
129
|
-
1. The wrapper binds the PUBLIC port - the one
|
|
141
|
+
1. The wrapper binds the PUBLIC port - the one tunnel clients and Databricks Apps
|
|
130
142
|
runtime route to - and spawns the command on a private loopback port.
|
|
131
143
|
2. A login route (`/auth/*`) is answered by the proxy itself, using the gate
|
|
132
144
|
handlers from a server-less AppKit app that supplies the code store, signing
|
|
@@ -134,8 +146,8 @@ local debugging, not for anything reachable.
|
|
|
134
146
|
3. Anything else goes through `gate.gateRequest`. A verified session is proxied
|
|
135
147
|
to the child with caller-supplied `x-` headers stripped; an unverified
|
|
136
148
|
request gets the login page or a `401`.
|
|
137
|
-
4.
|
|
138
|
-
|
|
149
|
+
4. The selected client(s) publish the public port. In `both` mode, configure
|
|
150
|
+
different Portr and FRP domains; the gate recognizes both hosts.
|
|
139
151
|
|
|
140
152
|
## Modules
|
|
141
153
|
|
package/lib/src/cli.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
import { spawn } from "node:child_process";
|
|
25
25
|
import { createServer } from "node:net";
|
|
26
26
|
import { log } from "@dbx-tools/shared-core";
|
|
27
|
-
import { portr } from "@dbx-tools/tunnel";
|
|
27
|
+
import { frp, portr } from "@dbx-tools/tunnel";
|
|
28
28
|
import { Command, CommanderError } from "commander";
|
|
29
29
|
import { resolveTunnelOptions } from "./options.js";
|
|
30
30
|
import { startProxy } from "./proxy.js";
|
|
@@ -55,7 +55,8 @@ function freePort() {
|
|
|
55
55
|
*/
|
|
56
56
|
function addOptions(command) {
|
|
57
57
|
return command
|
|
58
|
-
.option("--
|
|
58
|
+
.option("--transport <transport>", "public tunnel transport: portr, frp, or both")
|
|
59
|
+
.option("--public-domain <host>", "public tunnel domain")
|
|
59
60
|
.option("--subdomain <name>", "portr subdomain (else derived from the public domain)")
|
|
60
61
|
.option("--port <port>", "public port the wrapper listens on")
|
|
61
62
|
.option("--app-port <port>", "private port the wrapped app is told to bind")
|
|
@@ -71,6 +72,12 @@ function addOptions(command) {
|
|
|
71
72
|
.option("--forward-headers <patterns...>", "extra x- headers tunnel traffic may forward")
|
|
72
73
|
.option("--gate-path <prefix...>", "path prefixes to gate beyond /api/ (e.g. /ws)")
|
|
73
74
|
.option("--bind <host...>", "interface IPs the gate listens on (default: 0.0.0.0)")
|
|
75
|
+
.option("--frp-server <host>", "frps control host (default: FRP public domain)")
|
|
76
|
+
.option("--frp-public-domain <host>", "FRP public HTTP domain")
|
|
77
|
+
.option("--frp-server-port <port>", "frps control port (default: 443)")
|
|
78
|
+
.option("--frp-protocol <protocol>", "frpc transport protocol (default: wss)")
|
|
79
|
+
.option("--frp-token <token>", "frps auth token")
|
|
80
|
+
.option("--frp-proxy-name <name>", "frp proxy registration name")
|
|
74
81
|
.option("--insecure", "run open, with no gate");
|
|
75
82
|
}
|
|
76
83
|
/**
|
|
@@ -147,23 +154,29 @@ async function run(raw, command) {
|
|
|
147
154
|
brandName: resolved.gate.brandName,
|
|
148
155
|
bindHosts: resolved.bindHosts,
|
|
149
156
|
});
|
|
150
|
-
if (resolved.portr) {
|
|
157
|
+
if ((resolved.transport === "portr" || resolved.transport === "both") && resolved.portr) {
|
|
151
158
|
const portrEnv = await portr.installPortr();
|
|
152
159
|
await portr.writePortrConfig(resolved.portr, portrEnv);
|
|
153
160
|
children.push(await portr.startPortr(resolved.portr, portrEnv));
|
|
154
161
|
}
|
|
155
|
-
|
|
156
|
-
|
|
162
|
+
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
163
|
+
const frpEnv = await frp.installFrp();
|
|
164
|
+
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
165
|
+
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
166
|
+
}
|
|
167
|
+
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
168
|
+
if (!activeTunnelCount)
|
|
169
|
+
logger.info("no selected public tunnel is configured", {
|
|
170
|
+
transport: resolved.transport,
|
|
157
171
|
publicPort: resolved.publicPort,
|
|
158
172
|
});
|
|
159
|
-
}
|
|
160
173
|
supervise(children);
|
|
161
174
|
}
|
|
162
175
|
/** The `dbx tunnel` program. No side effects until parsed. */
|
|
163
176
|
export function buildProgram(name = "dbx tunnel") {
|
|
164
177
|
const program = addOptions(new Command()
|
|
165
178
|
.name(name)
|
|
166
|
-
.description("Front a command with a
|
|
179
|
+
.description("Front a command with a public tunnel and passwordless auth"));
|
|
167
180
|
// `run` is the DEFAULT action as well as a named subcommand, preserving the old
|
|
168
181
|
// wrapper's ergonomics (`dbx tunnel --allow x -- bun src/server.ts`) while
|
|
169
182
|
// leaving somewhere for `status` and `install` to live.
|
|
@@ -186,10 +199,17 @@ export function buildProgram(name = "dbx tunnel") {
|
|
|
186
199
|
});
|
|
187
200
|
program
|
|
188
201
|
.command("install")
|
|
189
|
-
.
|
|
190
|
-
.
|
|
191
|
-
|
|
202
|
+
.argument("[transport]", "portr, frp, or both", "portr")
|
|
203
|
+
.description("Install public tunnel client binaries and exit")
|
|
204
|
+
.action(async (transport) => {
|
|
205
|
+
if (transport === "portr" || transport === "both")
|
|
206
|
+
await portr.installPortr();
|
|
207
|
+
if (transport === "frp" || transport === "both")
|
|
208
|
+
await frp.installFrp();
|
|
209
|
+
if (transport !== "portr" && transport !== "frp" && transport !== "both") {
|
|
210
|
+
throw new CommanderError(1, "tunnel.invalid-transport", `invalid transport: ${transport}`);
|
|
211
|
+
}
|
|
192
212
|
});
|
|
193
213
|
return program;
|
|
194
214
|
}
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `dbx tunnel` - front a command with a public portr tunnel and passwordless gate.\n *\n * This is the WRAPPER path, and it exists for one case: a project that does not\n * use `@dbx-tools/appkit`'s `createApp`, and therefore cannot register\n * `tunnelInterceptor()` + the `authGate` plugin in-process. An AppKit app should\n * still take the plugin path - one process, no proxy hop, no duplicated header\n * handling.\n *\n * The wrapper claims the PUBLIC port (`DATABRICKS_APP_PORT`, the port the\n * platform and portr route to), moves the wrapped app to a private one, and\n * reverse-proxies between them so the gate sits in front of traffic it would\n * otherwise have no way to intercept. Everything else is delegated: the gate\n * config comes from `plugin.resolveAuthGateConfig`, the portr lifecycle from\n * `portr.*` - both the same functions the in-process path uses.\n *\n * Ships no bin. `@dbx-tools/cli` mounts `buildProgram()` as `dbx tunnel` lazily,\n * so `dbx dev` pays for none of this, and `--insecure` / `status` / `install`\n * never load AppKit or the SMTP stack either (the gate app is behind a dynamic\n * import).\n *\n * @module\n */\n\nimport { type ChildProcess, spawn } from \"node:child_process\";\nimport { createServer } from \"node:net\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { portr } from \"@dbx-tools/tunnel\";\nimport { Command, CommanderError } from \"commander\";\nimport { resolveTunnelOptions, type TunnelOptions } from \"./options.ts\";\nimport { startProxy } from \"./proxy.ts\";\n\nexport { CommanderError };\n\nconst logger = log.logger(\"tunnel\");\n\n/** How long a child gets to exit on SIGTERM before the wrapper leaves anyway. */\nconst SHUTDOWN_GRACE_MS = 3_000;\n\n/**\n * A free loopback port, from the OS rather than a random guess: binding `0` and\n * reading back what was assigned is the only way to know the port is actually\n * available, so two tunnels can run side by side without colliding.\n */\nfunction freePort(): Promise<number> {\n  return new Promise((resolve, reject) => {\n    const probe = createServer();\n    probe.on(\"error\", reject);\n    probe.listen(0, \"127.0.0.1\", () => {\n      const address = probe.address();\n      const port = typeof address === \"object\" && address ? address.port : 0;\n      probe.close(() => (port > 0 ? resolve(port) : reject(new Error(\"no free port\"))));\n    });\n  });\n}\n\n/**\n * Every gate/portr flag. Declared on the root command AND on `run`/`status` so\n * `dbx tunnel --allow x -- cmd` and `dbx tunnel run --allow x -- cmd` behave\n * identically - commander does not inherit options downward.\n */\nfunction addOptions(command: Command): Command {\n  return command\n    .option(\"--public-domain <host>\", \"portr public domain (<subdomain>.<server>)\")\n    .option(\"--subdomain <name>\", \"portr subdomain (else derived from the public domain)\")\n    .option(\"--port <port>\", \"public port the wrapper listens on\")\n    .option(\"--app-port <port>\", \"private port the wrapped app is told to bind\")\n    .option(\"--allow <patterns...>\", \"email allow-list (domain / glob / /regex/)\")\n    .option(\"--subject <text>\", \"verification email subject\")\n    .option(\"--brand-name <name>\", \"verification email brand name\")\n    .option(\"--message <text>\", \"verification email message\")\n    .option(\"--session-ttl <seconds>\", \"session lifetime\")\n    .option(\"--code-ttl <seconds>\", \"one-time-code lifetime\")\n    .option(\"--session-cutoff <when>\", \"invalidate every session issued before this\")\n    .option(\"--auth-storage <mode>\", \"auth database: auto, lakebase, or sqlite\")\n    .option(\"--auth-sqlite-path <path>\", \"local Better Auth SQLite file\")\n    .option(\"--forward-headers <patterns...>\", \"extra x- headers tunnel traffic may forward\")\n    .option(\"--gate-path <prefix...>\", \"path prefixes to gate beyond /api/ (e.g. /ws)\")\n    .option(\"--bind <host...>\", \"interface IPs the gate listens on (default: 0.0.0.0)\")\n    .option(\"--insecure\", \"run open, with no gate\");\n}\n\n/**\n * Tie the wrapper's lifetime to its children's, in both directions: a child that\n * exits takes the wrapper down with its code, and a signal to the wrapper is\n * forwarded before it leaves. Without this a crashed app leaves a portr tunnel\n * serving a dead port, which looks like a hang rather than a failure.\n */\nfunction supervise(children: readonly ChildProcess[]): void {\n  let stopping = false;\n  const stop = (code: number): void => {\n    if (stopping) return;\n    stopping = true;\n    for (const child of children) if (!child.killed) child.kill(\"SIGTERM\");\n    setTimeout(() => process.exit(code), SHUTDOWN_GRACE_MS).unref();\n  };\n  for (const child of children) child.on(\"exit\", (code) => stop(code ?? 1));\n  for (const signal of [\"SIGTERM\", \"SIGINT\", \"SIGHUP\"] as const) {\n    process.on(signal, () => stop(0));\n  }\n}\n\nasync function run(raw: TunnelOptions, command: readonly string[]): Promise<void> {\n  const [executable, ...args] = command;\n  const resolved = resolveTunnelOptions(raw);\n  const children: ChildProcess[] = [];\n\n  // Two upstream modes:\n  //   - WRAP: a command after `--`. The wrapper spawns it on a private loopback\n  //     port and is the only thing that talks to it.\n  //   - ATTACH: no command, but `--app-port` names an already-running upstream\n  //     (e.g. a local reverse proxy). The gate fronts it without spawning a\n  //     child. This is what lets the gate sit on an interface in front of a\n  //     separately-supervised stack.\n  let appPort: number;\n  if (executable) {\n    appPort = resolved.appPort ?? (await freePort());\n    const app = spawn(executable, args, {\n      env: {\n        ...process.env,\n        DATABRICKS_APP_PORT: String(appPort),\n        PORT: String(appPort),\n        HOST: \"127.0.0.1\",\n      },\n      stdio: \"inherit\",\n    });\n    children.push(app);\n  } else if (resolved.appPort) {\n    appPort = resolved.appPort;\n    logger.info(\"attaching gate to existing upstream\", { appPort });\n  } else {\n    throw new CommanderError(\n      1,\n      \"tunnel.no-upstream\",\n      \"no command given (pass it after `--`) and no --app-port to attach to\",\n    );\n  }\n\n  // Dynamic import: the gate is the only thing here that needs AppKit + SMTP, so\n  // an `--insecure` run never loads either.\n  const gate = resolved.gate.insecure\n    ? undefined\n    : await (\n        await import(\"./app.ts\")\n      ).startGateApp({\n        ...resolved.gateConfig,\n        publicDomain: resolved.gate.publicDomain ?? `localhost:${resolved.publicPort}`,\n      });\n  if (!gate) logger.warn(\"running OPEN - no gate is in front of this tunnel\");\n\n  await startProxy({\n    publicPort: resolved.publicPort,\n    appPort,\n    gate,\n    forwardHeaders: resolved.gate.forwardHeaders,\n    gatePaths: resolved.gate.gatePaths,\n    brandName: resolved.gate.brandName,\n    bindHosts: resolved.bindHosts,\n  });\n\n  if (resolved.portr) {\n    const portrEnv = await portr.installPortr();\n    await portr.writePortrConfig(resolved.portr, portrEnv);\n    children.push(await portr.startPortr(resolved.portr, portrEnv));\n  } else {\n    logger.info(\"no PORTR_TOKEN / TUNNEL_PUBLIC_DOMAIN - serving locally only\", {\n      publicPort: resolved.publicPort,\n    });\n  }\n  supervise(children);\n}\n\n/** The `dbx tunnel` program. No side effects until parsed. */\nexport function buildProgram(name = \"dbx tunnel\"): Command {\n  const program = addOptions(\n    new Command()\n      .name(name)\n      .description(\"Front a command with a portr tunnel and passwordless auth\"),\n  );\n\n  // `run` is the DEFAULT action as well as a named subcommand, preserving the old\n  // wrapper's ergonomics (`dbx tunnel --allow x -- bun src/server.ts`) while\n  // leaving somewhere for `status` and `install` to live.\n  program\n    .argument(\"[command...]\", \"the command to wrap, after `--`\")\n    .action(async (command: string[], _options: TunnelOptions, cmd: Command) => {\n      await run(cmd.opts<TunnelOptions>(), command);\n    });\n\n  addOptions(program.command(\"run\").description(\"Wrap a command (the default action)\"))\n    .argument(\"<command...>\", \"the command to wrap, after `--`\")\n    .action(async (command: string[], _options: TunnelOptions, cmd: Command) => {\n      await run(cmd.opts<TunnelOptions>(), command);\n    });\n\n  // Worth its own command: the most common failure is a tunnel that silently\n  // does nothing because no token or domain resolved, and this prints exactly\n  // what would happen without starting anything.\n  addOptions(\n    program.command(\"status\").description(\"Resolve the configuration and print it\"),\n  ).action((_options: TunnelOptions, cmd: Command) => {\n    const resolved = resolveTunnelOptions(cmd.opts<TunnelOptions>());\n    process.stdout.write(`${JSON.stringify(resolved, null, 2)}\\n`);\n  });\n\n  program\n    .command(\"install\")\n    .description(\"Install the portr binary and exit\")\n    .action(async () => {\n      await portr.installPortr();\n    });\n\n  return program;\n}\n"]}
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `dbx tunnel` - front a command with a public portr tunnel and passwordless gate.\n *\n * This is the WRAPPER path, and it exists for one case: a project that does not\n * use `@dbx-tools/appkit`'s `createApp`, and therefore cannot register\n * `tunnelInterceptor()` + the `authGate` plugin in-process. An AppKit app should\n * still take the plugin path - one process, no proxy hop, no duplicated header\n * handling.\n *\n * The wrapper claims the PUBLIC port (`DATABRICKS_APP_PORT`, the port the\n * platform and portr route to), moves the wrapped app to a private one, and\n * reverse-proxies between them so the gate sits in front of traffic it would\n * otherwise have no way to intercept. Everything else is delegated: the gate\n * config comes from `plugin.resolveAuthGateConfig`, the portr lifecycle from\n * `portr.*` - both the same functions the in-process path uses.\n *\n * Ships no bin. `@dbx-tools/cli` mounts `buildProgram()` as `dbx tunnel` lazily,\n * so `dbx dev` pays for none of this, and `--insecure` / `status` / `install`\n * never load AppKit or the SMTP stack either (the gate app is behind a dynamic\n * import).\n *\n * @module\n */\n\nimport { type ChildProcess, spawn } from \"node:child_process\";\nimport { createServer } from \"node:net\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { frp, portr } from \"@dbx-tools/tunnel\";\nimport { Command, CommanderError } from \"commander\";\nimport { resolveTunnelOptions, type TunnelOptions } from \"./options.ts\";\nimport { startProxy } from \"./proxy.ts\";\n\nexport { CommanderError };\n\nconst logger = log.logger(\"tunnel\");\n\n/** How long a child gets to exit on SIGTERM before the wrapper leaves anyway. */\nconst SHUTDOWN_GRACE_MS = 3_000;\n\n/**\n * A free loopback port, from the OS rather than a random guess: binding `0` and\n * reading back what was assigned is the only way to know the port is actually\n * available, so two tunnels can run side by side without colliding.\n */\nfunction freePort(): Promise<number> {\n  return new Promise((resolve, reject) => {\n    const probe = createServer();\n    probe.on(\"error\", reject);\n    probe.listen(0, \"127.0.0.1\", () => {\n      const address = probe.address();\n      const port = typeof address === \"object\" && address ? address.port : 0;\n      probe.close(() => (port > 0 ? resolve(port) : reject(new Error(\"no free port\"))));\n    });\n  });\n}\n\n/**\n * Every gate/portr flag. Declared on the root command AND on `run`/`status` so\n * `dbx tunnel --allow x -- cmd` and `dbx tunnel run --allow x -- cmd` behave\n * identically - commander does not inherit options downward.\n */\nfunction addOptions(command: Command): Command {\n  return command\n    .option(\"--transport <transport>\", \"public tunnel transport: portr, frp, or both\")\n    .option(\"--public-domain <host>\", \"public tunnel domain\")\n    .option(\"--subdomain <name>\", \"portr subdomain (else derived from the public domain)\")\n    .option(\"--port <port>\", \"public port the wrapper listens on\")\n    .option(\"--app-port <port>\", \"private port the wrapped app is told to bind\")\n    .option(\"--allow <patterns...>\", \"email allow-list (domain / glob / /regex/)\")\n    .option(\"--subject <text>\", \"verification email subject\")\n    .option(\"--brand-name <name>\", \"verification email brand name\")\n    .option(\"--message <text>\", \"verification email message\")\n    .option(\"--session-ttl <seconds>\", \"session lifetime\")\n    .option(\"--code-ttl <seconds>\", \"one-time-code lifetime\")\n    .option(\"--session-cutoff <when>\", \"invalidate every session issued before this\")\n    .option(\"--auth-storage <mode>\", \"auth database: auto, lakebase, or sqlite\")\n    .option(\"--auth-sqlite-path <path>\", \"local Better Auth SQLite file\")\n    .option(\"--forward-headers <patterns...>\", \"extra x- headers tunnel traffic may forward\")\n    .option(\"--gate-path <prefix...>\", \"path prefixes to gate beyond /api/ (e.g. /ws)\")\n    .option(\"--bind <host...>\", \"interface IPs the gate listens on (default: 0.0.0.0)\")\n    .option(\"--frp-server <host>\", \"frps control host (default: FRP public domain)\")\n    .option(\"--frp-public-domain <host>\", \"FRP public HTTP domain\")\n    .option(\"--frp-server-port <port>\", \"frps control port (default: 443)\")\n    .option(\"--frp-protocol <protocol>\", \"frpc transport protocol (default: wss)\")\n    .option(\"--frp-token <token>\", \"frps auth token\")\n    .option(\"--frp-proxy-name <name>\", \"frp proxy registration name\")\n    .option(\"--insecure\", \"run open, with no gate\");\n}\n\n/**\n * Tie the wrapper's lifetime to its children's, in both directions: a child that\n * exits takes the wrapper down with its code, and a signal to the wrapper is\n * forwarded before it leaves. Without this a crashed app leaves a portr tunnel\n * serving a dead port, which looks like a hang rather than a failure.\n */\nfunction supervise(children: readonly ChildProcess[]): void {\n  let stopping = false;\n  const stop = (code: number): void => {\n    if (stopping) return;\n    stopping = true;\n    for (const child of children) if (!child.killed) child.kill(\"SIGTERM\");\n    setTimeout(() => process.exit(code), SHUTDOWN_GRACE_MS).unref();\n  };\n  for (const child of children) child.on(\"exit\", (code) => stop(code ?? 1));\n  for (const signal of [\"SIGTERM\", \"SIGINT\", \"SIGHUP\"] as const) {\n    process.on(signal, () => stop(0));\n  }\n}\n\nasync function run(raw: TunnelOptions, command: readonly string[]): Promise<void> {\n  const [executable, ...args] = command;\n  const resolved = resolveTunnelOptions(raw);\n  const children: ChildProcess[] = [];\n\n  // Two upstream modes:\n  //   - WRAP: a command after `--`. The wrapper spawns it on a private loopback\n  //     port and is the only thing that talks to it.\n  //   - ATTACH: no command, but `--app-port` names an already-running upstream\n  //     (e.g. a local reverse proxy). The gate fronts it without spawning a\n  //     child. This is what lets the gate sit on an interface in front of a\n  //     separately-supervised stack.\n  let appPort: number;\n  if (executable) {\n    appPort = resolved.appPort ?? (await freePort());\n    const app = spawn(executable, args, {\n      env: {\n        ...process.env,\n        DATABRICKS_APP_PORT: String(appPort),\n        PORT: String(appPort),\n        HOST: \"127.0.0.1\",\n      },\n      stdio: \"inherit\",\n    });\n    children.push(app);\n  } else if (resolved.appPort) {\n    appPort = resolved.appPort;\n    logger.info(\"attaching gate to existing upstream\", { appPort });\n  } else {\n    throw new CommanderError(\n      1,\n      \"tunnel.no-upstream\",\n      \"no command given (pass it after `--`) and no --app-port to attach to\",\n    );\n  }\n\n  // Dynamic import: the gate is the only thing here that needs AppKit + SMTP, so\n  // an `--insecure` run never loads either.\n  const gate = resolved.gate.insecure\n    ? undefined\n    : await (\n        await import(\"./app.ts\")\n      ).startGateApp({\n        ...resolved.gateConfig,\n        publicDomain: resolved.gate.publicDomain ?? `localhost:${resolved.publicPort}`,\n      });\n  if (!gate) logger.warn(\"running OPEN - no gate is in front of this tunnel\");\n\n  await startProxy({\n    publicPort: resolved.publicPort,\n    appPort,\n    gate,\n    forwardHeaders: resolved.gate.forwardHeaders,\n    gatePaths: resolved.gate.gatePaths,\n    brandName: resolved.gate.brandName,\n    bindHosts: resolved.bindHosts,\n  });\n\n  if ((resolved.transport === \"portr\" || resolved.transport === \"both\") && resolved.portr) {\n    const portrEnv = await portr.installPortr();\n    await portr.writePortrConfig(resolved.portr, portrEnv);\n    children.push(await portr.startPortr(resolved.portr, portrEnv));\n  }\n  if ((resolved.transport === \"frp\" || resolved.transport === \"both\") && resolved.frp) {\n    const frpEnv = await frp.installFrp();\n    const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);\n    children.push(frp.startFrp(resolved.frp, frpEnv, configPath));\n  }\n  const activeTunnelCount = children.length - (executable ? 1 : 0);\n  if (!activeTunnelCount) logger.info(\"no selected public tunnel is configured\", {\n    transport: resolved.transport,\n    publicPort: resolved.publicPort,\n  });\n  supervise(children);\n}\n\n/** The `dbx tunnel` program. No side effects until parsed. */\nexport function buildProgram(name = \"dbx tunnel\"): Command {\n  const program = addOptions(\n    new Command()\n      .name(name)\n      .description(\"Front a command with a public tunnel and passwordless auth\"),\n  );\n\n  // `run` is the DEFAULT action as well as a named subcommand, preserving the old\n  // wrapper's ergonomics (`dbx tunnel --allow x -- bun src/server.ts`) while\n  // leaving somewhere for `status` and `install` to live.\n  program\n    .argument(\"[command...]\", \"the command to wrap, after `--`\")\n    .action(async (command: string[], _options: TunnelOptions, cmd: Command) => {\n      await run(cmd.opts<TunnelOptions>(), command);\n    });\n\n  addOptions(program.command(\"run\").description(\"Wrap a command (the default action)\"))\n    .argument(\"<command...>\", \"the command to wrap, after `--`\")\n    .action(async (command: string[], _options: TunnelOptions, cmd: Command) => {\n      await run(cmd.opts<TunnelOptions>(), command);\n    });\n\n  // Worth its own command: the most common failure is a tunnel that silently\n  // does nothing because no token or domain resolved, and this prints exactly\n  // what would happen without starting anything.\n  addOptions(\n    program.command(\"status\").description(\"Resolve the configuration and print it\"),\n  ).action((_options: TunnelOptions, cmd: Command) => {\n    const resolved = resolveTunnelOptions(cmd.opts<TunnelOptions>());\n    process.stdout.write(`${JSON.stringify(resolved, null, 2)}\\n`);\n  });\n\n  program\n    .command(\"install\")\n    .argument(\"[transport]\", \"portr, frp, or both\", \"portr\")\n    .description(\"Install public tunnel client binaries and exit\")\n    .action(async (transport: string) => {\n      if (transport === \"portr\" || transport === \"both\") await portr.installPortr();\n      if (transport === \"frp\" || transport === \"both\") await frp.installFrp();\n      if (transport !== \"portr\" && transport !== \"frp\" && transport !== \"both\") {\n        throw new CommanderError(1, \"tunnel.invalid-transport\", `invalid transport: ${transport}`);\n      }\n    });\n\n  return program;\n}\n"]}
|
package/lib/src/options.d.ts
CHANGED
|
@@ -12,9 +12,10 @@
|
|
|
12
12
|
* @module
|
|
13
13
|
*/
|
|
14
14
|
import type { AuthStorageMode } from "@dbx-tools/auth";
|
|
15
|
-
import { type AuthGateConfig, plugin, portr } from "@dbx-tools/tunnel";
|
|
15
|
+
import { type AuthGateConfig, frp, interceptor, plugin, portr } from "@dbx-tools/tunnel";
|
|
16
16
|
/** Raw commander flag values (every numeric flag arrives as a string). */
|
|
17
17
|
export interface TunnelOptions {
|
|
18
|
+
transport?: interceptor.TunnelTransport;
|
|
18
19
|
publicDomain?: string;
|
|
19
20
|
subdomain?: string;
|
|
20
21
|
port?: string | number;
|
|
@@ -32,6 +33,12 @@ export interface TunnelOptions {
|
|
|
32
33
|
gatePath?: string[];
|
|
33
34
|
bind?: string[];
|
|
34
35
|
insecure?: boolean;
|
|
36
|
+
frpServer?: string;
|
|
37
|
+
frpPublicDomain?: string;
|
|
38
|
+
frpServerPort?: string | number;
|
|
39
|
+
frpProtocol?: string;
|
|
40
|
+
frpToken?: string;
|
|
41
|
+
frpProxyName?: string;
|
|
35
42
|
}
|
|
36
43
|
export interface ResolvedTunnelOptions {
|
|
37
44
|
/** The port the wrapper itself listens on - what portr forwards to. */
|
|
@@ -40,6 +47,7 @@ export interface ResolvedTunnelOptions {
|
|
|
40
47
|
appPort?: number;
|
|
41
48
|
/** Interface IPs the gate listens on. Empty means the default (0.0.0.0). */
|
|
42
49
|
bindHosts: string[];
|
|
50
|
+
transport: interceptor.TunnelTransport;
|
|
43
51
|
/**
|
|
44
52
|
* The gate config as the `authGate` PLUGIN takes it - flags only, nothing
|
|
45
53
|
* resolved. Passed straight to the plugin so it applies its own fallbacks
|
|
@@ -49,5 +57,6 @@ export interface ResolvedTunnelOptions {
|
|
|
49
57
|
/** The same config after the plugin's resolution, for `status` and for routing. */
|
|
50
58
|
gate: plugin.ResolvedAuthGateConfig;
|
|
51
59
|
portr: ReturnType<typeof portr.resolvePortrConfig>;
|
|
60
|
+
frp: ReturnType<typeof frp.resolveFrpConfig>;
|
|
52
61
|
}
|
|
53
62
|
export declare function resolveTunnelOptions(options: TunnelOptions): ResolvedTunnelOptions;
|
package/lib/src/options.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*/
|
|
14
14
|
import { config } from "@dbx-tools/core";
|
|
15
15
|
import { object } from "@dbx-tools/shared-core";
|
|
16
|
-
import { plugin, portr } from "@dbx-tools/tunnel";
|
|
16
|
+
import { frp, interceptor, plugin, portr } from "@dbx-tools/tunnel";
|
|
17
17
|
export function resolveTunnelOptions(options) {
|
|
18
18
|
// The Databricks Apps runtime contract: the platform routes to
|
|
19
19
|
// DATABRICKS_APP_PORT, so the WRAPPER claims it and the wrapped app is moved
|
|
@@ -37,12 +37,15 @@ export function resolveTunnelOptions(options) {
|
|
|
37
37
|
gatePaths: options.gatePath,
|
|
38
38
|
insecure: options.insecure,
|
|
39
39
|
publicDomain: options.publicDomain,
|
|
40
|
+
publicDomains: options.frpPublicDomain ? [options.frpPublicDomain] : undefined,
|
|
40
41
|
};
|
|
41
42
|
const gate = plugin.resolveAuthGateConfig(gateConfig);
|
|
43
|
+
const transport = interceptor.resolveTunnelTransport(options.transport);
|
|
42
44
|
return {
|
|
43
45
|
publicPort,
|
|
44
46
|
...(appPort > 0 ? { appPort } : {}),
|
|
45
47
|
bindHosts: options.bind ?? [],
|
|
48
|
+
transport,
|
|
46
49
|
gateConfig,
|
|
47
50
|
gate,
|
|
48
51
|
portr: portr.resolvePortrConfig({
|
|
@@ -50,6 +53,15 @@ export function resolveTunnelOptions(options) {
|
|
|
50
53
|
subdomain: options.subdomain,
|
|
51
54
|
port: publicPort,
|
|
52
55
|
}),
|
|
56
|
+
frp: frp.resolveFrpConfig({
|
|
57
|
+
publicDomain: options.frpPublicDomain,
|
|
58
|
+
server: options.frpServer,
|
|
59
|
+
serverPort: options.frpServerPort,
|
|
60
|
+
protocol: options.frpProtocol,
|
|
61
|
+
token: options.frpToken,
|
|
62
|
+
proxyName: options.frpProxyName,
|
|
63
|
+
port: publicPort,
|
|
64
|
+
}),
|
|
53
65
|
};
|
|
54
66
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAuB,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAkDzF,MAAM,UAAU,oBAAoB,CAAC,OAAsB;IACzD,+DAA+D;IAC/D,6EAA6E;IAC7E,oBAAoB;IACpB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,EAAE,IAAI,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClF,MAAM,UAAU,GAAmB;QACjC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,0EAA0E;QAC1E,4EAA4E;QAC5E,kDAAkD;QAClD,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;QACtD,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QAChD,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS;KAC/E,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxE,OAAO;QACL,UAAU;QACV,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,SAAS,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;QAC7B,SAAS;QACT,UAAU;QACV,IAAI;QACJ,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC;YAC9B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,UAAU;SACjB,CAAC;QACF,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC;YACxB,YAAY,EAAE,OAAO,CAAC,eAAe;YACrC,MAAM,EAAE,OAAO,CAAC,SAAS;YACzB,UAAU,EAAE,OAAO,CAAC,aAAa;YACjC,QAAQ,EAAE,OAAO,CAAC,WAAW;YAC7B,KAAK,EAAE,OAAO,CAAC,QAAQ;YACvB,SAAS,EAAE,OAAO,CAAC,YAAY;YAC/B,IAAI,EAAE,UAAU;SACjB,CAAC;KACH,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Flag -> config -> default resolution for `dbx tunnel`.\n *\n * The point of this module is that it does almost NOTHING itself: every gate\n * setting is handed straight to `@dbx-tools/tunnel`'s own\n * `plugin.resolveAuthGateConfig`, which is the same function the in-process\n * plugin path calls. The CLI therefore cannot drift from the plugin on a default,\n * an env name, or a coercion rule - a flag is just a value passed where the\n * plugin's `config` object would go, and `config.*` fills the rest in from the\n * environment, a `.env` file, or `databricks.yml`.\n *\n * @module\n */\n\nimport type { AuthStorageMode } from \"@dbx-tools/auth\";\nimport { config } from \"@dbx-tools/core\";\nimport { object } from \"@dbx-tools/shared-core\";\nimport { type AuthGateConfig, frp, interceptor, plugin, portr } from \"@dbx-tools/tunnel\";\n\n/** Raw commander flag values (every numeric flag arrives as a string). */\nexport interface TunnelOptions {\n  transport?: interceptor.TunnelTransport;\n  publicDomain?: string;\n  subdomain?: string;\n  port?: string | number;\n  appPort?: string | number;\n  allow?: string[];\n  subject?: string;\n  brandName?: string;\n  message?: string;\n  sessionTtl?: string | number;\n  codeTtl?: string | number;\n  sessionCutoff?: string;\n  authStorage?: AuthStorageMode;\n  authSqlitePath?: string;\n  forwardHeaders?: string[];\n  gatePath?: string[];\n  bind?: string[];\n  insecure?: boolean;\n  frpServer?: string;\n  frpPublicDomain?: string;\n  frpServerPort?: string | number;\n  frpProtocol?: string;\n  frpToken?: string;\n  frpProxyName?: string;\n}\n\nexport interface ResolvedTunnelOptions {\n  /** The port the wrapper itself listens on - what portr forwards to. */\n  publicPort: number;\n  /** The private port the wrapped app is told to bind. Unset means \"pick one\". */\n  appPort?: number;\n  /** Interface IPs the gate listens on. Empty means the default (0.0.0.0). */\n  bindHosts: string[];\n  transport: interceptor.TunnelTransport;\n  /**\n   * The gate config as the `authGate` PLUGIN takes it - flags only, nothing\n   * resolved. Passed straight to the plugin so it applies its own fallbacks\n   * exactly once, in the one place that owns them.\n   */\n  gateConfig: AuthGateConfig;\n  /** The same config after the plugin's resolution, for `status` and for routing. */\n  gate: plugin.ResolvedAuthGateConfig;\n  portr: ReturnType<typeof portr.resolvePortrConfig>;\n  frp: ReturnType<typeof frp.resolveFrpConfig>;\n}\n\nexport function resolveTunnelOptions(options: TunnelOptions): ResolvedTunnelOptions {\n  // The Databricks Apps runtime contract: the platform routes to\n  // DATABRICKS_APP_PORT, so the WRAPPER claims it and the wrapped app is moved\n  // to a private one.\n  const publicPort = config.port(options.port, \"DATABRICKS_APP_PORT\", 8000);\n  const appPort = config.port(options.appPort, \"APP_PORT\", 0, { prefix: \"TUNNEL\" });\n  const gateConfig: AuthGateConfig = {\n    allow: options.allow,\n    subject: options.subject,\n    brandName: options.brandName,\n    message: options.message,\n    // Coerced, not resolved: the plugin owns the env name and the default for\n    // these, so the flag is passed through as the `config` value it expects and\n    // only needs a string -> number nudge on the way.\n    sessionTtlSeconds: object.toNumber(options.sessionTtl),\n    codeTtlSeconds: object.toNumber(options.codeTtl),\n    sessionCutoff: options.sessionCutoff,\n    storage: options.authStorage,\n    sqlitePath: options.authSqlitePath,\n    forwardHeaders: options.forwardHeaders,\n    gatePaths: options.gatePath,\n    insecure: options.insecure,\n    publicDomain: options.publicDomain,\n    publicDomains: options.frpPublicDomain ? [options.frpPublicDomain] : undefined,\n  };\n  const gate = plugin.resolveAuthGateConfig(gateConfig);\n  const transport = interceptor.resolveTunnelTransport(options.transport);\n  return {\n    publicPort,\n    ...(appPort > 0 ? { appPort } : {}),\n    bindHosts: options.bind ?? [],\n    transport,\n    gateConfig,\n    gate,\n    portr: portr.resolvePortrConfig({\n      publicDomain: gate.publicDomain,\n      subdomain: options.subdomain,\n      port: publicPort,\n    }),\n    frp: frp.resolveFrpConfig({\n      publicDomain: options.frpPublicDomain,\n      server: options.frpServer,\n      serverPort: options.frpServerPort,\n      protocol: options.frpProtocol,\n      token: options.frpToken,\n      proxyName: options.frpProxyName,\n      port: publicPort,\n    }),\n  };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@databricks/appkit": "^0.43.0",
|
|
27
|
-
"@dbx-tools/appkit": "0.6.
|
|
28
|
-
"@dbx-tools/auth": "0.6.
|
|
29
|
-
"@dbx-tools/core": "0.6.
|
|
30
|
-
"@dbx-tools/email": "0.6.
|
|
31
|
-
"@dbx-tools/shared-core": "0.6.
|
|
32
|
-
"@dbx-tools/shared-email": "0.6.
|
|
33
|
-
"@dbx-tools/tunnel": "0.6.
|
|
27
|
+
"@dbx-tools/appkit": "0.6.107",
|
|
28
|
+
"@dbx-tools/auth": "0.6.107",
|
|
29
|
+
"@dbx-tools/core": "0.6.107",
|
|
30
|
+
"@dbx-tools/email": "0.6.107",
|
|
31
|
+
"@dbx-tools/shared-core": "0.6.107",
|
|
32
|
+
"@dbx-tools/shared-email": "0.6.107",
|
|
33
|
+
"@dbx-tools/tunnel": "0.6.107",
|
|
34
34
|
"commander": "^15.0.0",
|
|
35
35
|
"http-proxy-3": "^1.23.1"
|
|
36
36
|
},
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"./package.json": "./package.json"
|
|
65
65
|
}
|
|
66
66
|
},
|
|
67
|
-
"version": "0.6.
|
|
67
|
+
"version": "0.6.107",
|
|
68
68
|
"types": "./lib/index.d.ts",
|
|
69
69
|
"type": "module",
|
|
70
70
|
"exports": {
|
package/src/cli.ts
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
import { type ChildProcess, spawn } from "node:child_process";
|
|
26
26
|
import { createServer } from "node:net";
|
|
27
27
|
import { log } from "@dbx-tools/shared-core";
|
|
28
|
-
import { portr } from "@dbx-tools/tunnel";
|
|
28
|
+
import { frp, portr } from "@dbx-tools/tunnel";
|
|
29
29
|
import { Command, CommanderError } from "commander";
|
|
30
30
|
import { resolveTunnelOptions, type TunnelOptions } from "./options.ts";
|
|
31
31
|
import { startProxy } from "./proxy.ts";
|
|
@@ -61,7 +61,8 @@ function freePort(): Promise<number> {
|
|
|
61
61
|
*/
|
|
62
62
|
function addOptions(command: Command): Command {
|
|
63
63
|
return command
|
|
64
|
-
.option("--
|
|
64
|
+
.option("--transport <transport>", "public tunnel transport: portr, frp, or both")
|
|
65
|
+
.option("--public-domain <host>", "public tunnel domain")
|
|
65
66
|
.option("--subdomain <name>", "portr subdomain (else derived from the public domain)")
|
|
66
67
|
.option("--port <port>", "public port the wrapper listens on")
|
|
67
68
|
.option("--app-port <port>", "private port the wrapped app is told to bind")
|
|
@@ -77,6 +78,12 @@ function addOptions(command: Command): Command {
|
|
|
77
78
|
.option("--forward-headers <patterns...>", "extra x- headers tunnel traffic may forward")
|
|
78
79
|
.option("--gate-path <prefix...>", "path prefixes to gate beyond /api/ (e.g. /ws)")
|
|
79
80
|
.option("--bind <host...>", "interface IPs the gate listens on (default: 0.0.0.0)")
|
|
81
|
+
.option("--frp-server <host>", "frps control host (default: FRP public domain)")
|
|
82
|
+
.option("--frp-public-domain <host>", "FRP public HTTP domain")
|
|
83
|
+
.option("--frp-server-port <port>", "frps control port (default: 443)")
|
|
84
|
+
.option("--frp-protocol <protocol>", "frpc transport protocol (default: wss)")
|
|
85
|
+
.option("--frp-token <token>", "frps auth token")
|
|
86
|
+
.option("--frp-proxy-name <name>", "frp proxy registration name")
|
|
80
87
|
.option("--insecure", "run open, with no gate");
|
|
81
88
|
}
|
|
82
89
|
|
|
@@ -158,15 +165,21 @@ async function run(raw: TunnelOptions, command: readonly string[]): Promise<void
|
|
|
158
165
|
bindHosts: resolved.bindHosts,
|
|
159
166
|
});
|
|
160
167
|
|
|
161
|
-
if (resolved.portr) {
|
|
168
|
+
if ((resolved.transport === "portr" || resolved.transport === "both") && resolved.portr) {
|
|
162
169
|
const portrEnv = await portr.installPortr();
|
|
163
170
|
await portr.writePortrConfig(resolved.portr, portrEnv);
|
|
164
171
|
children.push(await portr.startPortr(resolved.portr, portrEnv));
|
|
165
|
-
} else {
|
|
166
|
-
logger.info("no PORTR_TOKEN / TUNNEL_PUBLIC_DOMAIN - serving locally only", {
|
|
167
|
-
publicPort: resolved.publicPort,
|
|
168
|
-
});
|
|
169
172
|
}
|
|
173
|
+
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
174
|
+
const frpEnv = await frp.installFrp();
|
|
175
|
+
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
176
|
+
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
177
|
+
}
|
|
178
|
+
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
179
|
+
if (!activeTunnelCount) logger.info("no selected public tunnel is configured", {
|
|
180
|
+
transport: resolved.transport,
|
|
181
|
+
publicPort: resolved.publicPort,
|
|
182
|
+
});
|
|
170
183
|
supervise(children);
|
|
171
184
|
}
|
|
172
185
|
|
|
@@ -175,7 +188,7 @@ export function buildProgram(name = "dbx tunnel"): Command {
|
|
|
175
188
|
const program = addOptions(
|
|
176
189
|
new Command()
|
|
177
190
|
.name(name)
|
|
178
|
-
.description("Front a command with a
|
|
191
|
+
.description("Front a command with a public tunnel and passwordless auth"),
|
|
179
192
|
);
|
|
180
193
|
|
|
181
194
|
// `run` is the DEFAULT action as well as a named subcommand, preserving the old
|
|
@@ -205,9 +218,14 @@ export function buildProgram(name = "dbx tunnel"): Command {
|
|
|
205
218
|
|
|
206
219
|
program
|
|
207
220
|
.command("install")
|
|
208
|
-
.
|
|
209
|
-
.
|
|
210
|
-
|
|
221
|
+
.argument("[transport]", "portr, frp, or both", "portr")
|
|
222
|
+
.description("Install public tunnel client binaries and exit")
|
|
223
|
+
.action(async (transport: string) => {
|
|
224
|
+
if (transport === "portr" || transport === "both") await portr.installPortr();
|
|
225
|
+
if (transport === "frp" || transport === "both") await frp.installFrp();
|
|
226
|
+
if (transport !== "portr" && transport !== "frp" && transport !== "both") {
|
|
227
|
+
throw new CommanderError(1, "tunnel.invalid-transport", `invalid transport: ${transport}`);
|
|
228
|
+
}
|
|
211
229
|
});
|
|
212
230
|
|
|
213
231
|
return program;
|
package/src/options.ts
CHANGED
|
@@ -15,10 +15,11 @@
|
|
|
15
15
|
import type { AuthStorageMode } from "@dbx-tools/auth";
|
|
16
16
|
import { config } from "@dbx-tools/core";
|
|
17
17
|
import { object } from "@dbx-tools/shared-core";
|
|
18
|
-
import { type AuthGateConfig, plugin, portr } from "@dbx-tools/tunnel";
|
|
18
|
+
import { type AuthGateConfig, frp, interceptor, plugin, portr } from "@dbx-tools/tunnel";
|
|
19
19
|
|
|
20
20
|
/** Raw commander flag values (every numeric flag arrives as a string). */
|
|
21
21
|
export interface TunnelOptions {
|
|
22
|
+
transport?: interceptor.TunnelTransport;
|
|
22
23
|
publicDomain?: string;
|
|
23
24
|
subdomain?: string;
|
|
24
25
|
port?: string | number;
|
|
@@ -36,6 +37,12 @@ export interface TunnelOptions {
|
|
|
36
37
|
gatePath?: string[];
|
|
37
38
|
bind?: string[];
|
|
38
39
|
insecure?: boolean;
|
|
40
|
+
frpServer?: string;
|
|
41
|
+
frpPublicDomain?: string;
|
|
42
|
+
frpServerPort?: string | number;
|
|
43
|
+
frpProtocol?: string;
|
|
44
|
+
frpToken?: string;
|
|
45
|
+
frpProxyName?: string;
|
|
39
46
|
}
|
|
40
47
|
|
|
41
48
|
export interface ResolvedTunnelOptions {
|
|
@@ -45,6 +52,7 @@ export interface ResolvedTunnelOptions {
|
|
|
45
52
|
appPort?: number;
|
|
46
53
|
/** Interface IPs the gate listens on. Empty means the default (0.0.0.0). */
|
|
47
54
|
bindHosts: string[];
|
|
55
|
+
transport: interceptor.TunnelTransport;
|
|
48
56
|
/**
|
|
49
57
|
* The gate config as the `authGate` PLUGIN takes it - flags only, nothing
|
|
50
58
|
* resolved. Passed straight to the plugin so it applies its own fallbacks
|
|
@@ -54,6 +62,7 @@ export interface ResolvedTunnelOptions {
|
|
|
54
62
|
/** The same config after the plugin's resolution, for `status` and for routing. */
|
|
55
63
|
gate: plugin.ResolvedAuthGateConfig;
|
|
56
64
|
portr: ReturnType<typeof portr.resolvePortrConfig>;
|
|
65
|
+
frp: ReturnType<typeof frp.resolveFrpConfig>;
|
|
57
66
|
}
|
|
58
67
|
|
|
59
68
|
export function resolveTunnelOptions(options: TunnelOptions): ResolvedTunnelOptions {
|
|
@@ -79,12 +88,15 @@ export function resolveTunnelOptions(options: TunnelOptions): ResolvedTunnelOpti
|
|
|
79
88
|
gatePaths: options.gatePath,
|
|
80
89
|
insecure: options.insecure,
|
|
81
90
|
publicDomain: options.publicDomain,
|
|
91
|
+
publicDomains: options.frpPublicDomain ? [options.frpPublicDomain] : undefined,
|
|
82
92
|
};
|
|
83
93
|
const gate = plugin.resolveAuthGateConfig(gateConfig);
|
|
94
|
+
const transport = interceptor.resolveTunnelTransport(options.transport);
|
|
84
95
|
return {
|
|
85
96
|
publicPort,
|
|
86
97
|
...(appPort > 0 ? { appPort } : {}),
|
|
87
98
|
bindHosts: options.bind ?? [],
|
|
99
|
+
transport,
|
|
88
100
|
gateConfig,
|
|
89
101
|
gate,
|
|
90
102
|
portr: portr.resolvePortrConfig({
|
|
@@ -92,5 +104,14 @@ export function resolveTunnelOptions(options: TunnelOptions): ResolvedTunnelOpti
|
|
|
92
104
|
subdomain: options.subdomain,
|
|
93
105
|
port: publicPort,
|
|
94
106
|
}),
|
|
107
|
+
frp: frp.resolveFrpConfig({
|
|
108
|
+
publicDomain: options.frpPublicDomain,
|
|
109
|
+
server: options.frpServer,
|
|
110
|
+
serverPort: options.frpServerPort,
|
|
111
|
+
protocol: options.frpProtocol,
|
|
112
|
+
token: options.frpToken,
|
|
113
|
+
proxyName: options.frpProxyName,
|
|
114
|
+
port: publicPort,
|
|
115
|
+
}),
|
|
95
116
|
};
|
|
96
117
|
}
|