@niledatabase/express 5.0.0-alpha.14 → 5.0.0-alpha.15

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.15](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.14...v5.0.0-alpha.15) (2025-06-25)
+
+### Bug Fixes
+
+- **server:** add better extensions ([2dd7417](https://github.com/niledatabase/nile-js/commit/2dd741726e2336b042d06a36ad091e6749098454))
+
 # [5.0.0-alpha.14](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.13...v5.0.0-alpha.14) (2025-06-16)
 
 **Note:** Version bump only for package @niledatabase/express

package/dist/index.d.mts

@@ -1,31 +1,13 @@
-import { Server, NileConfig } from '@niledatabase/server';
+import * as _niledatabase_server from '@niledatabase/server';
+import { Server } from '@niledatabase/server';
+import { Request, Response, NextFunction } from 'express';
 
 declare function cleaner(val: string): string;
-declare function expressPaths(nile: Server): {
-    paths: {
-        get: string[];
-        post: string[];
-        put: string[];
-        delete: string[];
-    };
+declare const express: (instance: Server) => {
+    id: string;
+    onSetContext: (req: Request, res: Response, next: NextFunction) => void;
+    onConfigure: () => void;
+    onHandleRequest: (req: Request, res: Response) => Promise<_niledatabase_server.RouteReturn>;
 };
-type HandlerConfig = {
-    muteResponse?: boolean;
-    init?: RequestInit;
-};
-declare function NileExpressHandler(nile: Server, config?: HandlerConfig & NileConfig): Promise<{
-    handler: (req: any, res?: any) => Promise<{
-        body: string;
-        status: number;
-        headers: Record<string, string | string[]>;
-        response: Response;
-    } | null | undefined>;
-    paths: {
-        get: string[];
-        post: string[];
-        put: string[];
-        delete: string[];
-    };
-}>;
 
-export { NileExpressHandler, cleaner, expressPaths };
+export { cleaner, express };

package/dist/index.d.ts

@@ -1,31 +1,13 @@
-import { Server, NileConfig } from '@niledatabase/server';
+import * as _niledatabase_server from '@niledatabase/server';
+import { Server } from '@niledatabase/server';
+import { Request, Response, NextFunction } from 'express';
 
 declare function cleaner(val: string): string;
-declare function expressPaths(nile: Server): {
-    paths: {
-        get: string[];
-        post: string[];
-        put: string[];
-        delete: string[];
-    };
+declare const express: (instance: Server) => {
+    id: string;
+    onSetContext: (req: Request, res: Response, next: NextFunction) => void;
+    onConfigure: () => void;
+    onHandleRequest: (req: Request, res: Response) => Promise<_niledatabase_server.RouteReturn>;
 };
-type HandlerConfig = {
-    muteResponse?: boolean;
-    init?: RequestInit;
-};
-declare function NileExpressHandler(nile: Server, config?: HandlerConfig & NileConfig): Promise<{
-    handler: (req: any, res?: any) => Promise<{
-        body: string;
-        status: number;
-        headers: Record<string, string | string[]>;
-        response: Response;
-    } | null | undefined>;
-    paths: {
-        get: string[];
-        post: string[];
-        put: string[];
-        delete: string[];
-    };
-}>;
 
-export { NileExpressHandler, cleaner, expressPaths };
+export { cleaner, express };

package/dist/index.js

@@ -1,2 +1,2 @@
-"use strict";var R=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var E=Object.prototype.hasOwnProperty;var T=(n,e)=>{for(var r in e)R(n,r,{get:e[r],enumerable:!0})},S=(n,e,r,d)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of P(e))!E.call(n,i)&&i!==r&&R(n,i,{get:()=>e[i],enumerable:!(d=x(e,i))||d.enumerable});return n};var U=n=>S(R({},"__esModule",{value:!0}),n);var C={};T(C,{NileExpressHandler:()=>j,cleaner:()=>p,expressPaths:()=>b});module.exports=U(C);function p(n){return n.replaceAll(/\{([^}]+)\}/g,":$1")}function b(n){let e=n.getPaths();return{paths:{get:e.get.map(p),post:e.post.map(p),put:e.put.map(p),delete:e.delete.map(p)}}}async function j(n,e){let r=e?.logger?e?.logger("express").error:()=>null;async function d(t,u){let f=new Headers;if(!t||typeof t!="object")return null;if(!("url"in t)||typeof t?.url!="string")return r("A url is necessary for the nile express handler"),null;let h="method"in t&&typeof t.method=="string"?t.method:"GET";"headers"in t&&typeof t.headers=="object"&&t.headers&&"cookie"in t.headers&&typeof t.headers.cookie=="string"&&f.set("cookie",t.headers.cookie);let g={method:h,...e?.init};"body"in t&&(h==="POST"||h==="PUT")&&(f.set("content-type","application/json"),g.body=JSON.stringify(t.body)),g.headers=f;let y=t.protocol+"://"+t.get("host")+t.originalUrl;try{new URL(y)}catch(s){return r("Invalid URL",{url:y,error:s}),null}let w=new Request(y,g),o;try{o=await n.handlers[h](w)}catch(s){r(s)}let a;if(o instanceof Response){try{a=await(await o.clone()).json()}catch{a=await o.text()}let s={};if(o.headers.forEach((c,l)=>{if(!["content-length","transfer-encoding"].includes(l.toLowerCase()))if(s[l]){let m=s[l];Array.isArray(m)?s[l]=[...m,c]:s[l]=[m,c]}else s[l]=c}),e?.muteResponse!==!0){u&&(u.status(o.status).set(s),typeof a=="string"?u.send(a):u.json(a??{}));return}return{body:a,status:o.status,headers:s,response:o}}else{r("Bad response",{response:o});return}}let{paths:i}=b(n);return{handler:d,paths:i}}0&&(module.exports={NileExpressHandler,cleaner,expressPaths});
+"use strict";var x=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var w=Object.prototype.hasOwnProperty;var m=(s,n)=>{for(var o in n)x(s,o,{get:n[o],enumerable:!0})},S=(s,n,o,e)=>{if(n&&typeof n=="object"||typeof n=="function")for(let t of y(n))!w.call(s,t)&&t!==o&&x(s,t,{get:()=>n[t],enumerable:!(e=R(n,t))||e.enumerable});return s};var T=s=>S(x({},"__esModule",{value:!0}),s);var C={};m(C,{cleaner:()=>h,express:()=>b});module.exports=T(C);var g=require("@niledatabase/server");function h(s){return s.replaceAll(/\{([^}]+)\}/g,":$1")}var b=s=>{let{error:n,debug:o}=s.logger("[EXTENSION][express]");return{id:"express",onSetContext:(e,t,a)=>{e.params.tenantId&&s.setContext({tenantId:e.params.tenantId}),e.headers&&s.setContext(e.headers),e instanceof Headers&&s.setContext(e),typeof a=="function"&&a()},onConfigure:()=>{let{paths:e}=s,t={get:e.get.map(h),post:e.post.map(h),put:e.put.map(h),delete:e.delete.map(h)};o(`paths configured ${JSON.stringify(t)}`),s.paths=t},onHandleRequest:async(e,t)=>{if(e instanceof Request)return o("using default response"),await s.handlers[e.method](e,{disableExtensions:["express"]});o("handling response"),s.setContext(e.headers);let a=e.protocol+"://"+e.get("host")+e.originalUrl;try{new URL(a)}catch{throw new Error("Invalid URL sent for handle request. Are you running express?")}let{method:f}=e,u={method:f,headers:new Headers};"headers"in e&&typeof e.headers=="object"&&e.headers&&"cookie"in e.headers&&typeof e.headers.cookie=="string"&&u.headers.set("cookie",e.headers.cookie),"body"in e&&(f==="POST"||f==="PUT")&&(u.body=JSON.stringify(e.body));let E=new Request(a,u);o(`[${f.toUpperCase()}]proxy request converted to ${a} with ${JSON.stringify(u)}`);let d=null;try{d=await s.handlers[e.method](E,{disableExtensions:["express"]})}catch(r){n(r)}let c;try{c=await(await d.clone()).json()}catch{c=await d.text()}let i={};return d.headers.forEach((r,p)=>{if(!["content-length","transfer-encoding"].includes(p.toLowerCase()))if(i[p]){let l=i[p];Array.isArray(l)?i[p]=[...l,r]:i[p]=[l,r]}else i[p]=r}),t.headersSent||(o("sending response"),t.status(d.status).set(i),typeof c=="string"?t.send(c):t.json(c??{})),g.ExtensionState.onHandleRequest}}};0&&(module.exports={cleaner,express});
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { NileConfig, Server } from '@niledatabase/server';\n\nexport function cleaner(val: string) {\n  return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\nexport function expressPaths(nile: Server) {\n  const nilePaths = nile.getPaths();\n  const paths = {\n    get: nilePaths.get.map(cleaner),\n    post: nilePaths.post.map(cleaner),\n    put: nilePaths.put.map(cleaner),\n    delete: nilePaths.delete.map(cleaner),\n  };\n  return {\n    paths,\n  };\n}\n\ntype HandlerConfig = { muteResponse?: boolean; init?: RequestInit };\nexport async function NileExpressHandler(\n  nile: Server,\n  config?: HandlerConfig & NileConfig\n) {\n  const error = config?.logger ? config?.logger('express').error : () => null;\n  async function handler(\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    req: any,\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    res?: any\n  ): Promise<\n    | {\n        body: string;\n        status: number;\n        headers: Record<string, string | string[]>;\n        response: Response;\n      }\n    | null\n    | undefined\n  > {\n    const headers = new Headers();\n    if (!req || typeof req !== 'object') {\n      return null;\n    }\n    if (!('url' in req) || typeof req?.url !== 'string') {\n      error('A url is necessary for the nile express handler');\n      return null;\n    }\n    const method =\n      'method' in req && typeof req.method === 'string' ? req.method : 'GET';\n\n    if (\n      'headers' in req &&\n      typeof req.headers === 'object' &&\n      req.headers &&\n      'cookie' in req.headers &&\n      typeof req.headers.cookie === 'string'\n    ) {\n      headers.set('cookie', req.headers.cookie);\n    }\n    const _init: RequestInit = { method, ...config?.init };\n\n    if ('body' in req) {\n      if (method === 'POST' || method === 'PUT') {\n        headers.set('content-type', 'application/json');\n        _init.body = JSON.stringify(req.body);\n      }\n    }\n\n    _init.headers = headers;\n\n    const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n    // be sure its a valid url\n    try {\n      new URL(reqUrl);\n    } catch (e) {\n      error('Invalid URL', {\n        url: reqUrl,\n        error: e,\n      });\n      return null;\n    }\n    const proxyRequest = new Request(reqUrl, _init);\n    let response;\n    try {\n      response = await nile.handlers[\n        method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n      ](proxyRequest);\n    } catch (e) {\n      error(e);\n    }\n\n    let body;\n\n    if (response instanceof Response) {\n      try {\n        const tryJson = await response.clone();\n        body = await tryJson.json();\n      } catch (e) {\n        body = await response.text();\n      }\n      const newHeaders: Record<string, string | string[]> = {};\n      response.headers.forEach((value, key) => {\n        if (\n          !['content-length', 'transfer-encoding'].includes(key.toLowerCase())\n        ) {\n          if (newHeaders[key]) {\n            const prev = newHeaders[key];\n            if (Array.isArray(prev)) {\n              newHeaders[key] = [...prev, value];\n            } else {\n              newHeaders[key] = [prev, value];\n            }\n          } else {\n            newHeaders[key] = value;\n          }\n        }\n      });\n\n      if (config?.muteResponse !== true) {\n        if (res) {\n          res.status(response.status).set(newHeaders);\n          if (typeof body === 'string') {\n            res.send(body);\n          } else {\n            res.json(body ?? {});\n          }\n        }\n        return;\n      }\n\n      return {\n        body,\n        status: response.status,\n        headers: newHeaders,\n        response,\n      };\n    } else {\n      error('Bad response', { response });\n      return;\n    }\n  }\n  const { paths } = expressPaths(nile);\n  return { handler, paths };\n}\n"],"mappings":"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","names":["index_exports","__export","NileExpressHandler","cleaner","expressPaths","__toCommonJS","val","nile","nilePaths","config","error","handler","req","res","headers","method","_init","reqUrl","e","proxyRequest","response","body","newHeaders","value","key","prev","paths"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { ExtensionState, Server } from '@niledatabase/server';\nimport type {\n  Request as ExpressRequest,\n  Response as ExpressResponse,\n  NextFunction,\n} from 'express';\n\nexport function cleaner(val: string) {\n  return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\nexport const express = (instance: Server) => {\n  const { error, debug } = instance.logger('[EXTENSION][express]');\n  return {\n    id: 'express',\n    onSetContext: (\n      req: ExpressRequest,\n      res: ExpressResponse,\n      next: NextFunction\n    ) => {\n      // do this first, since `cookies` does not persist across context set\n      if (req.params.tenantId) {\n        instance.setContext({ tenantId: req.params.tenantId });\n      }\n\n      if (req.headers) {\n        instance.setContext(req.headers);\n      }\n      if (req instanceof Headers) {\n        instance.setContext(req);\n      }\n\n      if (typeof next === 'function') {\n        next();\n      }\n    },\n    onConfigure: () => {\n      const { paths: nilePaths } = instance;\n      const paths = {\n        get: nilePaths.get.map(cleaner),\n        post: nilePaths.post.map(cleaner),\n        put: nilePaths.put.map(cleaner),\n        delete: nilePaths.delete.map(cleaner),\n      };\n      debug(`paths configured ${JSON.stringify(paths)}`);\n      instance.paths = paths;\n    },\n    onHandleRequest: async (req: ExpressRequest, res: ExpressResponse) => {\n      // handle standard request objects\n      if (req instanceof Request) {\n        debug('using default response');\n        const response = await instance.handlers[\n          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n          // disable the extension so we don't re-handle\n        ](req, { disableExtensions: ['express'] });\n        return response;\n      }\n\n      debug('handling response');\n      instance.setContext(req.headers);\n\n      const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n      // be sure its a valid url\n      try {\n        new URL(reqUrl);\n      } catch (e) {\n        throw new Error(\n          'Invalid URL sent for handle request. Are you running express?'\n        );\n      }\n      const { method } = req;\n      const init: RequestInit = { method, headers: new Headers() };\n      // seems like this should work without this, since `get/set context should do the things we think it should.\n      if (\n        'headers' in req &&\n        typeof req.headers === 'object' &&\n        req.headers &&\n        'cookie' in req.headers &&\n        typeof req.headers.cookie === 'string'\n      ) {\n        (init.headers as Headers).set('cookie', req.headers.cookie);\n      }\n\n      if ('body' in req) {\n        if (method === 'POST' || method === 'PUT') {\n          init.body = JSON.stringify(req.body);\n        }\n      }\n\n      const proxyRequest = new Request(reqUrl, init);\n      debug(\n        `[${method.toUpperCase()}]proxy request converted to ${reqUrl} with ${JSON.stringify(\n          init\n        )}`\n      );\n\n      let response: Response = null as unknown as Response;\n\n      try {\n        response = (await instance.handlers[\n          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n        ](proxyRequest, { disableExtensions: ['express'] })) as Response;\n      } catch (e) {\n        error(e);\n      }\n\n      let body;\n      try {\n        const tryJson = await response.clone();\n        body = await tryJson.json();\n      } catch (e) {\n        body = await response.text();\n      }\n\n      const newHeaders: Record<string, string | string[]> = {};\n      response.headers.forEach((value, key) => {\n        if (\n          !['content-length', 'transfer-encoding'].includes(key.toLowerCase())\n        ) {\n          if (newHeaders[key]) {\n            const prev = newHeaders[key];\n            if (Array.isArray(prev)) {\n              newHeaders[key] = [...prev, value];\n            } else {\n              newHeaders[key] = [prev, value];\n            }\n          } else {\n            newHeaders[key] = value;\n          }\n        }\n      });\n\n      if (!res.headersSent) {\n        debug('sending response');\n        res.status(response.status).set(newHeaders);\n        if (typeof body === 'string') {\n          res.send(body);\n        } else {\n          res.json(body ?? {});\n        }\n      }\n      // always return to prevent infinite loop\n      return ExtensionState.onHandleRequest;\n    },\n  };\n};\n"],"mappings":"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","names":["index_exports","__export","cleaner","express","__toCommonJS","import_server","val","instance","error","debug","req","res","next","nilePaths","paths","reqUrl","method","init","proxyRequest","response","e","body","newHeaders","value","key","prev"]}

package/dist/index.mjs

@@ -1,2 +1,2 @@
-function d(r){return r.replaceAll(/\{([^}]+)\}/g,":$1")}function b(r){let n=r.getPaths();return{paths:{get:n.get.map(d),post:n.post.map(d),put:n.put.map(d),delete:n.delete.map(d)}}}async function w(r,n){let a=n?.logger?n?.logger("express").error:()=>null;async function y(e,c){let u=new Headers;if(!e||typeof e!="object")return null;if(!("url"in e)||typeof e?.url!="string")return a("A url is necessary for the nile express handler"),null;let p="method"in e&&typeof e.method=="string"?e.method:"GET";"headers"in e&&typeof e.headers=="object"&&e.headers&&"cookie"in e.headers&&typeof e.headers.cookie=="string"&&u.set("cookie",e.headers.cookie);let h={method:p,...n?.init};"body"in e&&(p==="POST"||p==="PUT")&&(u.set("content-type","application/json"),h.body=JSON.stringify(e.body)),h.headers=u;let f=e.protocol+"://"+e.get("host")+e.originalUrl;try{new URL(f)}catch(t){return a("Invalid URL",{url:f,error:t}),null}let R=new Request(f,h),s;try{s=await r.handlers[p](R)}catch(t){a(t)}let o;if(s instanceof Response){try{o=await(await s.clone()).json()}catch{o=await s.text()}let t={};if(s.headers.forEach((l,i)=>{if(!["content-length","transfer-encoding"].includes(i.toLowerCase()))if(t[i]){let g=t[i];Array.isArray(g)?t[i]=[...g,l]:t[i]=[g,l]}else t[i]=l}),n?.muteResponse!==!0){c&&(c.status(s.status).set(t),typeof o=="string"?c.send(o):c.json(o??{}));return}return{body:o,status:s.status,headers:t,response:s}}else{a("Bad response",{response:s});return}}let{paths:m}=b(r);return{handler:y,paths:m}}export{w as NileExpressHandler,d as cleaner,b as expressPaths};
+import{ExtensionState as g}from"@niledatabase/server";function f(s){return s.replaceAll(/\{([^}]+)\}/g,":$1")}var y=s=>{let{error:l,debug:i}=s.logger("[EXTENSION][express]");return{id:"express",onSetContext:(e,n,o)=>{e.params.tenantId&&s.setContext({tenantId:e.params.tenantId}),e.headers&&s.setContext(e.headers),e instanceof Headers&&s.setContext(e),typeof o=="function"&&o()},onConfigure:()=>{let{paths:e}=s,n={get:e.get.map(f),post:e.post.map(f),put:e.put.map(f),delete:e.delete.map(f)};i(`paths configured ${JSON.stringify(n)}`),s.paths=n},onHandleRequest:async(e,n)=>{if(e instanceof Request)return i("using default response"),await s.handlers[e.method](e,{disableExtensions:["express"]});i("handling response"),s.setContext(e.headers);let o=e.protocol+"://"+e.get("host")+e.originalUrl;try{new URL(o)}catch{throw new Error("Invalid URL sent for handle request. Are you running express?")}let{method:c}=e,h={method:c,headers:new Headers};"headers"in e&&typeof e.headers=="object"&&e.headers&&"cookie"in e.headers&&typeof e.headers.cookie=="string"&&h.headers.set("cookie",e.headers.cookie),"body"in e&&(c==="POST"||c==="PUT")&&(h.body=JSON.stringify(e.body));let x=new Request(o,h);i(`[${c.toUpperCase()}]proxy request converted to ${o} with ${JSON.stringify(h)}`);let p=null;try{p=await s.handlers[e.method](x,{disableExtensions:["express"]})}catch(t){l(t)}let d;try{d=await(await p.clone()).json()}catch{d=await p.text()}let r={};return p.headers.forEach((t,a)=>{if(!["content-length","transfer-encoding"].includes(a.toLowerCase()))if(r[a]){let u=r[a];Array.isArray(u)?r[a]=[...u,t]:r[a]=[u,t]}else r[a]=t}),n.headersSent||(i("sending response"),n.status(p.status).set(r),typeof d=="string"?n.send(d):n.json(d??{})),g.onHandleRequest}}};export{f as cleaner,y as express};
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { NileConfig, Server } from '@niledatabase/server';\n\nexport function cleaner(val: string) {\n  return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\nexport function expressPaths(nile: Server) {\n  const nilePaths = nile.getPaths();\n  const paths = {\n    get: nilePaths.get.map(cleaner),\n    post: nilePaths.post.map(cleaner),\n    put: nilePaths.put.map(cleaner),\n    delete: nilePaths.delete.map(cleaner),\n  };\n  return {\n    paths,\n  };\n}\n\ntype HandlerConfig = { muteResponse?: boolean; init?: RequestInit };\nexport async function NileExpressHandler(\n  nile: Server,\n  config?: HandlerConfig & NileConfig\n) {\n  const error = config?.logger ? config?.logger('express').error : () => null;\n  async function handler(\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    req: any,\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    res?: any\n  ): Promise<\n    | {\n        body: string;\n        status: number;\n        headers: Record<string, string | string[]>;\n        response: Response;\n      }\n    | null\n    | undefined\n  > {\n    const headers = new Headers();\n    if (!req || typeof req !== 'object') {\n      return null;\n    }\n    if (!('url' in req) || typeof req?.url !== 'string') {\n      error('A url is necessary for the nile express handler');\n      return null;\n    }\n    const method =\n      'method' in req && typeof req.method === 'string' ? req.method : 'GET';\n\n    if (\n      'headers' in req &&\n      typeof req.headers === 'object' &&\n      req.headers &&\n      'cookie' in req.headers &&\n      typeof req.headers.cookie === 'string'\n    ) {\n      headers.set('cookie', req.headers.cookie);\n    }\n    const _init: RequestInit = { method, ...config?.init };\n\n    if ('body' in req) {\n      if (method === 'POST' || method === 'PUT') {\n        headers.set('content-type', 'application/json');\n        _init.body = JSON.stringify(req.body);\n      }\n    }\n\n    _init.headers = headers;\n\n    const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n    // be sure its a valid url\n    try {\n      new URL(reqUrl);\n    } catch (e) {\n      error('Invalid URL', {\n        url: reqUrl,\n        error: e,\n      });\n      return null;\n    }\n    const proxyRequest = new Request(reqUrl, _init);\n    let response;\n    try {\n      response = await nile.handlers[\n        method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n      ](proxyRequest);\n    } catch (e) {\n      error(e);\n    }\n\n    let body;\n\n    if (response instanceof Response) {\n      try {\n        const tryJson = await response.clone();\n        body = await tryJson.json();\n      } catch (e) {\n        body = await response.text();\n      }\n      const newHeaders: Record<string, string | string[]> = {};\n      response.headers.forEach((value, key) => {\n        if (\n          !['content-length', 'transfer-encoding'].includes(key.toLowerCase())\n        ) {\n          if (newHeaders[key]) {\n            const prev = newHeaders[key];\n            if (Array.isArray(prev)) {\n              newHeaders[key] = [...prev, value];\n            } else {\n              newHeaders[key] = [prev, value];\n            }\n          } else {\n            newHeaders[key] = value;\n          }\n        }\n      });\n\n      if (config?.muteResponse !== true) {\n        if (res) {\n          res.status(response.status).set(newHeaders);\n          if (typeof body === 'string') {\n            res.send(body);\n          } else {\n            res.json(body ?? {});\n          }\n        }\n        return;\n      }\n\n      return {\n        body,\n        status: response.status,\n        headers: newHeaders,\n        response,\n      };\n    } else {\n      error('Bad response', { response });\n      return;\n    }\n  }\n  const { paths } = expressPaths(nile);\n  return { handler, paths };\n}\n"],"mappings":"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","names":["cleaner","val","expressPaths","nile","nilePaths","NileExpressHandler","config","error","handler","req","res","headers","method","_init","reqUrl","e","proxyRequest","response","body","newHeaders","value","key","prev","paths"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { ExtensionState, Server } from '@niledatabase/server';\nimport type {\n  Request as ExpressRequest,\n  Response as ExpressResponse,\n  NextFunction,\n} from 'express';\n\nexport function cleaner(val: string) {\n  return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\nexport const express = (instance: Server) => {\n  const { error, debug } = instance.logger('[EXTENSION][express]');\n  return {\n    id: 'express',\n    onSetContext: (\n      req: ExpressRequest,\n      res: ExpressResponse,\n      next: NextFunction\n    ) => {\n      // do this first, since `cookies` does not persist across context set\n      if (req.params.tenantId) {\n        instance.setContext({ tenantId: req.params.tenantId });\n      }\n\n      if (req.headers) {\n        instance.setContext(req.headers);\n      }\n      if (req instanceof Headers) {\n        instance.setContext(req);\n      }\n\n      if (typeof next === 'function') {\n        next();\n      }\n    },\n    onConfigure: () => {\n      const { paths: nilePaths } = instance;\n      const paths = {\n        get: nilePaths.get.map(cleaner),\n        post: nilePaths.post.map(cleaner),\n        put: nilePaths.put.map(cleaner),\n        delete: nilePaths.delete.map(cleaner),\n      };\n      debug(`paths configured ${JSON.stringify(paths)}`);\n      instance.paths = paths;\n    },\n    onHandleRequest: async (req: ExpressRequest, res: ExpressResponse) => {\n      // handle standard request objects\n      if (req instanceof Request) {\n        debug('using default response');\n        const response = await instance.handlers[\n          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n          // disable the extension so we don't re-handle\n        ](req, { disableExtensions: ['express'] });\n        return response;\n      }\n\n      debug('handling response');\n      instance.setContext(req.headers);\n\n      const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n      // be sure its a valid url\n      try {\n        new URL(reqUrl);\n      } catch (e) {\n        throw new Error(\n          'Invalid URL sent for handle request. Are you running express?'\n        );\n      }\n      const { method } = req;\n      const init: RequestInit = { method, headers: new Headers() };\n      // seems like this should work without this, since `get/set context should do the things we think it should.\n      if (\n        'headers' in req &&\n        typeof req.headers === 'object' &&\n        req.headers &&\n        'cookie' in req.headers &&\n        typeof req.headers.cookie === 'string'\n      ) {\n        (init.headers as Headers).set('cookie', req.headers.cookie);\n      }\n\n      if ('body' in req) {\n        if (method === 'POST' || method === 'PUT') {\n          init.body = JSON.stringify(req.body);\n        }\n      }\n\n      const proxyRequest = new Request(reqUrl, init);\n      debug(\n        `[${method.toUpperCase()}]proxy request converted to ${reqUrl} with ${JSON.stringify(\n          init\n        )}`\n      );\n\n      let response: Response = null as unknown as Response;\n\n      try {\n        response = (await instance.handlers[\n          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n        ](proxyRequest, { disableExtensions: ['express'] })) as Response;\n      } catch (e) {\n        error(e);\n      }\n\n      let body;\n      try {\n        const tryJson = await response.clone();\n        body = await tryJson.json();\n      } catch (e) {\n        body = await response.text();\n      }\n\n      const newHeaders: Record<string, string | string[]> = {};\n      response.headers.forEach((value, key) => {\n        if (\n          !['content-length', 'transfer-encoding'].includes(key.toLowerCase())\n        ) {\n          if (newHeaders[key]) {\n            const prev = newHeaders[key];\n            if (Array.isArray(prev)) {\n              newHeaders[key] = [...prev, value];\n            } else {\n              newHeaders[key] = [prev, value];\n            }\n          } else {\n            newHeaders[key] = value;\n          }\n        }\n      });\n\n      if (!res.headersSent) {\n        debug('sending response');\n        res.status(response.status).set(newHeaders);\n        if (typeof body === 'string') {\n          res.send(body);\n        } else {\n          res.json(body ?? {});\n        }\n      }\n      // always return to prevent infinite loop\n      return ExtensionState.onHandleRequest;\n    },\n  };\n};\n"],"mappings":"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","names":["ExtensionState","cleaner","val","express","instance","error","debug","req","res","next","nilePaths","paths","reqUrl","method","init","proxyRequest","response","e","body","newHeaders","value","key","prev"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/express",
-  "version": "5.0.0-alpha.14",
+  "version": "5.0.0-alpha.15",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -34,9 +34,11 @@
     "@niledatabase/server": "*"
   },
   "devDependencies": {
+    "@types/express": "^5",
+    "express": "^5.1.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.3.4",
     "tsup": "^8.5.0"
   },
-  "gitHead": "434359be6def0e3aa431d4cf65bc9f508b4db5da"
+  "gitHead": "5838393fd8739e388754a43b0efcd8430d6d6027"
 }

package/src/express.test.ts

@@ -1,54 +1,166 @@
-import { Server } from '@niledatabase/server';
+import express from 'express';
+import { ExtensionState, Server } from '@niledatabase/server';
+import type {
+  Request as ExpressRequest,
+  Response as ExpressResponse,
+} from 'express';
 
-import { expressPaths } from '.';
+import { express as expressExtension, cleaner } from '.';
 
-describe('express', () => {
-  it('cleans express paths', () => {
-    const nile = new Server({
-      apiUrl: 'http://localhost:3000',
-      user: '123',
-      password: '123',
-      databaseName: '123',
+describe('express extension', () => {
+  let app;
+  let instance: Server;
+
+  beforeEach(() => {
+    app = express();
+    app.use(express.json());
+
+    instance = {
+      logger: () => ({
+        error: jest.fn(),
+        debug: jest.fn(),
+        warn: jest.fn(),
+        info: jest.fn(),
+      }),
+      handlers: {
+        GET: jest
+          .fn()
+          .mockResolvedValue(
+            new Response(JSON.stringify({ msg: 'GET OK' }), { status: 200 })
+          ),
+        POST: jest
+          .fn()
+          .mockResolvedValue(
+            new Response(JSON.stringify({ msg: 'POST OK' }), { status: 201 })
+          ),
+      },
+      setContext: jest.fn(),
+      paths: {
+        get: ['/test/{id}'],
+        post: ['/submit/{formId}'],
+        put: [],
+        delete: [],
+      },
+    } as unknown as Server;
+  });
+
+  describe('cleaner()', () => {
+    it('replaces {param} with :param', () => {
+      expect(cleaner('/api/{tenantId}/resource')).toBe(
+        '/api/:tenantId/resource'
+      );
+    });
+  });
+
+  describe('onSetContext', () => {
+    it('sets context from params and headers', () => {
+      const ext = expressExtension(instance);
+      const req = {
+        params: { tenantId: 'abc' },
+        headers: { 'x-foo': 'bar' },
+      } as unknown as ExpressRequest;
+      const res = {} as unknown as ExpressResponse;
+      const next = jest.fn();
+
+      ext.onSetContext(req, res, next);
+
+      expect(instance.setContext).toHaveBeenCalledWith({ tenantId: 'abc' });
+      expect(instance.setContext).toHaveBeenCalledWith(req.headers);
+      expect(next).toHaveBeenCalled();
+    });
+  });
+
+  describe('onConfigure', () => {
+    it('cleans up path params and updates instance.paths', () => {
+      const ext = expressExtension(instance);
+      ext.onConfigure();
+      expect(instance.paths).toEqual({
+        get: ['/test/:id'],
+        post: ['/submit/:formId'],
+        put: [],
+        delete: [],
+      });
+    });
+  });
+
+  describe('onHandleRequest', () => {
+    it('proxies GET request with JSON response', async () => {
+      const ext = expressExtension(instance);
+      const req = {
+        method: 'GET',
+        protocol: 'http',
+        get: () => 'localhost',
+        originalUrl: '/api/test',
+        headers: { cookie: 'a=b' },
+        body: {},
+      } as unknown as ExpressRequest;
+      const res = {
+        headersSent: false,
+        status: jest.fn().mockReturnThis(),
+        set: jest.fn().mockReturnThis(),
+        json: jest.fn(),
+        send: jest.fn(),
+      } as unknown as ExpressResponse;
+
+      const result = await ext.onHandleRequest(req, res);
+
+      expect(instance.setContext).toHaveBeenCalledWith(req.headers);
+      expect(instance.handlers.GET).toHaveBeenCalled();
+      expect(res.status).toHaveBeenCalledWith(200);
+      expect(res.json).toHaveBeenCalledWith({ msg: 'GET OK' });
+      expect(result).toBe(ExtensionState.onHandleRequest);
+    });
+
+    it('handles non-JSON response fallback', async () => {
+      (instance.handlers.GET as jest.Mock).mockResolvedValue(
+        new Response('Plain text body', { status: 200 })
+      );
+      const ext = expressExtension(instance);
+
+      const req = {
+        method: 'GET',
+        protocol: 'http',
+        get: () => 'localhost',
+        originalUrl: '/api/test',
+        headers: {},
+        body: {},
+      } as unknown as ExpressRequest;
+      const res = {
+        headersSent: false,
+        status: jest.fn().mockReturnThis(),
+        set: jest.fn().mockReturnThis(),
+        json: jest.fn(),
+        send: jest.fn(),
+      } as unknown as ExpressResponse;
+
+      await ext.onHandleRequest(req, res);
+
+      expect(res.send).toHaveBeenCalledWith('Plain text body');
+    });
+
+    it('does not re-send headers if already sent', async () => {
+      const ext = expressExtension(instance);
+
+      const req = {
+        method: 'GET',
+        protocol: 'http',
+        get: () => 'localhost',
+        originalUrl: '/api/test',
+        headers: {},
+        body: {},
+      } as unknown as ExpressRequest;
+      const res = {
+        headersSent: true,
+        status: jest.fn(),
+        set: jest.fn(),
+        json: jest.fn(),
+        send: jest.fn(),
+      } as unknown as ExpressResponse;
+
+      const result = await ext.onHandleRequest(req, res);
+
+      expect(res.status).not.toHaveBeenCalled();
+      expect(result).toBe(ExtensionState.onHandleRequest);
     });
-    const { paths } = expressPaths(nile);
-    expect(Object.keys(paths)).toEqual(['get', 'post', 'put', 'delete']);
-    expect(paths.delete).toEqual([
-      '/api/tenants/:tenantId/users/:userId',
-      '/api/tenants/:tenantId',
-    ]);
-    expect(paths.post).toEqual([
-      '/api/tenants/:tenantId/users',
-      '/api/signup',
-      '/api/users',
-      '/api/tenants',
-      '/api/auth/session',
-      '/api/auth/signin/:provider',
-      '/api/auth/reset-password',
-      '/api/auth/providers',
-      '/api/auth/csrf',
-      '/api/auth/callback/:provider',
-      '/api/auth/signout',
-    ]);
-    expect(paths.put).toEqual([
-      '/api/tenants/:tenantId/users',
-      '/api/users',
-      '/api/tenants/:tenantId',
-      '/api/auth/reset-password',
-    ]);
-    expect(paths.get).toEqual([
-      '/api/me',
-      '/api/tenants/:tenantId/users',
-      '/api/tenants',
-      '/api/tenants/:tenantId',
-      '/api/auth/session',
-      '/api/auth/signin',
-      '/api/auth/providers',
-      '/api/auth/csrf',
-      '/api/auth/reset-password',
-      '/api/auth/callback',
-      '/api/auth/signout',
-      '/api/auth/verify-request',
-      '/api/auth/error',
-    ]);
   });
 });

package/src/index.ts

@@ -1,105 +1,118 @@
-import { NileConfig, Server } from '@niledatabase/server';
+import { ExtensionState, Server } from '@niledatabase/server';
+import type {
+  Request as ExpressRequest,
+  Response as ExpressResponse,
+  NextFunction,
+} from 'express';
 
 export function cleaner(val: string) {
   return val.replaceAll(/\{([^}]+)\}/g, ':$1');
 }
 
-export function expressPaths(nile: Server) {
-  const nilePaths = nile.getPaths();
-  const paths = {
-    get: nilePaths.get.map(cleaner),
-    post: nilePaths.post.map(cleaner),
-    put: nilePaths.put.map(cleaner),
-    delete: nilePaths.delete.map(cleaner),
-  };
+export const express = (instance: Server) => {
+  const { error, debug } = instance.logger('[EXTENSION][express]');
   return {
-    paths,
-  };
-}
+    id: 'express',
+    onSetContext: (
+      req: ExpressRequest,
+      res: ExpressResponse,
+      next: NextFunction
+    ) => {
+      // do this first, since `cookies` does not persist across context set
+      if (req.params.tenantId) {
+        instance.setContext({ tenantId: req.params.tenantId });
+      }
 
-type HandlerConfig = { muteResponse?: boolean; init?: RequestInit };
-export async function NileExpressHandler(
-  nile: Server,
-  config?: HandlerConfig & NileConfig
-) {
-  const error = config?.logger ? config?.logger('express').error : () => null;
-  async function handler(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    req: any,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    res?: any
-  ): Promise<
-    | {
-        body: string;
-        status: number;
-        headers: Record<string, string | string[]>;
-        response: Response;
+      if (req.headers) {
+        instance.setContext(req.headers);
+      }
+      if (req instanceof Headers) {
+        instance.setContext(req);
       }
-    | null
-    | undefined
-  > {
-    const headers = new Headers();
-    if (!req || typeof req !== 'object') {
-      return null;
-    }
-    if (!('url' in req) || typeof req?.url !== 'string') {
-      error('A url is necessary for the nile express handler');
-      return null;
-    }
-    const method =
-      'method' in req && typeof req.method === 'string' ? req.method : 'GET';
 
-    if (
-      'headers' in req &&
-      typeof req.headers === 'object' &&
-      req.headers &&
-      'cookie' in req.headers &&
-      typeof req.headers.cookie === 'string'
-    ) {
-      headers.set('cookie', req.headers.cookie);
-    }
-    const _init: RequestInit = { method, ...config?.init };
+      if (typeof next === 'function') {
+        next();
+      }
+    },
+    onConfigure: () => {
+      const { paths: nilePaths } = instance;
+      const paths = {
+        get: nilePaths.get.map(cleaner),
+        post: nilePaths.post.map(cleaner),
+        put: nilePaths.put.map(cleaner),
+        delete: nilePaths.delete.map(cleaner),
+      };
+      debug(`paths configured ${JSON.stringify(paths)}`);
+      instance.paths = paths;
+    },
+    onHandleRequest: async (req: ExpressRequest, res: ExpressResponse) => {
+      // handle standard request objects
+      if (req instanceof Request) {
+        debug('using default response');
+        const response = await instance.handlers[
+          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
+          // disable the extension so we don't re-handle
+        ](req, { disableExtensions: ['express'] });
+        return response;
+      }
+
+      debug('handling response');
+      instance.setContext(req.headers);
+
+      const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
 
-    if ('body' in req) {
-      if (method === 'POST' || method === 'PUT') {
-        headers.set('content-type', 'application/json');
-        _init.body = JSON.stringify(req.body);
+      // be sure its a valid url
+      try {
+        new URL(reqUrl);
+      } catch (e) {
+        throw new Error(
+          'Invalid URL sent for handle request. Are you running express?'
+        );
+      }
+      const { method } = req;
+      const init: RequestInit = { method, headers: new Headers() };
+      // seems like this should work without this, since `get/set context should do the things we think it should.
+      if (
+        'headers' in req &&
+        typeof req.headers === 'object' &&
+        req.headers &&
+        'cookie' in req.headers &&
+        typeof req.headers.cookie === 'string'
+      ) {
+        (init.headers as Headers).set('cookie', req.headers.cookie);
       }
-    }
 
-    _init.headers = headers;
+      if ('body' in req) {
+        if (method === 'POST' || method === 'PUT') {
+          init.body = JSON.stringify(req.body);
+        }
+      }
 
-    const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
+      const proxyRequest = new Request(reqUrl, init);
+      debug(
+        `[${method.toUpperCase()}]proxy request converted to ${reqUrl} with ${JSON.stringify(
+          init
+        )}`
+      );
 
-    // be sure its a valid url
-    try {
-      new URL(reqUrl);
-    } catch (e) {
-      error('Invalid URL', {
-        url: reqUrl,
-        error: e,
-      });
-      return null;
-    }
-    const proxyRequest = new Request(reqUrl, _init);
-    let response;
-    try {
-      response = await nile.handlers[
-        method as 'GET' | 'POST' | 'PUT' | 'DELETE'
-      ](proxyRequest);
-    } catch (e) {
-      error(e);
-    }
+      let response: Response = null as unknown as Response;
 
-    let body;
+      try {
+        response = (await instance.handlers[
+          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
+        ](proxyRequest, { disableExtensions: ['express'] })) as Response;
+      } catch (e) {
+        error(e);
+      }
 
-    if (response instanceof Response) {
+      let body;
       try {
         const tryJson = await response.clone();
         body = await tryJson.json();
       } catch (e) {
         body = await response.text();
       }
+
       const newHeaders: Record<string, string | string[]> = {};
       response.headers.forEach((value, key) => {
         if (
@@ -118,29 +131,17 @@ export async function NileExpressHandler(
         }
       });
 
-      if (config?.muteResponse !== true) {
-        if (res) {
-          res.status(response.status).set(newHeaders);
-          if (typeof body === 'string') {
-            res.send(body);
-          } else {
-            res.json(body ?? {});
-          }
+      if (!res.headersSent) {
+        debug('sending response');
+        res.status(response.status).set(newHeaders);
+        if (typeof body === 'string') {
+          res.send(body);
+        } else {
+          res.json(body ?? {});
         }
-        return;
       }
-
-      return {
-        body,
-        status: response.status,
-        headers: newHeaders,
-        response,
-      };
-    } else {
-      error('Bad response', { response });
-      return;
-    }
-  }
-  const { paths } = expressPaths(nile);
-  return { handler, paths };
-}
+      // always return to prevent infinite loop
+      return ExtensionState.onHandleRequest;
+    },
+  };
+};