@niledatabase/server 5.0.0-alpha.5 → 5.0.0-alpha.6

package/dist/index.mjs

@@ -25,6 +25,12 @@ var LoginUserResponseTokenTypeEnum = {
   IdToken: "ID_TOKEN"
 };
 
+// src/utils/constants.ts
+var TENANT_COOKIE = "nile.tenant-id";
+var USER_COOKIE = "nile.user-id";
+var HEADER_ORIGIN = "nile-origin";
+var HEADER_SECURE_COOKIES = "nile-secure-cookies";
+
 // src/api/utils/routes/index.ts
 var NILEDB_API_URL = process.env.NILEDB_API_URL;
 var DEFAULT_PREFIX = "/api";
@@ -114,74 +120,9 @@ function isUUID(value) {
   return regex.test(value);
 }
 
-// src/utils/Logger.ts
-var red = "\x1B[31m";
-var yellow = "\x1B[38;2;255;255;0m";
-var purple = "\x1B[38;2;200;160;255m";
-var orange = "\x1B[38;2;255;165;0m";
-var reset = "\x1B[0m";
-var baseLogger = (config, ...params) => ({
-  info(message, meta) {
-    if (config?.debug) {
-      console.info(
-        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
-          ""
-        )}${reset} ${message}`,
-        meta ? `${JSON.stringify(meta)}` : ""
-      );
-    }
-  },
-  debug(message, meta) {
-    if (config?.debug) {
-      console.debug(
-        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
-          ""
-        )}${reset} ${message}`,
-        meta ? `${JSON.stringify(meta)}` : ""
-      );
-    }
-  },
-  warn(message, meta) {
-    if (config?.debug) {
-      console.warn(
-        `${orange}[niledb]${reset}${yellow}[WARN]${reset}${params.join(
-          ""
-        )}${reset} ${message}`,
-        meta ? JSON.stringify(meta) : ""
-      );
-    }
-  },
-  error(message, meta) {
-    console.error(
-      `${orange}[niledb]${reset}${red}[ERROR]${reset}${params.join(
-        ""
-      )}${red} ${message}`,
-      meta ? meta : "",
-      `${reset}`
-    );
-  }
-});
-function Logger(config, ...params) {
-  const base = baseLogger(config, params);
-  const info = config?.logger?.info ?? base.info;
-  const debug = config?.logger?.debug ?? base.debug;
-  const warn = config?.logger?.warn ?? base.warn;
-  const error = config?.logger?.error ?? base.error;
-  return { info, warn, error, debug };
-}
-function matchesLog(configRoutes, request2) {
-  return urlMatches(request2.url, configRoutes.LOG);
-}
-
-// src/utils/constants.ts
-var TENANT_COOKIE = "nile.tenant-id";
-var USER_COOKIE = "nile.user-id";
-var HEADER_ORIGIN = "nile-origin";
-var HEADER_SECURE_COOKIES = "nile-secure-cookies";
-
 // src/api/utils/request.ts
 async function request(url, _init, config) {
-  const { debug, info, error } = Logger(config, "[REQUEST]");
+  const { debug, info, error } = config.logger("[REQUEST]");
   const { request: request2, ...init } = _init;
   const requestUrl = new URL(request2.url);
   const updatedHeaders = new Headers({});
@@ -279,7 +220,7 @@ async function request(url, _init, config) {
 
 // src/api/utils/auth.ts
 async function auth(req, config) {
-  const { info, error } = Logger(config, "[nileauth]");
+  const { info, error } = config.logger("[nileauth]");
   info("checking auth");
   const sessionUrl = `${config.apiUrl}/auth/session`;
   info(`using session ${sessionUrl}`);
@@ -422,10 +363,7 @@ async function PUT2(config, init) {
 // src/api/routes/users/index.ts
 var key2 = "USERS";
 async function route2(request2, config) {
-  const { info } = Logger(
-    { ...config, debug: config.debug },
-    `[ROUTES][${key2}]`
-  );
+  const { info } = config.logger(`[ROUTES][${key2}]`);
   switch (request2.method) {
     case "GET":
       return await GET2(config, { request: request2 }, info);
@@ -466,10 +404,7 @@ async function POST2(config, init) {
 // src/api/routes/tenants/[tenantId]/users/index.ts
 var key3 = "TENANT_USERS";
 async function route3(request2, config) {
-  const { info } = Logger(
-    { ...config, debug: config.debug },
-    `[ROUTES][${key3}]`
-  );
+  const { info } = config.logger(`[ROUTES][${key3}]`);
   const yurl = new URL(request2.url);
   const [, tenantId] = yurl.pathname.split("/").reverse();
   if (!tenantId) {
@@ -501,8 +436,8 @@ async function fetchTenantUsers(config, method, payload) {
       'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
     );
   }
-  if (!isUUID(config.tenantId) && config.logger?.warn) {
-    config.logger?.warn(
+  if (!isUUID(config.tenantId)) {
+    config.logger("fetchTenantUsers").warn(
       "nile.tenantId is not a valid UUID. This may lead to unexpected behavior in your application."
     );
   }
@@ -592,8 +527,8 @@ async function fetchInvite(config, method, body) {
       'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
     );
   }
-  if (!isUUID(config.tenantId) && config.logger?.warn) {
-    config.logger?.warn(
+  if (!isUUID(config.tenantId)) {
+    config.logger("fetchInvite").warn(
       "nile.tenantId is not a valid UUID. This may lead to unexpected behavior in your application."
     );
   }
@@ -647,8 +582,8 @@ async function fetchInvites(config) {
       'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
     );
   }
-  if (!isUUID(config.tenantId) && config.logger?.warn) {
-    config.logger?.warn(
+  if (!isUUID(config.tenantId)) {
+    config.logger("fetchInvites").warn(
       "nile.tenantId is not a valid UUID. This may lead to unexpected behavior in your application."
     );
   }
@@ -716,10 +651,7 @@ async function POST4(config, init) {
 // src/api/routes/tenants/index.ts
 var key6 = "TENANTS";
 async function route6(request2, config) {
-  const { info } = Logger(
-    { ...config, debug: config.debug },
-    `[ROUTES][${key6}]`
-  );
+  const { info } = config.logger(`[ROUTES][${key6}]`);
   const session = await auth(request2, config);
   if (!session) {
     info("401");
@@ -763,8 +695,8 @@ async function fetchTenant(config, method, body) {
       'Unable to fetch tenant, the tenantId context is missing. Call nile.setContext({ tenantId }), set nile.tenantId = "tenantId", or add it to the function call'
     );
   }
-  if (!isUUID(config.tenantId) && config.logger?.warn) {
-    config.logger?.warn(
+  if (!isUUID(config.tenantId)) {
+    config.logger("fetch tenant").warn(
       "nile.tenantId is not a valid UUID. This may lead to unexpected behavior in your application."
     );
   }
@@ -781,21 +713,17 @@ async function fetchTenant(config, method, body) {
   return await config.handlers[m](req);
 }
 async function fetchTenantsByUser(config) {
-  if (config.logger?.warn) {
-    if (!config.userId) {
-      config.logger?.warn(
-        "nile.userId is not set. The call will still work for the API, but the database context is not set properly and may lead to unexpected behavior in your application."
-      );
-    } else if (!isUUID(config.userId)) {
-      config.logger?.warn(
-        "nile.userId is not a valid UUID. This may lead to unexpected behavior in your application."
-      );
-    }
+  const { warn } = config.logger("fetchTenantsByUser");
+  if (!config.userId) {
+    warn(
+      "nile.userId is not set. The call will still work for the API, but the database context is not set properly and may lead to unexpected behavior in your application."
+    );
+  } else if (!isUUID(config.userId)) {
+    warn(
+      "nile.userId is not a valid UUID. This may lead to unexpected behavior in your application."
+    );
   }
-  const clientUrl = `${config.serverOrigin}${config.routePrefix}${"/users/{userId}/tenants" /* USER_TENANTS */.replace(
-    "{userId}",
-    config.userId ?? "WARN_NOT_SET"
-  )}`;
+  const clientUrl = `${config.serverOrigin}${config.routePrefix}${"/tenants" /* TENANTS */}`;
   const req = new Request(clientUrl, { headers: config.headers });
   return await config.handlers.GET(req);
 }
@@ -903,10 +831,7 @@ async function fetchCsrf(config) {
 // src/api/routes/auth/callback.ts
 var key8 = "CALLBACK";
 async function route11(req, config) {
-  const { error } = Logger(
-    { ...config, debug: config.debug },
-    `[ROUTES][${key8}]`
-  );
+  const { error } = config.logger(`[ROUTES][${key8}]`);
   const [provider] = new URL(req.url).pathname.split("/").reverse();
   try {
     const passThroughUrl = new URL(req.url);
@@ -1097,7 +1022,7 @@ async function fetchVerifyEmail(config, method, body) {
 
 // src/api/handlers/GET.ts
 function GETTER(configRoutes, config) {
-  const { info, warn } = Logger(config, "[GET MATCHER]");
+  const { info, warn } = config.logger("[GET MATCHER]");
   return async function GET7(req) {
     if (matches(configRoutes, req)) {
       info("matches me");
@@ -1168,6 +1093,68 @@ function GETTER(configRoutes, config) {
   };
 }
 
+// src/utils/Logger.ts
+var red = "\x1B[31m";
+var yellow = "\x1B[38;2;255;255;0m";
+var purple = "\x1B[38;2;200;160;255m";
+var orange = "\x1B[38;2;255;165;0m";
+var reset = "\x1B[0m";
+var baseLogger = (config, ...params) => ({
+  info(message, meta) {
+    if (config?.debug) {
+      console.info(
+        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? `${JSON.stringify(meta)}` : ""
+      );
+    }
+  },
+  debug(message, meta) {
+    if (config?.debug) {
+      console.debug(
+        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? `${JSON.stringify(meta)}` : ""
+      );
+    }
+  },
+  warn(message, meta) {
+    if (config?.debug) {
+      console.warn(
+        `${orange}[niledb]${reset}${yellow}[WARN]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? JSON.stringify(meta) : ""
+      );
+    }
+  },
+  error(message, meta) {
+    console.error(
+      `${orange}[niledb]${reset}${red}[ERROR]${reset}${params.join(
+        ""
+      )}${red} ${message}`,
+      meta ? meta : "",
+      `${reset}`
+    );
+  }
+});
+function Logger(config) {
+  return (prefixes) => {
+    const { info, debug, warn, error } = config && typeof config?.logger === "function" ? config.logger(prefixes) : baseLogger(config, prefixes);
+    return {
+      info,
+      debug,
+      warn,
+      error
+    };
+  };
+}
+function matchesLog(configRoutes, request2) {
+  return urlMatches(request2.url, configRoutes.LOG);
+}
+
 // src/api/routes/signup/POST.ts
 async function POST5(config, init) {
   init.body = init.request.body;
@@ -1209,7 +1196,7 @@ async function fetchSignUp(config, payload) {
 
 // src/api/handlers/POST.ts
 function POSTER(configRoutes, config) {
-  const { info, warn, error } = Logger(config, "[POST MATCHER]");
+  const { info, warn, error } = config.logger("[POST MATCHER]");
   return async function POST6(req) {
     if (matchesLog(configRoutes, req)) {
       try {
@@ -1302,10 +1289,7 @@ async function PUT5(config, init) {
 // src/api/routes/tenants/[tenantId]/users/[userId]/index.ts
 var key15 = "TENANT_USER";
 async function route18(request2, config) {
-  const { info } = Logger(
-    { ...config, debug: config.debug },
-    `[ROUTES][${key15}]`
-  );
+  const { info } = config.logger(`[ROUTES][${key15}]`);
   const session = await auth(request2, config);
   if (!session) {
     info("401");
@@ -1388,7 +1372,7 @@ function matches19(configRoutes, request2) {
 
 // src/api/handlers/DELETE.ts
 function DELETER(configRoutes, config) {
-  const { info, warn } = Logger(config, "[DELETE MATCHER]");
+  const { info, warn } = config.logger("[DELETE MATCHER]");
   return async function DELETE5(req) {
     if (matches19(configRoutes, req)) {
       info("matches tenant invite id");
@@ -1417,7 +1401,7 @@ function DELETER(configRoutes, config) {
 
 // src/api/handlers/PUT.ts
 function PUTER(configRoutes, config) {
-  const { info, warn } = Logger(config, "[PUT MATCHER]");
+  const { info, warn } = config.logger("[PUT MATCHER]");
   return async function PUT6(req) {
     if (matches4(configRoutes, req)) {
       info("matches tenant invite");
@@ -1497,14 +1481,14 @@ var getSecureCookies = (cfg) => {
 var getUsername = (cfg) => {
   const { config } = cfg;
   const logger = config.logger;
-  const { info } = Logger(config, "[username]");
+  const { info } = logger();
   if (config?.user) {
-    logger && info(`${logger}[config] ${config.user}`);
+    info(`[config] ${config.user}`);
     return String(config?.user);
   }
   const user = stringCheck(process.env.NILEDB_USER);
   if (user) {
-    logger && info(`${logger}[NILEDB_USER] ${user}`);
+    info(`[NILEDB_USER] ${user}`);
     return user;
   }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
@@ -1525,14 +1509,13 @@ var getPassword = (cfg) => {
   const { config } = cfg;
   const logger = config.logger;
   const log = logProtector(logger);
-  const { info } = Logger(config, "[password]");
   if (stringCheck(config?.password)) {
-    log && info(`${logger}[config] ***`);
+    log && log("[config]").info("***");
     return String(config?.password);
   }
   const pass = stringCheck(process.env.NILEDB_PASSWORD);
   if (pass) {
-    logger && info(`${logger}[NILEDB_PASSWORD] ***`);
+    logger("[NILEDB_PASSWORD]").info("***");
     return pass;
   }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
@@ -1551,15 +1534,14 @@ var getPassword = (cfg) => {
 };
 var getDatabaseName = (cfg) => {
   const { config } = cfg;
-  const logger = config.logger;
-  const { info } = Logger(config, "[databaseName]");
+  const { info } = config.logger("[databaseName]");
   if (stringCheck(config?.databaseName)) {
-    logger && info(`${logger}[config] ${config?.databaseName}`);
+    info(`[config] ${config?.databaseName}`);
     return String(config?.databaseName);
   }
   const name = stringCheck(process.env.NILEDB_NAME);
   if (name) {
-    logger && info(`${logger}[NILEDB_NAME] ${name}`);
+    info(`[NILEDB_NAME] ${name}`);
     return name;
   }
   if (process.env.NILEDB_POSTGRES_URL) {
@@ -1575,14 +1557,13 @@ var getDatabaseName = (cfg) => {
 };
 var getTenantId = (cfg) => {
   const { config } = cfg;
-  const logger = config.logger;
-  const { info } = Logger(config, "[tenantId]");
+  const { info } = config.logger("[tenantId]");
   if (stringCheck(config?.tenantId)) {
-    logger && info(`${logger}[config] ${config?.tenantId}`);
+    info(`[config] ${config?.tenantId}`);
     return String(config?.tenantId);
   }
   if (stringCheck(process.env.NILEDB_TENANT)) {
-    logger && info(`${logger}[NILEDB_TENANT] ${process.env.NILEDB_TENANT}`);
+    info(`[NILEDB_TENANT] ${process.env.NILEDB_TENANT}`);
     return String(process.env.NILEDB_TENANT);
   }
   return null;
@@ -1590,37 +1571,37 @@ var getTenantId = (cfg) => {
 function getDbHost(cfg) {
   const { config } = cfg;
   const logger = config.logger;
-  const { info } = Logger(config, "[db.host]");
+  const { info } = logger("[db.host]");
   if (stringCheck(config?.db && config.db.host)) {
-    logger && info(`${logger}[config] ${config?.db?.host}`);
+    info(`[config] ${config?.db?.host}`);
     return String(config?.db?.host);
   }
   if (stringCheck(process.env.NILEDB_HOST)) {
-    logger && info(`${logger}[NILEDB_HOST] ${process.env.NILEDB_HOST}`);
+    info(`[NILEDB_HOST] ${process.env.NILEDB_HOST}`);
     return process.env.NILEDB_HOST;
   }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
   if (pg2) {
     try {
       const pgUrl = new URL(pg2);
-      logger && info(`${logger}[NILEDB_POSTGRES_URL] ${pgUrl.hostname}`);
+      info(`[NILEDB_POSTGRES_URL] ${pgUrl.hostname}`);
       return pgUrl.hostname;
     } catch (e) {
     }
   }
-  logger && info(`${logger}[default] db.thenile.dev`);
+  info("[default] db.thenile.dev");
   return "db.thenile.dev";
 }
 function getDbPort(cfg) {
   const { config } = cfg;
   const logger = config.logger;
-  const { info } = Logger(config, "[db.port]");
+  const { info } = logger("[db.port]");
   if (config?.db?.port && config.db.port != null) {
-    logger && info(`${logger}[config] ${config?.db.port}`);
+    info(`[config] ${config?.db.port}`);
     return Number(config.db?.port);
   }
   if (stringCheck(process.env.NILEDB_PORT)) {
-    logger && info(`${logger}[NILEDB_PORT] ${process.env.NILEDB_PORT}`);
+    info(`[NILEDB_PORT] ${process.env.NILEDB_PORT}`);
     return Number(process.env.NILEDB_PORT);
   }
   const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
@@ -1633,7 +1614,7 @@ function getDbPort(cfg) {
     } catch (e) {
     }
   }
-  logger && info(`${logger}[default] 5432`);
+  info("[default] 5432");
   return 5432;
 }
 var logProtector = (logger) => {
@@ -1686,7 +1667,6 @@ var Config = class {
    */
   routePrefix;
   db;
-  // api: ApiConfig;
   constructor(config) {
     this.routePrefix = config?.routePrefix ?? "/api";
     this.debug = config?.debug;
@@ -1694,7 +1674,7 @@ var Config = class {
     this.extensions = config?.extensions;
     this.extensionCtx = config?.extensionCtx;
     this.serverOrigin = config?.origin ?? "http://localhost:3000";
-    this.logger = config?.logger ?? Logger(this);
+    this.logger = Logger(config);
     const envVarConfig = {
       config: { ...config, logger: this.logger }
     };
@@ -1815,7 +1795,7 @@ var watchHeaders = (cb) => eventer.subscribe("headers" /* Headers */, cb);
 
 // src/db/PoolProxy.ts
 function createProxyForPool(pool, config) {
-  const { info, error } = Logger(config, "[pool]");
+  const { info, error } = config.logger("[pool]");
   return new Proxy(pool, {
     get(target, property) {
       if (property === "query") {
@@ -1851,7 +1831,7 @@ var NileDatabase = class {
   config;
   timer;
   constructor(config, id) {
-    const { warn, info, debug } = Logger(config, "[NileInstance]");
+    const { warn, info, debug } = config.logger("[NileInstance]");
     this.id = id;
     const poolConfig = {
       min: 0,
@@ -1880,7 +1860,7 @@ var NileDatabase = class {
         `${this.id}-${this.timer}`
       );
       afterCreate2(client, (err) => {
-        const { error } = Logger(config, "[after create callback]");
+        const { error } = config.logger("[after create callback]");
         if (err) {
           clearTimeout(this.timer);
           error("after create failed", {
@@ -1908,7 +1888,7 @@ var NileDatabase = class {
     });
   }
   startTimeout() {
-    const { debug } = Logger(this.config, "[NileInstance]");
+    const { debug } = this.config.logger("[NileInstance]");
     if (this.timer) {
       clearTimeout(this.timer);
     }
@@ -1923,7 +1903,7 @@ var NileDatabase = class {
     }, Number(this.config.db.idleTimeoutMillis) ?? 3e4);
   }
   shutdown() {
-    const { debug } = Logger(this.config, "[NileInstance]");
+    const { debug } = this.config.logger("[NileInstance]");
     debug(`attempting to shut down ${this.id}`);
     clearTimeout(this.timer);
     this.pool.end(() => {
@@ -1933,7 +1913,7 @@ var NileDatabase = class {
 };
 var NileInstance_default = NileDatabase;
 function makeAfterCreate(config, id) {
-  const { error, warn, debug } = Logger(config, "[afterCreate]");
+  const { error, warn, debug } = config.logger("[afterCreate]");
   return (conn, done) => {
     conn.on("error", function errorHandler(e) {
       error(`Connection ${id} was terminated by server`, {
@@ -1997,7 +1977,7 @@ var DBManager = class {
     watchEvictPool(this.poolWatcherFn);
   }
   poolWatcher = (config) => (id) => {
-    const { info, warn } = Logger(config, "[DBManager]");
+    const { info, warn } = Logger(config)("[DBManager]");
     if (id && this.connections.has(id)) {
       info(`Removing ${id} from db connection pool.`);
       const connection = this.connections.get(id);
@@ -2008,7 +1988,7 @@ var DBManager = class {
     }
   };
   getConnection = (config) => {
-    const { info } = Logger(config, "[DBManager]");
+    const { info } = Logger(config)("[DBManager]");
     const id = this.makeId(config.tenantId, config.userId);
     const existing = this.connections.get(id);
     info(`# of instances: ${this.connections.size}`);
@@ -2027,7 +2007,7 @@ var DBManager = class {
     return newOne.pool;
   };
   clear = (config) => {
-    const { info } = Logger(config, "[DBManager]");
+    const { info } = Logger(config)("[DBManager]");
     info(`Clearing all connections ${this.connections.size}`);
     this.cleared = true;
     this.connections.forEach((connection) => {
@@ -2043,7 +2023,7 @@ var Auth = class {
   #config;
   constructor(config) {
     this.#config = config;
-    this.#logger = Logger(config, "[auth]");
+    this.#logger = config.logger("[auth]");
   }
   async getSession(rawResponse = false) {
     const res = await fetchSession(this.#config);
@@ -2493,7 +2473,7 @@ var Users = class {
   #logger;
   constructor(config) {
     this.#config = config;
-    this.#logger = Logger(config, "[me]");
+    this.#logger = config.logger("[me]");
   }
   async updateSelf(req, rawResponse) {
     const res = await fetchMe(this.#config, "PUT", JSON.stringify(req));
@@ -2585,10 +2565,8 @@ function defaultCallbackUrl2(config) {
 
 // src/tenants/index.ts
 var Tenants = class {
-  #logger;
   #config;
   constructor(config) {
-    this.#logger = Logger(config, "[tenants]");
     this.#config = config;
   }
   async create(req, rawResponse) {
@@ -2871,6 +2849,7 @@ function updateConfig(response, config) {
 // src/api/utils/extensions.ts
 function bindHandleOnRequest(instance) {
   return async function handleOnRequest(config, _init, params) {
+    const { debug } = config.logger("[EXTENSIONS]");
     if (config.extensions) {
       for (const create2 of config.extensions) {
         if (typeof create2 !== "function") {
@@ -2884,13 +2863,11 @@ function bindHandleOnRequest(instance) {
             const cookie = modHeaders.get("cookie");
             if (cookie) {
               params.headers.set("cookie", cookie);
-              config.logger.debug(
-                `extension ${ext.id ?? create2.name} modified cookie`
-              );
+              debug(`${ext.id ?? create2.name} modified cookie`);
             }
           }
         }
-        config.logger.debug(`extension ${ext.id ?? create2.name} ran onRequest`);
+        debug(`${ext.id ?? create2.name} ran onRequest`);
       }
     }
   };
@@ -3013,7 +2990,7 @@ var Server = class {
         return;
       }
     }
-    const { warn } = Logger(this.#config, "[API]");
+    const { warn } = Logger(this.#config)("[API]");
     if (warn) {
       warn(
         "Set context expects a Request, Header instance or an object of Record<string, string>"