@niledatabase/server 5.3.1 → 5.3.2-alpha.0

package/dist/index.js

@@ -753,27 +753,20 @@ async function GET(url, init, config) {
 
 // src/utils/fetch.ts
 function getTokenFromCookie(headers, cookieKey) {
-  const cookie = headers.get("cookie")?.split("; ");
-  const _cookies = {};
-  if (cookie) {
-    for (const parts of cookie) {
-      const cookieParts = parts.split("=");
-      const _cookie = cookieParts.slice(1).join("=");
-      const name = cookieParts[0];
-      _cookies[name] = _cookie;
-    }
+  const cookieHeader = headers.get("cookie");
+  if (!cookieHeader) {
+    return null;
   }
-  if (cookie) {
-    for (const parts of cookie) {
-      const cookieParts = parts.split("=");
-      const _cookie = cookieParts.slice(1).join("=");
-      const name = cookieParts[0];
-      _cookies[name] = _cookie;
+  const cookies = cookieHeader.split("; ");
+  for (const parts of cookies) {
+    const cookieParts = parts.split("=");
+    const name = cookieParts[0];
+    const value = cookieParts.slice(1).join("=");
+    if (name === cookieKey) {
+      return value;
     }
   }
-  {
-    return _cookies[cookieKey];
-  }
+  return null;
 }
 function getTenantFromHttp(headers, context) {
   const cookieTenant = getTokenFromCookie(headers, TENANT_COOKIE);
@@ -2268,43 +2261,45 @@ var updateHeaders = (val) => {
   eventer.publish("headers" /* Headers */, val);
 };
 var watchHeaders = (cb) => eventer.subscribe("headers" /* Headers */, cb);
-
-// src/db/PoolProxy.ts
-function createProxyForPool(pool, config, logger, context) {
-  const { info, error } = logger("[pool]");
-  return new Proxy(pool, {
-    get(target, property) {
-      if (property === "query") {
-        if (!config.connectionString) {
-          if (!config.user || !config.password) {
-            error(
-              "Cannot connect to the database. User and/or password are missing. Generate them at https://console.thenile.dev"
-            );
-          } else if (!config.database) {
-            error(
-              "Unable to obtain database name. Is process.env.NILEDB_POSTGRES_URL set?"
-            );
-          }
-        }
-        const caller = target[property];
-        return function query(...args) {
-          let log = "[QUERY]";
-          const [tenantId, userId] = context;
-          if (tenantId) {
-            log = `${log}[TENANT:${tenantId}]`;
-          }
-          if (userId) {
-            log = `${log}[USER:${userId}]`;
-          }
-          info(log, ...args);
-          const called = caller.apply(this, args);
-          return called;
-        };
+var PoolWithLogger = class extends pg__default.default.Pool {
+  nileConfig;
+  logger;
+  context;
+  info;
+  error;
+  constructor(config, logger, context) {
+    super(config);
+    this.nileConfig = config;
+    this.logger = logger;
+    this.context = context;
+    const { info, error } = this.logger("[pool]");
+    this.info = info;
+    this.error = error;
+  }
+  query(...args) {
+    if (!this.nileConfig.connectionString) {
+      if (!this.nileConfig.user || !this.nileConfig.password) {
+        this.error(
+          "Cannot connect to the database. User and/or password are missing. Generate them at https://console.thenile.dev"
+        );
+      } else if (!this.nileConfig.database) {
+        this.error(
+          "Unable to obtain database name. Is process.env.NILEDB_POSTGRES_URL set?"
+        );
       }
-      return target[property];
     }
-  });
-}
+    let log = "[QUERY]";
+    const [tenantId, userId] = this.context;
+    if (tenantId) {
+      log = `${log}[TENANT:${tenantId}]`;
+    }
+    if (userId) {
+      log = `${log}[USER:${userId}]`;
+    }
+    this.info(log, ...args);
+    return super.query(...args);
+  }
+};
 
 // src/db/NileInstance.ts
 var NileDatabase = class {
@@ -2329,8 +2324,7 @@ var NileDatabase = class {
     const cloned = { ...config };
     cloned.password = "***";
     this.logger.debug(`Connection pool config ${JSON.stringify(cloned)}`);
-    this.pool = createProxyForPool(
-      new pg__default.default.Pool(remaining),
+    this.pool = new PoolWithLogger(
       this.config,
       logger,
       id === "base" ? [] : id.split(":")