@niledatabase/server 4.2.0-alpha.0 → 4.2.0-alpha.2

package/dist/index.mjs

@@ -80,73 +80,6 @@ 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]");
@@ -179,7 +112,7 @@ async function request(url, _init, config) {
     updatedHeaders.set(X_NILE_ORIGIN, requestUrl.origin);
     debug(`Obtained origin from request ${requestUrl.origin}`);
   }
-  const params = { ...init, headers: updatedHeaders };
+  const params = { ...init };
   if (params.method?.toLowerCase() === "post" || params.method?.toLowerCase() === "put") {
     try {
       updatedHeaders.set("content-type", "application/json");
@@ -193,9 +126,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", {
@@ -214,7 +147,6 @@ async function request(url, _init, config) {
       statusText: res?.statusText,
       text: await loggingRes?.text()
     });
-    setCookie(res?.headers);
     return res;
   } catch (e) {
     if (e instanceof Error) {
@@ -509,6 +441,7 @@ 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.
@@ -522,6 +455,11 @@ 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;
@@ -1046,7 +984,7 @@ var ResponseError = class {
 
 // src/utils/fetch.ts
 function getTokenFromCookie(headers, cookieKey) {
-  const cookie = headers.get("cookie")?.split("; ") ?? getCookie()?.split("; ");
+  const cookie = headers.get("cookie")?.split("; ");
   const _cookies = {};
   if (cookie) {
     for (const parts of cookie) {
@@ -1084,22 +1022,24 @@ function getUserFromHttp(headers, config) {
 function makeBasicHeaders(config, url, opts) {
   const { warn, error } = Logger(config, "[headers]");
   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 })}`);
+  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 cookie = headers.get("cookie");
   if (!cookie) {
-    const contextCookie = getCookie();
-    if (contextCookie) {
-      headers.set("cookie", contextCookie);
+    if (config.api.headers) {
+      const configCookie = config.api.headers.get("cookie");
+      if (configCookie) {
+        headers.set("cookie", configCookie);
+      }
     } else {
       if (!url.endsWith("/users")) {
         error(
@@ -1108,14 +1048,20 @@ 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."
@@ -1147,7 +1093,8 @@ async function _fetch(config, path, opts) {
       error("[fetch][response]", {
         message: e.message,
         stack: e.stack,
-        debug: "Is nile-auth running?"
+        debug: "Is nile-auth running?",
+        cause: e.cause
       });
       return new Error(e);
     });
@@ -2473,6 +2420,52 @@ 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: POST5,
+    DELETE: DELETE3,
+    PUT: PUT4
+  };
+}
+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 = [];
+  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;
@@ -2482,9 +2475,13 @@ 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
     });
@@ -2495,6 +2492,7 @@ var Api = class {
       ...config?.api.routes
     };
     this.handlers = Handlers(this.routes, config);
+    this.handlersWithContext = handlersWithContext(this.routes, config);
     this.paths = {
       get: [
         this.routes.ME,
@@ -2546,7 +2544,6 @@ var Api = class {
   };
   resetHeaders = (headers) => {
     this.#headers = new Headers(headers ?? {});
-    setContext(new Headers());
     this.reset();
   };
   set headers(headers) {
@@ -2606,13 +2603,22 @@ var Api = class {
   };
   setContext = (req) => {
     if (req instanceof Headers) {
-      setContext(req);
+      this.headers = req;
+      return;
     } else if (req instanceof Request) {
-      setContext(req.headers);
+      this.headers = new Headers(req.headers);
+      return;
     }
-    const { warn } = Logger(this.config, "[API]");
-    if (warn) {
-      warn("Set context expects a Request or Header object");
+    const headers = new Headers(req);
+    if (headers) {
+      this.headers = headers;
+    } else {
+      const { warn } = Logger(this.config, "[API]");
+      if (warn) {
+        warn(
+          "Set context expects a Request, Header instance or an object of Record<string, string>"
+        );
+      }
     }
   };
 };
@@ -2698,7 +2704,7 @@ var Server = class {
   /**
    * A convenience function that applies a config and ensures whatever was passed is set properly
    */
-  getInstance(config) {
+  getInstance(config, req) {
     const _config = { ...this.config, ...config };
     const updatedConfig = new Config(_config);
     this.setConfig(updatedConfig);
@@ -2708,6 +2714,9 @@ var Server = class {
       this.token = updatedConfig.api.token;
     }
     this.databaseId = updatedConfig.databaseId;
+    if (req) {
+      this.api.setContext(req);
+    }
     return this;
   }
 };