@tramvai/cli 2.72.5 → 2.73.1
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/builder/webpack/devServer/server.js +13 -1
- package/lib/builder/webpack/devServer/server.js.map +1 -1
- package/lib/commands/static/application.js +8 -0
- package/lib/commands/static/application.js.map +1 -1
- package/lib/models/logger.d.ts +1 -0
- package/lib/models/logger.js +3 -3
- package/lib/models/logger.js.map +1 -1
- package/package.json +3 -3
- package/src/builder/webpack/devServer/server.ts +14 -1
- package/src/commands/static/application.ts +9 -0
- package/src/models/logger.ts +4 -3
|
@@ -95,7 +95,19 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
|
|
|
95
95
|
// http-proxy всегда склеивает слеши в урле, что немного неожиданно при работе с сервером напрямую
|
|
96
96
|
// https://github.com/http-party/node-http-proxy/issues/775
|
|
97
97
|
// поэтому пытаемся вернуть все слеши на место
|
|
98
|
-
proxy.on('proxyReq', (proxyReq, req) => {
|
|
98
|
+
proxy.on('proxyReq', (proxyReq, req, res) => {
|
|
99
|
+
// Early Hints support
|
|
100
|
+
proxyReq.socket.on('data', (data) => {
|
|
101
|
+
try {
|
|
102
|
+
const chunk = data.toString();
|
|
103
|
+
if (chunk.startsWith('HTTP/1.1 103 Early Hints')) {
|
|
104
|
+
res.socket.write(data);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
// do nothing
|
|
109
|
+
}
|
|
110
|
+
});
|
|
99
111
|
// https://github.com/http-party/node-http-proxy/issues/1022#issuecomment-439245479
|
|
100
112
|
// eslint-disable-next-line no-param-reassign
|
|
101
113
|
proxyReq.path = req.url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":";;;;AAAA,gFAAgD;AAChD,8EAAiD;AACjD,wDAAwB;AAGxB,0DAA0B;AAC1B,2CAA+C;AAC/C,iDAAiD;AACjD,yGAAwE;AACxE,mDAA2C;AAK3C,8CAA0D;AAC1D,6CAAwD;AACxD,sCAA+C;AAE/C,sCAAgD;AAEhD,MAAM,mBAAmB,GAAG;;;;;;;;;CAS3B,CAAC;AASF,MAAM,SAAS,GAAG,WAAW,CAAC;AAEvB,MAAM,YAAY,GAAG,CAAC,EAC3B,EAAE,EACF,MAAM,EACN,QAAQ,EACR,aAAa,EACb,MAAM,GAOP,EAAE,EAAE;IACH,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,cAAI,CAAC;KACb;IACD,0CAA0C;IAC1C,OAAO,SAAe,YAAY;;YAChC,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAClE,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/D,mEAAmE;YACnE,MAAM,YAAY,GAAG,UAAU,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YAC7H,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;YAEjF,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;aAClD;YAED,MAAM,EAAE,GAAG,cAAc,CAAC,gBAAuB,CAAC;YAClD,mCAAmC;YACnC,sEAAsE;YACtE,iEAAiE;YACjE,yDAAyD;YACzD,EAAE;YACF,6GAA6G;YAC7G,uDAAuD;YACvD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,uBAAgB,EAC3C,EAAE,EACF,aAAa,CAAC,WAAW,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,KAAK;gBACzE,CAAC,CAAC,yBAAkB;gBACpB,CAAC,CAAC,0BAAmB,CACxB,CAAC;YACF,IAAI,MAAqB,CAAC;YAC1B,IAAI,iBAAiB,GAAG,IAAI,CAAC;YAC7B,IAAI,UAAyB,CAAC;YAC9B,IAAI,iBAAoC,CAAC;YACzC,IAAI,iBAAuC,CAAC;YAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAElC,MAAM,KAAK,GAAG,IAAA,8BAAiB,EAAC;gBAC9B,uCAAuC;gBACvC,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,eAAK,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAO,MAAM,EAAE,GAAG,EAAE,EAAE;gBAC5F,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAEvB,IAAI,GAAG,YAAY,KAAK,EAAE;oBACxB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACpB;gBAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAA,CAAC,CAAC;YAEH,EAAE,CAAC,QAAQ,CAAC;gBACV,OAAO,EAAE,4BAAmB;gBAC5B,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,gBAAgB;aAC3B,CAAC,CAAC;YAEH,iFAAiF;YACjF,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE;gBAClC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE;oBAC/C,iBAAiB,GAAG,IAAI,CAAC;oBACzB,qBAAqB,GAAG,KAAK,CAAC;gBAChC,CAAC,CAAC,CAAC;aACJ;YAED,MAAM,cAAc,GAAG,GAAS,EAAE;gBAChC,IAAI,UAAU,EAAE;oBACd,OAAO,UAAU,CAAC;iBACnB;gBAED,IAAI,iBAAiB,EAAE;oBACrB,OAAO,iBAAiB,CAAC;iBAC1B;gBAED,iBAAiB,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBAChD,iBAAiB,GAAG,OAAO,CAAC;gBAC9B,CAAC,CAAC,CAAC;gBAEH,OAAO,iBAAiB,CAAC;YAC3B,CAAC,CAAA,CAAC;YAEF,kGAAkG;YAClG,2DAA2D;YAC3D,8CAA8C;YAC9C,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC1C,sBAAsB;gBACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBAClC,IAAI;wBACF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAE9B,IAAI,KAAK,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE;4BAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;yBACxB;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,aAAa;qBACd;gBACH,CAAC,CAAC,CAAC;gBAEH,mFAAmF;gBACnF,6CAA6C;gBAC5C,QAAgB,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,8EAA8E;YAC9E,8DAA8D;YAC9D,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC1C,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;oBACpB,iDAAiD;oBACjD,8GAA8G;oBAC9G,IAAA,cAAO,EAAC,CAAC,OAAO,EAAE,EAAE;wBAClB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClC,CAAC,EAAE,sBAAW,CAAC,CAAC;iBACjB;gBAED,EAAE;gBACF,oFAAoF;gBACpF,2FAA2F;gBAC3F,EAAE;gBACF,yFAAyF;gBACzF,oEAAoE;gBACpE,iFAAiF;gBACjF,EAAE;gBACF,kFAAkF;gBAClF,kEAAkE;gBAClE,EAAE;gBACF,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;oBAC1B,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;oBAElD,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;wBAChF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;qBACjD;gBACH,CAAC,CAAC,CAAC;gBAEH,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,yEAAyE;YACzE,yGAAyG;YACzG,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBACxC,IAAI,qBAAqB,EAAE;oBACzB,aAAa;oBACb,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;oBAC7B,OAAO;iBACR;gBAED,IAAI,IAAI,CAAC,KAAK,KAAK,0BAAS,CAAC,MAAM,EAAE;oBACnC,MAAM,cAAc,EAAE,CAAC;oBAEvB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAU,EAAE,EAAE,MAAM,EAAE,oBAAoB,UAAU,EAAE,EAAE,CAAC,CAAC;iBAC1E;YACH,CAAC,CAAA,CAAC,CAAC;YAEH,kFAAkF;YAClF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;gBACtC,IAAI,qBAAqB,EAAE;oBACzB,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;oBAC7B,OAAO;iBACR;gBAED,MAAM,cAAc,EAAE,CAAC;gBAEvB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,oBAAoB,UAAU,EAAE,EAAE,CAAC,CAAC;YACpE,CAAC,CAAA,CAAC,CAAC;YAEH,gCAAgC;YAChC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;gBACzC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,oBAAoB,UAAU,EAAE,EAAE,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,QAAQ,CAAC;gBACV,OAAO,EAAE,4BAAmB;gBAC5B,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,GAAS,EAAE;oBACnB,KAAK,CAAC,KAAK,EAAE,CAAC;oBAEd,IAAI,MAAM,EAAE;wBACV,oEAAoE;wBACpE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBAC3B,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qBACxB;gBACH,CAAC,CAAA;aACF,CAAC,CAAC;YAEH,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,GAAS,EAAE;gBAClE,IAAI,IAAI,CAAC,KAAK,KAAK,0BAAS,CAAC,IAAI,EAAE;oBACjC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;iBACpB;YACH,CAAC,CAAA,CAAC,CAAC;YAEH,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAO,KAAK,EAAE,EAAE;gBACjD,IAAI,iBAAiB,EAAE;oBACrB,UAAU,GAAG,IAAI,CAAC;oBAClB,iBAAiB,GAAG,IAAI,CAAC;oBAEzB,iBAAiB,GAAG,KAAK,CAAC;oBAE1B,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;wBACrB,iHAAiH;wBACjH,OAAO;qBACR;oBAED,IAAI,MAAM,EAAE;wBACV,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;qBAC5B;oBAED,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBAE9B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAS,EAAE;wBAC3B,qBAAqB,GAAG,IAAI,CAAC;wBAC7B,UAAU,GAAG,IAAI,CAAC;wBAClB,iBAAiB,GAAG,IAAI,CAAC;wBAEzB,IAAI,MAAM,EAAE;4BACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;yBACtB;wBAED,MAAM,GAAG,IAAI,CAAC;wBAEd,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBACrC,CAAC,CAAA,CAAC,CAAC;oBAEH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;wBACvC,IAAI,GAAG,KAAK,QAAQ,EAAE;4BACpB,UAAU,GAAG,IAAI,CAAC;4BAElB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,EAAI,CAAC;yBACvB;oBACH,CAAC,CAAC,CAAC;oBAEH,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBAEzC,MAAM,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;iBAClE;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA,CAAC;AACJ,CAAC,CAAC;AA1PW,QAAA,YAAY,gBA0PvB"}
|
|
@@ -43,6 +43,14 @@ const staticApp = (context, configEntry, options) => tslib_1.__awaiter(void 0, v
|
|
|
43
43
|
stdio: 'inherit',
|
|
44
44
|
env: Object.assign(Object.assign(Object.assign(Object.assign({}, (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true)), (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env'), true)), process.env), { NODE_ENV: 'production', PORT: `${port}`, PORT_SERVER: `${port}`, ASSETS_PREFIX: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : `http://${staticHost}:${staticPort}/${output.client.replace(/\/$/, '')}/` }),
|
|
45
45
|
});
|
|
46
|
+
server.catch((reason) => {
|
|
47
|
+
context.logger.event({
|
|
48
|
+
type: 'error',
|
|
49
|
+
event: 'COMMAND:STATIC:BUILD',
|
|
50
|
+
message: `message: server.js launch failed`,
|
|
51
|
+
payload: reason,
|
|
52
|
+
});
|
|
53
|
+
});
|
|
46
54
|
const bundleInfoPath = `http://localhost:${port}/${name}/papi/bundleInfo`;
|
|
47
55
|
yield Promise.race([
|
|
48
56
|
server,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/commands/static/application.ts"],"names":[],"mappings":"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"}
|
package/lib/models/logger.d.ts
CHANGED
package/lib/models/logger.js
CHANGED
|
@@ -4,13 +4,13 @@ exports.Logger = void 0;
|
|
|
4
4
|
class Logger {
|
|
5
5
|
event(event) {
|
|
6
6
|
if (event.type === 'error') {
|
|
7
|
-
console.error(event.type, event.event, event.message);
|
|
7
|
+
console.error(event.type, event.event, event.message, event.payload);
|
|
8
8
|
}
|
|
9
9
|
else if (event.type === 'warning') {
|
|
10
|
-
console.warn(event.type, event.event, event.message);
|
|
10
|
+
console.warn(event.type, event.event, event.message, event.payload);
|
|
11
11
|
}
|
|
12
12
|
else if (process.env.DEBUG_MODE === 'true') {
|
|
13
|
-
console.log(event.type, event.event, event.message);
|
|
13
|
+
console.log(event.type, event.event, event.message, event.payload);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
}
|
package/lib/models/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/models/logger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/models/logger.ts"],"names":[],"mappings":";;;AAOA,MAAa,MAAM;IACjB,KAAK,CAAC,KAAe;QACnB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SACtE;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SACrE;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,EAAE;YAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SACpE;IACH,CAAC;CACF;AAVD,wBAUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.73.1",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"@tinkoff/utils": "^2.1.3",
|
|
71
71
|
"@tinkoff/webpack-dedupe-plugin": "1.0.2",
|
|
72
72
|
"@tramvai/build": "3.1.2",
|
|
73
|
-
"@tramvai/react": "2.
|
|
73
|
+
"@tramvai/react": "2.73.1",
|
|
74
74
|
"@tramvai/tools-check-versions": "0.4.9",
|
|
75
75
|
"@tramvai/tools-migrate": "0.6.11",
|
|
76
76
|
"ajv": "^6.12.6",
|
|
@@ -163,7 +163,7 @@
|
|
|
163
163
|
"wrap-ansi": "^7.0.0"
|
|
164
164
|
},
|
|
165
165
|
"devDependencies": {
|
|
166
|
-
"@swc/core": "^1.3.
|
|
166
|
+
"@swc/core": "^1.3.36",
|
|
167
167
|
"@tramvai/tools-generate-schema": "0.1.4",
|
|
168
168
|
"@types/compression": "^1.7.2",
|
|
169
169
|
"@types/express": "^4.17.13",
|
|
@@ -135,7 +135,20 @@ export const serverRunner = ({
|
|
|
135
135
|
// http-proxy всегда склеивает слеши в урле, что немного неожиданно при работе с сервером напрямую
|
|
136
136
|
// https://github.com/http-party/node-http-proxy/issues/775
|
|
137
137
|
// поэтому пытаемся вернуть все слеши на место
|
|
138
|
-
proxy.on('proxyReq', (proxyReq, req) => {
|
|
138
|
+
proxy.on('proxyReq', (proxyReq, req, res) => {
|
|
139
|
+
// Early Hints support
|
|
140
|
+
proxyReq.socket.on('data', (data) => {
|
|
141
|
+
try {
|
|
142
|
+
const chunk = data.toString();
|
|
143
|
+
|
|
144
|
+
if (chunk.startsWith('HTTP/1.1 103 Early Hints')) {
|
|
145
|
+
res.socket.write(data);
|
|
146
|
+
}
|
|
147
|
+
} catch (e) {
|
|
148
|
+
// do nothing
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
|
|
139
152
|
// https://github.com/http-party/node-http-proxy/issues/1022#issuecomment-439245479
|
|
140
153
|
// eslint-disable-next-line no-param-reassign
|
|
141
154
|
(proxyReq as any).path = req.url;
|
|
@@ -71,6 +71,15 @@ export const staticApp = async (
|
|
|
71
71
|
},
|
|
72
72
|
});
|
|
73
73
|
|
|
74
|
+
server.catch((reason) => {
|
|
75
|
+
context.logger.event({
|
|
76
|
+
type: 'error',
|
|
77
|
+
event: 'COMMAND:STATIC:BUILD',
|
|
78
|
+
message: `message: server.js launch failed`,
|
|
79
|
+
payload: reason,
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
|
|
74
83
|
const bundleInfoPath = `http://localhost:${port}/${name}/papi/bundleInfo`;
|
|
75
84
|
|
|
76
85
|
await Promise.race([
|
package/src/models/logger.ts
CHANGED
|
@@ -2,16 +2,17 @@ interface LogEvent {
|
|
|
2
2
|
type: 'error' | 'warning' | 'info' | 'debug';
|
|
3
3
|
event: string; // уникальный идентификатор
|
|
4
4
|
message: string;
|
|
5
|
+
payload?: any;
|
|
5
6
|
}
|
|
6
7
|
|
|
7
8
|
export class Logger {
|
|
8
9
|
event(event: LogEvent): void {
|
|
9
10
|
if (event.type === 'error') {
|
|
10
|
-
console.error(event.type, event.event, event.message);
|
|
11
|
+
console.error(event.type, event.event, event.message, event.payload);
|
|
11
12
|
} else if (event.type === 'warning') {
|
|
12
|
-
console.warn(event.type, event.event, event.message);
|
|
13
|
+
console.warn(event.type, event.event, event.message, event.payload);
|
|
13
14
|
} else if (process.env.DEBUG_MODE === 'true') {
|
|
14
|
-
console.log(event.type, event.event, event.message);
|
|
15
|
+
console.log(event.type, event.event, event.message, event.payload);
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
}
|