@niledatabase/server 5.0.0-alpha.32 → 5.0.0-alpha.33

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import pg, { PoolConfig, PoolClient } from 'pg';
+import pg, { Pool, PoolConfig, PoolClient } from 'pg';
 
 type LogFunction = (message: string | unknown, meta?: Record<string, unknown>) => void;
 type Loggable = {
@@ -523,6 +523,14 @@ declare class Server {
     tenants: Tenants;
     auth: Auth;
     constructor(config?: NileConfig);
+    /**
+     * Query the database with the current context
+     */
+    query: Pool['query'];
+    /**
+     * Return a db object that can be used to talk to the database
+     * Does not have a context by default
+     */
     get db(): pg.Pool & {
         clearConnections: () => void;
     };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import pg, { PoolConfig, PoolClient } from 'pg';
+import pg, { Pool, PoolConfig, PoolClient } from 'pg';
 
 type LogFunction = (message: string | unknown, meta?: Record<string, unknown>) => void;
 type Loggable = {
@@ -523,6 +523,14 @@ declare class Server {
     tenants: Tenants;
     auth: Auth;
     constructor(config?: NileConfig);
+    /**
+     * Query the database with the current context
+     */
+    query: Pool['query'];
+    /**
+     * Return a db object that can be used to talk to the database
+     * Does not have a context by default
+     */
     get db(): pg.Pool & {
         clearConnections: () => void;
     };

package/dist/index.js

@@ -2116,17 +2116,17 @@ var updateHeaders = (val) => {
 var watchHeaders = (cb) => eventer.subscribe("headers" /* Headers */, cb);
 
 // src/db/PoolProxy.ts
-function createProxyForPool(pool, config) {
-  const { info, error } = config.logger("[pool]");
+function createProxyForPool(pool, config, logger, context) {
+  const { info, error } = logger("[pool]");
   return new Proxy(pool, {
     get(target, property) {
       if (property === "query") {
-        if (!config.db.connectionString) {
-          if (!config.db.user || !config.db.password) {
+        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.db.database) {
+          } else if (!config.database) {
             error(
               "Unable to obtain database name. Is process.env.NILEDB_POSTGRES_URL set?"
             );
@@ -2135,7 +2135,7 @@ function createProxyForPool(pool, config) {
         const caller = target[property];
         return function query(...args) {
           let log = "[QUERY]";
-          const { userId, tenantId } = config.context;
+          const [tenantId, userId] = context;
           if (tenantId) {
             log = `${log}[TENANT:${tenantId}]`;
           }
@@ -2158,39 +2158,44 @@ var NileDatabase = class {
   tenantId;
   userId;
   id;
-  config;
+  logger;
   timer;
-  constructor(config, id) {
-    const { warn: warn2, info, debug } = config.logger("[NileInstance]");
+  config;
+  constructor(config, logger, id) {
+    this.logger = logger("[NileInstance]");
     this.id = id;
     const poolConfig = {
       min: 0,
       max: 10,
       idleTimeoutMillis: 3e4,
-      ...config.db
+      ...config
     };
     const { afterCreate, ...remaining } = poolConfig;
-    config.db = poolConfig;
-    this.config = config;
-    const cloned = { ...this.config.db };
+    this.config = remaining;
+    const cloned = { ...config };
     cloned.password = "***";
-    debug(`Connection pool config ${JSON.stringify(cloned)}`);
-    this.pool = createProxyForPool(new pg__default.default.Pool(remaining), this.config);
+    this.logger.debug(`Connection pool config ${JSON.stringify(cloned)}`);
+    this.pool = createProxyForPool(
+      new pg__default.default.Pool(remaining),
+      this.config,
+      logger,
+      id === "base" ? [] : id.split(":")
+    );
     if (typeof afterCreate === "function") {
-      warn2(
+      this.logger.warn(
         "Providing an pool configuration will stop automatic tenant context setting."
       );
     }
     this.startTimeout();
     this.pool.on("connect", async (client) => {
-      debug(`pool connected ${this.id}`);
+      this.logger.debug(`pool connected ${this.id}`);
       this.startTimeout();
       const afterCreate2 = makeAfterCreate(
-        config,
-        `${this.id}-${this.timer}`
+        logger,
+        `${this.id}|${this.timer}`
       );
       afterCreate2(client, (err) => {
-        const { error } = config.logger("[after create callback]");
+        const { error } = logger("[after create callback]");
         if (err) {
           clearTimeout(this.timer);
           error("after create failed", {
@@ -2203,7 +2208,7 @@ var NileDatabase = class {
     });
     this.pool.on("error", (err) => {
       clearTimeout(this.timer);
-      info(`pool ${this.id} failed`, {
+      this.logger.info(`pool ${this.id} failed`, {
         message: err.message,
         stack: err.stack
       });
@@ -2213,27 +2218,27 @@ var NileDatabase = class {
       if (destroy) {
         clearTimeout(this.timer);
         evictPool(this.id);
-        debug(`destroying pool ${this.id}`);
+        this.logger.debug(`destroying pool ${this.id}`);
       }
     });
   }
   startTimeout() {
-    const { debug } = this.config.logger("[NileInstance]");
+    const { debug } = this.logger;
     if (this.timer) {
       clearTimeout(this.timer);
     }
     this.timer = setTimeout(() => {
       debug(
-        `Pool reached idleTimeoutMillis. ${this.id} evicted after ${Number(this.config.db.idleTimeoutMillis) ?? 3e4}ms`
+        `Pool reached idleTimeoutMillis. ${this.id} evicted after ${Number(this.config.idleTimeoutMillis) ?? 3e4}ms`
       );
       this.pool.end(() => {
         clearTimeout(this.timer);
         evictPool(this.id);
       });
-    }, Number(this.config.db.idleTimeoutMillis) ?? 3e4);
+    }, Number(this.config.idleTimeoutMillis) ?? 3e4);
   }
   shutdown() {
-    const { debug } = this.config.logger("[NileInstance]");
+    const { debug } = this.logger;
     debug(`attempting to shut down ${this.id}`);
     clearTimeout(this.timer);
     this.pool.end(() => {
@@ -2242,8 +2247,8 @@ var NileDatabase = class {
   }
 };
 var NileInstance_default = NileDatabase;
-function makeAfterCreate(config, id) {
-  const { error, warn: warn2, debug } = config.logger("[afterCreate]");
+function makeAfterCreate(logger, id) {
+  const { error, warn: warn2, debug } = logger("[afterCreate]");
   return (conn, done) => {
     conn.on("error", function errorHandler(e) {
       error(`Connection ${id} was terminated by server`, {
@@ -2252,8 +2257,9 @@ function makeAfterCreate(config, id) {
       });
       done(e, conn);
     });
-    const { tenantId, userId } = ctx.getLastUsed();
-    if (tenantId) {
+    const [context] = id.split("|");
+    const [tenantId, userId] = context.split(":");
+    if (tenantId !== "base") {
       const query = [`SET nile.tenant_id = '${tenantId}'`];
       if (userId) {
         if (!tenantId) {
@@ -2318,9 +2324,9 @@ var DBManager = class {
       warn2(`missed eviction of ${id}`);
     }
   };
-  getConnection = (config) => {
+  getConnection = (config, noContext = false) => {
     const { info } = Logger(config)("[DBManager]");
-    const { tenantId, userId } = ctx.getLastUsed();
+    const { tenantId, userId } = noContext ? {} : ctx.getLastUsed();
     const id = this.makeId(tenantId, userId);
     const existing = this.connections.get(id);
     info(`# of instances: ${this.connections.size}`);
@@ -2329,7 +2335,7 @@ var DBManager = class {
       existing.startTimeout();
       return existing.pool;
     }
-    const newOne = new NileInstance_default(config, id);
+    const newOne = new NileInstance_default(config.db, config.logger, id);
     this.connections.set(id, newOne);
     info(`created new ${id}`);
     info(`# of instances: ${this.connections.size}`);
@@ -3477,9 +3483,21 @@ var Server = class {
       }
     }
   }
-  get db() {
+  /**
+   * Query the database with the current context
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  query = (queryStream, values) => {
     this.#config.context = { ...this.getContext() };
     const pool = this.#manager.getConnection(this.#config);
+    return pool.query(queryStream, values);
+  };
+  /**
+   * Return a db object that can be used to talk to the database
+   * Does not have a context by default
+   */
+  get db() {
+    const pool = this.#manager.getConnection(this.#config, true);
     return Object.assign(pool, {
       clearConnections: () => {
         this.#manager.clear(this.#config);