@common-stack/server-stack 8.6.1-alpha.5 → 8.6.1-alpha.6
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/lib/StackServer.cjs +22 -5
- package/lib/StackServer.cjs.map +1 -1
- package/lib/StackServer.mjs +22 -5
- package/lib/StackServer.mjs.map +1 -1
- package/package.json +5 -3
package/lib/StackServer.cjs
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
|
-
'use strict';var
|
|
1
|
+
'use strict';var server=require('@cdm-logger/server');require('inversify'),require('common/server'),require('@common-stack/core');var infrastructureFactory=require('./infrastructure/infrastructure-factory.cjs');require('inngest'),require('./config/env-config.cjs');/* eslint-disable import/no-extraneous-dependencies */
|
|
2
2
|
/* eslint-disable import/namespace */
|
|
3
|
+
/**
|
|
4
|
+
* Dynamically load an Express-compatible framework.
|
|
5
|
+
* Prefers `ultimate-express` (backed by uWebSockets.js) when available;
|
|
6
|
+
* falls back to the standard `express` package so that consumers on
|
|
7
|
+
* unsupported Node / platform combinations are not broken at import time.
|
|
8
|
+
*/
|
|
9
|
+
async function loadExpress() {
|
|
10
|
+
try {
|
|
11
|
+
const mod = await import('ultimate-express');
|
|
12
|
+
return (mod.default ?? mod);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
// ultimate-express (uWebSockets.js) is unavailable – fall back to express
|
|
16
|
+
const mod = await import('express');
|
|
17
|
+
return (mod.default ?? mod);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
3
20
|
/**
|
|
4
21
|
* Controls the lifecycle of the Microservice Server
|
|
5
22
|
*
|
|
@@ -40,7 +57,8 @@ class StackServer {
|
|
|
40
57
|
}
|
|
41
58
|
}
|
|
42
59
|
async setupHttpServer() {
|
|
43
|
-
|
|
60
|
+
const express = await loadExpress();
|
|
61
|
+
this.logger.info('Setting up HTTP server (express-compatible)');
|
|
44
62
|
this.app = express();
|
|
45
63
|
// Apply Feature middleware functions (the (app) => void pattern)
|
|
46
64
|
const middlewares = this.serverFeature.middlewares || [];
|
|
@@ -63,11 +81,10 @@ class StackServer {
|
|
|
63
81
|
await this.microserviceContext.broker.start();
|
|
64
82
|
// Start listening if Express is configured
|
|
65
83
|
if (this.app && this.options.express) {
|
|
66
|
-
const port = this.options.express.port
|
|
67
|
-
|| Number(process.env.DEPLOYMENT_API_PORT || process.env.PORT || 3000);
|
|
84
|
+
const port = this.options.express.port || Number(process.env.DEPLOYMENT_API_PORT || process.env.PORT || 3000);
|
|
68
85
|
await new Promise((resolve) => {
|
|
69
86
|
this.app.listen(port, () => {
|
|
70
|
-
this.logger.info(`
|
|
87
|
+
this.logger.info(`HTTP server listening on port ${port}`);
|
|
71
88
|
resolve();
|
|
72
89
|
});
|
|
73
90
|
});
|
package/lib/StackServer.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackServer.cjs","sources":["../src/StackServer.ts"],"sourcesContent":[null],"names":["serverLogger","InfrastructureFactory"],"mappings":"
|
|
1
|
+
{"version":3,"file":"StackServer.cjs","sources":["../src/StackServer.ts"],"sourcesContent":[null],"names":["serverLogger","InfrastructureFactory"],"mappings":"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"}
|
package/lib/StackServer.mjs
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {logger}from'@cdm-logger/server';import'inversify';import'common/server';import'@common-stack/core';import {InfrastructureFactory}from'./infrastructure/infrastructure-factory.mjs';import'inngest';import'./config/env-config.mjs';/* eslint-disable import/no-extraneous-dependencies */
|
|
2
2
|
/* eslint-disable import/namespace */
|
|
3
|
+
/**
|
|
4
|
+
* Dynamically load an Express-compatible framework.
|
|
5
|
+
* Prefers `ultimate-express` (backed by uWebSockets.js) when available;
|
|
6
|
+
* falls back to the standard `express` package so that consumers on
|
|
7
|
+
* unsupported Node / platform combinations are not broken at import time.
|
|
8
|
+
*/
|
|
9
|
+
async function loadExpress() {
|
|
10
|
+
try {
|
|
11
|
+
const mod = await import('ultimate-express');
|
|
12
|
+
return (mod.default ?? mod);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
// ultimate-express (uWebSockets.js) is unavailable – fall back to express
|
|
16
|
+
const mod = await import('express');
|
|
17
|
+
return (mod.default ?? mod);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
3
20
|
/**
|
|
4
21
|
* Controls the lifecycle of the Microservice Server
|
|
5
22
|
*
|
|
@@ -40,7 +57,8 @@ class StackServer {
|
|
|
40
57
|
}
|
|
41
58
|
}
|
|
42
59
|
async setupHttpServer() {
|
|
43
|
-
|
|
60
|
+
const express = await loadExpress();
|
|
61
|
+
this.logger.info('Setting up HTTP server (express-compatible)');
|
|
44
62
|
this.app = express();
|
|
45
63
|
// Apply Feature middleware functions (the (app) => void pattern)
|
|
46
64
|
const middlewares = this.serverFeature.middlewares || [];
|
|
@@ -63,11 +81,10 @@ class StackServer {
|
|
|
63
81
|
await this.microserviceContext.broker.start();
|
|
64
82
|
// Start listening if Express is configured
|
|
65
83
|
if (this.app && this.options.express) {
|
|
66
|
-
const port = this.options.express.port
|
|
67
|
-
|| Number(process.env.DEPLOYMENT_API_PORT || process.env.PORT || 3000);
|
|
84
|
+
const port = this.options.express.port || Number(process.env.DEPLOYMENT_API_PORT || process.env.PORT || 3000);
|
|
68
85
|
await new Promise((resolve) => {
|
|
69
86
|
this.app.listen(port, () => {
|
|
70
|
-
this.logger.info(`
|
|
87
|
+
this.logger.info(`HTTP server listening on port ${port}`);
|
|
71
88
|
resolve();
|
|
72
89
|
});
|
|
73
90
|
});
|
package/lib/StackServer.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackServer.mjs","sources":["../src/StackServer.ts"],"sourcesContent":[null],"names":["serverLogger"],"mappings":"
|
|
1
|
+
{"version":3,"file":"StackServer.mjs","sources":["../src/StackServer.ts"],"sourcesContent":[null],"names":["serverLogger"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/server-stack",
|
|
3
|
-
"version": "8.6.1-alpha.
|
|
3
|
+
"version": "8.6.1-alpha.6",
|
|
4
4
|
"description": "common core for higher packages to depend on",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -77,7 +77,6 @@
|
|
|
77
77
|
"reflect-metadata": "^0.1.13",
|
|
78
78
|
"rxjs": "^7.8.1",
|
|
79
79
|
"subscriptions-transport-ws": "^0.11.0",
|
|
80
|
-
"ultimate-express": "^2.0.0",
|
|
81
80
|
"universal-cookie-express": "^4.0.1",
|
|
82
81
|
"ws": "^8.11.0",
|
|
83
82
|
"xstate": "^5.20.0",
|
|
@@ -92,10 +91,13 @@
|
|
|
92
91
|
"envalid": "*",
|
|
93
92
|
"moleculer": "*"
|
|
94
93
|
},
|
|
94
|
+
"optionalDependencies": {
|
|
95
|
+
"ultimate-express": "^2.0.0"
|
|
96
|
+
},
|
|
95
97
|
"publishConfig": {
|
|
96
98
|
"access": "public"
|
|
97
99
|
},
|
|
98
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "8e6456e4853f036b6786ee3e32acbabf5752a504",
|
|
99
101
|
"typescript": {
|
|
100
102
|
"definition": "lib/index.d.ts"
|
|
101
103
|
}
|