@niledatabase/express 5.0.0-alpha.14 → 5.0.0-alpha.16
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 +9 -27
- package/dist/index.d.ts +9 -27
- 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 -2
- package/CHANGELOG.md +0 -52
- package/jest.config.js +0 -6
- package/src/express.test.ts +0 -54
- package/src/index.ts +0 -146
- package/tsup.config.js +0 -9
package/dist/index.d.mts
CHANGED
|
@@ -1,31 +1,13 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as _niledatabase_server from '@niledatabase/server';
|
|
2
|
+
import { Server } from '@niledatabase/server';
|
|
3
|
+
import { Request, Response, NextFunction } from 'express';
|
|
2
4
|
|
|
3
5
|
declare function cleaner(val: string): string;
|
|
4
|
-
declare
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
delete: string[];
|
|
10
|
-
};
|
|
6
|
+
declare const express: (instance: Server) => {
|
|
7
|
+
id: string;
|
|
8
|
+
onSetContext: (req: Request, res: Response, next: NextFunction) => void;
|
|
9
|
+
onConfigure: () => void;
|
|
10
|
+
onHandleRequest: (req: Request, res: Response) => Promise<_niledatabase_server.RouteReturn>;
|
|
11
11
|
};
|
|
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
12
|
|
|
31
|
-
export {
|
|
13
|
+
export { cleaner, express };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,31 +1,13 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as _niledatabase_server from '@niledatabase/server';
|
|
2
|
+
import { Server } from '@niledatabase/server';
|
|
3
|
+
import { Request, Response, NextFunction } from 'express';
|
|
2
4
|
|
|
3
5
|
declare function cleaner(val: string): string;
|
|
4
|
-
declare
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
delete: string[];
|
|
10
|
-
};
|
|
6
|
+
declare const express: (instance: Server) => {
|
|
7
|
+
id: string;
|
|
8
|
+
onSetContext: (req: Request, res: Response, next: NextFunction) => void;
|
|
9
|
+
onConfigure: () => void;
|
|
10
|
+
onHandleRequest: (req: Request, res: Response) => Promise<_niledatabase_server.RouteReturn>;
|
|
11
11
|
};
|
|
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
12
|
|
|
31
|
-
export {
|
|
13
|
+
export { cleaner, express };
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";var
|
|
1
|
+
"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});
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import {
|
|
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 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
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
function
|
|
1
|
+
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};
|
|
2
2
|
//# sourceMappingURL=index.mjs.map
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import {
|
|
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 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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@niledatabase/express",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.16",
|
|
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"
|
|
@@ -34,9 +37,11 @@
|
|
|
34
37
|
"@niledatabase/server": "*"
|
|
35
38
|
},
|
|
36
39
|
"devDependencies": {
|
|
40
|
+
"@types/express": "^5",
|
|
41
|
+
"express": "^5.1.0",
|
|
37
42
|
"jest": "^29.7.0",
|
|
38
43
|
"ts-jest": "^29.3.4",
|
|
39
44
|
"tsup": "^8.5.0"
|
|
40
45
|
},
|
|
41
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "b96e22d67b78a2a0d6d8027dea4973272a1ce94e"
|
|
42
47
|
}
|
package/CHANGELOG.md
DELETED
|
@@ -1,52 +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.14](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.13...v5.0.0-alpha.14) (2025-06-16)
|
|
7
|
-
|
|
8
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
9
|
-
|
|
10
|
-
# [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)
|
|
11
|
-
|
|
12
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
13
|
-
|
|
14
|
-
# [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)
|
|
15
|
-
|
|
16
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
17
|
-
|
|
18
|
-
# [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)
|
|
19
|
-
|
|
20
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
21
|
-
|
|
22
|
-
# [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)
|
|
23
|
-
|
|
24
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
25
|
-
|
|
26
|
-
# [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)
|
|
27
|
-
|
|
28
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
29
|
-
|
|
30
|
-
# [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)
|
|
31
|
-
|
|
32
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
33
|
-
|
|
34
|
-
# [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)
|
|
35
|
-
|
|
36
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
37
|
-
|
|
38
|
-
# [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)
|
|
39
|
-
|
|
40
|
-
### Bug Fixes
|
|
41
|
-
|
|
42
|
-
- **server:** move logging to the config object ([6e3e380](https://github.com/niledatabase/nile-js/commit/6e3e38014f5b9795552af0a7b97e2d3fe6cd1a88))
|
|
43
|
-
|
|
44
|
-
# [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)
|
|
45
|
-
|
|
46
|
-
**Note:** Version bump only for package @niledatabase/express
|
|
47
|
-
|
|
48
|
-
# [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)
|
|
49
|
-
|
|
50
|
-
### Features
|
|
51
|
-
|
|
52
|
-
- **server:** invites ([c10f598](https://github.com/niledatabase/nile-js/commit/c10f5980bcbc55ed436ce8cceca4111aa8e6a276))
|
package/jest.config.js
DELETED
package/src/express.test.ts
DELETED
|
@@ -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
|
-
}
|