@openapi-typescript-infra/service 4.27.1 → 5.0.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/{.eslintrc.js → .eslintrc.cjs} +1 -1
- package/{.prettierrc.js → .prettierrc.cjs} +1 -1
- package/Makefile +1 -1
- package/build/bin/start-service.js +8 -13
- package/build/bin/start-service.js.map +1 -1
- package/build/bootstrap.d.ts +4 -4
- package/build/bootstrap.js +17 -29
- package/build/bootstrap.js.map +1 -1
- package/build/config/index.d.ts +3 -3
- package/build/config/index.js +15 -36
- package/build/config/index.js.map +1 -1
- package/build/config/schema.js +1 -2
- package/build/config/shortstops.js +19 -25
- package/build/config/shortstops.js.map +1 -1
- package/build/config/validation.d.ts +1 -1
- package/build/config/validation.js +1 -4
- package/build/config/validation.js.map +1 -1
- package/build/development/port-finder.js +6 -12
- package/build/development/port-finder.js.map +1 -1
- package/build/development/repl.d.ts +2 -2
- package/build/development/repl.js +18 -26
- package/build/development/repl.js.map +1 -1
- package/build/env.js +5 -12
- package/build/env.js.map +1 -1
- package/build/error.d.ts +2 -2
- package/build/error.js +1 -5
- package/build/error.js.map +1 -1
- package/build/express-app/app.d.ts +2 -2
- package/build/express-app/app.js +44 -52
- package/build/express-app/app.js.map +1 -1
- package/build/express-app/index.d.ts +3 -3
- package/build/express-app/index.js +3 -19
- package/build/express-app/index.js.map +1 -1
- package/build/express-app/internal-server.d.ts +2 -2
- package/build/express-app/internal-server.js +5 -11
- package/build/express-app/internal-server.js.map +1 -1
- package/build/express-app/modules.d.ts +0 -1
- package/build/express-app/modules.js +6 -24
- package/build/express-app/modules.js.map +1 -1
- package/build/express-app/route-loader.d.ts +2 -2
- package/build/express-app/route-loader.js +10 -16
- package/build/express-app/route-loader.js.map +1 -1
- package/build/express-app/types.d.ts +2 -2
- package/build/express-app/types.js +1 -2
- package/build/hook.d.ts +2 -2
- package/build/hook.js +1 -4
- package/build/hook.js.map +1 -1
- package/build/index.d.ts +9 -9
- package/build/index.js +9 -27
- package/build/index.js.map +1 -1
- package/build/openapi.d.ts +3 -3
- package/build/openapi.js +17 -46
- package/build/openapi.js.map +1 -1
- package/build/telemetry/DummyExporter.js +3 -7
- package/build/telemetry/DummyExporter.js.map +1 -1
- package/build/telemetry/index.d.ts +3 -3
- package/build/telemetry/index.js +22 -51
- package/build/telemetry/index.js.map +1 -1
- package/build/telemetry/instrumentations.js +19 -22
- package/build/telemetry/instrumentations.js.map +1 -1
- package/build/telemetry/requestLogger.d.ts +2 -2
- package/build/telemetry/requestLogger.js +10 -18
- package/build/telemetry/requestLogger.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/build/types.d.ts +2 -2
- package/build/types.js +1 -2
- package/package.json +14 -13
- package/src/bin/start-service.ts +3 -3
- package/src/bootstrap.ts +12 -17
- package/src/config/index.ts +4 -4
- package/src/config/validation.ts +1 -1
- package/src/development/port-finder.ts +1 -1
- package/src/development/repl.ts +8 -9
- package/src/error.ts +2 -2
- package/src/express-app/app.ts +11 -11
- package/src/express-app/index.ts +3 -3
- package/src/express-app/internal-server.ts +3 -3
- package/src/express-app/modules.ts +4 -22
- package/src/express-app/route-loader.ts +6 -6
- package/src/express-app/types.ts +2 -2
- package/src/hook.ts +2 -2
- package/src/index.ts +9 -9
- package/src/openapi.ts +6 -6
- package/src/telemetry/index.ts +5 -5
- package/src/telemetry/requestLogger.ts +7 -7
- package/src/types.ts +2 -2
- package/tsconfig.json +4 -3
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
exports.serviceRepl = serviceRepl;
|
|
7
|
-
exports.repl$ = repl$;
|
|
8
|
-
const repl_1 = __importDefault(require("repl"));
|
|
9
|
-
const fs_1 = __importDefault(require("fs"));
|
|
10
|
-
const path_1 = __importDefault(require("path"));
|
|
11
|
-
const glob_1 = require("glob");
|
|
12
|
-
const lodash_1 = require("lodash");
|
|
1
|
+
import repl from 'repl';
|
|
2
|
+
import fs from 'fs';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { glob } from 'glob';
|
|
5
|
+
import { set } from 'lodash';
|
|
13
6
|
const REPL_PROP = '$$repl$$';
|
|
14
|
-
function serviceRepl(app, codepath, onExit) {
|
|
15
|
-
const rl =
|
|
7
|
+
export function serviceRepl(app, codepath, onExit) {
|
|
8
|
+
const rl = repl.start({
|
|
16
9
|
prompt: '> ',
|
|
17
10
|
});
|
|
18
11
|
Object.assign(rl.context, app.locals, {
|
|
@@ -22,7 +15,7 @@ function serviceRepl(app, codepath, onExit) {
|
|
|
22
15
|
console.log(JSON.stringify(o, null, '\t'));
|
|
23
16
|
},
|
|
24
17
|
});
|
|
25
|
-
rl.setupHistory(
|
|
18
|
+
rl.setupHistory(path.resolve('.node_repl_history'), (err) => {
|
|
26
19
|
if (err) {
|
|
27
20
|
// eslint-disable-next-line no-console
|
|
28
21
|
console.error('History setup failed', err);
|
|
@@ -32,19 +25,18 @@ function serviceRepl(app, codepath, onExit) {
|
|
|
32
25
|
loadReplFunctions(app, codepath, rl);
|
|
33
26
|
rl.on('exit', onExit);
|
|
34
27
|
}
|
|
35
|
-
function loadReplFunctions(app, codepath, rl) {
|
|
28
|
+
async function loadReplFunctions(app, codepath, rl) {
|
|
36
29
|
if (!codepath) {
|
|
37
30
|
return;
|
|
38
31
|
}
|
|
39
|
-
const files =
|
|
40
|
-
|
|
32
|
+
const files = glob.sync(path.join(codepath, '**/*.{js,ts}'));
|
|
33
|
+
for (const file of files) {
|
|
41
34
|
try {
|
|
42
35
|
// Read the file content as text
|
|
43
|
-
const fileContent =
|
|
44
|
-
// Check if repl$ is present, in a very rudimentary way
|
|
45
|
-
if (/repl
|
|
46
|
-
|
|
47
|
-
const module = require(path_1.default.resolve(file));
|
|
36
|
+
const fileContent = fs.readFileSync(file, 'utf-8');
|
|
37
|
+
// Check if repl$ is present, in a very rudimentary way (note built JS has close paren not open)
|
|
38
|
+
if (/repl\$[()]/.test(fileContent)) {
|
|
39
|
+
const module = await import(path.resolve(file));
|
|
48
40
|
// Look for functions with the REPL_PROP marker
|
|
49
41
|
Object.values(module).forEach((exported) => {
|
|
50
42
|
if (!exported) {
|
|
@@ -53,7 +45,7 @@ function loadReplFunctions(app, codepath, rl) {
|
|
|
53
45
|
if (typeof exported === 'function') {
|
|
54
46
|
const replName = exported[REPL_PROP];
|
|
55
47
|
if (replName) {
|
|
56
|
-
|
|
48
|
+
set(rl.context, replName, exported.bind(null, app));
|
|
57
49
|
}
|
|
58
50
|
}
|
|
59
51
|
});
|
|
@@ -62,7 +54,7 @@ function loadReplFunctions(app, codepath, rl) {
|
|
|
62
54
|
catch (err) {
|
|
63
55
|
console.error(`Failed to load REPL functions from ${file}:`, err);
|
|
64
56
|
}
|
|
65
|
-
}
|
|
57
|
+
}
|
|
66
58
|
}
|
|
67
59
|
/**
|
|
68
60
|
* This decorator-like function can be applied to functions and the service will load and expose
|
|
@@ -76,7 +68,7 @@ function loadReplFunctions(app, codepath, rl) {
|
|
|
76
68
|
*
|
|
77
69
|
* repl(myFunction, 'some.func.name');
|
|
78
70
|
*/
|
|
79
|
-
function repl$(fn, name) {
|
|
71
|
+
export function repl$(fn, name) {
|
|
80
72
|
const functionName = name || fn.name;
|
|
81
73
|
if (!functionName) {
|
|
82
74
|
throw new Error('Function must have a name or a name must be provided.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repl.js","sourceRoot":"","sources":["../../src/development/repl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repl.js","sourceRoot":"","sources":["../../src/development/repl.ts"],"names":[],"mappings":"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"}
|
package/build/env.js
CHANGED
|
@@ -1,11 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNodeEnv = getNodeEnv;
|
|
4
|
-
exports.isDev = isDev;
|
|
5
|
-
exports.isProd = isProd;
|
|
6
|
-
exports.isStaging = isStaging;
|
|
7
|
-
exports.isTest = isTest;
|
|
8
|
-
function getNodeEnv() {
|
|
1
|
+
export function getNodeEnv() {
|
|
9
2
|
switch (process.env.APP_ENV || process.env.NODE_ENV) {
|
|
10
3
|
case 'production':
|
|
11
4
|
case 'staging':
|
|
@@ -15,16 +8,16 @@ function getNodeEnv() {
|
|
|
15
8
|
return 'development';
|
|
16
9
|
}
|
|
17
10
|
}
|
|
18
|
-
function isDev() {
|
|
11
|
+
export function isDev() {
|
|
19
12
|
return getNodeEnv() === 'development';
|
|
20
13
|
}
|
|
21
|
-
function isProd() {
|
|
14
|
+
export function isProd() {
|
|
22
15
|
return getNodeEnv() === 'production';
|
|
23
16
|
}
|
|
24
|
-
function isStaging() {
|
|
17
|
+
export function isStaging() {
|
|
25
18
|
return getNodeEnv() === 'staging';
|
|
26
19
|
}
|
|
27
|
-
function isTest() {
|
|
20
|
+
export function isTest() {
|
|
28
21
|
return getNodeEnv() === 'test';
|
|
29
22
|
}
|
|
30
23
|
//# sourceMappingURL=env.js.map
|
package/build/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,UAAU;IACxB,QAAQ,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QACpD,KAAK,YAAY,CAAC;QAClB,KAAK,SAAS,CAAC;QACf,KAAK,MAAM;YACT,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAa,CAAC;QACnE;YACE,OAAO,aAAa,CAAC;IACzB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,KAAK;IACnB,OAAO,UAAU,EAAE,KAAK,aAAa,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,OAAO,UAAU,EAAE,KAAK,YAAY,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,EAAE,KAAK,SAAS,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,OAAO,UAAU,EAAE,KAAK,MAAM,CAAC;AACjC,CAAC"}
|
package/build/error.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ConfigurationSchema } from './config/schema';
|
|
2
|
-
import type { AnyServiceLocals, ServiceLike, ServiceLocals } from './types';
|
|
1
|
+
import { ConfigurationSchema } from './config/schema.js';
|
|
2
|
+
import type { AnyServiceLocals, ServiceLike, ServiceLocals } from './types.js';
|
|
3
3
|
export interface ServiceErrorSpec {
|
|
4
4
|
status?: number;
|
|
5
5
|
code?: string;
|
package/build/error.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ServiceError = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* An error that gives more structured information to callers. Throw inside a handler as
|
|
6
3
|
*
|
|
@@ -8,7 +5,7 @@ exports.ServiceError = void 0;
|
|
|
8
5
|
*
|
|
9
6
|
* You can also include a display_message which is intended to be viewed by the end user
|
|
10
7
|
*/
|
|
11
|
-
class ServiceError extends Error {
|
|
8
|
+
export class ServiceError extends Error {
|
|
12
9
|
status;
|
|
13
10
|
code;
|
|
14
11
|
domain;
|
|
@@ -26,5 +23,4 @@ class ServiceError extends Error {
|
|
|
26
23
|
Object.assign(this, spec);
|
|
27
24
|
}
|
|
28
25
|
}
|
|
29
|
-
exports.ServiceError = ServiceError;
|
|
30
26
|
//# sourceMappingURL=error.js.map
|
package/build/error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAaA;;;;;;GAMG;AACH,MAAM,OAAO,YAEX,SAAQ,KAAK;IACN,MAAM,CAAqB;IAE3B,IAAI,CAAU;IAEd,MAAM,CAAS;IAEf,eAAe,CAAU;IAEzB,SAAS,CAAW;IAE3B,+CAA+C;IACxC,eAAe,CAA2B;IAEjD,qEAAqE;IACrE,0EAA0E;IAC1E,qDAAqD;IAC9C,cAAc,CAAW;IAEhC,YAAY,GAAyB,EAAE,OAAe,EAAE,IAAuB;QAC7E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import http from 'http';
|
|
2
2
|
import https from 'https';
|
|
3
|
-
import type { AnyServiceLocals, RequestLocals, ServiceExpress, ServiceLocals, ServiceStartOptions } from '../types';
|
|
4
|
-
import { ConfigurationSchema } from '../config/schema';
|
|
3
|
+
import type { AnyServiceLocals, RequestLocals, ServiceExpress, ServiceLocals, ServiceStartOptions } from '../types.js';
|
|
4
|
+
import { ConfigurationSchema } from '../config/schema.js';
|
|
5
5
|
export declare function startApp<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals>(startOptions: ServiceStartOptions<SLocals, RLocals>): Promise<ServiceExpress<SLocals>>;
|
|
6
6
|
export type StartAppFn<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals> = typeof startApp<SLocals, RLocals>;
|
|
7
7
|
export declare function shutdownApp<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>): Promise<void>;
|
package/build/express-app/app.js
CHANGED
|
@@ -1,44 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const index_1 = require("../config/index");
|
|
19
|
-
const openapi_1 = require("../openapi");
|
|
20
|
-
const requestLogger_1 = require("../telemetry/requestLogger");
|
|
21
|
-
const shortstops_1 = require("../config/shortstops");
|
|
22
|
-
const env_1 = require("../env");
|
|
23
|
-
const index_2 = require("../telemetry/index");
|
|
24
|
-
const route_loader_1 = require("./route-loader");
|
|
25
|
-
const internal_server_1 = require("./internal-server");
|
|
1
|
+
import assert from 'assert';
|
|
2
|
+
import http from 'http';
|
|
3
|
+
import https from 'https';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { pino } from 'pino';
|
|
6
|
+
import cookieParser from 'cookie-parser';
|
|
7
|
+
import { metrics } from '@opentelemetry/api';
|
|
8
|
+
import { setupNodeMetrics } from '@sesamecare-oss/opentelemetry-node-metrics';
|
|
9
|
+
import { createTerminus } from '@godaddy/terminus';
|
|
10
|
+
import { loadConfiguration } from '../config/index.js';
|
|
11
|
+
import { openApi } from '../openapi.js';
|
|
12
|
+
import { errorHandlerMiddleware, loggerMiddleware, notFoundMiddleware, } from '../telemetry/requestLogger.js';
|
|
13
|
+
import { shortstops } from '../config/shortstops.js';
|
|
14
|
+
import { getNodeEnv, isDev } from '../env.js';
|
|
15
|
+
import { getGlobalPrometheusExporter } from '../telemetry/index.js';
|
|
16
|
+
import { loadRoutes } from './route-loader.js';
|
|
17
|
+
import { startInternalApp } from './internal-server.js';
|
|
26
18
|
function isSyncLogging() {
|
|
27
19
|
if (process.env.LOG_SYNC) {
|
|
28
20
|
return true;
|
|
29
21
|
}
|
|
30
|
-
return
|
|
22
|
+
return isDev() || getNodeEnv() === 'test';
|
|
31
23
|
}
|
|
32
|
-
async function startApp(startOptions) {
|
|
24
|
+
export async function startApp(startOptions) {
|
|
33
25
|
const { service, rootDirectory, codepath = 'build', name, version } = startOptions;
|
|
34
|
-
const shouldPrettyPrint =
|
|
35
|
-
const destination =
|
|
26
|
+
const shouldPrettyPrint = isDev() && !process.env.NO_PRETTY_LOGS;
|
|
27
|
+
const destination = pino.destination({
|
|
36
28
|
sync: isSyncLogging(),
|
|
37
29
|
dest: process.env.LOG_TO_FILE || process.stdout.fd,
|
|
38
30
|
minLength: process.env.LOG_BUFFER ? Number(process.env.LOG_BUFFER) : undefined,
|
|
39
31
|
});
|
|
40
32
|
const logger = shouldPrettyPrint
|
|
41
|
-
?
|
|
33
|
+
? pino({
|
|
42
34
|
transport: {
|
|
43
35
|
target: 'pino-pretty',
|
|
44
36
|
options: {
|
|
@@ -46,7 +38,7 @@ async function startApp(startOptions) {
|
|
|
46
38
|
},
|
|
47
39
|
},
|
|
48
40
|
}, destination)
|
|
49
|
-
:
|
|
41
|
+
: pino({
|
|
50
42
|
formatters: {
|
|
51
43
|
level(label) {
|
|
52
44
|
return { level: label };
|
|
@@ -54,14 +46,14 @@ async function startApp(startOptions) {
|
|
|
54
46
|
},
|
|
55
47
|
}, destination);
|
|
56
48
|
const serviceImpl = service();
|
|
57
|
-
(
|
|
58
|
-
const sourceDirectory =
|
|
49
|
+
assert(serviceImpl?.start, 'Service function did not return a conforming object');
|
|
50
|
+
const sourceDirectory = path.join(rootDirectory, codepath);
|
|
59
51
|
const baseOptions = {
|
|
60
|
-
configurationDirectories: [
|
|
61
|
-
shortstopHandlers:
|
|
52
|
+
configurationDirectories: [path.resolve(rootDirectory, './config')],
|
|
53
|
+
shortstopHandlers: shortstops({ name }, sourceDirectory),
|
|
62
54
|
};
|
|
63
55
|
const options = serviceImpl.configure?.(startOptions, baseOptions) || baseOptions;
|
|
64
|
-
const config = await
|
|
56
|
+
const config = await loadConfiguration({
|
|
65
57
|
configurationDirectories: options.configurationDirectories,
|
|
66
58
|
shortstopHandlers: options.shortstopHandlers,
|
|
67
59
|
});
|
|
@@ -85,8 +77,8 @@ async function startApp(startOptions) {
|
|
|
85
77
|
if (serviceImpl.attach) {
|
|
86
78
|
await serviceImpl.attach(app);
|
|
87
79
|
}
|
|
88
|
-
app.locals.meter =
|
|
89
|
-
|
|
80
|
+
app.locals.meter = metrics.getMeterProvider().getMeter(name);
|
|
81
|
+
setupNodeMetrics(app.locals.meter, {});
|
|
90
82
|
if (config.trustProxy === true) {
|
|
91
83
|
app.enable('trust proxy');
|
|
92
84
|
}
|
|
@@ -96,7 +88,7 @@ async function startApp(startOptions) {
|
|
|
96
88
|
const histogram = app.locals.meter.createHistogram('http_request_duration_seconds', {
|
|
97
89
|
description: 'Duration of HTTP requests in seconds',
|
|
98
90
|
});
|
|
99
|
-
app.use(
|
|
91
|
+
app.use(loggerMiddleware(app, histogram, logging));
|
|
100
92
|
// Allow the service to add locals, etc. We put this before the body parsers
|
|
101
93
|
// so that the req can decide whether to save the raw request body or not.
|
|
102
94
|
const attachServiceLocals = (req, res, next) => {
|
|
@@ -117,7 +109,7 @@ async function startApp(startOptions) {
|
|
|
117
109
|
};
|
|
118
110
|
app.use(attachServiceLocals);
|
|
119
111
|
if (routing?.cookieParser) {
|
|
120
|
-
app.use((
|
|
112
|
+
app.use(cookieParser());
|
|
121
113
|
}
|
|
122
114
|
if (routing?.bodyParsers?.json) {
|
|
123
115
|
app.use(express.json({
|
|
@@ -158,7 +150,7 @@ async function startApp(startOptions) {
|
|
|
158
150
|
app.use(authorize);
|
|
159
151
|
}
|
|
160
152
|
if (routing?.static?.enabled) {
|
|
161
|
-
const localdir =
|
|
153
|
+
const localdir = path.resolve(rootDirectory, routing?.static?.path || 'public');
|
|
162
154
|
if (routing.static.mountPath) {
|
|
163
155
|
app.use(routing.static.mountPath, express.static(localdir));
|
|
164
156
|
}
|
|
@@ -186,23 +178,23 @@ async function startApp(startOptions) {
|
|
|
186
178
|
}
|
|
187
179
|
const codePattern = codepath === 'src' ? '**/*.ts' : '**/*.js';
|
|
188
180
|
if (routing?.routes) {
|
|
189
|
-
await
|
|
181
|
+
await loadRoutes(app, path.resolve(rootDirectory, codepath, config.routing?.routes || 'routes'), codePattern);
|
|
190
182
|
}
|
|
191
183
|
if (routing?.openapi) {
|
|
192
|
-
app.use(await
|
|
184
|
+
app.use(await openApi(app, rootDirectory, codepath, codePattern, options.openApiOptions));
|
|
193
185
|
}
|
|
194
186
|
// Putting this here allows more flexible middleware insertion
|
|
195
187
|
await serviceImpl.start(app);
|
|
196
188
|
const { notFound, errors } = routing?.finalHandlers || {};
|
|
197
189
|
if (notFound) {
|
|
198
|
-
app.use(
|
|
190
|
+
app.use(notFoundMiddleware());
|
|
199
191
|
}
|
|
200
192
|
if (errors?.enabled) {
|
|
201
|
-
app.use(
|
|
193
|
+
app.use(errorHandlerMiddleware(app, histogram, errors?.unnest, errors?.render));
|
|
202
194
|
}
|
|
203
195
|
return app;
|
|
204
196
|
}
|
|
205
|
-
async function shutdownApp(app) {
|
|
197
|
+
export async function shutdownApp(app) {
|
|
206
198
|
const { logger } = app.locals;
|
|
207
199
|
try {
|
|
208
200
|
await app.locals.service.stop?.(app);
|
|
@@ -215,9 +207,9 @@ async function shutdownApp(app) {
|
|
|
215
207
|
}
|
|
216
208
|
function httpServer(app, config) {
|
|
217
209
|
if (!config.certificate) {
|
|
218
|
-
return
|
|
210
|
+
return http.createServer(app);
|
|
219
211
|
}
|
|
220
|
-
return
|
|
212
|
+
return https.createServer({
|
|
221
213
|
key: config.key ? Buffer.from(config.key) : undefined,
|
|
222
214
|
cert: config.certificate ? Buffer.from(config.certificate) : undefined,
|
|
223
215
|
}, app);
|
|
@@ -228,14 +220,14 @@ function url(config, port) {
|
|
|
228
220
|
}
|
|
229
221
|
return `http://${config.hostname}${port === 80 ? '' : `:${port}`}`;
|
|
230
222
|
}
|
|
231
|
-
async function listen(app, shutdownHandler) {
|
|
223
|
+
export async function listen(app, shutdownHandler) {
|
|
232
224
|
const config = app.locals.config.server || {};
|
|
233
225
|
const { port } = config;
|
|
234
226
|
const { service, logger } = app.locals;
|
|
235
227
|
const server = httpServer(app, config);
|
|
236
228
|
await app.locals.service.attachServer?.(app, server);
|
|
237
229
|
let shutdownInProgress = false;
|
|
238
|
-
|
|
230
|
+
createTerminus(server, {
|
|
239
231
|
timeout: 15000,
|
|
240
232
|
useExit0: true,
|
|
241
233
|
// https://github.com/godaddy/terminus#how-to-set-terminus-up-with-kubernetes
|
|
@@ -285,10 +277,10 @@ async function listen(app, shutdownHandler) {
|
|
|
285
277
|
const serverConfig = app.locals.config.server;
|
|
286
278
|
// Ok now start the internal port if we have one.
|
|
287
279
|
if (serverConfig?.internalPort || serverConfig?.internalPort === 0) {
|
|
288
|
-
|
|
280
|
+
startInternalApp(app, serverConfig.internalPort)
|
|
289
281
|
.then((internalApp) => {
|
|
290
282
|
locals.internalApp = internalApp;
|
|
291
|
-
const prometheusExporter =
|
|
283
|
+
const prometheusExporter = getGlobalPrometheusExporter();
|
|
292
284
|
if (prometheusExporter) {
|
|
293
285
|
locals.internalApp.get('/metrics', prometheusExporter.getMetricsRequestHandler.bind(prometheusExporter));
|
|
294
286
|
locals.logger.info('Metrics exporter started');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/express-app/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/express-app/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './app';
|
|
2
|
-
export * from './types';
|
|
3
|
-
export * from './modules';
|
|
1
|
+
export * from './app.js';
|
|
2
|
+
export * from './types.js';
|
|
3
|
+
export * from './modules.js';
|
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./app"), exports);
|
|
18
|
-
__exportStar(require("./types"), exports);
|
|
19
|
-
__exportStar(require("./modules"), exports);
|
|
1
|
+
export * from './app.js';
|
|
2
|
+
export * from './types.js';
|
|
3
|
+
export * from './modules.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express-app/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express-app/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Application } from 'express-serve-static-core';
|
|
2
|
-
import { AnyServiceLocals, InternalLocals, ServiceExpress, ServiceLocals } from '../types';
|
|
3
|
-
import { ConfigurationSchema } from '../config/schema';
|
|
2
|
+
import { AnyServiceLocals, InternalLocals, ServiceExpress, ServiceLocals } from '../types.js';
|
|
3
|
+
import { ConfigurationSchema } from '../config/schema.js';
|
|
4
4
|
export declare function startInternalApp<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(mainApp: ServiceExpress<SLocals>, port: number): Promise<Application<InternalLocals<SLocals>>>;
|
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.startInternalApp = startInternalApp;
|
|
7
|
-
const express_1 = __importDefault(require("express"));
|
|
8
|
-
const port_finder_1 = require("../development/port-finder");
|
|
9
|
-
async function startInternalApp(mainApp, port) {
|
|
10
|
-
const app = (0, express_1.default)();
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import { getAvailablePort } from '../development/port-finder.js';
|
|
3
|
+
export async function startInternalApp(mainApp, port) {
|
|
4
|
+
const app = express();
|
|
11
5
|
app.locals.mainApp = mainApp;
|
|
12
|
-
const finalPort = port === 0 ? await
|
|
6
|
+
const finalPort = port === 0 ? await getAvailablePort(3001) : port;
|
|
13
7
|
app.get('/health', async (req, res) => {
|
|
14
8
|
if (mainApp.locals.service?.healthy) {
|
|
15
9
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-server.js","sourceRoot":"","sources":["../../src/express-app/internal-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"internal-server.js","sourceRoot":"","sources":["../../src/express-app/internal-server.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAEpC,OAAgC,EAAE,IAAY;IAC9C,MAAM,GAAG,GAAG,OAAO,EAAqD,CAAC;IACzE,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAE7B,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEnE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACpC,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACzD,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,OAAO,CAAO,CAAC,MAAM,EAAE,EAAE;QACjD,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE;YAC7C,MAAM,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,CAAC;IAEpB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAEpF,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1,27 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
try {
|
|
8
|
-
return require(path);
|
|
9
|
-
}
|
|
10
|
-
catch (error) {
|
|
11
|
-
if (error.message.includes('Cannot use import statement outside a module')) {
|
|
12
|
-
return import(path);
|
|
13
|
-
}
|
|
14
|
-
throw error;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
async function getFilesInDir(pattern, dir) {
|
|
18
|
-
const files = await new Promise((accept, reject) => {
|
|
19
|
-
(0, glob_1.glob)(pattern, {
|
|
20
|
-
nodir: true,
|
|
21
|
-
strict: true,
|
|
22
|
-
cwd: dir,
|
|
23
|
-
ignore: ['**/*.spec.@(js|ts)', '**/*.test.@(js|ts)', '**/*.fixtures.@(js|ts)'],
|
|
24
|
-
}, (error, matches) => (error ? reject(error) : accept(matches)));
|
|
1
|
+
import { glob } from 'glob';
|
|
2
|
+
export async function getFilesInDir(pattern, dir) {
|
|
3
|
+
const files = await glob(pattern, {
|
|
4
|
+
nodir: true,
|
|
5
|
+
cwd: dir,
|
|
6
|
+
ignore: ['**/*.spec.@(js|ts)', '**/*.test.@(js|ts)', '**/*.fixtures.@(js|ts)'],
|
|
25
7
|
});
|
|
26
8
|
return files;
|
|
27
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/express-app/modules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/express-app/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAe,EAAE,GAAW;IAC9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE;QAChC,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,GAAG;QACR,MAAM,EAAE,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,wBAAwB,CAAC;KAC/E,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from '../types';
|
|
2
|
-
import { ConfigurationSchema } from '../config/schema';
|
|
1
|
+
import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from '../types.js';
|
|
2
|
+
import { ConfigurationSchema } from '../config/schema.js';
|
|
3
3
|
export declare function loadRoutes<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>, routingDir: string, pattern: string): Promise<void>;
|
|
@@ -1,27 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
exports.loadRoutes = loadRoutes;
|
|
7
|
-
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const express_1 = __importDefault(require("express"));
|
|
9
|
-
const modules_1 = require("./modules");
|
|
10
|
-
async function loadRoutes(app, routingDir, pattern) {
|
|
11
|
-
const files = await (0, modules_1.getFilesInDir)(pattern, routingDir);
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { Router } from 'express';
|
|
3
|
+
import { getFilesInDir } from './modules.js';
|
|
4
|
+
export async function loadRoutes(app, routingDir, pattern) {
|
|
5
|
+
const files = await getFilesInDir(pattern, routingDir);
|
|
12
6
|
await Promise.all(files.map(async (filename) => {
|
|
13
|
-
const routeBase =
|
|
14
|
-
const modulePath =
|
|
15
|
-
const module = await (
|
|
7
|
+
const routeBase = path.dirname(filename);
|
|
8
|
+
const modulePath = path.resolve(routingDir, filename);
|
|
9
|
+
const module = await import(modulePath);
|
|
16
10
|
const mounter = module.default || module.route;
|
|
17
11
|
if (typeof mounter === 'function') {
|
|
18
|
-
const childRouter =
|
|
12
|
+
const childRouter = Router();
|
|
19
13
|
mounter(childRouter, app);
|
|
20
14
|
const pathParts = [''];
|
|
21
15
|
if (routeBase !== '.') {
|
|
22
16
|
pathParts.push(routeBase);
|
|
23
17
|
}
|
|
24
|
-
const fn =
|
|
18
|
+
const fn = path.parse(path.basename(filename)).name;
|
|
25
19
|
if (fn.toLowerCase() !== 'index') {
|
|
26
20
|
pathParts.push(fn);
|
|
27
21
|
}
|