@proteinjs/server 1.1.2 → 1.1.3
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/.eslintrc.js +20 -0
- package/.prettierignore +3 -0
- package/.prettierrc +8 -0
- package/CHANGELOG.md +11 -44
- package/LICENSE +21 -0
- package/dist/generated/index.js +1 -1
- package/dist/generated/index.js.map +1 -1
- package/dist/jest.config.d.ts +1 -1
- package/dist/jest.config.js +6 -15
- package/dist/jest.config.js.map +1 -1
- package/dist/src/NodeSessionDataStorage.d.ts.map +1 -1
- package/dist/src/NodeSessionDataStorage.js +13 -7
- package/dist/src/NodeSessionDataStorage.js.map +1 -1
- package/dist/src/loadRoutes.d.ts.map +1 -1
- package/dist/src/loadRoutes.js +14 -7
- package/dist/src/loadRoutes.js.map +1 -1
- package/dist/src/routes/healthCheck.d.ts.map +1 -1
- package/dist/src/routes/healthCheck.js +1 -1
- package/dist/src/routes/healthCheck.js.map +1 -1
- package/dist/src/routes/reactApp.d.ts.map +1 -1
- package/dist/src/routes/reactApp.js +7 -4
- package/dist/src/routes/reactApp.js.map +1 -1
- package/dist/src/startServer.d.ts.map +1 -1
- package/dist/src/startServer.js +25 -12
- package/dist/src/startServer.js.map +1 -1
- package/dist/webpack.config.js +15 -15
- package/dist/webpack.config.js.map +1 -1
- package/generated/index.ts +5 -8
- package/index.ts +1 -1
- package/jest.config.js +8 -17
- package/package.json +11 -5
- package/src/NodeSessionDataStorage.ts +35 -29
- package/src/loadRoutes.ts +124 -103
- package/src/nodeModulesPath.ts +1 -1
- package/src/routes/healthCheck.ts +7 -7
- package/src/routes/reactApp.ts +43 -36
- package/src/startServer.ts +164 -132
- package/tsconfig.json +17 -17
- package/webpack.config.js +20 -20
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startServer.js","sourceRoot":"","sources":["../../src/startServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAC9B,oEAA6C;AAC7C,4DAAsC;AACtC,gEAAyC;AACzC,4DAAqC;AACrC,sDAAgC;AAChC,kEAA2C;AAC3C,oDAA8B;AAC9B,kFAA0D;AAC1D,kFAA0D;AAC1D,oCAAmC;AACnC,oDAAgE;AAChE,2CAAgE;AAChE,wCAAyC;AACzC,qDAAuD;AAEvD,IAAM,iBAAiB,GAAG,UAAU,CAAC;AACrC,IAAM,MAAM,GAAG,IAAI,aAAM,CAAC,QAAQ,CAAC,CAAC;AAEpC,SAAsB,WAAW,CAAC,MAAoB;;;;;;
|
|
1
|
+
{"version":3,"file":"startServer.js","sourceRoot":"","sources":["../../src/startServer.ts"],"names":[],"mappings":"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"}
|
package/dist/webpack.config.js
CHANGED
|
@@ -12,8 +12,8 @@ var nodeModulesPath = require('./src/nodeModulesPath').nodeModulesPath;
|
|
|
12
12
|
var webpack5esmInteropRule = {
|
|
13
13
|
test: /\.m?js/,
|
|
14
14
|
resolve: {
|
|
15
|
-
fullySpecified: false
|
|
16
|
-
}
|
|
15
|
+
fullySpecified: false,
|
|
16
|
+
},
|
|
17
17
|
};
|
|
18
18
|
module.exports = {
|
|
19
19
|
mode: 'development',
|
|
@@ -26,13 +26,13 @@ module.exports = {
|
|
|
26
26
|
filename: '[name].js',
|
|
27
27
|
// path and publicPath provided in startServer.initializeHotReloading
|
|
28
28
|
// path: path.join(__dirname, 'dist'),
|
|
29
|
-
library: '[name]'
|
|
29
|
+
library: '[name]',
|
|
30
30
|
},
|
|
31
31
|
resolve: {
|
|
32
32
|
extensions: ['.tsx', '.ts', '.js', '.json'],
|
|
33
33
|
alias: {
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
react: path.join(nodeModulesPath, 'react'),
|
|
35
|
+
process: 'process/browser',
|
|
36
36
|
'@mui/joy': path.join(nodeModulesPath, '@mui/joy'),
|
|
37
37
|
'@mui/material': path.join(nodeModulesPath, '@mui/material'),
|
|
38
38
|
'@mui/icons-material': path.join(nodeModulesPath, '@mui/icons-material'),
|
|
@@ -40,12 +40,12 @@ module.exports = {
|
|
|
40
40
|
},
|
|
41
41
|
// provide shims for node libraries for webpack >= 5
|
|
42
42
|
fallback: {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
crypto: require.resolve('crypto-browserify'),
|
|
44
|
+
util: require.resolve('util/'),
|
|
45
|
+
events: require.resolve('events/'),
|
|
46
|
+
url: require.resolve('url/'),
|
|
47
|
+
buffer: require.resolve('buffer/'),
|
|
48
|
+
stream: require.resolve('stream-browserify'),
|
|
49
49
|
'process/browser': require.resolve('process/browser'),
|
|
50
50
|
},
|
|
51
51
|
},
|
|
@@ -96,10 +96,10 @@ module.exports = {
|
|
|
96
96
|
test: /[\\/]node_modules[\\/]/,
|
|
97
97
|
name: 'vendor',
|
|
98
98
|
chunks: 'all',
|
|
99
|
-
priority: -10
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
}
|
|
99
|
+
priority: -10,
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
},
|
|
103
103
|
},
|
|
104
104
|
plugins: [
|
|
105
105
|
new webpack.ProvidePlugin({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["../webpack.config.js"],"names":[],"mappings":";AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,IAAM,yBAAyB,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;AAClF,IAAM,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC3D,IAAA,eAAe,GAAK,OAAO,CAAC,uBAAuB,CAAC,gBAArC,CAAsC;AAE7D,6DAA6D;AAC7D,0EAA0E;AAC1E,sDAAsD;AAEtD,+EAA+E;AAC/E,cAAc;AACd,IAAM,sBAAsB,GAAG;IAC7B,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE;QACP,cAAc,EAAE,KAAK;KACtB;CACF,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG;IACf,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,mBAAmB;IAC5B,mEAAmE;IACnE,WAAW;IACX,oEAAoE;IACpE,KAAK;IACL,MAAM,EAAE;QACN,QAAQ,EAAE,WAAW;QACrB,qEAAqE;QACrE,sCAAsC;QACtC,OAAO,EAAE,QAAQ;KAClB;IACD,OAAO,EAAE;QACP,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;QAC3C,KAAK,EAAE;YACL,
|
|
1
|
+
{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["../webpack.config.js"],"names":[],"mappings":"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"}
|
package/generated/index.ts
CHANGED
|
@@ -31,11 +31,10 @@ import 'webpack';
|
|
|
31
31
|
import 'webpack-dev-middleware';
|
|
32
32
|
import 'webpack-hot-middleware';
|
|
33
33
|
|
|
34
|
-
|
|
35
34
|
/** Generate Source Graph */
|
|
36
35
|
|
|
37
|
-
const sourceGraph =
|
|
38
|
-
|
|
36
|
+
const sourceGraph =
|
|
37
|
+
'{"options":{"directed":true,"multigraph":false,"compound":false},"nodes":[{"v":"@proteinjs/server/NodeSessionDataStorage","value":{"packageName":"@proteinjs/server","name":"NodeSessionDataStorage","filePath":"/home/runner/work/server/server/packages/server/src/NodeSessionDataStorage.ts","qualifiedName":"@proteinjs/server/NodeSessionDataStorage","isAbstract":false,"isStatic":false,"visibility":"public","properties":[{"name":"HOOK_INITIALIZED","type":null,"isOptional":false,"isAbstract":false,"isStatic":true,"visibility":"private"},{"name":"SESSION_DATA","type":{"packageName":"@proteinjs/server","name":"{ [id: string]: SessionData }","filePath":null,"qualifiedName":"@proteinjs/server/{ [id: string]: SessionData }","typeParameters":null,"directParents":null},"isOptional":false,"isAbstract":false,"isStatic":true,"visibility":"private"},{"name":"environment","type":null,"isOptional":false,"isAbstract":false,"isStatic":false,"visibility":"public"}],"methods":[{"name":"setData","returnType":null,"isAsync":false,"isOptional":false,"isAbstract":false,"isStatic":false,"visibility":"public","parameters":[{"name":"data","type":{"packageName":"@proteinjs/server-api","name":"SessionData","filePath":null,"qualifiedName":"@proteinjs/server-api/SessionData","typeParameters":null,"directParents":null}}]},{"name":"getData","returnType":{"packageName":"@proteinjs/server-api","name":"SessionData","filePath":null,"qualifiedName":"@proteinjs/server-api/SessionData","typeParameters":null,"directParents":null},"isAsync":false,"isOptional":false,"isAbstract":false,"isStatic":false,"visibility":"public","parameters":[]},{"name":"initHook","returnType":null,"isAsync":false,"isOptional":false,"isAbstract":false,"isStatic":false,"visibility":"private","parameters":[]}],"typeParameters":[],"directParentInterfaces":[{"packageName":"@proteinjs/server-api","name":"SessionDataStorage","filePath":null,"qualifiedName":"@proteinjs/server-api/SessionDataStorage","properties":[],"methods":[],"typeParameters":[],"directParents":[]}],"directParentClasses":[],"sourceType":2}},{"v":"@proteinjs/server-api/SessionDataStorage"},{"v":"/string"},{"v":"@proteinjs/server/healthCheck","value":{"packageName":"@proteinjs/server","name":"healthCheck","filePath":"/home/runner/work/server/server/packages/server/src/routes/healthCheck.ts","qualifiedName":"@proteinjs/server/healthCheck","type":{"packageName":"@proteinjs/server-api","name":"Route","filePath":null,"qualifiedName":"@proteinjs/server-api/Route","typeParameters":[],"directParents":[{"packageName":"@proteinjs/server-api","name":"Route","filePath":null,"qualifiedName":"@proteinjs/server-api/Route","typeParameters":[],"directParents":null}]},"isExported":true,"isConst":true,"sourceType":0}},{"v":"@proteinjs/server-api/Route"}],"edges":[{"v":"@proteinjs/server/NodeSessionDataStorage","w":"@proteinjs/server-api/SessionDataStorage","value":"implements interface"},{"v":"@proteinjs/server/healthCheck","w":"@proteinjs/server-api/Route","value":"has type"}]}';
|
|
39
38
|
|
|
40
39
|
/** Generate Source Links */
|
|
41
40
|
|
|
@@ -43,15 +42,13 @@ import { NodeSessionDataStorage } from '../src/NodeSessionDataStorage';
|
|
|
43
42
|
import { healthCheck } from '../src/routes/healthCheck';
|
|
44
43
|
|
|
45
44
|
const sourceLinks = {
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
'@proteinjs/server/NodeSessionDataStorage': NodeSessionDataStorage,
|
|
46
|
+
'@proteinjs/server/healthCheck': healthCheck,
|
|
48
47
|
};
|
|
49
48
|
|
|
50
|
-
|
|
51
49
|
/** Load Source Graph and Links */
|
|
52
50
|
|
|
53
51
|
import { SourceRepository } from '@proteinjs/reflection';
|
|
54
52
|
SourceRepository.merge(sourceGraph, sourceLinks);
|
|
55
53
|
|
|
56
|
-
|
|
57
|
-
export * from '../index';
|
|
54
|
+
export * from '../index';
|
package/index.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './src/startServer';
|
|
1
|
+
export * from './src/startServer';
|
package/jest.config.js
CHANGED
|
@@ -1,18 +1,9 @@
|
|
|
1
1
|
module.exports = {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
"ts",
|
|
11
|
-
"tsx",
|
|
12
|
-
"js",
|
|
13
|
-
"jsx",
|
|
14
|
-
"json",
|
|
15
|
-
"node"
|
|
16
|
-
],
|
|
17
|
-
"testEnvironment": "node"
|
|
18
|
-
}
|
|
2
|
+
roots: ['<rootDir>/test'],
|
|
3
|
+
transform: {
|
|
4
|
+
'^.+\\.tsx?$': 'ts-jest',
|
|
5
|
+
},
|
|
6
|
+
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
|
|
7
|
+
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
|
|
8
|
+
testEnvironment: 'node',
|
|
9
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/server",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.3",
|
|
4
4
|
"description": "A server impl",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
|
|
25
25
|
"@proteinjs/db": "1.0.15",
|
|
26
26
|
"@proteinjs/reflection": "1.1.1",
|
|
27
|
-
"@proteinjs/server-api": "^1.1.
|
|
27
|
+
"@proteinjs/server-api": "^1.1.2",
|
|
28
28
|
"@proteinjs/util": "1.1.0",
|
|
29
29
|
"@proteinjs/util-node": "1.2.0",
|
|
30
30
|
"body-parser": "1.19.0",
|
|
@@ -64,8 +64,14 @@
|
|
|
64
64
|
"@types/passport-local": "1.0.33",
|
|
65
65
|
"@types/react": "18.2.23",
|
|
66
66
|
"@types/react-helmet": "6.1.0",
|
|
67
|
-
"@types/webpack-hot-middleware": "2.25.9"
|
|
67
|
+
"@types/webpack-hot-middleware": "2.25.9",
|
|
68
|
+
"@typescript-eslint/eslint-plugin": "7.8.0",
|
|
69
|
+
"@typescript-eslint/parser": "7.8.0",
|
|
70
|
+
"eslint": "8.57.0",
|
|
71
|
+
"eslint-config-prettier": "9.1.0",
|
|
72
|
+
"eslint-plugin-prettier": "5.1.3"
|
|
68
73
|
},
|
|
69
74
|
"main": "./dist/generated/index.js",
|
|
70
|
-
"types": "./dist/generated/index.d.ts"
|
|
71
|
-
|
|
75
|
+
"types": "./dist/generated/index.d.ts",
|
|
76
|
+
"gitHead": "f25eef46fdc16afae1bcad0f48ab1fe4608b4fce"
|
|
77
|
+
}
|
|
@@ -2,39 +2,45 @@ import asyncHooks from 'async_hooks';
|
|
|
2
2
|
import { SessionData, SessionDataStorage } from '@proteinjs/server-api';
|
|
3
3
|
|
|
4
4
|
export class NodeSessionDataStorage implements SessionDataStorage {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
private static HOOK_INITIALIZED = false;
|
|
6
|
+
private static readonly SESSION_DATA: { [id: string]: SessionData } = {};
|
|
7
|
+
environment = 'node' as 'node';
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (NodeSessionDataStorage.SESSION_DATA[asyncHooks.executionAsyncId()])
|
|
14
|
-
return;
|
|
9
|
+
setData(data: SessionData) {
|
|
10
|
+
if (!NodeSessionDataStorage.HOOK_INITIALIZED) {
|
|
11
|
+
this.initHook();
|
|
12
|
+
}
|
|
15
13
|
|
|
16
|
-
|
|
14
|
+
if (NodeSessionDataStorage.SESSION_DATA[asyncHooks.executionAsyncId()]) {
|
|
15
|
+
return;
|
|
17
16
|
}
|
|
18
17
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
this.initHook();
|
|
18
|
+
NodeSessionDataStorage.SESSION_DATA[asyncHooks.executionAsyncId()] = data;
|
|
19
|
+
}
|
|
22
20
|
|
|
23
|
-
|
|
21
|
+
getData(): SessionData {
|
|
22
|
+
if (!NodeSessionDataStorage.HOOK_INITIALIZED) {
|
|
23
|
+
this.initHook();
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
26
|
+
return NodeSessionDataStorage.SESSION_DATA[asyncHooks.executionAsyncId()];
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
private initHook() {
|
|
30
|
+
asyncHooks
|
|
31
|
+
.createHook({
|
|
32
|
+
init: (asyncId: number, type: string, triggerAsyncId: number, resource: Object) => {
|
|
33
|
+
if (!NodeSessionDataStorage.SESSION_DATA[triggerAsyncId]) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
NodeSessionDataStorage.SESSION_DATA[asyncId] = NodeSessionDataStorage.SESSION_DATA[triggerAsyncId];
|
|
38
|
+
},
|
|
39
|
+
destroy: (asyncId: number) => {
|
|
40
|
+
delete NodeSessionDataStorage.SESSION_DATA[asyncId];
|
|
41
|
+
},
|
|
42
|
+
})
|
|
43
|
+
.enable();
|
|
44
|
+
NodeSessionDataStorage.HOOK_INITIALIZED = true;
|
|
45
|
+
}
|
|
46
|
+
}
|
package/src/loadRoutes.ts
CHANGED
|
@@ -1,126 +1,147 @@
|
|
|
1
1
|
import express from 'express';
|
|
2
2
|
import passport from 'passport';
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
ServerConfig,
|
|
5
|
+
Route,
|
|
6
|
+
getRequestListeners,
|
|
7
|
+
Session,
|
|
8
|
+
SessionData,
|
|
9
|
+
getSessionDataCaches,
|
|
10
|
+
} from '@proteinjs/server-api';
|
|
4
11
|
import { createReactApp } from './routes/reactApp';
|
|
5
12
|
import { Logger } from '@proteinjs/util';
|
|
6
13
|
|
|
7
14
|
const logger = new Logger('Server');
|
|
8
15
|
|
|
9
16
|
export function loadRoutes(routes: Route[], server: express.Express, config: ServerConfig) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if (route.path.includes('*')) {
|
|
20
|
-
wildcardRoutes.push(route);
|
|
21
|
-
continue;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
server[route.method](getPath(route.path), wrapRoute(route.onRequest.bind(route), config));
|
|
17
|
+
let starRoute: Route | null = null;
|
|
18
|
+
const wildcardRoutes: Route[] = [];
|
|
19
|
+
for (const route of routes) {
|
|
20
|
+
logger.info(`Loading route: ${route.path}`);
|
|
21
|
+
if (route.path == '*') {
|
|
22
|
+
starRoute = route;
|
|
23
|
+
continue;
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
if (route.path.includes('*')) {
|
|
27
|
+
wildcardRoutes.push(route);
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
server[route.method](getPath(route.path), wrapRoute(route.onRequest.bind(route), config));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
for (const wildcardRoute of wildcardRoutes) {
|
|
35
|
+
server[wildcardRoute.method](
|
|
36
|
+
getPath(wildcardRoute.path),
|
|
37
|
+
wrapRoute(wildcardRoute.onRequest.bind(wildcardRoute), config)
|
|
38
|
+
);
|
|
39
|
+
}
|
|
29
40
|
|
|
30
|
-
|
|
31
|
-
|
|
41
|
+
if (starRoute) {
|
|
42
|
+
server[starRoute.method](starRoute.path, wrapRoute(starRoute.onRequest.bind(starRoute), config));
|
|
43
|
+
}
|
|
32
44
|
}
|
|
33
45
|
|
|
34
46
|
export function loadDefaultStarRoute(routes: Route[], server: express.Express, config: ServerConfig) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
if (!starRouteSpecified && (config.staticContent?.bundlePaths || config.staticContent?.bundlesDir)) {
|
|
44
|
-
const reactApp = createReactApp(config);
|
|
45
|
-
server[reactApp.method](reactApp.path, wrapRoute(reactApp.onRequest, config));
|
|
47
|
+
let starRouteSpecified = false;
|
|
48
|
+
for (const route of routes) {
|
|
49
|
+
if (route.path == '*') {
|
|
50
|
+
starRouteSpecified = true;
|
|
51
|
+
break;
|
|
46
52
|
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
if (!starRouteSpecified && (config.staticContent?.bundlePaths || config.staticContent?.bundlesDir)) {
|
|
56
|
+
const reactApp = createReactApp(config);
|
|
57
|
+
server[reactApp.method](reactApp.path, wrapRoute(reactApp.onRequest, config));
|
|
58
|
+
}
|
|
47
59
|
}
|
|
48
60
|
|
|
49
61
|
function getPath(path: string) {
|
|
50
|
-
|
|
62
|
+
return path.startsWith('/') ? path : `/${path}`;
|
|
51
63
|
}
|
|
52
64
|
|
|
53
|
-
function wrapRoute(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
65
|
+
function wrapRoute(
|
|
66
|
+
route: (request: express.Request, response: express.Response) => Promise<void>,
|
|
67
|
+
config: ServerConfig
|
|
68
|
+
) {
|
|
69
|
+
return async function (request: express.Request, response: express.Response, next: express.NextFunction) {
|
|
70
|
+
if (response.locals['responseHandled']) {
|
|
71
|
+
next();
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
if (config.authenticate) {
|
|
76
|
+
await new Promise<void>((resolve, reject) => {
|
|
77
|
+
passport.authenticate('local', function (err, user, info) {
|
|
78
|
+
if (err) {
|
|
79
|
+
reject(err);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
resolve();
|
|
83
|
+
})(request, response, next);
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
const sessionData: SessionData = { sessionId: request.sessionID, user: request.user as string, data: {} };
|
|
88
|
+
for (const sessionDataCache of getSessionDataCaches()) {
|
|
89
|
+
sessionData.data[sessionDataCache.key] = await sessionDataCache.create(sessionData.sessionId, sessionData.user);
|
|
90
|
+
}
|
|
91
|
+
Session.setData(sessionData);
|
|
92
|
+
|
|
93
|
+
const requestListeners = getRequestListeners();
|
|
94
|
+
for (const listener of requestListeners) {
|
|
95
|
+
if (!listener.beforeRequest) {
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
try {
|
|
100
|
+
await listener.beforeRequest(request, response);
|
|
101
|
+
} catch (error: any) {
|
|
102
|
+
logger.error(`Caught error when running listener before request`, error);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
const sixtyMinutes = 1000 * 60 * 60;
|
|
107
|
+
const timeout = typeof config.request?.timeoutMs !== 'undefined' ? config.request.timeoutMs : sixtyMinutes;
|
|
108
|
+
request.setTimeout(timeout, () => {
|
|
109
|
+
if (response.locals.requestNumber) {
|
|
110
|
+
logger.warn(`[#${response.locals.requestNumber}] Timed out ${request.originalUrl}`);
|
|
111
|
+
} else {
|
|
112
|
+
logger.warn(`Timed out ${request.originalUrl}`);
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
try {
|
|
117
|
+
await route(request, response);
|
|
118
|
+
} catch (error) {
|
|
119
|
+
console.error(error);
|
|
120
|
+
}
|
|
121
|
+
response.locals['responseHandled'] = true;
|
|
122
|
+
|
|
123
|
+
for (const listener of requestListeners) {
|
|
124
|
+
if (!listener.afterRequest) {
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
try {
|
|
129
|
+
await listener.afterRequest(request, response);
|
|
130
|
+
} catch (error: any) {
|
|
131
|
+
logger.error(`Caught error when running listener after request`, error);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
next();
|
|
136
|
+
};
|
|
117
137
|
}
|
|
118
138
|
|
|
119
|
-
function basicAuthCredentials(request: express.Request): { username: string
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
139
|
+
function basicAuthCredentials(request: express.Request): { username: string; password: string } | null {
|
|
140
|
+
const b64auth = (request.headers.authorization || '').split(' ')[1] || '';
|
|
141
|
+
const [username, password] = Buffer.from(b64auth, 'base64').toString().split(':');
|
|
142
|
+
if (!username || !password) {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
124
145
|
|
|
125
|
-
|
|
126
|
-
}
|
|
146
|
+
return { username, password };
|
|
147
|
+
}
|
package/src/nodeModulesPath.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Route } from '@proteinjs/server-api';
|
|
2
2
|
|
|
3
3
|
export const healthCheck: Route = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}
|
|
4
|
+
path: 'health-check',
|
|
5
|
+
method: 'get',
|
|
6
|
+
useHttp: true,
|
|
7
|
+
onRequest: async (request, response): Promise<void> => {
|
|
8
|
+
response.send();
|
|
9
|
+
},
|
|
10
|
+
};
|