@niledatabase/server 4.0.1 → 4.0.2-alpha.11

package/dist/index.js

@@ -23,39 +23,48 @@ function urlMatches(requestUrl, route15) {
 
 // src/utils/Logger.ts
 var red = "\x1B[31m";
-var yellow = "\x1B[33m";
+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(
-        `[niledb][DEBUG]${params.join("")} ${message}`,
-        meta ? `
-${JSON.stringify(meta, null, 2)}` : ""
+        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? `${JSON.stringify(meta)}` : ""
       );
     }
   },
   debug(message, meta) {
     if (config?.debug) {
       console.debug(
-        `[niledb][DEBUG]${params.join("")} ${message}`,
-        meta ? `
-${JSON.stringify(meta, null, 2)}` : ""
+        `${orange}[niledb]${reset}${purple}[DEBUG]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? `${JSON.stringify(meta)}` : ""
       );
     }
   },
   warn(message, meta) {
     if (config?.debug) {
       console.warn(
-        `${yellow}[niledb][WARN]${reset}${params.join("")} ${message}`,
-        JSON.stringify(meta, null, 2)
+        `${orange}[niledb]${reset}${yellow}[WARN]${reset}${params.join(
+          ""
+        )}${reset} ${message}`,
+        meta ? JSON.stringify(meta) : ""
       );
     }
   },
   error(message, meta) {
     console.error(
-      `${red}[niledb][ERROR]${reset}${params.join("")} ${message}`,
-      meta
+      `${orange}[niledb]${reset}${red}[ERROR]${reset}${params.join(
+        ""
+      )}${red} ${message}`,
+      meta ? meta : "",
+      `${reset}`
     );
   }
 });
@@ -77,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]");
@@ -110,7 +186,7 @@ async function request(url, _init, config) {
     debug(`Obtained origin from request ${requestUrl.origin}`);
   }
   const params = { ...init, headers: updatedHeaders };
-  if (params.method === "POST" || params.method === "PUT") {
+  if (params.method?.toLowerCase() === "post" || params.method?.toLowerCase() === "put") {
     try {
       updatedHeaders.set("content-type", "application/json");
       const initBody = await new Response(_init.request.clone().body).json();
@@ -125,22 +201,26 @@ async function request(url, _init, config) {
   }
   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 }
-      );
-    });
+    setContext(updatedHeaders);
+    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()
     });
+    setCookie(res?.headers);
     return res;
   } catch (e) {
     if (e instanceof Error) {
@@ -440,11 +520,11 @@ var ApiConfig = class {
    * If this is set, any `callbackUrl` from the client will be ignored.
    */
   callbackUrl;
-  _token;
+  #token;
   constructor(config, logger) {
     const envVarConfig = { config, logger };
     this.cookieKey = getCookieKey(envVarConfig);
-    this._token = getToken(envVarConfig);
+    this.#token = getToken(envVarConfig);
     this.callbackUrl = getCallbackUrl(envVarConfig);
     this.secureCookies = getSecureCookies(envVarConfig);
     this.basePath = getBasePath(envVarConfig);
@@ -453,10 +533,10 @@ var ApiConfig = class {
     this.origin = config?.api?.origin;
   }
   get token() {
-    return this._token;
+    return this.#token;
   }
   set token(value) {
-    this._token = value;
+    this.#token = value;
   }
 };
 var Config = class {
@@ -968,7 +1048,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) {
@@ -1003,7 +1083,8 @@ function getUserFromHttp(headers, config) {
   }
   return headers?.get(X_NILE_USER_ID) ?? config.userId;
 }
-function makeBasicHeaders(config, opts) {
+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;
@@ -1016,11 +1097,31 @@ function makeBasicHeaders(config, opts) {
       headers.set("Authorization", `Bearer ${getToken({ config })}`);
     }
   }
+  const cookie = headers.get("cookie");
+  if (!cookie) {
+    const contextCookie = getCookie();
+    if (contextCookie) {
+      headers.set("cookie", contextCookie);
+    } else {
+      if (!url.endsWith("/users")) {
+        error(
+          "Missing cookie header from request. Call nile.api.setContext(request) before making additional calls."
+        );
+      }
+    }
+  }
   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."
+    );
   }
   return headers;
 }
@@ -1029,7 +1130,7 @@ async function _fetch(config, path, opts) {
   const url = `${config.api?.basePath}${path}`;
   const headers = new Headers(opts?.headers);
   const tenantId = getTenantFromHttp(headers, config);
-  const basicHeaders = makeBasicHeaders(config, opts);
+  const basicHeaders = makeBasicHeaders(config, url, opts);
   updateTenantId(tenantId);
   const userId = getUserFromHttp(headers, config);
   updateUserId(userId);
@@ -1988,7 +2089,7 @@ function serverLogin(config, handlers) {
     if (!authCookie) {
       throw new Error("authentication failed");
     }
-    const [, token] = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie) ?? [];
+    const token = parseToken(loginRes?.headers);
     if (!token) {
       error("Unable to obtain auth token", { authCookie });
       throw new Error("Server login failed");
@@ -2001,6 +2102,17 @@ function serverLogin(config, handlers) {
     return [headers, loginRes];
   };
 }
+function parseToken(headers) {
+  let authCookie = headers?.get("set-cookie");
+  if (!authCookie) {
+    authCookie = headers?.get("cookie");
+  }
+  if (!authCookie) {
+    return void 0;
+  }
+  const [, token] = /((__Secure-)?nile\.session-token=[^;]+)/.exec(authCookie) ?? [];
+  return token;
+}
 var Auth = class extends Config {
   headers;
   resetHeaders;
@@ -2247,8 +2359,15 @@ var Users = class extends Config {
     super(config);
     this.headers = headers;
   }
-  get usersUrl() {
-    return "/users";
+  usersUrl(user) {
+    const params = new URLSearchParams();
+    if (user.newTenantName) {
+      params.set("newTenantName", user.newTenantName);
+    }
+    if (user.tenantId) {
+      params.set("tenantId", user.tenantId);
+    }
+    return `/users?${params.size > 0 ? params : ""}`;
   }
   get tenantUsersUrl() {
     return `/tenants/${this.tenantId ?? "{tenantId}"}/users`;
@@ -2273,10 +2392,10 @@ var Users = class extends Config {
     }
     return void 0;
   }
-  createUser = async (req, init) => {
+  createUser = async (user, init) => {
     const _requester = new Requester(this);
     const _init = this.handleHeaders(init);
-    return await _requester.post(req, this.usersUrl, _init);
+    return await _requester.post(user, this.usersUrl(user), _init);
   };
   createTenantUser = async (req, init) => {
     const _requester = new Requester(this);
@@ -2421,6 +2540,7 @@ var Api = class {
   };
   resetHeaders = (headers) => {
     this.#headers = new Headers(headers ?? {});
+    setContext(new Headers());
     this.reset();
   };
   set headers(headers) {
@@ -2450,12 +2570,21 @@ var Api = class {
   get headers() {
     return this.#headers;
   }
+  getCookie(req) {
+    if (req instanceof Headers) {
+      return parseToken(req);
+    } else if (req instanceof Request) {
+      return parseToken(req.headers);
+    }
+    return null;
+  }
   login = async (payload, config) => {
     const [headers, loginRes] = await serverLogin(
       this.config,
       this.handlers
     )(payload);
     this.headers = headers;
+    this.setContext(headers);
     if (config?.returnResponse) {
       return loginRes;
     }
@@ -2469,6 +2598,17 @@ var Api = class {
     }
     return this.auth.getSession(this.#headers);
   };
+  setContext = (req) => {
+    if (req instanceof Headers) {
+      setContext(req);
+    } else if (req instanceof Request) {
+      setContext(req.headers);
+    }
+    const { warn } = Logger(this.config, "[API]");
+    if (warn) {
+      warn("Set context expects a Request or Header object");
+    }
+  };
 };
 
 // src/Server.ts