@niledatabase/server 4.2.0 → 5.0.0-alpha.0

package/dist/index.js

@@ -86,6 +86,73 @@ var X_NILE_USER_ID = "nile.user_id";
 var X_NILE_ORIGIN = "nile.origin";
 var X_NILE_SECURECOOKIES = "nile.secure_cookies";
 
+// src/context/asyncStorage.ts
+var globalContext = null;
+function setContext(headers) {
+  const origin = headers.get(X_NILE_ORIGIN);
+  const host = headers.get("host");
+  const cookie = headers.get("cookie");
+  const tenantId = headers.get(X_NILE_TENANT);
+  const userId = headers.get(X_NILE_USER_ID);
+  const context = {};
+  if (origin) {
+    context.origin = origin;
+  } else if (host) {
+    context.origin = host;
+  }
+  if (cookie) {
+    context.cookie = cookie;
+  }
+  if (tenantId) {
+    context.tenantId = tenantId;
+  }
+  if (userId) {
+    context.userId = userId;
+  }
+  globalContext = context;
+}
+function getOrigin() {
+  return globalContext?.origin;
+}
+function getCookie() {
+  return globalContext?.cookie;
+}
+function setCookie(headers) {
+  const getSet = headers?.getSetCookie?.();
+  if (getSet?.length) {
+    const updatedCookie = [];
+    for (const cook of getSet) {
+      const [c] = cook.split("; ");
+      const [, val] = c.split("=");
+      if (val) {
+        updatedCookie.push(c);
+      }
+    }
+    const cookie = mergeCookies(updatedCookie);
+    globalContext = { ...globalContext, cookie };
+  }
+}
+function mergeCookies(overrideArray) {
+  const cookieString = getCookie();
+  const cookieMap = {};
+  if (!cookieString) {
+    return overrideArray.join("; ");
+  }
+  cookieString.split(";").forEach((cookie) => {
+    const [rawKey, ...rawVal] = cookie.trim().split("=");
+    const key12 = rawKey.trim();
+    const value = rawVal.join("=").trim();
+    if (key12) cookieMap[key12] = value;
+  });
+  overrideArray.forEach((cookie) => {
+    const [rawKey, ...rawVal] = cookie.trim().split("=");
+    const key12 = rawKey.trim();
+    const value = rawVal.join("=").trim();
+    if (key12) cookieMap[key12] = value;
+  });
+  return Object.entries(cookieMap).map(([k, v]) => `${k}=${v}`).join("; ");
+}
+
 // src/api/utils/request.ts
 async function request(url, _init, config) {
   const { debug, info, error } = Logger(config, "[REQUEST]");
@@ -118,7 +185,7 @@ async function request(url, _init, config) {
     updatedHeaders.set(X_NILE_ORIGIN, requestUrl.origin);
     debug(`Obtained origin from request ${requestUrl.origin}`);
   }
-  const params = { ...init };
+  const params = { ...init, headers: updatedHeaders };
   if (params.method?.toLowerCase() === "post" || params.method?.toLowerCase() === "put") {
     try {
       updatedHeaders.set("content-type", "application/json");
@@ -132,9 +199,9 @@ async function request(url, _init, config) {
       params.body = initBody ?? requestBody;
     }
   }
-  params.headers = updatedHeaders;
   const fullUrl = `${url}${requestUrl.search}`;
   try {
+    setContext(updatedHeaders);
     const res = await fetch(fullUrl, { ...params }).catch(
       (e) => {
         error("An error has occurred in the fetch", {
@@ -153,6 +220,7 @@ async function request(url, _init, config) {
       statusText: res?.statusText,
       text: await loggingRes?.text()
     });
+    setCookie(res?.headers);
     return res;
   } catch (e) {
     if (e instanceof Error) {
@@ -194,17 +262,20 @@ async function auth(req, config) {
 }
 var getCallbackUrl = (cfg) => {
   const { config } = cfg;
-  if (stringCheck(process.env.NILEDB_CALLBACK_URL)) {
-    return process.env.NILEDB_CALLBACK_URL;
+  if (stringCheck(config?.api?.callbackUrl)) {
+    return config?.api?.callbackUrl;
   }
-  return config?.api?.callbackUrl;
+  return process.env.NILEDB_CALLBACK_URL;
 };
 var getSecureCookies = (cfg) => {
   const { config } = cfg;
+  if (config?.api?.secureCookies != null) {
+    return config?.api?.secureCookies;
+  }
   if (stringCheck(process.env.NILEDB_SECURECOOKIES)) {
     return Boolean(process.env.NILEDB_SECURECOOKIES);
   }
-  return config?.api?.secureCookies;
+  return void 0;
 };
 var getDatabaseId = (cfg) => {
   const { config, logger } = cfg;
@@ -277,9 +348,6 @@ var getPassword = (cfg) => {
   }
   return void 0;
 };
-var getInfoBearer = (cfg) => {
-  return `${getUsername(cfg)}:${getPassword(cfg)}`;
-};
 var getToken = (cfg) => {
   const { config, logger } = cfg;
   const { info } = Logger(config, "[token]");
@@ -364,24 +432,6 @@ var getBasePath = (cfg) => {
   warn("not set. Must run auto-configuration");
   return void 0;
 };
-var getControlPlane = (cfg) => {
-  const { config, logger } = cfg;
-  const { info } = Logger(config, "[basePath]");
-  if (stringCheck(config?.configureUrl)) {
-    logger && info(`${logger}[config] ${config?.configureUrl}`);
-    return String(config?.configureUrl);
-  }
-  const autoConfigUrl = stringCheck(process.env.NILEDB_CONFIGURE);
-  if (autoConfigUrl) {
-    logger && info(`${logger}[NILEDB_CONFIGURE] ${process.env.NILEDB_CONFIGURE}`);
-    if (!autoConfigUrl.startsWith("http")) {
-      return `https://${process.env.NILEDB_CONFIGURE}`;
-    }
-    return process.env.NILEDB_CONFIGURE;
-  }
-  logger && info(`${logger}[default] https://global.thenile.dev`);
-  return "https://global.thenile.dev";
-};
 function getDbHost(cfg) {
   const { config, logger } = cfg;
   const { info } = Logger(config, "[db.host]");
@@ -447,7 +497,6 @@ var ApiConfig = class {
   routePrefix;
   secureCookies;
   origin;
-  headers;
   /**
    * The client side callback url. Defaults to nothing (so nile.origin will be it), but in the cases of x-origin, you want to set this explicitly to be sure nile-auth does the right thing
    * If this is set, any `callbackUrl` from the client will be ignored.
@@ -461,11 +510,6 @@ var ApiConfig = class {
     this.callbackUrl = getCallbackUrl(envVarConfig);
     this.secureCookies = getSecureCookies(envVarConfig);
     this.basePath = getBasePath(envVarConfig);
-    if (config?.api?.headers instanceof Headers) {
-      this.headers = config?.api?.headers;
-    } else if (config?.api?.headers) {
-      this.headers = new Headers(config.api.headers);
-    }
     this.routes = config?.api?.routes;
     this.routePrefix = config?.api?.routePrefix;
     this.origin = config?.api?.origin;
@@ -537,116 +581,6 @@ var Config = class {
       this.db.database = this.databaseName;
     }
   }
-  configure = async (config) => {
-    const { info, error, debug } = Logger(config, "[init]");
-    const envVarConfig = {
-      config
-    };
-    const { host, port, ...dbConfig } = config.db ?? {};
-    let configuredHost = host ?? getDbHost(envVarConfig);
-    const configuredPort = port ?? getDbPort(envVarConfig);
-    let basePath = getBasePath(envVarConfig);
-    if (configuredHost && this.databaseName && this.databaseId && basePath) {
-      info("Already configured, aborting fetch");
-      this.api = new ApiConfig(config);
-      this.db = {
-        user: this.user,
-        password: this.password,
-        host: configuredHost,
-        port: configuredPort,
-        database: this.databaseName,
-        ...dbConfig
-      };
-      const cloned = { ...this.db };
-      cloned.password = "***";
-      info("[config set]", { db: cloned, api: this.api });
-      return this;
-    } else {
-      const msg = [];
-      if (!configuredHost) {
-        msg.push("Database host");
-      }
-      if (!this.databaseName) {
-        msg.push("Database name");
-      }
-      if (!this.databaseId) {
-        msg.push("Database id");
-      }
-      if (!basePath) {
-        msg.push("API URL");
-      }
-      info(
-        `[autoconfigure] ${msg.join(", ")} ${msg.length > 1 ? "are" : "is"} missing from the config. Autoconfiguration will run.`
-      );
-    }
-    const cp = getControlPlane(envVarConfig);
-    const databaseName = getDatabaseName({ config, logger: "getInfo" });
-    const url = new URL(`${cp}/databases/configure`);
-    if (databaseName) {
-      url.searchParams.set("databaseName", databaseName);
-    }
-    info(`configuring from ${url.href}`);
-    const res = await fetch(url, {
-      headers: {
-        Authorization: `Bearer ${getInfoBearer({ config })}`
-      }
-    }).catch(() => {
-      error(`Unable to auto-configure. is ${url} available?`);
-    });
-    if (!res) {
-      return this;
-    }
-    let database;
-    const possibleError = res.clone();
-    try {
-      const json = await res.json();
-      if (res.status === 404) {
-        info("is the configured databaseName correct?");
-      }
-      if (json.status && json.status !== "READY") {
-        database = { message: "Database is not ready yet" };
-      } else {
-        database = json;
-      }
-    } catch (e) {
-      const message = await possibleError.text();
-      debug("Unable to auto-configure");
-      error(message);
-      database = { message };
-    }
-    info("[fetched database]", database);
-    if (process.env.NODE_ENV !== "TEST") {
-      if ("message" in database) {
-        if ("statusCode" in database) {
-          error(database);
-          throw new Error("HTTP error has occurred");
-        } else {
-          throw new Error(
-            "Unable to auto-configure. Please remove NILEDB_NAME, NILEDB_API_URL, NILEDB_POSTGRES_URL, and/or NILEDB_HOST from your environment variables."
-          );
-        }
-      }
-      if (typeof database === "object") {
-        const { apiHost, dbHost, name, id } = database;
-        basePath = basePath || apiHost;
-        this.databaseId = id;
-        this.databaseName = name;
-        const dburl = new URL(dbHost);
-        configuredHost = dburl.hostname;
-      }
-    }
-    this.api = new ApiConfig(config);
-    this.db = {
-      user: this.user,
-      password: this.password,
-      host: configuredHost,
-      port: configuredPort,
-      database: this.databaseName,
-      ...dbConfig
-    };
-    info("[config set]", { db: this.db, api: this.api });
-    return this;
-  };
 };
 
 // src/utils/Event/index.ts
@@ -990,7 +924,7 @@ var ResponseError = class {
 
 // src/utils/fetch.ts
 function getTokenFromCookie(headers, cookieKey) {
-  const cookie = headers.get("cookie")?.split("; ");
+  const cookie = headers.get("cookie")?.split("; ") ?? getCookie()?.split("; ");
   const _cookies = {};
   if (cookie) {
     for (const parts of cookie) {
@@ -1028,24 +962,22 @@ function getUserFromHttp(headers, config) {
 function makeBasicHeaders(config, url, opts) {
   const { warn, error } = Logger(config, "[headers]");
   const headers = new Headers(opts?.headers);
-  const cookieKey = config.api?.cookieKey;
   headers.set("content-type", "application/json; charset=utf-8");
-  const origin = headers.get(X_NILE_ORIGIN);
-  if (!origin) {
-    if (config.api.headers) {
-      const localOrigin = config.api.headers.get(X_NILE_ORIGIN);
-      if (localOrigin) {
-        headers.set(X_NILE_ORIGIN, localOrigin);
-      }
+  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 })}`);
     }
   }
   const cookie = headers.get("cookie");
   if (!cookie) {
-    if (config.api.headers) {
-      const configCookie = config.api.headers.get("cookie");
-      if (configCookie) {
-        headers.set("cookie", configCookie);
-      }
+    const contextCookie = getCookie();
+    if (contextCookie) {
+      headers.set("cookie", contextCookie);
     } else {
       if (!url.endsWith("/users")) {
         error(
@@ -1054,20 +986,14 @@ function makeBasicHeaders(config, url, opts) {
       }
     }
   }
-  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 (config && config.api.secureCookies != null) {
     headers.set(X_NILE_SECURECOOKIES, String(config.api.secureCookies));
   }
+  const savedOrigin = getOrigin();
   if (config && config.api.origin) {
     headers.set(X_NILE_ORIGIN, config.api.origin);
+  } else if (savedOrigin) {
+    headers.set(X_NILE_ORIGIN, savedOrigin);
   } else {
     warn(
       "nile.origin missing from header, which defaults to secure cookies only."
@@ -1099,8 +1025,7 @@ async function _fetch(config, path, opts) {
       error("[fetch][response]", {
         message: e.message,
         stack: e.stack,
-        debug: "Is nile-auth running?",
-        cause: e.cause
+        debug: "Is nile-auth running?"
       });
       return new Error(e);
     });
@@ -2426,66 +2351,6 @@ var Users = class extends Config {
   };
 };
 
-// src/api/handlers/withContext/index.ts
-function handlersWithContext(configRoutes, config) {
-  const GET6 = GETTER(configRoutes, config);
-  const POST5 = POSTER(configRoutes, config);
-  const DELETE3 = DELETER(configRoutes, config);
-  const PUT4 = PUTER(configRoutes, config);
-  return {
-    GET: async (req) => {
-      const response = await GET6(req);
-      const updatedConfig = updateConfig(response, config);
-      return { response, nile: new Server(updatedConfig) };
-    },
-    POST: async (req) => {
-      const response = await POST5(req);
-      const updatedConfig = updateConfig(response, config);
-      return { response, nile: new Server(updatedConfig) };
-    },
-    DELETE: async (req) => {
-      const response = await DELETE3(req);
-      const updatedConfig = updateConfig(response, config);
-      return { response, nile: new Server(updatedConfig) };
-    },
-    PUT: async (req) => {
-      const response = await PUT4(req);
-      const updatedConfig = updateConfig(response, config);
-      return { response, nile: new Server(updatedConfig) };
-    }
-  };
-}
-function updateConfig(response, config) {
-  let origin = "http://localhost:3000";
-  let headers = null;
-  if (response?.status === 302) {
-    const location = response.headers.get("location");
-    if (location) {
-      origin = location;
-    }
-  }
-  const setCookies = [];
-  if (response?.headers) {
-    for (const [key12, value] of response.headers) {
-      if (key12.toLowerCase() === "set-cookie") {
-        setCookies.push(value);
-      }
-    }
-  }
-  if (setCookies.length > 0) {
-    const cookieHeader = setCookies.map((cookieStr) => cookieStr.split(";")[0]).join("; ");
-    headers = new Headers({ cookie: cookieHeader });
-  }
-  return {
-    ...config,
-    api: {
-      ...config.api,
-      origin,
-      headers: headers ?? void 0
-    }
-  };
-}
-
 // src/Api.ts
 var Api = class {
   config;
@@ -2495,13 +2360,9 @@ var Api = class {
   routes;
   #headers;
   handlers;
-  handlersWithContext;
   paths;
   constructor(config) {
     this.config = config;
-    if (config?.api.headers) {
-      this.headers = config?.api.headers;
-    }
     this.auth = new Auth(config, void 0, {
       resetHeaders: this.resetHeaders
     });
@@ -2512,7 +2373,6 @@ var Api = class {
       ...config?.api.routes
     };
     this.handlers = Handlers(this.routes, config);
-    this.handlersWithContext = handlersWithContext(this.routes, config);
     this.paths = {
       get: [
         this.routes.ME,
@@ -2564,11 +2424,9 @@ var Api = class {
   };
   resetHeaders = (headers) => {
     this.#headers = new Headers(headers ?? {});
+    setContext(new Headers());
     this.reset();
   };
-  /**
-   * Merge headers together
-   */
   set headers(headers) {
     const updates = [];
     if (headers instanceof Headers) {
@@ -2582,9 +2440,7 @@ var Api = class {
     }
     const merged = {};
     this.#headers?.forEach((value, key12) => {
-      if (key12.toLowerCase() !== "cookie") {
-        merged[key12.toLowerCase()] = value;
-      }
+      merged[key12.toLowerCase()] = value;
     });
     for (const [key12, value] of updates) {
       merged[key12] = value;
@@ -2611,18 +2467,8 @@ var Api = class {
       this.config,
       this.handlers
     )(payload);
+    this.headers = headers;
     this.setContext(headers);
-    try {
-      const res = await loginRes.json();
-      if (res.id) {
-        this.config.userId = res.id;
-      }
-    } catch (e) {
-      const { warn } = Logger(this.config, "[API][login]");
-      if (warn) {
-        warn("Unable to set user id from login attempt.");
-      }
-    }
     if (config?.returnResponse) {
       return loginRes;
     }
@@ -2637,26 +2483,21 @@ var Api = class {
     return this.auth.getSession(this.#headers);
   };
   setContext = (req) => {
-    try {
-      if (req instanceof Headers) {
-        this.headers = req;
-        return;
-      } else if (req instanceof Request) {
-        this.headers = new Headers(req.headers);
-        return;
-      }
-      const headers = new Headers(req);
-      if (headers) {
-        this.headers = headers;
-        return;
-      }
-    } catch {
+    if (req instanceof Headers) {
+      setContext(req);
+      return;
+    } else if (req instanceof Request) {
+      setContext(req.headers);
+      return;
     }
-    const { warn } = Logger(this.config, "[API]");
-    if (warn) {
-      warn(
-        "Set context expects a Request, Header instance or an object of Record<string, string>"
-      );
+    const headers = new Headers(req);
+    if (headers) {
+      setContext(headers);
+    } else {
+      const { warn } = Logger(this.config, "[API]");
+      if (warn) {
+        warn("Set context expects a Request or Header object");
+      }
     }
   };
 };
@@ -2684,14 +2525,6 @@ var Server = class {
     this.config = new Config(cfg);
     this.api.updateConfig(this.config);
   }
-  async init(cfg) {
-    const updatedConfig = await this.config.configure({
-      ...this.config,
-      ...cfg
-    });
-    this.setConfig(updatedConfig);
-    return this;
-  }
   set databaseId(val) {
     if (val) {
       this.config.databaseId = val;
@@ -2742,7 +2575,7 @@ var Server = class {
   /**
    * A convenience function that applies a config and ensures whatever was passed is set properly
    */
-  getInstance(config, req) {
+  getInstance(config) {
     const _config = { ...this.config, ...config };
     const updatedConfig = new Config(_config);
     this.setConfig(updatedConfig);
@@ -2752,21 +2585,15 @@ var Server = class {
       this.token = updatedConfig.api.token;
     }
     this.databaseId = updatedConfig.databaseId;
-    if (req) {
-      this.api.setContext(req);
-    }
     return this;
   }
 };
 var server;
-async function create(config) {
+function create(config) {
   if (!server) {
     server = new Server(config);
   }
-  if (config) {
-    return await server.init(new Config(config));
-  }
-  return await server.init();
+  return server;
 }
 
 exports.LoginUserResponseTokenTypeEnum = LoginUserResponseTokenTypeEnum;