@niledatabase/express 5.0.0-alpha.15 → 5.0.0-alpha.17
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 +6 -6
- package/dist/index.d.ts +6 -6
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +7 -3
- package/CHANGELOG.md +0 -58
- package/jest.config.js +0 -6
- package/src/express.test.ts +0 -166
- package/src/index.ts +0 -147
- package/tsup.config.js +0 -9
package/dist/index.d.mts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { Request, Response, NextFunction } from 'express';
|
|
1
|
+
import { Server, ExtensionState } from '@niledatabase/server';
|
|
2
|
+
import { Express, Request, Response, NextFunction } from 'express';
|
|
4
3
|
|
|
5
4
|
declare function cleaner(val: string): string;
|
|
6
|
-
declare
|
|
5
|
+
declare function express(app?: Express): (instance: Server) => {
|
|
7
6
|
id: string;
|
|
8
|
-
onSetContext: (req:
|
|
7
|
+
onSetContext: (req: unknown, _res: unknown, next: unknown) => void;
|
|
8
|
+
onGetContext: () => {};
|
|
9
9
|
onConfigure: () => void;
|
|
10
|
-
onHandleRequest: (req: Request, res: Response) => Promise<
|
|
10
|
+
onHandleRequest: (req: Request, res: Response, next: NextFunction) => Promise<void | ExtensionState.onHandleRequest>;
|
|
11
11
|
};
|
|
12
12
|
|
|
13
13
|
export { cleaner, express };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { Request, Response, NextFunction } from 'express';
|
|
1
|
+
import { Server, ExtensionState } from '@niledatabase/server';
|
|
2
|
+
import { Express, Request, Response, NextFunction } from 'express';
|
|
4
3
|
|
|
5
4
|
declare function cleaner(val: string): string;
|
|
6
|
-
declare
|
|
5
|
+
declare function express(app?: Express): (instance: Server) => {
|
|
7
6
|
id: string;
|
|
8
|
-
onSetContext: (req:
|
|
7
|
+
onSetContext: (req: unknown, _res: unknown, next: unknown) => void;
|
|
8
|
+
onGetContext: () => {};
|
|
9
9
|
onConfigure: () => void;
|
|
10
|
-
onHandleRequest: (req: Request, res: Response) => Promise<
|
|
10
|
+
onHandleRequest: (req: Request, res: Response, next: NextFunction) => Promise<void | ExtensionState.onHandleRequest>;
|
|
11
11
|
};
|
|
12
12
|
|
|
13
13
|
export { cleaner, express };
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";var
|
|
1
|
+
"use strict";var y=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var O=(s,o)=>{for(var r in o)y(s,r,{get:o[r],enumerable:!0})},U=(s,o,r,E)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of P(o))!b.call(s,t)&&t!==r&&y(s,t,{get:()=>o[t],enumerable:!(E=N(o,t))||E.enumerable});return s};var C=s=>U(y({},"__esModule",{value:!0}),s);var L={};O(L,{cleaner:()=>h,express:()=>I});module.exports=C(L);var m=require("async_hooks"),S=require("@niledatabase/server");function h(s){return s.replaceAll(/\{([^}]+)\}/g,":$1")}var w=new m.AsyncLocalStorage;function I(s){let o=!1;return r=>{let{error:E,debug:t}=r.logger("[EXTENSION][express]"),p=e=>{w.getStore()?.set("context",e),r.setContext(e)};function T(e){s&&(t("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!o&&s&&(t("initializing express extension with middleware"),s.use((e,a,i)=>{w.run(new Map,()=>i())}),s.param("tenantId",(e,a,i,n)=>{t(`tenantId param set: ${n}`),p({tenantId:n}),i()}),s.use((e,a,i)=>{let n=typeof e=="object"&&"headers"in e&&e.headers||{};p(n),i()})),o=!0,{id:"express",onSetContext:(e,a,i)=>{let n=e;n?.params?.tenantId&&p({tenantId:n.params.tenantId}),n?.headers&&p(n.headers),e instanceof Headers&&p(e),typeof i=="function"&&i()},onGetContext:()=>w.getStore()?.get("context")??{},onConfigure:()=>{let{paths:e}=r,a={get:e.get.map(h),post:e.post.map(h),put:e.put.map(h),delete:e.delete.map(h)};t(`paths configured ${JSON.stringify(a)}`),r.paths=a,T(r)},onHandleRequest:async(e,a,i)=>{t("handling response");let n=e.protocol+"://"+e.get("host")+e.originalUrl;try{new URL(n)}catch{throw new Error("Invalid URL \u2014 are you running Express?")}let g=e.method,f={method:g,headers:new Headers};e.headers?.cookie&&f.headers.set("cookie",e.headers.cookie),["POST","PUT"].includes(g)&&e.body&&(f.body=JSON.stringify(e.body));let H=new Request(n,f);t(`[${g}] proxy: ${n} ${JSON.stringify(f)}`);let d;try{d=await r.handlers[g](H,{disableExtensions:["express"]})}catch(x){return E(x),i()}let u;try{u=await d.clone().json()}catch{u=await d.text()}let c={};return d.headers.forEach((x,l)=>{if(!["content-length","transfer-encoding"].includes(l.toLowerCase()))if(c[l]){let R=c[l];c[l]=Array.isArray(R)?[...R,x]:[R,x]}else c[l]=x}),a.headersSent||(t("sending response"),a.status(d.status).set(c),typeof u=="string"?a.send(u):a.json(u??{})),S.ExtensionState.onHandleRequest}}}}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 { 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
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'async_hooks';\n\nimport { 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 function 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\n const setRequestContext = (context: unknown) => {\n contextStore.getStore()?.set('context', context);\n instance.setContext(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({ tenantId });\n next();\n });\n\n app.use((req, res, next) => {\n const headers =\n (typeof req === 'object' && 'headers' in req && req.headers) || {};\n setRequestContext(headers);\n next();\n });\n }\n\n init = true;\n\n return {\n id: 'express',\n\n onSetContext: (req: unknown, _res: unknown, next: unknown) => {\n const maybeReq = req as ExpressRequest;\n\n if (maybeReq?.params?.tenantId) {\n setRequestContext({ tenantId: maybeReq.params.tenantId });\n }\n\n if (maybeReq?.headers) {\n setRequestContext(maybeReq.headers);\n }\n\n if (req instanceof Headers) {\n setRequestContext(req);\n }\n\n if (typeof next === 'function') next();\n },\n\n onGetContext: () => {\n return contextStore.getStore()?.get('context') ?? {};\n },\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 req: ExpressRequest,\n res: ExpressResponse,\n next: NextFunction\n ) => {\n debug('handling response');\n\n const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n try {\n new URL(reqUrl);\n } catch {\n throw new Error('Invalid URL — are you running Express?');\n }\n\n const method = req.method;\n const init: RequestInit = { method, headers: new Headers() };\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 try {\n response = (await instance.handlers[\n method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n ](proxyRequest, { disableExtensions: ['express'] })) as Response;\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 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"],"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","headers","_res","maybeReq","rawPaths","paths","reqUrl","method","proxyRequest","response","e","body","newHeaders","value","key","prev"]}
|
package/dist/index.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{ExtensionState as
|
|
1
|
+
import{AsyncLocalStorage as S}from"async_hooks";import{ExtensionState as T}from"@niledatabase/server";function E(t){return t.replaceAll(/\{([^}]+)\}/g,":$1")}var f=new S;function b(t){let R=!1;return a=>{let{error:y,debug:r}=a.logger("[EXTENSION][express]"),i=e=>{f.getStore()?.set("context",e),a.setContext(e)};function w(e){t&&(r("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!R&&t&&(r("initializing express extension with middleware"),t.use((e,n,o)=>{f.run(new Map,()=>o())}),t.param("tenantId",(e,n,o,s)=>{r(`tenantId param set: ${s}`),i({tenantId:s}),o()}),t.use((e,n,o)=>{let s=typeof e=="object"&&"headers"in e&&e.headers||{};i(s),o()})),R=!0,{id:"express",onSetContext:(e,n,o)=>{let s=e;s?.params?.tenantId&&i({tenantId:s.params.tenantId}),s?.headers&&i(s.headers),e instanceof Headers&&i(e),typeof o=="function"&&o()},onGetContext:()=>f.getStore()?.get("context")??{},onConfigure:()=>{let{paths:e}=a,n={get:e.get.map(E),post:e.post.map(E),put:e.put.map(E),delete:e.delete.map(E)};r(`paths configured ${JSON.stringify(n)}`),a.paths=n,w(a)},onHandleRequest:async(e,n,o)=>{r("handling response");let s=e.protocol+"://"+e.get("host")+e.originalUrl;try{new URL(s)}catch{throw new Error("Invalid URL \u2014 are you running Express?")}let l=e.method,h={method:l,headers:new Headers};e.headers?.cookie&&h.headers.set("cookie",e.headers.cookie),["POST","PUT"].includes(l)&&e.body&&(h.body=JSON.stringify(e.body));let m=new Request(s,h);r(`[${l}] proxy: ${s} ${JSON.stringify(h)}`);let p;try{p=await a.handlers[l](m,{disableExtensions:["express"]})}catch(c){return y(c),o()}let d;try{d=await p.clone().json()}catch{d=await p.text()}let u={};return p.headers.forEach((c,x)=>{if(!["content-length","transfer-encoding"].includes(x.toLowerCase()))if(u[x]){let g=u[x];u[x]=Array.isArray(g)?[...g,c]:[g,c]}else u[x]=c}),n.headersSent||(r("sending response"),n.status(p.status).set(u),typeof d=="string"?n.send(d):n.json(d??{})),T.onHandleRequest}}}}export{E as cleaner,b as express};
|
|
2
2
|
//# sourceMappingURL=index.mjs.map
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'async_hooks';\n\nimport { 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 function 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\n const setRequestContext = (context: unknown) => {\n contextStore.getStore()?.set('context', context);\n instance.setContext(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({ tenantId });\n next();\n });\n\n app.use((req, res, next) => {\n const headers =\n (typeof req === 'object' && 'headers' in req && req.headers) || {};\n setRequestContext(headers);\n next();\n });\n }\n\n init = true;\n\n return {\n id: 'express',\n\n onSetContext: (req: unknown, _res: unknown, next: unknown) => {\n const maybeReq = req as ExpressRequest;\n\n if (maybeReq?.params?.tenantId) {\n setRequestContext({ tenantId: maybeReq.params.tenantId });\n }\n\n if (maybeReq?.headers) {\n setRequestContext(maybeReq.headers);\n }\n\n if (req instanceof Headers) {\n setRequestContext(req);\n }\n\n if (typeof next === 'function') next();\n },\n\n onGetContext: () => {\n return contextStore.getStore()?.get('context') ?? {};\n },\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 req: ExpressRequest,\n res: ExpressResponse,\n next: NextFunction\n ) => {\n debug('handling response');\n\n const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;\n\n try {\n new URL(reqUrl);\n } catch {\n throw new Error('Invalid URL — are you running Express?');\n }\n\n const method = req.method;\n const init: RequestInit = { method, headers: new Headers() };\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 try {\n response = (await instance.handlers[\n method as 'GET' | 'POST' | 'PUT' | 'DELETE'\n ](proxyRequest, { disableExtensions: ['express'] })) as Response;\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 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"],"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","headers","_res","maybeReq","rawPaths","paths","reqUrl","method","proxyRequest","response","e","body","newHeaders","value","key","prev"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@niledatabase/express",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.17",
|
|
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,7 +34,8 @@
|
|
|
31
34
|
"access": "public"
|
|
32
35
|
},
|
|
33
36
|
"peerDependencies": {
|
|
34
|
-
"@niledatabase/server": "*"
|
|
37
|
+
"@niledatabase/server": "*",
|
|
38
|
+
"express": "^5.0.0 || ^4.0.0"
|
|
35
39
|
},
|
|
36
40
|
"devDependencies": {
|
|
37
41
|
"@types/express": "^5",
|
|
@@ -40,5 +44,5 @@
|
|
|
40
44
|
"ts-jest": "^29.3.4",
|
|
41
45
|
"tsup": "^8.5.0"
|
|
42
46
|
},
|
|
43
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "45a166b3318215178a1dd15110aa580402691422"
|
|
44
48
|
}
|
package/CHANGELOG.md
DELETED
|
@@ -1,58 +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.15](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.14...v5.0.0-alpha.15) (2025-06-25)
|
|
7
|
-
|
|
8
|
-
### Bug Fixes
|
|
9
|
-
|
|
10
|
-
- **server:** add better extensions ([2dd7417](https://github.com/niledatabase/nile-js/commit/2dd741726e2336b042d06a36ad091e6749098454))
|
|
11
|
-
|
|
12
|
-
# [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)
|
|
13
|
-
|
|
14
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
15
|
-
|
|
16
|
-
# [5.0.0-alpha.13](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.12...v5.0.0-alpha.13) (2025-06-16)
|
|
17
|
-
|
|
18
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
19
|
-
|
|
20
|
-
# [5.0.0-alpha.12](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.11...v5.0.0-alpha.12) (2025-06-16)
|
|
21
|
-
|
|
22
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
23
|
-
|
|
24
|
-
# [5.0.0-alpha.11](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.10...v5.0.0-alpha.11) (2025-06-16)
|
|
25
|
-
|
|
26
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
27
|
-
|
|
28
|
-
# [5.0.0-alpha.10](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.9...v5.0.0-alpha.10) (2025-06-16)
|
|
29
|
-
|
|
30
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
31
|
-
|
|
32
|
-
# [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)
|
|
33
|
-
|
|
34
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
35
|
-
|
|
36
|
-
# [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)
|
|
37
|
-
|
|
38
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
39
|
-
|
|
40
|
-
# [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)
|
|
41
|
-
|
|
42
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
43
|
-
|
|
44
|
-
# [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)
|
|
45
|
-
|
|
46
|
-
### Bug Fixes
|
|
47
|
-
|
|
48
|
-
- **server:** move logging to the config object ([6e3e380](https://github.com/niledatabase/nile-js/commit/6e3e38014f5b9795552af0a7b97e2d3fe6cd1a88))
|
|
49
|
-
|
|
50
|
-
# [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)
|
|
51
|
-
|
|
52
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
53
|
-
|
|
54
|
-
# [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)
|
|
55
|
-
|
|
56
|
-
### Features
|
|
57
|
-
|
|
58
|
-
- **server:** invites ([c10f598](https://github.com/niledatabase/nile-js/commit/c10f5980bcbc55ed436ce8cceca4111aa8e6a276))
|
package/jest.config.js
DELETED
package/src/express.test.ts
DELETED
|
@@ -1,166 +0,0 @@
|
|
|
1
|
-
import express from 'express';
|
|
2
|
-
import { ExtensionState, Server } from '@niledatabase/server';
|
|
3
|
-
import type {
|
|
4
|
-
Request as ExpressRequest,
|
|
5
|
-
Response as ExpressResponse,
|
|
6
|
-
} from 'express';
|
|
7
|
-
|
|
8
|
-
import { express as expressExtension, cleaner } from '.';
|
|
9
|
-
|
|
10
|
-
describe('express extension', () => {
|
|
11
|
-
let app;
|
|
12
|
-
let instance: Server;
|
|
13
|
-
|
|
14
|
-
beforeEach(() => {
|
|
15
|
-
app = express();
|
|
16
|
-
app.use(express.json());
|
|
17
|
-
|
|
18
|
-
instance = {
|
|
19
|
-
logger: () => ({
|
|
20
|
-
error: jest.fn(),
|
|
21
|
-
debug: jest.fn(),
|
|
22
|
-
warn: jest.fn(),
|
|
23
|
-
info: jest.fn(),
|
|
24
|
-
}),
|
|
25
|
-
handlers: {
|
|
26
|
-
GET: jest
|
|
27
|
-
.fn()
|
|
28
|
-
.mockResolvedValue(
|
|
29
|
-
new Response(JSON.stringify({ msg: 'GET OK' }), { status: 200 })
|
|
30
|
-
),
|
|
31
|
-
POST: jest
|
|
32
|
-
.fn()
|
|
33
|
-
.mockResolvedValue(
|
|
34
|
-
new Response(JSON.stringify({ msg: 'POST OK' }), { status: 201 })
|
|
35
|
-
),
|
|
36
|
-
},
|
|
37
|
-
setContext: jest.fn(),
|
|
38
|
-
paths: {
|
|
39
|
-
get: ['/test/{id}'],
|
|
40
|
-
post: ['/submit/{formId}'],
|
|
41
|
-
put: [],
|
|
42
|
-
delete: [],
|
|
43
|
-
},
|
|
44
|
-
} as unknown as Server;
|
|
45
|
-
});
|
|
46
|
-
|
|
47
|
-
describe('cleaner()', () => {
|
|
48
|
-
it('replaces {param} with :param', () => {
|
|
49
|
-
expect(cleaner('/api/{tenantId}/resource')).toBe(
|
|
50
|
-
'/api/:tenantId/resource'
|
|
51
|
-
);
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
describe('onSetContext', () => {
|
|
56
|
-
it('sets context from params and headers', () => {
|
|
57
|
-
const ext = expressExtension(instance);
|
|
58
|
-
const req = {
|
|
59
|
-
params: { tenantId: 'abc' },
|
|
60
|
-
headers: { 'x-foo': 'bar' },
|
|
61
|
-
} as unknown as ExpressRequest;
|
|
62
|
-
const res = {} as unknown as ExpressResponse;
|
|
63
|
-
const next = jest.fn();
|
|
64
|
-
|
|
65
|
-
ext.onSetContext(req, res, next);
|
|
66
|
-
|
|
67
|
-
expect(instance.setContext).toHaveBeenCalledWith({ tenantId: 'abc' });
|
|
68
|
-
expect(instance.setContext).toHaveBeenCalledWith(req.headers);
|
|
69
|
-
expect(next).toHaveBeenCalled();
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
|
|
73
|
-
describe('onConfigure', () => {
|
|
74
|
-
it('cleans up path params and updates instance.paths', () => {
|
|
75
|
-
const ext = expressExtension(instance);
|
|
76
|
-
ext.onConfigure();
|
|
77
|
-
expect(instance.paths).toEqual({
|
|
78
|
-
get: ['/test/:id'],
|
|
79
|
-
post: ['/submit/:formId'],
|
|
80
|
-
put: [],
|
|
81
|
-
delete: [],
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
describe('onHandleRequest', () => {
|
|
87
|
-
it('proxies GET request with JSON response', async () => {
|
|
88
|
-
const ext = expressExtension(instance);
|
|
89
|
-
const req = {
|
|
90
|
-
method: 'GET',
|
|
91
|
-
protocol: 'http',
|
|
92
|
-
get: () => 'localhost',
|
|
93
|
-
originalUrl: '/api/test',
|
|
94
|
-
headers: { cookie: 'a=b' },
|
|
95
|
-
body: {},
|
|
96
|
-
} as unknown as ExpressRequest;
|
|
97
|
-
const res = {
|
|
98
|
-
headersSent: false,
|
|
99
|
-
status: jest.fn().mockReturnThis(),
|
|
100
|
-
set: jest.fn().mockReturnThis(),
|
|
101
|
-
json: jest.fn(),
|
|
102
|
-
send: jest.fn(),
|
|
103
|
-
} as unknown as ExpressResponse;
|
|
104
|
-
|
|
105
|
-
const result = await ext.onHandleRequest(req, res);
|
|
106
|
-
|
|
107
|
-
expect(instance.setContext).toHaveBeenCalledWith(req.headers);
|
|
108
|
-
expect(instance.handlers.GET).toHaveBeenCalled();
|
|
109
|
-
expect(res.status).toHaveBeenCalledWith(200);
|
|
110
|
-
expect(res.json).toHaveBeenCalledWith({ msg: 'GET OK' });
|
|
111
|
-
expect(result).toBe(ExtensionState.onHandleRequest);
|
|
112
|
-
});
|
|
113
|
-
|
|
114
|
-
it('handles non-JSON response fallback', async () => {
|
|
115
|
-
(instance.handlers.GET as jest.Mock).mockResolvedValue(
|
|
116
|
-
new Response('Plain text body', { status: 200 })
|
|
117
|
-
);
|
|
118
|
-
const ext = expressExtension(instance);
|
|
119
|
-
|
|
120
|
-
const req = {
|
|
121
|
-
method: 'GET',
|
|
122
|
-
protocol: 'http',
|
|
123
|
-
get: () => 'localhost',
|
|
124
|
-
originalUrl: '/api/test',
|
|
125
|
-
headers: {},
|
|
126
|
-
body: {},
|
|
127
|
-
} as unknown as ExpressRequest;
|
|
128
|
-
const res = {
|
|
129
|
-
headersSent: false,
|
|
130
|
-
status: jest.fn().mockReturnThis(),
|
|
131
|
-
set: jest.fn().mockReturnThis(),
|
|
132
|
-
json: jest.fn(),
|
|
133
|
-
send: jest.fn(),
|
|
134
|
-
} as unknown as ExpressResponse;
|
|
135
|
-
|
|
136
|
-
await ext.onHandleRequest(req, res);
|
|
137
|
-
|
|
138
|
-
expect(res.send).toHaveBeenCalledWith('Plain text body');
|
|
139
|
-
});
|
|
140
|
-
|
|
141
|
-
it('does not re-send headers if already sent', async () => {
|
|
142
|
-
const ext = expressExtension(instance);
|
|
143
|
-
|
|
144
|
-
const req = {
|
|
145
|
-
method: 'GET',
|
|
146
|
-
protocol: 'http',
|
|
147
|
-
get: () => 'localhost',
|
|
148
|
-
originalUrl: '/api/test',
|
|
149
|
-
headers: {},
|
|
150
|
-
body: {},
|
|
151
|
-
} as unknown as ExpressRequest;
|
|
152
|
-
const res = {
|
|
153
|
-
headersSent: true,
|
|
154
|
-
status: jest.fn(),
|
|
155
|
-
set: jest.fn(),
|
|
156
|
-
json: jest.fn(),
|
|
157
|
-
send: jest.fn(),
|
|
158
|
-
} as unknown as ExpressResponse;
|
|
159
|
-
|
|
160
|
-
const result = await ext.onHandleRequest(req, res);
|
|
161
|
-
|
|
162
|
-
expect(res.status).not.toHaveBeenCalled();
|
|
163
|
-
expect(result).toBe(ExtensionState.onHandleRequest);
|
|
164
|
-
});
|
|
165
|
-
});
|
|
166
|
-
});
|
package/src/index.ts
DELETED
|
@@ -1,147 +0,0 @@
|
|
|
1
|
-
import { ExtensionState, Server } from '@niledatabase/server';
|
|
2
|
-
import type {
|
|
3
|
-
Request as ExpressRequest,
|
|
4
|
-
Response as ExpressResponse,
|
|
5
|
-
NextFunction,
|
|
6
|
-
} from 'express';
|
|
7
|
-
|
|
8
|
-
export function cleaner(val: string) {
|
|
9
|
-
return val.replaceAll(/\{([^}]+)\}/g, ':$1');
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
export const express = (instance: Server) => {
|
|
13
|
-
const { error, debug } = instance.logger('[EXTENSION][express]');
|
|
14
|
-
return {
|
|
15
|
-
id: 'express',
|
|
16
|
-
onSetContext: (
|
|
17
|
-
req: ExpressRequest,
|
|
18
|
-
res: ExpressResponse,
|
|
19
|
-
next: NextFunction
|
|
20
|
-
) => {
|
|
21
|
-
// do this first, since `cookies` does not persist across context set
|
|
22
|
-
if (req.params.tenantId) {
|
|
23
|
-
instance.setContext({ tenantId: req.params.tenantId });
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
if (req.headers) {
|
|
27
|
-
instance.setContext(req.headers);
|
|
28
|
-
}
|
|
29
|
-
if (req instanceof Headers) {
|
|
30
|
-
instance.setContext(req);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
if (typeof next === 'function') {
|
|
34
|
-
next();
|
|
35
|
-
}
|
|
36
|
-
},
|
|
37
|
-
onConfigure: () => {
|
|
38
|
-
const { paths: nilePaths } = instance;
|
|
39
|
-
const paths = {
|
|
40
|
-
get: nilePaths.get.map(cleaner),
|
|
41
|
-
post: nilePaths.post.map(cleaner),
|
|
42
|
-
put: nilePaths.put.map(cleaner),
|
|
43
|
-
delete: nilePaths.delete.map(cleaner),
|
|
44
|
-
};
|
|
45
|
-
debug(`paths configured ${JSON.stringify(paths)}`);
|
|
46
|
-
instance.paths = paths;
|
|
47
|
-
},
|
|
48
|
-
onHandleRequest: async (req: ExpressRequest, res: ExpressResponse) => {
|
|
49
|
-
// handle standard request objects
|
|
50
|
-
if (req instanceof Request) {
|
|
51
|
-
debug('using default response');
|
|
52
|
-
const response = await instance.handlers[
|
|
53
|
-
req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
|
|
54
|
-
// disable the extension so we don't re-handle
|
|
55
|
-
](req, { disableExtensions: ['express'] });
|
|
56
|
-
return response;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
debug('handling response');
|
|
60
|
-
instance.setContext(req.headers);
|
|
61
|
-
|
|
62
|
-
const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
|
|
63
|
-
|
|
64
|
-
// be sure its a valid url
|
|
65
|
-
try {
|
|
66
|
-
new URL(reqUrl);
|
|
67
|
-
} catch (e) {
|
|
68
|
-
throw new Error(
|
|
69
|
-
'Invalid URL sent for handle request. Are you running express?'
|
|
70
|
-
);
|
|
71
|
-
}
|
|
72
|
-
const { method } = req;
|
|
73
|
-
const init: RequestInit = { method, headers: new Headers() };
|
|
74
|
-
// seems like this should work without this, since `get/set context should do the things we think it should.
|
|
75
|
-
if (
|
|
76
|
-
'headers' in req &&
|
|
77
|
-
typeof req.headers === 'object' &&
|
|
78
|
-
req.headers &&
|
|
79
|
-
'cookie' in req.headers &&
|
|
80
|
-
typeof req.headers.cookie === 'string'
|
|
81
|
-
) {
|
|
82
|
-
(init.headers as Headers).set('cookie', req.headers.cookie);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
if ('body' in req) {
|
|
86
|
-
if (method === 'POST' || method === 'PUT') {
|
|
87
|
-
init.body = JSON.stringify(req.body);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
const proxyRequest = new Request(reqUrl, init);
|
|
92
|
-
debug(
|
|
93
|
-
`[${method.toUpperCase()}]proxy request converted to ${reqUrl} with ${JSON.stringify(
|
|
94
|
-
init
|
|
95
|
-
)}`
|
|
96
|
-
);
|
|
97
|
-
|
|
98
|
-
let response: Response = null as unknown as Response;
|
|
99
|
-
|
|
100
|
-
try {
|
|
101
|
-
response = (await instance.handlers[
|
|
102
|
-
req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
|
|
103
|
-
](proxyRequest, { disableExtensions: ['express'] })) as Response;
|
|
104
|
-
} catch (e) {
|
|
105
|
-
error(e);
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
let body;
|
|
109
|
-
try {
|
|
110
|
-
const tryJson = await response.clone();
|
|
111
|
-
body = await tryJson.json();
|
|
112
|
-
} catch (e) {
|
|
113
|
-
body = await response.text();
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
const newHeaders: Record<string, string | string[]> = {};
|
|
117
|
-
response.headers.forEach((value, key) => {
|
|
118
|
-
if (
|
|
119
|
-
!['content-length', 'transfer-encoding'].includes(key.toLowerCase())
|
|
120
|
-
) {
|
|
121
|
-
if (newHeaders[key]) {
|
|
122
|
-
const prev = newHeaders[key];
|
|
123
|
-
if (Array.isArray(prev)) {
|
|
124
|
-
newHeaders[key] = [...prev, value];
|
|
125
|
-
} else {
|
|
126
|
-
newHeaders[key] = [prev, value];
|
|
127
|
-
}
|
|
128
|
-
} else {
|
|
129
|
-
newHeaders[key] = value;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
});
|
|
133
|
-
|
|
134
|
-
if (!res.headersSent) {
|
|
135
|
-
debug('sending response');
|
|
136
|
-
res.status(response.status).set(newHeaders);
|
|
137
|
-
if (typeof body === 'string') {
|
|
138
|
-
res.send(body);
|
|
139
|
-
} else {
|
|
140
|
-
res.json(body ?? {});
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
// always return to prevent infinite loop
|
|
144
|
-
return ExtensionState.onHandleRequest;
|
|
145
|
-
},
|
|
146
|
-
};
|
|
147
|
-
};
|