@niledatabase/server 5.0.0-alpha.13 → 5.0.0-alpha.15

package/dist/index.js

@@ -8,6 +8,12 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var pg__default = /*#__PURE__*/_interopDefault(pg);
 
 // src/types.ts
+var ExtensionState = /* @__PURE__ */ ((ExtensionState2) => {
+  ExtensionState2["onHandleRequest"] = "onHandleRequest";
+  ExtensionState2["onRequest"] = "onRequest";
+  ExtensionState2["onResponse"] = "onResposne";
+  return ExtensionState2;
+})(ExtensionState || {});
 var APIErrorErrorCodeEnum = {
   InternalError: "internal_error",
   BadRequest: "bad_request",
@@ -189,7 +195,12 @@ async function request(url, _init, config) {
     params.headers.set("request-id", crypto.randomUUID());
     params.cache = "no-store";
   }
-  await config.extensionCtx?.handleOnRequest(config, _init, params);
+  await config.extensionCtx?.runExtensions(
+    "onRequest" /* onRequest */,
+    config,
+    params,
+    _init
+  );
   try {
     const res = await fetch(fullUrl, {
       ...params
@@ -209,6 +220,14 @@ async function request(url, _init, config) {
       statusText: res?.statusText,
       text: await loggingRes?.text()
     });
+    const updatedRes = await config.extensionCtx?.runExtensions(
+      "onResposne" /* onResponse */,
+      config,
+      params
+    );
+    if (updatedRes) {
+      return updatedRes;
+    }
     return res;
   } catch (e) {
     if (e instanceof Error) {
@@ -232,16 +251,13 @@ async function auth(req, config) {
   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) {
+      info("no session found");
       return void 0;
     }
+    info("session active");
     return session;
   } catch (e) {
     error(e);
@@ -480,7 +496,7 @@ async function PUT3(config, init) {
   init.method = "PUT";
   const url = `${apiRoutes(config).INVITE(tenantId)}`;
   const res = await request(url, init, config);
-  const location = res?.headers.get("location");
+  const location = res?.headers?.get("location");
   if (location) {
     return new Response(res?.body, {
       status: 302,
@@ -853,7 +869,7 @@ async function route11(req, config) {
     ).catch((e) => {
       error("an error as occurred", e);
     });
-    const location = res?.headers.get("location");
+    const location = res?.headers?.get("location");
     if (location) {
       return new Response(res?.body, {
         status: 302,
@@ -954,7 +970,7 @@ async function route15(req, config) {
     },
     config
   );
-  const location = res?.headers.get("location");
+  const location = res?.headers?.get("location");
   if (location) {
     return new Response(res?.body, {
       status: 302,
@@ -998,7 +1014,7 @@ async function route16(req, config) {
     },
     config
   );
-  const location = res?.headers.get("location");
+  const location = res?.headers?.get("location");
   if (location) {
     return new Response(res?.body, {
       status: 302,
@@ -1028,8 +1044,21 @@ async function fetchVerifyEmail(config, method, body) {
 
 // src/api/handlers/GET.ts
 function GETTER(configRoutes, config) {
-  const { info, warn } = config.logger("[GET MATCHER]");
-  return async function GET7(req) {
+  const { error, info, warn } = config.logger("[GET MATCHER]");
+  return async function GET7(...params) {
+    const handledRequest = await config.extensionCtx?.runExtensions(
+      "onHandleRequest" /* onHandleRequest */,
+      config,
+      params
+    );
+    if (handledRequest) {
+      return handledRequest;
+    }
+    const req = params[0] instanceof Request ? params[0] : null;
+    if (!req) {
+      error("Proxy requests failed, a Request object was not passed.");
+      return;
+    }
     if (matches(configRoutes, req)) {
       info("matches me");
       return route(req, config);
@@ -1203,7 +1232,20 @@ async function fetchSignUp(config, payload) {
 // src/api/handlers/POST.ts
 function POSTER(configRoutes, config) {
   const { info, warn, error } = config.logger("[POST MATCHER]");
-  return async function POST6(req) {
+  return async function POST6(...params) {
+    const handledRequest = await config.extensionCtx?.runExtensions(
+      "onHandleRequest" /* onHandleRequest */,
+      config,
+      params
+    );
+    if (handledRequest) {
+      return handledRequest;
+    }
+    const req = params[0] instanceof Request ? params[0] : null;
+    if (!req) {
+      error("Proxy requests failed, a Request object was not passed.");
+      return;
+    }
     if (matchesLog(configRoutes, req)) {
       try {
         const json = await req.clone().json();
@@ -1378,8 +1420,21 @@ function matches19(configRoutes, request2) {
 
 // src/api/handlers/DELETE.ts
 function DELETER(configRoutes, config) {
-  const { info, warn } = config.logger("[DELETE MATCHER]");
-  return async function DELETE5(req) {
+  const { error, info, warn } = config.logger("[DELETE MATCHER]");
+  return async function DELETE5(...params) {
+    const handledRequest = await config.extensionCtx?.runExtensions(
+      "onHandleRequest" /* onHandleRequest */,
+      config,
+      params
+    );
+    if (handledRequest) {
+      return handledRequest;
+    }
+    const req = params[0] instanceof Request ? params[0] : null;
+    if (!req) {
+      error("Proxy requests failed, a Request object was not passed.");
+      return;
+    }
     if (matches19(configRoutes, req)) {
       info("matches tenant invite id");
       return route19(req, config);
@@ -1388,10 +1443,6 @@ function DELETER(configRoutes, config) {
       info("matches tenant user");
       return route18(req, config);
     }
-    if (matches3(configRoutes, req)) {
-      info("matches tenant users");
-      return route3(req, config);
-    }
     if (matches6(configRoutes, req)) {
       info("matches tenants");
       return route6(req, config);
@@ -1407,8 +1458,21 @@ function DELETER(configRoutes, config) {
 
 // src/api/handlers/PUT.ts
 function PUTER(configRoutes, config) {
-  const { info, warn } = config.logger("[PUT MATCHER]");
-  return async function PUT6(req) {
+  const { error, info, warn } = config.logger("[PUT MATCHER]");
+  return async function PUT6(...params) {
+    const handledRequest = await config.extensionCtx?.runExtensions(
+      "onHandleRequest" /* onHandleRequest */,
+      config,
+      params
+    );
+    if (handledRequest) {
+      return handledRequest;
+    }
+    const req = params[0] instanceof Request ? params[0] : null;
+    if (!req) {
+      error("Proxy requests failed, a Request object was not passed.");
+      return;
+    }
     if (matches4(configRoutes, req)) {
       info("matches tenant invite");
       return route4(req, config);
@@ -2347,6 +2411,9 @@ var Auth = class {
     }
     info(`Obtaining providers for ${email}`);
     info(`Attempting sign in with email ${email}`);
+    if (!email) {
+      throw new Error("Email missing from payload, unable to sign in");
+    }
     const body = JSON.stringify({
       email,
       password,
@@ -2464,6 +2531,7 @@ function defaultCallbackUrl({ config }) {
 async function obtainCsrf(config, rawResponse = false) {
   const res = await fetchCsrf(config);
   const csrfCook = parseCSRF(res.headers);
+  const h = new Headers();
   if (csrfCook) {
     const [, value] = csrfCook.split("=");
     const [token] = decodeURIComponent(value).split("|");
@@ -2475,7 +2543,8 @@ async function obtainCsrf(config, rawResponse = false) {
         parseToken(res.headers)
       ].filter(Boolean).join("; ");
       config.headers.set("cookie", cookie);
-      updateHeaders(new Headers({ cookie }));
+      h.set("cookie", cookie);
+      updateHeaders(h);
     }
     if (!rawResponse) {
       return { csrfToken: token };
@@ -2923,24 +2992,26 @@ function handlersWithContext(config) {
 function updateConfig(response, config) {
   let origin = "http://localhost:3000";
   let headers = null;
-  if (response?.status === 302) {
-    const location = response.headers.get("location");
-    if (location) {
-      const urlLocation = new URL(location);
-      origin = urlLocation.origin;
+  if (response instanceof Response) {
+    if (response?.status === 302) {
+      const location = response.headers.get("location");
+      if (location) {
+        const urlLocation = new URL(location);
+        origin = urlLocation.origin;
+      }
     }
-  }
-  const setCookies = [];
-  if (response?.headers) {
-    for (const [key17, value] of response.headers) {
-      if (key17.toLowerCase() === "set-cookie") {
-        setCookies.push(value);
+    const setCookies = [];
+    if (response?.headers) {
+      for (const [key17, value] of response.headers) {
+        if (key17.toLowerCase() === "set-cookie") {
+          setCookies.push(value);
+        }
       }
     }
-  }
-  if (setCookies.length > 0) {
-    const cookieHeader = setCookies.map((cookieStr) => cookieStr.split(";")[0]).join("; ");
-    headers = new Headers({ cookie: cookieHeader });
+    if (setCookies.length > 0) {
+      const cookieHeader = setCookies.map((cookieStr) => cookieStr.split(";")[0]).join("; ");
+      headers = new Headers({ cookie: cookieHeader });
+    }
   }
   return {
     ...config,
@@ -2951,26 +3022,51 @@ function updateConfig(response, config) {
 }
 
 // src/api/utils/extensions.ts
-function bindHandleOnRequest(instance) {
-  return async function handleOnRequest(config, _init, params) {
+function getRequestConfig(params) {
+  if (typeof params[1] === "object") {
+    return params[1];
+  }
+  return {};
+}
+function bindRunExtensions(instance) {
+  return async function runExtensions(toRun, config, params, _init) {
     const { debug } = config.logger("[EXTENSIONS]");
+    const extensionConfig = getRequestConfig(
+      Array.isArray(params) ? params : [null, params]
+    );
     if (config.extensions) {
       for (const create2 of config.extensions) {
         if (typeof create2 !== "function") {
-          return void 0;
+          continue;
+        }
+        const ext = create2(instance);
+        if (extensionConfig.disableExtensions?.includes(ext.id)) {
+          continue;
         }
-        const ext = await create2(instance);
-        if (ext.onRequest) {
+        if (ext.onHandleRequest && toRun === "onHandleRequest" /* onHandleRequest */) {
+          const result = await ext.onHandleRequest(
+            ...Array.isArray(params) ? params : [params]
+          );
+          if (result != null) {
+            return result;
+          }
+          continue;
+        }
+        const [param] = Array.isArray(params) ? params : [params];
+        if (ext.onRequest && toRun === "onRequest" /* onRequest */) {
           const previousContext = instance.getContext();
           if (previousContext.preserveHeaders) {
             instance.setContext({ preserveHeaders: false });
           }
+          if (!_init) {
+            continue;
+          }
           await ext.onRequest(_init.request);
           const updatedContext = instance.getContext();
           if (updatedContext?.headers) {
             const cookie = updatedContext.headers.get("cookie");
-            if (cookie) {
-              params.headers.set(
+            if (cookie && param.headers) {
+              param.headers.set(
                 "cookie",
                 mergeCookies(
                   previousContext.preserveHeaders ? previousContext.headers?.get("cookie") : null,
@@ -2978,22 +3074,31 @@ function bindHandleOnRequest(instance) {
                 )
               );
             }
-            if (updatedContext.tenantId) {
-              params.headers.set(
+            if (updatedContext.tenantId && param.headers) {
+              param.headers.set(
                 TENANT_COOKIE,
                 String(updatedContext.headers.get(TENANT_COOKIE))
               );
             }
           }
           debug(`${ext.id ?? create2.name} ran onRequest`);
+          continue;
+        }
+        if (ext.onResponse && toRun === "onResposne" /* onResponse */) {
+          const result = await ext.onResponse(param);
+          if (result != null) {
+            return result;
+          }
+          continue;
         }
       }
     }
+    return void 0;
   };
 }
 function buildExtensionConfig(instance) {
   return {
-    handleOnRequest: bindHandleOnRequest(instance)
+    runExtensions: bindRunExtensions(instance)
   };
 }
 function mergeCookies(...cookieStrings) {
@@ -3015,7 +3120,6 @@ var Server = class {
   auth;
   #config;
   #handlers;
-  #paths;
   #manager;
   #headers;
   #preserveHeaders;
@@ -3045,13 +3149,23 @@ var Server = class {
       withContext: handlersWithContext(this.#config)
     };
     this.#preserveHeaders = config?.preserveHeaders ?? false;
-    this.#paths = this.#config.paths;
     this.#config.tenantId = getTenantId({ config: this.#config });
     this.#manager = new DBManager(this.#config);
     this.#handleHeaders(config);
     this.users = new Users(this.#config);
     this.tenants = new Tenants(this.#config);
     this.auth = new Auth(this.#config);
+    if (config?.extensions) {
+      for (const create2 of config.extensions) {
+        if (typeof create2 !== "function") {
+          continue;
+        }
+        const ext = create2(this);
+        if (ext.onConfigure) {
+          ext.onConfigure();
+        }
+      }
+    }
   }
   get db() {
     const pool = this.#manager.getConnection(this.#config);
@@ -3061,6 +3175,28 @@ var Server = class {
       }
     });
   }
+  get logger() {
+    return this.#config.logger;
+  }
+  get extensions() {
+    return {
+      remove: async (id) => {
+        if (!this.#config.extensions) return;
+        const resolved = this.#config.extensions.map((ext) => ext(this));
+        const index = resolved.findIndex((ext) => ext.id === id);
+        if (index !== -1) {
+          this.#config.extensions.splice(index, 1);
+        }
+        return resolved;
+      },
+      add: (extension) => {
+        if (!this.#config.extensions) {
+          this.#config.extensions = [];
+        }
+        this.#config.extensions.push(extension);
+      }
+    };
+  }
   /**
    * A convenience function that applies a config and ensures whatever was passed is set properly
    */
@@ -3076,12 +3212,15 @@ var Server = class {
     this.#reset();
     return this;
   }
-  getPaths() {
-    return this.#paths;
-  }
   get handlers() {
     return this.#handlers;
   }
+  get paths() {
+    return this.#config.paths;
+  }
+  set paths(paths) {
+    this.#config.paths = paths;
+  }
   /**
    * Allow the setting of headers from a req or header object.
    * Makes it possible to handle REST requests easily
@@ -3089,7 +3228,27 @@ var Server = class {
    * @param req
    * @returns undefined
    */
-  setContext(req) {
+  setContext = (req, ...remaining) => {
+    let atLeastOne = false;
+    if (this.#config?.extensions) {
+      for (const create2 of this.#config.extensions) {
+        if (typeof create2 !== "function") {
+          continue;
+        }
+        const ext = create2(this);
+        if (typeof ext.onSetContext === "function") {
+          if (req) {
+            ext.onSetContext(req, ...remaining);
+            atLeastOne = true;
+          } else {
+            this.#config.logger("extension").warn("attempted to call onSetContext without a value");
+          }
+        }
+      }
+    }
+    if (atLeastOne) {
+      return;
+    }
     try {
       if (req instanceof Headers) {
         this.#handleHeaders(req);
@@ -3119,11 +3278,14 @@ var Server = class {
       return;
     }
     if (typeof req === "object") {
-      const headers = new Headers(req);
-      if (headers) {
-        this.#handleHeaders(headers);
-        this.#reset();
-        return;
+      try {
+        const headers = new Headers(req);
+        if (headers) {
+          this.#handleHeaders(headers);
+          this.#reset();
+          return;
+        }
+      } catch {
       }
     }
     const { warn } = Logger(this.#config)("[API]");
@@ -3132,12 +3294,12 @@ var Server = class {
         "Set context expects a Request, Header instance or an object of Record<string, string>"
       );
     }
-  }
+  };
   getContext() {
     return {
       headers: this.#headers,
-      userId: this.#config.userId,
-      tenantId: this.#config.tenantId,
+      userId: this.#config?.userId,
+      tenantId: this.#config?.tenantId,
       preserveHeaders: this.#preserveHeaders
     };
   }
@@ -3190,6 +3352,7 @@ var Server = class {
    */
   #reset = () => {
     this.#config.headers = this.#headers ?? new Headers();
+    this.#config.extensionCtx = buildExtensionConfig(this);
     this.users = new Users(this.#config);
     this.tenants = new Tenants(this.#config);
     this.auth = new Auth(this.#config);
@@ -3204,6 +3367,7 @@ function create(config) {
 }
 
 exports.APIErrorErrorCodeEnum = APIErrorErrorCodeEnum;
+exports.ExtensionState = ExtensionState;
 exports.HEADER_ORIGIN = HEADER_ORIGIN;
 exports.HEADER_SECURE_COOKIES = HEADER_SECURE_COOKIES;
 exports.LoginUserResponseTokenTypeEnum = LoginUserResponseTokenTypeEnum;
@@ -3213,6 +3377,7 @@ exports.TENANT_COOKIE = TENANT_COOKIE;
 exports.USER_COOKIE = USER_COOKIE;
 exports.parseCSRF = parseCSRF;
 exports.parseCallback = parseCallback;
+exports.parseResetToken = parseResetToken;
 exports.parseToken = parseToken;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map