@niledatabase/server 3.0.0-alpha.50 → 3.0.0-alpha.52

package/dist/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var jose = require('jose');
 require('dotenv/config');
 var pg = require('pg');
+var jose = require('jose');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -62,62 +62,103 @@ function Logger(config, ...params) {
   return { info, warn, error, debug };
 }
 
-// src/utils/ResponseError.ts
-var ResponseError = class {
-  response;
-  constructor(body, init) {
-    this.response = new Response(body, init);
-  }
-};
+// src/utils/constants.ts
+var X_NILE_TENANT = "nile.tenant_id";
+var X_NILE_USER_ID = "nile.user_id";
+var X_NILE_ORIGIN = "nile.origin";
+var X_NILE_SECURECOOKIES = "nile.secure_cookies";
 
-// src/utils/Event/index.ts
-var Eventer = class {
-  events = {};
-  // Publish event and notify all subscribers
-  publish(eventName, value) {
-    const callbackList = this.events[eventName];
-    if (callbackList) {
-      for (const callback of callbackList) {
-        callback(value);
-      }
-    }
+// src/api/utils/request.ts
+async function request(url, _init, config) {
+  const { info, error } = Logger(config, "[REQUEST]");
+  const { request: request2, ...init } = _init;
+  const requestUrl = new URL(request2.url);
+  const updatedHeaders = new Headers({});
+  if (request2.headers.get("cookie")) {
+    updatedHeaders.set("cookie", String(request2.headers.get("cookie")));
   }
-  // Subscribe to events
-  subscribe(eventName, callback) {
-    if (!this.events[eventName]) {
-      this.events[eventName] = [];
-    }
-    this.events[eventName].push(callback);
+  if (request2.headers.get(X_NILE_TENANT)) {
+    updatedHeaders.set(
+      X_NILE_TENANT,
+      String(request2.headers.get(X_NILE_TENANT))
+    );
   }
-  // Unsubscribe from an event
-  unsubscribe(eventName, callback) {
-    const callbackList = this.events[eventName];
-    if (!callbackList) {
-      return;
+  if ("secureCookies" in config && config.secureCookies != null) {
+    updatedHeaders.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
+  }
+  updatedHeaders.set("host", requestUrl.host);
+  updatedHeaders.set(X_NILE_ORIGIN, requestUrl.origin);
+  const params = { ...init, headers: updatedHeaders };
+  if (params.method === "POST" || params.method === "PUT") {
+    try {
+      updatedHeaders.set("content-type", "application/json");
+      const initBody = await new Response(_init.request.clone().body).json();
+      const requestBody = await new Response(request2.clone().body).json();
+      params.body = JSON.stringify(initBody ?? requestBody);
+    } catch (e) {
+      updatedHeaders.set("content-type", "application/x-www-form-urlencoded");
+      const initBody = await new Response(_init.request.clone().body).text();
+      const requestBody = await new Response(request2.clone().body).text();
+      params.body = initBody ?? requestBody;
     }
-    const index = callbackList.indexOf(callback);
-    if (index !== -1) {
-      callbackList.splice(index, 1);
+  }
+  const fullUrl = `${url}${requestUrl.search}`;
+  try {
+    const res = await fetch(fullUrl, { ...params }).catch((e) => {
+      error("An error has occurred in the fetch", {
+        message: e.message,
+        stack: e.stack
+      });
+      return new Response(
+        "An unexpected (most likely configuration) problem has occurred",
+        { status: 500 }
+      );
+    });
+    const loggingRes = typeof res?.clone === "function" ? res?.clone() : null;
+    info(`[${params.method ?? "GET"}] ${fullUrl}`, {
+      status: res?.status,
+      statusText: res?.statusText,
+      text: await loggingRes?.text()
+    });
+    return res;
+  } catch (e) {
+    if (e instanceof Error) {
+      error("An error has occurred in the fetch", {
+        message: e.message,
+        stack: e.stack
+      });
     }
-    if (callbackList.length === 0) {
-      delete this.events[eventName];
+    return new Response(
+      "An unexpected (most likely configuration) problem has occurred",
+      { status: 500 }
+    );
+  }
+}
+
+// src/api/utils/auth.ts
+async function auth(req, config) {
+  const { info, error } = Logger(config, "[nileauth]");
+  info("checking auth");
+  const sessionUrl = `${config.api.basePath}/auth/session`;
+  info(`using session${sessionUrl}`);
+  req.headers.delete("content-length");
+  const res = await request(sessionUrl, { request: req }, config);
+  if (!res) {
+    info("no session found");
+    return void 0;
+  }
+  info("session active");
+  try {
+    const session = await new Response(res.body).json();
+    if (Object.keys(session).length === 0) {
+      return void 0;
     }
+    return session;
+  } catch (e) {
+    error(e);
+    return void 0;
   }
-};
-var eventer = new Eventer();
-var updateTenantId = (tenantId) => {
-  eventer.publish("tenantId" /* Tenant */, tenantId);
-};
-var watchTenantId = (cb) => eventer.subscribe("tenantId" /* Tenant */, cb);
-var updateUserId = (userId) => {
-  eventer.publish("userId" /* User */, userId);
-};
-var watchUserId = (cb) => eventer.subscribe("userId" /* User */, cb);
-var watchToken = (cb) => eventer.subscribe("token" /* Token */, cb);
-var watchEvictPool = (cb) => eventer.subscribe("EvictPool" /* EvictPool */, cb);
-var evictPool = (val) => {
-  eventer.publish("EvictPool" /* EvictPool */, val);
-};
+}
 var getSecureCookies = (cfg) => {
   const { config } = cfg;
   if (stringCheck(process.env.NILEDB_SECURECOOKIES)) {
@@ -318,293 +359,32 @@ function getDbPort(cfg) {
     logger && info(`${logger}[config] ${config?.db.port}`);
     return Number(config.db?.port);
   }
-  if (stringCheck(process.env.NILEDB_PORT)) {
-    logger && info(`${logger}[NILEDB_PORT] ${process.env.NILEDB_PORT}`);
-    return Number(process.env.NILEDB_PORT);
-  }
-  const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
-  if (pg2) {
-    try {
-      const pgUrl = new URL(pg2);
-      if (pgUrl.port) {
-        return Number(pgUrl.port);
-      }
-    } catch (e) {
-    }
-  }
-  logger && info(`${logger}[default] 5432`);
-  return 5432;
-}
-var logProtector = (logger) => {
-  return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test" ? logger : null;
-};
-var stringCheck = (str) => {
-  if (str && str !== "") {
-    return str;
-  }
-  return;
-};
-
-// src/utils/fetch.ts
-var X_NILE_TENANT = "niledb-tenant-id";
-var X_NILE_USER_ID = "niledb-user-id";
-var X_NILE_SECURECOOKIES = "niledb-useSecureCookies";
-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;
-    }
-  }
-  if (cookie) {
-    for (const parts of cookie) {
-      const cookieParts = parts.split("=");
-      const _cookie = cookieParts.slice(1).join("=");
-      const name = cookieParts[0];
-      _cookies[name] = _cookie;
-    }
-  }
-  if (cookieKey) {
-    return _cookies[cookieKey];
-  }
-  return null;
-}
-function getTenantFromHttp(headers, config) {
-  const cookieTenant = getTokenFromCookie(headers, X_NILE_TENANT);
-  return cookieTenant ?? headers?.get(X_NILE_TENANT) ?? config?.tenantId;
-}
-function getUserFromHttp(headers, config) {
-  const token = getTokenFromCookie(headers, config.api.cookieKey);
-  if (token) {
-    const jwt = jose.decodeJwt(token);
-    return jwt.sub;
-  }
-  return headers?.get(X_NILE_USER_ID) ?? config.userId;
-}
-function makeBasicHeaders(config, opts) {
-  const headers = new Headers(opts?.headers);
-  headers.set("content-type", "application/json; charset=utf-8");
-  const cookieKey = config.api?.cookieKey;
-  const authHeader = headers.get("Authorization");
-  if (!authHeader) {
-    const token = getTokenFromCookie(headers, cookieKey);
-    if (token) {
-      headers.set("Authorization", `Bearer ${token}`);
-    } else if (getToken({ config })) {
-      headers.set("Authorization", `Bearer ${getToken({ config })}`);
-    }
-  }
-  if ("secureCookies" in config && config.secureCookies != null) {
-    headers.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
-  }
-  return headers;
-}
-async function _fetch(config, path, opts) {
-  const { debug, error } = Logger(config, "[server]");
-  const url = `${config.api?.basePath}${path}`;
-  const headers = new Headers(opts?.headers);
-  const tenantId = getTenantFromHttp(headers, config);
-  const basicHeaders = makeBasicHeaders(config, opts);
-  updateTenantId(tenantId);
-  const userId = getUserFromHttp(headers, config);
-  updateUserId(userId);
-  if (url.includes("{tenantId}") && !tenantId) {
-    return new ResponseError("tenantId is not set for request", {
-      status: 400
-    });
-  }
-  const useableUrl = url.replace("{tenantId}", encodeURIComponent(String(tenantId))).replace("{userId}", encodeURIComponent(String(userId)));
-  debug(`[fetch] ${useableUrl}`);
-  try {
-    const response = await fetch(useableUrl, {
-      ...opts,
-      headers: basicHeaders
-    }).catch((e) => {
-      error("[fetch][response]", {
-        message: e.message,
-        stack: e.stack,
-        debug: "Is nile-auth running?"
-      });
-      return new Error(e);
-    });
-    if (response instanceof Error) {
-      return new ResponseError("Failed to connect to database", {
-        status: 400
-      });
-    }
-    if (response && response.status >= 200 && response.status < 300) {
-      if (typeof response.clone === "function") {
-        try {
-          debug(
-            `[fetch][response][${opts?.method ?? "GET"}] ${response.status} ${useableUrl}`,
-            {
-              body: await response.clone().json()
-            }
-          );
-        } catch (e) {
-          debug(
-            `[fetch][response][${opts?.method ?? "GET"}] ${response.status} ${useableUrl}`,
-            {
-              body: await response.clone().text()
-            }
-          );
-        }
-      }
-      return response;
-    }
-    if (response?.status === 404) {
-      return new ResponseError("Not found", { status: 404 });
-    }
-    if (response?.status === 401) {
-      return new ResponseError("Unauthorized", { status: 401 });
-    }
-    if (response?.status === 405) {
-      return new ResponseError("Method not allowed", { status: 405 });
-    }
-    let res;
-    const errorHandler = typeof response?.clone === "function" ? response.clone() : null;
-    let msg = "";
-    try {
-      res = await response?.json();
-    } catch (e) {
-      if (errorHandler) {
-        msg = await errorHandler.text();
-        if (msg) {
-          error(`[fetch][response][status: ${errorHandler.status}]`, {
-            message: msg
-          });
-        }
-        return e;
-      }
-      if (!msg) {
-        error("[fetch][response]", { e });
-      }
-    }
-    if (msg) {
-      return new ResponseError(msg, { status: errorHandler?.status });
-    }
-    if (res && "message" in res) {
-      const { message } = res;
-      error(`[fetch][response][status: ${errorHandler?.status}] ${message}`);
-      return new ResponseError(message, { status: 400 });
-    }
-    if (res && "errors" in res) {
-      const {
-        errors: [message]
-      } = res;
-      error(`[fetch][response] [status: ${errorHandler?.status}] ${message}`);
-      return new ResponseError(message, { status: 400 });
-    }
-    error(
-      `[fetch][response][status: ${errorHandler?.status}] UNHANDLED ERROR`,
-      {
-        res
-      }
-    );
-    return new ResponseError(null, {
-      status: response?.status ?? 500
-    });
-  } catch (e) {
-    return new ResponseError("an unexpected error has occurred", {
-      status: 500
-    });
-  }
-}
-
-// src/api/utils/request.ts
-async function request(url, _init, config) {
-  const { info, error } = Logger(config, "[REQUEST]");
-  const { request: request2, ...init } = _init;
-  const requestUrl = new URL(request2.url);
-  const updatedHeaders = new Headers({});
-  if (request2.headers.get("cookie")) {
-    updatedHeaders.set("cookie", String(request2.headers.get("cookie")));
-  }
-  if (request2.headers.get(X_NILE_TENANT)) {
-    updatedHeaders.set(
-      X_NILE_TENANT,
-      String(request2.headers.get(X_NILE_TENANT))
-    );
-  }
-  if ("secureCookies" in config && config.secureCookies != null) {
-    updatedHeaders.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
-  }
-  updatedHeaders.set("host", requestUrl.host);
-  updatedHeaders.set("niledb-origin", requestUrl.origin);
-  const params = { ...init, headers: updatedHeaders };
-  if (params.method === "POST" || params.method === "PUT") {
-    try {
-      updatedHeaders.set("content-type", "application/json");
-      const initBody = await new Response(_init.request.clone().body).json();
-      const requestBody = await new Response(request2.clone().body).json();
-      params.body = JSON.stringify(initBody ?? requestBody);
-    } catch (e) {
-      updatedHeaders.set("content-type", "application/x-www-form-urlencoded");
-      const initBody = await new Response(_init.request.clone().body).text();
-      const requestBody = await new Response(request2.clone().body).text();
-      params.body = initBody ?? requestBody;
-    }
-  }
-  try {
-    const res = await fetch(url, { ...params }).catch((e) => {
-      error("An error has occurred in the fetch", {
-        message: e.message,
-        stack: e.stack
-      });
-      return new Response(
-        "An unexpected (most likely configuration) problem has occurred",
-        { status: 500 }
-      );
-    });
-    const loggingRes = typeof res?.clone === "function" ? res?.clone() : null;
-    info(`[${params.method ?? "GET"}] ${url}`, {
-      status: res?.status,
-      statusText: res?.statusText,
-      text: await loggingRes?.text()
-    });
-    return res;
-  } catch (e) {
-    if (e instanceof Error) {
-      error("An error has occurred in the fetch", {
-        message: e.message,
-        stack: e.stack
-      });
-    }
-    return new Response(
-      "An unexpected (most likely configuration) problem has occurred",
-      { status: 500 }
-    );
-  }
-}
-
-// src/api/utils/auth.ts
-async function auth(req, config) {
-  const { info, error } = Logger(config, "[nileauth]");
-  info("checking auth");
-  const sessionUrl = `${config.api.basePath}/auth/session`;
-  info(`using session${sessionUrl}`);
-  req.headers.delete("content-length");
-  const res = await request(sessionUrl, { request: req }, config);
-  if (!res) {
-    info("no session found");
-    return void 0;
-  }
-  info("session active");
-  try {
-    const session = await new Response(res.body).json();
-    if (Object.keys(session).length === 0) {
-      return void 0;
+  if (stringCheck(process.env.NILEDB_PORT)) {
+    logger && info(`${logger}[NILEDB_PORT] ${process.env.NILEDB_PORT}`);
+    return Number(process.env.NILEDB_PORT);
+  }
+  const pg2 = stringCheck(process.env.NILEDB_POSTGRES_URL);
+  if (pg2) {
+    try {
+      const pgUrl = new URL(pg2);
+      if (pgUrl.port) {
+        return Number(pgUrl.port);
+      }
+    } catch (e) {
     }
-    return session;
-  } catch (e) {
-    error(e);
-    return void 0;
   }
+  logger && info(`${logger}[default] 5432`);
+  return 5432;
 }
+var logProtector = (logger) => {
+  return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test" ? logger : null;
+};
+var stringCheck = (str) => {
+  if (str && str !== "") {
+    return str;
+  }
+  return;
+};
 
 // src/utils/Config/index.ts
 var ApiConfig = class {
@@ -814,6 +594,55 @@ var Config = class {
   };
 };
 
+// src/utils/Event/index.ts
+var Eventer = class {
+  events = {};
+  // Publish event and notify all subscribers
+  publish(eventName, value) {
+    const callbackList = this.events[eventName];
+    if (callbackList) {
+      for (const callback of callbackList) {
+        callback(value);
+      }
+    }
+  }
+  // Subscribe to events
+  subscribe(eventName, callback) {
+    if (!this.events[eventName]) {
+      this.events[eventName] = [];
+    }
+    this.events[eventName].push(callback);
+  }
+  // Unsubscribe from an event
+  unsubscribe(eventName, callback) {
+    const callbackList = this.events[eventName];
+    if (!callbackList) {
+      return;
+    }
+    const index = callbackList.indexOf(callback);
+    if (index !== -1) {
+      callbackList.splice(index, 1);
+    }
+    if (callbackList.length === 0) {
+      delete this.events[eventName];
+    }
+  }
+};
+var eventer = new Eventer();
+var updateTenantId = (tenantId) => {
+  eventer.publish("tenantId" /* Tenant */, tenantId);
+};
+var watchTenantId = (cb) => eventer.subscribe("tenantId" /* Tenant */, cb);
+var updateUserId = (userId) => {
+  eventer.publish("userId" /* User */, userId);
+};
+var watchUserId = (cb) => eventer.subscribe("userId" /* User */, cb);
+var watchToken = (cb) => eventer.subscribe("token" /* Token */, cb);
+var watchEvictPool = (cb) => eventer.subscribe("EvictPool" /* EvictPool */, cb);
+var evictPool = (val) => {
+  eventer.publish("EvictPool" /* EvictPool */, val);
+};
+
 // src/db/PoolProxy.ts
 function createProxyForPool(pool, config) {
   const { info, error } = Logger(config, "[pool]");
@@ -1097,6 +926,181 @@ function matches(configRoutes, request2) {
   return urlMatches(request2.url, configRoutes[key]);
 }
 
+// src/utils/ResponseError.ts
+var ResponseError = class {
+  response;
+  constructor(body, init) {
+    this.response = new Response(body, init);
+  }
+};
+
+// 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;
+    }
+  }
+  if (cookie) {
+    for (const parts of cookie) {
+      const cookieParts = parts.split("=");
+      const _cookie = cookieParts.slice(1).join("=");
+      const name = cookieParts[0];
+      _cookies[name] = _cookie;
+    }
+  }
+  if (cookieKey) {
+    return _cookies[cookieKey];
+  }
+  return null;
+}
+function getTenantFromHttp(headers, config) {
+  const cookieTenant = getTokenFromCookie(headers, X_NILE_TENANT);
+  return cookieTenant ?? headers?.get(X_NILE_TENANT) ?? config?.tenantId;
+}
+function getUserFromHttp(headers, config) {
+  const token = getTokenFromCookie(headers, config.api.cookieKey);
+  if (token) {
+    const jwt = jose.decodeJwt(token);
+    return jwt.sub;
+  }
+  return headers?.get(X_NILE_USER_ID) ?? config.userId;
+}
+function makeBasicHeaders(config, opts) {
+  const headers = new Headers(opts?.headers);
+  headers.set("content-type", "application/json; charset=utf-8");
+  const cookieKey = config.api?.cookieKey;
+  const authHeader = headers.get("Authorization");
+  if (!authHeader) {
+    const token = getTokenFromCookie(headers, cookieKey);
+    if (token) {
+      headers.set("Authorization", `Bearer ${token}`);
+    } else if (getToken({ config })) {
+      headers.set("Authorization", `Bearer ${getToken({ config })}`);
+    }
+  }
+  if ("secureCookies" in config && config.secureCookies != null) {
+    headers.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
+  }
+  return headers;
+}
+async function _fetch(config, path, opts) {
+  const { debug, error } = Logger(config, "[server]");
+  const url = `${config.api?.basePath}${path}`;
+  const headers = new Headers(opts?.headers);
+  const tenantId = getTenantFromHttp(headers, config);
+  const basicHeaders = makeBasicHeaders(config, opts);
+  updateTenantId(tenantId);
+  const userId = getUserFromHttp(headers, config);
+  updateUserId(userId);
+  if (url.includes("{tenantId}") && !tenantId) {
+    return new ResponseError("tenantId is not set for request", {
+      status: 400
+    });
+  }
+  const useableUrl = url.replace("{tenantId}", encodeURIComponent(String(tenantId))).replace("{userId}", encodeURIComponent(String(userId)));
+  debug(`[fetch] ${useableUrl}`);
+  try {
+    const response = await fetch(useableUrl, {
+      ...opts,
+      headers: basicHeaders
+    }).catch((e) => {
+      error("[fetch][response]", {
+        message: e.message,
+        stack: e.stack,
+        debug: "Is nile-auth running?"
+      });
+      return new Error(e);
+    });
+    if (response instanceof Error) {
+      return new ResponseError("Failed to connect to database", {
+        status: 400
+      });
+    }
+    if (response && response.status >= 200 && response.status < 300) {
+      if (typeof response.clone === "function") {
+        try {
+          debug(
+            `[fetch][response][${opts?.method ?? "GET"}] ${response.status} ${useableUrl}`,
+            {
+              body: await response.clone().json()
+            }
+          );
+        } catch (e) {
+          debug(
+            `[fetch][response][${opts?.method ?? "GET"}] ${response.status} ${useableUrl}`,
+            {
+              body: await response.clone().text()
+            }
+          );
+        }
+      }
+      return response;
+    }
+    if (response?.status === 404) {
+      return new ResponseError("Not found", { status: 404 });
+    }
+    if (response?.status === 401) {
+      return new ResponseError("Unauthorized", { status: 401 });
+    }
+    if (response?.status === 405) {
+      return new ResponseError("Method not allowed", { status: 405 });
+    }
+    let res;
+    const errorHandler = typeof response?.clone === "function" ? response.clone() : null;
+    let msg = "";
+    try {
+      res = await response?.json();
+    } catch (e) {
+      if (errorHandler) {
+        msg = await errorHandler.text();
+        if (msg) {
+          error(`[fetch][response][status: ${errorHandler.status}]`, {
+            message: msg
+          });
+        }
+        return e;
+      }
+      if (!msg) {
+        error("[fetch][response]", { e });
+      }
+    }
+    if (msg) {
+      return new ResponseError(msg, { status: errorHandler?.status });
+    }
+    if (res && "message" in res) {
+      const { message } = res;
+      error(`[fetch][response][status: ${errorHandler?.status}] ${message}`);
+      return new ResponseError(message, { status: 400 });
+    }
+    if (res && "errors" in res) {
+      const {
+        errors: [message]
+      } = res;
+      error(`[fetch][response] [status: ${errorHandler?.status}] ${message}`);
+      return new ResponseError(message, { status: 400 });
+    }
+    error(
+      `[fetch][response][status: ${errorHandler?.status}] UNHANDLED ERROR`,
+      {
+        res
+      }
+    );
+    return new ResponseError(null, {
+      status: response?.status ?? 500
+    });
+  } catch (e) {
+    return new ResponseError("an unexpected error has occurred", {
+      status: 500
+    });
+  }
+}
+
 // src/api/routes/users/POST.ts
 async function POST(config, init) {
   init.body = init.request.body;
@@ -1870,7 +1874,7 @@ function serverLogin(config, handlers) {
     const sessionUrl = new URL(`${ORIGIN}${routes.PROVIDERS}`);
     const baseHeaders = {
       host: sessionUrl.host,
-      "niledb-origin": ORIGIN
+      [X_NILE_ORIGIN]: ORIGIN
     };
     info(`Obtaining providers for ${email}`);
     const sessionReq = new Request(sessionUrl, {