@dbx-tools/lakebox 0.9.154 → 0.9.157

package/package.json

@@ -25,9 +25,9 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@dbx-tools/core": "^0.9.154",
-    "@dbx-tools/shared-core": "^0.9.154",
-    "@dbx-tools/shared-lakebox": "^0.9.154",
+    "@dbx-tools/core": "^0.9.157",
+    "@dbx-tools/shared-core": "^0.9.157",
+    "@dbx-tools/shared-lakebox": "^0.9.157",
     "generic-pool": "^3.9.0",
     "socks": "^2.8.10",
     "ssh2": "^1.17.0",
@@ -44,34 +44,10 @@
         "types": "./lib/index.d.ts",
         "default": "./lib/index.js"
       },
-      "./key-store": {
-        "types": "./lib/src/key-store.d.ts",
-        "default": "./lib/src/key-store.js"
-      },
-      "./lifecycle": {
-        "types": "./lib/src/lifecycle.d.ts",
-        "default": "./lib/src/lifecycle.js"
-      },
-      "./rest": {
-        "types": "./lib/src/rest.d.ts",
-        "default": "./lib/src/rest.js"
-      },
-      "./session": {
-        "types": "./lib/src/session.d.ts",
-        "default": "./lib/src/session.js"
-      },
-      "./transport": {
-        "types": "./lib/src/transport.d.ts",
-        "default": "./lib/src/transport.js"
-      },
-      "./*": {
-        "types": "./lib/src/*/index.d.ts",
-        "default": "./lib/src/*/index.js"
-      },
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.154",
+  "version": "0.9.157",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [
@@ -84,34 +60,10 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./key-store": {
-      "types": "./lib/src/key-store.d.ts",
-      "default": "./lib/src/key-store.js"
-    },
-    "./lifecycle": {
-      "types": "./lib/src/lifecycle.d.ts",
-      "default": "./lib/src/lifecycle.js"
-    },
-    "./rest": {
-      "types": "./lib/src/rest.d.ts",
-      "default": "./lib/src/rest.js"
-    },
-    "./session": {
-      "types": "./lib/src/session.d.ts",
-      "default": "./lib/src/session.js"
-    },
-    "./transport": {
-      "types": "./lib/src/transport.d.ts",
-      "default": "./lib/src/transport.js"
-    },
-    "./*": {
-      "types": "./lib/src/*/index.d.ts",
-      "default": "./lib/src/*/index.js"
-    },
     "./package.json": "./package.json"
   },
   "files": [
-    "index.ts",
+    "index*.ts",
     "src",
     "lib"
   ],

package/src/_ssh_openssh.ts

@@ -4,9 +4,9 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { Duplex } from "node:stream";
 import { setTimeout as delay } from "node:timers/promises";
-import { exec } from "@dbx-tools/core";
-import type { ChildProcessResult } from "@dbx-tools/core/exec";
-import { errorUtils, log, stringUtils } from "@dbx-tools/shared-core";
+import { spawn, onParentTerminationSignal } from "@dbx-tools/core";
+import type { ChildProcessResult } from "@dbx-tools/core";
+import { log, toError, dedent } from "@dbx-tools/shared-core";
 import { SocksClient } from "socks";
 import {
   PooledSshTransport,
@@ -14,7 +14,7 @@ import {
   type SshPoolOptions,
   type SshResourceLifecycle,
   type SshTransportOptions,
-} from "./_ssh.ts";
+} from "./ssh.ts";
 
 const SOCKS_HOST = "127.0.0.1";
 const OPENSSH_HELPER_TIMEOUT_MS = 2_000;
@@ -26,7 +26,7 @@ let stopParentTerminationSignal: (() => void) | undefined;
 let processExitHookInstalled = false;
 /** @internal JavaScript watchdog that terminates one child when its parent pipe closes. */
 export const OPENSSH_PARENT_WATCH_SOURCE =
-  stringUtils.dedent(// ============================================================================
+  dedent(// ============================================================================
   /*js*/ `
     const { spawn } = require("node:child_process");
 
@@ -176,7 +176,7 @@ class NativeOpenSshResource implements OpenSshResource {
       const socksPort = await availableLoopbackPort();
       const target = `${options.username}@${options.connectHost}`;
       const master = trackNativeOpenSshProcess(
-        exec.spawn(
+        spawn(
           process.execPath,
           [
             "-e",
@@ -228,7 +228,7 @@ class NativeOpenSshResource implements OpenSshResource {
 
   async run(script: string, execution: SshCommandExecution): Promise<number> {
     const child = trackNativeOpenSshProcess(
-      exec.spawn(
+      spawn(
         this.command,
         [
           ...nativeOpenSshArgs(this.options),
@@ -253,7 +253,7 @@ class NativeOpenSshResource implements OpenSshResource {
     let shutdown: Promise<void> | undefined;
     execution.setCancel(() => {
       shutdown ??= child.shutdown({ terminateTimeout: 0, killTimeout: 1_000 }).catch((error) => {
-        logger.warn("failed to stop native SSH command", { error: errorUtils.toError(error) });
+        logger.warn("failed to stop native SSH command", { error: toError(error) });
       });
       return shutdown;
     });
@@ -293,7 +293,7 @@ class NativeOpenSshResource implements OpenSshResource {
     } finally {
       await this.master.shutdown({ terminateTimeout: 0, killTimeout: 1_000 }).catch((error) =>
         logger.warn("failed to stop native SSH ControlMaster", {
-          error: errorUtils.toError(error),
+          error: toError(error),
         }),
       );
       await rm(this.directory, { recursive: true, force: true });
@@ -319,7 +319,7 @@ class NativeOpenSshResource implements OpenSshResource {
 
   private control(operation: "check" | "exit") {
     const child = trackNativeOpenSshProcess(
-      exec.spawn(
+      spawn(
         this.command,
         [
           "-p",
@@ -346,7 +346,7 @@ async function probeNativeOpenSsh(command: string): Promise<boolean> {
   try {
     const version = await waitForNativeOpenSshChild(
       trackNativeOpenSshProcess(
-        exec.spawn(command, ["-V"], {
+        spawn(command, ["-V"], {
           stdin: "ignore",
           stdout: "capture",
           stderr: "capture",
@@ -359,7 +359,7 @@ async function probeNativeOpenSsh(command: string): Promise<boolean> {
     if (version.exitCode !== 0 || !/(?:^|\s)OpenSSH_/m.test(versionOutput)) return false;
     const dynamicForward = await waitForNativeOpenSshChild(
       trackNativeOpenSshProcess(
-        exec.spawn(command, ["-G", "-D", `${SOCKS_HOST}:1`, "localhost"], {
+        spawn(command, ["-G", "-D", `${SOCKS_HOST}:1`, "localhost"], {
           stdin: "ignore",
           stdout: "ignore",
           stderr: "ignore",
@@ -402,7 +402,7 @@ function trackNativeOpenSshProcess(
   activeNativeOpenSshProcesses.add(child);
   if (parentBound) parentBoundNativeOpenSshProcesses.add(child);
   if (!stopParentTerminationSignal) {
-    stopParentTerminationSignal = exec.onParentTerminationSignal(forceStopNativeOpenSshProcesses);
+    stopParentTerminationSignal = onParentTerminationSignal(forceStopNativeOpenSshProcesses);
   }
   if (!processExitHookInstalled) {
     processExitHookInstalled = true;

package/src/_ssh_ssh2.ts

@@ -7,7 +7,7 @@ import {
   type SshPoolOptions,
   type SshResourceLifecycle,
   type SshTransportOptions,
-} from "./_ssh.ts";
+} from "./ssh.ts";
 
 const logger = log.logger("lakebox:ssh2");
 const patchedSsh2Protocols = new WeakSet<Ssh2Protocol>();

package/src/key-store.ts

@@ -2,7 +2,7 @@ import { createHash, randomBytes } from "node:crypto";
 import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { fileLock } from "@dbx-tools/core";
+import { withFileLock } from "@dbx-tools/core";
 import ssh2 from "ssh2";
 import type { LakeboxClient } from "./rest.ts";
 
@@ -103,7 +103,7 @@ export class SshKeyStore {
     const stored = await readStoredKey(privatePath, publicPath);
     if (stored) return stored;
     await mkdir(directory, { recursive: true, mode: 0o700 });
-    return fileLock.withFileLock(["lakebox-ssh-key", privatePath], async () => {
+    return withFileLock(["lakebox-ssh-key", privatePath], async () => {
       const rechecked = await readStoredKey(privatePath, publicPath);
       if (rechecked) return rechecked;
 

package/src/lifecycle.ts

@@ -1,4 +1,4 @@
-import { asyncUtils } from "@dbx-tools/shared-core";
+import { sleep } from "@dbx-tools/shared-core";
 import type { LakeboxStatus } from "@dbx-tools/shared-lakebox";
 import type { LakeboxClient, LakeboxEntry } from "./rest.ts";
 
@@ -81,7 +81,7 @@ async function waitForLakeboxStatus(
     if (Date.now() >= deadline) {
       throw new Error(`Timed out waiting for Lakebox ${entry.sandboxId} to become ${expected}`);
     }
-    await asyncUtils.sleep(POLL_INTERVAL_MS, signal);
+    await sleep(POLL_INTERVAL_MS, signal);
     entry = await api.get(entry.sandboxId, signal);
   }
   return entry;

package/src/rest.ts

@@ -1,4 +1,4 @@
-import { errorUtils, log, net } from "@dbx-tools/shared-core";
+import { log, toError, urlBuilder } from "@dbx-tools/shared-core";
 import { z } from "zod";
 
 const LAKEBOX_ROOT = "/api/2.0/lakebox";
@@ -94,7 +94,7 @@ export class LakeboxClient {
     return (
       process.env.DATABRICKS_WORKSPACE_ID?.trim() ||
       this.auth.workspaceId?.trim() ||
-      net.urlBuilder(this.auth.host ?? "")?.origin ||
+      urlBuilder(this.auth.host ?? "")?.origin ||
       "workspace"
     );
   }
@@ -201,7 +201,7 @@ export class LakeboxClient {
       logger.warn("lakebox REST request failed", {
         ...metadata,
         durationMs: Date.now() - startedAt,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
       throw error;
     }

package/src/session.ts

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { isIP } from "node:net";
 import type { Duplex } from "node:stream";
-import { errorUtils, log } from "@dbx-tools/shared-core";
+import { log, toError } from "@dbx-tools/shared-core";
 import ssh2, { type Client as Ssh2Client } from "ssh2";
 import { z } from "zod";
 import {
@@ -10,11 +10,9 @@ import {
   sshCommandScript,
   type SshCommandIdentity,
   type SshTransport,
-} from "./_ssh.ts";
+} from "./ssh.ts";
 import type { Ssh2PatchMode, SshTransportMode } from "./transport.ts";
 
-export { SshCommand, sshCommandScript, type SshCommandIdentity } from "./_ssh.ts";
-
 const { Client } = ssh2;
 const logger = log.logger("lakebox:ssh");
 const SERVICE_DIRECT_SUFFIX = ".service-direct.cloud.databricks.com";
@@ -66,7 +64,7 @@ export interface SshSessionOptions {
 
 /**
  * Verified SSH session that delegates commands and remote TCP connections to
- * the transport selected by `src/_ssh.ts`.
+ * the transport selected by `src/ssh.ts`.
  *
  * The initial ssh2 handshake verifies and persists the Databricks gateway host
  * key. The selected transport then starts its pooled command and forwarding
@@ -114,7 +112,7 @@ export class SshSession {
       } catch (resolveError) {
         logger.warn("public Lakebox gateway resolution failed", {
           host: this.options.host,
-          error: errorUtils.toError(resolveError),
+          error: toError(resolveError),
         });
         throw error;
       }
@@ -329,7 +327,7 @@ export class SshSession {
     for (const result of results) {
       if (result.status === "rejected") {
         logger.warn("failed to close SSH session resource", {
-          error: errorUtils.toError(result.reason),
+          error: toError(result.reason),
         });
       }
     }

package/src/{_ssh.ts → ssh.ts}

@@ -1,6 +1,6 @@
 import { PassThrough, type Duplex, type Readable } from "node:stream";
 import { StringDecoder } from "node:string_decoder";
-import { errorUtils, log } from "@dbx-tools/shared-core";
+import { log, toError } from "@dbx-tools/shared-core";
 import type { LakeboxCommandResult } from "@dbx-tools/shared-lakebox";
 import { createPool, type Factory, type Options, type Pool } from "generic-pool";
 import type { Client as Ssh2Client } from "ssh2";
@@ -324,7 +324,7 @@ export abstract class PooledSshTransport<T> implements SshTransport {
       .catch((error) =>
         logger.warn("failed to close SSH transport after startup failure", {
           kind: this.kind,
-          error: errorUtils.toError(error),
+          error: toError(error),
         }),
       );
     return this.starting;
@@ -436,7 +436,7 @@ export abstract class PooledSshTransport<T> implements SshTransport {
     } catch (error) {
       logger.warn("failed to destroy pooled SSH resource", {
         kind: this.kind,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
     }
   }