@dbx-tools/cli 0.9.69 → 0.9.71
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/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/src/genie-code/runner.js +4 -19
- package/lib/src/graphiti/cli.d.ts +1 -1
- package/lib/src/graphiti/cli.js +2 -2
- package/lib/src/graphiti/options.d.ts +2 -2
- package/lib/src/graphiti/options.js +2 -2
- package/lib/src/tunnel/cli.js +3 -3
- package/package.json +19 -19
- package/src/genie-code/runner.ts +2 -16
- package/src/graphiti/cli.ts +4 -1
- package/src/graphiti/options.ts +5 -2
- package/src/tunnel/cli.ts +2 -2
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.71";
|
|
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.71";
|
|
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.71";
|
|
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxnQkFBZ0IsQ0FBQztBQUNuRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLGVBQWUsTUFBTSw0QkFBNEIsQ0FBQztBQUM5RCxPQUFPLEtBQUssT0FBTyxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sS0FBSyxXQUFXLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEtBQUssR0FBRyxNQUFNLGNBQWMsQ0FBQztBQUNwQyxPQUFPLEtBQUssR0FBRyxNQUFNLGNBQWMsQ0FBQztBQUNwQyxPQUFPLEtBQUssWUFBWSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxlQUFlLE1BQU0sNEJBQTRCLENBQUM7QUFDOUQsT0FBTyxLQUFLLGdCQUFnQixNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssZUFBZSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssV0FBVyxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxLQUFLLHlCQUF5QixNQUFNLHNDQUFzQyxDQUFDO0FBQ2xGLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssb0JBQW9CLE1BQU0saUNBQWlDLENBQUM7QUFDeEUsT0FBTyxLQUFLLHFCQUFxQixNQUFNLGtDQUFrQyxDQUFDO0FBQzFFLE9BQU8sS0FBSyxrQkFBa0IsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRSxPQUFPLEtBQUssZUFBZSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxrQkFBa0IsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRSxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQztBQUN0QyxPQUFPLEtBQUssU0FBUyxNQUFNLHFCQUFxQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLGFBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFOUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHekUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFHNUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFNUcsT0FBTyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsVUFBVSxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEgsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTlELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2NsaVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjcxXCI7XG5leHBvcnQgKiBhcyBhcHBraXRDbGkgZnJvbSBcIi4vc3JjL2FwcGtpdC9jbGkudHNcIjtcbmV4cG9ydCAqIGFzIGFwcGtpdEVudkV4cG9ydCBmcm9tIFwiLi9zcmMvYXBwa2l0L2Vudi1leHBvcnQudHNcIjtcbmV4cG9ydCAqIGFzIGF1dGhDbGkgZnJvbSBcIi4vc3JjL2F1dGgvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBhdXRoT3B0aW9ucyBmcm9tIFwiLi9zcmMvYXV0aC9vcHRpb25zLnRzXCI7XG5leHBvcnQgKiBhcyBib290c3RyYXAgZnJvbSBcIi4vc3JjL2Jvb3RzdHJhcC50c1wiO1xuZXhwb3J0ICogYXMgYnVuIGZyb20gXCIuL3NyYy9idW4udHNcIjtcbmV4cG9ydCAqIGFzIGNsaSBmcm9tIFwiLi9zcmMvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBnZW5pZUNvZGVDbGkgZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBnZW5pZUNvZGVDb25maWcgZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvY29uZmlnLnRzXCI7XG5leHBvcnQgKiBhcyBnZW5pZUNvZGVJbnN0YWxsIGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2luc3RhbGwudHNcIjtcbmV4cG9ydCAqIGFzIGdlbmllQ29kZU9wdGlvbnMgZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvb3B0aW9ucy50c1wiO1xuZXhwb3J0ICogYXMgZ2VuaWVDb2RlUnVubmVyIGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL3J1bm5lci50c1wiO1xuZXhwb3J0ICogYXMgZ2VuaWVDb2RlUnVudGltZSBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9ydW50aW1lLnRzXCI7XG5leHBvcnQgKiBhcyBncmFwaGl0aUNsaSBmcm9tIFwiLi9zcmMvZ3JhcGhpdGkvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBncmFwaGl0aU9wdGlvbnMgZnJvbSBcIi4vc3JjL2dyYXBoaXRpL29wdGlvbnMudHNcIjtcbmV4cG9ydCAqIGFzIGxha2ViYXNlUHJveHlDYW5jZWxsYXRpb24gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L2NhbmNlbGxhdGlvbi50c1wiO1xuZXhwb3J0ICogYXMgbGFrZWJhc2VQcm94eUNsaSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvY2xpLnRzXCI7XG5leHBvcnQgKiBhcyBsYWtlYmFzZVByb3h5T3B0aW9ucyBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvb3B0aW9ucy50c1wiO1xuZXhwb3J0ICogYXMgbGFrZWJhc2VQcm94eVByb3RvY29sIGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9wcm90b2NvbC50c1wiO1xuZXhwb3J0ICogYXMgbGFrZWJhc2VQcm94eVByb3h5IGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9wcm94eS50c1wiO1xuZXhwb3J0ICogYXMgbW9kZWxHYXRld2F5Q2xpIGZyb20gXCIuL3NyYy9tb2RlbC1nYXRld2F5L2NsaS50c1wiO1xuZXhwb3J0ICogYXMgbW9kZWxHYXRld2F5U2VydmVyIGZyb20gXCIuL3NyYy9tb2RlbC1nYXRld2F5L3NlcnZlci50c1wiO1xuZXhwb3J0ICogYXMgcm9vdCBmcm9tIFwiLi9zcmMvcm9vdC50c1wiO1xuZXhwb3J0ICogYXMgdHVubmVsQXBwIGZyb20gXCIuL3NyYy90dW5uZWwvYXBwLnRzXCI7XG5leHBvcnQgKiBhcyB0dW5uZWxDbGkgZnJvbSBcIi4vc3JjL3R1bm5lbC9jbGkudHNcIjtcbmV4cG9ydCAqIGFzIHR1bm5lbE9wdGlvbnMgZnJvbSBcIi4vc3JjL3R1bm5lbC9vcHRpb25zLnRzXCI7XG5leHBvcnQgKiBhcyB0dW5uZWxQcm94eSBmcm9tIFwiLi9zcmMvdHVubmVsL3Byb3h5LnRzXCI7XG5leHBvcnQgeyBFbnZFeHBvcnRGb3JtYXRTY2hlbWEsIEVudkNvbW1hbmRPcHRpb25zU2NoZW1hIH0gZnJvbSBcIi4vc3JjL2FwcGtpdC9lbnYtZXhwb3J0LnRzXCI7XG5leHBvcnQgdHlwZSB7IEVudkV4cG9ydEZvcm1hdCwgRW52Q29tbWFuZE9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvYXBwa2l0L2Vudi1leHBvcnQudHNcIjtcbmV4cG9ydCB7IEF1dGhDbGlPcHRpb25zU2NoZW1hLCBUb2tlbkNvbW1hbmRPcHRpb25zU2NoZW1hIH0gZnJvbSBcIi4vc3JjL2F1dGgvb3B0aW9ucy50c1wiO1xuZXhwb3J0IHR5cGUgeyBBdXRoQ2xpT3B0aW9ucywgVG9rZW5Db21tYW5kT3B0aW9ucyB9IGZyb20gXCIuL3NyYy9hdXRoL29wdGlvbnMudHNcIjtcbmV4cG9ydCB7IHJlc29sdmVCdW5Bcmd2IH0gZnJvbSBcIi4vc3JjL2J1bi50c1wiO1xuZXhwb3J0IHR5cGUgeyBHZW5pZUNvZGVDbGlEZXBlbmRlbmNpZXMgfSBmcm9tIFwiLi9zcmMvZ2VuaWUtY29kZS9jbGkudHNcIjtcbmV4cG9ydCB7IEdFTklFX0NPREVfR0FURVdBWV9QUk9WSURFUiB9IGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL2NvbmZpZy50c1wiO1xuZXhwb3J0IHR5cGUgeyBXcml0ZUdlbmllQ29kZUNvbmZpZ09wdGlvbnMsIEdlbmllQ29kZVByb2ZpbGVIb21lLCBHZW5pZUNvZGVIb21lIH0gZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvY29uZmlnLnRzXCI7XG5leHBvcnQgdHlwZSB7IEluc3RhbGxHZW5pZUNvZGVPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvaW5zdGFsbC50c1wiO1xuZXhwb3J0IHsgUlVOTkVSX09QVElPTlNfRU5WIH0gZnJvbSBcIi4vc3JjL2dlbmllLWNvZGUvcnVubmVyLnRzXCI7XG5leHBvcnQgdHlwZSB7IEdlbmllQ29kZVJ1bnRpbWVEZXBlbmRlbmNpZXMsIFJ1bkdlbmllQ29kZU9wdGlvbnMsIFByZXBhcmVkR2VuaWVDb2RlUnVudGltZSB9IGZyb20gXCIuL3NyYy9nZW5pZS1jb2RlL3J1bnRpbWUudHNcIjtcbmV4cG9ydCB0eXBlIHsgR3JhcGhpdGlDbGlEZXBlbmRlbmNpZXMsIEdyYXBoaXRpU2VydmljZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ3JhcGhpdGkvY2xpLnRzXCI7XG5leHBvcnQgeyBDYW5jZWxsYXRpb25SZWdpc3RyeSB9IGZyb20gXCIuL3NyYy9sYWtlYmFzZS1wcm94eS9jYW5jZWxsYXRpb24udHNcIjtcbmV4cG9ydCB0eXBlIHsgQ2FuY2VsbGF0aW9uVGFyZ2V0LCBDYW5jZWxsYXRpb25Gb3J3YXJkZXIgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvY2FuY2VsbGF0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2ViYXNlUHJveHlDbGlEZXBlbmRlbmNpZXMgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvY2xpLnRzXCI7XG5leHBvcnQgeyBMYWtlYmFzZVByb3h5T3B0aW9uc1NjaGVtYSwgTGFrZWJhc2VQcm94eVVybE9wdGlvbnNTY2hlbWEgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvb3B0aW9ucy50c1wiO1xuZXhwb3J0IHR5cGUgeyBMYWtlYmFzZVByb3h5T3B0aW9ucywgUmVzb2x2ZWRMYWtlYmFzZVByb3h5T3B0aW9ucywgTGFrZWJhc2VQcm94eVVybE9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvb3B0aW9ucy50c1wiO1xuZXhwb3J0IHsgU1NMX1JFUVVFU1QsIENBTkNFTF9SRVFVRVNULCBQUk9UT0NPTF8zLCBQb3N0Z3Jlc1Byb3RvY29sRXJyb3IgfSBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcHJveHkvcHJvdG9jb2wudHNcIjtcbmV4cG9ydCB0eXBlIHsgU3RhcnR1cE1lc3NhZ2UsIENhbmNlbE1lc3NhZ2UsIEluaXRpYWxNZXNzYWdlIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L3Byb3RvY29sLnRzXCI7XG5leHBvcnQgeyBMYWtlYmFzZVByb3h5IH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXByb3h5L3Byb3h5LnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheUNsaURlcGVuZGVuY2llcyB9IGZyb20gXCIuL3NyYy9tb2RlbC1nYXRld2F5L2NsaS50c1wiO1xuZXhwb3J0IHsgd29ya3NwYWNlUm9vdCB9IGZyb20gXCIuL3NyYy9yb290LnRzXCI7XG5leHBvcnQgeyBUdW5uZWxPcHRpb25zU2NoZW1hIH0gZnJvbSBcIi4vc3JjL3R1bm5lbC9vcHRpb25zLnRzXCI7XG5leHBvcnQgdHlwZSB7IFR1bm5lbE9wdGlvbnMsIFJlc29sdmVkVHVubmVsT3B0aW9ucyB9IGZyb20gXCIuL3NyYy90dW5uZWwvb3B0aW9ucy50c1wiO1xuZXhwb3J0IHR5cGUgeyBQcm94eU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvdHVubmVsL3Byb3h5LnRzXCI7XG4iXX0=
|
|
@@ -67,24 +67,9 @@ export async function runGenieCodeChild(environment = process.env) {
|
|
|
67
67
|
gracefulTimeoutMs: 5_000,
|
|
68
68
|
forceTimeoutMs: 1_000,
|
|
69
69
|
});
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
};
|
|
74
|
-
for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
|
|
75
|
-
process.once(signal, shutdown);
|
|
76
|
-
}
|
|
77
|
-
try {
|
|
78
|
-
const result = await running;
|
|
79
|
-
if (result.exitCode !== 0)
|
|
80
|
-
process.exitCode = result.exitCode;
|
|
81
|
-
}
|
|
82
|
-
finally {
|
|
83
|
-
for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
|
|
84
|
-
process.off(signal, shutdown);
|
|
85
|
-
}
|
|
86
|
-
await child.shutdown();
|
|
87
|
-
}
|
|
70
|
+
const result = await child.run();
|
|
71
|
+
if (result.exitCode !== 0)
|
|
72
|
+
process.exitCode = result.exitCode;
|
|
88
73
|
}
|
|
89
74
|
export { RUNNER_OPTIONS_ENV };
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2dlbmllLWNvZGUvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFFSCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3pELE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXBGLG9FQUFvRTtBQUNwRSxNQUFNLGtCQUFrQixHQUFHLGdDQUFnQyxDQUFDO0FBQzVELE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsQ0FBQztBQUUvQywrRUFBK0U7QUFDL0UsTUFBTSxVQUFVLHNCQUFzQixDQUFDLGNBQWlDLE9BQU8sQ0FBQyxHQUFHO0lBQ2pGLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ25ELElBQUksQ0FBQyxVQUFVO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxHQUFHLGtCQUFrQixjQUFjLENBQUMsQ0FBQztJQUN0RSxPQUFPLDRCQUE0QixDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDcEUsQ0FBQztBQUVELGtGQUFrRjtBQUNsRixNQUFNLENBQUMsS0FBSyxVQUFVLHVCQUF1QixDQUMzQyxTQUFpQixFQUNqQixXQUFtQixFQUNuQixTQUFpQjtJQUVqQixJQUFJLEtBQUssRUFBRSxNQUFNLEtBQUssSUFBSSxVQUFVLENBQUMsSUFBSSxDQUN2QyxLQUFLLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFO1FBQ25CLElBQUksQ0FBQztZQUNILE1BQU0sUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLFNBQVMsRUFBRTtnQkFDdEMsT0FBTyxFQUFFLEVBQUUsYUFBYSxFQUFFLFVBQVUsV0FBVyxFQUFFLEVBQUU7Z0JBQ25ELE1BQU07YUFDUCxDQUFDLENBQUM7WUFDSCxPQUFPLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDckIsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNQLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsRUFDRDtRQUNFLFVBQVUsRUFBRSxHQUFHO1FBQ2YsU0FBUztRQUNULFNBQVMsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLO0tBQzdCLENBQ0YsRUFBRSxDQUFDO1FBQ0YsSUFBSSxLQUFLO1lBQUUsT0FBTztJQUNwQixDQUFDO0FBQ0gsQ0FBQztBQUVELGlGQUFpRjtBQUNqRixNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxjQUFpQyxPQUFPLENBQUMsR0FBRztJQUU1QyxNQUFNLE9BQU8sR0FBRyxzQkFBc0IsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNwRCxNQUFNLENBQUMsSUFBSSxDQUFDLDJCQUEyQixFQUFFO1FBQ3ZDLE9BQU8sRUFBRSxPQUFPLENBQUMsZ0JBQWdCO1FBQ2pDLFNBQVMsRUFBRSxPQUFPLENBQUMsZ0JBQWdCO0tBQ3BDLENBQUMsQ0FBQztJQUNILE1BQU0sdUJBQXVCLENBQzNCLE9BQU8sQ0FBQyxnQkFBZ0IsRUFDeEIsT0FBTyxDQUFDLFdBQVcsRUFDbkIsT0FBTyxDQUFDLGdCQUFnQixDQUN6QixDQUFDO0lBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQywwQ0FBMEMsRUFBRTtRQUN0RCxVQUFVLEVBQUUsT0FBTyxDQUFDLFVBQVU7UUFDOUIsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJO0tBQ25CLENBQUMsQ0FBQztJQUNILE1BQU0sS0FBSyxHQUFHLElBQUksa0JBQWtCLENBQ2xDO1FBQ0UsT0FBTyxDQUFDLFVBQVU7UUFDbEIsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDdEI7WUFDRSxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNsQixHQUFHLEVBQUU7Z0JBQ0gsR0FBRyxXQUFXO2dCQUNkLFVBQVUsRUFBRSxPQUFPLENBQUMsSUFBSTthQUN6QjtZQUNELEtBQUssRUFBRSxTQUFTO1lBQ2hCLE1BQU0sRUFBRSxTQUFTO1lBQ2pCLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO0tBQ0YsRUFDRDtRQUNFLGlCQUFpQixFQUFFLEtBQUs7UUFDeEIsY0FBYyxFQUFFLEtBQUs7S0FDdEIsQ0FDRixDQUFDO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDakMsSUFBSSxNQUFNLENBQUMsUUFBUSxLQUFLLENBQUM7UUFBRSxPQUFPLENBQUMsUUFBUSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUM7QUFDaEUsQ0FBQztBQUVELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBJbnRlcm5hbCByZWFkaW5lc3MgZ2F0ZSBhbmQgaW50ZXJhY3RpdmUgR2VuaWUgQ29kZSBjaGlsZCBwcm9jZXNzLlxuICpcbiAqIEBtb2R1bGVcbiAqL1xuXG5pbXBvcnQgeyBBcHBLaXRDaGlsZFByb2Nlc3MgfSBmcm9tIFwiQGRieC10b29scy9hcHBraXQvY2hpbGQtcHJvY2Vzc1wiO1xuaW1wb3J0IHsgYXN5bmNVdGlscywgbG9nIH0gZnJvbSBcIkBkYngtdG9vbHMvc2hhcmVkLWNvcmVcIjtcbmltcG9ydCB7IEdlbmllQ29kZVJ1bm5lck9wdGlvbnNTY2hlbWEgfSBmcm9tIFwiQGRieC10b29scy9zaGFyZWQtZ2VuaWUtY29kZS9vcHRpb25zXCI7XG5cbi8qKiBQcml2YXRlIGVudmlyb25tZW50IGZpZWxkIGNhcnJ5aW5nIHNlcmlhbGl6ZWQgcnVubmVyIG9wdGlvbnMuICovXG5jb25zdCBSVU5ORVJfT1BUSU9OU19FTlYgPSBcIkRCWF9UT09MU19HRU5JRV9SVU5ORVJfT1BUSU9OU1wiO1xuY29uc3QgbG9nZ2VyID0gbG9nLmxvZ2dlcihcImdlbmllLWNvZGU6cnVubmVyXCIpO1xuXG4vKiogUGFyc2UgdGhlIHNlcmlhbGl6ZWQgcnVubmVyIGJvdW5kYXJ5IGZyb20gaXRzIHByaXZhdGUgZW52aXJvbm1lbnQgZmllbGQuICovXG5leHBvcnQgZnVuY3Rpb24gZ2VuaWVDb2RlUnVubmVyT3B0aW9ucyhlbnZpcm9ubWVudDogTm9kZUpTLlByb2Nlc3NFbnYgPSBwcm9jZXNzLmVudikge1xuICBjb25zdCBzZXJpYWxpemVkID0gZW52aXJvbm1lbnRbUlVOTkVSX09QVElPTlNfRU5WXTtcbiAgaWYgKCFzZXJpYWxpemVkKSB0aHJvdyBuZXcgRXJyb3IoYCR7UlVOTkVSX09QVElPTlNfRU5WfSBpcyByZXF1aXJlZGApO1xuICByZXR1cm4gR2VuaWVDb2RlUnVubmVyT3B0aW9uc1NjaGVtYS5wYXJzZShKU09OLnBhcnNlKHNlcmlhbGl6ZWQpKTtcbn1cblxuLyoqIFdhaXQgdW50aWwgdGhlIGd1YXJkZWQgbW9kZWwtZ2F0ZXdheSBoZWFsdGggcm91dGUgYWNjZXB0cyB0aGUgcnVubmVyIHRva2VuLiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHdhaXRGb3JHZW5pZUNvZGVHYXRld2F5KFxuICBoZWFsdGhVcmw6IHN0cmluZyxcbiAgYmVhcmVyVG9rZW46IHN0cmluZyxcbiAgdGltZW91dE1zOiBudW1iZXIsXG4pOiBQcm9taXNlPHZvaWQ+IHtcbiAgZm9yIGF3YWl0IChjb25zdCByZWFkeSBvZiBhc3luY1V0aWxzLnBvbGwoXG4gICAgYXN5bmMgKHsgc2lnbmFsIH0pID0+IHtcbiAgICAgIHRyeSB7XG4gICAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZmV0Y2goaGVhbHRoVXJsLCB7XG4gICAgICAgICAgaGVhZGVyczogeyBhdXRob3JpemF0aW9uOiBgQmVhcmVyICR7YmVhcmVyVG9rZW59YCB9LFxuICAgICAgICAgIHNpZ25hbCxcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiByZXNwb25zZS5vaztcbiAgICAgIH0gY2F0Y2gge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBpbnRlcnZhbE1zOiAyMDAsXG4gICAgICB0aW1lb3V0TXMsXG4gICAgICBwcmVkaWNhdGU6IChyZWFkeSkgPT4gIXJlYWR5LFxuICAgIH0sXG4gICkpIHtcbiAgICBpZiAocmVhZHkpIHJldHVybjtcbiAgfVxufVxuXG4vKiogUnVuIEdlbmllIENvZGUgd2l0aCBpbmhlcml0ZWQgdGVybWluYWwgc3RyZWFtcyBhZnRlciBpdHMgZ2F0ZXdheSBpcyByZWFkeS4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBydW5HZW5pZUNvZGVDaGlsZChcbiAgZW52aXJvbm1lbnQ6IE5vZGVKUy5Qcm9jZXNzRW52ID0gcHJvY2Vzcy5lbnYsXG4pOiBQcm9taXNlPHZvaWQ+IHtcbiAgY29uc3Qgb3B0aW9ucyA9IGdlbmllQ29kZVJ1bm5lck9wdGlvbnMoZW52aXJvbm1lbnQpO1xuICBsb2dnZXIuaW5mbyhcIndhaXRpbmcgZm9yIG1vZGVsIGdhdGV3YXlcIiwge1xuICAgIGdhdGV3YXk6IG9wdGlvbnMuZ2F0ZXdheUhlYWx0aFVybCxcbiAgICB0aW1lb3V0TXM6IG9wdGlvbnMuc3RhcnR1cFRpbWVvdXRNcyxcbiAgfSk7XG4gIGF3YWl0IHdhaXRGb3JHZW5pZUNvZGVHYXRld2F5KFxuICAgIG9wdGlvbnMuZ2F0ZXdheUhlYWx0aFVybCxcbiAgICBvcHRpb25zLmJlYXJlclRva2VuLFxuICAgIG9wdGlvbnMuc3RhcnR1cFRpbWVvdXRNcyxcbiAgKTtcbiAgbG9nZ2VyLmluZm8oXCJtb2RlbCBnYXRld2F5IHJlYWR5OyBzdGFydGluZyBHZW5pZSBDb2RlXCIsIHtcbiAgICBleGVjdXRhYmxlOiBvcHRpb25zLmV4ZWN1dGFibGUsXG4gICAgaG9tZTogb3B0aW9ucy5ob21lLFxuICB9KTtcbiAgY29uc3QgY2hpbGQgPSBuZXcgQXBwS2l0Q2hpbGRQcm9jZXNzKFxuICAgIFtcbiAgICAgIG9wdGlvbnMuZXhlY3V0YWJsZSxcbiAgICAgIFsuLi5vcHRpb25zLmFyZ3VtZW50c10sXG4gICAgICB7XG4gICAgICAgIGN3ZDogcHJvY2Vzcy5jd2QoKSxcbiAgICAgICAgZW52OiB7XG4gICAgICAgICAgLi4uZW52aXJvbm1lbnQsXG4gICAgICAgICAgR0VOSUVfSE9NRTogb3B0aW9ucy5ob21lLFxuICAgICAgICB9LFxuICAgICAgICBzdGRpbjogXCJpbmhlcml0XCIsXG4gICAgICAgIHN0ZG91dDogXCJpbmhlcml0XCIsXG4gICAgICAgIHN0ZGVycjogXCJpbmhlcml0XCIsXG4gICAgICB9LFxuICAgIF0sXG4gICAge1xuICAgICAgZ3JhY2VmdWxUaW1lb3V0TXM6IDVfMDAwLFxuICAgICAgZm9yY2VUaW1lb3V0TXM6IDFfMDAwLFxuICAgIH0sXG4gICk7XG4gIGNvbnN0IHJlc3VsdCA9IGF3YWl0IGNoaWxkLnJ1bigpO1xuICBpZiAocmVzdWx0LmV4aXRDb2RlICE9PSAwKSBwcm9jZXNzLmV4aXRDb2RlID0gcmVzdWx0LmV4aXRDb2RlO1xufVxuXG5leHBvcnQgeyBSVU5ORVJfT1BUSU9OU19FTlYgfTtcbiJdfQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type CliServiceCliDependencies } from "@dbx-tools/cli-service/cli";
|
|
2
2
|
import { type CliServiceDefinition } from "@dbx-tools/cli-service/definition";
|
|
3
|
-
import { type GraphitiRuntimeOptions } from "@dbx-tools/graphiti/runtime";
|
|
3
|
+
import { type GraphitiRuntimeOptions } from "@dbx-tools/appkit-graphiti/runtime";
|
|
4
4
|
import { Command } from "commander";
|
|
5
5
|
import { type GraphitiOptions } from "./options.ts";
|
|
6
6
|
/** Injectable runtime and service lifecycle boundaries for CLI callers. */
|
package/lib/src/graphiti/cli.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
import { addArgs, parseArgs, serializeArgs } from "@dbx-tools/cli-args";
|
|
11
11
|
import { buildServiceCommand } from "@dbx-tools/cli-service/cli";
|
|
12
12
|
import { defineService } from "@dbx-tools/cli-service/definition";
|
|
13
|
-
import { runGraphiti } from "@dbx-tools/graphiti/runtime";
|
|
13
|
+
import { runGraphiti, } from "@dbx-tools/appkit-graphiti/runtime";
|
|
14
14
|
import { Command } from "commander";
|
|
15
15
|
import { GraphitiCliOptionsSchema, GraphitiOptionsSchema, } from "./options.js";
|
|
16
16
|
import { PACKAGE_VERSION } from "../../index.js";
|
|
@@ -40,4 +40,4 @@ export function buildProgram(name = "dbx graphiti", dependencies = { run: runGra
|
|
|
40
40
|
function graphitiOptions(command) {
|
|
41
41
|
return GraphitiOptionsSchema.parse(parseArgs(command, GraphitiCliOptionsSchema));
|
|
42
42
|
}
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2dyYXBoaXRpL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7R0FRRztBQUNILE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxtQkFBbUIsRUFBa0MsTUFBTSw0QkFBNEIsQ0FBQztBQUNqRyxPQUFPLEVBQUUsYUFBYSxFQUE2QixNQUFNLG1DQUFtQyxDQUFDO0FBQzdGLE9BQU8sRUFDTCxXQUFXLEdBRVosTUFBTSxvQ0FBb0MsQ0FBQztBQUM1QyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXBDLE9BQU8sRUFDTCx3QkFBd0IsRUFDeEIscUJBQXFCLEdBRXRCLE1BQU0sY0FBYyxDQUFDO0FBQ3RCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQWFqRCxzRkFBc0Y7QUFDdEYsTUFBTSxVQUFVLHlCQUF5QixDQUN2QyxVQUFrQyxFQUFFO0lBRXBDLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ3BDLEVBQUUsRUFBRSx3QkFBd0I7UUFDNUIsSUFBSSxFQUFFLGNBQWM7UUFDcEIsYUFBYSxFQUFFLEVBQUUsSUFBSSxFQUFFLG9CQUFvQixFQUFFO1FBQzdDLE9BQU8sRUFBRTtZQUNQLE9BQU8sRUFBRSxjQUFjO1lBQ3ZCLFNBQVMsRUFBRSxhQUFhLENBQUMscUJBQXFCLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQy9EO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVELHNFQUFzRTtBQUN0RSxNQUFNLFVBQVUsWUFBWSxDQUMxQixJQUFJLEdBQUcsY0FBYyxFQUNyQixlQUF3QyxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUU7SUFFNUQsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUNyQixJQUFJLE9BQU8sRUFBRTtTQUNWLElBQUksQ0FBQyxJQUFJLENBQUM7U0FDVixXQUFXLENBQUMseURBQXlELENBQUM7U0FDdEUsT0FBTyxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsRUFDNUMsd0JBQXdCLENBQ3pCLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ2xCLE1BQU0sWUFBWSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNuRCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sQ0FBQyxVQUFVLENBQ2hCLG1CQUFtQixDQUNqQixHQUFHLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLENBQUMsRUFDekQsWUFBWSxDQUFDLE9BQU8sQ0FDckIsQ0FDRixDQUFDO0lBQ0YsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQztBQUVELFNBQVMsZUFBZSxDQUFDLE9BQWdCO0lBQ3ZDLE9BQU8scUJBQXFCLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsd0JBQXdCLENBQUMsQ0FBQyxDQUFDO0FBQ25GLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvbW1hbmRlci1vd25lZCBHcmFwaGl0aSBDTEkgYW5kIHNoYXJlZCBjdXJyZW50LXVzZXIgc2VydmljZSBkZWZpbml0aW9uLlxuICpcbiAqIFRoaXMgbW9kdWxlIG93bnMgZXZlcnkgdXNlci1mYWNpbmcgR3JhcGhpdGkgY29tbWFuZC4gVGhlIHNoYXJlZCBHcmFwaGl0aSBab2RcbiAqIHNjaGVtYSBvd25zIGl0cyBvcHRpb25zLCBlbnZpcm9ubWVudCBuYW1lcywgZGVmYXVsdHMsIGFuZCB2YWxpZGF0aW9uLiBUaGVcbiAqIE5vZGUgR3JhcGhpdGkgcGFja2FnZSBvd25zIHJ1bnRpbWUgYW5kIFB5dGhvbiBpbnRlcmFjdGlvbi5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cbmltcG9ydCB7IGFkZEFyZ3MsIHBhcnNlQXJncywgc2VyaWFsaXplQXJncyB9IGZyb20gXCJAZGJ4LXRvb2xzL2NsaS1hcmdzXCI7XG5pbXBvcnQgeyBidWlsZFNlcnZpY2VDb21tYW5kLCB0eXBlIENsaVNlcnZpY2VDbGlEZXBlbmRlbmNpZXMgfSBmcm9tIFwiQGRieC10b29scy9jbGktc2VydmljZS9jbGlcIjtcbmltcG9ydCB7IGRlZmluZVNlcnZpY2UsIHR5cGUgQ2xpU2VydmljZURlZmluaXRpb24gfSBmcm9tIFwiQGRieC10b29scy9jbGktc2VydmljZS9kZWZpbml0aW9uXCI7XG5pbXBvcnQge1xuICBydW5HcmFwaGl0aSxcbiAgdHlwZSBHcmFwaGl0aVJ1bnRpbWVPcHRpb25zLFxufSBmcm9tIFwiQGRieC10b29scy9hcHBraXQtZ3JhcGhpdGkvcnVudGltZVwiO1xuaW1wb3J0IHsgQ29tbWFuZCB9IGZyb20gXCJjb21tYW5kZXJcIjtcblxuaW1wb3J0IHtcbiAgR3JhcGhpdGlDbGlPcHRpb25zU2NoZW1hLFxuICBHcmFwaGl0aU9wdGlvbnNTY2hlbWEsXG4gIHR5cGUgR3JhcGhpdGlPcHRpb25zLFxufSBmcm9tIFwiLi9vcHRpb25zLnRzXCI7XG5pbXBvcnQgeyBQQUNLQUdFX1ZFUlNJT04gfSBmcm9tIFwiLi4vLi4vaW5kZXgudHNcIjtcblxuLyoqIEluamVjdGFibGUgcnVudGltZSBhbmQgc2VydmljZSBsaWZlY3ljbGUgYm91bmRhcmllcyBmb3IgQ0xJIGNhbGxlcnMuICovXG5leHBvcnQgaW50ZXJmYWNlIEdyYXBoaXRpQ2xpRGVwZW5kZW5jaWVzIHtcbiAgLyoqIFJ1biB0aGUgR3JhcGhpdGkgc3RhY2sgdGhyb3VnaCB0aGUgTm9kZSBydW50aW1lIG93bmVyLiAqL1xuICBydW4ob3B0aW9uczogR3JhcGhpdGlSdW50aW1lT3B0aW9ucyk6IFByb21pc2U8dm9pZD47XG4gIC8qKiBTaGFyZWQgc2VydmljZSBjb21tYW5kIGRlcGVuZGVuY2llcyBmb3IgdGVzdHMgYW5kIGVtYmVkZGluZy4gKi9cbiAgcmVhZG9ubHkgc2VydmljZT86IENsaVNlcnZpY2VDbGlEZXBlbmRlbmNpZXM7XG59XG5cbi8qKiBSdW50aW1lIG9wdGlvbnMgcGVyc2lzdGVkIHdoZW4gaW5zdGFsbGluZyB0aGUgR3JhcGhpdGkgZGVza3RvcCBzZXJ2aWNlLiAqL1xuZXhwb3J0IHR5cGUgR3JhcGhpdGlTZXJ2aWNlT3B0aW9ucyA9IEdyYXBoaXRpT3B0aW9ucztcblxuLyoqIERlZmluZSBhIEdyYXBoaXRpIHNlcnZpY2Ugd2l0aG91dCBkdXBsaWNhdGluZyBpbnN0YWxsYXRpb24gb3IgbGlmZWN5Y2xlIHBvbGljeS4gKi9cbmV4cG9ydCBmdW5jdGlvbiBncmFwaGl0aVNlcnZpY2VEZWZpbml0aW9uKFxuICBvcHRpb25zOiBHcmFwaGl0aVNlcnZpY2VPcHRpb25zID0ge30sXG4pOiBDbGlTZXJ2aWNlRGVmaW5pdGlvbiB7XG4gIHJldHVybiBkZWZpbmVTZXJ2aWNlKGltcG9ydC5tZXRhLnVybCwge1xuICAgIGlkOiBcImRieC10b29scy5jbGktZ3JhcGhpdGlcIixcbiAgICBuYW1lOiBcImRieCBncmFwaGl0aVwiLFxuICAgIHB5dGhvblBhY2thZ2U6IHsgbmFtZTogXCJkYngtdG9vbHMtZ3JhcGhpdGlcIiB9LFxuICAgIGNvbW1hbmQ6IHtcbiAgICAgIGJpbk5hbWU6IFwiZGJ4LWdyYXBoaXRpXCIsXG4gICAgICBhcmd1bWVudHM6IHNlcmlhbGl6ZUFyZ3MoR3JhcGhpdGlPcHRpb25zU2NoZW1hLnBhcnNlKG9wdGlvbnMpKSxcbiAgICB9LFxuICB9KTtcbn1cblxuLyoqIEJ1aWxkIGZvcmVncm91bmQgZXhlY3V0aW9uIGFuZCBzaGFyZWQgZGVza3RvcC1zZXJ2aWNlIGNvbW1hbmRzLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkUHJvZ3JhbShcbiAgbmFtZSA9IFwiZGJ4IGdyYXBoaXRpXCIsXG4gIGRlcGVuZGVuY2llczogR3JhcGhpdGlDbGlEZXBlbmRlbmNpZXMgPSB7IHJ1bjogcnVuR3JhcGhpdGkgfSxcbik6IENvbW1hbmQge1xuICBjb25zdCBwcm9ncmFtID0gYWRkQXJncyhcbiAgICBuZXcgQ29tbWFuZCgpXG4gICAgICAubmFtZShuYW1lKVxuICAgICAgLmRlc2NyaXB0aW9uKFwiUnVuIEdyYXBoaXRpIG9yIG1hbmFnZSBpdHMgY3VycmVudC11c2VyIGRlc2t0b3Agc2VydmljZVwiKVxuICAgICAgLnZlcnNpb24oUEFDS0FHRV9WRVJTSU9OLCBcIi12LCAtLXZlcnNpb25cIiksXG4gICAgR3JhcGhpdGlDbGlPcHRpb25zU2NoZW1hLFxuICApLmFjdGlvbihhc3luYyAoKSA9PiB7XG4gICAgYXdhaXQgZGVwZW5kZW5jaWVzLnJ1bihncmFwaGl0aU9wdGlvbnMocHJvZ3JhbSkpO1xuICB9KTtcblxuICBwcm9ncmFtLmFkZENvbW1hbmQoXG4gICAgYnVpbGRTZXJ2aWNlQ29tbWFuZChcbiAgICAgICgpID0+IGdyYXBoaXRpU2VydmljZURlZmluaXRpb24oZ3JhcGhpdGlPcHRpb25zKHByb2dyYW0pKSxcbiAgICAgIGRlcGVuZGVuY2llcy5zZXJ2aWNlLFxuICAgICksXG4gICk7XG4gIHJldHVybiBwcm9ncmFtO1xufVxuXG5mdW5jdGlvbiBncmFwaGl0aU9wdGlvbnMoY29tbWFuZDogQ29tbWFuZCk6IEdyYXBoaXRpT3B0aW9ucyB7XG4gIHJldHVybiBHcmFwaGl0aU9wdGlvbnNTY2hlbWEucGFyc2UocGFyc2VBcmdzKGNvbW1hbmQsIEdyYXBoaXRpQ2xpT3B0aW9uc1NjaGVtYSkpO1xufVxuIl19
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @module
|
|
8
8
|
*/
|
|
9
|
-
export { GRAPHITI_DEFAULTS, GraphitiCliOptionsSchema, GraphitiOptionsSchema, ResolvedGraphitiOptionsSchema, graphitiOptionOverrides, graphitiOptionsEnvironment, graphitiOptionsFromEnvironment, resolveGraphitiOptions, } from "@dbx-tools/graphiti/options";
|
|
10
|
-
export type { GraphitiOptions, ResolvedGraphitiOptions } from "@dbx-tools/graphiti/options";
|
|
9
|
+
export { GRAPHITI_DEFAULTS, GraphitiCliOptionsSchema, GraphitiOptionsSchema, ResolvedGraphitiOptionsSchema, graphitiOptionOverrides, graphitiOptionsEnvironment, graphitiOptionsFromEnvironment, resolveGraphitiOptions, } from "@dbx-tools/appkit-graphiti/options";
|
|
10
|
+
export type { GraphitiOptions, ResolvedGraphitiOptions, } from "@dbx-tools/appkit-graphiti/options";
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @module
|
|
8
8
|
*/
|
|
9
|
-
export { GRAPHITI_DEFAULTS, GraphitiCliOptionsSchema, GraphitiOptionsSchema, ResolvedGraphitiOptionsSchema, graphitiOptionOverrides, graphitiOptionsEnvironment, graphitiOptionsFromEnvironment, resolveGraphitiOptions, } from "@dbx-tools/graphiti/options";
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
export { GRAPHITI_DEFAULTS, GraphitiCliOptionsSchema, GraphitiOptionsSchema, ResolvedGraphitiOptionsSchema, graphitiOptionOverrides, graphitiOptionsEnvironment, graphitiOptionsFromEnvironment, resolveGraphitiOptions, } from "@dbx-tools/appkit-graphiti/options";
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ncmFwaGl0aS9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O0dBT0c7QUFFSCxPQUFPLEVBQ0wsaUJBQWlCLEVBQ2pCLHdCQUF3QixFQUN4QixxQkFBcUIsRUFDckIsNkJBQTZCLEVBQzdCLHVCQUF1QixFQUN2QiwwQkFBMEIsRUFDMUIsOEJBQThCLEVBQzlCLHNCQUFzQixHQUN2QixNQUFNLG9DQUFvQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHcmFwaGl0aSBDTEkgb3B0aW9uIHN1cmZhY2UuXG4gKlxuICogVGhlIE5vZGUgR3JhcGhpdGkgcnVudGltZSBvd25zIHRoZSBjb21wbGV0ZSBzaGFyZWQgb3B0aW9uIGNvbnRyYWN0LiBUaGlzXG4gKiBtb2R1bGUgcmUtZXhwb3J0cyB0aGF0IHN1cmZhY2Ugd2l0aG91dCBjcmVhdGluZyBwYXJhbGxlbCBDTEkgcG9saWN5LlxuICpcbiAqIEBtb2R1bGVcbiAqL1xuXG5leHBvcnQge1xuICBHUkFQSElUSV9ERUZBVUxUUyxcbiAgR3JhcGhpdGlDbGlPcHRpb25zU2NoZW1hLFxuICBHcmFwaGl0aU9wdGlvbnNTY2hlbWEsXG4gIFJlc29sdmVkR3JhcGhpdGlPcHRpb25zU2NoZW1hLFxuICBncmFwaGl0aU9wdGlvbk92ZXJyaWRlcyxcbiAgZ3JhcGhpdGlPcHRpb25zRW52aXJvbm1lbnQsXG4gIGdyYXBoaXRpT3B0aW9uc0Zyb21FbnZpcm9ubWVudCxcbiAgcmVzb2x2ZUdyYXBoaXRpT3B0aW9ucyxcbn0gZnJvbSBcIkBkYngtdG9vbHMvYXBwa2l0LWdyYXBoaXRpL29wdGlvbnNcIjtcbmV4cG9ydCB0eXBlIHtcbiAgR3JhcGhpdGlPcHRpb25zLFxuICBSZXNvbHZlZEdyYXBoaXRpT3B0aW9ucyxcbn0gZnJvbSBcIkBkYngtdG9vbHMvYXBwa2l0LWdyYXBoaXRpL29wdGlvbnNcIjtcbiJdfQ==
|
package/lib/src/tunnel/cli.js
CHANGED
|
@@ -99,7 +99,7 @@ async function run(raw, command) {
|
|
|
99
99
|
stderr: "inherit",
|
|
100
100
|
},
|
|
101
101
|
], { gracefulTimeoutMs: 10_000 });
|
|
102
|
-
|
|
102
|
+
await app.start();
|
|
103
103
|
children.push(app);
|
|
104
104
|
}
|
|
105
105
|
else if (resolved.appPort) {
|
|
@@ -136,7 +136,7 @@ async function run(raw, command) {
|
|
|
136
136
|
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
137
137
|
const frpEnv = await frp.installFrp();
|
|
138
138
|
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
139
|
-
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
139
|
+
children.push(await frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
140
140
|
}
|
|
141
141
|
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
142
142
|
if (!activeTunnelCount) {
|
|
@@ -187,4 +187,4 @@ export function buildProgram(name = "dbx tunnel") {
|
|
|
187
187
|
});
|
|
188
188
|
return program;
|
|
189
189
|
}
|
|
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    void 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(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"]}
|
|
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"]}
|
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-
|
|
39
|
-
"@dbx-tools/
|
|
40
|
-
"@dbx-tools/auth
|
|
41
|
-
"@dbx-tools/
|
|
42
|
-
"@dbx-tools/cli-
|
|
43
|
-
"@dbx-tools/
|
|
44
|
-
"@dbx-tools/
|
|
45
|
-
"@dbx-tools/
|
|
46
|
-
"@dbx-tools/
|
|
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.71",
|
|
38
|
+
"@dbx-tools/appkit-graphiti": "^0.9.71",
|
|
39
|
+
"@dbx-tools/appkit-model-gateway": "^0.9.71",
|
|
40
|
+
"@dbx-tools/auth": "^0.9.71",
|
|
41
|
+
"@dbx-tools/auth-gate": "^0.9.71",
|
|
42
|
+
"@dbx-tools/cli-args": "^0.9.71",
|
|
43
|
+
"@dbx-tools/cli-service": "^0.9.71",
|
|
44
|
+
"@dbx-tools/core": "^0.9.71",
|
|
45
|
+
"@dbx-tools/databricks": "^0.9.71",
|
|
46
|
+
"@dbx-tools/email": "^0.9.71",
|
|
47
|
+
"@dbx-tools/lakebase": "^0.9.71",
|
|
48
|
+
"@dbx-tools/postgres": "^0.9.71",
|
|
49
|
+
"@dbx-tools/shared-auth": "^0.9.71",
|
|
50
|
+
"@dbx-tools/shared-core": "^0.9.71",
|
|
51
|
+
"@dbx-tools/shared-email": "^0.9.71",
|
|
52
|
+
"@dbx-tools/shared-genie-code": "^0.9.71",
|
|
53
|
+
"@dbx-tools/shared-model-gateway": "^0.9.71",
|
|
54
|
+
"@dbx-tools/tunnel": "^0.9.71",
|
|
55
55
|
"commander": "^15.0.0",
|
|
56
56
|
"concurrently": "^10.0.3",
|
|
57
57
|
"get-port": "^7.1.0",
|
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
"./package.json": "./package.json"
|
|
155
155
|
}
|
|
156
156
|
},
|
|
157
|
-
"version": "0.9.
|
|
157
|
+
"version": "0.9.71",
|
|
158
158
|
"types": "./lib/index.d.ts",
|
|
159
159
|
"dbxToolsConfig": {
|
|
160
160
|
"tags": [
|
package/src/genie-code/runner.ts
CHANGED
|
@@ -85,22 +85,8 @@ export async function runGenieCodeChild(
|
|
|
85
85
|
forceTimeoutMs: 1_000,
|
|
86
86
|
},
|
|
87
87
|
);
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
void child.shutdown();
|
|
91
|
-
};
|
|
92
|
-
for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"] as const) {
|
|
93
|
-
process.once(signal, shutdown);
|
|
94
|
-
}
|
|
95
|
-
try {
|
|
96
|
-
const result = await running;
|
|
97
|
-
if (result.exitCode !== 0) process.exitCode = result.exitCode;
|
|
98
|
-
} finally {
|
|
99
|
-
for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"] as const) {
|
|
100
|
-
process.off(signal, shutdown);
|
|
101
|
-
}
|
|
102
|
-
await child.shutdown();
|
|
103
|
-
}
|
|
88
|
+
const result = await child.run();
|
|
89
|
+
if (result.exitCode !== 0) process.exitCode = result.exitCode;
|
|
104
90
|
}
|
|
105
91
|
|
|
106
92
|
export { RUNNER_OPTIONS_ENV };
|
package/src/graphiti/cli.ts
CHANGED
|
@@ -10,7 +10,10 @@
|
|
|
10
10
|
import { addArgs, parseArgs, serializeArgs } from "@dbx-tools/cli-args";
|
|
11
11
|
import { buildServiceCommand, type CliServiceCliDependencies } from "@dbx-tools/cli-service/cli";
|
|
12
12
|
import { defineService, type CliServiceDefinition } from "@dbx-tools/cli-service/definition";
|
|
13
|
-
import {
|
|
13
|
+
import {
|
|
14
|
+
runGraphiti,
|
|
15
|
+
type GraphitiRuntimeOptions,
|
|
16
|
+
} from "@dbx-tools/appkit-graphiti/runtime";
|
|
14
17
|
import { Command } from "commander";
|
|
15
18
|
|
|
16
19
|
import {
|
package/src/graphiti/options.ts
CHANGED
|
@@ -16,5 +16,8 @@ export {
|
|
|
16
16
|
graphitiOptionsEnvironment,
|
|
17
17
|
graphitiOptionsFromEnvironment,
|
|
18
18
|
resolveGraphitiOptions,
|
|
19
|
-
} from "@dbx-tools/graphiti/options";
|
|
20
|
-
export type {
|
|
19
|
+
} from "@dbx-tools/appkit-graphiti/options";
|
|
20
|
+
export type {
|
|
21
|
+
GraphitiOptions,
|
|
22
|
+
ResolvedGraphitiOptions,
|
|
23
|
+
} from "@dbx-tools/appkit-graphiti/options";
|
package/src/tunnel/cli.ts
CHANGED
|
@@ -109,7 +109,7 @@ async function run(raw: TunnelOptions, command: readonly string[]): Promise<void
|
|
|
109
109
|
],
|
|
110
110
|
{ gracefulTimeoutMs: 10_000 },
|
|
111
111
|
);
|
|
112
|
-
|
|
112
|
+
await app.start();
|
|
113
113
|
children.push(app);
|
|
114
114
|
} else if (resolved.appPort) {
|
|
115
115
|
appPort = resolved.appPort;
|
|
@@ -152,7 +152,7 @@ async function run(raw: TunnelOptions, command: readonly string[]): Promise<void
|
|
|
152
152
|
if ((resolved.transport === "frp" || resolved.transport === "both") && resolved.frp) {
|
|
153
153
|
const frpEnv = await frp.installFrp();
|
|
154
154
|
const configPath = await frp.writeFrpConfig(resolved.frp, frpEnv);
|
|
155
|
-
children.push(frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
155
|
+
children.push(await frp.startFrp(resolved.frp, frpEnv, configPath));
|
|
156
156
|
}
|
|
157
157
|
const activeTunnelCount = children.length - (executable ? 1 : 0);
|
|
158
158
|
if (!activeTunnelCount) {
|