@dbx-tools/appkit 0.6.60 → 0.6.62
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/lib/src/databricks.js +7 -4
- package/lib/src/pgaddress.js +5 -6
- package/package.json +3 -3
- package/src/databricks.ts +8 -3
- package/src/pgaddress.ts +4 -4
package/lib/src/databricks.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* @module
|
|
11
11
|
*/
|
|
12
12
|
import { Context } from "@databricks/sdk-experimental";
|
|
13
|
-
import { async, log } from "@dbx-tools/shared-core";
|
|
13
|
+
import { async, log, object } from "@dbx-tools/shared-core";
|
|
14
14
|
const logger = log.logger("databricks");
|
|
15
15
|
/** Highest valid TCP port number. */
|
|
16
16
|
export const MAX_TCP_PORT = 65_535;
|
|
@@ -44,8 +44,11 @@ export function isAppEnv(env = process.env) {
|
|
|
44
44
|
logger.debug("app env rejected: host is not a URL");
|
|
45
45
|
return false;
|
|
46
46
|
}
|
|
47
|
-
const portNumber =
|
|
48
|
-
if (
|
|
47
|
+
const portNumber = object.toNumber(port);
|
|
48
|
+
if (portNumber === undefined ||
|
|
49
|
+
!Number.isInteger(portNumber) ||
|
|
50
|
+
portNumber < 1 ||
|
|
51
|
+
portNumber > MAX_TCP_PORT) {
|
|
49
52
|
logger.debug("app env rejected: DATABRICKS_APP_PORT is not a TCP port");
|
|
50
53
|
return false;
|
|
51
54
|
}
|
|
@@ -104,4 +107,4 @@ function tieCancellationToken(controller, token) {
|
|
|
104
107
|
}
|
|
105
108
|
token.onCancellationRequested((reason) => controller.abort(reason));
|
|
106
109
|
}
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"databricks.js","sourceRoot":"","sources":["../../src/databricks.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Generic Databricks SDK glue (no AppKit): adapt WHATWG cancellation\n * (`AbortSignal` / `AbortController`) into the SDK's `Context` /\n * `CancellationToken` shapes so a single `AbortController` can drive every\n * in-flight SDK call, plus Databricks runtime-environment detection.\n *\n * Server-only: leans on the Databricks SDK `Context`. Lives in node-appkit so\n * the browser-safe shared-core stays SDK-free.\n *\n * @module\n */\n\nimport type { CancellationToken } from \"@databricks/sdk-experimental\";\nimport { Context } from \"@databricks/sdk-experimental\";\nimport { async, log } from \"@dbx-tools/shared-core\";\n\nconst logger = log.logger(\"databricks\");\n\n/** Highest valid TCP port number. */\nexport const MAX_TCP_PORT = 65_535;\n\n/**\n * Detect the Databricks App runtime from environment shape: requires a\n * non-empty `DATABRICKS_APP_NAME`, a `DATABRICKS_HOST` that parses as an\n * `http`/`https` URL, and a `DATABRICKS_APP_PORT` that is a valid TCP port.\n * Reads `process.env` when no `env` is passed.\n *\n * @example\n * import { databricks } from \"@dbx-tools/appkit\";\n *\n * // Skip bundle / app.yaml discovery when the app is already deployed.\n * const local = !databricks.isAppEnv();\n */\nexport function isAppEnv(env: Record<string, string | undefined> = process.env): boolean {\n  const appName = env.DATABRICKS_APP_NAME?.trim();\n  const host = env.DATABRICKS_HOST?.trim();\n  const port = env.DATABRICKS_APP_PORT?.trim();\n\n  if (!appName || !host || !port) {\n    return false;\n  }\n\n  try {\n    const url = new URL(host);\n    if (![\"http:\", \"https:\"].includes(url.protocol)) {\n      logger.debug(\"app env rejected: host is not an http(s) URL\");\n      return false;\n    }\n  } catch {\n    logger.debug(\"app env rejected: host is not a URL\");\n    return false;\n  }\n\n  const portNumber = Number(port);\n  if (!Number.isInteger(portNumber) || portNumber < 1 || portNumber > MAX_TCP_PORT) {\n    logger.debug(\"app env rejected: DATABRICKS_APP_PORT is not a TCP port\");\n    return false;\n  }\n\n  return true;\n}\n\n/** Either an SDK `Context` or a WHATWG `AbortSignal`. */\nexport type ContextLike = Context | AbortSignal;\n\n/**\n * Wrap a `Context` (returned as-is) or `AbortSignal` (adapted) as an SDK `Context`.\n *\n * @example\n * import { databricks } from \"@dbx-tools/appkit\";\n * import { getWorkspaceClient } from \"@databricks/appkit\";\n *\n * await getWorkspaceClient({}).apiClient.request(\n *   { path: \"/api/2.0/serving-endpoints\", method: \"GET\", headers: new Headers(), raw: false },\n *   databricks.toContext(request.signal),\n * );\n */\nexport function toContext(input: ContextLike): Context;\n/**\n * Derive an SDK `Context` from `controller.signal`, optionally tying `input`\n * into the controller so the controller becomes the single cancellation\n * source for downstream SDK calls:\n *\n *   - `AbortSignal`: aborting it propagates into `controller` (and from there\n *     into every SDK call you pass the returned context to).\n *   - `Context`: its `cancellationToken` is tied into `controller`, and its\n *     other fields (`logger`, `opName`, `rootClassName`, `rootFnName`, `opId`)\n *     are preserved in the returned `Context`. The returned context's\n *     `cancellationToken` is replaced with one backed by `controller.signal`.\n *\n * The tie is one-way (parent -> child): aborting `controller` directly does\n * NOT cancel `input`. So a request-level cancel (your loop's `try/finally {\n * controller.abort() }`) won't tear down a caller-supplied AbortSignal it\n * didn't own.\n */\nexport function toContext(controller: AbortController, input?: ContextLike): Context;\nexport function toContext(source: AbortController | ContextLike, input?: ContextLike): Context {\n  if (!(source instanceof AbortController)) {\n    if (source instanceof Context) return source;\n    return new Context({ cancellationToken: signalToCancellationToken(source) });\n  }\n  if (input instanceof AbortSignal) {\n    async.tieAbortSignal(source, input);\n  } else if (input instanceof Context) {\n    const token = input.cancellationToken;\n    if (token) tieCancellationToken(source, token);\n    const merged = input.copy();\n    merged.setItems({ cancellationToken: signalToCancellationToken(source.signal) });\n    return merged;\n  }\n  return new Context({ cancellationToken: signalToCancellationToken(source.signal) });\n}\n\n/**\n * Adapt a WHATWG `AbortSignal` to the Databricks SDK's `CancellationToken`\n * interface. The SDK's `api-client.ts` internally creates an `AbortController`\n * and wires `cancellationToken.onCancellationRequested` to it, so this adapter\n * is the one-line bridge from \"platform-standard cancellation\" to \"the SDK\n * aborts the fetch on your behalf\".\n */\nfunction signalToCancellationToken(signal: AbortSignal): CancellationToken {\n  return {\n    get isCancellationRequested() {\n      return signal.aborted;\n    },\n    onCancellationRequested(cb) {\n      if (signal.aborted) {\n        cb(signal.reason);\n        return;\n      }\n      signal.addEventListener(\"abort\", () => cb(signal.reason), { once: true });\n    },\n  };\n}\n\n/**\n * Tie the SDK's `CancellationToken` interface back into an `AbortController`.\n * Mirrors `async.tieAbortSignal` but for the SDK's cancellation shape, used\n * when a caller hands us a pre-built `Context` whose token we want to fold into\n * our own controller.\n */\nfunction tieCancellationToken(controller: AbortController, token: CancellationToken): void {\n  if (token.isCancellationRequested) {\n    controller.abort();\n    return;\n  }\n  token.onCancellationRequested((reason) => controller.abort(reason));\n}\n"]}
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"databricks.js","sourceRoot":"","sources":["../../src/databricks.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Generic Databricks SDK glue (no AppKit): adapt WHATWG cancellation\n * (`AbortSignal` / `AbortController`) into the SDK's `Context` /\n * `CancellationToken` shapes so a single `AbortController` can drive every\n * in-flight SDK call, plus Databricks runtime-environment detection.\n *\n * Server-only: leans on the Databricks SDK `Context`. Lives in node-appkit so\n * the browser-safe shared-core stays SDK-free.\n *\n * @module\n */\n\nimport type { CancellationToken } from \"@databricks/sdk-experimental\";\nimport { Context } from \"@databricks/sdk-experimental\";\nimport { async, log, object } from \"@dbx-tools/shared-core\";\n\nconst logger = log.logger(\"databricks\");\n\n/** Highest valid TCP port number. */\nexport const MAX_TCP_PORT = 65_535;\n\n/**\n * Detect the Databricks App runtime from environment shape: requires a\n * non-empty `DATABRICKS_APP_NAME`, a `DATABRICKS_HOST` that parses as an\n * `http`/`https` URL, and a `DATABRICKS_APP_PORT` that is a valid TCP port.\n * Reads `process.env` when no `env` is passed.\n *\n * @example\n * import { databricks } from \"@dbx-tools/appkit\";\n *\n * // Skip bundle / app.yaml discovery when the app is already deployed.\n * const local = !databricks.isAppEnv();\n */\nexport function isAppEnv(env: Record<string, string | undefined> = process.env): boolean {\n  const appName = env.DATABRICKS_APP_NAME?.trim();\n  const host = env.DATABRICKS_HOST?.trim();\n  const port = env.DATABRICKS_APP_PORT?.trim();\n\n  if (!appName || !host || !port) {\n    return false;\n  }\n\n  try {\n    const url = new URL(host);\n    if (![\"http:\", \"https:\"].includes(url.protocol)) {\n      logger.debug(\"app env rejected: host is not an http(s) URL\");\n      return false;\n    }\n  } catch {\n    logger.debug(\"app env rejected: host is not a URL\");\n    return false;\n  }\n\n  const portNumber = object.toNumber(port);\n  if (\n    portNumber === undefined ||\n    !Number.isInteger(portNumber) ||\n    portNumber < 1 ||\n    portNumber > MAX_TCP_PORT\n  ) {\n    logger.debug(\"app env rejected: DATABRICKS_APP_PORT is not a TCP port\");\n    return false;\n  }\n\n  return true;\n}\n\n/** Either an SDK `Context` or a WHATWG `AbortSignal`. */\nexport type ContextLike = Context | AbortSignal;\n\n/**\n * Wrap a `Context` (returned as-is) or `AbortSignal` (adapted) as an SDK `Context`.\n *\n * @example\n * import { databricks } from \"@dbx-tools/appkit\";\n * import { getWorkspaceClient } from \"@databricks/appkit\";\n *\n * await getWorkspaceClient({}).apiClient.request(\n *   { path: \"/api/2.0/serving-endpoints\", method: \"GET\", headers: new Headers(), raw: false },\n *   databricks.toContext(request.signal),\n * );\n */\nexport function toContext(input: ContextLike): Context;\n/**\n * Derive an SDK `Context` from `controller.signal`, optionally tying `input`\n * into the controller so the controller becomes the single cancellation\n * source for downstream SDK calls:\n *\n *   - `AbortSignal`: aborting it propagates into `controller` (and from there\n *     into every SDK call you pass the returned context to).\n *   - `Context`: its `cancellationToken` is tied into `controller`, and its\n *     other fields (`logger`, `opName`, `rootClassName`, `rootFnName`, `opId`)\n *     are preserved in the returned `Context`. The returned context's\n *     `cancellationToken` is replaced with one backed by `controller.signal`.\n *\n * The tie is one-way (parent -> child): aborting `controller` directly does\n * NOT cancel `input`. So a request-level cancel (your loop's `try/finally {\n * controller.abort() }`) won't tear down a caller-supplied AbortSignal it\n * didn't own.\n */\nexport function toContext(controller: AbortController, input?: ContextLike): Context;\nexport function toContext(source: AbortController | ContextLike, input?: ContextLike): Context {\n  if (!(source instanceof AbortController)) {\n    if (source instanceof Context) return source;\n    return new Context({ cancellationToken: signalToCancellationToken(source) });\n  }\n  if (input instanceof AbortSignal) {\n    async.tieAbortSignal(source, input);\n  } else if (input instanceof Context) {\n    const token = input.cancellationToken;\n    if (token) tieCancellationToken(source, token);\n    const merged = input.copy();\n    merged.setItems({ cancellationToken: signalToCancellationToken(source.signal) });\n    return merged;\n  }\n  return new Context({ cancellationToken: signalToCancellationToken(source.signal) });\n}\n\n/**\n * Adapt a WHATWG `AbortSignal` to the Databricks SDK's `CancellationToken`\n * interface. The SDK's `api-client.ts` internally creates an `AbortController`\n * and wires `cancellationToken.onCancellationRequested` to it, so this adapter\n * is the one-line bridge from \"platform-standard cancellation\" to \"the SDK\n * aborts the fetch on your behalf\".\n */\nfunction signalToCancellationToken(signal: AbortSignal): CancellationToken {\n  return {\n    get isCancellationRequested() {\n      return signal.aborted;\n    },\n    onCancellationRequested(cb) {\n      if (signal.aborted) {\n        cb(signal.reason);\n        return;\n      }\n      signal.addEventListener(\"abort\", () => cb(signal.reason), { once: true });\n    },\n  };\n}\n\n/**\n * Tie the SDK's `CancellationToken` interface back into an `AbortController`.\n * Mirrors `async.tieAbortSignal` but for the SDK's cancellation shape, used\n * when a caller hands us a pre-built `Context` whose token we want to fold into\n * our own controller.\n */\nfunction tieCancellationToken(controller: AbortController, token: CancellationToken): void {\n  if (token.isCancellationRequested) {\n    controller.abort();\n    return;\n  }\n  token.onCancellationRequested((reason) => controller.abort(reason));\n}\n"]}
|
package/lib/src/pgaddress.js
CHANGED
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
*
|
|
43
43
|
* @module
|
|
44
44
|
*/
|
|
45
|
+
import { object } from "@dbx-tools/shared-core";
|
|
45
46
|
/** Postgres TLS modes accepted by {@link SslMode}, in `PGSSLMODE` spelling. */
|
|
46
47
|
export const SSL_MODES = ["require", "disable", "prefer"];
|
|
47
48
|
const URL_SCHEME_RE = /^(postgres|postgresql):\/\//i;
|
|
@@ -102,11 +103,9 @@ function parseUri(s) {
|
|
|
102
103
|
const result = {};
|
|
103
104
|
if (url.hostname)
|
|
104
105
|
result.host = url.hostname;
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
result.port = port;
|
|
109
|
-
}
|
|
106
|
+
const port = object.toNumber(url.port);
|
|
107
|
+
if (port !== undefined)
|
|
108
|
+
result.port = port;
|
|
110
109
|
if (url.username) {
|
|
111
110
|
try {
|
|
112
111
|
result.user = decodeURIComponent(url.username);
|
|
@@ -168,4 +167,4 @@ function parseResourcePathSegments(s) {
|
|
|
168
167
|
}
|
|
169
168
|
return {};
|
|
170
169
|
}
|
|
171
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pgaddress.js","sourceRoot":"","sources":["../../src/pgaddress.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Flexible address parser for Lakebase Postgres connection inputs.\n *\n * Accepts whatever shape a user is likely to paste into\n * `LAKEBASE_ENDPOINT` (or the matching config field) and extracts\n * every recognizable piece. Whatever it can't recover is left for the\n * Lakebase resolver to discover.\n *\n * Recognized formats:\n *\n * - **Postgres URI** -\n *   `postgresql://user@host:port/db?sslmode=require` (also `postgres://`).\n *   Yields `user`, `host`, `port`, `database`, `sslMode`.\n *\n * - **Canonical endpoint resource path** -\n *   `projects/{p}/branches/{b}/endpoints/{e}` -\n *   yields `project`, `branch`, `endpointId`, and the original string as\n *   `endpoint` (already in lakebase's expected form).\n *\n * - **Database resource path** -\n *   `projects/{p}/branches/{b}/databases/{d}` -\n *   yields `project`, `branch`, and `databaseResourceId` (the UC\n *   resource leaf, not `PGDATABASE`; the resolver looks up the real\n *   Postgres name via REST).\n *\n * - **Branch resource path** -\n *   `projects/{p}/branches/{b}` - yields `project`, `branch`.\n *\n * - **Project resource path** -\n *   `projects/{p}` - yields `project`.\n *\n * - **Bare hostname** -\n *   `ep-steep-forest-e199v43w.database.eastus2.azuredatabricks.net` -\n *   yields `host` only; the resolver reverse-looks up the owning\n *   endpoint to recover the resource path.\n *\n * - **Bare project id** -\n *   `dbx-tools-demo` (1-63 chars, lowercase letters/digits/hyphens) -\n *   yields `project`.\n *\n * Returns an empty object for inputs it doesn't recognize.\n *\n * @module\n */\n\n/** Postgres TLS modes accepted by {@link SslMode}, in `PGSSLMODE` spelling. */\nexport const SSL_MODES = [\"require\", \"disable\", \"prefer\"] as const;\n\n/** Postgres TLS mode passed through to `pg`. */\nexport type SslMode = (typeof SSL_MODES)[number];\n\n/**\n * Optional Lakebase Postgres connection fields shared by parsed addresses,\n * resolver/env inputs, and resolved connections.\n */\nexport interface LakebaseConnectionInputs {\n  /** Lakebase project id. Resolved from the workspace when unset. */\n  project?: string;\n  /** Branch id within the project. Defaults to the project's default branch. */\n  branch?: string;\n  /**\n   * Canonical endpoint resource path (`projects/.../endpoints/...`), from\n   * `LAKEBASE_ENDPOINT`. Defaults to the branch's read-write endpoint.\n   */\n  endpoint?: string;\n  /** Postgres database name (`PGDATABASE`). Defaults to `databricks_postgres`. */\n  database?: string;\n  /** Postgres hostname (`PGHOST`). Defaults to the resolved endpoint's host. */\n  host?: string;\n  /** Postgres port (`PGPORT`). Defaults to 5432. */\n  port?: number;\n  /** Postgres TLS mode (`PGSSLMODE`). Defaults to `require`. */\n  sslMode?: SslMode;\n}\n\n/** Pieces recovered from parsing a single address or resource-path input. */\nexport interface ParsedAddress extends LakebaseConnectionInputs {\n  /** Endpoint leaf id (last segment of an endpoint resource path). */\n  endpointId?: string;\n  /**\n   * Database resource id leaf from a `.../databases/{id}` path. Not the\n   * Postgres database name.\n   */\n  databaseResourceId?: string;\n  /** Postgres user (URI-decoded if encoded). */\n  user?: string;\n}\n\nconst URL_SCHEME_RE = /^(postgres|postgresql):\\/\\//i;\nconst PROJECT_ID_RE = /^[a-z][a-z0-9-]{0,61}[a-z0-9]$|^[a-z]$/;\nconst HOSTNAME_HINT_RE = /^[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$/i;\n\n/**\n * Parse a Lakebase connection input into whatever pieces it carries.\n * See module docstring for the supported formats. Returns `{}` for\n * `undefined`, empty strings, and unrecognized inputs.\n *\n * @example\n * import { pgaddress } from \"@dbx-tools/appkit\";\n *\n * pgaddress.parseAddress(\"projects/demo/branches/production/endpoints/ep-1\");\n * // { project: \"demo\", branch: \"production\", endpointId: \"ep-1\", endpoint: \"projects/...\" }\n *\n * pgaddress.parseAddress(\"postgresql://me@ep-1.database.azuredatabricks.net/app?sslmode=require\");\n * // { host: \"ep-1.database.azuredatabricks.net\", user: \"me\", database: \"app\", sslMode: \"require\" }\n */\nexport function parseAddress(input: string | undefined | null): ParsedAddress {\n  if (!input) return {};\n  const s = input.trim();\n  if (!s) return {};\n\n  if (URL_SCHEME_RE.test(s)) return parseUri(s);\n  if (s.startsWith(\"projects/\")) return parseResourcePathSegments(s);\n  // Resource ids never contain dots; a dotted input must be a hostname.\n  if (HOSTNAME_HINT_RE.test(s) && s.includes(\".\")) return { host: s };\n  if (PROJECT_ID_RE.test(s)) return { project: s };\n  return {};\n}\n\n/**\n * Parse a Lakebase `projects/...` resource path. Returns `{}` when the\n * input is not a resource path (so bare branch ids are not mistaken for\n * project ids).\n */\nexport function parseResourcePath(input: string | undefined | null): ParsedAddress {\n  if (!input) return {};\n  const s = input.trim();\n  if (!s.startsWith(\"projects/\")) return {};\n  return parseResourcePathSegments(s);\n}\n\nfunction parseUri(s: string): ParsedAddress {\n  let url: URL;\n  try {\n    url = new URL(s);\n  } catch {\n    return {};\n  }\n  const result: ParsedAddress = {};\n  if (url.hostname) result.host = url.hostname;\n  if (url.port) {\n    const port = Number.parseInt(url.port, 10);\n    if (!Number.isNaN(port)) result.port = port;\n  }\n  if (url.username) {\n    try {\n      result.user = decodeURIComponent(url.username);\n    } catch {\n      result.user = url.username;\n    }\n  }\n  const db = url.pathname.replace(/^\\//, \"\");\n  if (db) result.database = decodeURIComponent(db);\n  const sslmodeRaw = url.searchParams.get(\"sslmode\") ?? url.searchParams.get(\"sslMode\");\n  const sslmode = sslmodeRaw?.toLowerCase();\n  if (isSslMode(sslmode)) {\n    result.sslMode = sslmode;\n  }\n  return result;\n}\n\nfunction isSslMode(value: string | undefined): value is SslMode {\n  return SSL_MODES.some((mode) => mode === value);\n}\n\nfunction parseResourcePathSegments(s: string): ParsedAddress {\n  const parts = s.split(\"/\");\n  if (parts[0] !== \"projects\" || parts.length < 2) {\n    return {};\n  }\n\n  const project = parts[1];\n  if (!project) {\n    return {};\n  }\n\n  if (parts.length === 2) {\n    return { project };\n  }\n\n  if (parts.length === 4 && parts[2] === \"branches\" && parts[3]) {\n    return { project, branch: parts[3] };\n  }\n\n  if (\n    parts.length === 6 &&\n    parts[2] === \"branches\" &&\n    parts[4] === \"endpoints\" &&\n    parts[3] &&\n    parts[5]\n  ) {\n    return {\n      project,\n      branch: parts[3],\n      endpointId: parts[5],\n      endpoint: s,\n    };\n  }\n\n  if (\n    parts.length === 6 &&\n    parts[2] === \"branches\" &&\n    parts[4] === \"databases\" &&\n    parts[3] &&\n    parts[5]\n  ) {\n    return {\n      project,\n      branch: parts[3],\n      databaseResourceId: parts[5],\n    };\n  }\n\n  return {};\n}\n"]}
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pgaddress.js","sourceRoot":"","sources":["../../src/pgaddress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,+EAA+E;AAC/E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAU,CAAC;AA0CnE,MAAM,aAAa,GAAG,8BAA8B,CAAC;AACrD,MAAM,aAAa,GAAG,wCAAwC,CAAC;AAC/D,MAAM,gBAAgB,GAAG,8CAA8C,CAAC;AAExE;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,YAAY,CAAC,KAAgC;IAC3D,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAElB,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,IAAI,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACnE,sEAAsE;IACtE,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACpE,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACjD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAgC;IAChE,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,EAAE,CAAC;IAC1C,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS;IACzB,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,IAAI,GAAG,CAAC,QAAQ;QAAE,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IAC3C,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,CAAC,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,MAAM,EAAE,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC3C,IAAI,EAAE;QAAE,MAAM,CAAC,QAAQ,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,UAAU,EAAE,WAAW,EAAE,CAAC;IAC1C,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,KAAyB;IAC1C,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,yBAAyB,CAAC,CAAS;IAC1C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IACE,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU;QACvB,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW;QACxB,KAAK,CAAC,CAAC,CAAC;QACR,KAAK,CAAC,CAAC,CAAC,EACR,CAAC;QACD,OAAO;YACL,OAAO;YACP,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAChB,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;YACpB,QAAQ,EAAE,CAAC;SACZ,CAAC;IACJ,CAAC;IAED,IACE,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU;QACvB,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW;QACxB,KAAK,CAAC,CAAC,CAAC;QACR,KAAK,CAAC,CAAC,CAAC,EACR,CAAC;QACD,OAAO;YACL,OAAO;YACP,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAChB,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC;SAC7B,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC","sourcesContent":["/**\n * Flexible address parser for Lakebase Postgres connection inputs.\n *\n * Accepts whatever shape a user is likely to paste into\n * `LAKEBASE_ENDPOINT` (or the matching config field) and extracts\n * every recognizable piece. Whatever it can't recover is left for the\n * Lakebase resolver to discover.\n *\n * Recognized formats:\n *\n * - **Postgres URI** -\n *   `postgresql://user@host:port/db?sslmode=require` (also `postgres://`).\n *   Yields `user`, `host`, `port`, `database`, `sslMode`.\n *\n * - **Canonical endpoint resource path** -\n *   `projects/{p}/branches/{b}/endpoints/{e}` -\n *   yields `project`, `branch`, `endpointId`, and the original string as\n *   `endpoint` (already in lakebase's expected form).\n *\n * - **Database resource path** -\n *   `projects/{p}/branches/{b}/databases/{d}` -\n *   yields `project`, `branch`, and `databaseResourceId` (the UC\n *   resource leaf, not `PGDATABASE`; the resolver looks up the real\n *   Postgres name via REST).\n *\n * - **Branch resource path** -\n *   `projects/{p}/branches/{b}` - yields `project`, `branch`.\n *\n * - **Project resource path** -\n *   `projects/{p}` - yields `project`.\n *\n * - **Bare hostname** -\n *   `ep-steep-forest-e199v43w.database.eastus2.azuredatabricks.net` -\n *   yields `host` only; the resolver reverse-looks up the owning\n *   endpoint to recover the resource path.\n *\n * - **Bare project id** -\n *   `dbx-tools-demo` (1-63 chars, lowercase letters/digits/hyphens) -\n *   yields `project`.\n *\n * Returns an empty object for inputs it doesn't recognize.\n *\n * @module\n */\n\nimport { object } from \"@dbx-tools/shared-core\";\n\n/** Postgres TLS modes accepted by {@link SslMode}, in `PGSSLMODE` spelling. */\nexport const SSL_MODES = [\"require\", \"disable\", \"prefer\"] as const;\n\n/** Postgres TLS mode passed through to `pg`. */\nexport type SslMode = (typeof SSL_MODES)[number];\n\n/**\n * Optional Lakebase Postgres connection fields shared by parsed addresses,\n * resolver/env inputs, and resolved connections.\n */\nexport interface LakebaseConnectionInputs {\n  /** Lakebase project id. Resolved from the workspace when unset. */\n  project?: string;\n  /** Branch id within the project. Defaults to the project's default branch. */\n  branch?: string;\n  /**\n   * Canonical endpoint resource path (`projects/.../endpoints/...`), from\n   * `LAKEBASE_ENDPOINT`. Defaults to the branch's read-write endpoint.\n   */\n  endpoint?: string;\n  /** Postgres database name (`PGDATABASE`). Defaults to `databricks_postgres`. */\n  database?: string;\n  /** Postgres hostname (`PGHOST`). Defaults to the resolved endpoint's host. */\n  host?: string;\n  /** Postgres port (`PGPORT`). Defaults to 5432. */\n  port?: number;\n  /** Postgres TLS mode (`PGSSLMODE`). Defaults to `require`. */\n  sslMode?: SslMode;\n}\n\n/** Pieces recovered from parsing a single address or resource-path input. */\nexport interface ParsedAddress extends LakebaseConnectionInputs {\n  /** Endpoint leaf id (last segment of an endpoint resource path). */\n  endpointId?: string;\n  /**\n   * Database resource id leaf from a `.../databases/{id}` path. Not the\n   * Postgres database name.\n   */\n  databaseResourceId?: string;\n  /** Postgres user (URI-decoded if encoded). */\n  user?: string;\n}\n\nconst URL_SCHEME_RE = /^(postgres|postgresql):\\/\\//i;\nconst PROJECT_ID_RE = /^[a-z][a-z0-9-]{0,61}[a-z0-9]$|^[a-z]$/;\nconst HOSTNAME_HINT_RE = /^[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$/i;\n\n/**\n * Parse a Lakebase connection input into whatever pieces it carries.\n * See module docstring for the supported formats. Returns `{}` for\n * `undefined`, empty strings, and unrecognized inputs.\n *\n * @example\n * import { pgaddress } from \"@dbx-tools/appkit\";\n *\n * pgaddress.parseAddress(\"projects/demo/branches/production/endpoints/ep-1\");\n * // { project: \"demo\", branch: \"production\", endpointId: \"ep-1\", endpoint: \"projects/...\" }\n *\n * pgaddress.parseAddress(\"postgresql://me@ep-1.database.azuredatabricks.net/app?sslmode=require\");\n * // { host: \"ep-1.database.azuredatabricks.net\", user: \"me\", database: \"app\", sslMode: \"require\" }\n */\nexport function parseAddress(input: string | undefined | null): ParsedAddress {\n  if (!input) return {};\n  const s = input.trim();\n  if (!s) return {};\n\n  if (URL_SCHEME_RE.test(s)) return parseUri(s);\n  if (s.startsWith(\"projects/\")) return parseResourcePathSegments(s);\n  // Resource ids never contain dots; a dotted input must be a hostname.\n  if (HOSTNAME_HINT_RE.test(s) && s.includes(\".\")) return { host: s };\n  if (PROJECT_ID_RE.test(s)) return { project: s };\n  return {};\n}\n\n/**\n * Parse a Lakebase `projects/...` resource path. Returns `{}` when the\n * input is not a resource path (so bare branch ids are not mistaken for\n * project ids).\n */\nexport function parseResourcePath(input: string | undefined | null): ParsedAddress {\n  if (!input) return {};\n  const s = input.trim();\n  if (!s.startsWith(\"projects/\")) return {};\n  return parseResourcePathSegments(s);\n}\n\nfunction parseUri(s: string): ParsedAddress {\n  let url: URL;\n  try {\n    url = new URL(s);\n  } catch {\n    return {};\n  }\n  const result: ParsedAddress = {};\n  if (url.hostname) result.host = url.hostname;\n  const port = object.toNumber(url.port);\n  if (port !== undefined) result.port = port;\n  if (url.username) {\n    try {\n      result.user = decodeURIComponent(url.username);\n    } catch {\n      result.user = url.username;\n    }\n  }\n  const db = url.pathname.replace(/^\\//, \"\");\n  if (db) result.database = decodeURIComponent(db);\n  const sslmodeRaw = url.searchParams.get(\"sslmode\") ?? url.searchParams.get(\"sslMode\");\n  const sslmode = sslmodeRaw?.toLowerCase();\n  if (isSslMode(sslmode)) {\n    result.sslMode = sslmode;\n  }\n  return result;\n}\n\nfunction isSslMode(value: string | undefined): value is SslMode {\n  return SSL_MODES.some((mode) => mode === value);\n}\n\nfunction parseResourcePathSegments(s: string): ParsedAddress {\n  const parts = s.split(\"/\");\n  if (parts[0] !== \"projects\" || parts.length < 2) {\n    return {};\n  }\n\n  const project = parts[1];\n  if (!project) {\n    return {};\n  }\n\n  if (parts.length === 2) {\n    return { project };\n  }\n\n  if (parts.length === 4 && parts[2] === \"branches\" && parts[3]) {\n    return { project, branch: parts[3] };\n  }\n\n  if (\n    parts.length === 6 &&\n    parts[2] === \"branches\" &&\n    parts[4] === \"endpoints\" &&\n    parts[3] &&\n    parts[5]\n  ) {\n    return {\n      project,\n      branch: parts[3],\n      endpointId: parts[5],\n      endpoint: s,\n    };\n  }\n\n  if (\n    parts.length === 6 &&\n    parts[2] === \"branches\" &&\n    parts[4] === \"databases\" &&\n    parts[3] &&\n    parts[5]\n  ) {\n    return {\n      project,\n      branch: parts[3],\n      databaseResourceId: parts[5],\n    };\n  }\n\n  return {};\n}\n"]}
|
package/package.json
CHANGED
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@databricks/sdk-experimental": "^0.17.0",
|
|
31
|
-
"@dbx-tools/core": "0.6.
|
|
32
|
-
"@dbx-tools/shared-core": "0.6.
|
|
31
|
+
"@dbx-tools/core": "0.6.62",
|
|
32
|
+
"@dbx-tools/shared-core": "0.6.62",
|
|
33
33
|
"yaml": "^2.9.0",
|
|
34
34
|
"zod": "4.3.6"
|
|
35
35
|
},
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"./package.json": "./package.json"
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
|
-
"version": "0.6.
|
|
50
|
+
"version": "0.6.62",
|
|
51
51
|
"types": "./lib/index.d.ts",
|
|
52
52
|
"type": "module",
|
|
53
53
|
"exports": {
|
package/src/databricks.ts
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
import type { CancellationToken } from "@databricks/sdk-experimental";
|
|
14
14
|
import { Context } from "@databricks/sdk-experimental";
|
|
15
|
-
import { async, log } from "@dbx-tools/shared-core";
|
|
15
|
+
import { async, log, object } from "@dbx-tools/shared-core";
|
|
16
16
|
|
|
17
17
|
const logger = log.logger("databricks");
|
|
18
18
|
|
|
@@ -51,8 +51,13 @@ export function isAppEnv(env: Record<string, string | undefined> = process.env):
|
|
|
51
51
|
return false;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
const portNumber =
|
|
55
|
-
if (
|
|
54
|
+
const portNumber = object.toNumber(port);
|
|
55
|
+
if (
|
|
56
|
+
portNumber === undefined ||
|
|
57
|
+
!Number.isInteger(portNumber) ||
|
|
58
|
+
portNumber < 1 ||
|
|
59
|
+
portNumber > MAX_TCP_PORT
|
|
60
|
+
) {
|
|
56
61
|
logger.debug("app env rejected: DATABRICKS_APP_PORT is not a TCP port");
|
|
57
62
|
return false;
|
|
58
63
|
}
|
package/src/pgaddress.ts
CHANGED
|
@@ -43,6 +43,8 @@
|
|
|
43
43
|
* @module
|
|
44
44
|
*/
|
|
45
45
|
|
|
46
|
+
import { object } from "@dbx-tools/shared-core";
|
|
47
|
+
|
|
46
48
|
/** Postgres TLS modes accepted by {@link SslMode}, in `PGSSLMODE` spelling. */
|
|
47
49
|
export const SSL_MODES = ["require", "disable", "prefer"] as const;
|
|
48
50
|
|
|
@@ -138,10 +140,8 @@ function parseUri(s: string): ParsedAddress {
|
|
|
138
140
|
}
|
|
139
141
|
const result: ParsedAddress = {};
|
|
140
142
|
if (url.hostname) result.host = url.hostname;
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
if (!Number.isNaN(port)) result.port = port;
|
|
144
|
-
}
|
|
143
|
+
const port = object.toNumber(url.port);
|
|
144
|
+
if (port !== undefined) result.port = port;
|
|
145
145
|
if (url.username) {
|
|
146
146
|
try {
|
|
147
147
|
result.user = decodeURIComponent(url.username);
|