@dbx-tools/appkit 0.9.58 → 0.9.60
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 +28 -1
- package/index.ts +4 -1
- package/lib/index.d.ts +4 -1
- package/lib/index.js +4 -2
- package/lib/src/_cache-storage.js +3 -2
- package/lib/src/child-process.d.ts +39 -0
- package/lib/src/child-process.js +128 -0
- package/lib/src/provision.js +6 -15
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -6
- package/src/_cache-storage.ts +4 -1
- package/src/child-process.ts +157 -0
- package/src/provision.ts +11 -19
package/README.md
CHANGED
|
@@ -256,6 +256,33 @@ hard-code registered names or casts at every call site. A missing required
|
|
|
256
256
|
plugin throws AppKit's `ConfigurationError`, naming both the caller and the
|
|
257
257
|
plugin to register.
|
|
258
258
|
|
|
259
|
+
## Supervise AppKit Subprocesses
|
|
260
|
+
|
|
261
|
+
`AppKitChildProcess` starts a long-running sibling process through
|
|
262
|
+
`@dbx-tools/core/exec` and owns its shutdown escalation. Its spawn tuple accepts
|
|
263
|
+
core exec options, including line handlers and optional output capture.
|
|
264
|
+
|
|
265
|
+
```ts
|
|
266
|
+
import { AppKitChildProcess } from "@dbx-tools/appkit/child-process";
|
|
267
|
+
|
|
268
|
+
const worker = new AppKitChildProcess([
|
|
269
|
+
"bun",
|
|
270
|
+
["run", "worker.ts"],
|
|
271
|
+
{
|
|
272
|
+
stdout: { onLine: (line) => logger.info(line), capture: false },
|
|
273
|
+
stderr: { onLine: (line) => logger.error(line), capture: false },
|
|
274
|
+
},
|
|
275
|
+
]);
|
|
276
|
+
|
|
277
|
+
worker.start();
|
|
278
|
+
this.context.onLifecycle("shutdown", () => worker.shutdown());
|
|
279
|
+
```
|
|
280
|
+
|
|
281
|
+
`shutdown()` is idempotent. It sends `SIGTERM`, waits seven seconds, then sends
|
|
282
|
+
`SIGKILL` and waits one more second. Override those signals or timeouts in the
|
|
283
|
+
constructor's second argument. A detached POSIX child is signaled as a process
|
|
284
|
+
group so descendants do not survive their AppKit owner.
|
|
285
|
+
|
|
259
286
|
## Provision Lakebase Cache Schema
|
|
260
287
|
|
|
261
288
|
`provision.provisionCacheSchema()` grants the AppKit cache schema in Lakebase to
|
|
@@ -340,5 +367,5 @@ is shared. `@dbx-tools/appkit-mastra` exposes this as its `genieIdentity` option
|
|
|
340
367
|
| `identity` | OBO-vs-service-principal request identity: modes, resolution, and the forwarded headers. |
|
|
341
368
|
|
|
342
369
|
The shell-facing wrapper for auto-config is
|
|
343
|
-
[`@dbx-tools/cli
|
|
370
|
+
[`@dbx-tools/cli/appkit`](../../cli/dbx-tools). Higher-level agent composition
|
|
344
371
|
is in [`@dbx-tools/appkit-mastra`](../appkit-mastra).
|
package/index.ts
CHANGED
|
@@ -3,10 +3,11 @@
|
|
|
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/appkit";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.60";
|
|
7
7
|
export * as appkit from "./src/appkit.ts";
|
|
8
8
|
export * as brandContext from "./src/brand-context.ts";
|
|
9
9
|
export * as bundle from "./src/bundle.ts";
|
|
10
|
+
export * as childProcess from "./src/child-process.ts";
|
|
10
11
|
export * as databricks from "./src/databricks.ts";
|
|
11
12
|
export * as identity from "./src/identity.ts";
|
|
12
13
|
export * as interceptor from "./src/interceptor.ts";
|
|
@@ -21,6 +22,8 @@ export * as toolkitEntries from "./src/toolkit-entries.ts";
|
|
|
21
22
|
export type { AutoConfigureMode, CreateAppConfig, ExecutionContextLike, WorkspaceClientLike } from "./src/appkit.ts";
|
|
22
23
|
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.ts";
|
|
23
24
|
export type { BundleValidateJson, ConfigFile, ConfigMapValue, ConfigSource, ResolveConfigValueOptions } from "./src/bundle.ts";
|
|
25
|
+
export { AppKitChildProcess } from "./src/child-process.ts";
|
|
26
|
+
export type { AppKitSpawnArgs, AppKitChildProcessOptions } from "./src/child-process.ts";
|
|
24
27
|
export type { ContextLike } from "./src/databricks.ts";
|
|
25
28
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.ts";
|
|
26
29
|
export type { IdentityMode, HeaderBearing } from "./src/identity.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.60";
|
|
3
3
|
export * as appkit from "./src/appkit.ts";
|
|
4
4
|
export * as brandContext from "./src/brand-context.ts";
|
|
5
5
|
export * as bundle from "./src/bundle.ts";
|
|
6
|
+
export * as childProcess from "./src/child-process.ts";
|
|
6
7
|
export * as databricks from "./src/databricks.ts";
|
|
7
8
|
export * as identity from "./src/identity.ts";
|
|
8
9
|
export * as interceptor from "./src/interceptor.ts";
|
|
@@ -17,6 +18,8 @@ export * as toolkitEntries from "./src/toolkit-entries.ts";
|
|
|
17
18
|
export type { AutoConfigureMode, CreateAppConfig, ExecutionContextLike, WorkspaceClientLike } from "./src/appkit.ts";
|
|
18
19
|
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.ts";
|
|
19
20
|
export type { BundleValidateJson, ConfigFile, ConfigMapValue, ConfigSource, ResolveConfigValueOptions } from "./src/bundle.ts";
|
|
21
|
+
export { AppKitChildProcess } from "./src/child-process.ts";
|
|
22
|
+
export type { AppKitSpawnArgs, AppKitChildProcessOptions } from "./src/child-process.ts";
|
|
20
23
|
export type { ContextLike } from "./src/databricks.ts";
|
|
21
24
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.ts";
|
|
22
25
|
export type { IdentityMode, HeaderBearing } from "./src/identity.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
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/appkit";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.60";
|
|
6
6
|
export * as appkit from "./src/appkit.js";
|
|
7
7
|
export * as brandContext from "./src/brand-context.js";
|
|
8
8
|
export * as bundle from "./src/bundle.js";
|
|
9
|
+
export * as childProcess from "./src/child-process.js";
|
|
9
10
|
export * as databricks from "./src/databricks.js";
|
|
10
11
|
export * as identity from "./src/identity.js";
|
|
11
12
|
export * as interceptor from "./src/interceptor.js";
|
|
@@ -18,8 +19,9 @@ export * as provision from "./src/provision.js";
|
|
|
18
19
|
export * as toolProvider from "./src/tool-provider.js";
|
|
19
20
|
export * as toolkitEntries from "./src/toolkit-entries.js";
|
|
20
21
|
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.js";
|
|
22
|
+
export { AppKitChildProcess } from "./src/child-process.js";
|
|
21
23
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.js";
|
|
22
24
|
export { LifecycleBridgePlugin, lifecycleBridge } from "./src/interceptor.js";
|
|
23
25
|
export { SSL_MODES } from "./src/pgaddress.js";
|
|
24
26
|
export { ToolRegistryPlugin } from "./src/tool-provider.js";
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxtQkFBbUIsQ0FBQztBQUN0RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLFlBQVksTUFBTSx3QkFBd0IsQ0FBQztBQUN2RCxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxZQUFZLE1BQU0sd0JBQXdCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFVBQVUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxXQUFXLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxLQUFLLGdCQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxTQUFTLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEtBQUssZUFBZSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sS0FBSyxjQUFjLE1BQU0sMEJBQTBCLENBQUM7QUFDM0QsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEtBQUssWUFBWSxNQUFNLHdCQUF3QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxjQUFjLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUc1RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWxJLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUk5RSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFJL0MsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2FwcGtpdFwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjYwXCI7XG5leHBvcnQgKiBhcyBhcHBraXQgZnJvbSBcIi4vc3JjL2FwcGtpdC50c1wiO1xuZXhwb3J0ICogYXMgYnJhbmRDb250ZXh0IGZyb20gXCIuL3NyYy9icmFuZC1jb250ZXh0LnRzXCI7XG5leHBvcnQgKiBhcyBidW5kbGUgZnJvbSBcIi4vc3JjL2J1bmRsZS50c1wiO1xuZXhwb3J0ICogYXMgY2hpbGRQcm9jZXNzIGZyb20gXCIuL3NyYy9jaGlsZC1wcm9jZXNzLnRzXCI7XG5leHBvcnQgKiBhcyBkYXRhYnJpY2tzIGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLnRzXCI7XG5leHBvcnQgKiBhcyBpZGVudGl0eSBmcm9tIFwiLi9zcmMvaWRlbnRpdHkudHNcIjtcbmV4cG9ydCAqIGFzIGludGVyY2VwdG9yIGZyb20gXCIuL3NyYy9pbnRlcmNlcHRvci50c1wiO1xuZXhwb3J0ICogYXMgbGFrZWJhc2VSZXNvbHZlciBmcm9tIFwiLi9zcmMvbGFrZWJhc2UtcmVzb2x2ZXIudHNcIjtcbmV4cG9ydCAqIGFzIG1pZ3JhdGlvbiBmcm9tIFwiLi9zcmMvbWlncmF0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyBwZ2FkZHJlc3MgZnJvbSBcIi4vc3JjL3BnYWRkcmVzcy50c1wiO1xuZXhwb3J0ICogYXMgcGx1Z2luRXhlY3V0aW9uIGZyb20gXCIuL3NyYy9wbHVnaW4tZXhlY3V0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyBwbHVnaW5SZWdpc3RyeSBmcm9tIFwiLi9zcmMvcGx1Z2luLXJlZ2lzdHJ5LnRzXCI7XG5leHBvcnQgKiBhcyBwcm92aXNpb24gZnJvbSBcIi4vc3JjL3Byb3Zpc2lvbi50c1wiO1xuZXhwb3J0ICogYXMgdG9vbFByb3ZpZGVyIGZyb20gXCIuL3NyYy90b29sLXByb3ZpZGVyLnRzXCI7XG5leHBvcnQgKiBhcyB0b29sa2l0RW50cmllcyBmcm9tIFwiLi9zcmMvdG9vbGtpdC1lbnRyaWVzLnRzXCI7XG5leHBvcnQgdHlwZSB7IEF1dG9Db25maWd1cmVNb2RlLCBDcmVhdGVBcHBDb25maWcsIEV4ZWN1dGlvbkNvbnRleHRMaWtlLCBXb3Jrc3BhY2VDbGllbnRMaWtlIH0gZnJvbSBcIi4vc3JjL2FwcGtpdC50c1wiO1xuZXhwb3J0IHsgYnVuZGxlQXBwUmVzb3VyY2VTY2hlbWEsIGZsYXR0ZW5BcHBZYW1sRW52LCBmbGF0dGVuQXBwRW52LCBnZXRCdW5kbGVQYXRoIH0gZnJvbSBcIi4vc3JjL2J1bmRsZS50c1wiO1xuZXhwb3J0IHR5cGUgeyBCdW5kbGVWYWxpZGF0ZUpzb24sIENvbmZpZ0ZpbGUsIENvbmZpZ01hcFZhbHVlLCBDb25maWdTb3VyY2UsIFJlc29sdmVDb25maWdWYWx1ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvYnVuZGxlLnRzXCI7XG5leHBvcnQgeyBBcHBLaXRDaGlsZFByb2Nlc3MgfSBmcm9tIFwiLi9zcmMvY2hpbGQtcHJvY2Vzcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBBcHBLaXRTcGF3bkFyZ3MsIEFwcEtpdENoaWxkUHJvY2Vzc09wdGlvbnMgfSBmcm9tIFwiLi9zcmMvY2hpbGQtcHJvY2Vzcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBDb250ZXh0TGlrZSB9IGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLnRzXCI7XG5leHBvcnQgeyBBQ0NFU1NfVE9LRU5fSEVBREVSLCBVU0VSX0lEX0hFQURFUiwgVVNFUl9FTUFJTF9IRUFERVIsIElERU5USVRZX01PREVTLCBERUZBVUxUX0lERU5USVRZX01PREUgfSBmcm9tIFwiLi9zcmMvaWRlbnRpdHkudHNcIjtcbmV4cG9ydCB0eXBlIHsgSWRlbnRpdHlNb2RlLCBIZWFkZXJCZWFyaW5nIH0gZnJvbSBcIi4vc3JjL2lkZW50aXR5LnRzXCI7XG5leHBvcnQgeyBMaWZlY3ljbGVCcmlkZ2VQbHVnaW4sIGxpZmVjeWNsZUJyaWRnZSB9IGZyb20gXCIuL3NyYy9pbnRlcmNlcHRvci50c1wiO1xuZXhwb3J0IHR5cGUgeyBMaWZlY3ljbGVFdmVudCwgTGlmZWN5Y2xlSGFuZGxlciwgUmVzb2x2ZWRBcHBFbnYsIEJpbmRhYmxlUHJvY2VzcywgSW50ZXJjZXB0b3JDb250ZXh0LCBJbnRlcmNlcHRvciwgSW50ZXJjZXB0b3JSdW50aW1lIH0gZnJvbSBcIi4vc3JjL2ludGVyY2VwdG9yLnRzXCI7XG5leHBvcnQgdHlwZSB7IExha2ViYXNlUmVzb2x2ZXJJbnB1dHMsIExha2ViYXNlQ29ubmVjdGlvbiB9IGZyb20gXCIuL3NyYy9sYWtlYmFzZS1yZXNvbHZlci50c1wiO1xuZXhwb3J0IHR5cGUgeyBPd25lcnNoaXBNaWdyYXRpb25FcnJvck9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvbWlncmF0aW9uLnRzXCI7XG5leHBvcnQgeyBTU0xfTU9ERVMgfSBmcm9tIFwiLi9zcmMvcGdhZGRyZXNzLnRzXCI7XG5leHBvcnQgdHlwZSB7IFNzbE1vZGUsIFBhcnNlZEFkZHJlc3MsIExha2ViYXNlQ29ubmVjdGlvbklucHV0cyB9IGZyb20gXCIuL3NyYy9wZ2FkZHJlc3MudHNcIjtcbmV4cG9ydCB0eXBlIHsgUnVuUGx1Z2luRXhlY3V0aW9uT3B0aW9ucyB9IGZyb20gXCIuL3NyYy9wbHVnaW4tZXhlY3V0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IFBsdWdpbkNvbnRleHRMaWtlIH0gZnJvbSBcIi4vc3JjL3BsdWdpbi1yZWdpc3RyeS50c1wiO1xuZXhwb3J0IHsgVG9vbFJlZ2lzdHJ5UGx1Z2luIH0gZnJvbSBcIi4vc3JjL3Rvb2wtcHJvdmlkZXIudHNcIjtcbiJdfQ==
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import { createRequire } from "node:module";
|
|
17
17
|
import { dirname, join } from "node:path";
|
|
18
18
|
import { createLakebasePool, getWorkspaceClient } from "@databricks/appkit";
|
|
19
|
+
import { postgresConnectionOptions } from "@dbx-tools/postgres";
|
|
19
20
|
import { errorUtils, hash, log } from "@dbx-tools/shared-core";
|
|
20
21
|
import { handleOwnershipMigrationError } from "./migration.js";
|
|
21
22
|
const logger = log.logger("cache-storage");
|
|
@@ -128,7 +129,7 @@ export async function createSoftPersistentStorage(cache) {
|
|
|
128
129
|
}
|
|
129
130
|
let pool;
|
|
130
131
|
try {
|
|
131
|
-
const createdPool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });
|
|
132
|
+
const createdPool = createLakebasePool(postgresConnectionOptions({ workspaceClient: getWorkspaceClient({}) }));
|
|
132
133
|
pool = createdPool;
|
|
133
134
|
const storage = new PersistentStorage(cache ?? {}, createdPool);
|
|
134
135
|
softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));
|
|
@@ -150,4 +151,4 @@ export async function createSoftPersistentStorage(cache) {
|
|
|
150
151
|
return undefined;
|
|
151
152
|
}
|
|
152
153
|
}
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_cache-storage.js","sourceRoot":"","sources":["../../src/_cache-storage.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Soft-fail Lakebase cache storage for AppKit's persistent cache.\n *\n * AppKit's `PersistentStorage.initialize()` runs DDL migrations and throws on\n * any step failure. With `cache.strictPersistence: true` that throw makes\n * `CacheManager` silently disable the cache. This wraps the same storage,\n * still runs its migrations, but logs a failed step instead of throwing so a\n * usable table keeps serving.\n *\n * `PersistentStorage` is not on AppKit's public export map. The deep load is\n * lazy and best-effort: if the installed AppKit layout changes, this returns\n * `undefined` and `createApp` leaves AppKit on its default cache path.\n *\n * @module\n */\n\nimport { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\nimport { createLakebasePool, getWorkspaceClient, type CacheConfig } from \"@databricks/appkit\";\nimport { errorUtils, hash, log } from \"@dbx-tools/shared-core\";\nimport { handleOwnershipMigrationError } from \"./migration.ts\";\n\nconst logger = log.logger(\"cache-storage\");\n\ntype LakebasePool = ReturnType<typeof createLakebasePool>;\ntype CacheStorage = NonNullable<CacheConfig[\"storage\"]>;\n\n/** AppKit's internal persistent storage surface. */\nexport type PersistentStorageBase = CacheStorage & {\n  initialize(): Promise<void>;\n  initialized: boolean;\n  schemaName?: string;\n  tableName?: string;\n};\n\ntype PersistentStorageConstructor = new (\n  config: CacheConfig,\n  pool: LakebasePool,\n) => PersistentStorageBase;\n\nlet persistentStorageCtor: PersistentStorageConstructor | undefined | null = null;\n\n/**\n * Lazily resolve AppKit's internal `PersistentStorage` constructor. `null`\n * means not attempted yet; `undefined` means the lookup already failed.\n */\nexport function loadPersistentStorage(): PersistentStorageConstructor | undefined {\n  if (persistentStorageCtor !== null) {\n    return persistentStorageCtor;\n  }\n  try {\n    const require = createRequire(import.meta.url);\n    const modulePath = join(\n      dirname(require.resolve(\"@databricks/appkit\")),\n      \"cache/storage/persistent.js\",\n    );\n    const loaded = require(modulePath).PersistentStorage as\n      PersistentStorageConstructor | undefined;\n    if (typeof loaded !== \"function\") {\n      logger.debug(\"soft persistent cache skipped (PersistentStorage missing)\");\n      persistentStorageCtor = undefined;\n      return undefined;\n    }\n    persistentStorageCtor = loaded;\n    return loaded;\n  } catch (err) {\n    logger.debug(\"soft persistent cache skipped (PersistentStorage unavailable)\", {\n      error: errorUtils.errorMessage(err),\n    });\n    persistentStorageCtor = undefined;\n    return undefined;\n  }\n}\n\n/**\n * Whether an existing cache table belongs to another role.\n *\n * PostgreSQL allows granted reads/writes but reserves index DDL for the table\n * owner. Skip AppKit migrations in that case; {@link probeStorage} still proves\n * the existing table can serve the cache before it is accepted.\n */\nasync function tableOwnedByAnotherRole(\n  storage: PersistentStorageBase,\n  pool: LakebasePool,\n): Promise<boolean> {\n  if (!storage.schemaName || !storage.tableName) return false;\n  const result = await pool.query(\n    `SELECT pg_get_userbyid(c.relowner) = current_user AS owned\n     FROM pg_class c\n     JOIN pg_namespace n ON n.oid = c.relnamespace\n     WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r', 'p')`,\n    [storage.schemaName, storage.tableName],\n  );\n  if (result.rows[0]?.owned !== false) return false;\n  logger.warn(\"persistent cache migrations skipped (table owned by another role)\", {\n    schema: storage.schemaName,\n    table: storage.tableName,\n  });\n  return true;\n}\n\n/** Soften `initialize()` so an ownership-only migration failure is not fatal. */\nexport function softenInitialize(\n  storage: PersistentStorageBase,\n  skipMigrations?: () => Promise<boolean>,\n): void {\n  const originalInitialize = storage.initialize.bind(storage);\n  let softInitPromise: Promise<void> | undefined;\n\n  storage.initialize = async () => {\n    if (storage.initialized) return;\n    softInitPromise ??= (async () => {\n      try {\n        if (!(await skipMigrations?.())) await originalInitialize();\n      } catch (err) {\n        if (\n          !handleOwnershipMigrationError(err, {\n            scope: \"cache-storage\",\n            logger,\n            event: \"persistent cache migration failed\",\n          })\n        ) {\n          throw err;\n        }\n      }\n    })();\n    try {\n      await softInitPromise;\n      storage.initialized = true;\n    } catch (err) {\n      softInitPromise = undefined;\n      throw err;\n    }\n  };\n}\n\n/** Verify the migrated cache table can serve the reads and writes AppKit needs. */\nexport async function probeStorage(storage: PersistentStorageBase): Promise<void> {\n  const key = `dbx-tools:cache-probe:${hash.id()}`;\n  try {\n    await storage.set(key, { value: key, expiry: Date.now() + 60_000 });\n    const result = await storage.get(key);\n    if (result?.value !== key) {\n      throw new Error(\"persistent cache probe returned an unexpected value\");\n    }\n  } finally {\n    await storage.delete(key).catch(() => undefined);\n  }\n}\n\n/**\n * Build a soft-fail Lakebase cache storage when a pool can be created and\n * AppKit's PersistentStorage can be loaded. Returns `undefined` otherwise so\n * AppKit can fall through to its normal cache path.\n */\nexport async function createSoftPersistentStorage(\n  cache: CacheConfig | undefined,\n): Promise<CacheStorage | undefined> {\n  const PersistentStorage = loadPersistentStorage();\n  if (!PersistentStorage) {\n    return undefined;\n  }\n\n  let pool: LakebasePool | undefined;\n  try {\n    const createdPool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });\n    pool = createdPool;\n    const storage = new PersistentStorage(cache ?? {}, createdPool);\n    softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));\n    if (!(await storage.healthCheck())) {\n      await storage.close().catch(() => {});\n      return undefined;\n    }\n    await storage.initialize();\n    await probeStorage(storage);\n    return storage;\n  } catch (err) {\n    logger.debug(\"soft persistent cache unavailable\", {\n      error: errorUtils.errorMessage(err),\n    });\n    if (pool) {\n      await pool.end().catch(() => {});\n    }\n    return undefined;\n  }\n}\n"]}
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_cache-storage.js","sourceRoot":"","sources":["../../src/_cache-storage.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Soft-fail Lakebase cache storage for AppKit's persistent cache.\n *\n * AppKit's `PersistentStorage.initialize()` runs DDL migrations and throws on\n * any step failure. With `cache.strictPersistence: true` that throw makes\n * `CacheManager` silently disable the cache. This wraps the same storage,\n * still runs its migrations, but logs a failed step instead of throwing so a\n * usable table keeps serving.\n *\n * `PersistentStorage` is not on AppKit's public export map. The deep load is\n * lazy and best-effort: if the installed AppKit layout changes, this returns\n * `undefined` and `createApp` leaves AppKit on its default cache path.\n *\n * @module\n */\n\nimport { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\nimport { createLakebasePool, getWorkspaceClient, type CacheConfig } from \"@databricks/appkit\";\nimport { postgresConnectionOptions } from \"@dbx-tools/postgres\";\nimport { errorUtils, hash, log } from \"@dbx-tools/shared-core\";\nimport { handleOwnershipMigrationError } from \"./migration.ts\";\n\nconst logger = log.logger(\"cache-storage\");\n\ntype LakebasePool = ReturnType<typeof createLakebasePool>;\ntype CacheStorage = NonNullable<CacheConfig[\"storage\"]>;\n\n/** AppKit's internal persistent storage surface. */\nexport type PersistentStorageBase = CacheStorage & {\n  initialize(): Promise<void>;\n  initialized: boolean;\n  schemaName?: string;\n  tableName?: string;\n};\n\ntype PersistentStorageConstructor = new (\n  config: CacheConfig,\n  pool: LakebasePool,\n) => PersistentStorageBase;\n\nlet persistentStorageCtor: PersistentStorageConstructor | undefined | null = null;\n\n/**\n * Lazily resolve AppKit's internal `PersistentStorage` constructor. `null`\n * means not attempted yet; `undefined` means the lookup already failed.\n */\nexport function loadPersistentStorage(): PersistentStorageConstructor | undefined {\n  if (persistentStorageCtor !== null) {\n    return persistentStorageCtor;\n  }\n  try {\n    const require = createRequire(import.meta.url);\n    const modulePath = join(\n      dirname(require.resolve(\"@databricks/appkit\")),\n      \"cache/storage/persistent.js\",\n    );\n    const loaded = require(modulePath).PersistentStorage as\n      PersistentStorageConstructor | undefined;\n    if (typeof loaded !== \"function\") {\n      logger.debug(\"soft persistent cache skipped (PersistentStorage missing)\");\n      persistentStorageCtor = undefined;\n      return undefined;\n    }\n    persistentStorageCtor = loaded;\n    return loaded;\n  } catch (err) {\n    logger.debug(\"soft persistent cache skipped (PersistentStorage unavailable)\", {\n      error: errorUtils.errorMessage(err),\n    });\n    persistentStorageCtor = undefined;\n    return undefined;\n  }\n}\n\n/**\n * Whether an existing cache table belongs to another role.\n *\n * PostgreSQL allows granted reads/writes but reserves index DDL for the table\n * owner. Skip AppKit migrations in that case; {@link probeStorage} still proves\n * the existing table can serve the cache before it is accepted.\n */\nasync function tableOwnedByAnotherRole(\n  storage: PersistentStorageBase,\n  pool: LakebasePool,\n): Promise<boolean> {\n  if (!storage.schemaName || !storage.tableName) return false;\n  const result = await pool.query(\n    `SELECT pg_get_userbyid(c.relowner) = current_user AS owned\n     FROM pg_class c\n     JOIN pg_namespace n ON n.oid = c.relnamespace\n     WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r', 'p')`,\n    [storage.schemaName, storage.tableName],\n  );\n  if (result.rows[0]?.owned !== false) return false;\n  logger.warn(\"persistent cache migrations skipped (table owned by another role)\", {\n    schema: storage.schemaName,\n    table: storage.tableName,\n  });\n  return true;\n}\n\n/** Soften `initialize()` so an ownership-only migration failure is not fatal. */\nexport function softenInitialize(\n  storage: PersistentStorageBase,\n  skipMigrations?: () => Promise<boolean>,\n): void {\n  const originalInitialize = storage.initialize.bind(storage);\n  let softInitPromise: Promise<void> | undefined;\n\n  storage.initialize = async () => {\n    if (storage.initialized) return;\n    softInitPromise ??= (async () => {\n      try {\n        if (!(await skipMigrations?.())) await originalInitialize();\n      } catch (err) {\n        if (\n          !handleOwnershipMigrationError(err, {\n            scope: \"cache-storage\",\n            logger,\n            event: \"persistent cache migration failed\",\n          })\n        ) {\n          throw err;\n        }\n      }\n    })();\n    try {\n      await softInitPromise;\n      storage.initialized = true;\n    } catch (err) {\n      softInitPromise = undefined;\n      throw err;\n    }\n  };\n}\n\n/** Verify the migrated cache table can serve the reads and writes AppKit needs. */\nexport async function probeStorage(storage: PersistentStorageBase): Promise<void> {\n  const key = `dbx-tools:cache-probe:${hash.id()}`;\n  try {\n    await storage.set(key, { value: key, expiry: Date.now() + 60_000 });\n    const result = await storage.get(key);\n    if (result?.value !== key) {\n      throw new Error(\"persistent cache probe returned an unexpected value\");\n    }\n  } finally {\n    await storage.delete(key).catch(() => undefined);\n  }\n}\n\n/**\n * Build a soft-fail Lakebase cache storage when a pool can be created and\n * AppKit's PersistentStorage can be loaded. Returns `undefined` otherwise so\n * AppKit can fall through to its normal cache path.\n */\nexport async function createSoftPersistentStorage(\n  cache: CacheConfig | undefined,\n): Promise<CacheStorage | undefined> {\n  const PersistentStorage = loadPersistentStorage();\n  if (!PersistentStorage) {\n    return undefined;\n  }\n\n  let pool: LakebasePool | undefined;\n  try {\n    const createdPool = createLakebasePool(\n      postgresConnectionOptions({ workspaceClient: getWorkspaceClient({}) }),\n    );\n    pool = createdPool;\n    const storage = new PersistentStorage(cache ?? {}, createdPool);\n    softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));\n    if (!(await storage.healthCheck())) {\n      await storage.close().catch(() => {});\n      return undefined;\n    }\n    await storage.initialize();\n    await probeStorage(storage);\n    return storage;\n  } catch (err) {\n    logger.debug(\"soft persistent cache unavailable\", {\n      error: errorUtils.errorMessage(err),\n    });\n    if (pool) {\n      await pool.end().catch(() => {});\n    }\n    return undefined;\n  }\n}\n"]}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AppKit child-process lifecycle built on `@dbx-tools/core/exec`.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
import * as exec from "@dbx-tools/core/exec";
|
|
7
|
+
/** Spawn arguments accepted by {@link AppKitChildProcess}. */
|
|
8
|
+
export type AppKitSpawnArgs = exec.SpawnArgs<exec.ExecOptions>;
|
|
9
|
+
/** Graceful and forced shutdown policy for an AppKit child process. */
|
|
10
|
+
export interface AppKitChildProcessOptions {
|
|
11
|
+
/** Signal sent when shutdown starts. Defaults to `SIGTERM`. */
|
|
12
|
+
gracefulSignal?: NodeJS.Signals;
|
|
13
|
+
/** Time to wait after the graceful signal. Defaults to 7 seconds. */
|
|
14
|
+
gracefulTimeoutMs?: number;
|
|
15
|
+
/** Signal sent when graceful shutdown times out. Defaults to `SIGKILL`. */
|
|
16
|
+
forceSignal?: NodeJS.Signals;
|
|
17
|
+
/** Time to wait after the force signal. Defaults to 1 second. */
|
|
18
|
+
forceTimeoutMs?: number;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Start and stop one AppKit-owned subprocess.
|
|
22
|
+
*
|
|
23
|
+
* The spawn arguments use {@link exec.ExecOptions}, including core exec's
|
|
24
|
+
* stdin, output capture, line handlers, exit checking, and trim policy.
|
|
25
|
+
* Shutdown is idempotent and escalates from the graceful signal to the force
|
|
26
|
+
* signal when the child does not exit within the configured timeouts.
|
|
27
|
+
*/
|
|
28
|
+
export declare class AppKitChildProcess {
|
|
29
|
+
#private;
|
|
30
|
+
constructor(spawnArgs: AppKitSpawnArgs, options?: AppKitChildProcessOptions);
|
|
31
|
+
/** Current child handle, or `undefined` when no child is running. */
|
|
32
|
+
get process(): exec.ChildProcessResult | undefined;
|
|
33
|
+
/** Whether the current child has not reported an exit code or signal. */
|
|
34
|
+
get running(): boolean;
|
|
35
|
+
/** Start the configured child process. */
|
|
36
|
+
start(): exec.ChildProcessResult;
|
|
37
|
+
/** Stop the child once, escalating when graceful shutdown times out. */
|
|
38
|
+
shutdown(): Promise<void>;
|
|
39
|
+
}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AppKit child-process lifecycle built on `@dbx-tools/core/exec`.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
import * as exec from "@dbx-tools/core/exec";
|
|
7
|
+
/**
|
|
8
|
+
* Start and stop one AppKit-owned subprocess.
|
|
9
|
+
*
|
|
10
|
+
* The spawn arguments use {@link exec.ExecOptions}, including core exec's
|
|
11
|
+
* stdin, output capture, line handlers, exit checking, and trim policy.
|
|
12
|
+
* Shutdown is idempotent and escalates from the graceful signal to the force
|
|
13
|
+
* signal when the child does not exit within the configured timeouts.
|
|
14
|
+
*/
|
|
15
|
+
export class AppKitChildProcess {
|
|
16
|
+
#spawnArgs;
|
|
17
|
+
#options;
|
|
18
|
+
#detached;
|
|
19
|
+
#child;
|
|
20
|
+
#shutdownPromise;
|
|
21
|
+
constructor(spawnArgs, options = {}) {
|
|
22
|
+
this.#spawnArgs = spawnArgs;
|
|
23
|
+
this.#options = {
|
|
24
|
+
gracefulSignal: options.gracefulSignal ?? "SIGTERM",
|
|
25
|
+
gracefulTimeoutMs: options.gracefulTimeoutMs ?? 7_000,
|
|
26
|
+
forceSignal: options.forceSignal ?? "SIGKILL",
|
|
27
|
+
forceTimeoutMs: options.forceTimeoutMs ?? 1_000,
|
|
28
|
+
};
|
|
29
|
+
this.#detached = spawnOptions(spawnArgs)?.detached === true;
|
|
30
|
+
}
|
|
31
|
+
/** Current child handle, or `undefined` when no child is running. */
|
|
32
|
+
get process() {
|
|
33
|
+
return this.#child;
|
|
34
|
+
}
|
|
35
|
+
/** Whether the current child has not reported an exit code or signal. */
|
|
36
|
+
get running() {
|
|
37
|
+
return this.#child !== undefined && !hasExited(this.#child);
|
|
38
|
+
}
|
|
39
|
+
/** Start the configured child process. */
|
|
40
|
+
start() {
|
|
41
|
+
if (this.running)
|
|
42
|
+
throw new Error("Child process is already running");
|
|
43
|
+
if (this.#shutdownPromise) {
|
|
44
|
+
throw new Error("Child process is shutting down or has been shut down");
|
|
45
|
+
}
|
|
46
|
+
const child = exec.spawn(...this.#spawnArgs);
|
|
47
|
+
this.#child = child;
|
|
48
|
+
void child.once("close", () => {
|
|
49
|
+
if (this.#child === child)
|
|
50
|
+
this.#child = undefined;
|
|
51
|
+
});
|
|
52
|
+
return child;
|
|
53
|
+
}
|
|
54
|
+
/** Stop the child once, escalating when graceful shutdown times out. */
|
|
55
|
+
shutdown() {
|
|
56
|
+
this.#shutdownPromise ??= this.#performShutdown();
|
|
57
|
+
return this.#shutdownPromise;
|
|
58
|
+
}
|
|
59
|
+
async #performShutdown() {
|
|
60
|
+
const child = this.#child;
|
|
61
|
+
if (!child || hasExited(child)) {
|
|
62
|
+
this.#child = undefined;
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
signalChild(child, this.#options.gracefulSignal, this.#detached);
|
|
66
|
+
if (await waitForExit(child, this.#options.gracefulTimeoutMs)) {
|
|
67
|
+
if (this.#child === child)
|
|
68
|
+
this.#child = undefined;
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
signalChild(child, this.#options.forceSignal, this.#detached);
|
|
72
|
+
if (!(await waitForExit(child, this.#options.forceTimeoutMs))) {
|
|
73
|
+
throw new Error(`Child process ${child.pid ?? "<unknown>"} did not terminate`);
|
|
74
|
+
}
|
|
75
|
+
if (this.#child === child)
|
|
76
|
+
this.#child = undefined;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
function spawnOptions(args) {
|
|
80
|
+
const value = args.at(-1);
|
|
81
|
+
return isExecOptions(value) ? value : undefined;
|
|
82
|
+
}
|
|
83
|
+
function isExecOptions(value) {
|
|
84
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
85
|
+
}
|
|
86
|
+
function hasExited(child) {
|
|
87
|
+
return child.exitCode !== null || child.signalCode !== null;
|
|
88
|
+
}
|
|
89
|
+
function signalChild(child, signal, detached) {
|
|
90
|
+
if (detached && process.platform !== "win32" && child.pid) {
|
|
91
|
+
try {
|
|
92
|
+
process.kill(-child.pid, signal);
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
// Fall back to the direct child when the process group already exited.
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
child.kill(signal);
|
|
100
|
+
}
|
|
101
|
+
function waitForExit(child, timeoutMs) {
|
|
102
|
+
if (hasExited(child))
|
|
103
|
+
return Promise.resolve(true);
|
|
104
|
+
return new Promise((resolve) => {
|
|
105
|
+
let timer;
|
|
106
|
+
let settled = false;
|
|
107
|
+
const finish = (exited) => {
|
|
108
|
+
if (settled)
|
|
109
|
+
return;
|
|
110
|
+
settled = true;
|
|
111
|
+
if (timer)
|
|
112
|
+
clearTimeout(timer);
|
|
113
|
+
void child.off("exit", onExit);
|
|
114
|
+
void child.off("error", onError);
|
|
115
|
+
resolve(exited);
|
|
116
|
+
};
|
|
117
|
+
const onExit = () => finish(true);
|
|
118
|
+
const onError = () => finish(true);
|
|
119
|
+
void child.once("exit", onExit);
|
|
120
|
+
void child.once("error", onError);
|
|
121
|
+
if (hasExited(child)) {
|
|
122
|
+
finish(true);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
timer = setTimeout(() => finish(false), timeoutMs);
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"child-process.js","sourceRoot":"","sources":["../../src/child-process.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * AppKit child-process lifecycle built on `@dbx-tools/core/exec`.\n *\n * @module\n */\nimport * as exec from \"@dbx-tools/core/exec\";\n\n/** Spawn arguments accepted by {@link AppKitChildProcess}. */\nexport type AppKitSpawnArgs = exec.SpawnArgs<exec.ExecOptions>;\n\n/** Graceful and forced shutdown policy for an AppKit child process. */\nexport interface AppKitChildProcessOptions {\n  /** Signal sent when shutdown starts. Defaults to `SIGTERM`. */\n  gracefulSignal?: NodeJS.Signals;\n  /** Time to wait after the graceful signal. Defaults to 7 seconds. */\n  gracefulTimeoutMs?: number;\n  /** Signal sent when graceful shutdown times out. Defaults to `SIGKILL`. */\n  forceSignal?: NodeJS.Signals;\n  /** Time to wait after the force signal. Defaults to 1 second. */\n  forceTimeoutMs?: number;\n}\n\n/**\n * Start and stop one AppKit-owned subprocess.\n *\n * The spawn arguments use {@link exec.ExecOptions}, including core exec's\n * stdin, output capture, line handlers, exit checking, and trim policy.\n * Shutdown is idempotent and escalates from the graceful signal to the force\n * signal when the child does not exit within the configured timeouts.\n */\nexport class AppKitChildProcess {\n  readonly #spawnArgs: AppKitSpawnArgs;\n  readonly #options: Required<AppKitChildProcessOptions>;\n  readonly #detached: boolean;\n\n  #child?: exec.ChildProcessResult;\n  #shutdownPromise?: Promise<void>;\n\n  constructor(spawnArgs: AppKitSpawnArgs, options: AppKitChildProcessOptions = {}) {\n    this.#spawnArgs = spawnArgs;\n    this.#options = {\n      gracefulSignal: options.gracefulSignal ?? \"SIGTERM\",\n      gracefulTimeoutMs: options.gracefulTimeoutMs ?? 7_000,\n      forceSignal: options.forceSignal ?? \"SIGKILL\",\n      forceTimeoutMs: options.forceTimeoutMs ?? 1_000,\n    };\n    this.#detached = spawnOptions(spawnArgs)?.detached === true;\n  }\n\n  /** Current child handle, or `undefined` when no child is running. */\n  get process(): exec.ChildProcessResult | undefined {\n    return this.#child;\n  }\n\n  /** Whether the current child has not reported an exit code or signal. */\n  get running(): boolean {\n    return this.#child !== undefined && !hasExited(this.#child);\n  }\n\n  /** Start the configured child process. */\n  start(): exec.ChildProcessResult {\n    if (this.running) throw new Error(\"Child process is already running\");\n    if (this.#shutdownPromise) {\n      throw new Error(\"Child process is shutting down or has been shut down\");\n    }\n\n    const child = exec.spawn(...this.#spawnArgs);\n    this.#child = child;\n    void child.once(\"close\", () => {\n      if (this.#child === child) this.#child = undefined;\n    });\n    return child;\n  }\n\n  /** Stop the child once, escalating when graceful shutdown times out. */\n  shutdown(): Promise<void> {\n    this.#shutdownPromise ??= this.#performShutdown();\n    return this.#shutdownPromise;\n  }\n\n  async #performShutdown(): Promise<void> {\n    const child = this.#child;\n    if (!child || hasExited(child)) {\n      this.#child = undefined;\n      return;\n    }\n\n    signalChild(child, this.#options.gracefulSignal, this.#detached);\n    if (await waitForExit(child, this.#options.gracefulTimeoutMs)) {\n      if (this.#child === child) this.#child = undefined;\n      return;\n    }\n\n    signalChild(child, this.#options.forceSignal, this.#detached);\n    if (!(await waitForExit(child, this.#options.forceTimeoutMs))) {\n      throw new Error(`Child process ${child.pid ?? \"<unknown>\"} did not terminate`);\n    }\n    if (this.#child === child) this.#child = undefined;\n  }\n}\n\nfunction spawnOptions(args: AppKitSpawnArgs): exec.ExecOptions | undefined {\n  const value = args.at(-1);\n  return isExecOptions(value) ? value : undefined;\n}\n\nfunction isExecOptions(value: unknown): value is exec.ExecOptions {\n  return value !== null && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction hasExited(child: exec.ChildProcessResult): boolean {\n  return child.exitCode !== null || child.signalCode !== null;\n}\n\nfunction signalChild(\n  child: exec.ChildProcessResult,\n  signal: NodeJS.Signals,\n  detached: boolean,\n): void {\n  if (detached && process.platform !== \"win32\" && child.pid) {\n    try {\n      process.kill(-child.pid, signal);\n      return;\n    } catch {\n      // Fall back to the direct child when the process group already exited.\n    }\n  }\n  child.kill(signal);\n}\n\nfunction waitForExit(child: exec.ChildProcessResult, timeoutMs: number): Promise<boolean> {\n  if (hasExited(child)) return Promise.resolve(true);\n\n  return new Promise((resolve) => {\n    let timer: NodeJS.Timeout | undefined;\n    let settled = false;\n\n    const finish = (exited: boolean) => {\n      if (settled) return;\n      settled = true;\n      if (timer) clearTimeout(timer);\n      void child.off(\"exit\", onExit);\n      void child.off(\"error\", onError);\n      resolve(exited);\n    };\n    const onExit = () => finish(true);\n    const onError = () => finish(true);\n\n    void child.once(\"exit\", onExit);\n    void child.once(\"error\", onError);\n    if (hasExited(child)) {\n      finish(true);\n      return;\n    }\n    timer = setTimeout(() => finish(false), timeoutMs);\n  });\n}\n"]}
|
package/lib/src/provision.js
CHANGED
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
*/
|
|
23
23
|
import { createLakebasePool, getWorkspaceClient, ValidationError } from "@databricks/appkit";
|
|
24
24
|
import { configUtils } from "@dbx-tools/core";
|
|
25
|
+
import { postgresConnectionOptions, quotePostgresIdentifier } from "@dbx-tools/postgres";
|
|
25
26
|
import { errorUtils, log } from "@dbx-tools/shared-core";
|
|
26
27
|
const defaultLogger = log.logger("provision");
|
|
27
28
|
/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */
|
|
@@ -38,16 +39,6 @@ const ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;
|
|
|
38
39
|
*/
|
|
39
40
|
const CONNECT_TIMEOUT_MS = 10_000;
|
|
40
41
|
const STATEMENT_TIMEOUT_MS = 15_000;
|
|
41
|
-
/**
|
|
42
|
-
* Quote a Postgres identifier: wrap in double quotes and double any embedded
|
|
43
|
-
* quote. Schema and role names are identifiers, and Postgres does not accept a
|
|
44
|
-
* bind parameter in an identifier position, so quoting is the only defense
|
|
45
|
-
* available for these statements. Lakebase role names are usually emails
|
|
46
|
-
* (`user@host`), which must be quoted to be a valid identifier at all.
|
|
47
|
-
*/
|
|
48
|
-
function quoteIdent(ident) {
|
|
49
|
-
return `"${ident.replace(/"/g, '""')}"`;
|
|
50
|
-
}
|
|
51
42
|
/**
|
|
52
43
|
* Idempotent grants that make the (already-existing) AppKit cache schema fully
|
|
53
44
|
* usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table
|
|
@@ -60,8 +51,8 @@ export function cacheGrantStatements(role) {
|
|
|
60
51
|
if (!ROLE_PATTERN.test(role)) {
|
|
61
52
|
throw ValidationError.invalidValue("role", role, "a Postgres role name");
|
|
62
53
|
}
|
|
63
|
-
const schema =
|
|
64
|
-
const target =
|
|
54
|
+
const schema = quotePostgresIdentifier(CACHE_SCHEMA);
|
|
55
|
+
const target = quotePostgresIdentifier(role);
|
|
65
56
|
return [
|
|
66
57
|
`GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,
|
|
67
58
|
`GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,
|
|
@@ -103,12 +94,12 @@ export async function provisionCacheSchema(role, logger = defaultLogger) {
|
|
|
103
94
|
// returns a fresh default-auth client - literally `new WorkspaceClient({})`,
|
|
104
95
|
// but built against the SDK version AppKit's `createLakebasePool` expects
|
|
105
96
|
// (importing the SDK class directly here pulls a newer, type-incompatible copy).
|
|
106
|
-
const pool = createLakebasePool({
|
|
97
|
+
const pool = createLakebasePool(postgresConnectionOptions({
|
|
107
98
|
user: role,
|
|
108
99
|
workspaceClient: getWorkspaceClient({}),
|
|
109
100
|
connectionTimeoutMillis: CONNECT_TIMEOUT_MS,
|
|
110
101
|
statement_timeout: STATEMENT_TIMEOUT_MS,
|
|
111
|
-
});
|
|
102
|
+
}));
|
|
112
103
|
try {
|
|
113
104
|
const found = await pool.query("SELECT 1 FROM information_schema.schemata WHERE schema_name = $1", [CACHE_SCHEMA]);
|
|
114
105
|
if (found.rowCount === 0) {
|
|
@@ -130,4 +121,4 @@ export async function provisionCacheSchema(role, logger = defaultLogger) {
|
|
|
130
121
|
await pool.end().catch(() => { });
|
|
131
122
|
}
|
|
132
123
|
}
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../src/provision.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Lakebase cache-schema grant fix-up.\n *\n * AppKit's persistent cache (`CacheManager` -> `PersistentStorage`) uses a\n * schema `appkit` and a table `appkit.appkit_cache_entries`. When the connecting\n * Databricks identity lacks privileges on that schema, the cache migration\n * throws, and because AppKit is typically run with `cache.strictPersistence:\n * true`, the cache is silently switched to a disabled in-memory stub - so every\n * persistent read (chart long-poll, history, etc.) misses and 404s.\n *\n * This grants the connecting role full rights on the cache schema, but only when\n * the schema ALREADY EXISTS - it never creates the schema itself. Run from a\n * LOCAL identity that owns the schema (or holds grant option on it); it is\n * skipped inside a Databricks App, where the app SP cannot grant and its\n * Postgres role does not exist until its first connection.\n *\n * Must run AFTER {@link applyLakebaseToEnv} has written the resolved connection\n * to `process.env` (so `createLakebasePool` picks up host / database / endpoint)\n * and BEFORE `createApp` initializes the cache.\n *\n * @module\n */\n\nimport { createLakebasePool, getWorkspaceClient, ValidationError } from \"@databricks/appkit\";\nimport { configUtils } from \"@dbx-tools/core\";\nimport { errorUtils, log } from \"@dbx-tools/shared-core\";\n\nconst defaultLogger = log.logger(\"provision\");\n\n/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */\nconst CACHE_SCHEMA = \"appkit\";\n\n/**\n * Characters a Lakebase Postgres role can legitimately contain: workspace\n * identities are emails, service principals are UUIDs.\n */\nconst ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;\n\n/**\n * Provisioning runs at boot as the local developer identity, before any plugin\n * exists, so it is outside AppKit's interceptor chain and inherits no timeout\n * from it. Both bounds are explicit for that reason.\n */\nconst CONNECT_TIMEOUT_MS = 10_000;\nconst STATEMENT_TIMEOUT_MS = 15_000;\n\n/**\n * Quote a Postgres identifier: wrap in double quotes and double any embedded\n * quote. Schema and role names are identifiers, and Postgres does not accept a\n * bind parameter in an identifier position, so quoting is the only defense\n * available for these statements. Lakebase role names are usually emails\n * (`user@host`), which must be quoted to be a valid identifier at all.\n */\nfunction quoteIdent(ident: string): string {\n  return `\"${ident.replace(/\"/g, '\"\"')}\"`;\n}\n\n/**\n * Idempotent grants that make the (already-existing) AppKit cache schema fully\n * usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table\n * whenever the schema owner creates it later.\n *\n * Throws a {@link ValidationError} when `role` is not a plausible Postgres role\n * name, since the value lands in an identifier position.\n */\nexport function cacheGrantStatements(role: string): readonly string[] {\n  if (!ROLE_PATTERN.test(role)) {\n    throw ValidationError.invalidValue(\"role\", role, \"a Postgres role name\");\n  }\n  const schema = quoteIdent(CACHE_SCHEMA);\n  const target = quoteIdent(role);\n  return [\n    `GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${schema} TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON TABLES TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON SEQUENCES TO ${target}`,\n  ];\n}\n\n/**\n * Grant `role` rights on the AppKit cache schema, but only when that schema\n * already exists.\n *\n * No-ops inside a Databricks App env, when `role` is undefined, or when the\n * schema is absent. Best-effort otherwise: any failure (e.g. the local identity\n * doesn't own the schema) is logged and swallowed so it never blocks startup -\n * a disabled cache is degraded, not fatal.\n *\n * @param role - Postgres role to grant to and connect as (the resolved\n *   workspace-client identity); skips when undefined.\n * @param logger - Logger to report progress on. Defaults to this module's.\n *\n * @example\n * import { provision } from \"@dbx-tools/appkit\";\n *\n * await provision.provisionCacheSchema(\"app-service-principal@databricks.com\");\n */\nexport async function provisionCacheSchema(\n  role: string | undefined,\n  logger: log.Logger = defaultLogger,\n): Promise<void> {\n  if (configUtils.isDatabricksAppEnv()) {\n    logger.debug(\"autopg: skip cache provisioning (inside a Databricks App)\");\n    return;\n  }\n  if (!role) {\n    logger.warn(\"autopg: skip cache provisioning (could not resolve connecting role)\");\n    return;\n  }\n  // Pass `user` explicitly: autopg resolves the connection target\n  // (host/database/endpoint) but not the identity, so `createLakebasePool`'s\n  // synchronous username lookup would otherwise throw. `getWorkspaceClient({})`\n  // returns a fresh default-auth client - literally `new WorkspaceClient({})`,\n  // but built against the SDK version AppKit's `createLakebasePool` expects\n  // (importing the SDK class directly here pulls a newer, type-incompatible copy).\n  const pool = createLakebasePool({\n    user: role,\n    workspaceClient: getWorkspaceClient({}),\n    connectionTimeoutMillis: CONNECT_TIMEOUT_MS,\n    statement_timeout: STATEMENT_TIMEOUT_MS,\n  });\n  try {\n    const found = await pool.query(\n      \"SELECT 1 FROM information_schema.schemata WHERE schema_name = $1\",\n      [CACHE_SCHEMA],\n    );\n    if (found.rowCount === 0) {\n      logger.debug(\"autopg: skip cache provisioning (schema absent)\", { schema: CACHE_SCHEMA });\n      return;\n    }\n    for (const sql of cacheGrantStatements(role)) {\n      await pool.query(sql);\n    }\n    logger.info(\"autopg: granted cache schema\", { schema: CACHE_SCHEMA, role });\n  } catch (err) {\n    logger.warn(\"autopg: cache provisioning failed (continuing)\", {\n      schema: CACHE_SCHEMA,\n      error: errorUtils.errorMessage(err),\n    });\n  } finally {\n    await pool.end().catch(() => {});\n  }\n}\n"]}
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../src/provision.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAE9C,yEAAyE;AACzE,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B;;;GAGG;AACH,MAAM,YAAY,GAAG,2BAA2B,CAAC;AAEjD;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAEpC;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,MAAM,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO;QACL,iCAAiC,MAAM,OAAO,MAAM,EAAE;QACtD,gDAAgD,MAAM,OAAO,MAAM,EAAE;QACrE,mDAAmD,MAAM,OAAO,MAAM,EAAE;QACxE,sCAAsC,MAAM,2BAA2B,MAAM,EAAE;QAC/E,sCAAsC,MAAM,8BAA8B,MAAM,EAAE;KACnF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAwB,EACxB,SAAqB,aAAa;IAElC,IAAI,WAAW,CAAC,kBAAkB,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO;IACT,CAAC;IACD,gEAAgE;IAChE,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,iFAAiF;IACjF,MAAM,IAAI,GAAG,kBAAkB,CAC7B,yBAAyB,CAAC;QACxB,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACvC,uBAAuB,EAAE,kBAAkB;QAC3C,iBAAiB,EAAE,oBAAoB;KACxC,CAAC,CACH,CAAC;IACF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAC5B,kEAAkE,EAClE,CAAC,YAAY,CAAC,CACf,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;YAC5D,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC;SACpC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnC,CAAC;AACH,CAAC","sourcesContent":["/**\n * Lakebase cache-schema grant fix-up.\n *\n * AppKit's persistent cache (`CacheManager` -> `PersistentStorage`) uses a\n * schema `appkit` and a table `appkit.appkit_cache_entries`. When the connecting\n * Databricks identity lacks privileges on that schema, the cache migration\n * throws, and because AppKit is typically run with `cache.strictPersistence:\n * true`, the cache is silently switched to a disabled in-memory stub - so every\n * persistent read (chart long-poll, history, etc.) misses and 404s.\n *\n * This grants the connecting role full rights on the cache schema, but only when\n * the schema ALREADY EXISTS - it never creates the schema itself. Run from a\n * LOCAL identity that owns the schema (or holds grant option on it); it is\n * skipped inside a Databricks App, where the app SP cannot grant and its\n * Postgres role does not exist until its first connection.\n *\n * Must run AFTER {@link applyLakebaseToEnv} has written the resolved connection\n * to `process.env` (so `createLakebasePool` picks up host / database / endpoint)\n * and BEFORE `createApp` initializes the cache.\n *\n * @module\n */\n\nimport { createLakebasePool, getWorkspaceClient, ValidationError } from \"@databricks/appkit\";\nimport { configUtils } from \"@dbx-tools/core\";\nimport { postgresConnectionOptions, quotePostgresIdentifier } from \"@dbx-tools/postgres\";\nimport { errorUtils, log } from \"@dbx-tools/shared-core\";\n\nconst defaultLogger = log.logger(\"provision\");\n\n/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */\nconst CACHE_SCHEMA = \"appkit\";\n\n/**\n * Characters a Lakebase Postgres role can legitimately contain: workspace\n * identities are emails, service principals are UUIDs.\n */\nconst ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;\n\n/**\n * Provisioning runs at boot as the local developer identity, before any plugin\n * exists, so it is outside AppKit's interceptor chain and inherits no timeout\n * from it. Both bounds are explicit for that reason.\n */\nconst CONNECT_TIMEOUT_MS = 10_000;\nconst STATEMENT_TIMEOUT_MS = 15_000;\n\n/**\n * Idempotent grants that make the (already-existing) AppKit cache schema fully\n * usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table\n * whenever the schema owner creates it later.\n *\n * Throws a {@link ValidationError} when `role` is not a plausible Postgres role\n * name, since the value lands in an identifier position.\n */\nexport function cacheGrantStatements(role: string): readonly string[] {\n  if (!ROLE_PATTERN.test(role)) {\n    throw ValidationError.invalidValue(\"role\", role, \"a Postgres role name\");\n  }\n  const schema = quotePostgresIdentifier(CACHE_SCHEMA);\n  const target = quotePostgresIdentifier(role);\n  return [\n    `GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${schema} TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON TABLES TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON SEQUENCES TO ${target}`,\n  ];\n}\n\n/**\n * Grant `role` rights on the AppKit cache schema, but only when that schema\n * already exists.\n *\n * No-ops inside a Databricks App env, when `role` is undefined, or when the\n * schema is absent. Best-effort otherwise: any failure (e.g. the local identity\n * doesn't own the schema) is logged and swallowed so it never blocks startup -\n * a disabled cache is degraded, not fatal.\n *\n * @param role - Postgres role to grant to and connect as (the resolved\n *   workspace-client identity); skips when undefined.\n * @param logger - Logger to report progress on. Defaults to this module's.\n *\n * @example\n * import { provision } from \"@dbx-tools/appkit\";\n *\n * await provision.provisionCacheSchema(\"app-service-principal@databricks.com\");\n */\nexport async function provisionCacheSchema(\n  role: string | undefined,\n  logger: log.Logger = defaultLogger,\n): Promise<void> {\n  if (configUtils.isDatabricksAppEnv()) {\n    logger.debug(\"autopg: skip cache provisioning (inside a Databricks App)\");\n    return;\n  }\n  if (!role) {\n    logger.warn(\"autopg: skip cache provisioning (could not resolve connecting role)\");\n    return;\n  }\n  // Pass `user` explicitly: autopg resolves the connection target\n  // (host/database/endpoint) but not the identity, so `createLakebasePool`'s\n  // synchronous username lookup would otherwise throw. `getWorkspaceClient({})`\n  // returns a fresh default-auth client - literally `new WorkspaceClient({})`,\n  // but built against the SDK version AppKit's `createLakebasePool` expects\n  // (importing the SDK class directly here pulls a newer, type-incompatible copy).\n  const pool = createLakebasePool(\n    postgresConnectionOptions({\n      user: role,\n      workspaceClient: getWorkspaceClient({}),\n      connectionTimeoutMillis: CONNECT_TIMEOUT_MS,\n      statement_timeout: STATEMENT_TIMEOUT_MS,\n    }),\n  );\n  try {\n    const found = await pool.query(\n      \"SELECT 1 FROM information_schema.schemata WHERE schema_name = $1\",\n      [CACHE_SCHEMA],\n    );\n    if (found.rowCount === 0) {\n      logger.debug(\"autopg: skip cache provisioning (schema absent)\", { schema: CACHE_SCHEMA });\n      return;\n    }\n    for (const sql of cacheGrantStatements(role)) {\n      await pool.query(sql);\n    }\n    logger.info(\"autopg: granted cache schema\", { schema: CACHE_SCHEMA, role });\n  } catch (err) {\n    logger.warn(\"autopg: cache provisioning failed (continuing)\", {\n      schema: CACHE_SCHEMA,\n      error: errorUtils.errorMessage(err),\n    });\n  } finally {\n    await pool.end().catch(() => {});\n  }\n}\n"]}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/_auto-configure.ts","../src/_cache-storage.ts","../src/appkit.ts","../src/brand-context.ts","../src/bundle.ts","../src/databricks.ts","../src/identity.ts","../src/interceptor.ts","../src/lakebase-resolver.ts","../src/migration.ts","../src/pgaddress.ts","../src/plugin-execution.ts","../src/plugin-registry.ts","../src/provision.ts","../src/tool-provider.ts","../src/toolkit-entries.ts","../index.ts"],"version":"5.9.3"}
|
|
1
|
+
{"root":["../src/_auto-configure.ts","../src/_cache-storage.ts","../src/appkit.ts","../src/brand-context.ts","../src/bundle.ts","../src/child-process.ts","../src/databricks.ts","../src/identity.ts","../src/interceptor.ts","../src/lakebase-resolver.ts","../src/migration.ts","../src/pgaddress.ts","../src/plugin-execution.ts","../src/plugin-registry.ts","../src/provision.ts","../src/tool-provider.ts","../src/toolkit-entries.ts","../index.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@databricks/appkit": "0.81.0",
|
|
23
|
-
"@dbx-tools/projen": "^0.9.
|
|
23
|
+
"@dbx-tools/projen": "^0.9.60",
|
|
24
24
|
"@types/node": "^24.6.0",
|
|
25
25
|
"typescript": "^5.9.3",
|
|
26
26
|
"vitest": "3.2.4"
|
|
@@ -30,10 +30,11 @@
|
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@databricks/sdk-experimental": "^0.17.0",
|
|
33
|
-
"@dbx-tools/auth": "^0.9.
|
|
34
|
-
"@dbx-tools/core": "^0.9.
|
|
35
|
-
"@dbx-tools/lakebase": "^0.9.
|
|
36
|
-
"@dbx-tools/
|
|
33
|
+
"@dbx-tools/auth": "^0.9.60",
|
|
34
|
+
"@dbx-tools/core": "^0.9.60",
|
|
35
|
+
"@dbx-tools/lakebase": "^0.9.60",
|
|
36
|
+
"@dbx-tools/postgres": "^0.9.60",
|
|
37
|
+
"@dbx-tools/shared-core": "^0.9.60",
|
|
37
38
|
"zod": "4.3.6"
|
|
38
39
|
},
|
|
39
40
|
"main": "./lib/index.js",
|
|
@@ -59,6 +60,10 @@
|
|
|
59
60
|
"types": "./lib/src/bundle.d.ts",
|
|
60
61
|
"default": "./lib/src/bundle.js"
|
|
61
62
|
},
|
|
63
|
+
"./child-process": {
|
|
64
|
+
"types": "./lib/src/child-process.d.ts",
|
|
65
|
+
"default": "./lib/src/child-process.js"
|
|
66
|
+
},
|
|
62
67
|
"./databricks": {
|
|
63
68
|
"types": "./lib/src/databricks.d.ts",
|
|
64
69
|
"default": "./lib/src/databricks.js"
|
|
@@ -106,7 +111,7 @@
|
|
|
106
111
|
"./package.json": "./package.json"
|
|
107
112
|
}
|
|
108
113
|
},
|
|
109
|
-
"version": "0.9.
|
|
114
|
+
"version": "0.9.60",
|
|
110
115
|
"types": "./lib/index.d.ts",
|
|
111
116
|
"dbxToolsConfig": {
|
|
112
117
|
"tags": [
|
|
@@ -131,6 +136,10 @@
|
|
|
131
136
|
"types": "./lib/src/bundle.d.ts",
|
|
132
137
|
"default": "./lib/src/bundle.js"
|
|
133
138
|
},
|
|
139
|
+
"./child-process": {
|
|
140
|
+
"types": "./lib/src/child-process.d.ts",
|
|
141
|
+
"default": "./lib/src/child-process.js"
|
|
142
|
+
},
|
|
134
143
|
"./databricks": {
|
|
135
144
|
"types": "./lib/src/databricks.d.ts",
|
|
136
145
|
"default": "./lib/src/databricks.js"
|
package/src/_cache-storage.ts
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import { createRequire } from "node:module";
|
|
18
18
|
import { dirname, join } from "node:path";
|
|
19
19
|
import { createLakebasePool, getWorkspaceClient, type CacheConfig } from "@databricks/appkit";
|
|
20
|
+
import { postgresConnectionOptions } from "@dbx-tools/postgres";
|
|
20
21
|
import { errorUtils, hash, log } from "@dbx-tools/shared-core";
|
|
21
22
|
import { handleOwnershipMigrationError } from "./migration.ts";
|
|
22
23
|
|
|
@@ -163,7 +164,9 @@ export async function createSoftPersistentStorage(
|
|
|
163
164
|
|
|
164
165
|
let pool: LakebasePool | undefined;
|
|
165
166
|
try {
|
|
166
|
-
const createdPool = createLakebasePool(
|
|
167
|
+
const createdPool = createLakebasePool(
|
|
168
|
+
postgresConnectionOptions({ workspaceClient: getWorkspaceClient({}) }),
|
|
169
|
+
);
|
|
167
170
|
pool = createdPool;
|
|
168
171
|
const storage = new PersistentStorage(cache ?? {}, createdPool);
|
|
169
172
|
softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AppKit child-process lifecycle built on `@dbx-tools/core/exec`.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
import * as exec from "@dbx-tools/core/exec";
|
|
7
|
+
|
|
8
|
+
/** Spawn arguments accepted by {@link AppKitChildProcess}. */
|
|
9
|
+
export type AppKitSpawnArgs = exec.SpawnArgs<exec.ExecOptions>;
|
|
10
|
+
|
|
11
|
+
/** Graceful and forced shutdown policy for an AppKit child process. */
|
|
12
|
+
export interface AppKitChildProcessOptions {
|
|
13
|
+
/** Signal sent when shutdown starts. Defaults to `SIGTERM`. */
|
|
14
|
+
gracefulSignal?: NodeJS.Signals;
|
|
15
|
+
/** Time to wait after the graceful signal. Defaults to 7 seconds. */
|
|
16
|
+
gracefulTimeoutMs?: number;
|
|
17
|
+
/** Signal sent when graceful shutdown times out. Defaults to `SIGKILL`. */
|
|
18
|
+
forceSignal?: NodeJS.Signals;
|
|
19
|
+
/** Time to wait after the force signal. Defaults to 1 second. */
|
|
20
|
+
forceTimeoutMs?: number;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Start and stop one AppKit-owned subprocess.
|
|
25
|
+
*
|
|
26
|
+
* The spawn arguments use {@link exec.ExecOptions}, including core exec's
|
|
27
|
+
* stdin, output capture, line handlers, exit checking, and trim policy.
|
|
28
|
+
* Shutdown is idempotent and escalates from the graceful signal to the force
|
|
29
|
+
* signal when the child does not exit within the configured timeouts.
|
|
30
|
+
*/
|
|
31
|
+
export class AppKitChildProcess {
|
|
32
|
+
readonly #spawnArgs: AppKitSpawnArgs;
|
|
33
|
+
readonly #options: Required<AppKitChildProcessOptions>;
|
|
34
|
+
readonly #detached: boolean;
|
|
35
|
+
|
|
36
|
+
#child?: exec.ChildProcessResult;
|
|
37
|
+
#shutdownPromise?: Promise<void>;
|
|
38
|
+
|
|
39
|
+
constructor(spawnArgs: AppKitSpawnArgs, options: AppKitChildProcessOptions = {}) {
|
|
40
|
+
this.#spawnArgs = spawnArgs;
|
|
41
|
+
this.#options = {
|
|
42
|
+
gracefulSignal: options.gracefulSignal ?? "SIGTERM",
|
|
43
|
+
gracefulTimeoutMs: options.gracefulTimeoutMs ?? 7_000,
|
|
44
|
+
forceSignal: options.forceSignal ?? "SIGKILL",
|
|
45
|
+
forceTimeoutMs: options.forceTimeoutMs ?? 1_000,
|
|
46
|
+
};
|
|
47
|
+
this.#detached = spawnOptions(spawnArgs)?.detached === true;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Current child handle, or `undefined` when no child is running. */
|
|
51
|
+
get process(): exec.ChildProcessResult | undefined {
|
|
52
|
+
return this.#child;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Whether the current child has not reported an exit code or signal. */
|
|
56
|
+
get running(): boolean {
|
|
57
|
+
return this.#child !== undefined && !hasExited(this.#child);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Start the configured child process. */
|
|
61
|
+
start(): exec.ChildProcessResult {
|
|
62
|
+
if (this.running) throw new Error("Child process is already running");
|
|
63
|
+
if (this.#shutdownPromise) {
|
|
64
|
+
throw new Error("Child process is shutting down or has been shut down");
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const child = exec.spawn(...this.#spawnArgs);
|
|
68
|
+
this.#child = child;
|
|
69
|
+
void child.once("close", () => {
|
|
70
|
+
if (this.#child === child) this.#child = undefined;
|
|
71
|
+
});
|
|
72
|
+
return child;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** Stop the child once, escalating when graceful shutdown times out. */
|
|
76
|
+
shutdown(): Promise<void> {
|
|
77
|
+
this.#shutdownPromise ??= this.#performShutdown();
|
|
78
|
+
return this.#shutdownPromise;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
async #performShutdown(): Promise<void> {
|
|
82
|
+
const child = this.#child;
|
|
83
|
+
if (!child || hasExited(child)) {
|
|
84
|
+
this.#child = undefined;
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
signalChild(child, this.#options.gracefulSignal, this.#detached);
|
|
89
|
+
if (await waitForExit(child, this.#options.gracefulTimeoutMs)) {
|
|
90
|
+
if (this.#child === child) this.#child = undefined;
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
signalChild(child, this.#options.forceSignal, this.#detached);
|
|
95
|
+
if (!(await waitForExit(child, this.#options.forceTimeoutMs))) {
|
|
96
|
+
throw new Error(`Child process ${child.pid ?? "<unknown>"} did not terminate`);
|
|
97
|
+
}
|
|
98
|
+
if (this.#child === child) this.#child = undefined;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function spawnOptions(args: AppKitSpawnArgs): exec.ExecOptions | undefined {
|
|
103
|
+
const value = args.at(-1);
|
|
104
|
+
return isExecOptions(value) ? value : undefined;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function isExecOptions(value: unknown): value is exec.ExecOptions {
|
|
108
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function hasExited(child: exec.ChildProcessResult): boolean {
|
|
112
|
+
return child.exitCode !== null || child.signalCode !== null;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
function signalChild(
|
|
116
|
+
child: exec.ChildProcessResult,
|
|
117
|
+
signal: NodeJS.Signals,
|
|
118
|
+
detached: boolean,
|
|
119
|
+
): void {
|
|
120
|
+
if (detached && process.platform !== "win32" && child.pid) {
|
|
121
|
+
try {
|
|
122
|
+
process.kill(-child.pid, signal);
|
|
123
|
+
return;
|
|
124
|
+
} catch {
|
|
125
|
+
// Fall back to the direct child when the process group already exited.
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
child.kill(signal);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
function waitForExit(child: exec.ChildProcessResult, timeoutMs: number): Promise<boolean> {
|
|
132
|
+
if (hasExited(child)) return Promise.resolve(true);
|
|
133
|
+
|
|
134
|
+
return new Promise((resolve) => {
|
|
135
|
+
let timer: NodeJS.Timeout | undefined;
|
|
136
|
+
let settled = false;
|
|
137
|
+
|
|
138
|
+
const finish = (exited: boolean) => {
|
|
139
|
+
if (settled) return;
|
|
140
|
+
settled = true;
|
|
141
|
+
if (timer) clearTimeout(timer);
|
|
142
|
+
void child.off("exit", onExit);
|
|
143
|
+
void child.off("error", onError);
|
|
144
|
+
resolve(exited);
|
|
145
|
+
};
|
|
146
|
+
const onExit = () => finish(true);
|
|
147
|
+
const onError = () => finish(true);
|
|
148
|
+
|
|
149
|
+
void child.once("exit", onExit);
|
|
150
|
+
void child.once("error", onError);
|
|
151
|
+
if (hasExited(child)) {
|
|
152
|
+
finish(true);
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
timer = setTimeout(() => finish(false), timeoutMs);
|
|
156
|
+
});
|
|
157
|
+
}
|
package/src/provision.ts
CHANGED
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
|
|
24
24
|
import { createLakebasePool, getWorkspaceClient, ValidationError } from "@databricks/appkit";
|
|
25
25
|
import { configUtils } from "@dbx-tools/core";
|
|
26
|
+
import { postgresConnectionOptions, quotePostgresIdentifier } from "@dbx-tools/postgres";
|
|
26
27
|
import { errorUtils, log } from "@dbx-tools/shared-core";
|
|
27
28
|
|
|
28
29
|
const defaultLogger = log.logger("provision");
|
|
@@ -44,17 +45,6 @@ const ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;
|
|
|
44
45
|
const CONNECT_TIMEOUT_MS = 10_000;
|
|
45
46
|
const STATEMENT_TIMEOUT_MS = 15_000;
|
|
46
47
|
|
|
47
|
-
/**
|
|
48
|
-
* Quote a Postgres identifier: wrap in double quotes and double any embedded
|
|
49
|
-
* quote. Schema and role names are identifiers, and Postgres does not accept a
|
|
50
|
-
* bind parameter in an identifier position, so quoting is the only defense
|
|
51
|
-
* available for these statements. Lakebase role names are usually emails
|
|
52
|
-
* (`user@host`), which must be quoted to be a valid identifier at all.
|
|
53
|
-
*/
|
|
54
|
-
function quoteIdent(ident: string): string {
|
|
55
|
-
return `"${ident.replace(/"/g, '""')}"`;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
48
|
/**
|
|
59
49
|
* Idempotent grants that make the (already-existing) AppKit cache schema fully
|
|
60
50
|
* usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table
|
|
@@ -67,8 +57,8 @@ export function cacheGrantStatements(role: string): readonly string[] {
|
|
|
67
57
|
if (!ROLE_PATTERN.test(role)) {
|
|
68
58
|
throw ValidationError.invalidValue("role", role, "a Postgres role name");
|
|
69
59
|
}
|
|
70
|
-
const schema =
|
|
71
|
-
const target =
|
|
60
|
+
const schema = quotePostgresIdentifier(CACHE_SCHEMA);
|
|
61
|
+
const target = quotePostgresIdentifier(role);
|
|
72
62
|
return [
|
|
73
63
|
`GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,
|
|
74
64
|
`GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,
|
|
@@ -114,12 +104,14 @@ export async function provisionCacheSchema(
|
|
|
114
104
|
// returns a fresh default-auth client - literally `new WorkspaceClient({})`,
|
|
115
105
|
// but built against the SDK version AppKit's `createLakebasePool` expects
|
|
116
106
|
// (importing the SDK class directly here pulls a newer, type-incompatible copy).
|
|
117
|
-
const pool = createLakebasePool(
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
107
|
+
const pool = createLakebasePool(
|
|
108
|
+
postgresConnectionOptions({
|
|
109
|
+
user: role,
|
|
110
|
+
workspaceClient: getWorkspaceClient({}),
|
|
111
|
+
connectionTimeoutMillis: CONNECT_TIMEOUT_MS,
|
|
112
|
+
statement_timeout: STATEMENT_TIMEOUT_MS,
|
|
113
|
+
}),
|
|
114
|
+
);
|
|
123
115
|
try {
|
|
124
116
|
const found = await pool.query(
|
|
125
117
|
"SELECT 1 FROM information_schema.schemata WHERE schema_name = $1",
|