@niledatabase/express 5.0.0-alpha.9 → 5.0.1-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.mts CHANGED
@@ -1,31 +1,11 @@
1
- import { Server, NileConfig } from '@niledatabase/server';
1
+ import { Server, ExtensionState } from '@niledatabase/server';
2
+ import { Express, Request, Response as Response$1, NextFunction } from 'express';
2
3
 
3
4
  declare function cleaner(val: string): string;
4
- declare function expressPaths(nile: Server): {
5
- paths: {
6
- get: string[];
7
- post: string[];
8
- put: string[];
9
- delete: string[];
10
- };
5
+ declare const express: (app?: Express) => (instance: Server) => {
6
+ id: string;
7
+ onConfigure: () => void;
8
+ onHandleRequest: (params: [Request, Response$1, NextFunction]) => Promise<void | Response | ExtensionState.onHandleRequest>;
11
9
  };
12
- type HandlerConfig = {
13
- muteResponse?: boolean;
14
- init?: RequestInit;
15
- };
16
- declare function NileExpressHandler(nile: Server, config?: HandlerConfig & NileConfig): Promise<{
17
- handler: (req: any, res?: any) => Promise<{
18
- body: string;
19
- status: number;
20
- headers: Record<string, string | string[]>;
21
- response: Response;
22
- } | null | undefined>;
23
- paths: {
24
- get: string[];
25
- post: string[];
26
- put: string[];
27
- delete: string[];
28
- };
29
- }>;
30
10
 
31
- export { NileExpressHandler, cleaner, expressPaths };
11
+ export { cleaner, express };
package/dist/index.d.ts CHANGED
@@ -1,31 +1,11 @@
1
- import { Server, NileConfig } from '@niledatabase/server';
1
+ import { Server, ExtensionState } from '@niledatabase/server';
2
+ import { Express, Request, Response as Response$1, NextFunction } from 'express';
2
3
 
3
4
  declare function cleaner(val: string): string;
4
- declare function expressPaths(nile: Server): {
5
- paths: {
6
- get: string[];
7
- post: string[];
8
- put: string[];
9
- delete: string[];
10
- };
5
+ declare const express: (app?: Express) => (instance: Server) => {
6
+ id: string;
7
+ onConfigure: () => void;
8
+ onHandleRequest: (params: [Request, Response$1, NextFunction]) => Promise<void | Response | ExtensionState.onHandleRequest>;
11
9
  };
12
- type HandlerConfig = {
13
- muteResponse?: boolean;
14
- init?: RequestInit;
15
- };
16
- declare function NileExpressHandler(nile: Server, config?: HandlerConfig & NileConfig): Promise<{
17
- handler: (req: any, res?: any) => Promise<{
18
- body: string;
19
- status: number;
20
- headers: Record<string, string | string[]>;
21
- response: Response;
22
- } | null | undefined>;
23
- paths: {
24
- get: string[];
25
- post: string[];
26
- put: string[];
27
- delete: string[];
28
- };
29
- }>;
30
10
 
31
- export { NileExpressHandler, cleaner, expressPaths };
11
+ export { cleaner, express };
package/dist/index.js CHANGED
@@ -1,2 +1,2 @@
1
- "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});
1
+ "use strict";var y=Object.defineProperty;var I=Object.getOwnPropertyDescriptor;var O=Object.getOwnPropertyNames;var C=Object.prototype.hasOwnProperty;var U=(s,r)=>{for(var n in r)y(s,n,{get:r[n],enumerable:!0})},b=(s,r,n,i)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of O(r))!C.call(s,o)&&o!==n&&y(s,o,{get:()=>r[o],enumerable:!(i=I(r,o))||i.enumerable});return s};var L=s=>b(y({},"__esModule",{value:!0}),s);var $={};U($,{cleaner:()=>E,express:()=>A});module.exports=L($);var S=require("async_hooks"),q=require("@niledatabase/server");function E(s){return s.replaceAll(/\{([^}]+)\}/g,":$1")}var w=new S.AsyncLocalStorage,A=s=>{let r=!1;return n=>{let{error:i,debug:o}=n.logger("[EXTENSION][express]"),m=e=>{w.getStore()?.set("context",e),n.withContext(e)};function T(e){s&&(o("routes configured"),s.get(e.paths.get,e.handlers.GET),s.post(e.paths.post,e.handlers.POST),s.put(e.paths.put,e.handlers.PUT),s.delete(e.paths.delete,e.handlers.DELETE))}return!r&&s&&(o("initializing express extension with middleware"),s.use((e,t,a)=>{w.run(new Map,()=>a())}),s.param("tenantId",(e,t,a,g)=>{o(`tenantId param set: ${g}`),m({tenantId:g,headers:new Headers(H(e.headers))}),a()}),s.use((e,t,a)=>{m({headers:new Headers(H(e.headers))}),a()})),r=!0,{id:"express",onConfigure:()=>{let{paths:e}=n,t={get:e.get.map(E),post:e.post.map(E),put:e.put.map(E),delete:e.delete.map(E)};o(`paths configured ${JSON.stringify(t)}`),n.paths=t,T(n)},onHandleRequest:async e=>{let[t,a,g]=e;o("handling response");let u="",f=t.method,c={method:f,headers:new Headers};if(t instanceof Request)u=t.url,c.headers=t.headers;else try{u=t.protocol+"://"+t.get("host")+t.originalUrl}catch{}try{new URL(u)}catch{throw new Error("Invalid URL \u2014 are you running Express?")}t.headers?.cookie&&c.headers.set("cookie",t.headers.cookie),["POST","PUT"].includes(f)&&t.body&&(c.body=JSON.stringify(t.body));let P=new Request(u,c);o(`[${f}] proxy: ${u} ${JSON.stringify(c)}`);let p,N={headers:new Headers(t.headers),tenantId:t.params?.tenantId||void 0};try{p=await n.withContext(N,async d=>await d.handlers[f](P,{disableExtensions:["express"]}))}catch(d){return i(d),g()}let l;try{l=await p.clone().json()}catch{l=await p.text()}let h={};return p.headers.forEach((d,x)=>{if(!["content-length","transfer-encoding"].includes(x.toLowerCase()))if(h[x]){let R=h[x];h[x]=Array.isArray(R)?[...R,d]:[R,d]}else h[x]=d}),a?(a.headersSent||(o("sending response"),a.status(p.status).set(h),typeof l=="string"?a.send(l):a.json(l??{})),q.ExtensionState.onHandleRequest):p}}}};function H(s){let r={};for(let[n,i]of Object.entries(s))typeof i=="string"?r[n]=i:Array.isArray(i)&&(r[n]=i.join(","));return r}0&&(module.exports={cleaner,express});
2
2
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +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"]}
1
+ {"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'async_hooks';\nimport { IncomingHttpHeaders } from 'http';\n\nimport { PartialContext, ExtensionState, Server } from '@niledatabase/server';\nimport type {\n Request as ExpressRequest,\n Response as ExpressResponse,\n NextFunction,\n Express,\n} from 'express';\n\nexport function cleaner(val: string) {\n return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\ntype ExpressRouteHandler = (\n req: ExpressRequest,\n res: ExpressResponse,\n next: NextFunction\n) => void | Promise<void>;\n\ntype ExpressRouteFunctions = {\n GET: ExpressRouteHandler;\n POST: ExpressRouteHandler;\n PUT: ExpressRouteHandler;\n DELETE: ExpressRouteHandler;\n};\n\ntype NileWithExpress = Server & {\n handlers: ExpressRouteFunctions;\n};\n\n// AsyncLocalStorage to persist context per request\nconst contextStore = new AsyncLocalStorage<Map<string, unknown>>();\n\n// Express extension factory\nexport const express = (app?: Express) => {\n let init = false;\n\n return (instance: Server) => {\n const { error, debug } = instance.logger('[EXTENSION][express]');\n\n // Internal context helpers - I think we delete this now?\n const setRequestContext = (context: PartialContext) => {\n contextStore.getStore()?.set('context', context);\n\n instance.withContext(context);\n };\n\n function doConfigure(server: NileWithExpress) {\n if (app) {\n debug('routes configured');\n app.get(server.paths.get, server.handlers.GET);\n app.post(server.paths.post, server.handlers.POST);\n app.put(server.paths.put, server.handlers.PUT);\n app.delete(server.paths.delete, server.handlers.DELETE);\n }\n }\n\n if (!init && app) {\n debug('initializing express extension with middleware');\n\n app.use((req, res, next) => {\n contextStore.run(new Map(), () => next());\n });\n\n app.param('tenantId', (req, res, next, tenantId) => {\n debug(`tenantId param set: ${tenantId}`);\n setRequestContext({\n tenantId,\n headers: new Headers(normalizeHeaders(req.headers)),\n });\n next();\n });\n\n app.use((req, res, next) => {\n setRequestContext({\n headers: new Headers(normalizeHeaders(req.headers)),\n });\n next();\n });\n }\n\n init = true;\n\n return {\n id: 'express',\n\n onConfigure: () => {\n const { paths: rawPaths } = instance;\n const paths = {\n get: rawPaths.get.map(cleaner),\n post: rawPaths.post.map(cleaner),\n put: rawPaths.put.map(cleaner),\n delete: rawPaths.delete.map(cleaner),\n };\n debug(`paths configured ${JSON.stringify(paths)}`);\n instance.paths = paths;\n doConfigure(instance as NileWithExpress);\n },\n\n onHandleRequest: async (\n params: [ExpressRequest, ExpressResponse, NextFunction]\n ) => {\n // there are two cases here.\n // One is a server side request (normal Request/Response, the other is GET/POST/PUT/DELETE)\n const [req, res, next] = params;\n debug('handling response');\n\n let reqUrl = '';\n const method = req.method;\n const init: RequestInit = { method, headers: new Headers() };\n if (req instanceof Request) {\n reqUrl = req.url;\n init.headers = req.headers;\n } else {\n try {\n reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n } catch {\n // handled later\n }\n }\n\n try {\n new URL(reqUrl);\n } catch {\n throw new Error('Invalid URL — are you running Express?');\n }\n\n if (req.headers?.cookie) {\n (init.headers as Headers).set('cookie', req.headers.cookie);\n }\n\n if (['POST', 'PUT'].includes(method) && req.body) {\n init.body = JSON.stringify(req.body);\n }\n\n const proxyRequest = new Request(reqUrl, init);\n debug(`[${method}] proxy: ${reqUrl} ${JSON.stringify(init)}`);\n\n let response: Response;\n const context = {\n headers: new Headers(req.headers as HeadersInit),\n tenantId: req.params?.tenantId || undefined,\n };\n try {\n response = await instance.withContext(context, async (ctx) => {\n return (await ctx.handlers[\n method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n ](proxyRequest, { disableExtensions: ['express'] })) as Response;\n });\n } catch (e) {\n error(e);\n return next();\n }\n\n let body;\n try {\n body = await response.clone().json();\n } catch {\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 newHeaders[key] = Array.isArray(prev)\n ? [...prev, value]\n : [prev, value];\n } else {\n newHeaders[key] = value;\n }\n }\n });\n\n if (!res) {\n return response;\n }\n\n if (!res.headersSent) {\n debug('sending response');\n res.status(response.status).set(newHeaders);\n typeof body === 'string' ? res.send(body) : res.json(body ?? {});\n }\n\n return ExtensionState.onHandleRequest;\n },\n };\n };\n};\n\nfunction normalizeHeaders(headers: IncomingHttpHeaders): HeadersInit {\n const normalized: Record<string, string> = {};\n for (const [key, value] of Object.entries(headers)) {\n if (typeof value === 'string') {\n normalized[key] = value;\n } else if (Array.isArray(value)) {\n normalized[key] = value.join(','); // Join multi-values with commas\n }\n }\n return normalized;\n}\n"],"mappings":"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","names":["index_exports","__export","cleaner","express","__toCommonJS","import_async_hooks","import_server","val","contextStore","app","init","instance","error","debug","setRequestContext","context","doConfigure","server","req","res","next","tenantId","normalizeHeaders","rawPaths","paths","params","reqUrl","method","proxyRequest","response","ctx","e","body","newHeaders","value","key","prev","headers","normalized"]}
package/dist/index.mjs CHANGED
@@ -1,2 +1,2 @@
1
- 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};
1
+ import{AsyncLocalStorage as T}from"async_hooks";import{ExtensionState as P}from"@niledatabase/server";function f(t){return t.replaceAll(/\{([^}]+)\}/g,":$1")}var m=new T,U=t=>{let i=!1;return n=>{let{error:d,debug:o}=n.logger("[EXTENSION][express]"),y=e=>{m.getStore()?.set("context",e),n.withContext(e)};function H(e){t&&(o("routes configured"),t.get(e.paths.get,e.handlers.GET),t.post(e.paths.post,e.handlers.POST),t.put(e.paths.put,e.handlers.PUT),t.delete(e.paths.delete,e.handlers.DELETE))}return!i&&t&&(o("initializing express extension with middleware"),t.use((e,s,r)=>{m.run(new Map,()=>r())}),t.param("tenantId",(e,s,r,E)=>{o(`tenantId param set: ${E}`),y({tenantId:E,headers:new Headers(w(e.headers))}),r()}),t.use((e,s,r)=>{y({headers:new Headers(w(e.headers))}),r()})),i=!0,{id:"express",onConfigure:()=>{let{paths:e}=n,s={get:e.get.map(f),post:e.post.map(f),put:e.put.map(f),delete:e.delete.map(f)};o(`paths configured ${JSON.stringify(s)}`),n.paths=s,H(n)},onHandleRequest:async e=>{let[s,r,E]=e;o("handling response");let u="",g=s.method,c={method:g,headers:new Headers};if(s instanceof Request)u=s.url,c.headers=s.headers;else try{u=s.protocol+"://"+s.get("host")+s.originalUrl}catch{}try{new URL(u)}catch{throw new Error("Invalid URL \u2014 are you running Express?")}s.headers?.cookie&&c.headers.set("cookie",s.headers.cookie),["POST","PUT"].includes(g)&&s.body&&(c.body=JSON.stringify(s.body));let S=new Request(u,c);o(`[${g}] proxy: ${u} ${JSON.stringify(c)}`);let p,q={headers:new Headers(s.headers),tenantId:s.params?.tenantId||void 0};try{p=await n.withContext(q,async a=>await a.handlers[g](S,{disableExtensions:["express"]}))}catch(a){return d(a),E()}let l;try{l=await p.clone().json()}catch{l=await p.text()}let h={};return p.headers.forEach((a,x)=>{if(!["content-length","transfer-encoding"].includes(x.toLowerCase()))if(h[x]){let R=h[x];h[x]=Array.isArray(R)?[...R,a]:[R,a]}else h[x]=a}),r?(r.headersSent||(o("sending response"),r.status(p.status).set(h),typeof l=="string"?r.send(l):r.json(l??{})),P.onHandleRequest):p}}}};function w(t){let i={};for(let[n,d]of Object.entries(t))typeof d=="string"?i[n]=d:Array.isArray(d)&&(i[n]=d.join(","));return i}export{f as cleaner,U as express};
2
2
  //# sourceMappingURL=index.mjs.map
@@ -1 +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"]}
1
+ {"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'async_hooks';\nimport { IncomingHttpHeaders } from 'http';\n\nimport { PartialContext, ExtensionState, Server } from '@niledatabase/server';\nimport type {\n Request as ExpressRequest,\n Response as ExpressResponse,\n NextFunction,\n Express,\n} from 'express';\n\nexport function cleaner(val: string) {\n return val.replaceAll(/\\{([^}]+)\\}/g, ':$1');\n}\n\ntype ExpressRouteHandler = (\n req: ExpressRequest,\n res: ExpressResponse,\n next: NextFunction\n) => void | Promise<void>;\n\ntype ExpressRouteFunctions = {\n GET: ExpressRouteHandler;\n POST: ExpressRouteHandler;\n PUT: ExpressRouteHandler;\n DELETE: ExpressRouteHandler;\n};\n\ntype NileWithExpress = Server & {\n handlers: ExpressRouteFunctions;\n};\n\n// AsyncLocalStorage to persist context per request\nconst contextStore = new AsyncLocalStorage<Map<string, unknown>>();\n\n// Express extension factory\nexport const express = (app?: Express) => {\n let init = false;\n\n return (instance: Server) => {\n const { error, debug } = instance.logger('[EXTENSION][express]');\n\n // Internal context helpers - I think we delete this now?\n const setRequestContext = (context: PartialContext) => {\n contextStore.getStore()?.set('context', context);\n\n instance.withContext(context);\n };\n\n function doConfigure(server: NileWithExpress) {\n if (app) {\n debug('routes configured');\n app.get(server.paths.get, server.handlers.GET);\n app.post(server.paths.post, server.handlers.POST);\n app.put(server.paths.put, server.handlers.PUT);\n app.delete(server.paths.delete, server.handlers.DELETE);\n }\n }\n\n if (!init && app) {\n debug('initializing express extension with middleware');\n\n app.use((req, res, next) => {\n contextStore.run(new Map(), () => next());\n });\n\n app.param('tenantId', (req, res, next, tenantId) => {\n debug(`tenantId param set: ${tenantId}`);\n setRequestContext({\n tenantId,\n headers: new Headers(normalizeHeaders(req.headers)),\n });\n next();\n });\n\n app.use((req, res, next) => {\n setRequestContext({\n headers: new Headers(normalizeHeaders(req.headers)),\n });\n next();\n });\n }\n\n init = true;\n\n return {\n id: 'express',\n\n onConfigure: () => {\n const { paths: rawPaths } = instance;\n const paths = {\n get: rawPaths.get.map(cleaner),\n post: rawPaths.post.map(cleaner),\n put: rawPaths.put.map(cleaner),\n delete: rawPaths.delete.map(cleaner),\n };\n debug(`paths configured ${JSON.stringify(paths)}`);\n instance.paths = paths;\n doConfigure(instance as NileWithExpress);\n },\n\n onHandleRequest: async (\n params: [ExpressRequest, ExpressResponse, NextFunction]\n ) => {\n // there are two cases here.\n // One is a server side request (normal Request/Response, the other is GET/POST/PUT/DELETE)\n const [req, res, next] = params;\n debug('handling response');\n\n let reqUrl = '';\n const method = req.method;\n const init: RequestInit = { method, headers: new Headers() };\n if (req instanceof Request) {\n reqUrl = req.url;\n init.headers = req.headers;\n } else {\n try {\n reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n } catch {\n // handled later\n }\n }\n\n try {\n new URL(reqUrl);\n } catch {\n throw new Error('Invalid URL — are you running Express?');\n }\n\n if (req.headers?.cookie) {\n (init.headers as Headers).set('cookie', req.headers.cookie);\n }\n\n if (['POST', 'PUT'].includes(method) && req.body) {\n init.body = JSON.stringify(req.body);\n }\n\n const proxyRequest = new Request(reqUrl, init);\n debug(`[${method}] proxy: ${reqUrl} ${JSON.stringify(init)}`);\n\n let response: Response;\n const context = {\n headers: new Headers(req.headers as HeadersInit),\n tenantId: req.params?.tenantId || undefined,\n };\n try {\n response = await instance.withContext(context, async (ctx) => {\n return (await ctx.handlers[\n method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n ](proxyRequest, { disableExtensions: ['express'] })) as Response;\n });\n } catch (e) {\n error(e);\n return next();\n }\n\n let body;\n try {\n body = await response.clone().json();\n } catch {\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 newHeaders[key] = Array.isArray(prev)\n ? [...prev, value]\n : [prev, value];\n } else {\n newHeaders[key] = value;\n }\n }\n });\n\n if (!res) {\n return response;\n }\n\n if (!res.headersSent) {\n debug('sending response');\n res.status(response.status).set(newHeaders);\n typeof body === 'string' ? res.send(body) : res.json(body ?? {});\n }\n\n return ExtensionState.onHandleRequest;\n },\n };\n };\n};\n\nfunction normalizeHeaders(headers: IncomingHttpHeaders): HeadersInit {\n const normalized: Record<string, string> = {};\n for (const [key, value] of Object.entries(headers)) {\n if (typeof value === 'string') {\n normalized[key] = value;\n } else if (Array.isArray(value)) {\n normalized[key] = value.join(','); // Join multi-values with commas\n }\n }\n return normalized;\n}\n"],"mappings":"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","names":["AsyncLocalStorage","ExtensionState","cleaner","val","contextStore","express","app","init","instance","error","debug","setRequestContext","context","doConfigure","server","req","res","next","tenantId","normalizeHeaders","rawPaths","paths","params","reqUrl","method","proxyRequest","response","ctx","e","body","newHeaders","value","key","prev","headers","normalized"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@niledatabase/express",
3
- "version": "5.0.0-alpha.9",
3
+ "version": "5.0.1-alpha.0",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.mjs",
@@ -17,6 +17,9 @@
17
17
  "singleQuote": true,
18
18
  "trailingComma": "es5"
19
19
  },
20
+ "files": [
21
+ "dist"
22
+ ],
20
23
  "scripts": {
21
24
  "build": "tsup src/index.ts",
22
25
  "test": "jest"
@@ -31,12 +34,15 @@
31
34
  "access": "public"
32
35
  },
33
36
  "peerDependencies": {
34
- "@niledatabase/server": "*"
37
+ "@niledatabase/server": ">=5.0.0-alpha",
38
+ "express": "^5.0.0 || ^4.0.0"
35
39
  },
36
40
  "devDependencies": {
41
+ "@types/express": "^5",
42
+ "express": "^5.1.0",
37
43
  "jest": "^29.7.0",
38
44
  "ts-jest": "^29.3.4",
39
45
  "tsup": "^8.5.0"
40
46
  },
41
- "gitHead": "0a9e4f3a9099ec5c76f55535b17c9dd32c5cc030"
47
+ "gitHead": "e007e8aeaaecfab54afd7321dd7def184149514e"
42
48
  }
package/CHANGELOG.md DELETED
@@ -1,32 +0,0 @@
1
- # Change Log
2
-
3
- All notable changes to this project will be documented in this file.
4
- See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
-
6
- # [5.0.0-alpha.9](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.8...v5.0.0-alpha.9) (2025-06-16)
7
-
8
- **Note:** Version bump only for package @niledatabase/express
9
-
10
- # [5.0.0-alpha.8](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.7...v5.0.0-alpha.8) (2025-06-12)
11
-
12
- **Note:** Version bump only for package @niledatabase/express
13
-
14
- # [5.0.0-alpha.7](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.6...v5.0.0-alpha.7) (2025-06-11)
15
-
16
- **Note:** Version bump only for package @niledatabase/express
17
-
18
- # [5.0.0-alpha.6](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.5...v5.0.0-alpha.6) (2025-06-11)
19
-
20
- ### Bug Fixes
21
-
22
- - **server:** move logging to the config object ([6e3e380](https://github.com/niledatabase/nile-js/commit/6e3e38014f5b9795552af0a7b97e2d3fe6cd1a88))
23
-
24
- # [5.0.0-alpha.5](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.4...v5.0.0-alpha.5) (2025-06-10)
25
-
26
- **Note:** Version bump only for package @niledatabase/express
27
-
28
- # [5.0.0-alpha.4](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.3...v5.0.0-alpha.4) (2025-06-10)
29
-
30
- ### Features
31
-
32
- - **server:** invites ([c10f598](https://github.com/niledatabase/nile-js/commit/c10f5980bcbc55ed436ce8cceca4111aa8e6a276))
package/jest.config.js DELETED
@@ -1,6 +0,0 @@
1
- // eslint-disable-next-line @typescript-eslint/no-var-requires
2
-
3
- module.exports = {
4
- preset: 'ts-jest',
5
- testEnvironment: 'node',
6
- };
@@ -1,54 +0,0 @@
1
- import { Server } from '@niledatabase/server';
2
-
3
- import { expressPaths } from '.';
4
-
5
- describe('express', () => {
6
- it('cleans express paths', () => {
7
- const nile = new Server({
8
- apiUrl: 'http://localhost:3000',
9
- user: '123',
10
- password: '123',
11
- databaseName: '123',
12
- });
13
- const { paths } = expressPaths(nile);
14
- expect(Object.keys(paths)).toEqual(['get', 'post', 'put', 'delete']);
15
- expect(paths.delete).toEqual([
16
- '/api/tenants/:tenantId/users/:userId',
17
- '/api/tenants/:tenantId',
18
- ]);
19
- expect(paths.post).toEqual([
20
- '/api/tenants/:tenantId/users',
21
- '/api/signup',
22
- '/api/users',
23
- '/api/tenants',
24
- '/api/auth/session',
25
- '/api/auth/signin/:provider',
26
- '/api/auth/reset-password',
27
- '/api/auth/providers',
28
- '/api/auth/csrf',
29
- '/api/auth/callback/:provider',
30
- '/api/auth/signout',
31
- ]);
32
- expect(paths.put).toEqual([
33
- '/api/tenants/:tenantId/users',
34
- '/api/users',
35
- '/api/tenants/:tenantId',
36
- '/api/auth/reset-password',
37
- ]);
38
- expect(paths.get).toEqual([
39
- '/api/me',
40
- '/api/tenants/:tenantId/users',
41
- '/api/tenants',
42
- '/api/tenants/:tenantId',
43
- '/api/auth/session',
44
- '/api/auth/signin',
45
- '/api/auth/providers',
46
- '/api/auth/csrf',
47
- '/api/auth/reset-password',
48
- '/api/auth/callback',
49
- '/api/auth/signout',
50
- '/api/auth/verify-request',
51
- '/api/auth/error',
52
- ]);
53
- });
54
- });
package/src/index.ts DELETED
@@ -1,146 +0,0 @@
1
- import { NileConfig, Server } from '@niledatabase/server';
2
-
3
- export function cleaner(val: string) {
4
- return val.replaceAll(/\{([^}]+)\}/g, ':$1');
5
- }
6
-
7
- export function expressPaths(nile: Server) {
8
- const nilePaths = nile.getPaths();
9
- const paths = {
10
- get: nilePaths.get.map(cleaner),
11
- post: nilePaths.post.map(cleaner),
12
- put: nilePaths.put.map(cleaner),
13
- delete: nilePaths.delete.map(cleaner),
14
- };
15
- return {
16
- paths,
17
- };
18
- }
19
-
20
- type HandlerConfig = { muteResponse?: boolean; init?: RequestInit };
21
- export async function NileExpressHandler(
22
- nile: Server,
23
- config?: HandlerConfig & NileConfig
24
- ) {
25
- const error = config?.logger ? config?.logger('express').error : () => null;
26
- async function handler(
27
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
28
- req: any,
29
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
30
- res?: any
31
- ): Promise<
32
- | {
33
- body: string;
34
- status: number;
35
- headers: Record<string, string | string[]>;
36
- response: Response;
37
- }
38
- | null
39
- | undefined
40
- > {
41
- const headers = new Headers();
42
- if (!req || typeof req !== 'object') {
43
- return null;
44
- }
45
- if (!('url' in req) || typeof req?.url !== 'string') {
46
- error('A url is necessary for the nile express handler');
47
- return null;
48
- }
49
- const method =
50
- 'method' in req && typeof req.method === 'string' ? req.method : 'GET';
51
-
52
- if (
53
- 'headers' in req &&
54
- typeof req.headers === 'object' &&
55
- req.headers &&
56
- 'cookie' in req.headers &&
57
- typeof req.headers.cookie === 'string'
58
- ) {
59
- headers.set('cookie', req.headers.cookie);
60
- }
61
- const _init: RequestInit = { method, ...config?.init };
62
-
63
- if ('body' in req) {
64
- if (method === 'POST' || method === 'PUT') {
65
- headers.set('content-type', 'application/json');
66
- _init.body = JSON.stringify(req.body);
67
- }
68
- }
69
-
70
- _init.headers = headers;
71
-
72
- const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
73
-
74
- // be sure its a valid url
75
- try {
76
- new URL(reqUrl);
77
- } catch (e) {
78
- error('Invalid URL', {
79
- url: reqUrl,
80
- error: e,
81
- });
82
- return null;
83
- }
84
- const proxyRequest = new Request(reqUrl, _init);
85
- let response;
86
- try {
87
- response = await nile.handlers[
88
- method as 'GET' | 'POST' | 'PUT' | 'DELETE'
89
- ](proxyRequest);
90
- } catch (e) {
91
- error(e);
92
- }
93
-
94
- let body;
95
-
96
- if (response instanceof Response) {
97
- try {
98
- const tryJson = await response.clone();
99
- body = await tryJson.json();
100
- } catch (e) {
101
- body = await response.text();
102
- }
103
- const newHeaders: Record<string, string | string[]> = {};
104
- response.headers.forEach((value, key) => {
105
- if (
106
- !['content-length', 'transfer-encoding'].includes(key.toLowerCase())
107
- ) {
108
- if (newHeaders[key]) {
109
- const prev = newHeaders[key];
110
- if (Array.isArray(prev)) {
111
- newHeaders[key] = [...prev, value];
112
- } else {
113
- newHeaders[key] = [prev, value];
114
- }
115
- } else {
116
- newHeaders[key] = value;
117
- }
118
- }
119
- });
120
-
121
- if (config?.muteResponse !== true) {
122
- if (res) {
123
- res.status(response.status).set(newHeaders);
124
- if (typeof body === 'string') {
125
- res.send(body);
126
- } else {
127
- res.json(body ?? {});
128
- }
129
- }
130
- return;
131
- }
132
-
133
- return {
134
- body,
135
- status: response.status,
136
- headers: newHeaders,
137
- response,
138
- };
139
- } else {
140
- error('Bad response', { response });
141
- return;
142
- }
143
- }
144
- const { paths } = expressPaths(nile);
145
- return { handler, paths };
146
- }
package/tsup.config.js DELETED
@@ -1,9 +0,0 @@
1
- import { defineConfig } from 'tsup';
2
-
3
- export default defineConfig({
4
- minify: true,
5
- target: 'es2022',
6
- sourcemap: true,
7
- dts: true,
8
- format: ['esm', 'cjs'],
9
- });