@dbx-tools/cli 0.9.121 → 0.9.122
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 +18 -18
- package/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/src/genie-code/runner.js +13 -18
- package/lib/src/lakebase-proxy/options.js +2 -2
- package/lib/src/tunnel/cli.js +20 -27
- package/package.json +19 -19
- package/src/genie-code/runner.ts +13 -21
- package/src/lakebase-proxy/options.ts +1 -1
- package/src/tunnel/cli.ts +23 -32
package/README.md
CHANGED
|
@@ -452,13 +452,13 @@ dbx lakebase-proxy [options] [command]
|
|
|
452
452
|
|
|
453
453
|
#### Options
|
|
454
454
|
|
|
455
|
-
| Option | Description
|
|
456
|
-
| --------------------------------------- |
|
|
457
|
-
| `-V, --version` | output the version number
|
|
458
|
-
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env:
|
|
459
|
-
| `-l, --listen <value>` | Loopback listener address. (default: tcp://localhost:5432, env: LISTEN)
|
|
460
|
-
| `-s, --startup-timeout-seconds <value>` | Startup timeout in seconds. (default: 30, env: STARTUP_TIMEOUT_SECONDS)
|
|
461
|
-
| `--profile <value>` | Exact Databricks profile. (env: DATABRICKS_CONFIG_PROFILE)
|
|
455
|
+
| Option | Description |
|
|
456
|
+
| --------------------------------------- | ----------------------------------------------------------------------- |
|
|
457
|
+
| `-V, --version` | output the version number |
|
|
458
|
+
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env: POSTGRES_ROLE) |
|
|
459
|
+
| `-l, --listen <value>` | Loopback listener address. (default: tcp://localhost:5432, env: LISTEN) |
|
|
460
|
+
| `-s, --startup-timeout-seconds <value>` | Startup timeout in seconds. (default: 30, env: STARTUP_TIMEOUT_SECONDS) |
|
|
461
|
+
| `--profile <value>` | Exact Databricks profile. (env: DATABRICKS_CONFIG_PROFILE) |
|
|
462
462
|
|
|
463
463
|
#### Commands
|
|
464
464
|
|
|
@@ -512,15 +512,15 @@ dbx lakebase-proxy service install [options]
|
|
|
512
512
|
|
|
513
513
|
#### Options
|
|
514
514
|
|
|
515
|
-
| Option | Description
|
|
516
|
-
| --------------------------------------- |
|
|
517
|
-
| `--no-start` | Do not start the service after installation
|
|
518
|
-
| `--python-project <path>` | Install a local Python project instead of the registry package
|
|
519
|
-
| `--offline` | Install Python packages from the uv cache without network access
|
|
520
|
-
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env:
|
|
521
|
-
| `-l, --listen <value>` | Loopback listener address. (default: tcp://localhost:5432, env: LISTEN)
|
|
522
|
-
| `-s, --startup-timeout-seconds <value>` | Startup timeout in seconds. (default: 30, env: STARTUP_TIMEOUT_SECONDS)
|
|
523
|
-
| `--profile <value>` | Exact Databricks profile. (env: DATABRICKS_CONFIG_PROFILE)
|
|
515
|
+
| Option | Description |
|
|
516
|
+
| --------------------------------------- | ----------------------------------------------------------------------- |
|
|
517
|
+
| `--no-start` | Do not start the service after installation |
|
|
518
|
+
| `--python-project <path>` | Install a local Python project instead of the registry package |
|
|
519
|
+
| `--offline` | Install Python packages from the uv cache without network access |
|
|
520
|
+
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env: POSTGRES_ROLE) |
|
|
521
|
+
| `-l, --listen <value>` | Loopback listener address. (default: tcp://localhost:5432, env: LISTEN) |
|
|
522
|
+
| `-s, --startup-timeout-seconds <value>` | Startup timeout in seconds. (default: 30, env: STARTUP_TIMEOUT_SECONDS) |
|
|
523
|
+
| `--profile <value>` | Exact Databricks profile. (env: DATABRICKS_CONFIG_PROFILE) |
|
|
524
524
|
|
|
525
525
|
### `dbx lakebase-proxy service start`
|
|
526
526
|
|
|
@@ -735,11 +735,11 @@ dbx graphiti [options] [command]
|
|
|
735
735
|
| `-m, --model-class <value>` | Optional chat capability class used when selecting a default model. (choices: "chat-thinking", "chat-balanced", "chat-fast", default: "chat-fast", env: MODEL_CLASS) |
|
|
736
736
|
| `-t, --temperature <value>` | Sampling temperature forwarded to the Graphiti LLM client. (default: 1, env: TEMPERATURE) |
|
|
737
737
|
| `--structured-output-mode <value>` | Structured-output mode forwarded to Graphiti's OpenAI provider. (default: "json_object", env: LLM_STRUCTURED_OUTPUT_MODE) |
|
|
738
|
-
| `--startup-timeout-ms <value>` | Maximum milliseconds allowed for the Graphiti runtime to become ready. (default: 180000, env:
|
|
738
|
+
| `--startup-timeout-ms <value>` | Maximum milliseconds allowed for the Graphiti runtime to become ready. (default: 180000, env: GRAPHITI_STARTUP_TIMEOUT_MS) |
|
|
739
739
|
| `-l, --listen <value>` | Graphiti HTTP listener. (default: tcp://127.0.0.1:7272, env: GRAPHITI_LISTEN) |
|
|
740
740
|
| `--database-url <value>` | PostgreSQL URL or Lakebase target. Omit it to use persistent embedded PostgreSQL. (env: LAKEBASE_ENDPOINT) |
|
|
741
741
|
| `--database-schema <value>` | PostgreSQL schema used for Lakebase graph tables. (default: "dbx_tools_graphiti", env: GRAPHITI_DATABASE_SCHEMA) |
|
|
742
|
-
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env:
|
|
742
|
+
| `--postgres-role <value>` | PostgreSQL role assumed after authentication. (env: POSTGRES_ROLE) |
|
|
743
743
|
|
|
744
744
|
#### Commands
|
|
745
745
|
|
package/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
5
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.122";
|
|
7
7
|
export * as appkitCli from "./src/appkit/cli.ts";
|
|
8
8
|
export * as appkitEnvExport from "./src/appkit/env-export.ts";
|
|
9
9
|
export * as authCli from "./src/auth/cli.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.122";
|
|
3
3
|
export * as appkitCli from "./src/appkit/cli.ts";
|
|
4
4
|
export * as appkitEnvExport from "./src/appkit/env-export.ts";
|
|
5
5
|
export * as authCli from "./src/auth/cli.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.122";
|
|
6
6
|
export * as appkitCli from "./src/appkit/cli.js";
|
|
7
7
|
export * as appkitEnvExport from "./src/appkit/env-export.js";
|
|
8
8
|
export * as authCli from "./src/auth/cli.js";
|
|
@@ -41,4 +41,4 @@ export { SSL_REQUEST, CANCEL_REQUEST, PROTOCOL_3, PostgresProtocolError } from "
|
|
|
41
41
|
export { LakebaseProxy } from "./src/lakebase-proxy/proxy.js";
|
|
42
42
|
export { workspaceRoot } from "./src/root.js";
|
|
43
43
|
export { TunnelOptionsSchema } from "./src/tunnel/options.js";
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxnQkFBZ0IsQ0FBQztBQUNuRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLGVBQWUsTUFBTSw0QkFBNEIsQ0FBQztBQUM5RCxPQUFPLEtBQUssT0FBTyxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sS0FBSyxXQUFXLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEtBQUssR0FBRyxNQUFNLGNBQWMsQ0FBQztBQUNwQyxPQUFPLEtBQUssR0FBRyxNQUFNLGNBQWMsQ0FBQztBQUNwQyxPQUFPLEtBQUssWUFBWSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxlQUFlLE1BQU0sNEJBQTRCLENBQUM7QUFDOUQsT0FBTyxLQUFLLGdCQUFnQixNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssZUFBZSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssV0FBVyxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxLQUFLLHlCQUF5QixNQUFNLHNDQUFzQyxDQUFDO0FBQ2xGLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssb0JBQW9CLE1BQU0saUNBQWlDLENBQUM7QUFDeEUsT0FBTyxLQUFLLHFCQUFxQixNQUFNLGtDQUFrQyxDQUFDO0FBQzFFLE9BQU8sS0FBSyxrQkFBa0IsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRSxPQUFPLEtBQUssZUFBZSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxrQkFBa0IsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRSxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQztBQUN0QyxPQUFPLEtBQUssU0FBUyxNQUFNLHFCQUFxQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLGFBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFOUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHekUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFHNUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFNUcsT0FBTyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsVUFBVSxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEgsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTlELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2NsaVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjEyMlwiO1xuZXhwb3J0ICogYXMgYXBwa2l0Q2xpIGZyb20gXCIuL3NyYy9hcHBraXQvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBhcHBraXRFbnZFeHBvcnQgZnJvbSBcIi4vc3JjL2FwcGtpdC9lbnYtZXhwb3J0LnRzXCI7XG5leHBvcnQgKiBhcyBhdXRoQ2xpIGZyb20gXCIuL3NyYy9hdXRoL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgYXV0aE9wdGlvbnMgZnJvbSBcIi4vc3JjL2F1dGgvb3B0aW9ucy50c1wiO1xuZXhwb3J0ICogYXMgYm9vdHN0cmFwIGZyb20gXCIuL3NyYy9ib290c3RyYXAudHNcIjtcbmV4cG9ydCAqIGFzIGJ1biBmcm9tIFwiLi9zcmMvYnVuLnRzXCI7XG5leHBvcnQgKiBhcyBjbGkgZnJvbSBcIi4vc3JjL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgZ2VuaWVDb2RlQ2xpIGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgZ2VuaWVDb2RlQ29uZmlnIGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2NvbmZpZy50c1wiO1xuZXhwb3J0ICogYXMgZ2VuaWVDb2RlSW5zdGFsbCBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9pbnN0YWxsLnRzXCI7XG5leHBvcnQgKiBhcyBnZW5pZUNvZGVPcHRpb25zIGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL29wdGlvbnMudHNcIjtcbmV4cG9ydCAqIGFzIGdlbmllQ29kZVJ1bm5lciBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9ydW5uZXIudHNcIjtcbmV4cG9ydCAqIGFzIGdlbmllQ29kZVJ1bnRpbWUgZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvcnVudGltZS50c1wiO1xuZXhwb3J0ICogYXMgZ3JhcGhpdGlDbGkgZnJvbSBcIi4vc3JjL2dyYXBoaXRpL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgZ3JhcGhpdGlPcHRpb25zIGZyb20gXCIuL3NyYy9ncmFwaGl0aS9vcHRpb25zLnRzXCI7XG5leHBvcnQgKiBhcyBsYWtlYmFzZVByb3h5Q2FuY2VsbGF0aW9uIGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9jYW5jZWxsYXRpb24udHNcIjtcbmV4cG9ydCAqIGFzIGxha2ViYXNlUHJveHlDbGkgZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L2NsaS50c1wiO1xuZXhwb3J0ICogYXMgbGFrZWJhc2VQcm94eU9wdGlvbnMgZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L29wdGlvbnMudHNcIjtcbmV4cG9ydCAqIGFzIGxha2ViYXNlUHJveHlQcm90b2NvbCBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvcHJvdG9jb2wudHNcIjtcbmV4cG9ydCAqIGFzIGxha2ViYXNlUHJveHlQcm94eSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvcHJveHkudHNcIjtcbmV4cG9ydCAqIGFzIG1vZGVsR2F0ZXdheUNsaSBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9jbGkudHNcIjtcbmV4cG9ydCAqIGFzIG1vZGVsR2F0ZXdheVNlcnZlciBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9zZXJ2ZXIudHNcIjtcbmV4cG9ydCAqIGFzIHJvb3QgZnJvbSBcIi4vc3JjL3Jvb3QudHNcIjtcbmV4cG9ydCAqIGFzIHR1bm5lbEFwcCBmcm9tIFwiLi9zcmMvdHVubmVsL2FwcC50c1wiO1xuZXhwb3J0ICogYXMgdHVubmVsQ2xpIGZyb20gXCIuL3NyYy90dW5uZWwvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyB0dW5uZWxPcHRpb25zIGZyb20gXCIuL3NyYy90dW5uZWwvb3B0aW9ucy50c1wiO1xuZXhwb3J0ICogYXMgdHVubmVsUHJveHkgZnJvbSBcIi4vc3JjL3R1bm5lbC9wcm94eS50c1wiO1xuZXhwb3J0IHsgRW52RXhwb3J0Rm9ybWF0U2NoZW1hLCBFbnZDb21tYW5kT3B0aW9uc1NjaGVtYSB9IGZyb20gXCIuL3NyYy9hcHBraXQvZW52LWV4cG9ydC50c1wiO1xuZXhwb3J0IHR5cGUgeyBFbnZFeHBvcnRGb3JtYXQsIEVudkNvbW1hbmRPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2FwcGtpdC9lbnYtZXhwb3J0LnRzXCI7XG5leHBvcnQgeyBBdXRoQ2xpT3B0aW9uc1NjaGVtYSwgVG9rZW5Db21tYW5kT3B0aW9uc1NjaGVtYSB9IGZyb20gXCIuL3NyYy9hdXRoL29wdGlvbnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgQXV0aENsaU9wdGlvbnMsIFRva2VuQ29tbWFuZE9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvYXV0aC9vcHRpb25zLnRzXCI7XG5leHBvcnQgeyByZXNvbHZlQnVuQXJndiB9IGZyb20gXCIuL3NyYy9idW4udHNcIjtcbmV4cG9ydCB0eXBlIHsgR2VuaWVDb2RlQ2xpRGVwZW5kZW5jaWVzIH0gZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvY2xpLnRzXCI7XG5leHBvcnQgeyBHRU5JRV9DT0RFX0dBVEVXQVlfUFJPVklERVIgfSBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9jb25maWcudHNcIjtcbmV4cG9ydCB0eXBlIHsgV3JpdGVHZW5pZUNvZGVDb25maWdPcHRpb25zLCBHZW5pZUNvZGVQcm9maWxlSG9tZSwgR2VuaWVDb2RlSG9tZSB9IGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2NvbmZpZy50c1wiO1xuZXhwb3J0IHR5cGUgeyBJbnN0YWxsR2VuaWVDb2RlT3B0aW9ucyB9IGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2luc3RhbGwudHNcIjtcbmV4cG9ydCB7IFJVTk5FUl9PUFRJT05TX0VOViB9IGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL3J1bm5lci50c1wiO1xuZXhwb3J0IHR5cGUgeyBHZW5pZUNvZGVSdW50aW1lRGVwZW5kZW5jaWVzLCBSdW5HZW5pZUNvZGVPcHRpb25zLCBQcmVwYXJlZEdlbmllQ29kZVJ1bnRpbWUgfSBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9ydW50aW1lLnRzXCI7XG5leHBvcnQgdHlwZSB7IEdyYXBoaXRpQ2xpRGVwZW5kZW5jaWVzLCBHcmFwaGl0aVNlcnZpY2VPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2dyYXBoaXRpL2NsaS50c1wiO1xuZXhwb3J0IHsgQ2FuY2VsbGF0aW9uUmVnaXN0cnkgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvY2FuY2VsbGF0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IENhbmNlbGxhdGlvblRhcmdldCwgQ2FuY2VsbGF0aW9uRm9yd2FyZGVyIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L2NhbmNlbGxhdGlvbi50c1wiO1xuZXhwb3J0IHR5cGUgeyBMYWtlYmFzZVByb3h5Q2xpRGVwZW5kZW5jaWVzIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L2NsaS50c1wiO1xuZXhwb3J0IHsgTGFrZWJhc2VQcm94eU9wdGlvbnNTY2hlbWEsIExha2ViYXNlUHJveHlVcmxPcHRpb25zU2NoZW1hIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L29wdGlvbnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJhc2VQcm94eU9wdGlvbnMsIFJlc29sdmVkTGFrZWJhc2VQcm94eU9wdGlvbnMsIExha2ViYXNlUHJveHlVcmxPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L29wdGlvbnMudHNcIjtcbmV4cG9ydCB7IFNTTF9SRVFVRVNULCBDQU5DRUxfUkVRVUVTVCwgUFJPVE9DT0xfMywgUG9zdGdyZXNQcm90b2NvbEVycm9yIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L3Byb3RvY29sLnRzXCI7XG5leHBvcnQgdHlwZSB7IFN0YXJ0dXBNZXNzYWdlLCBDYW5jZWxNZXNzYWdlLCBJbml0aWFsTWVzc2FnZSB9IGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9wcm90b2NvbC50c1wiO1xuZXhwb3J0IHsgTGFrZWJhc2VQcm94eSB9IGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9wcm94eS50c1wiO1xuZXhwb3J0IHR5cGUgeyBNb2RlbEdhdGV3YXlDbGlEZXBlbmRlbmNpZXMgfSBmcm9tIFwiLi9zcmMvbW9kZWwtZ2F0ZXdheS9jbGkudHNcIjtcbmV4cG9ydCB7IHdvcmtzcGFjZVJvb3QgfSBmcm9tIFwiLi9zcmMvcm9vdC50c1wiO1xuZXhwb3J0IHsgVHVubmVsT3B0aW9uc1NjaGVtYSB9IGZyb20gXCIuL3NyYy90dW5uZWwvb3B0aW9ucy50c1wiO1xuZXhwb3J0IHR5cGUgeyBUdW5uZWxPcHRpb25zLCBSZXNvbHZlZFR1bm5lbE9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvdHVubmVsL29wdGlvbnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgUHJveHlPcHRpb25zIH0gZnJvbSBcIi4vc3JjL3R1bm5lbC9wcm94eS50c1wiO1xuIl19
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { exec } from "@dbx-tools/core";
|
|
7
7
|
import { asyncUtils, log } from "@dbx-tools/shared-core";
|
|
8
8
|
import { GenieCodeRunnerOptionsSchema } from "@dbx-tools/shared-genie-code/options";
|
|
9
9
|
/** Private environment field carrying serialized runner options. */
|
|
@@ -50,26 +50,21 @@ export async function runGenieCodeChild(environment = process.env) {
|
|
|
50
50
|
executable: options.executable,
|
|
51
51
|
home: options.home,
|
|
52
52
|
});
|
|
53
|
-
const child =
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
env: {
|
|
59
|
-
...environment,
|
|
60
|
-
GENIE_HOME: options.home,
|
|
61
|
-
},
|
|
62
|
-
stdin: "inherit",
|
|
63
|
-
stdout: "inherit",
|
|
64
|
-
stderr: "inherit",
|
|
53
|
+
const child = exec.spawn(options.executable, [...options.arguments], {
|
|
54
|
+
cwd: process.cwd(),
|
|
55
|
+
env: {
|
|
56
|
+
...environment,
|
|
57
|
+
GENIE_HOME: options.home,
|
|
65
58
|
},
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
59
|
+
stdin: "inherit",
|
|
60
|
+
stdout: "inherit",
|
|
61
|
+
stderr: "inherit",
|
|
62
|
+
terminateTimeout: 5_000,
|
|
63
|
+
killTimeout: 1_000,
|
|
69
64
|
});
|
|
70
|
-
const result = await child
|
|
65
|
+
const result = await child;
|
|
71
66
|
if (result.exitCode !== 0)
|
|
72
67
|
process.exitCode = result.exitCode;
|
|
73
68
|
}
|
|
74
69
|
export { RUNNER_OPTIONS_ENV };
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2dlbmllLWNvZGUvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFFSCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVwRixvRUFBb0U7QUFDcEUsTUFBTSxrQkFBa0IsR0FBRyxnQ0FBZ0MsQ0FBQztBQUM1RCxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFFL0MsK0VBQStFO0FBQy9FLE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxjQUFpQyxPQUFPLENBQUMsR0FBRztJQUNqRixNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNuRCxJQUFJLENBQUMsVUFBVTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsR0FBRyxrQkFBa0IsY0FBYyxDQUFDLENBQUM7SUFDdEUsT0FBTyw0QkFBNEIsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLENBQUM7QUFFRCxrRkFBa0Y7QUFDbEYsTUFBTSxDQUFDLEtBQUssVUFBVSx1QkFBdUIsQ0FDM0MsU0FBaUIsRUFDakIsV0FBbUIsRUFDbkIsU0FBaUI7SUFFakIsSUFBSSxLQUFLLEVBQUUsTUFBTSxLQUFLLElBQUksVUFBVSxDQUFDLElBQUksQ0FDdkMsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRTtRQUNuQixJQUFJLENBQUM7WUFDSCxNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLEVBQUU7Z0JBQ3RDLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxVQUFVLFdBQVcsRUFBRSxFQUFFO2dCQUNuRCxNQUFNO2FBQ1AsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3JCLENBQUM7UUFBQyxNQUFNLENBQUM7WUFDUCxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUM7SUFDSCxDQUFDLEVBQ0Q7UUFDRSxVQUFVLEVBQUUsR0FBRztRQUNmLFNBQVM7UUFDVCxTQUFTLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSztLQUM3QixDQUNGLEVBQUUsQ0FBQztRQUNGLElBQUksS0FBSztZQUFFLE9BQU87SUFDcEIsQ0FBQztBQUNILENBQUM7QUFFRCxpRkFBaUY7QUFDakYsTUFBTSxDQUFDLEtBQUssVUFBVSxpQkFBaUIsQ0FDckMsY0FBaUMsT0FBTyxDQUFDLEdBQUc7SUFFNUMsTUFBTSxPQUFPLEdBQUcsc0JBQXNCLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDcEQsTUFBTSxDQUFDLElBQUksQ0FBQywyQkFBMkIsRUFBRTtRQUN2QyxPQUFPLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtRQUNqQyxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtLQUNwQyxDQUFDLENBQUM7SUFDSCxNQUFNLHVCQUF1QixDQUMzQixPQUFPLENBQUMsZ0JBQWdCLEVBQ3hCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FDekIsQ0FBQztJQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsMENBQTBDLEVBQUU7UUFDdEQsVUFBVSxFQUFFLE9BQU8sQ0FBQyxVQUFVO1FBQzlCLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtLQUNuQixDQUFDLENBQUM7SUFDSCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUNuRSxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtRQUNsQixHQUFHLEVBQUU7WUFDSCxHQUFHLFdBQVc7WUFDZCxVQUFVLEVBQUUsT0FBTyxDQUFDLElBQUk7U0FDekI7UUFDRCxLQUFLLEVBQUUsU0FBUztRQUNoQixNQUFNLEVBQUUsU0FBUztRQUNqQixNQUFNLEVBQUUsU0FBUztRQUNqQixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLFdBQVcsRUFBRSxLQUFLO0tBQ25CLENBQUMsQ0FBQztJQUNILE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDO0lBQzNCLElBQUksTUFBTSxDQUFDLFFBQVEsS0FBSyxDQUFDO1FBQUUsT0FBTyxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0FBQ2hFLENBQUM7QUFFRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogSW50ZXJuYWwgcmVhZGluZXNzIGdhdGUgYW5kIGludGVyYWN0aXZlIEdlbmllIENvZGUgY2hpbGQgcHJvY2Vzcy5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cblxuaW1wb3J0IHsgZXhlYyB9IGZyb20gXCJAZGJ4LXRvb2xzL2NvcmVcIjtcbmltcG9ydCB7IGFzeW5jVXRpbHMsIGxvZyB9IGZyb20gXCJAZGJ4LXRvb2xzL3NoYXJlZC1jb3JlXCI7XG5pbXBvcnQgeyBHZW5pZUNvZGVSdW5uZXJPcHRpb25zU2NoZW1hIH0gZnJvbSBcIkBkYngtdG9vbHMvc2hhcmVkLWdlbmllLWNvZGUvb3B0aW9uc1wiO1xuXG4vKiogUHJpdmF0ZSBlbnZpcm9ubWVudCBmaWVsZCBjYXJyeWluZyBzZXJpYWxpemVkIHJ1bm5lciBvcHRpb25zLiAqL1xuY29uc3QgUlVOTkVSX09QVElPTlNfRU5WID0gXCJEQlhfVE9PTFNfR0VOSUVfUlVOTkVSX09QVElPTlNcIjtcbmNvbnN0IGxvZ2dlciA9IGxvZy5sb2dnZXIoXCJnZW5pZS1jb2RlOnJ1bm5lclwiKTtcblxuLyoqIFBhcnNlIHRoZSBzZXJpYWxpemVkIHJ1bm5lciBib3VuZGFyeSBmcm9tIGl0cyBwcml2YXRlIGVudmlyb25tZW50IGZpZWxkLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGdlbmllQ29kZVJ1bm5lck9wdGlvbnMoZW52aXJvbm1lbnQ6IE5vZGVKUy5Qcm9jZXNzRW52ID0gcHJvY2Vzcy5lbnYpIHtcbiAgY29uc3Qgc2VyaWFsaXplZCA9IGVudmlyb25tZW50W1JVTk5FUl9PUFRJT05TX0VOVl07XG4gIGlmICghc2VyaWFsaXplZCkgdGhyb3cgbmV3IEVycm9yKGAke1JVTk5FUl9PUFRJT05TX0VOVn0gaXMgcmVxdWlyZWRgKTtcbiAgcmV0dXJuIEdlbmllQ29kZVJ1bm5lck9wdGlvbnNTY2hlbWEucGFyc2UoSlNPTi5wYXJzZShzZXJpYWxpemVkKSk7XG59XG5cbi8qKiBXYWl0IHVudGlsIHRoZSBndWFyZGVkIG1vZGVsLWdhdGV3YXkgaGVhbHRoIHJvdXRlIGFjY2VwdHMgdGhlIHJ1bm5lciB0b2tlbi4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3YWl0Rm9yR2VuaWVDb2RlR2F0ZXdheShcbiAgaGVhbHRoVXJsOiBzdHJpbmcsXG4gIGJlYXJlclRva2VuOiBzdHJpbmcsXG4gIHRpbWVvdXRNczogbnVtYmVyLFxuKTogUHJvbWlzZTx2b2lkPiB7XG4gIGZvciBhd2FpdCAoY29uc3QgcmVhZHkgb2YgYXN5bmNVdGlscy5wb2xsKFxuICAgIGFzeW5jICh7IHNpZ25hbCB9KSA9PiB7XG4gICAgICB0cnkge1xuICAgICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKGhlYWx0aFVybCwge1xuICAgICAgICAgIGhlYWRlcnM6IHsgYXV0aG9yaXphdGlvbjogYEJlYXJlciAke2JlYXJlclRva2VufWAgfSxcbiAgICAgICAgICBzaWduYWwsXG4gICAgICAgIH0pO1xuICAgICAgICByZXR1cm4gcmVzcG9uc2Uub2s7XG4gICAgICB9IGNhdGNoIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgfVxuICAgIH0sXG4gICAge1xuICAgICAgaW50ZXJ2YWxNczogMjAwLFxuICAgICAgdGltZW91dE1zLFxuICAgICAgcHJlZGljYXRlOiAocmVhZHkpID0+ICFyZWFkeSxcbiAgICB9LFxuICApKSB7XG4gICAgaWYgKHJlYWR5KSByZXR1cm47XG4gIH1cbn1cblxuLyoqIFJ1biBHZW5pZSBDb2RlIHdpdGggaW5oZXJpdGVkIHRlcm1pbmFsIHN0cmVhbXMgYWZ0ZXIgaXRzIGdhdGV3YXkgaXMgcmVhZHkuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gcnVuR2VuaWVDb2RlQ2hpbGQoXG4gIGVudmlyb25tZW50OiBOb2RlSlMuUHJvY2Vzc0VudiA9IHByb2Nlc3MuZW52LFxuKTogUHJvbWlzZTx2b2lkPiB7XG4gIGNvbnN0IG9wdGlvbnMgPSBnZW5pZUNvZGVSdW5uZXJPcHRpb25zKGVudmlyb25tZW50KTtcbiAgbG9nZ2VyLmluZm8oXCJ3YWl0aW5nIGZvciBtb2RlbCBnYXRld2F5XCIsIHtcbiAgICBnYXRld2F5OiBvcHRpb25zLmdhdGV3YXlIZWFsdGhVcmwsXG4gICAgdGltZW91dE1zOiBvcHRpb25zLnN0YXJ0dXBUaW1lb3V0TXMsXG4gIH0pO1xuICBhd2FpdCB3YWl0Rm9yR2VuaWVDb2RlR2F0ZXdheShcbiAgICBvcHRpb25zLmdhdGV3YXlIZWFsdGhVcmwsXG4gICAgb3B0aW9ucy5iZWFyZXJUb2tlbixcbiAgICBvcHRpb25zLnN0YXJ0dXBUaW1lb3V0TXMsXG4gICk7XG4gIGxvZ2dlci5pbmZvKFwibW9kZWwgZ2F0ZXdheSByZWFkeTsgc3RhcnRpbmcgR2VuaWUgQ29kZVwiLCB7XG4gICAgZXhlY3V0YWJsZTogb3B0aW9ucy5leGVjdXRhYmxlLFxuICAgIGhvbWU6IG9wdGlvbnMuaG9tZSxcbiAgfSk7XG4gIGNvbnN0IGNoaWxkID0gZXhlYy5zcGF3bihvcHRpb25zLmV4ZWN1dGFibGUsIFsuLi5vcHRpb25zLmFyZ3VtZW50c10sIHtcbiAgICBjd2Q6IHByb2Nlc3MuY3dkKCksXG4gICAgZW52OiB7XG4gICAgICAuLi5lbnZpcm9ubWVudCxcbiAgICAgIEdFTklFX0hPTUU6IG9wdGlvbnMuaG9tZSxcbiAgICB9LFxuICAgIHN0ZGluOiBcImluaGVyaXRcIixcbiAgICBzdGRvdXQ6IFwiaW5oZXJpdFwiLFxuICAgIHN0ZGVycjogXCJpbmhlcml0XCIsXG4gICAgdGVybWluYXRlVGltZW91dDogNV8wMDAsXG4gICAga2lsbFRpbWVvdXQ6IDFfMDAwLFxuICB9KTtcbiAgY29uc3QgcmVzdWx0ID0gYXdhaXQgY2hpbGQ7XG4gIGlmIChyZXN1bHQuZXhpdENvZGUgIT09IDApIHByb2Nlc3MuZXhpdENvZGUgPSByZXN1bHQuZXhpdENvZGU7XG59XG5cbmV4cG9ydCB7IFJVTk5FUl9PUFRJT05TX0VOViB9O1xuIl19
|
|
@@ -8,7 +8,7 @@ import { z } from "zod";
|
|
|
8
8
|
const text = (description) => z.string().trim().min(1).optional().describe(description);
|
|
9
9
|
export const LakebaseProxyOptionsSchema = z
|
|
10
10
|
.object({
|
|
11
|
-
...options.
|
|
11
|
+
...options.PostgresConfigOptionsSchema.shape,
|
|
12
12
|
listen: options
|
|
13
13
|
.listenAddressSchema({ port: 5432, loopback: true })
|
|
14
14
|
.describe("Loopback listener address."),
|
|
@@ -38,4 +38,4 @@ export const LakebaseProxyUrlOptionsSchema = z
|
|
|
38
38
|
export function resolveLakebaseProxyOptions(options = {}) {
|
|
39
39
|
return LakebaseProxyOptionsSchema.parse(options);
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sYWtlYmFzZS1wcm94eS9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFFSCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDakQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixNQUFNLElBQUksR0FBRyxDQUFDLFdBQW1CLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBRWhHLE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQUM7S0FDeEMsTUFBTSxDQUFDO0lBQ04sR0FBRyxPQUFPLENBQUMsMkJBQTJCLENBQUMsS0FBSztJQUM1QyxNQUFNLEVBQUUsT0FBTztTQUNaLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDbkQsUUFBUSxDQUFDLDRCQUE0QixDQUFDO0lBQ3pDLHFCQUFxQixFQUFFLENBQUMsQ0FBQyxNQUFNO1NBQzVCLE1BQU0sRUFBVTtTQUNoQixHQUFHLEVBQUU7U0FDTCxXQUFXLEVBQUU7U0FDYixPQUFPLENBQUMsRUFBRSxDQUFDO1NBQ1gsUUFBUSxDQUFDLDZCQUE2QixDQUFDO0lBQzFDLE9BQU8sRUFBRSxPQUFPLENBQUMsdUJBQXVCLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsMkJBQTJCLENBQUM7Q0FDN0YsQ0FBQztLQUNELE1BQU0sRUFBRTtLQUNSLFFBQVEsQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0FBRTVELE1BQU0sQ0FBQyxNQUFNLDZCQUE2QixHQUFHLENBQUM7S0FDM0MsTUFBTSxDQUFDO0lBQ04sTUFBTSxFQUFFLElBQUksQ0FBQyxnREFBZ0QsQ0FBQztJQUM5RCxnQkFBZ0IsRUFBRSxPQUFPLENBQUMscUJBQXFCLENBQUMsS0FBSyxDQUFDLGdCQUFnQjtJQUN0RSxNQUFNLEVBQUUsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLHNCQUFzQixDQUFDO0NBQ3JGLENBQUM7S0FDRCxNQUFNLEVBQUU7S0FDUixNQUFNLENBQ0wsQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEtBQUssU0FBUyxJQUFJLFVBQVUsQ0FBQyxnQkFBZ0IsS0FBSyxTQUFTLEVBQzVGO0lBQ0UsT0FBTyxFQUFFLGtDQUFrQztJQUMzQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUM7Q0FDakIsQ0FDRjtLQUNBLFFBQVEsQ0FBQyx5REFBeUQsQ0FBQyxDQUFDO0FBUXZFLDREQUE0RDtBQUM1RCxNQUFNLFVBQVUsMkJBQTJCLENBQ3pDLFVBQWdDLEVBQUU7SUFFbEMsT0FBTywwQkFBMEIsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDbkQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogTGFrZWJhc2UgcHJveHkgbGlzdGVuZXIsIHNlcnZpY2UsIGFuZCBVUkwgY29tbWFuZCBvcHRpb25zLlxuICpcbiAqIEBtb2R1bGVcbiAqL1xuXG5pbXBvcnQgeyBvcHRpb25zIH0gZnJvbSBcIkBkYngtdG9vbHMvc2hhcmVkLWNvcmVcIjtcbmltcG9ydCB7IHogfSBmcm9tIFwiem9kXCI7XG5cbmNvbnN0IHRleHQgPSAoZGVzY3JpcHRpb246IHN0cmluZykgPT4gei5zdHJpbmcoKS50cmltKCkubWluKDEpLm9wdGlvbmFsKCkuZGVzY3JpYmUoZGVzY3JpcHRpb24pO1xuXG5leHBvcnQgY29uc3QgTGFrZWJhc2VQcm94eU9wdGlvbnNTY2hlbWEgPSB6XG4gIC5vYmplY3Qoe1xuICAgIC4uLm9wdGlvbnMuUG9zdGdyZXNDb25maWdPcHRpb25zU2NoZW1hLnNoYXBlLFxuICAgIGxpc3Rlbjogb3B0aW9uc1xuICAgICAgLmxpc3RlbkFkZHJlc3NTY2hlbWEoeyBwb3J0OiA1NDMyLCBsb29wYmFjazogdHJ1ZSB9KVxuICAgICAgLmRlc2NyaWJlKFwiTG9vcGJhY2sgbGlzdGVuZXIgYWRkcmVzcy5cIiksXG4gICAgc3RhcnR1cFRpbWVvdXRTZWNvbmRzOiB6LmNvZXJjZVxuICAgICAgLm51bWJlcjxudW1iZXI+KClcbiAgICAgIC5pbnQoKVxuICAgICAgLm5vbm5lZ2F0aXZlKClcbiAgICAgIC5kZWZhdWx0KDMwKVxuICAgICAgLmRlc2NyaWJlKFwiU3RhcnR1cCB0aW1lb3V0IGluIHNlY29uZHMuXCIpLFxuICAgIHByb2ZpbGU6IG9wdGlvbnMuRGF0YWJyaWNrc09wdGlvbnNTY2hlbWEuc2hhcGUucHJvZmlsZS5kZXNjcmliZShcIkV4YWN0IERhdGFicmlja3MgcHJvZmlsZS5cIiksXG4gIH0pXG4gIC5zdHJpY3QoKVxuICAuZGVzY3JpYmUoXCJMYWtlYmFzZSBwcm94eSBsaXN0ZW5lciBhbmQgc2VydmljZSBvcHRpb25zLlwiKTtcblxuZXhwb3J0IGNvbnN0IExha2ViYXNlUHJveHlVcmxPcHRpb25zU2NoZW1hID0gelxuICAub2JqZWN0KHtcbiAgICB0YXJnZXQ6IHRleHQoXCJMYWtlYmFzZSBwcm9qZWN0LCByZXNvdXJjZSBwYXRoLCBob3N0LCBvciBVUkwuXCIpLFxuICAgIGxha2ViYXNlRW5kcG9pbnQ6IG9wdGlvbnMuTGFrZWJhc2VPcHRpb25zU2NoZW1hLnNoYXBlLmxha2ViYXNlRW5kcG9pbnQsXG4gICAgbGlzdGVuOiBvcHRpb25zLmxpc3RlbkFkZHJlc3NTY2hlbWEoeyBwb3J0OiA1NDMyIH0pLmRlc2NyaWJlKFwiTG9jYWwgcHJveHkgYWRkcmVzcy5cIiksXG4gIH0pXG4gIC5zdHJpY3QoKVxuICAucmVmaW5lKFxuICAgIChjb25maWd1cmVkKSA9PiBjb25maWd1cmVkLnRhcmdldCAhPT0gdW5kZWZpbmVkIHx8IGNvbmZpZ3VyZWQubGFrZWJhc2VFbmRwb2ludCAhPT0gdW5kZWZpbmVkLFxuICAgIHtcbiAgICAgIG1lc3NhZ2U6IFwiVVJMIHJlcXVpcmVzIHRhcmdldCBvciBlbmRwb2ludC5cIixcbiAgICAgIHBhdGg6IFtcInRhcmdldFwiXSxcbiAgICB9LFxuICApXG4gIC5kZXNjcmliZShcIk9wdGlvbnMgZm9yIGZvcm1hdHRpbmcgYSBsb2NhbCBMYWtlYmFzZSBQb3N0Z3JlU1FMIFVSTC5cIik7XG5cbmV4cG9ydCB0eXBlIExha2ViYXNlUHJveHlPcHRpb25zID0gei5pbnB1dDx0eXBlb2YgTGFrZWJhc2VQcm94eU9wdGlvbnNTY2hlbWE+O1xuXG5leHBvcnQgdHlwZSBSZXNvbHZlZExha2ViYXNlUHJveHlPcHRpb25zID0gei5vdXRwdXQ8dHlwZW9mIExha2ViYXNlUHJveHlPcHRpb25zU2NoZW1hPjtcblxuZXhwb3J0IHR5cGUgTGFrZWJhc2VQcm94eVVybE9wdGlvbnMgPSB6Lm91dHB1dDx0eXBlb2YgTGFrZWJhc2VQcm94eVVybE9wdGlvbnNTY2hlbWE+O1xuXG4vKiogVmFsaWRhdGUgYW5kIGRlZmF1bHQgTGFrZWJhc2UgcHJveHkgbGlzdGVuZXIgb3B0aW9ucy4gKi9cbmV4cG9ydCBmdW5jdGlvbiByZXNvbHZlTGFrZWJhc2VQcm94eU9wdGlvbnMoXG4gIG9wdGlvbnM6IExha2ViYXNlUHJveHlPcHRpb25zID0ge30sXG4pOiBSZXNvbHZlZExha2ViYXNlUHJveHlPcHRpb25zIHtcbiAgcmV0dXJuIExha2ViYXNlUHJveHlPcHRpb25zU2NoZW1hLnBhcnNlKG9wdGlvbnMpO1xufVxuIl19
|
package/lib/src/tunnel/cli.js
CHANGED
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
* @module
|
|
23
23
|
*/
|
|
24
24
|
import { createServer } from "node:net";
|
|
25
|
-
import { AppKitChildProcess } from "@dbx-tools/appkit/child-process";
|
|
26
25
|
import { addArgs, parseArgs } from "@dbx-tools/cli-args";
|
|
26
|
+
import { exec } from "@dbx-tools/core";
|
|
27
27
|
import { log } from "@dbx-tools/shared-core";
|
|
28
28
|
import { frp, interceptor, portr } from "@dbx-tools/tunnel";
|
|
29
29
|
import { Command, CommanderError } from "commander";
|
|
@@ -48,10 +48,10 @@ function freePort() {
|
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
|
-
* Tie the wrapper's lifetime to its children
|
|
52
|
-
*
|
|
53
|
-
*
|
|
54
|
-
*
|
|
51
|
+
* Tie the wrapper's lifetime to its children: a child that exits takes the
|
|
52
|
+
* wrapper down with its code. Core exec owns parent termination forwarding for
|
|
53
|
+
* every spawned child. Without this a crashed app leaves a portr tunnel serving
|
|
54
|
+
* a dead port, which looks like a hang rather than a failure.
|
|
55
55
|
*/
|
|
56
56
|
function supervise(children) {
|
|
57
57
|
let stopping = false;
|
|
@@ -64,10 +64,7 @@ function supervise(children) {
|
|
|
64
64
|
});
|
|
65
65
|
};
|
|
66
66
|
for (const child of children) {
|
|
67
|
-
void child.
|
|
68
|
-
}
|
|
69
|
-
for (const signal of ["SIGTERM", "SIGINT", "SIGHUP"]) {
|
|
70
|
-
process.on(signal, () => stop(0));
|
|
67
|
+
void child.on("exit", (code) => stop(code ?? 1));
|
|
71
68
|
}
|
|
72
69
|
}
|
|
73
70
|
async function run(raw, command) {
|
|
@@ -84,22 +81,18 @@ async function run(raw, command) {
|
|
|
84
81
|
let appPort;
|
|
85
82
|
if (executable) {
|
|
86
83
|
appPort = resolved.appPort ?? (await freePort());
|
|
87
|
-
const app =
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
DATABRICKS_APP_PORT: String(appPort),
|
|
94
|
-
PORT: String(appPort),
|
|
95
|
-
HOST: "127.0.0.1",
|
|
96
|
-
},
|
|
97
|
-
stdin: "inherit",
|
|
98
|
-
stdout: "inherit",
|
|
99
|
-
stderr: "inherit",
|
|
84
|
+
const app = exec.spawn(executable, args, {
|
|
85
|
+
env: {
|
|
86
|
+
...process.env,
|
|
87
|
+
DATABRICKS_APP_PORT: String(appPort),
|
|
88
|
+
PORT: String(appPort),
|
|
89
|
+
HOST: "127.0.0.1",
|
|
100
90
|
},
|
|
101
|
-
|
|
102
|
-
|
|
91
|
+
stdin: "inherit",
|
|
92
|
+
stdout: "inherit",
|
|
93
|
+
stderr: "inherit",
|
|
94
|
+
terminateTimeout: 10_000,
|
|
95
|
+
});
|
|
103
96
|
children.push(app);
|
|
104
97
|
}
|
|
105
98
|
else if (resolved.appPort) {
|
|
@@ -131,12 +124,12 @@ async function run(raw, command) {
|
|
|
131
124
|
if ((resolved.transport === "portr" || resolved.transport === "both") && resolved.portr) {
|
|
132
125
|
const portrEnv = await portr.installPortr();
|
|
133
126
|
await portr.writePortrConfig(resolved.portr, portrEnv);
|
|
134
|
-
children.push(
|
|
127
|
+
children.push(portr.startPortr(resolved.portr, portrEnv));
|
|
135
128
|
}
|
|
136
129
|
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
137
130
|
const frpEnv = await frp.installFrp();
|
|
138
131
|
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
139
|
-
children.push(
|
|
132
|
+
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
140
133
|
}
|
|
141
134
|
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
142
135
|
if (!activeTunnelCount) {
|
|
@@ -187,4 +180,4 @@ export function buildProgram(name = "dbx tunnel") {
|
|
|
187
180
|
});
|
|
188
181
|
return program;
|
|
189
182
|
}
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/tunnel/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 { createServer } from \"node:net\";\nimport { AppKitChildProcess } from \"@dbx-tools/appkit/child-process\";\nimport { addArgs, parseArgs } from \"@dbx-tools/cli-args\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { frp, interceptor, portr } from \"@dbx-tools/tunnel\";\nimport { Command, CommanderError } from \"commander\";\n\nimport { resolveTunnelOptions, TunnelOptionsSchema, type TunnelOptions } from \"./options.ts\";\nimport { startProxy } from \"./proxy.ts\";\n\nexport { CommanderError };\n\nconst logger = log.logger(\"tunnel\");\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 * 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 AppKitChildProcess[]): void {\n  let stopping = false;\n  const stop = (code: number): void => {\n    if (stopping) return;\n    stopping = true;\n    void Promise.allSettled(children.map((child) => child.shutdown())).then(() => {\n      process.exit(code);\n    });\n  };\n  for (const child of children) {\n    void child.process?.on(\"exit\", (code) => stop(code ?? 1));\n  }\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: AppKitChildProcess[] = [];\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 = new AppKitChildProcess(\n      [\n        executable,\n        args,\n        {\n          env: {\n            ...process.env,\n            DATABRICKS_APP_PORT: String(appPort),\n            PORT: String(appPort),\n            HOST: \"127.0.0.1\",\n          },\n          stdin: \"inherit\",\n          stdout: \"inherit\",\n          stderr: \"inherit\",\n        },\n      ],\n      { gracefulTimeoutMs: 10_000 },\n    );\n    await app.start();\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(await frp.startFrp(resolved.frp, frpEnv, configPath));\n  }\n  const activeTunnelCount = children.length - (executable ? 1 : 0);\n  if (!activeTunnelCount) {\n    logger.info(\"no selected public tunnel is configured\", {\n      transport: resolved.transport,\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 = addArgs(\n    new Command()\n      .name(name)\n      .description(\"Front a command with a public tunnel and passwordless auth\"),\n    TunnelOptionsSchema,\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[]) => {\n      await run(parseArgs(program, TunnelOptionsSchema), command);\n    });\n\n  const runCommand = addArgs(\n    program.command(\"run\").description(\"Wrap a command (the default action)\"),\n    TunnelOptionsSchema,\n  );\n  runCommand\n    .argument(\"<command...>\", \"the command to wrap, after `--`\")\n    .action(async (command: string[]) => {\n      await run(parseArgs(runCommand, TunnelOptionsSchema), 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  const statusCommand = addArgs(\n    program.command(\"status\").description(\"Resolve the configuration and print it\"),\n    TunnelOptionsSchema,\n  );\n  statusCommand.action(() => {\n    const resolved = resolveTunnelOptions(parseArgs(statusCommand, TunnelOptionsSchema));\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      const parsed = interceptor.TunnelTransportSchema.parse(transport);\n      if (parsed === \"portr\" || parsed === \"both\") await portr.installPortr();\n      if (parsed === \"frp\" || parsed === \"both\") await frp.installFrp();\n    });\n\n  return program;\n}\n"]}
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/tunnel/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAsB,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEpC;;;;GAIG;AACH,SAAS,QAAQ;IACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;QAC7B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACvE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,SAAS,CAAC,QAAuC;IACxD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,IAAI,GAAG,CAAC,IAAY,EAAQ,EAAE;QAClC,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAChB,KAAK,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,KAAK,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,GAAG,CAAC,GAAkB,EAAE,OAA0B;IAC/D,MAAM,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;IACtC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAE1C,sBAAsB;IACtB,8EAA8E;IAC9E,mDAAmD;IACnD,6EAA6E;IAC7E,0EAA0E;IAC1E,0EAA0E;IAC1E,mCAAmC;IACnC,IAAI,OAAe,CAAC;IACpB,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE;YACvC,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC;gBACpC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;gBACrB,IAAI,EAAE,WAAW;aAClB;YACD,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,gBAAgB,EAAE,MAAM;SACzB,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;SAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,cAAc,CACtB,CAAC,EACD,oBAAoB,EACpB,sEAAsE,CACvE,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,0CAA0C;IAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ;QACjC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CACJ,MAAM,MAAM,CAAC,UAAU,CAAC,CACzB,CAAC,YAAY,CAAC;YACb,GAAG,QAAQ,CAAC,UAAU;YACtB,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,IAAI,aAAa,QAAQ,CAAC,UAAU,EAAE;SAC/E,CAAC,CAAC;IACP,IAAI,CAAC,IAAI;QAAE,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IAE5E,MAAM,UAAU,CAAC;QACf,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO;QACP,IAAI;QACJ,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;QAClC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;QAClC,SAAS,EAAE,QAAQ,CAAC,SAAS;KAC9B,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,OAAO,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,KAAK,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE;YACrD,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;SAChC,CAAC,CAAC;IACL,CAAC;IACD,SAAS,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,YAAY,CAAC,IAAI,GAAG,YAAY;IAC9C,MAAM,OAAO,GAAG,OAAO,CACrB,IAAI,OAAO,EAAE;SACV,IAAI,CAAC,IAAI,CAAC;SACV,WAAW,CAAC,4DAA4D,CAAC,EAC5E,mBAAmB,CACpB,CAAC;IAEF,gFAAgF;IAChF,2EAA2E;IAC3E,wDAAwD;IACxD,OAAO;SACJ,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;SAC3D,MAAM,CAAC,KAAK,EAAE,OAAiB,EAAE,EAAE;QAClC,MAAM,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,OAAO,CACxB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,qCAAqC,CAAC,EACzE,mBAAmB,CACpB,CAAC;IACF,UAAU;SACP,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;SAC3D,MAAM,CAAC,KAAK,EAAE,OAAiB,EAAE,EAAE;QAClC,MAAM,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEL,2EAA2E;IAC3E,4EAA4E;IAC5E,+CAA+C;IAC/C,MAAM,aAAa,GAAG,OAAO,CAC3B,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,wCAAwC,CAAC,EAC/E,mBAAmB,CACpB,CAAC;IACF,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE;QACxB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC,CAAC;QACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,OAAO;SACJ,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CAAC,aAAa,EAAE,qBAAqB,EAAE,OAAO,CAAC;SACvD,WAAW,CAAC,gDAAgD,CAAC;SAC7D,MAAM,CAAC,KAAK,EAAE,SAAiB,EAAE,EAAE;QAClC,MAAM,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,MAAM;YAAE,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;QACxE,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM;YAAE,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;IACpE,CAAC,CAAC,CAAC;IAEL,OAAO,OAAO,CAAC;AACjB,CAAC","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 { createServer } from \"node:net\";\nimport { addArgs, parseArgs } from \"@dbx-tools/cli-args\";\nimport { exec } from \"@dbx-tools/core\";\nimport type { ChildProcessResult } from \"@dbx-tools/core/exec\";\nimport { log } from \"@dbx-tools/shared-core\";\nimport { frp, interceptor, portr } from \"@dbx-tools/tunnel\";\nimport { Command, CommanderError } from \"commander\";\n\nimport { resolveTunnelOptions, TunnelOptionsSchema, type TunnelOptions } from \"./options.ts\";\nimport { startProxy } from \"./proxy.ts\";\n\nexport { CommanderError };\n\nconst logger = log.logger(\"tunnel\");\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 * Tie the wrapper's lifetime to its children: a child that exits takes the\n * wrapper down with its code. Core exec owns parent termination forwarding for\n * every spawned child. Without this a crashed app leaves a portr tunnel serving\n * a dead port, which looks like a hang rather than a failure.\n */\nfunction supervise(children: readonly ChildProcessResult[]): void {\n  let stopping = false;\n  const stop = (code: number): void => {\n    if (stopping) return;\n    stopping = true;\n    void Promise.allSettled(children.map((child) => child.shutdown())).then(() => {\n      process.exit(code);\n    });\n  };\n  for (const child of children) {\n    void child.on(\"exit\", (code) => stop(code ?? 1));\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: ChildProcessResult[] = [];\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 = exec.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      stdin: \"inherit\",\n      stdout: \"inherit\",\n      stderr: \"inherit\",\n      terminateTimeout: 10_000,\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(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) {\n    logger.info(\"no selected public tunnel is configured\", {\n      transport: resolved.transport,\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 = addArgs(\n    new Command()\n      .name(name)\n      .description(\"Front a command with a public tunnel and passwordless auth\"),\n    TunnelOptionsSchema,\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[]) => {\n      await run(parseArgs(program, TunnelOptionsSchema), command);\n    });\n\n  const runCommand = addArgs(\n    program.command(\"run\").description(\"Wrap a command (the default action)\"),\n    TunnelOptionsSchema,\n  );\n  runCommand\n    .argument(\"<command...>\", \"the command to wrap, after `--`\")\n    .action(async (command: string[]) => {\n      await run(parseArgs(runCommand, TunnelOptionsSchema), 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  const statusCommand = addArgs(\n    program.command(\"status\").description(\"Resolve the configuration and print it\"),\n    TunnelOptionsSchema,\n  );\n  statusCommand.action(() => {\n    const resolved = resolveTunnelOptions(parseArgs(statusCommand, TunnelOptionsSchema));\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      const parsed = interceptor.TunnelTransportSchema.parse(transport);\n      if (parsed === \"portr\" || parsed === \"both\") await portr.installPortr();\n      if (parsed === \"frp\" || parsed === \"both\") await frp.installFrp();\n    });\n\n  return program;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -34,24 +34,24 @@
|
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@clack/prompts": "^1.7.0",
|
|
36
36
|
"@databricks/appkit": "0.81.0",
|
|
37
|
-
"@dbx-tools/appkit": "^0.9.
|
|
38
|
-
"@dbx-tools/appkit-graphiti": "^0.9.
|
|
39
|
-
"@dbx-tools/appkit-model-gateway": "^0.9.
|
|
40
|
-
"@dbx-tools/auth": "^0.9.
|
|
41
|
-
"@dbx-tools/auth-gate": "^0.9.
|
|
42
|
-
"@dbx-tools/cli-args": "^0.9.
|
|
43
|
-
"@dbx-tools/cli-service": "^0.9.
|
|
44
|
-
"@dbx-tools/core": "^0.9.
|
|
45
|
-
"@dbx-tools/databricks": "^0.9.
|
|
46
|
-
"@dbx-tools/email": "^0.9.
|
|
47
|
-
"@dbx-tools/lakebase": "^0.9.
|
|
48
|
-
"@dbx-tools/postgres": "^0.9.
|
|
49
|
-
"@dbx-tools/shared-auth": "^0.9.
|
|
50
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
51
|
-
"@dbx-tools/shared-email": "^0.9.
|
|
52
|
-
"@dbx-tools/shared-genie-code": "^0.9.
|
|
53
|
-
"@dbx-tools/shared-model-gateway": "^0.9.
|
|
54
|
-
"@dbx-tools/tunnel": "^0.9.
|
|
37
|
+
"@dbx-tools/appkit": "^0.9.122",
|
|
38
|
+
"@dbx-tools/appkit-graphiti": "^0.9.122",
|
|
39
|
+
"@dbx-tools/appkit-model-gateway": "^0.9.122",
|
|
40
|
+
"@dbx-tools/auth": "^0.9.122",
|
|
41
|
+
"@dbx-tools/auth-gate": "^0.9.122",
|
|
42
|
+
"@dbx-tools/cli-args": "^0.9.122",
|
|
43
|
+
"@dbx-tools/cli-service": "^0.9.122",
|
|
44
|
+
"@dbx-tools/core": "^0.9.122",
|
|
45
|
+
"@dbx-tools/databricks": "^0.9.122",
|
|
46
|
+
"@dbx-tools/email": "^0.9.122",
|
|
47
|
+
"@dbx-tools/lakebase": "^0.9.122",
|
|
48
|
+
"@dbx-tools/postgres": "^0.9.122",
|
|
49
|
+
"@dbx-tools/shared-auth": "^0.9.122",
|
|
50
|
+
"@dbx-tools/shared-core": "^0.9.122",
|
|
51
|
+
"@dbx-tools/shared-email": "^0.9.122",
|
|
52
|
+
"@dbx-tools/shared-genie-code": "^0.9.122",
|
|
53
|
+
"@dbx-tools/shared-model-gateway": "^0.9.122",
|
|
54
|
+
"@dbx-tools/tunnel": "^0.9.122",
|
|
55
55
|
"commander": "^15.0.0",
|
|
56
56
|
"concurrently": "^10.0.3",
|
|
57
57
|
"get-port": "^7.1.0",
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"./package.json": "./package.json"
|
|
159
159
|
}
|
|
160
160
|
},
|
|
161
|
-
"version": "0.9.
|
|
161
|
+
"version": "0.9.122",
|
|
162
162
|
"types": "./lib/index.d.ts",
|
|
163
163
|
"dbxToolsConfig": {
|
|
164
164
|
"tags": [
|
package/src/genie-code/runner.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { exec } from "@dbx-tools/core";
|
|
8
8
|
import { asyncUtils, log } from "@dbx-tools/shared-core";
|
|
9
9
|
import { GenieCodeRunnerOptionsSchema } from "@dbx-tools/shared-genie-code/options";
|
|
10
10
|
|
|
@@ -65,27 +65,19 @@ export async function runGenieCodeChild(
|
|
|
65
65
|
executable: options.executable,
|
|
66
66
|
home: options.home,
|
|
67
67
|
});
|
|
68
|
-
const child =
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
cwd: process.cwd(),
|
|
74
|
-
env: {
|
|
75
|
-
...environment,
|
|
76
|
-
GENIE_HOME: options.home,
|
|
77
|
-
},
|
|
78
|
-
stdin: "inherit",
|
|
79
|
-
stdout: "inherit",
|
|
80
|
-
stderr: "inherit",
|
|
81
|
-
},
|
|
82
|
-
],
|
|
83
|
-
{
|
|
84
|
-
gracefulTimeoutMs: 5_000,
|
|
85
|
-
forceTimeoutMs: 1_000,
|
|
68
|
+
const child = exec.spawn(options.executable, [...options.arguments], {
|
|
69
|
+
cwd: process.cwd(),
|
|
70
|
+
env: {
|
|
71
|
+
...environment,
|
|
72
|
+
GENIE_HOME: options.home,
|
|
86
73
|
},
|
|
87
|
-
|
|
88
|
-
|
|
74
|
+
stdin: "inherit",
|
|
75
|
+
stdout: "inherit",
|
|
76
|
+
stderr: "inherit",
|
|
77
|
+
terminateTimeout: 5_000,
|
|
78
|
+
killTimeout: 1_000,
|
|
79
|
+
});
|
|
80
|
+
const result = await child;
|
|
89
81
|
if (result.exitCode !== 0) process.exitCode = result.exitCode;
|
|
90
82
|
}
|
|
91
83
|
|
|
@@ -11,7 +11,7 @@ const text = (description: string) => z.string().trim().min(1).optional().descri
|
|
|
11
11
|
|
|
12
12
|
export const LakebaseProxyOptionsSchema = z
|
|
13
13
|
.object({
|
|
14
|
-
...options.
|
|
14
|
+
...options.PostgresConfigOptionsSchema.shape,
|
|
15
15
|
listen: options
|
|
16
16
|
.listenAddressSchema({ port: 5432, loopback: true })
|
|
17
17
|
.describe("Loopback listener address."),
|
package/src/tunnel/cli.ts
CHANGED
|
@@ -23,8 +23,9 @@
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
import { createServer } from "node:net";
|
|
26
|
-
import { AppKitChildProcess } from "@dbx-tools/appkit/child-process";
|
|
27
26
|
import { addArgs, parseArgs } from "@dbx-tools/cli-args";
|
|
27
|
+
import { exec } from "@dbx-tools/core";
|
|
28
|
+
import type { ChildProcessResult } from "@dbx-tools/core/exec";
|
|
28
29
|
import { log } from "@dbx-tools/shared-core";
|
|
29
30
|
import { frp, interceptor, portr } from "@dbx-tools/tunnel";
|
|
30
31
|
import { Command, CommanderError } from "commander";
|
|
@@ -54,12 +55,12 @@ function freePort(): Promise<number> {
|
|
|
54
55
|
}
|
|
55
56
|
|
|
56
57
|
/**
|
|
57
|
-
* Tie the wrapper's lifetime to its children
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
58
|
+
* Tie the wrapper's lifetime to its children: a child that exits takes the
|
|
59
|
+
* wrapper down with its code. Core exec owns parent termination forwarding for
|
|
60
|
+
* every spawned child. Without this a crashed app leaves a portr tunnel serving
|
|
61
|
+
* a dead port, which looks like a hang rather than a failure.
|
|
61
62
|
*/
|
|
62
|
-
function supervise(children: readonly
|
|
63
|
+
function supervise(children: readonly ChildProcessResult[]): void {
|
|
63
64
|
let stopping = false;
|
|
64
65
|
const stop = (code: number): void => {
|
|
65
66
|
if (stopping) return;
|
|
@@ -69,17 +70,14 @@ function supervise(children: readonly AppKitChildProcess[]): void {
|
|
|
69
70
|
});
|
|
70
71
|
};
|
|
71
72
|
for (const child of children) {
|
|
72
|
-
void child.
|
|
73
|
-
}
|
|
74
|
-
for (const signal of ["SIGTERM", "SIGINT", "SIGHUP"] as const) {
|
|
75
|
-
process.on(signal, () => stop(0));
|
|
73
|
+
void child.on("exit", (code) => stop(code ?? 1));
|
|
76
74
|
}
|
|
77
75
|
}
|
|
78
76
|
|
|
79
77
|
async function run(raw: TunnelOptions, command: readonly string[]): Promise<void> {
|
|
80
78
|
const [executable, ...args] = command;
|
|
81
79
|
const resolved = resolveTunnelOptions(raw);
|
|
82
|
-
const children:
|
|
80
|
+
const children: ChildProcessResult[] = [];
|
|
83
81
|
|
|
84
82
|
// Two upstream modes:
|
|
85
83
|
// - WRAP: a command after `--`. The wrapper spawns it on a private loopback
|
|
@@ -91,25 +89,18 @@ async function run(raw: TunnelOptions, command: readonly string[]): Promise<void
|
|
|
91
89
|
let appPort: number;
|
|
92
90
|
if (executable) {
|
|
93
91
|
appPort = resolved.appPort ?? (await freePort());
|
|
94
|
-
const app =
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
stdout: "inherit",
|
|
107
|
-
stderr: "inherit",
|
|
108
|
-
},
|
|
109
|
-
],
|
|
110
|
-
{ gracefulTimeoutMs: 10_000 },
|
|
111
|
-
);
|
|
112
|
-
await app.start();
|
|
92
|
+
const app = exec.spawn(executable, args, {
|
|
93
|
+
env: {
|
|
94
|
+
...process.env,
|
|
95
|
+
DATABRICKS_APP_PORT: String(appPort),
|
|
96
|
+
PORT: String(appPort),
|
|
97
|
+
HOST: "127.0.0.1",
|
|
98
|
+
},
|
|
99
|
+
stdin: "inherit",
|
|
100
|
+
stdout: "inherit",
|
|
101
|
+
stderr: "inherit",
|
|
102
|
+
terminateTimeout: 10_000,
|
|
103
|
+
});
|
|
113
104
|
children.push(app);
|
|
114
105
|
} else if (resolved.appPort) {
|
|
115
106
|
appPort = resolved.appPort;
|
|
@@ -147,12 +138,12 @@ async function run(raw: TunnelOptions, command: readonly string[]): Promise<void
|
|
|
147
138
|
if ((resolved.transport === "portr" || resolved.transport === "both") && resolved.portr) {
|
|
148
139
|
const portrEnv = await portr.installPortr();
|
|
149
140
|
await portr.writePortrConfig(resolved.portr, portrEnv);
|
|
150
|
-
children.push(
|
|
141
|
+
children.push(portr.startPortr(resolved.portr, portrEnv));
|
|
151
142
|
}
|
|
152
143
|
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
153
144
|
const frpEnv = await frp.installFrp();
|
|
154
145
|
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
155
|
-
children.push(
|
|
146
|
+
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
156
147
|
}
|
|
157
148
|
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
158
149
|
if (!activeTunnelCount) {
|