@hasna/shortlinks 0.2.2 → 0.2.3

package/dist/cli/index.js

@@ -2894,7 +2894,7 @@ async function upsertCloudflareDnsRecord(options) {
   return { id: created.id, action: "created" };
 }
 
-// node_modules/.pnpm/@hasna+events@0.1.13/node_modules/@hasna/events/dist/commander.js
+// node_modules/@hasna/events/dist/commander.js
 import { chmod, mkdir, readFile, rename, writeFile } from "fs/promises";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir2 } from "os";
@@ -2911,83 +2911,29 @@ function getPathValue(input, path) {
     return;
   }, input);
 }
-function getFieldValues(input, path) {
-  const values = [];
-  const push = (value) => {
-    if (!values.some((item) => Object.is(item, value)))
-      values.push(value);
-  };
-  if (path.includes(".") && path in input)
-    push(input[path]);
-  const nestedValue = getPathValue(input, path);
-  if (nestedValue !== undefined || !path.includes("."))
-    push(nestedValue);
-  return values;
-}
-function wildcardToRegExp(pattern, options = {}) {
-  let body = "";
-  for (let index = 0;index < pattern.length; index += 1) {
-    const char = pattern[index];
-    if (char === "*") {
-      if (pattern[index + 1] === "*") {
-        body += ".*";
-        index += 1;
-      } else {
-        body += options.segmentSafe ? "[^/]*" : ".*";
-      }
-    } else {
-      body += char.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
-    }
-  }
-  return new RegExp(`^${body}$`);
+function wildcardToRegExp(pattern) {
+  const escaped = pattern.replace(/[|\\{}()[\]^$+?.]/g, "\\$&").replace(/\*/g, ".*");
+  return new RegExp(`^${escaped}$`);
 }
-function matchString(value, matcher, options = {}) {
+function matchString(value, matcher) {
   if (matcher === undefined)
     return true;
   if (value === undefined)
     return false;
   const matchers = Array.isArray(matcher) ? matcher : [matcher];
-  return matchers.some((item) => wildcardToRegExp(item, options).test(value));
+  return matchers.some((item) => wildcardToRegExp(item).test(value));
 }
 function matchRecord(input, matcher) {
   if (!matcher)
     return true;
   return Object.entries(matcher).every(([path, expected]) => {
-    const actualValues = getFieldValues(input, path);
-    return matchField(actualValues, expected, path);
+    const actual = getPathValue(input, path);
+    if (typeof expected === "string" || Array.isArray(expected)) {
+      return matchString(actual === undefined ? undefined : String(actual), expected);
+    }
+    return actual === expected;
   });
 }
-function matchField(actualValues, expected, path) {
-  if (isNegativeMatcher(expected)) {
-    return !actualValues.some((actual) => matchPositiveField(actual, expected.not, path));
-  }
-  return actualValues.some((actual) => matchPositiveField(actual, expected, path));
-}
-function matchPositiveField(actual, expected, path) {
-  if (typeof expected === "string" || Array.isArray(expected)) {
-    return stringCandidates(actual).some((candidate) => matchString(candidate, expected, {
-      segmentSafe: path.endsWith("_path") || path.endsWith(".path")
-    }));
-  }
-  if (Array.isArray(actual)) {
-    return actual.some((item) => item === expected);
-  }
-  return actual === expected;
-}
-function stringCandidates(actual) {
-  if (actual === undefined)
-    return [];
-  if (Array.isArray(actual)) {
-    return actual.flatMap((item) => isPrimitiveFieldValue(item) ? [String(item)] : []);
-  }
-  return [String(actual)];
-}
-function isPrimitiveFieldValue(value) {
-  return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
-}
-function isNegativeMatcher(value) {
-  return Boolean(value && typeof value === "object" && !Array.isArray(value) && "not" in value);
-}
 function eventMatchesFilter(event, filter) {
   return matchString(event.source, filter.source) && matchString(event.type, filter.type) && matchString(event.subject, filter.subject) && matchString(event.severity, filter.severity) && matchRecord(event.data, filter.data) && matchRecord(event.metadata, filter.metadata);
 }
@@ -3003,13 +2949,6 @@ var HASNA_EVENTS_HOME_ENV = "HASNA_EVENTS_HOME";
 function getEventsDataDir(override) {
   return override || process.env[HASNA_EVENTS_DIR_ENV] || process.env[HASNA_EVENTS_HOME_ENV] || join4(homedir2(), ".hasna", "events");
 }
-function getActiveEventsDirEnv() {
-  if (process.env[HASNA_EVENTS_DIR_ENV])
-    return HASNA_EVENTS_DIR_ENV;
-  if (process.env[HASNA_EVENTS_HOME_ENV])
-    return HASNA_EVENTS_HOME_ENV;
-  return null;
-}
 
 class JsonEventsStore {
   dataDir;
@@ -3122,52 +3061,6 @@ class JsonEventsStore {
     });
   }
 }
-async function getEventsStatus(dataDir) {
-  const store = new JsonEventsStore(dataDir);
-  await store.init();
-  const [channels, events, deliveries] = await Promise.all([
-    store.listChannels(),
-    store.listEvents(),
-    store.listDeliveries()
-  ]);
-  const transports = channels.reduce((counts, channel) => {
-    counts[channel.transport] = (counts[channel.transport] ?? 0) + 1;
-    return counts;
-  }, {});
-  return {
-    service: "events",
-    schemaVersion: "1.0",
-    dataDir: store.dataDir,
-    env: {
-      primary: HASNA_EVENTS_DIR_ENV,
-      fallback: HASNA_EVENTS_HOME_ENV,
-      active: getActiveEventsDirEnv()
-    },
-    files: {
-      channels: statusFile(store.dataDir, "channels.json", channels.length),
-      events: statusFile(store.dataDir, "events.json", events.length),
-      deliveries: statusFile(store.dataDir, "deliveries.json", deliveries.length)
-    },
-    counts: {
-      channels: channels.length,
-      enabledChannels: channels.filter((channel) => channel.enabled).length,
-      disabledChannels: channels.filter((channel) => !channel.enabled).length,
-      events: events.length,
-      deliveries: deliveries.length
-    },
-    transports,
-    safety: {
-      includesEventPayloads: false,
-      includesWebhookSecrets: false,
-      listOutputsRedactSecrets: true,
-      statusOutputIsMetadataOnly: true
-    }
-  };
-}
-function statusFile(dataDir, fileName, records) {
-  const path = join4(dataDir, fileName);
-  return { path, exists: existsSync3(path), records };
-}
 var DEFAULT_SIGNATURE_TOLERANCE_MS = 5 * 60 * 1000;
 function buildSignatureBase(timestamp, body) {
   return `${timestamp}.${body}`;
@@ -3393,7 +3286,7 @@ class EventsClient {
     }
     return deliveries;
   }
-  async matchChannel(id, input = {}) {
+  async testChannel(id, input = {}) {
     const channel = await this.store.getChannel(id);
     if (!channel)
       throw new Error(`Channel not found: ${id}`);
@@ -3410,34 +3303,6 @@ class EventsClient {
       time: input.time,
       id: input.id
     });
-    const matched = channelMatchesEvent(channel, event);
-    return {
-      channelId: channel.id,
-      matched,
-      event,
-      filters: channel.filters,
-      reason: matched ? undefined : channel.enabled ? "event did not match channel filters" : "channel is disabled"
-    };
-  }
-  async testChannel(id, input = {}, options = {}) {
-    const channel = await this.store.getChannel(id);
-    if (!channel)
-      throw new Error(`Channel not found: ${id}`);
-    const match = await this.matchChannel(id, input);
-    const event = match.event;
-    if (options.honorFilters && !match.matched) {
-      const timestamp = new Date().toISOString();
-      const result2 = createDeliveryResult(event, channel, [{
-        attempt: 1,
-        status: "skipped",
-        startedAt: timestamp,
-        completedAt: timestamp,
-        error: match.reason
-      }]);
-      result2.metadata = { reason: "filter_mismatch" };
-      await this.store.appendDelivery(result2);
-      return result2;
-    }
     const eventForChannel = await this.applyRedaction(event, channel);
     const result = await this.deliverWithRetry(eventForChannel, channel);
     await this.store.appendDelivery(result);
@@ -3548,76 +3413,6 @@ function normalizeRetryPolicy(policy) {
     multiplier: Math.max(1, policy?.multiplier ?? 2)
   };
 }
-function parseFieldMatchers(values, label, typed = false) {
-  if (!values?.length)
-    return;
-  const result = {};
-  for (const value of values) {
-    const parsed = parseMatcherExpression(value, label);
-    const path = parsed.path;
-    if (path in result)
-      throw new Error(`Duplicate ${label} filter path: ${path}`);
-    const matcherValue = typed ? parseTypedMatcherValue(parsed.rawValue, label) : parsed.rawValue;
-    result[path] = parsed.negated ? { not: matcherValue } : matcherValue;
-  }
-  return result;
-}
-function parseFilterOptions(options) {
-  const filter2 = {};
-  if (options.source)
-    filter2.source = options.source;
-  if (options.type)
-    filter2.type = options.type;
-  if (options.subject)
-    filter2.subject = options.subject;
-  if (options.severity)
-    filter2.severity = options.severity;
-  const data = mergeMatchers(parseFieldMatchers(options.data, "data"), parseFieldMatchers(options.dataJson, "data-json", true));
-  const metadata = mergeMatchers(parseFieldMatchers(options.metadata, "metadata"), parseFieldMatchers(options.metadataJson, "metadata-json", true));
-  if (Object.keys(data).length > 0)
-    filter2.data = data;
-  if (Object.keys(metadata).length > 0)
-    filter2.metadata = metadata;
-  return Object.keys(filter2).length > 0 ? [filter2] : undefined;
-}
-function mergeMatchers(...records) {
-  const result = {};
-  for (const record of records) {
-    if (!record)
-      continue;
-    for (const [path, value] of Object.entries(record)) {
-      if (path in result)
-        throw new Error(`Duplicate filter path: ${path}`);
-      result[path] = value;
-    }
-  }
-  return result;
-}
-function parseTypedMatcherValue(value, label) {
-  const parsed = JSON.parse(value);
-  if (parsed === null || typeof parsed === "string" || typeof parsed === "number" || typeof parsed === "boolean" || Array.isArray(parsed) && parsed.every((item) => typeof item === "string")) {
-    return parsed;
-  }
-  throw new Error(`${label} filter JSON values must be string, string[], number, boolean, or null`);
-}
-function parseMatcherExpression(value, label) {
-  const negativeSeparator = value.indexOf("!=");
-  if (negativeSeparator > 0) {
-    return {
-      path: value.slice(0, negativeSeparator),
-      rawValue: value.slice(negativeSeparator + 2),
-      negated: true
-    };
-  }
-  const separator = value.indexOf("=");
-  if (separator <= 0)
-    throw new Error(`Invalid ${label} filter, expected path=value or path!=value: ${value}`);
-  return {
-    path: value.slice(0, separator),
-    rawValue: value.slice(separator + 1),
-    negated: false
-  };
-}
 function parseJsonObject2(value, fallback) {
   if (!value)
     return fallback;
@@ -3639,6 +3434,18 @@ function parseHeaders(values) {
   }
   return headers;
 }
+function parseFilter(options) {
+  const filter2 = {};
+  if (options.source)
+    filter2.source = options.source;
+  if (options.type)
+    filter2.type = options.type;
+  if (options.subject)
+    filter2.subject = options.subject;
+  if (options.severity)
+    filter2.severity = options.severity;
+  return Object.keys(filter2).length > 0 ? [filter2] : undefined;
+}
 function createClient(options) {
   if (options.createClient)
     return options.createClient();
@@ -3656,16 +3463,16 @@ function hasJsonOption(options) {
 function wantsJson(actionOptions, command) {
   return hasJsonOption(actionOptions) || hasJsonOption(command);
 }
-function registerChannelCommands(program, options) {
-  const channels = program.command(options.channelsCommandName ?? "channels").description("Manage Hasna event channels");
-  channels.command("add").description("Add or replace a channel").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--data <path=value...>", "Event data field filter; string values, path!=value negatives, array-member matching, dot paths, * segment wildcard, ** recursive wildcard", collectValues, []).option("--metadata <path=value...>", "Event metadata field filter; string values, path!=value negatives, array-member matching, dot paths, * segment wildcard, ** recursive wildcard", collectValues, []).option("--data-json <path=json...>", "Event data field filter with typed JSON value; path!=json negatives supported", collectValues, []).option("--metadata-json <path=json...>", "Event metadata field filter with typed JSON value; path!=json negatives supported", collectValues, []).option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions, command) => {
+function registerWebhookCommands(program, options) {
+  const webhooks = program.command(options.webhooksCommandName ?? "webhooks").description("Manage Hasna event webhook subscriptions");
+  webhooks.command("add").description("Add or replace a webhook or command subscription").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Subscription/channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions, command) => {
     const timestamp = new Date().toISOString();
     const channel = {
       id: actionOptions.id,
       name: actionOptions.name,
       enabled: !actionOptions.disabled,
       transport: actionOptions.transport,
-      filters: parseFilterOptions(actionOptions),
+      filters: parseFilter(actionOptions),
       retry: actionOptions.retryAttempts || actionOptions.retryBackoffMs ? { maxAttempts: actionOptions.retryAttempts, backoffMs: actionOptions.retryBackoffMs } : undefined,
       redact: actionOptions.redact?.length ? { paths: actionOptions.redact } : undefined,
       createdAt: timestamp,
@@ -3681,51 +3488,35 @@ function registerChannelCommands(program, options) {
     const saved = await createClient(options).addChannel(channel);
     print(sanitizeChannelForOutput(saved), wantsJson(actionOptions, command), `Added ${saved.transport} channel ${saved.id}`);
   });
-  channels.command("list").description("List configured channels").option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
-    const channels2 = await createClient(options).listChannels();
+  webhooks.command("list").description("List configured subscriptions").option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
+    const channels = await createClient(options).listChannels();
     if (wantsJson(actionOptions, command)) {
-      console.log(JSON.stringify(sanitizeChannelsForOutput(channels2), null, 2));
+      console.log(JSON.stringify(sanitizeChannelsForOutput(channels), null, 2));
       return;
     }
-    if (!channels2.length) {
+    if (!channels.length) {
       console.log("No channels configured.");
       return;
     }
-    for (const channel of channels2) {
+    for (const channel of channels) {
       console.log(`${channel.id}	${channel.enabled ? "enabled" : "disabled"}	${channel.transport}	${channel.webhook?.url ?? channel.command?.command ?? channel.transport}`);
     }
   });
-  channels.command("status").description("Show events channel storage status").option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
-    const status = await getEventsStatus(options.dataDir);
-    print(status, wantsJson(actionOptions, command), `events dataDir: ${status.dataDir}`);
-  });
-  channels.command("remove").description("Remove a channel").argument("<id>", "Channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
+  webhooks.command("remove").description("Remove a subscription").argument("<id>", "Subscription/channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
     const removed = await createClient(options).removeChannel(id);
     print({ removed }, wantsJson(actionOptions, command), removed ? `Removed ${id}` : `Channel not found: ${id}`);
   });
-  channels.command("test").description("Send a test event to one channel").argument("<id>", "Channel identifier").option("--source <source>", "Event source override").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("--honor-filters", "Skip delivery when the sample event does not match channel filters", false).option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
+  webhooks.command("test").description("Send a test event to one subscription").argument("<id>", "Subscription/channel identifier").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
     const result = await createClient(options).testChannel(id, {
-      source: actionOptions.source ?? options.source,
-      type: actionOptions.type,
-      subject: actionOptions.subject ?? id,
-      message: actionOptions.message,
-      data: parseJsonObject2(actionOptions.data, { test: true }),
-      metadata: parseJsonObject2(actionOptions.metadata, {})
-    }, { honorFilters: actionOptions.honorFilters });
-    print(result, wantsJson(actionOptions, command), `${result.status}: ${result.channelId}`);
-  });
-  channels.command("match").description("Check whether a sample event matches one channel without delivering").argument("<id>", "Channel identifier").option("--source <source>", "Event source override").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events match preview").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
-    const result = await createClient(options).matchChannel(id, {
-      source: actionOptions.source ?? options.source,
+      source: options.source,
       type: actionOptions.type,
       subject: actionOptions.subject ?? id,
       message: actionOptions.message,
-      data: parseJsonObject2(actionOptions.data, { test: true }),
-      metadata: parseJsonObject2(actionOptions.metadata, {})
+      data: parseJsonObject2(actionOptions.data, { test: true })
     });
-    print(result, wantsJson(actionOptions, command), `${result.matched ? "matched" : "skipped"}: ${result.channelId}`);
+    print(result, wantsJson(actionOptions, command), `${result.status}: ${result.channelId}`);
   });
-  return channels;
+  return webhooks;
 }
 function registerEventCommands(program, options) {
   const events = program.command(options.eventsCommandName ?? "events").description("Emit, list, and replay Hasna events");
@@ -3773,7 +3564,7 @@ function registerEventCommands(program, options) {
   return events;
 }
 function registerEventsCommands(program, options) {
-  registerChannelCommands(program, options);
+  registerWebhookCommands(program, options);
   registerEventCommands(program, options);
 }
 function parseNumber(value) {

package/dist/serve/index.js

@@ -33,7 +33,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = import.meta.require;
 
-// node_modules/.pnpm/postgres-array@2.0.0/node_modules/postgres-array/index.js
+// node_modules/postgres-array/index.js
 var require_postgres_array = __commonJS((exports) => {
   exports.parse = function(source, transform) {
     return new ArrayParser(source, transform).parse();
@@ -129,7 +129,7 @@ var require_postgres_array = __commonJS((exports) => {
   }
 });
 
-// node_modules/.pnpm/pg-types@2.2.0/node_modules/pg-types/lib/arrayParser.js
+// node_modules/pg-types/lib/arrayParser.js
 var require_arrayParser = __commonJS((exports, module) => {
   var array = require_postgres_array();
   module.exports = {
@@ -143,7 +143,7 @@ var require_arrayParser = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/postgres-date@1.0.7/node_modules/postgres-date/index.js
+// node_modules/postgres-date/index.js
 var require_postgres_date = __commonJS((exports, module) => {
   var DATE_TIME = /(\d{1,})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(\.\d{1,})?.*?( BC)?$/;
   var DATE = /^(\d{1,})-(\d{2})-(\d{2})( BC)?$/;
@@ -228,7 +228,7 @@ var require_postgres_date = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/xtend@4.0.2/node_modules/xtend/mutable.js
+// node_modules/xtend/mutable.js
 var require_mutable = __commonJS((exports, module) => {
   module.exports = extend;
   var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -245,7 +245,7 @@ var require_mutable = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/postgres-interval@1.2.0/node_modules/postgres-interval/index.js
+// node_modules/postgres-interval/index.js
 var require_postgres_interval = __commonJS((exports, module) => {
   var extend = require_mutable();
   module.exports = PostgresInterval;
@@ -337,7 +337,7 @@ var require_postgres_interval = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/postgres-bytea@1.0.1/node_modules/postgres-bytea/index.js
+// node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports, module) => {
   var bufferFrom = Buffer.from || Buffer;
   module.exports = function parseBytea(input) {
@@ -370,7 +370,7 @@ var require_postgres_bytea = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg-types@2.2.0/node_modules/pg-types/lib/textParsers.js
+// node_modules/pg-types/lib/textParsers.js
 var require_textParsers = __commonJS((exports, module) => {
   var array = require_postgres_array();
   var arrayParser = require_arrayParser();
@@ -573,7 +573,7 @@ var require_textParsers = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg-int8@1.0.1/node_modules/pg-int8/index.js
+// node_modules/pg-int8/index.js
 var require_pg_int8 = __commonJS((exports, module) => {
   var BASE = 1e6;
   function readInt8(buffer) {
@@ -650,7 +650,7 @@ var require_pg_int8 = __commonJS((exports, module) => {
   module.exports = readInt8;
 });
 
-// node_modules/.pnpm/pg-types@2.2.0/node_modules/pg-types/lib/binaryParsers.js
+// node_modules/pg-types/lib/binaryParsers.js
 var require_binaryParsers = __commonJS((exports, module) => {
   var parseInt64 = require_pg_int8();
   var parseBits = function(data, bits, offset, invert, callback) {
@@ -849,7 +849,7 @@ var require_binaryParsers = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg-types@2.2.0/node_modules/pg-types/lib/builtins.js
+// node_modules/pg-types/lib/builtins.js
 var require_builtins = __commonJS((exports, module) => {
   module.exports = {
     BOOL: 16,
@@ -915,7 +915,7 @@ var require_builtins = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg-types@2.2.0/node_modules/pg-types/index.js
+// node_modules/pg-types/index.js
 var require_pg_types = __commonJS((exports) => {
   var textParsers = require_textParsers();
   var binaryParsers = require_binaryParsers();
@@ -954,7 +954,7 @@ var require_pg_types = __commonJS((exports) => {
   });
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/defaults.js
+// node_modules/pg/lib/defaults.js
 var require_defaults = __commonJS((exports, module) => {
   var user;
   try {
@@ -973,7 +973,6 @@ var require_defaults = __commonJS((exports, module) => {
     idleTimeoutMillis: 30000,
     client_encoding: "",
     ssl: false,
-    sslnegotiation: undefined,
     application_name: undefined,
     fallback_application_name: undefined,
     options: undefined,
@@ -995,10 +994,11 @@ var require_defaults = __commonJS((exports, module) => {
   });
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/utils.js
+// node_modules/pg/lib/utils.js
 var require_utils = __commonJS((exports, module) => {
   var defaults = require_defaults();
-  var { isDate } = __require("util/types");
+  var util = __require("util");
+  var { isDate } = util.types || util;
   function escapeElement(elementRepresentation) {
     const escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
     return '"' + escaped + '"';
@@ -1007,23 +1007,28 @@ var require_utils = __commonJS((exports, module) => {
     let result = "{";
     for (let i = 0;i < val.length; i++) {
       if (i > 0) {
-        result += ",";
-      }
-      let item = val[i];
-      if (item == null) {
-        result += "NULL";
-      } else if (Array.isArray(item)) {
-        result += arrayString(item);
-      } else if (ArrayBuffer.isView(item)) {
+        result = result + ",";
+      }
+      if (val[i] === null || typeof val[i] === "undefined") {
+        result = result + "NULL";
+      } else if (Array.isArray(val[i])) {
+        result = result + arrayString(val[i]);
+      } else if (ArrayBuffer.isView(val[i])) {
+        let item = val[i];
         if (!(item instanceof Buffer)) {
-          item = Buffer.from(item.buffer, item.byteOffset, item.byteLength);
+          const buf = Buffer.from(item.buffer, item.byteOffset, item.byteLength);
+          if (buf.length === item.byteLength) {
+            item = buf;
+          } else {
+            item = buf.slice(item.byteOffset, item.byteOffset + item.byteLength);
+          }
         }
         result += "\\\\x" + item.toString("hex");
       } else {
-        result += escapeElement(prepareValue(item));
+        result += escapeElement(prepareValue(val[i]));
       }
     }
-    result += "}";
+    result = result + "}";
     return result;
   }
   var prepareValue = function(val, seen) {
@@ -1035,7 +1040,11 @@ var require_utils = __commonJS((exports, module) => {
         return val;
       }
       if (ArrayBuffer.isView(val)) {
-        return Buffer.from(val.buffer, val.byteOffset, val.byteLength);
+        const buf = Buffer.from(val.buffer, val.byteOffset, val.byteLength);
+        if (buf.length === val.byteLength) {
+          return buf;
+        }
+        return buf.slice(val.byteOffset, val.byteOffset + val.byteLength);
       }
       if (isDate(val)) {
         if (defaults.parseInputDatesAsUTC) {
@@ -1144,8 +1153,43 @@ var require_utils = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/crypto/utils.js
-var require_utils2 = __commonJS((exports, module) => {
+// node_modules/pg/lib/crypto/utils-legacy.js
+var require_utils_legacy = __commonJS((exports, module) => {
+  var nodeCrypto = __require("crypto");
+  function md5(string) {
+    return nodeCrypto.createHash("md5").update(string, "utf-8").digest("hex");
+  }
+  function postgresMd5PasswordHash(user, password, salt) {
+    const inner = md5(password + user);
+    const outer = md5(Buffer.concat([Buffer.from(inner), salt]));
+    return "md5" + outer;
+  }
+  function sha256(text) {
+    return nodeCrypto.createHash("sha256").update(text).digest();
+  }
+  function hashByName(hashName, text) {
+    hashName = hashName.replace(/(\D)-/, "$1");
+    return nodeCrypto.createHash(hashName).update(text).digest();
+  }
+  function hmacSha256(key, msg) {
+    return nodeCrypto.createHmac("sha256", key).update(msg).digest();
+  }
+  async function deriveKey(password, salt, iterations) {
+    return nodeCrypto.pbkdf2Sync(password, salt, iterations, 32, "sha256");
+  }
+  module.exports = {
+    postgresMd5PasswordHash,
+    randomBytes: nodeCrypto.randomBytes,
+    deriveKey,
+    sha256,
+    hashByName,
+    hmacSha256,
+    md5
+  };
+});
+
+// node_modules/pg/lib/crypto/utils-webcrypto.js
+var require_utils_webcrypto = __commonJS((exports, module) => {
   var nodeCrypto = __require("crypto");
   module.exports = {
     postgresMd5PasswordHash,
@@ -1193,7 +1237,17 @@ var require_utils2 = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/crypto/cert-signatures.js
+// node_modules/pg/lib/crypto/utils.js
+var require_utils2 = __commonJS((exports, module) => {
+  var useLegacyCrypto = parseInt(process.versions && process.versions.node && process.versions.node.split(".")[0]) < 15;
+  if (useLegacyCrypto) {
+    module.exports = require_utils_legacy();
+  } else {
+    module.exports = require_utils_webcrypto();
+  }
+});
+
+// node_modules/pg/lib/crypto/cert-signatures.js
 var require_cert_signatures = __commonJS((exports, module) => {
   function x509Error(msg, cert) {
     return new Error("SASL channel binding: " + msg + " when parsing public certificate " + cert.toString("base64"));
@@ -1305,17 +1359,11 @@ var require_cert_signatures = __commonJS((exports, module) => {
   module.exports = { signatureAlgorithmHashFromCertificate };
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/crypto/sasl.js
+// node_modules/pg/lib/crypto/sasl.js
 var require_sasl = __commonJS((exports, module) => {
   var crypto2 = require_utils2();
   var { signatureAlgorithmHashFromCertificate } = require_cert_signatures();
-  function saslprep(password) {
-    const nonAsciiSpace = /[\u00A0\u1680\u2000-\u200B\u202F\u205F\u3000]/g;
-    const mappedToNothing = /[\u00AD\u034F\u1806\u180B\u180C\u180D\u200C\u200D\u2060\uFE00-\uFE0F\uFEFF]/g;
-    return password.replace(nonAsciiSpace, " ").replace(mappedToNothing, "").normalize("NFKC");
-  }
-  var DEFAULT_MAX_SCRAM_ITERATIONS = 1e5;
-  function startSession(mechanisms, stream, scramMaxIterations = DEFAULT_MAX_SCRAM_ITERATIONS) {
+  function startSession(mechanisms, stream) {
     const candidates = ["SCRAM-SHA-256"];
     if (stream)
       candidates.unshift("SCRAM-SHA-256-PLUS");
@@ -1332,8 +1380,7 @@ var require_sasl = __commonJS((exports, module) => {
       mechanism,
       clientNonce,
       response: gs2Header + ",,n=*,r=" + clientNonce,
-      message: "SASLInitialResponse",
-      scramMaxIterations
+      message: "SASLInitialResponse"
     };
   }
   async function continueSession(session, password, serverData, stream) {
@@ -1355,10 +1402,6 @@ var require_sasl = __commonJS((exports, module) => {
     } else if (sv.nonce.length === session.clientNonce.length) {
       throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: server nonce is too short");
     }
-    const scramMaxIterations = typeof session.scramMaxIterations === "number" ? session.scramMaxIterations : DEFAULT_MAX_SCRAM_ITERATIONS;
-    if (scramMaxIterations !== 0 && sv.iteration > scramMaxIterations) {
-      throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: iteration count " + sv.iteration + " exceeds scramMaxIterations of " + scramMaxIterations);
-    }
     const clientFirstMessageBare = "n=*,r=" + session.clientNonce;
     const serverFirstMessage = "r=" + sv.nonce + ",s=" + sv.salt + ",i=" + sv.iteration;
     let channelBinding = stream ? "eSws" : "biws";
@@ -1374,7 +1417,7 @@ var require_sasl = __commonJS((exports, module) => {
     const clientFinalMessageWithoutProof = "c=" + channelBinding + ",r=" + sv.nonce;
     const authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
     const saltBytes = Buffer.from(sv.salt, "base64");
-    const saltedPassword = await crypto2.deriveKey(saslprep(password), saltBytes, sv.iteration);
+    const saltedPassword = await crypto2.deriveKey(password, saltBytes, sv.iteration);
     const clientKey = await crypto2.hmacSha256(saltedPassword, "Client Key");
     const storedKey = await crypto2.sha256(clientKey);
     const clientSignature = await crypto2.hmacSha256(storedKey, authMessage);
@@ -1448,11 +1491,7 @@ var require_sasl = __commonJS((exports, module) => {
   }
   function parseServerFinalMessage(serverData) {
     const attrPairs = parseAttributePairs(serverData);
-    const error = attrPairs.get("e");
     const serverSignature = attrPairs.get("v");
-    if (error) {
-      throw new Error(`SASL: SCRAM-SERVER-FINAL-MESSAGE: server returned error: "${error}"`);
-    }
     if (!serverSignature) {
       throw new Error("SASL: SCRAM-SERVER-FINAL-MESSAGE: server signature is missing");
     } else if (!isBase64(serverSignature)) {
@@ -1480,12 +1519,11 @@ var require_sasl = __commonJS((exports, module) => {
   module.exports = {
     startSession,
     continueSession,
-    finalizeSession,
-    DEFAULT_MAX_SCRAM_ITERATIONS
+    finalizeSession
   };
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/type-overrides.js
+// node_modules/pg/lib/type-overrides.js
 var require_type_overrides = __commonJS((exports, module) => {
   var types = require_pg_types();
   function TypeOverrides(userTypes) {
@@ -1517,14 +1555,14 @@ var require_type_overrides = __commonJS((exports, module) => {
   module.exports = TypeOverrides;
 });
 
-// node_modules/.pnpm/pg-connection-string@2.14.0/node_modules/pg-connection-string/index.js
+// node_modules/pg-connection-string/index.js
 var require_pg_connection_string = __commonJS((exports, module) => {
   function parse(str, options = {}) {
     if (str.charAt(0) === "/") {
       const config2 = str.split(" ");
       return { host: config2[0], database: config2[1] };
     }
-    const config = Object.create(null);
+    const config = {};
     let result;
     let dummyHost = false;
     if (/ |%[^a-f0-9]|%[a-f0-9][^a-f0-9]/i.test(str)) {
@@ -1572,9 +1610,6 @@ var require_pg_connection_string = __commonJS((exports, module) => {
     if (config.sslcert || config.sslkey || config.sslrootcert || config.sslmode) {
       config.ssl = {};
     }
-    if (config.sslnegotiation === "direct" && config.ssl === undefined) {
-      config.ssl = true;
-    }
     const fs = config.sslcert || config.sslkey || config.sslrootcert ? __require("fs") : null;
     if (config.sslcert) {
       config.ssl.cert = fs.readFileSync(config.sslcert).toString();
@@ -1646,7 +1681,7 @@ var require_pg_connection_string = __commonJS((exports, module) => {
         c[key] = value;
       }
       return c;
-    }, Object.create(null));
+    }, {});
     return connectionOptions;
   }
   function toClientConfig(config) {
@@ -1673,7 +1708,7 @@ var require_pg_connection_string = __commonJS((exports, module) => {
         }
       }
       return c;
-    }, Object.create(null));
+    }, {});
     return poolConfig;
   }
   function parseIntoClientConfig(str) {
@@ -1698,7 +1733,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   parse.parseIntoClientConfig = parseIntoClientConfig;
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/connection-parameters.js
+// node_modules/pg/lib/connection-parameters.js
 var require_connection_parameters = __commonJS((exports, module) => {
   var dns = __require("dns");
   var defaults = require_defaults();
@@ -1773,13 +1808,6 @@ var require_connection_parameters = __commonJS((exports, module) => {
           enumerable: false
         });
       }
-      this.sslnegotiation = val("sslnegotiation", config, "PGSSLNEGOTIATION");
-      if (this.sslnegotiation !== undefined && this.sslnegotiation !== "postgres" && this.sslnegotiation !== "direct") {
-        throw new Error(`Invalid sslnegotiation value: "${this.sslnegotiation}". Valid values are "postgres" and "direct".`);
-      }
-      if (this.sslnegotiation === "direct" && !this.ssl) {
-        throw new Error("sslnegotiation=direct requires SSL to be enabled");
-      }
       this.client_encoding = val("client_encoding", config);
       this.replication = val("replication", config);
       this.isDomainSocket = !(this.host || "").indexOf("/");
@@ -1818,7 +1846,6 @@ var require_connection_parameters = __commonJS((exports, module) => {
       add(params, ssl, "sslkey");
       add(params, ssl, "sslcert");
       add(params, ssl, "sslrootcert");
-      add(params, this, "sslnegotiation");
       if (this.database) {
         params.push("dbname=" + quoteParamValue(this.database));
       }
@@ -1845,7 +1872,7 @@ var require_connection_parameters = __commonJS((exports, module) => {
   module.exports = ConnectionParameters;
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/result.js
+// node_modules/pg/lib/result.js
 var require_result = __commonJS((exports, module) => {
   var types = require_pg_types();
   var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/;
@@ -1917,7 +1944,7 @@ var require_result = __commonJS((exports, module) => {
       if (this.fields.length) {
         this._parsers = new Array(fieldDescriptions.length);
       }
-      const row = Object.create(null);
+      const row = {};
       for (let i = 0;i < fieldDescriptions.length; i++) {
         const desc = fieldDescriptions[i];
         row[desc.name] = null;
@@ -1933,7 +1960,7 @@ var require_result = __commonJS((exports, module) => {
   module.exports = Result;
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/query.js
+// node_modules/pg/lib/query.js
 var require_query = __commonJS((exports, module) => {
   var { EventEmitter } = __require("events");
   var Result = require_result();
@@ -2102,8 +2129,6 @@ var require_query = __commonJS((exports, module) => {
           valueMapper: utils.prepareValue
         });
       } catch (err) {
-        connection.close({ type: "S", name: this.name });
-        connection.sync();
         this.handleError(err, connection);
         return;
       }
@@ -2121,7 +2146,7 @@ var require_query = __commonJS((exports, module) => {
   module.exports = Query;
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/messages.js
+// node_modules/pg-protocol/dist/messages.js
 var require_messages = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.NoticeMessage = exports.DataRowMessage = exports.CommandCompleteMessage = exports.ReadyForQueryMessage = exports.NotificationResponseMessage = exports.BackendKeyDataMessage = exports.AuthenticationMD5Password = exports.ParameterStatusMessage = exports.ParameterDescriptionMessage = exports.RowDescriptionMessage = exports.Field = exports.CopyResponse = exports.CopyDataMessage = exports.DatabaseError = exports.copyDone = exports.emptyQuery = exports.replicationStart = exports.portalSuspended = exports.noData = exports.closeComplete = exports.bindComplete = exports.parseComplete = undefined;
@@ -2297,7 +2322,7 @@ var require_messages = __commonJS((exports) => {
   exports.NoticeMessage = NoticeMessage;
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/buffer-writer.js
+// node_modules/pg-protocol/dist/buffer-writer.js
 var require_buffer_writer = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.Writer = undefined;
@@ -2351,19 +2376,6 @@ var require_buffer_writer = __commonJS((exports) => {
       this.offset += len;
       return this;
     }
-    addInt32PrefixedString(string) {
-      const len = Buffer.byteLength(string);
-      this.ensure(4 + len);
-      const buffer = this.buffer;
-      let offset = this.offset;
-      buffer[offset++] = len >>> 24 & 255;
-      buffer[offset++] = len >>> 16 & 255;
-      buffer[offset++] = len >>> 8 & 255;
-      buffer[offset++] = len >>> 0 & 255;
-      buffer.write(string, offset, "utf-8");
-      this.offset = offset + len;
-      return this;
-    }
     add(otherBuffer) {
       this.ensure(otherBuffer.length);
       otherBuffer.copy(this.buffer, this.offset);
@@ -2385,15 +2397,11 @@ var require_buffer_writer = __commonJS((exports) => {
       this.buffer = Buffer.allocUnsafe(this.size);
       return result;
     }
-    clear() {
-      this.offset = 5;
-      this.headerPosition = 0;
-    }
   }
   exports.Writer = Writer;
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/serializer.js
+// node_modules/pg-protocol/dist/serializer.js
 var require_serializer = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.serialize = undefined;
@@ -2419,7 +2427,7 @@ var require_serializer = __commonJS((exports) => {
     return writer.addCString(password2).flush(112);
   };
   var sendSASLInitialResponseMessage = function(mechanism, initialResponse) {
-    writer.addCString(mechanism).addInt32PrefixedString(initialResponse);
+    writer.addCString(mechanism).addInt32(Buffer.byteLength(initialResponse)).addString(initialResponse);
     return writer.flush(112);
   };
   var sendSCRAMClientFinalMessage = function(additionalData) {
@@ -2457,7 +2465,8 @@ var require_serializer = __commonJS((exports) => {
         paramWriter.add(mappedVal);
       } else {
         writer.addInt16(0);
-        paramWriter.addInt32PrefixedString(mappedVal);
+        paramWriter.addInt32(Buffer.byteLength(mappedVal));
+        paramWriter.addString(mappedVal);
       }
     }
   };
@@ -2469,13 +2478,7 @@ var require_serializer = __commonJS((exports) => {
     const len = values.length;
     writer.addCString(portal).addCString(statement);
     writer.addInt16(len);
-    try {
-      writeValues(values, config.valueMapper);
-    } catch (err) {
-      writer.clear();
-      paramWriter.clear();
-      throw err;
-    }
+    writeValues(values, config.valueMapper);
     writer.addInt16(len);
     writer.add(paramWriter.flush());
     writer.addInt16(1);
@@ -2561,7 +2564,7 @@ var require_serializer = __commonJS((exports) => {
   exports.serialize = serialize;
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/buffer-reader.js
+// node_modules/pg-protocol/dist/buffer-reader.js
 var require_buffer_reader = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.BufferReader = undefined;
@@ -2604,7 +2607,7 @@ var require_buffer_reader = __commonJS((exports) => {
     cstring() {
       const start = this.offset;
       let end = start;
-      while (this.buffer[end++]) {}
+      while (this.buffer[end++] !== 0) {}
       this.offset = end;
       return this.buffer.toString(this.encoding, start, end - 1);
     }
@@ -2617,7 +2620,7 @@ var require_buffer_reader = __commonJS((exports) => {
   exports.BufferReader = BufferReader;
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/parser.js
+// node_modules/pg-protocol/dist/parser.js
 var require_parser = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.Parser = undefined;
@@ -2922,11 +2925,10 @@ var require_parser = __commonJS((exports) => {
   };
 });
 
-// node_modules/.pnpm/pg-protocol@1.15.0/node_modules/pg-protocol/dist/index.js
+// node_modules/pg-protocol/dist/index.js
 var require_dist = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.DatabaseError = exports.serialize = undefined;
-  exports.parse = parse;
+  exports.DatabaseError = exports.serialize = exports.parse = undefined;
   var messages_1 = require_messages();
   Object.defineProperty(exports, "DatabaseError", { enumerable: true, get: function() {
     return messages_1.DatabaseError;
@@ -2941,15 +2943,16 @@ var require_dist = __commonJS((exports) => {
     stream.on("data", (buffer) => parser.parse(buffer, callback));
     return new Promise((resolve2) => stream.on("end", () => resolve2()));
   }
+  exports.parse = parse;
 });
 
-// node_modules/.pnpm/pg-cloudflare@1.4.0/node_modules/pg-cloudflare/dist/empty.js
+// node_modules/pg-cloudflare/dist/empty.js
 var require_empty = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.default = {};
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/stream.js
+// node_modules/pg/lib/stream.js
 var require_stream = __commonJS((exports, module) => {
   var { getStream, getSecureStream } = getStreamFuncs();
   module.exports = {
@@ -3004,12 +3007,11 @@ var require_stream = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/connection.js
+// node_modules/pg/lib/connection.js
 var require_connection = __commonJS((exports, module) => {
   var EventEmitter = __require("events").EventEmitter;
   var { parse, serialize } = require_dist();
-  var stream = require_stream();
-  var { getStream } = stream;
+  var { getStream, getSecureStream } = require_stream();
   var flushBuffer = serialize.flush();
   var syncBuffer = serialize.sync();
   var endBuffer = serialize.end();
@@ -3026,7 +3028,6 @@ var require_connection = __commonJS((exports, module) => {
       this._keepAliveInitialDelayMillis = config.keepAliveInitialDelayMillis;
       this.parsedStatements = {};
       this.ssl = config.ssl || false;
-      this.sslNegotiation = config.sslNegotiation || "postgres";
       this._ending = false;
       this._emitMessage = false;
       const self = this;
@@ -3060,11 +3061,6 @@ var require_connection = __commonJS((exports, module) => {
       if (!this.ssl) {
         return this.attachListeners(this.stream);
       }
-      if (this.sslNegotiation === "direct") {
-        return this.stream.once("connect", function() {
-          self.upgradeToSSL(host, reportStreamError);
-        });
-      }
       this.stream.once("data", function(buffer) {
         const responseCode = buffer.toString("utf8");
         switch (responseCode) {
@@ -3077,38 +3073,31 @@ var require_connection = __commonJS((exports, module) => {
             self.stream.end();
             return self.emit("error", new Error("There was an error establishing an SSL connection"));
         }
-        self.upgradeToSSL(host, reportStreamError);
-      });
-    }
-    upgradeToSSL(host, reportStreamError) {
-      const self = this;
-      const options = {
-        socket: self.stream
-      };
-      if (self.ssl !== true) {
-        Object.assign(options, self.ssl);
-        if ("key" in self.ssl) {
-          options.key = self.ssl.key;
+        const options = {
+          socket: self.stream
+        };
+        if (self.ssl !== true) {
+          Object.assign(options, self.ssl);
+          if ("key" in self.ssl) {
+            options.key = self.ssl.key;
+          }
         }
-      }
-      if (self.sslNegotiation === "direct") {
-        options.ALPNProtocols = ["postgresql"];
-      }
-      const net = __require("net");
-      if (net.isIP && net.isIP(host) === 0) {
-        options.servername = host;
-      }
-      try {
-        self.stream = stream.getSecureStream(options);
-      } catch (err) {
-        return self.emit("error", err);
-      }
-      self.attachListeners(self.stream);
-      self.stream.on("error", reportStreamError);
-      self.emit("sslconnect");
+        const net = __require("net");
+        if (net.isIP && net.isIP(host) === 0) {
+          options.servername = host;
+        }
+        try {
+          self.stream = getSecureStream(options);
+        } catch (err) {
+          return self.emit("error", err);
+        }
+        self.attachListeners(self.stream);
+        self.stream.on("error", reportStreamError);
+        self.emit("sslconnect");
+      });
     }
-    attachListeners(stream2) {
-      parse(stream2, (msg) => {
+    attachListeners(stream) {
+      parse(stream, (msg) => {
         const eventName = msg.name === "error" ? "errorMessage" : msg.name;
         if (this._emitMessage) {
           this.emit("message", msg);
@@ -3196,7 +3185,7 @@ var require_connection = __commonJS((exports, module) => {
   module.exports = Connection;
 });
 
-// node_modules/.pnpm/split2@4.2.0/node_modules/split2/index.js
+// node_modules/split2/index.js
 var require_split2 = __commonJS((exports, module) => {
   var { Transform } = __require("stream");
   var { StringDecoder } = __require("string_decoder");
@@ -3295,7 +3284,7 @@ var require_split2 = __commonJS((exports, module) => {
   module.exports = split;
 });
 
-// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js
+// node_modules/pgpass/lib/helper.js
 var require_helper = __commonJS((exports, module) => {
   var path = __require("path");
   var Stream = __require("stream").Stream;
@@ -3459,7 +3448,7 @@ var require_helper = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js
+// node_modules/pgpass/lib/index.js
 var require_lib = __commonJS((exports, module) => {
   var path = __require("path");
   var fs = __require("fs");
@@ -3477,7 +3466,7 @@ var require_lib = __commonJS((exports, module) => {
   module.exports.warnTo = helper.warnTo;
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/client.js
+// node_modules/pg/lib/client.js
 var require_client = __commonJS((exports, module) => {
   var EventEmitter = __require("events").EventEmitter;
   var utils = require_utils();
@@ -3494,16 +3483,6 @@ var require_client = __commonJS((exports, module) => {
   var pgPassDeprecationNotice = nodeUtils.deprecate(() => {}, "pgpass support is deprecated and will be removed in pg@9.0. " + "You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this function you can call the pgpass module in your own code.");
   var byoPromiseDeprecationNotice = nodeUtils.deprecate(() => {}, "Passing a custom Promise implementation to the Client/Pool constructor is deprecated and will be removed in pg@9.0.");
   var queryQueueLengthDeprecationNotice = nodeUtils.deprecate(() => {}, "Calling client.query() when the client is already executing a query is deprecated and will be removed in pg@9.0. Use async/await or an external async flow control mechanism instead.");
-  function coerceNumberOrDefault(value, defaultValue) {
-    if (typeof value === "number") {
-      return Number.isFinite(value) ? value : defaultValue;
-    }
-    if (typeof value === "string" && value.trim() !== "") {
-      const n = Number(value);
-      return Number.isFinite(n) ? n : defaultValue;
-    }
-    return defaultValue;
-  }
 
   class Client extends EventEmitter {
     constructor(config) {
@@ -3533,13 +3512,10 @@ var require_client = __commonJS((exports, module) => {
       this._connectionError = false;
       this._queryable = true;
       this._activeQuery = null;
-      this._txStatus = null;
       this.enableChannelBinding = Boolean(c.enableChannelBinding);
-      this.scramMaxIterations = coerceNumberOrDefault(c.scramMaxIterations, sasl.DEFAULT_MAX_SCRAM_ITERATIONS);
       this.connection = c.connection || new Connection({
         stream: c.stream,
         ssl: this.connectionParameters.ssl,
-        sslNegotiation: this.connectionParameters.sslnegotiation,
         keepAlive: c.keepAlive || false,
         keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
         encoding: this.connectionParameters.client_encoding || "utf8"
@@ -3549,7 +3525,6 @@ var require_client = __commonJS((exports, module) => {
       this.processID = null;
       this.secretKey = null;
       this.ssl = this.connectionParameters.ssl || false;
-      this.sslNegotiation = this.connectionParameters.sslnegotiation || "postgres";
       if (this.ssl && this.ssl.key) {
         Object.defineProperty(this.ssl, "key", {
           enumerable: false
@@ -3610,9 +3585,7 @@ var require_client = __commonJS((exports, module) => {
       }
       con.on("connect", function() {
         if (self.ssl) {
-          if (self.sslNegotiation !== "direct") {
-            con.requestSsl();
-          }
+          con.requestSsl();
         } else {
           con.startup(self.getStartupConf());
         }
@@ -3730,7 +3703,7 @@ var require_client = __commonJS((exports, module) => {
     _handleAuthSASL(msg) {
       this._getPassword(() => {
         try {
-          this.saslSession = sasl.startSession(msg.mechanisms, this.enableChannelBinding && this.connection.stream, this.scramMaxIterations);
+          this.saslSession = sasl.startSession(msg.mechanisms, this.enableChannelBinding && this.connection.stream);
           this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response);
         } catch (err) {
           this.connection.emit("error", err);
@@ -3770,7 +3743,6 @@ var require_client = __commonJS((exports, module) => {
       }
       const activeQuery = this._getActiveQuery();
       this._activeQuery = null;
-      this._txStatus = msg?.status ?? null;
       this.readyForQuery = true;
       if (activeQuery) {
         activeQuery.handleReadyForQuery(this.connection);
@@ -3966,10 +3938,13 @@ var require_client = __commonJS((exports, module) => {
     query(config, values, callback) {
       let query;
       let result;
-      if (config == null) {
+      let readTimeout;
+      let readTimeoutTimer;
+      let queryCallback;
+      if (config === null || config === undefined) {
         throw new TypeError("Client was passed a null or undefined query");
-      }
-      if (typeof config.submit === "function") {
+      } else if (typeof config.submit === "function") {
+        readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
         result = query = config;
         if (!query.callback) {
           if (typeof values === "function") {
@@ -3979,6 +3954,7 @@ var require_client = __commonJS((exports, module) => {
           }
         }
       } else {
+        readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
         query = new Query(config, values, callback);
         if (!query.callback) {
           result = new this._Promise((resolve2, reject) => {
@@ -3987,14 +3963,11 @@ var require_client = __commonJS((exports, module) => {
             Error.captureStackTrace(err);
             throw err;
           });
-        } else if (typeof query.callback !== "function") {
-          throw new TypeError("callback is not a function");
         }
       }
-      const readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
       if (readTimeout) {
-        const queryCallback = query.callback || (() => {});
-        const readTimeoutTimer = setTimeout(() => {
+        queryCallback = query.callback || (() => {});
+        readTimeoutTimer = setTimeout(() => {
           const error = new Error("Query read timeout");
           process.nextTick(() => {
             query.handleError(error, this.connection);
@@ -4043,15 +4016,11 @@ var require_client = __commonJS((exports, module) => {
     unref() {
       this.connection.unref();
     }
-    getTransactionStatus() {
-      return this._txStatus;
-    }
     end(cb) {
       this._ending = true;
       if (!this.connection._connecting || this._ended) {
         if (cb) {
           cb();
-          return;
         } else {
           return this._Promise.resolve();
         }
@@ -4078,7 +4047,7 @@ var require_client = __commonJS((exports, module) => {
   module.exports = Client;
 });
 
-// node_modules/.pnpm/pg-pool@3.14.0_pg@8.22.0/node_modules/pg-pool/index.js
+// node_modules/pg-pool/index.js
 var require_pg_pool = __commonJS((exports, module) => {
   var EventEmitter = __require("events").EventEmitter;
   var NOOP = function() {};
@@ -4490,7 +4459,7 @@ var require_pg_pool = __commonJS((exports, module) => {
   module.exports = Pool;
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/native/query.js
+// node_modules/pg/lib/native/query.js
 var require_query2 = __commonJS((exports, module) => {
   var EventEmitter = __require("events").EventEmitter;
   var util = __require("util");
@@ -4626,7 +4595,7 @@ var require_query2 = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/native/client.js
+// node_modules/pg/lib/native/client.js
 var require_client2 = __commonJS((exports, module) => {
   var nodeUtils = __require("util");
   var Native;
@@ -4808,10 +4777,8 @@ var require_client2 = __commonJS((exports, module) => {
   Client.prototype.end = function(cb) {
     const self = this;
     this._ending = true;
-    if (this._connecting && !this._connected) {
-      this.once("connect", () => {
-        this.end(() => {});
-      });
+    if (!this._connected) {
+      this.once("connect", this.end.bind(this, cb));
     }
     let result;
     if (!cb) {
@@ -4872,12 +4839,9 @@ var require_client2 = __commonJS((exports, module) => {
   Client.prototype.isConnected = function() {
     return this._connected;
   };
-  Client.prototype.getTransactionStatus = function() {
-    return this.native.getTransactionStatus();
-  };
 });
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/lib/index.js
+// node_modules/pg/lib/index.js
 var require_lib2 = __commonJS((exports, module) => {
   var Client = require_client();
   var defaults = require_defaults();
@@ -4943,7 +4907,7 @@ var require_lib2 = __commonJS((exports, module) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/shortlinks",
-    version: "0.2.2",
+    version: "0.2.3",
     description: "Shortlink manager for custom domains and click tracking, with local SQLite or self-hosted cloud (/v1 API + bearer key) storage and Cloudflare setup helpers",
     type: "module",
     main: "dist/index.js",
@@ -5664,7 +5628,7 @@ class PgShortlinksStore {
   }
 }
 
-// node_modules/.pnpm/pg@8.22.0/node_modules/pg/esm/index.mjs
+// node_modules/pg/esm/index.mjs
 var import_lib = __toESM(require_lib2(), 1);
 var Client = import_lib.default.Client;
 var Pool = import_lib.default.Pool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Shortlink manager for custom domains and click tracking, with local SQLite or self-hosted cloud (/v1 API + bearer key) storage and Cloudflare setup helpers",
   "type": "module",
   "main": "dist/index.js",