@dbx-tools/tunnel 0.6.65 → 0.6.67

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 CHANGED
@@ -355,6 +355,19 @@ the cookie, because that request was never going to be gated. So the same runnin
355
355
  app shows the OTP screen to a portr visitor and no login at all to a browser on
356
356
  `localhost` or the platform front door.
357
357
 
358
+ ## Verify The Live Portr Install
359
+
360
+ The normal test task skips the networked portr release download. Run the
361
+ integration test explicitly when validating GitHub release discovery, archive
362
+ selection, executable installation, and the downloaded CLI:
363
+
364
+ ```sh
365
+ RUN_LIVE_INSTALL_TEST=1 bun test packages/node/tunnel/test/portr-install.integration.test.ts
366
+ ```
367
+
368
+ The test installs into an isolated temporary home, runs `portr --version`, logs
369
+ the selected release and executable path, then removes the temporary directory.
370
+
358
371
  ## Modules
359
372
 
360
373
  - `interceptor` - `tunnelInterceptor()`, the `createApp` interceptor that applies
package/index.ts CHANGED
@@ -25,7 +25,7 @@ export { CodeStore } from "./src/otp.ts";
25
25
  export type { VerifyOutcome } from "./src/otp.ts";
26
26
  export { AuthGatePlugin, authGate } from "./src/plugin.ts";
27
27
  export type { AuthGateConfig, SendCodeOptions, ResolvedAuthGateConfig, AuthGateApi } from "./src/plugin.ts";
28
- export type { PortrConfig } from "./src/portr.ts";
28
+ export type { PortrInstallOptions, PortrConfig } from "./src/portr.ts";
29
29
  export { RateLimiter } from "./src/rate-limit.ts";
30
30
  export { KEY_TTL_SECONDS } from "./src/signing-key.ts";
31
31
  export type { SigningKey } from "./src/signing-key.ts";
package/lib/index.d.ts CHANGED
@@ -21,7 +21,7 @@ export { CodeStore } from "./src/otp.ts";
21
21
  export type { VerifyOutcome } from "./src/otp.ts";
22
22
  export { AuthGatePlugin, authGate } from "./src/plugin.ts";
23
23
  export type { AuthGateConfig, SendCodeOptions, ResolvedAuthGateConfig, AuthGateApi } from "./src/plugin.ts";
24
- export type { PortrConfig } from "./src/portr.ts";
24
+ export type { PortrInstallOptions, PortrConfig } from "./src/portr.ts";
25
25
  export { RateLimiter } from "./src/rate-limit.ts";
26
26
  export { KEY_TTL_SECONDS } from "./src/signing-key.ts";
27
27
  export type { SigningKey } from "./src/signing-key.ts";
package/lib/index.js CHANGED
@@ -20,4 +20,4 @@ export { CodeStore } from "./src/otp.js";
20
20
  export { AuthGatePlugin, authGate } from "./src/plugin.js";
21
21
  export { RateLimiter } from "./src/rate-limit.js";
22
22
  export { KEY_TTL_SECONDS } from "./src/signing-key.js";
23
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxPQUFPLEtBQUssU0FBUyxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLEdBQUcsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxLQUFLLElBQUksTUFBTSxlQUFlLENBQUM7QUFDdEMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssV0FBVyxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLEtBQUssTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QyxPQUFPLEtBQUssU0FBUyxNQUFNLHFCQUFxQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxRQUFRLE1BQU0sb0JBQW9CLENBQUM7QUFDL0MsT0FBTyxLQUFLLFVBQVUsTUFBTSxzQkFBc0IsQ0FBQztBQUVuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFLGtCQUFrQixFQUFFLGlCQUFpQixFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM1TSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTVDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRzlFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFekMsT0FBTyxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUczRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0ICogYXMgYWxsb3dsaXN0IGZyb20gXCIuL3NyYy9hbGxvd2xpc3QudHNcIjtcbmV4cG9ydCAqIGFzIGNvZGVFbWFpbCBmcm9tIFwiLi9zcmMvY29kZS1lbWFpbC50c1wiO1xuZXhwb3J0ICogYXMgZW52IGZyb20gXCIuL3NyYy9lbnYudHNcIjtcbmV4cG9ydCAqIGFzIGdhdGUgZnJvbSBcIi4vc3JjL2dhdGUudHNcIjtcbmV4cG9ydCAqIGFzIGhlYWRlcnMgZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCAqIGFzIGludGVyY2VwdG9yIGZyb20gXCIuL3NyYy9pbnRlcmNlcHRvci50c1wiO1xuZXhwb3J0ICogYXMgb3RwIGZyb20gXCIuL3NyYy9vdHAudHNcIjtcbmV4cG9ydCAqIGFzIHBsdWdpbiBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgKiBhcyBwb3J0ciBmcm9tIFwiLi9zcmMvcG9ydHIudHNcIjtcbmV4cG9ydCAqIGFzIHJhdGVMaW1pdCBmcm9tIFwiLi9zcmMvcmF0ZS1saW1pdC50c1wiO1xuZXhwb3J0ICogYXMgc2VuZENvZGUgZnJvbSBcIi4vc3JjL3NlbmQtY29kZS50c1wiO1xuZXhwb3J0ICogYXMgc2lnbmluZ0tleSBmcm9tIFwiLi9zcmMvc2lnbmluZy1rZXkudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ29kZUNvcHkgfSBmcm9tIFwiLi9zcmMvY29kZS1lbWFpbC50c1wiO1xuZXhwb3J0IHsgQUxMT1dfRU5WLCBTVUJKRUNUX0VOViwgQlJBTkRfTkFNRV9FTlYsIE1FU1NBR0VfRU5WLCBTRVNTSU9OX1RUTF9FTlYsIENPREVfVFRMX0VOViwgSldUX1NFQ1JFVF9FTlYsIFNFU1NJT05fQ1VUT0ZGX0VOViwgUFVCTElDX0RPTUFJTl9FTlYsIElOU0VDVVJFX0VOViwgRk9SV0FSRF9IRUFERVJTX0VOViB9IGZyb20gXCIuL3NyYy9lbnYudHNcIjtcbmV4cG9ydCB7IEFVVEhfUFJFRklYIH0gZnJvbSBcIi4vc3JjL2dhdGUudHNcIjtcbmV4cG9ydCB0eXBlIHsgR2F0ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ2F0ZS50c1wiO1xuZXhwb3J0IHsgUFJPVEVDVEVEX0hFQURFUlMsIERFRkFVTFRfRk9SV0FSRF9IRUFERVJTIH0gZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgSGVhZGVyUG9saWN5IH0gZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgVHVubmVsSW50ZXJjZXB0b3JPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2ludGVyY2VwdG9yLnRzXCI7XG5leHBvcnQgeyBDb2RlU3RvcmUgfSBmcm9tIFwiLi9zcmMvb3RwLnRzXCI7XG5leHBvcnQgdHlwZSB7IFZlcmlmeU91dGNvbWUgfSBmcm9tIFwiLi9zcmMvb3RwLnRzXCI7XG5leHBvcnQgeyBBdXRoR2F0ZVBsdWdpbiwgYXV0aEdhdGUgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgdHlwZSB7IEF1dGhHYXRlQ29uZmlnLCBTZW5kQ29kZU9wdGlvbnMsIFJlc29sdmVkQXV0aEdhdGVDb25maWcsIEF1dGhHYXRlQXBpIH0gZnJvbSBcIi4vc3JjL3BsdWdpbi50c1wiO1xuZXhwb3J0IHR5cGUgeyBQb3J0ckNvbmZpZyB9IGZyb20gXCIuL3NyYy9wb3J0ci50c1wiO1xuZXhwb3J0IHsgUmF0ZUxpbWl0ZXIgfSBmcm9tIFwiLi9zcmMvcmF0ZS1saW1pdC50c1wiO1xuZXhwb3J0IHsgS0VZX1RUTF9TRUNPTkRTIH0gZnJvbSBcIi4vc3JjL3NpZ25pbmcta2V5LnRzXCI7XG5leHBvcnQgdHlwZSB7IFNpZ25pbmdLZXkgfSBmcm9tIFwiLi9zcmMvc2lnbmluZy1rZXkudHNcIjtcbiJdfQ==
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxPQUFPLEtBQUssU0FBUyxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxTQUFTLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxLQUFLLEdBQUcsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxLQUFLLElBQUksTUFBTSxlQUFlLENBQUM7QUFDdEMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssV0FBVyxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLEtBQUssTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QyxPQUFPLEtBQUssU0FBUyxNQUFNLHFCQUFxQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxRQUFRLE1BQU0sb0JBQW9CLENBQUM7QUFDL0MsT0FBTyxLQUFLLFVBQVUsTUFBTSxzQkFBc0IsQ0FBQztBQUVuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFLGtCQUFrQixFQUFFLGlCQUFpQixFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM1TSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTVDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRzlFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFekMsT0FBTyxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUczRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0ICogYXMgYWxsb3dsaXN0IGZyb20gXCIuL3NyYy9hbGxvd2xpc3QudHNcIjtcbmV4cG9ydCAqIGFzIGNvZGVFbWFpbCBmcm9tIFwiLi9zcmMvY29kZS1lbWFpbC50c1wiO1xuZXhwb3J0ICogYXMgZW52IGZyb20gXCIuL3NyYy9lbnYudHNcIjtcbmV4cG9ydCAqIGFzIGdhdGUgZnJvbSBcIi4vc3JjL2dhdGUudHNcIjtcbmV4cG9ydCAqIGFzIGhlYWRlcnMgZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCAqIGFzIGludGVyY2VwdG9yIGZyb20gXCIuL3NyYy9pbnRlcmNlcHRvci50c1wiO1xuZXhwb3J0ICogYXMgb3RwIGZyb20gXCIuL3NyYy9vdHAudHNcIjtcbmV4cG9ydCAqIGFzIHBsdWdpbiBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgKiBhcyBwb3J0ciBmcm9tIFwiLi9zcmMvcG9ydHIudHNcIjtcbmV4cG9ydCAqIGFzIHJhdGVMaW1pdCBmcm9tIFwiLi9zcmMvcmF0ZS1saW1pdC50c1wiO1xuZXhwb3J0ICogYXMgc2VuZENvZGUgZnJvbSBcIi4vc3JjL3NlbmQtY29kZS50c1wiO1xuZXhwb3J0ICogYXMgc2lnbmluZ0tleSBmcm9tIFwiLi9zcmMvc2lnbmluZy1rZXkudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ29kZUNvcHkgfSBmcm9tIFwiLi9zcmMvY29kZS1lbWFpbC50c1wiO1xuZXhwb3J0IHsgQUxMT1dfRU5WLCBTVUJKRUNUX0VOViwgQlJBTkRfTkFNRV9FTlYsIE1FU1NBR0VfRU5WLCBTRVNTSU9OX1RUTF9FTlYsIENPREVfVFRMX0VOViwgSldUX1NFQ1JFVF9FTlYsIFNFU1NJT05fQ1VUT0ZGX0VOViwgUFVCTElDX0RPTUFJTl9FTlYsIElOU0VDVVJFX0VOViwgRk9SV0FSRF9IRUFERVJTX0VOViB9IGZyb20gXCIuL3NyYy9lbnYudHNcIjtcbmV4cG9ydCB7IEFVVEhfUFJFRklYIH0gZnJvbSBcIi4vc3JjL2dhdGUudHNcIjtcbmV4cG9ydCB0eXBlIHsgR2F0ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ2F0ZS50c1wiO1xuZXhwb3J0IHsgUFJPVEVDVEVEX0hFQURFUlMsIERFRkFVTFRfRk9SV0FSRF9IRUFERVJTIH0gZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgSGVhZGVyUG9saWN5IH0gZnJvbSBcIi4vc3JjL2hlYWRlcnMudHNcIjtcbmV4cG9ydCB0eXBlIHsgVHVubmVsSW50ZXJjZXB0b3JPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2ludGVyY2VwdG9yLnRzXCI7XG5leHBvcnQgeyBDb2RlU3RvcmUgfSBmcm9tIFwiLi9zcmMvb3RwLnRzXCI7XG5leHBvcnQgdHlwZSB7IFZlcmlmeU91dGNvbWUgfSBmcm9tIFwiLi9zcmMvb3RwLnRzXCI7XG5leHBvcnQgeyBBdXRoR2F0ZVBsdWdpbiwgYXV0aEdhdGUgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgdHlwZSB7IEF1dGhHYXRlQ29uZmlnLCBTZW5kQ29kZU9wdGlvbnMsIFJlc29sdmVkQXV0aEdhdGVDb25maWcsIEF1dGhHYXRlQXBpIH0gZnJvbSBcIi4vc3JjL3BsdWdpbi50c1wiO1xuZXhwb3J0IHR5cGUgeyBQb3J0ckluc3RhbGxPcHRpb25zLCBQb3J0ckNvbmZpZyB9IGZyb20gXCIuL3NyYy9wb3J0ci50c1wiO1xuZXhwb3J0IHsgUmF0ZUxpbWl0ZXIgfSBmcm9tIFwiLi9zcmMvcmF0ZS1saW1pdC50c1wiO1xuZXhwb3J0IHsgS0VZX1RUTF9TRUNPTkRTIH0gZnJvbSBcIi4vc3JjL3NpZ25pbmcta2V5LnRzXCI7XG5leHBvcnQgdHlwZSB7IFNpZ25pbmdLZXkgfSBmcm9tIFwiLi9zcmMvc2lnbmluZy1rZXkudHNcIjtcbiJdfQ==
@@ -5,16 +5,10 @@
5
5
  *
6
6
  * This is the in-process replacement for the old `dbxt-tunnel -- <cmd>` wrapper.
7
7
  * Instead of the tunnel being the main process that spawns the app as a child, the
8
- * APP is the main process and hands this interceptor its context. The interceptor:
9
- *
10
- * 1. applies the workspace host the context computed to `process.env`
11
- * (`DATABRICKS_HOST`), so portr and any later SDK call agree on the workspace;
12
- * 2. installs + launches portr, pointed at the app's PUBLIC port;
13
- * 3. `bindProcess`es portr so the app and the tunnel live and die as one -
14
- * signals pass through and either death tears the pair down (the
15
- * concurrently-style supervision that used to be `superviseExit`);
16
- * 4. registers an AppKit `shutdown` lifecycle handler so an orderly app shutdown
17
- * also stops portr.
8
+ * APP is the main process and hands this interceptor its context. The interceptor
9
+ * applies the computed workspace host, installs and launches portr on the app's
10
+ * public port, binds the child process to the app, and stops portr during an
11
+ * orderly AppKit shutdown.
18
12
  *
19
13
  * The email-OTP GATE is a separate concern: it is the `authGate` AppKit plugin,
20
14
  * which registers the login routes + a gating middleware on the app's own server.
@@ -5,16 +5,10 @@
5
5
  *
6
6
  * This is the in-process replacement for the old `dbxt-tunnel -- <cmd>` wrapper.
7
7
  * Instead of the tunnel being the main process that spawns the app as a child, the
8
- * APP is the main process and hands this interceptor its context. The interceptor:
9
- *
10
- * 1. applies the workspace host the context computed to `process.env`
11
- * (`DATABRICKS_HOST`), so portr and any later SDK call agree on the workspace;
12
- * 2. installs + launches portr, pointed at the app's PUBLIC port;
13
- * 3. `bindProcess`es portr so the app and the tunnel live and die as one -
14
- * signals pass through and either death tears the pair down (the
15
- * concurrently-style supervision that used to be `superviseExit`);
16
- * 4. registers an AppKit `shutdown` lifecycle handler so an orderly app shutdown
17
- * also stops portr.
8
+ * APP is the main process and hands this interceptor its context. The interceptor
9
+ * applies the computed workspace host, installs and launches portr on the app's
10
+ * public port, binds the child process to the app, and stops portr during an
11
+ * orderly AppKit shutdown.
18
12
  *
19
13
  * The email-OTP GATE is a separate concern: it is the `authGate` AppKit plugin,
20
14
  * which registers the login routes + a gating middleware on the app's own server.
@@ -47,16 +41,10 @@ function resolvePublicPort(port) {
47
41
  * });
48
42
  */
49
43
  export function tunnelInterceptor(options = {}) {
50
- return (ctx) => {
51
- // 1. Apply the computed workspace host so portr + the SDK agree. The context
52
- // already resolved it (from the env / auto-config); set it only when it is
53
- // known and not already present, so an explicit env wins.
44
+ return async (ctx) => {
54
45
  if (ctx.env.databricksHost) {
55
46
  process.env.DATABRICKS_HOST ??= ctx.env.databricksHost;
56
47
  }
57
- // 2. Resolve portr wiring. No token / domain -> no tunnel; leave the app alone.
58
- // `resolvePortrConfig` already falls back to TUNNEL_PUBLIC_DOMAIN itself, so
59
- // the explicit option is passed straight through.
60
48
  const port = resolvePublicPort(options.port);
61
49
  const portrConfig = resolvePortrConfig({
62
50
  publicDomain: options.publicDomain,
@@ -67,13 +55,10 @@ export function tunnelInterceptor(options = {}) {
67
55
  logger.info("no PORTR_TOKEN/TUNNEL_PUBLIC_DOMAIN - the app runs without a public tunnel");
68
56
  return;
69
57
  }
70
- // 3. Install + launch portr, then bind it: the app and portr now share a fate.
71
- const portrEnv = installPortr();
72
- writePortrConfig(portrConfig, portrEnv);
73
- const portr = startPortr(portrConfig, portrEnv);
58
+ const portrEnv = await installPortr();
59
+ await writePortrConfig(portrConfig, portrEnv);
60
+ const portr = await startPortr(portrConfig, portrEnv);
74
61
  ctx.bindProcess(portr);
75
- // 4. An orderly AppKit shutdown also stops portr (belt-and-suspenders with the
76
- // signal pass-through `bindProcess` already installed).
77
62
  ctx.onLifecycle("shutdown", () => {
78
63
  if (!portr.killed)
79
64
  portr.kill("SIGTERM");
@@ -81,4 +66,4 @@ export function tunnelInterceptor(options = {}) {
81
66
  logger.info(`tunnel bound: portr -> :${port} (${portrConfig.subdomain}.${portrConfig.server})`);
82
67
  };
83
68
  }
84
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"interceptor.js","sourceRoot":"","sources":["../../src/interceptor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAGH,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE5F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAgBhD,qFAAqF;AACrF,SAAS,iBAAiB,CAAC,IAAa;IACtC,OAAO,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC;AAC1E,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAoC,EAAE;IACtE,OAAO,CAAC,GAAuB,EAAQ,EAAE;QACvC,6EAA6E;QAC7E,8EAA8E;QAC9E,6DAA6D;QAC7D,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QACzD,CAAC;QAED,gFAAgF;QAChF,gFAAgF;QAChF,qDAAqD;QACrD,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,kBAAkB,CAAC;YACrC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI;SACL,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QAED,+EAA+E;QAC/E,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;QAChC,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAChD,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvB,+EAA+E;QAC/E,2DAA2D;QAC3D,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,MAAM;gBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,2BAA2B,IAAI,KAAK,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IAClG,CAAC,CAAC;AACJ,CAAC","sourcesContent":["/**\n * `tunnelInterceptor()` - the {@link Interceptor} that fronts an app with a public\n * portr tunnel, consuming the {@link InterceptorContext} `@dbx-tools/appkit`'s\n * `createApp` hands it.\n *\n * This is the in-process replacement for the old `dbxt-tunnel -- <cmd>` wrapper.\n * Instead of the tunnel being the main process that spawns the app as a child, the\n * APP is the main process and hands this interceptor its context. The interceptor:\n *\n *   1. applies the workspace host the context computed to `process.env`\n *      (`DATABRICKS_HOST`), so portr and any later SDK call agree on the workspace;\n *   2. installs + launches portr, pointed at the app's PUBLIC port;\n *   3. `bindProcess`es portr so the app and the tunnel live and die as one -\n *      signals pass through and either death tears the pair down (the\n *      concurrently-style supervision that used to be `superviseExit`);\n *   4. registers an AppKit `shutdown` lifecycle handler so an orderly app shutdown\n *      also stops portr.\n *\n * The email-OTP GATE is a separate concern: it is the `authGate` AppKit plugin,\n * which registers the login routes + a gating middleware on the app's own server.\n * Register it in the app's `plugins` for gated traffic. This interceptor is only\n * the portr half - \"update the host, bind portr\" - the smallest useful unit.\n *\n * @module\n */\n\nimport type { Interceptor, InterceptorContext } from \"@dbx-tools/appkit\";\nimport { log, object } from \"@dbx-tools/shared-core\";\nimport { installPortr, resolvePortrConfig, startPortr, writePortrConfig } from \"./portr.ts\";\n\nconst logger = log.logger(\"tunnel:interceptor\");\n\n/** Options for {@link tunnelInterceptor} (each also resolvable from env). */\nexport interface TunnelInterceptorOptions {\n  /** portr `<subdomain>.<server>` to serve on. Env `TUNNEL_PUBLIC_DOMAIN`. */\n  publicDomain?: string;\n  /** portr subdomain (else derived from {@link publicDomain}). */\n  subdomain?: string;\n  /**\n   * The PUBLIC port portr forwards to - the port the app itself listens on.\n   * Defaults to the Databricks Apps runtime contract `DATABRICKS_APP_PORT`\n   * (then `8000`), which is the port the platform routes to.\n   */\n  port?: number;\n}\n\n/** Resolve the public port portr should target: explicit, else the Apps contract. */\nfunction resolvePublicPort(port?: number): number {\n  return port ?? object.toNumber(process.env.DATABRICKS_APP_PORT) ?? 8000;\n}\n\n/**\n * Build the tunnel {@link Interceptor}. Pass it to `createApp({ interceptor })`.\n *\n * A no-op (logs and returns) when no portr tunnel is configured - no `PORTR_TOKEN`\n * or no resolvable `<subdomain>.<server>` - so an app can register it\n * unconditionally and only actually tunnels where the deployment wired portr.\n *\n * @example\n * import { createApp } from \"@dbx-tools/appkit\";\n * import { tunnelInterceptor } from \"@dbx-tools/tunnel\";\n *\n * await createApp({\n *   plugins: [server({ host, staticPath })],\n *   interceptor: tunnelInterceptor(),\n * });\n */\nexport function tunnelInterceptor(options: TunnelInterceptorOptions = {}): Interceptor {\n  return (ctx: InterceptorContext): void => {\n    // 1. Apply the computed workspace host so portr + the SDK agree. The context\n    //    already resolved it (from the env / auto-config); set it only when it is\n    //    known and not already present, so an explicit env wins.\n    if (ctx.env.databricksHost) {\n      process.env.DATABRICKS_HOST ??= ctx.env.databricksHost;\n    }\n\n    // 2. Resolve portr wiring. No token / domain -> no tunnel; leave the app alone.\n    //    `resolvePortrConfig` already falls back to TUNNEL_PUBLIC_DOMAIN itself, so\n    //    the explicit option is passed straight through.\n    const port = resolvePublicPort(options.port);\n    const portrConfig = resolvePortrConfig({\n      publicDomain: options.publicDomain,\n      subdomain: options.subdomain,\n      port,\n    });\n    if (!portrConfig) {\n      logger.info(\"no PORTR_TOKEN/TUNNEL_PUBLIC_DOMAIN - the app runs without a public tunnel\");\n      return;\n    }\n\n    // 3. Install + launch portr, then bind it: the app and portr now share a fate.\n    const portrEnv = installPortr();\n    writePortrConfig(portrConfig, portrEnv);\n    const portr = startPortr(portrConfig, portrEnv);\n    ctx.bindProcess(portr);\n\n    // 4. An orderly AppKit shutdown also stops portr (belt-and-suspenders with the\n    //    signal pass-through `bindProcess` already installed).\n    ctx.onLifecycle(\"shutdown\", () => {\n      if (!portr.killed) portr.kill(\"SIGTERM\");\n    });\n\n    logger.info(`tunnel bound: portr -> :${port} (${portrConfig.subdomain}.${portrConfig.server})`);\n  };\n}\n"]}
69
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUdILE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxFQUFFLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFNUYsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBZ0JoRCxxRkFBcUY7QUFDckYsU0FBUyxpQkFBaUIsQ0FBQyxJQUFhO0lBQ3RDLE9BQU8sSUFBSSxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLElBQUksQ0FBQztBQUMxRSxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7OztHQWVHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUFDLFVBQW9DLEVBQUU7SUFDdEUsT0FBTyxLQUFLLEVBQUUsR0FBdUIsRUFBaUIsRUFBRTtRQUN0RCxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDM0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEtBQUssR0FBRyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7UUFDekQsQ0FBQztRQUVELE1BQU0sSUFBSSxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxNQUFNLFdBQVcsR0FBRyxrQkFBa0IsQ0FBQztZQUNyQyxZQUFZLEVBQUUsT0FBTyxDQUFDLFlBQVk7WUFDbEMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTO1lBQzVCLElBQUk7U0FDTCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsTUFBTSxDQUFDLElBQUksQ0FBQyw0RUFBNEUsQ0FBQyxDQUFDO1lBQzFGLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxZQUFZLEVBQUUsQ0FBQztRQUN0QyxNQUFNLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUM5QyxNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDdEQsR0FBRyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUV2QixHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUU7WUFDL0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNO2dCQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDM0MsQ0FBQyxDQUFDLENBQUM7UUFFSCxNQUFNLENBQUMsSUFBSSxDQUFDLDJCQUEyQixJQUFJLEtBQUssV0FBVyxDQUFDLFNBQVMsSUFBSSxXQUFXLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNsRyxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBgdHVubmVsSW50ZXJjZXB0b3IoKWAgLSB0aGUge0BsaW5rIEludGVyY2VwdG9yfSB0aGF0IGZyb250cyBhbiBhcHAgd2l0aCBhIHB1YmxpY1xuICogcG9ydHIgdHVubmVsLCBjb25zdW1pbmcgdGhlIHtAbGluayBJbnRlcmNlcHRvckNvbnRleHR9IGBAZGJ4LXRvb2xzL2FwcGtpdGAnc1xuICogYGNyZWF0ZUFwcGAgaGFuZHMgaXQuXG4gKlxuICogVGhpcyBpcyB0aGUgaW4tcHJvY2VzcyByZXBsYWNlbWVudCBmb3IgdGhlIG9sZCBgZGJ4dC10dW5uZWwgLS0gPGNtZD5gIHdyYXBwZXIuXG4gKiBJbnN0ZWFkIG9mIHRoZSB0dW5uZWwgYmVpbmcgdGhlIG1haW4gcHJvY2VzcyB0aGF0IHNwYXducyB0aGUgYXBwIGFzIGEgY2hpbGQsIHRoZVxuICogQVBQIGlzIHRoZSBtYWluIHByb2Nlc3MgYW5kIGhhbmRzIHRoaXMgaW50ZXJjZXB0b3IgaXRzIGNvbnRleHQuIFRoZSBpbnRlcmNlcHRvclxuICogYXBwbGllcyB0aGUgY29tcHV0ZWQgd29ya3NwYWNlIGhvc3QsIGluc3RhbGxzIGFuZCBsYXVuY2hlcyBwb3J0ciBvbiB0aGUgYXBwJ3NcbiAqIHB1YmxpYyBwb3J0LCBiaW5kcyB0aGUgY2hpbGQgcHJvY2VzcyB0byB0aGUgYXBwLCBhbmQgc3RvcHMgcG9ydHIgZHVyaW5nIGFuXG4gKiBvcmRlcmx5IEFwcEtpdCBzaHV0ZG93bi5cbiAqXG4gKiBUaGUgZW1haWwtT1RQIEdBVEUgaXMgYSBzZXBhcmF0ZSBjb25jZXJuOiBpdCBpcyB0aGUgYGF1dGhHYXRlYCBBcHBLaXQgcGx1Z2luLFxuICogd2hpY2ggcmVnaXN0ZXJzIHRoZSBsb2dpbiByb3V0ZXMgKyBhIGdhdGluZyBtaWRkbGV3YXJlIG9uIHRoZSBhcHAncyBvd24gc2VydmVyLlxuICogUmVnaXN0ZXIgaXQgaW4gdGhlIGFwcCdzIGBwbHVnaW5zYCBmb3IgZ2F0ZWQgdHJhZmZpYy4gVGhpcyBpbnRlcmNlcHRvciBpcyBvbmx5XG4gKiB0aGUgcG9ydHIgaGFsZiAtIFwidXBkYXRlIHRoZSBob3N0LCBiaW5kIHBvcnRyXCIgLSB0aGUgc21hbGxlc3QgdXNlZnVsIHVuaXQuXG4gKlxuICogQG1vZHVsZVxuICovXG5cbmltcG9ydCB0eXBlIHsgSW50ZXJjZXB0b3IsIEludGVyY2VwdG9yQ29udGV4dCB9IGZyb20gXCJAZGJ4LXRvb2xzL2FwcGtpdFwiO1xuaW1wb3J0IHsgbG9nLCBvYmplY3QgfSBmcm9tIFwiQGRieC10b29scy9zaGFyZWQtY29yZVwiO1xuaW1wb3J0IHsgaW5zdGFsbFBvcnRyLCByZXNvbHZlUG9ydHJDb25maWcsIHN0YXJ0UG9ydHIsIHdyaXRlUG9ydHJDb25maWcgfSBmcm9tIFwiLi9wb3J0ci50c1wiO1xuXG5jb25zdCBsb2dnZXIgPSBsb2cubG9nZ2VyKFwidHVubmVsOmludGVyY2VwdG9yXCIpO1xuXG4vKiogT3B0aW9ucyBmb3Ige0BsaW5rIHR1bm5lbEludGVyY2VwdG9yfSAoZWFjaCBhbHNvIHJlc29sdmFibGUgZnJvbSBlbnYpLiAqL1xuZXhwb3J0IGludGVyZmFjZSBUdW5uZWxJbnRlcmNlcHRvck9wdGlvbnMge1xuICAvKiogcG9ydHIgYDxzdWJkb21haW4+LjxzZXJ2ZXI+YCB0byBzZXJ2ZSBvbi4gRW52IGBUVU5ORUxfUFVCTElDX0RPTUFJTmAuICovXG4gIHB1YmxpY0RvbWFpbj86IHN0cmluZztcbiAgLyoqIHBvcnRyIHN1YmRvbWFpbiAoZWxzZSBkZXJpdmVkIGZyb20ge0BsaW5rIHB1YmxpY0RvbWFpbn0pLiAqL1xuICBzdWJkb21haW4/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBUaGUgUFVCTElDIHBvcnQgcG9ydHIgZm9yd2FyZHMgdG8gLSB0aGUgcG9ydCB0aGUgYXBwIGl0c2VsZiBsaXN0ZW5zIG9uLlxuICAgKiBEZWZhdWx0cyB0byB0aGUgRGF0YWJyaWNrcyBBcHBzIHJ1bnRpbWUgY29udHJhY3QgYERBVEFCUklDS1NfQVBQX1BPUlRgXG4gICAqICh0aGVuIGA4MDAwYCksIHdoaWNoIGlzIHRoZSBwb3J0IHRoZSBwbGF0Zm9ybSByb3V0ZXMgdG8uXG4gICAqL1xuICBwb3J0PzogbnVtYmVyO1xufVxuXG4vKiogUmVzb2x2ZSB0aGUgcHVibGljIHBvcnQgcG9ydHIgc2hvdWxkIHRhcmdldDogZXhwbGljaXQsIGVsc2UgdGhlIEFwcHMgY29udHJhY3QuICovXG5mdW5jdGlvbiByZXNvbHZlUHVibGljUG9ydChwb3J0PzogbnVtYmVyKTogbnVtYmVyIHtcbiAgcmV0dXJuIHBvcnQgPz8gb2JqZWN0LnRvTnVtYmVyKHByb2Nlc3MuZW52LkRBVEFCUklDS1NfQVBQX1BPUlQpID8/IDgwMDA7XG59XG5cbi8qKlxuICogQnVpbGQgdGhlIHR1bm5lbCB7QGxpbmsgSW50ZXJjZXB0b3J9LiBQYXNzIGl0IHRvIGBjcmVhdGVBcHAoeyBpbnRlcmNlcHRvciB9KWAuXG4gKlxuICogQSBuby1vcCAobG9ncyBhbmQgcmV0dXJucykgd2hlbiBubyBwb3J0ciB0dW5uZWwgaXMgY29uZmlndXJlZCAtIG5vIGBQT1JUUl9UT0tFTmBcbiAqIG9yIG5vIHJlc29sdmFibGUgYDxzdWJkb21haW4+LjxzZXJ2ZXI+YCAtIHNvIGFuIGFwcCBjYW4gcmVnaXN0ZXIgaXRcbiAqIHVuY29uZGl0aW9uYWxseSBhbmQgb25seSBhY3R1YWxseSB0dW5uZWxzIHdoZXJlIHRoZSBkZXBsb3ltZW50IHdpcmVkIHBvcnRyLlxuICpcbiAqIEBleGFtcGxlXG4gKiBpbXBvcnQgeyBjcmVhdGVBcHAgfSBmcm9tIFwiQGRieC10b29scy9hcHBraXRcIjtcbiAqIGltcG9ydCB7IHR1bm5lbEludGVyY2VwdG9yIH0gZnJvbSBcIkBkYngtdG9vbHMvdHVubmVsXCI7XG4gKlxuICogYXdhaXQgY3JlYXRlQXBwKHtcbiAqICAgcGx1Z2luczogW3NlcnZlcih7IGhvc3QsIHN0YXRpY1BhdGggfSldLFxuICogICBpbnRlcmNlcHRvcjogdHVubmVsSW50ZXJjZXB0b3IoKSxcbiAqIH0pO1xuICovXG5leHBvcnQgZnVuY3Rpb24gdHVubmVsSW50ZXJjZXB0b3Iob3B0aW9uczogVHVubmVsSW50ZXJjZXB0b3JPcHRpb25zID0ge30pOiBJbnRlcmNlcHRvciB7XG4gIHJldHVybiBhc3luYyAoY3R4OiBJbnRlcmNlcHRvckNvbnRleHQpOiBQcm9taXNlPHZvaWQ+ID0+IHtcbiAgICBpZiAoY3R4LmVudi5kYXRhYnJpY2tzSG9zdCkge1xuICAgICAgcHJvY2Vzcy5lbnYuREFUQUJSSUNLU19IT1NUID8/PSBjdHguZW52LmRhdGFicmlja3NIb3N0O1xuICAgIH1cblxuICAgIGNvbnN0IHBvcnQgPSByZXNvbHZlUHVibGljUG9ydChvcHRpb25zLnBvcnQpO1xuICAgIGNvbnN0IHBvcnRyQ29uZmlnID0gcmVzb2x2ZVBvcnRyQ29uZmlnKHtcbiAgICAgIHB1YmxpY0RvbWFpbjogb3B0aW9ucy5wdWJsaWNEb21haW4sXG4gICAgICBzdWJkb21haW46IG9wdGlvbnMuc3ViZG9tYWluLFxuICAgICAgcG9ydCxcbiAgICB9KTtcbiAgICBpZiAoIXBvcnRyQ29uZmlnKSB7XG4gICAgICBsb2dnZXIuaW5mbyhcIm5vIFBPUlRSX1RPS0VOL1RVTk5FTF9QVUJMSUNfRE9NQUlOIC0gdGhlIGFwcCBydW5zIHdpdGhvdXQgYSBwdWJsaWMgdHVubmVsXCIpO1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGNvbnN0IHBvcnRyRW52ID0gYXdhaXQgaW5zdGFsbFBvcnRyKCk7XG4gICAgYXdhaXQgd3JpdGVQb3J0ckNvbmZpZyhwb3J0ckNvbmZpZywgcG9ydHJFbnYpO1xuICAgIGNvbnN0IHBvcnRyID0gYXdhaXQgc3RhcnRQb3J0cihwb3J0ckNvbmZpZywgcG9ydHJFbnYpO1xuICAgIGN0eC5iaW5kUHJvY2Vzcyhwb3J0cik7XG5cbiAgICBjdHgub25MaWZlY3ljbGUoXCJzaHV0ZG93blwiLCAoKSA9PiB7XG4gICAgICBpZiAoIXBvcnRyLmtpbGxlZCkgcG9ydHIua2lsbChcIlNJR1RFUk1cIik7XG4gICAgfSk7XG5cbiAgICBsb2dnZXIuaW5mbyhgdHVubmVsIGJvdW5kOiBwb3J0ciAtPiA6JHtwb3J0fSAoJHtwb3J0ckNvbmZpZy5zdWJkb21haW59LiR7cG9ydHJDb25maWcuc2VydmVyfSlgKTtcbiAgfTtcbn1cbiJdfQ==
@@ -1,16 +1,20 @@
1
1
  /**
2
- * portr install + config + launch for the tunnel CLI.
2
+ * portr install, config, and launch support for the tunnel runtime.
3
3
  *
4
- * Some hosts (Databricks Apps among them) mount the container's `$HOME` read-only
5
- * on cold start, so the portr binary and its config are placed under a writable,
6
- * cwd-rooted `.home` unconditionally - it costs nothing where `$HOME` is writable.
7
- * The install is idempotent (the installer skips when the on-PATH binary is
8
- * current). The config is rendered from `TUNNEL_PUBLIC_DOMAIN` (`<subdomain>.<server>`)
9
- * + `PORTR_TOKEN` and points portr at the PUBLIC port (the proxy listens there).
4
+ * The binary and config use portr's conventional `$HOME/.portr` tree. The
5
+ * install is idempotent (the installer skips an existing executable). The
6
+ * config is rendered from `TUNNEL_PUBLIC_DOMAIN`
7
+ * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port
8
+ * (the proxy listens there).
10
9
  *
11
10
  * @module
12
11
  */
13
12
  import { spawn } from "node:child_process";
13
+ /** Options for installing the portr executable. */
14
+ export interface PortrInstallOptions {
15
+ /** Home directory containing `.portr`; defaults to the OS home directory. */
16
+ homeDir?: string;
17
+ }
14
18
  /** Resolved portr wiring, or `undefined` when no tunnel is configured. */
15
19
  export interface PortrConfig {
16
20
  subdomain: string;
@@ -30,11 +34,11 @@ export declare function resolvePortrConfig(opts: {
30
34
  token?: string;
31
35
  port: number;
32
36
  }): PortrConfig | undefined;
33
- /** Install portr (idempotent) into the cwd-rooted home and return the child env. */
34
- export declare function installPortr(): NodeJS.ProcessEnv;
37
+ /** GitHub release asset name for the current or supplied OS/architecture. */
38
+ export declare function portrAssetName(version: string, platform?: NodeJS.Platform, arch?: string): string;
39
+ /** Install portr when absent and return the environment used by its process. */
40
+ export declare function installPortr(options?: PortrInstallOptions): Promise<NodeJS.ProcessEnv>;
35
41
  /** Render `~/.portr/config.yaml` for the resolved tunnel. */
36
- export declare function writePortrConfig(config: PortrConfig, env: NodeJS.ProcessEnv): void;
42
+ export declare function writePortrConfig(config: PortrConfig, childEnv: NodeJS.ProcessEnv): Promise<void>;
37
43
  /** Launch `portr start` as a child process (caller supervises + kills it). */
38
- export declare function startPortr(config: PortrConfig, env: NodeJS.ProcessEnv): ReturnType<typeof spawn>;
39
- /** True when the installed portr binary path exists (post-install sanity). */
40
- export declare function portrInstalled(env: NodeJS.ProcessEnv): boolean;
44
+ export declare function startPortr(config: PortrConfig, childEnv: NodeJS.ProcessEnv): Promise<ReturnType<typeof spawn>>;
package/lib/src/portr.js CHANGED
@@ -1,21 +1,26 @@
1
1
  /**
2
- * portr install + config + launch for the tunnel CLI.
2
+ * portr install, config, and launch support for the tunnel runtime.
3
3
  *
4
- * Some hosts (Databricks Apps among them) mount the container's `$HOME` read-only
5
- * on cold start, so the portr binary and its config are placed under a writable,
6
- * cwd-rooted `.home` unconditionally - it costs nothing where `$HOME` is writable.
7
- * The install is idempotent (the installer skips when the on-PATH binary is
8
- * current). The config is rendered from `TUNNEL_PUBLIC_DOMAIN` (`<subdomain>.<server>`)
9
- * + `PORTR_TOKEN` and points portr at the PUBLIC port (the proxy listens there).
4
+ * The binary and config use portr's conventional `$HOME/.portr` tree. The
5
+ * install is idempotent (the installer skips an existing executable). The
6
+ * config is rendered from `TUNNEL_PUBLIC_DOMAIN`
7
+ * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port
8
+ * (the proxy listens there).
10
9
  *
11
10
  * @module
12
11
  */
13
- import { spawn, spawnSync } from "node:child_process";
14
- import { existsSync, mkdirSync, writeFileSync } from "node:fs";
12
+ import { execFile, spawn } from "node:child_process";
13
+ import { writeFile } from "node:fs/promises";
14
+ import os from "node:os";
15
15
  import { delimiter, join } from "node:path";
16
+ import { promisify } from "node:util";
17
+ import { bin } from "@dbx-tools/core";
16
18
  import { env, log } from "@dbx-tools/shared-core";
17
19
  import { PUBLIC_DOMAIN_ENV } from "./env.js";
18
20
  const logger = log.logger("tunnel:portr");
21
+ const PORTR_LATEST_RELEASE_URL = "https://api.github.com/repos/amalshaji/portr/releases/latest";
22
+ const PORTR_MIN_VERSION = "v1.0.15";
23
+ const execFileAsync = promisify(execFile);
19
24
  /**
20
25
  * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an
21
26
  * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.
@@ -39,34 +44,54 @@ export function resolvePortrConfig(opts) {
39
44
  return undefined;
40
45
  return { subdomain, server, token, port: opts.port };
41
46
  }
42
- /** The writable home portr installs + configures under (Apps `$HOME` is read-only). */
43
- function portrHome() {
44
- const home = join(process.cwd(), ".home");
45
- mkdirSync(join(home, ".portr", "bin"), { recursive: true });
46
- return home;
47
+ /** GitHub release asset name for the current or supplied OS/architecture. */
48
+ export function portrAssetName(version, platform = process.platform, arch = process.arch) {
49
+ const osName = platform === "darwin" ? "Darwin" : platform === "linux" ? "Linux" : undefined;
50
+ const archName = arch === "arm64" ? "arm64" : arch === "x64" ? "x86_64" : undefined;
51
+ if (!osName || !archName) {
52
+ throw new Error(`portr has no supported release asset for ${platform}/${arch}`);
53
+ }
54
+ return `portr_${version}_${osName}_${archName}.zip`;
55
+ }
56
+ async function portrDownloadUrl() {
57
+ const releaseResponse = await fetch(PORTR_LATEST_RELEASE_URL, {
58
+ headers: {
59
+ accept: "application/vnd.github+json",
60
+ "user-agent": "@dbx-tools/tunnel",
61
+ },
62
+ });
63
+ if (!releaseResponse.ok) {
64
+ throw new Error(`portr release lookup failed (${releaseResponse.status})`);
65
+ }
66
+ const release = (await releaseResponse.json());
67
+ const version = release.tag_name.replace(/^v/, "");
68
+ const assetName = portrAssetName(version);
69
+ const asset = release.assets.find((candidate) => candidate.name === assetName);
70
+ if (!asset)
71
+ throw new Error(`portr release ${release.tag_name} has no ${assetName}`);
72
+ logger.info("installing portr", { version, asset: assetName });
73
+ return asset.browser_download_url;
47
74
  }
48
- /** Install portr (idempotent) into the cwd-rooted home and return the child env. */
49
- export function installPortr() {
50
- const home = portrHome();
51
- const env = {
75
+ /** Install portr when absent and return the environment used by its process. */
76
+ export async function installPortr(options = {}) {
77
+ const homeDir = options.homeDir ?? os.homedir();
78
+ const context = await bin.ensure("portr", portrDownloadUrl, {
79
+ autoUnpackage: true,
80
+ homeDir,
81
+ minVersion: PORTR_MIN_VERSION,
82
+ selector: ({ source }) => join(source, "portr"),
83
+ });
84
+ return {
52
85
  ...process.env,
53
- HOME: home,
86
+ HOME: homeDir,
54
87
  PORTR_AUTO_ADD_PATH: "no",
55
- PATH: [join(home, ".portr", "bin"), process.env.PATH ?? ""].join(delimiter),
88
+ PATH: [context.binDir, process.env.PATH ?? ""].join(delimiter),
56
89
  };
57
- logger.info("installing portr (idempotent)");
58
- const res = spawnSync("bash", ["-c", "curl -sSf https://install.portr.dev | sh"], {
59
- env,
60
- stdio: "inherit",
61
- });
62
- if (res.status !== 0)
63
- throw new Error("portr install failed");
64
- return env;
65
90
  }
66
91
  /** Render `~/.portr/config.yaml` for the resolved tunnel. */
67
- export function writePortrConfig(config, env) {
68
- const path = join(env.HOME, ".portr", "config.yaml");
69
- writeFileSync(path, [
92
+ export async function writePortrConfig(config, childEnv) {
93
+ const path = join(childEnv.HOME ?? os.homedir(), ".portr", "config.yaml");
94
+ await writeFile(path, [
70
95
  `server_url: ${config.server}`,
71
96
  `ssh_url: ${config.server}:4444`,
72
97
  `secret_key: ${config.token}`,
@@ -80,14 +105,10 @@ export function writePortrConfig(config, env) {
80
105
  ].join("\n"));
81
106
  }
82
107
  /** Launch `portr start` as a child process (caller supervises + kills it). */
83
- export function startPortr(config, env) {
108
+ export async function startPortr(config, childEnv) {
84
109
  // Reclaim the subdomain from any portr left by a previous boot in this container.
85
- spawnSync("pkill", ["-x", "portr"], { stdio: "ignore" });
110
+ await execFileAsync("pkill", ["-x", "portr"]).catch(() => undefined);
86
111
  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);
87
- return spawn("portr", ["start"], { env, stdio: "inherit" });
88
- }
89
- /** True when the installed portr binary path exists (post-install sanity). */
90
- export function portrInstalled(env) {
91
- return existsSync(join(env.HOME, ".portr", "bin", "portr"));
112
+ return spawn("portr", ["start"], { env: childEnv, stdio: "inherit" });
92
113
  }
93
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portr.js","sourceRoot":"","sources":["../../src/portr.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * portr install + config + launch for the tunnel CLI.\n *\n * Some hosts (Databricks Apps among them) mount the container's `$HOME` read-only\n * on cold start, so the portr binary and its config are placed under a writable,\n * cwd-rooted `.home` unconditionally - it costs nothing where `$HOME` is writable.\n * The install is idempotent (the installer skips when the on-PATH binary is\n * current). The config is rendered from `TUNNEL_PUBLIC_DOMAIN` (`<subdomain>.<server>`)\n * + `PORTR_TOKEN` and points portr at the PUBLIC port (the proxy listens there).\n *\n * @module\n */\n\nimport { spawn, spawnSync } from \"node:child_process\";\nimport { existsSync, mkdirSync, writeFileSync } from \"node:fs\";\nimport { delimiter, join } from \"node:path\";\nimport { env, log } from \"@dbx-tools/shared-core\";\nimport { PUBLIC_DOMAIN_ENV } from \"./env.ts\";\n\nconst logger = log.logger(\"tunnel:portr\");\n\n/** Resolved portr wiring, or `undefined` when no tunnel is configured. */\nexport interface PortrConfig {\n  subdomain: string;\n  server: string;\n  token: string;\n  port: number;\n}\n\n/**\n * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an\n * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.\n * `demo.apps.dbx.tools`). Returns `undefined` (no tunnel) when the token or a\n * usable domain is absent.\n */\nexport function resolvePortrConfig(opts: {\n  publicDomain?: string;\n  subdomain?: string;\n  token?: string;\n  port: number;\n}): PortrConfig | undefined {\n  // PORTR_* is upstream portr's own namespace, so it keeps its name.\n  const token = env.string(opts.token, \"PORTR_TOKEN\");\n  const domain = env.string(opts.publicDomain, PUBLIC_DOMAIN_ENV);\n  if (!token) return undefined;\n  let subdomain = opts.subdomain;\n  let server: string | undefined;\n  if (domain) {\n    subdomain ??= domain.split(\".\")[0];\n    server = domain.slice(domain.indexOf(\".\") + 1);\n  }\n  server ??= env.text(\"PORTR_SERVER\") ?? undefined;\n  if (!subdomain || !server || server === domain) return undefined;\n  return { subdomain, server, token, port: opts.port };\n}\n\n/** The writable home portr installs + configures under (Apps `$HOME` is read-only). */\nfunction portrHome(): string {\n  const home = join(process.cwd(), \".home\");\n  mkdirSync(join(home, \".portr\", \"bin\"), { recursive: true });\n  return home;\n}\n\n/** Install portr (idempotent) into the cwd-rooted home and return the child env. */\nexport function installPortr(): NodeJS.ProcessEnv {\n  const home = portrHome();\n  const env: NodeJS.ProcessEnv = {\n    ...process.env,\n    HOME: home,\n    PORTR_AUTO_ADD_PATH: \"no\",\n    PATH: [join(home, \".portr\", \"bin\"), process.env.PATH ?? \"\"].join(delimiter),\n  };\n  logger.info(\"installing portr (idempotent)\");\n  const res = spawnSync(\"bash\", [\"-c\", \"curl -sSf https://install.portr.dev | sh\"], {\n    env,\n    stdio: \"inherit\",\n  });\n  if (res.status !== 0) throw new Error(\"portr install failed\");\n  return env;\n}\n\n/** Render `~/.portr/config.yaml` for the resolved tunnel. */\nexport function writePortrConfig(config: PortrConfig, env: NodeJS.ProcessEnv): void {\n  const path = join(env.HOME!, \".portr\", \"config.yaml\");\n  writeFileSync(\n    path,\n    [\n      `server_url: ${config.server}`,\n      `ssh_url: ${config.server}:4444`,\n      `secret_key: ${config.token}`,\n      \"disable_dashboard: true\",\n      \"disable_tui: true\",\n      \"tunnels:\",\n      `  - name: ${config.subdomain}`,\n      `    subdomain: ${config.subdomain}`,\n      `    port: ${config.port}`,\n      \"\",\n    ].join(\"\\n\"),\n  );\n}\n\n/** Launch `portr start` as a child process (caller supervises + kills it). */\nexport function startPortr(config: PortrConfig, env: NodeJS.ProcessEnv): ReturnType<typeof spawn> {\n  // Reclaim the subdomain from any portr left by a previous boot in this container.\n  spawnSync(\"pkill\", [\"-x\", \"portr\"], { stdio: \"ignore\" });\n  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);\n  return spawn(\"portr\", [\"start\"], { env, stdio: \"inherit\" });\n}\n\n/** True when the installed portr binary path exists (post-install sanity). */\nexport function portrInstalled(env: NodeJS.ProcessEnv): boolean {\n  return existsSync(join(env.HOME!, \".portr\", \"bin\", \"portr\"));\n}\n"]}
114
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portr.js","sourceRoot":"","sources":["../../src/portr.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * portr install, config, and launch support for the tunnel runtime.\n *\n * The binary and config use portr's conventional `$HOME/.portr` tree. The\n * install is idempotent (the installer skips an existing executable). The\n * config is rendered from `TUNNEL_PUBLIC_DOMAIN`\n * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port\n * (the proxy listens there).\n *\n * @module\n */\nimport { execFile, spawn } from \"node:child_process\";\nimport { writeFile } from \"node:fs/promises\";\nimport os from \"node:os\";\nimport { delimiter, join } from \"node:path\";\nimport { promisify } from \"node:util\";\n\nimport { bin } from \"@dbx-tools/core\";\nimport { env, log } from \"@dbx-tools/shared-core\";\nimport { PUBLIC_DOMAIN_ENV } from \"./env.ts\";\n\nconst logger = log.logger(\"tunnel:portr\");\nconst PORTR_LATEST_RELEASE_URL = \"https://api.github.com/repos/amalshaji/portr/releases/latest\";\nconst PORTR_MIN_VERSION = \"v1.0.15\";\nconst execFileAsync = promisify(execFile);\n\ninterface PortrRelease {\n  tag_name: string;\n  assets: Array<{ name: string; browser_download_url: string }>;\n}\n\n/** Options for installing the portr executable. */\nexport interface PortrInstallOptions {\n  /** Home directory containing `.portr`; defaults to the OS home directory. */\n  homeDir?: string;\n}\n\n/** Resolved portr wiring, or `undefined` when no tunnel is configured. */\nexport interface PortrConfig {\n  subdomain: string;\n  server: string;\n  token: string;\n  port: number;\n}\n\n/**\n * Resolve portr config from `TUNNEL_PUBLIC_DOMAIN` + `PORTR_TOKEN`, or an\n * explicit `subdomain`. The domain is `<subdomain>.<server>` (e.g.\n * `demo.apps.dbx.tools`). Returns `undefined` (no tunnel) when the token or a\n * usable domain is absent.\n */\nexport function resolvePortrConfig(opts: {\n  publicDomain?: string;\n  subdomain?: string;\n  token?: string;\n  port: number;\n}): PortrConfig | undefined {\n  // PORTR_* is upstream portr's own namespace, so it keeps its name.\n  const token = env.string(opts.token, \"PORTR_TOKEN\");\n  const domain = env.string(opts.publicDomain, PUBLIC_DOMAIN_ENV);\n  if (!token) return undefined;\n  let subdomain = opts.subdomain;\n  let server: string | undefined;\n  if (domain) {\n    subdomain ??= domain.split(\".\")[0];\n    server = domain.slice(domain.indexOf(\".\") + 1);\n  }\n  server ??= env.text(\"PORTR_SERVER\") ?? undefined;\n  if (!subdomain || !server || server === domain) return undefined;\n  return { subdomain, server, token, port: opts.port };\n}\n\n/** GitHub release asset name for the current or supplied OS/architecture. */\nexport function portrAssetName(\n  version: string,\n  platform: NodeJS.Platform = process.platform,\n  arch: string = process.arch,\n): string {\n  const osName = platform === \"darwin\" ? \"Darwin\" : platform === \"linux\" ? \"Linux\" : undefined;\n  const archName = arch === \"arm64\" ? \"arm64\" : arch === \"x64\" ? \"x86_64\" : undefined;\n  if (!osName || !archName) {\n    throw new Error(`portr has no supported release asset for ${platform}/${arch}`);\n  }\n  return `portr_${version}_${osName}_${archName}.zip`;\n}\n\nasync function portrDownloadUrl(): Promise<string> {\n  const releaseResponse = await fetch(PORTR_LATEST_RELEASE_URL, {\n    headers: {\n      accept: \"application/vnd.github+json\",\n      \"user-agent\": \"@dbx-tools/tunnel\",\n    },\n  });\n  if (!releaseResponse.ok) {\n    throw new Error(`portr release lookup failed (${releaseResponse.status})`);\n  }\n  const release = (await releaseResponse.json()) as PortrRelease;\n  const version = release.tag_name.replace(/^v/, \"\");\n\n  const assetName = portrAssetName(version);\n  const asset = release.assets.find((candidate) => candidate.name === assetName);\n  if (!asset) throw new Error(`portr release ${release.tag_name} has no ${assetName}`);\n\n  logger.info(\"installing portr\", { version, asset: assetName });\n  return asset.browser_download_url;\n}\n\n/** Install portr when absent and return the environment used by its process. */\nexport async function installPortr(options: PortrInstallOptions = {}): Promise<NodeJS.ProcessEnv> {\n  const homeDir = options.homeDir ?? os.homedir();\n  const context = await bin.ensure(\"portr\", portrDownloadUrl, {\n    autoUnpackage: true,\n    homeDir,\n    minVersion: PORTR_MIN_VERSION,\n    selector: ({ source }) => join(source, \"portr\"),\n  });\n  return {\n    ...process.env,\n    HOME: homeDir,\n    PORTR_AUTO_ADD_PATH: \"no\",\n    PATH: [context.binDir, process.env.PATH ?? \"\"].join(delimiter),\n  };\n}\n\n/** Render `~/.portr/config.yaml` for the resolved tunnel. */\nexport async function writePortrConfig(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<void> {\n  const path = join(childEnv.HOME ?? os.homedir(), \".portr\", \"config.yaml\");\n  await writeFile(\n    path,\n    [\n      `server_url: ${config.server}`,\n      `ssh_url: ${config.server}:4444`,\n      `secret_key: ${config.token}`,\n      \"disable_dashboard: true\",\n      \"disable_tui: true\",\n      \"tunnels:\",\n      `  - name: ${config.subdomain}`,\n      `    subdomain: ${config.subdomain}`,\n      `    port: ${config.port}`,\n      \"\",\n    ].join(\"\\n\"),\n  );\n}\n\n/** Launch `portr start` as a child process (caller supervises + kills it). */\nexport async function startPortr(\n  config: PortrConfig,\n  childEnv: NodeJS.ProcessEnv,\n): Promise<ReturnType<typeof spawn>> {\n  // Reclaim the subdomain from any portr left by a previous boot in this container.\n  await execFileAsync(\"pkill\", [\"-x\", \"portr\"]).catch(() => undefined);\n\n  logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);\n  return spawn(\"portr\", [\"start\"], { env: childEnv, stdio: \"inherit\" });\n}\n"]}
package/package.json CHANGED
@@ -18,19 +18,20 @@
18
18
  "projen": "projen"
19
19
  },
20
20
  "devDependencies": {
21
- "@dbx-tools/email": "0.6.65",
21
+ "@dbx-tools/email": "0.6.67",
22
22
  "@types/bun": "^1.3.14",
23
23
  "@types/node": "^24.6.0",
24
24
  "typescript": "^5.9.3"
25
25
  },
26
26
  "peerDependencies": {
27
- "@dbx-tools/email": "0.6.65"
27
+ "@dbx-tools/email": "0.6.67"
28
28
  },
29
29
  "dependencies": {
30
30
  "@databricks/appkit": "^0.43.0",
31
- "@dbx-tools/appkit": "0.6.65",
32
- "@dbx-tools/shared-core": "0.6.65",
33
- "@dbx-tools/shared-email": "0.6.65",
31
+ "@dbx-tools/appkit": "0.6.67",
32
+ "@dbx-tools/core": "0.6.67",
33
+ "@dbx-tools/shared-core": "0.6.67",
34
+ "@dbx-tools/shared-email": "0.6.67",
34
35
  "jose": "^6.2.3"
35
36
  },
36
37
  "main": "./lib/index.js",
@@ -47,7 +48,7 @@
47
48
  "./package.json": "./package.json"
48
49
  }
49
50
  },
50
- "version": "0.6.65",
51
+ "version": "0.6.67",
51
52
  "types": "./lib/index.d.ts",
52
53
  "type": "module",
53
54
  "exports": {
@@ -5,16 +5,10 @@
5
5
  *
6
6
  * This is the in-process replacement for the old `dbxt-tunnel -- <cmd>` wrapper.
7
7
  * Instead of the tunnel being the main process that spawns the app as a child, the
8
- * APP is the main process and hands this interceptor its context. The interceptor:
9
- *
10
- * 1. applies the workspace host the context computed to `process.env`
11
- * (`DATABRICKS_HOST`), so portr and any later SDK call agree on the workspace;
12
- * 2. installs + launches portr, pointed at the app's PUBLIC port;
13
- * 3. `bindProcess`es portr so the app and the tunnel live and die as one -
14
- * signals pass through and either death tears the pair down (the
15
- * concurrently-style supervision that used to be `superviseExit`);
16
- * 4. registers an AppKit `shutdown` lifecycle handler so an orderly app shutdown
17
- * also stops portr.
8
+ * APP is the main process and hands this interceptor its context. The interceptor
9
+ * applies the computed workspace host, installs and launches portr on the app's
10
+ * public port, binds the child process to the app, and stops portr during an
11
+ * orderly AppKit shutdown.
18
12
  *
19
13
  * The email-OTP GATE is a separate concern: it is the `authGate` AppKit plugin,
20
14
  * which registers the login routes + a gating middleware on the app's own server.
@@ -66,17 +60,11 @@ function resolvePublicPort(port?: number): number {
66
60
  * });
67
61
  */
68
62
  export function tunnelInterceptor(options: TunnelInterceptorOptions = {}): Interceptor {
69
- return (ctx: InterceptorContext): void => {
70
- // 1. Apply the computed workspace host so portr + the SDK agree. The context
71
- // already resolved it (from the env / auto-config); set it only when it is
72
- // known and not already present, so an explicit env wins.
63
+ return async (ctx: InterceptorContext): Promise<void> => {
73
64
  if (ctx.env.databricksHost) {
74
65
  process.env.DATABRICKS_HOST ??= ctx.env.databricksHost;
75
66
  }
76
67
 
77
- // 2. Resolve portr wiring. No token / domain -> no tunnel; leave the app alone.
78
- // `resolvePortrConfig` already falls back to TUNNEL_PUBLIC_DOMAIN itself, so
79
- // the explicit option is passed straight through.
80
68
  const port = resolvePublicPort(options.port);
81
69
  const portrConfig = resolvePortrConfig({
82
70
  publicDomain: options.publicDomain,
@@ -88,14 +76,11 @@ export function tunnelInterceptor(options: TunnelInterceptorOptions = {}): Inter
88
76
  return;
89
77
  }
90
78
 
91
- // 3. Install + launch portr, then bind it: the app and portr now share a fate.
92
- const portrEnv = installPortr();
93
- writePortrConfig(portrConfig, portrEnv);
94
- const portr = startPortr(portrConfig, portrEnv);
79
+ const portrEnv = await installPortr();
80
+ await writePortrConfig(portrConfig, portrEnv);
81
+ const portr = await startPortr(portrConfig, portrEnv);
95
82
  ctx.bindProcess(portr);
96
83
 
97
- // 4. An orderly AppKit shutdown also stops portr (belt-and-suspenders with the
98
- // signal pass-through `bindProcess` already installed).
99
84
  ctx.onLifecycle("shutdown", () => {
100
85
  if (!portr.killed) portr.kill("SIGTERM");
101
86
  });
package/src/portr.ts CHANGED
@@ -1,23 +1,39 @@
1
1
  /**
2
- * portr install + config + launch for the tunnel CLI.
2
+ * portr install, config, and launch support for the tunnel runtime.
3
3
  *
4
- * Some hosts (Databricks Apps among them) mount the container's `$HOME` read-only
5
- * on cold start, so the portr binary and its config are placed under a writable,
6
- * cwd-rooted `.home` unconditionally - it costs nothing where `$HOME` is writable.
7
- * The install is idempotent (the installer skips when the on-PATH binary is
8
- * current). The config is rendered from `TUNNEL_PUBLIC_DOMAIN` (`<subdomain>.<server>`)
9
- * + `PORTR_TOKEN` and points portr at the PUBLIC port (the proxy listens there).
4
+ * The binary and config use portr's conventional `$HOME/.portr` tree. The
5
+ * install is idempotent (the installer skips an existing executable). The
6
+ * config is rendered from `TUNNEL_PUBLIC_DOMAIN`
7
+ * (`<subdomain>.<server>`) + `PORTR_TOKEN` and points portr at the PUBLIC port
8
+ * (the proxy listens there).
10
9
  *
11
10
  * @module
12
11
  */
13
-
14
- import { spawn, spawnSync } from "node:child_process";
15
- import { existsSync, mkdirSync, writeFileSync } from "node:fs";
12
+ import { execFile, spawn } from "node:child_process";
13
+ import { writeFile } from "node:fs/promises";
14
+ import os from "node:os";
16
15
  import { delimiter, join } from "node:path";
16
+ import { promisify } from "node:util";
17
+
18
+ import { bin } from "@dbx-tools/core";
17
19
  import { env, log } from "@dbx-tools/shared-core";
18
20
  import { PUBLIC_DOMAIN_ENV } from "./env.ts";
19
21
 
20
22
  const logger = log.logger("tunnel:portr");
23
+ const PORTR_LATEST_RELEASE_URL = "https://api.github.com/repos/amalshaji/portr/releases/latest";
24
+ const PORTR_MIN_VERSION = "v1.0.15";
25
+ const execFileAsync = promisify(execFile);
26
+
27
+ interface PortrRelease {
28
+ tag_name: string;
29
+ assets: Array<{ name: string; browser_download_url: string }>;
30
+ }
31
+
32
+ /** Options for installing the portr executable. */
33
+ export interface PortrInstallOptions {
34
+ /** Home directory containing `.portr`; defaults to the OS home directory. */
35
+ homeDir?: string;
36
+ }
21
37
 
22
38
  /** Resolved portr wiring, or `undefined` when no tunnel is configured. */
23
39
  export interface PortrConfig {
@@ -54,35 +70,65 @@ export function resolvePortrConfig(opts: {
54
70
  return { subdomain, server, token, port: opts.port };
55
71
  }
56
72
 
57
- /** The writable home portr installs + configures under (Apps `$HOME` is read-only). */
58
- function portrHome(): string {
59
- const home = join(process.cwd(), ".home");
60
- mkdirSync(join(home, ".portr", "bin"), { recursive: true });
61
- return home;
73
+ /** GitHub release asset name for the current or supplied OS/architecture. */
74
+ export function portrAssetName(
75
+ version: string,
76
+ platform: NodeJS.Platform = process.platform,
77
+ arch: string = process.arch,
78
+ ): string {
79
+ const osName = platform === "darwin" ? "Darwin" : platform === "linux" ? "Linux" : undefined;
80
+ const archName = arch === "arm64" ? "arm64" : arch === "x64" ? "x86_64" : undefined;
81
+ if (!osName || !archName) {
82
+ throw new Error(`portr has no supported release asset for ${platform}/${arch}`);
83
+ }
84
+ return `portr_${version}_${osName}_${archName}.zip`;
85
+ }
86
+
87
+ async function portrDownloadUrl(): Promise<string> {
88
+ const releaseResponse = await fetch(PORTR_LATEST_RELEASE_URL, {
89
+ headers: {
90
+ accept: "application/vnd.github+json",
91
+ "user-agent": "@dbx-tools/tunnel",
92
+ },
93
+ });
94
+ if (!releaseResponse.ok) {
95
+ throw new Error(`portr release lookup failed (${releaseResponse.status})`);
96
+ }
97
+ const release = (await releaseResponse.json()) as PortrRelease;
98
+ const version = release.tag_name.replace(/^v/, "");
99
+
100
+ const assetName = portrAssetName(version);
101
+ const asset = release.assets.find((candidate) => candidate.name === assetName);
102
+ if (!asset) throw new Error(`portr release ${release.tag_name} has no ${assetName}`);
103
+
104
+ logger.info("installing portr", { version, asset: assetName });
105
+ return asset.browser_download_url;
62
106
  }
63
107
 
64
- /** Install portr (idempotent) into the cwd-rooted home and return the child env. */
65
- export function installPortr(): NodeJS.ProcessEnv {
66
- const home = portrHome();
67
- const env: NodeJS.ProcessEnv = {
108
+ /** Install portr when absent and return the environment used by its process. */
109
+ export async function installPortr(options: PortrInstallOptions = {}): Promise<NodeJS.ProcessEnv> {
110
+ const homeDir = options.homeDir ?? os.homedir();
111
+ const context = await bin.ensure("portr", portrDownloadUrl, {
112
+ autoUnpackage: true,
113
+ homeDir,
114
+ minVersion: PORTR_MIN_VERSION,
115
+ selector: ({ source }) => join(source, "portr"),
116
+ });
117
+ return {
68
118
  ...process.env,
69
- HOME: home,
119
+ HOME: homeDir,
70
120
  PORTR_AUTO_ADD_PATH: "no",
71
- PATH: [join(home, ".portr", "bin"), process.env.PATH ?? ""].join(delimiter),
121
+ PATH: [context.binDir, process.env.PATH ?? ""].join(delimiter),
72
122
  };
73
- logger.info("installing portr (idempotent)");
74
- const res = spawnSync("bash", ["-c", "curl -sSf https://install.portr.dev | sh"], {
75
- env,
76
- stdio: "inherit",
77
- });
78
- if (res.status !== 0) throw new Error("portr install failed");
79
- return env;
80
123
  }
81
124
 
82
125
  /** Render `~/.portr/config.yaml` for the resolved tunnel. */
83
- export function writePortrConfig(config: PortrConfig, env: NodeJS.ProcessEnv): void {
84
- const path = join(env.HOME!, ".portr", "config.yaml");
85
- writeFileSync(
126
+ export async function writePortrConfig(
127
+ config: PortrConfig,
128
+ childEnv: NodeJS.ProcessEnv,
129
+ ): Promise<void> {
130
+ const path = join(childEnv.HOME ?? os.homedir(), ".portr", "config.yaml");
131
+ await writeFile(
86
132
  path,
87
133
  [
88
134
  `server_url: ${config.server}`,
@@ -100,14 +146,13 @@ export function writePortrConfig(config: PortrConfig, env: NodeJS.ProcessEnv): v
100
146
  }
101
147
 
102
148
  /** Launch `portr start` as a child process (caller supervises + kills it). */
103
- export function startPortr(config: PortrConfig, env: NodeJS.ProcessEnv): ReturnType<typeof spawn> {
149
+ export async function startPortr(
150
+ config: PortrConfig,
151
+ childEnv: NodeJS.ProcessEnv,
152
+ ): Promise<ReturnType<typeof spawn>> {
104
153
  // Reclaim the subdomain from any portr left by a previous boot in this container.
105
- spawnSync("pkill", ["-x", "portr"], { stdio: "ignore" });
106
- logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);
107
- return spawn("portr", ["start"], { env, stdio: "inherit" });
108
- }
154
+ await execFileAsync("pkill", ["-x", "portr"]).catch(() => undefined);
109
155
 
110
- /** True when the installed portr binary path exists (post-install sanity). */
111
- export function portrInstalled(env: NodeJS.ProcessEnv): boolean {
112
- return existsSync(join(env.HOME!, ".portr", "bin", "portr"));
156
+ logger.info(`portr tunneling https://${config.subdomain}.${config.server} -> :${config.port}`);
157
+ return spawn("portr", ["start"], { env: childEnv, stdio: "inherit" });
113
158
  }