@niledatabase/server 5.0.3-alpha.0 → 5.0.3-alpha.1

package/dist/index.js

@@ -304,8 +304,13 @@ function mergeCookies(...cookieStrings) {
   }
   return [...cookieMap.entries()].map(([k, v]) => `${k}=${v}`).join("; ");
 }
-async function runExtensionContext(config) {
-  await config?.extensionCtx?.runExtensions("withContext" /* withContext */, config);
+async function runExtensionContext(config, options) {
+  if (!options?.skipWithContext) {
+    await config?.extensionCtx?.runExtensions(
+      "withContext" /* withContext */,
+      config
+    );
+  }
   await config?.extensionCtx?.runExtensions(
     "withTenantId" /* withTenantId */,
     config
@@ -375,38 +380,55 @@ var ctx = {
   // for convenience only
   getLastUsed: () => lastUsedContext
 };
-function withNileContext(config, fn, name = "unknown") {
+async function withNileContext(config, fn, name = "unknown") {
   const initialContext = config.context;
   const existing = ctx.get();
-  const mergedHeaders = new Headers(existing.headers);
+  const { overrides: extensionOverrides, ran: extensionRan } = await resolveExtensionOverrides(config, existing);
+  let mergedHeaders = new Headers(existing.headers);
+  let tenantId = existing.tenantId;
+  let userId = existing.userId;
   if (initialContext instanceof Request) {
     initialContext.headers.forEach((value, key17) => {
       mergedHeaders.set(key17, value);
     });
-    const context2 = {
-      headers: mergedHeaders,
-      tenantId: existing.tenantId,
-      userId: existing.userId
-    };
-    silly(`${name} [INITIAL - Request] ${serializeContext(context2)}`);
-    return ctx.run(context2, fn);
+  } else {
+    if (initialContext.headers === null) {
+      mergedHeaders = new Headers();
+    } else if (initialContext.headers) {
+      const incoming = initialContext.headers instanceof Headers ? initialContext.headers : new Headers(initialContext.headers);
+      incoming.forEach((value, key17) => {
+        mergedHeaders.set(key17, value);
+      });
+    }
+    if ("tenantId" in initialContext) {
+      tenantId = initialContext.tenantId;
+    }
+    if ("userId" in initialContext) {
+      userId = initialContext.userId;
+    }
   }
-  if (initialContext.headers) {
-    const incoming = initialContext.headers instanceof Headers ? initialContext.headers : new Headers(initialContext.headers);
-    incoming.forEach((value, key17) => {
+  if (extensionOverrides?.headers) {
+    for (const key17 of extensionOverrides.headers.removed) {
+      mergedHeaders.delete(key17);
+    }
+    for (const [key17, value] of extensionOverrides.headers.set) {
       mergedHeaders.set(key17, value);
-    });
+    }
+  }
+  if (extensionOverrides?.tenantId) {
+    tenantId = extensionOverrides.tenantId.value;
+  }
+  if (extensionOverrides?.userId) {
+    userId = extensionOverrides.userId.value;
   }
-  const hasTenantId = "tenantId" in initialContext;
-  const hasUserId = "userId" in initialContext;
   const context = {
     headers: mergedHeaders,
-    tenantId: hasTenantId ? initialContext.tenantId : existing.tenantId,
-    userId: hasUserId ? initialContext.userId : existing.userId
+    tenantId,
+    userId
   };
-  silly(`${name} [INITIAL - Partial<Context>] ${serializeContext(context)}`);
+  silly(`${name} [INITIAL] ${serializeContext(context)}`);
   return ctx.run(context, async () => {
-    await runExtensionContext(config);
+    await runExtensionContext(config, { skipWithContext: extensionRan });
     return fn();
   });
 }
@@ -432,10 +454,81 @@ function parseCookieHeader(header) {
 function serializeCookies(cookies) {
   return Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join("; ");
 }
+async function resolveExtensionOverrides(config, existing) {
+  if (!config.extensions?.length || !config.extensionCtx) {
+    return { ran: false };
+  }
+  let updated;
+  await ctx.run(
+    {
+      headers: new Headers(existing.headers),
+      tenantId: existing.tenantId,
+      userId: existing.userId
+    },
+    async () => {
+      await config.extensionCtx?.runExtensions(
+        "withContext" /* withContext */,
+        config
+      );
+      updated = ctx.get();
+    }
+  );
+  if (!updated) {
+    return { ran: true };
+  }
+  const diff = diffContext(existing, updated);
+  return { overrides: diff, ran: true };
+}
+function diffContext(before, after) {
+  const headers = diffHeaders(before.headers, after.headers);
+  const tenantChanged = before.tenantId !== after.tenantId;
+  const userChanged = before.userId !== after.userId;
+  if (!headers && !tenantChanged && !userChanged) {
+    return void 0;
+  }
+  const overrides = {};
+  if (headers) {
+    overrides.headers = headers;
+  }
+  if (tenantChanged) {
+    overrides.tenantId = { value: after.tenantId };
+  }
+  if (userChanged) {
+    overrides.userId = { value: after.userId };
+  }
+  return overrides;
+}
+function diffHeaders(before, after) {
+  const beforeMap = headersToMap(before);
+  const afterMap = headersToMap(after);
+  const set = [];
+  const removed = [];
+  for (const [key17, value] of afterMap.entries()) {
+    if (beforeMap.get(key17) !== value) {
+      set.push([key17, value]);
+    }
+  }
+  for (const key17 of beforeMap.keys()) {
+    if (!afterMap.has(key17)) {
+      removed.push(key17);
+    }
+  }
+  if (set.length === 0 && removed.length === 0) {
+    return void 0;
+  }
+  return { set, removed };
+}
+function headersToMap(headers) {
+  const map = /* @__PURE__ */ new Map();
+  headers.forEach((value, key17) => {
+    map.set(key17.toLowerCase(), value);
+  });
+  return map;
+}
 
 // src/api/utils/request.ts
 async function request(url, _init, config) {
-  const { debug, info, error, warn: warn2 } = config.logger("[REQUEST]");
+  const { debug, info, error } = config.logger("[REQUEST]");
   const { request: request2, ...init } = _init;
   const requestUrl = new URL(request2.url);
   const updatedHeaders = new Headers({});
@@ -2411,79 +2504,89 @@ var Auth = class {
    * from the internal configuration once the request completes.
    */
   async signOut() {
-    return withNileContext(this.#config, async () => {
-      const csrfRes = await this.getCsrf();
-      if (!("csrfToken" in csrfRes)) {
-        throw new Error("Unable to obtain CSRF token. Sign out failed.");
-      }
-      const body = JSON.stringify({
-        csrfToken: csrfRes.csrfToken,
-        json: true
-      });
-      const res = await fetchSignOut(this.#config, body);
-      updateHeaders(new Headers({}));
-      ctx.set({ headers: null });
-      return res;
-    });
+    return withNileContext(
+      this.#config,
+      async () => {
+        const csrfRes = await this.getCsrf();
+        if (!("csrfToken" in csrfRes)) {
+          throw new Error("Unable to obtain CSRF token. Sign out failed.");
+        }
+        const body = JSON.stringify({
+          csrfToken: csrfRes.csrfToken,
+          json: true
+        });
+        const res = await fetchSignOut(this.#config, body);
+        updateHeaders(new Headers({}));
+        ctx.set({ headers: null });
+        return res;
+      },
+      "signout"
+    );
   }
   async signUp(payload, rawResponse) {
-    return withNileContext(this.#config, async () => {
-      ctx.set({ headers: null });
-      const { email, password, ...params } = payload;
-      if (!email || !password) {
-        throw new Error(
-          "Server side sign up requires a user email and password."
-        );
-      }
-      const providers = await this.listProviders();
-      const { credentials } = providers ?? {};
-      if (!credentials) {
-        throw new Error(
-          "Unable to obtain credential provider. Aborting server side sign up."
-        );
-      }
-      const csrf = await obtainCsrf(this.#config);
-      let csrfToken;
-      if ("csrfToken" in csrf) {
-        csrfToken = csrf.csrfToken;
-      } else {
-        throw new Error("Unable to obtain parse CSRF. Request blocked.");
-      }
-      const body = JSON.stringify({
-        email,
-        password,
-        csrfToken,
-        callbackUrl: credentials.callbackUrl
-      });
-      const res = await fetchSignUp(this.#config, { body, params });
-      if (res.status > 299) {
-        this.#logger.error(await res.clone().text());
-        return void 0;
-      }
-      const token = parseToken(res.headers);
-      if (!token) {
-        throw new Error("Server side sign up failed. Session token not found");
-      }
-      const { headers } = ctx.get();
-      headers?.append("cookie", token);
-      ctx.set({ headers });
-      updateHeaders(headers);
-      if (rawResponse) {
-        return res;
-      }
-      try {
-        const json = await res.clone().json();
-        if (json && typeof json === "object" && "tenants" in json) {
-          const tenantId = json.tenants[0];
-          if (tenantId) {
-            updateTenantId(tenantId);
+    return withNileContext(
+      this.#config,
+      async () => {
+        ctx.set({ headers: null });
+        const { email, password, ...params } = payload;
+        if (!email || !password) {
+          throw new Error(
+            "Server side sign up requires a user email and password."
+          );
+        }
+        const providers = await this.listProviders();
+        const { credentials } = providers ?? {};
+        if (!credentials) {
+          throw new Error(
+            "Unable to obtain credential provider. Aborting server side sign up."
+          );
+        }
+        const csrf = await obtainCsrf(this.#config);
+        let csrfToken;
+        if ("csrfToken" in csrf) {
+          csrfToken = csrf.csrfToken;
+        } else {
+          throw new Error("Unable to obtain parse CSRF. Request blocked.");
+        }
+        const body = JSON.stringify({
+          email,
+          password,
+          csrfToken,
+          callbackUrl: credentials.callbackUrl
+        });
+        const res = await fetchSignUp(this.#config, { body, params });
+        if (res.status > 299) {
+          this.#logger.error(await res.clone().text());
+          return void 0;
+        }
+        const token = parseToken(res.headers);
+        if (!token) {
+          throw new Error(
+            "Server side sign up failed. Session token not found"
+          );
+        }
+        const { headers } = ctx.get();
+        headers?.append("cookie", token);
+        ctx.set({ headers });
+        updateHeaders(headers);
+        if (rawResponse) {
+          return res;
+        }
+        try {
+          const json = await res.clone().json();
+          if (json && typeof json === "object" && "tenants" in json) {
+            const tenantId = json.tenants[0];
+            if (tenantId) {
+              updateTenantId(tenantId);
+            }
           }
+          return json;
+        } catch {
+          return res;
         }
-        return json;
-      } catch {
-        return res;
-      }
-    });
+      },
+      "signup"
+    );
   }
   /**
    * Request a password reset email.
@@ -2966,17 +3069,21 @@ var Users = class {
     });
   }
   async getSelf(rawResponse) {
-    return withNileContext(this.#config, async () => {
-      const res = await fetchMe(this.#config);
-      if (rawResponse) {
-        return res;
-      }
-      try {
-        return await res?.clone().json();
-      } catch {
-        return res;
-      }
-    });
+    return withNileContext(
+      this.#config,
+      async () => {
+        const res = await fetchMe(this.#config);
+        if (rawResponse) {
+          return res;
+        }
+        try {
+          return await res?.clone().json();
+        } catch {
+          return res;
+        }
+      },
+      "getSelf"
+    );
   }
   async verifySelf(options, rawResponse = false) {
     return withNileContext(this.#config, async () => {
@@ -3540,8 +3647,11 @@ var Server = class {
     const context = isFn ? {} : contextOrFn ?? {};
     const fn = isFn ? contextOrFn : maybeFn;
     const preserve = "useLastContext" in context ? context.useLastContext : true;
+    let hydrated;
     if (preserve) {
-      this.#config.context = { ...this.getContext(), ...context };
+      hydrated = await this.#hydrateContextFromExtensions();
+      const base = hydrated ?? this.#config.context;
+      this.#config.context = { ...base, ...context };
     } else {
       this.#config.context = { ...defaultContext, ...context };
     }
@@ -3613,6 +3723,31 @@ var Server = class {
     }
     this.#config.logger("[handleHeaders]").debug(JSON.stringify(merged));
   }
+  async #hydrateContextFromExtensions() {
+    if (!this.#config.extensions || this.#config.extensions.length === 0) {
+      return void 0;
+    }
+    let updated;
+    await ctx.run({}, async () => {
+      await this.#config.extensionCtx?.runExtensions(
+        "withContext" /* withContext */,
+        this.#config
+      );
+      updated = ctx.get();
+    });
+    if (!updated) {
+      return void 0;
+    }
+    const hydrated = {
+      headers: new Headers(updated.headers),
+      tenantId: updated.tenantId,
+      userId: updated.userId
+    };
+    this.#config.context.headers = new Headers(hydrated.headers);
+    this.#config.context.tenantId = hydrated.tenantId;
+    this.#config.context.userId = hydrated.userId;
+    return hydrated;
+  }
   /**
    * Allow some internal mutations to reset our config + headers
    */