xypriss 9.12.69 → 9.12.71
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/cjs/src/plugins/const/getSysApi.js +2 -7
- package/dist/cjs/src/plugins/const/getSysApi.js.map +1 -1
- package/dist/cjs/src/server/FastServer/ComponentManager.js +4 -2
- package/dist/cjs/src/server/FastServer/ComponentManager.js.map +1 -1
- package/dist/cjs/src/server/components/fastapi/WorkerPoolComponent.js +4 -1
- package/dist/cjs/src/server/components/fastapi/WorkerPoolComponent.js.map +1 -1
- package/dist/cjs/src/server/components/fastapi/console/ConsoleInterceptor.js +7 -4
- package/dist/cjs/src/server/components/fastapi/console/ConsoleInterceptor.js.map +1 -1
- package/dist/cjs/src/server/const/Defaulthelmetopts.js +1 -1
- package/dist/cjs/src/server/const/Defaulthelmetopts.js.map +1 -1
- package/dist/cjs/src/server/const/default.js +3 -3
- package/dist/cjs/src/server/const/default.js.map +1 -1
- package/dist/cjs/src/server/core/XHSCBridge/EngineManager.js +4 -2
- package/dist/cjs/src/server/core/XHSCBridge/EngineManager.js.map +1 -1
- package/dist/cjs/src/server/core/XHSCBridge/index.js +13 -6
- package/dist/cjs/src/server/core/XHSCBridge/index.js.map +1 -1
- package/dist/cjs/src/server/core/XyLifecycleManager.js +11 -6
- package/dist/cjs/src/server/core/XyLifecycleManager.js.map +1 -1
- package/dist/cjs/src/server/core/XyServerCreator.js +11 -4
- package/dist/cjs/src/server/core/XyServerCreator.js.map +1 -1
- package/dist/cjs/src/server/core/XyprissApp.js +3 -2
- package/dist/cjs/src/server/core/XyprissApp.js.map +1 -1
- package/dist/cjs/src/server/utils/WorkerModeHandler.js +18 -7
- package/dist/cjs/src/server/utils/WorkerModeHandler.js.map +1 -1
- package/dist/cjs/src/shared/logger/quickLogger.js +11 -6
- package/dist/cjs/src/shared/logger/quickLogger.js.map +1 -1
- package/dist/cjs/src/xhsc/EnvApi.js +111 -3
- package/dist/cjs/src/xhsc/EnvApi.js.map +1 -1
- package/dist/cjs/src/xhsc/cluster/XHSCWorker.js +12 -2
- package/dist/cjs/src/xhsc/cluster/XHSCWorker.js.map +1 -1
- package/dist/cjs/src/xhsc/fs/FSCore.js +5 -2
- package/dist/cjs/src/xhsc/fs/FSCore.js.map +1 -1
- package/dist/cjs/src/xhsc/fs/FileHandle.js +5 -2
- package/dist/cjs/src/xhsc/fs/FileHandle.js.map +1 -1
- package/dist/esm/src/plugins/const/getSysApi.js +2 -7
- package/dist/esm/src/plugins/const/getSysApi.js.map +1 -1
- package/dist/esm/src/server/FastServer/ComponentManager.js +4 -2
- package/dist/esm/src/server/FastServer/ComponentManager.js.map +1 -1
- package/dist/esm/src/server/components/fastapi/WorkerPoolComponent.js +4 -1
- package/dist/esm/src/server/components/fastapi/WorkerPoolComponent.js.map +1 -1
- package/dist/esm/src/server/components/fastapi/console/ConsoleInterceptor.js +7 -4
- package/dist/esm/src/server/components/fastapi/console/ConsoleInterceptor.js.map +1 -1
- package/dist/esm/src/server/const/Defaulthelmetopts.js +1 -1
- package/dist/esm/src/server/const/Defaulthelmetopts.js.map +1 -1
- package/dist/esm/src/server/const/default.js +3 -3
- package/dist/esm/src/server/const/default.js.map +1 -1
- package/dist/esm/src/server/core/XHSCBridge/EngineManager.js +4 -2
- package/dist/esm/src/server/core/XHSCBridge/EngineManager.js.map +1 -1
- package/dist/esm/src/server/core/XHSCBridge/index.js +13 -6
- package/dist/esm/src/server/core/XHSCBridge/index.js.map +1 -1
- package/dist/esm/src/server/core/XyLifecycleManager.js +11 -6
- package/dist/esm/src/server/core/XyLifecycleManager.js.map +1 -1
- package/dist/esm/src/server/core/XyServerCreator.js +11 -4
- package/dist/esm/src/server/core/XyServerCreator.js.map +1 -1
- package/dist/esm/src/server/core/XyprissApp.js +3 -2
- package/dist/esm/src/server/core/XyprissApp.js.map +1 -1
- package/dist/esm/src/server/utils/WorkerModeHandler.js +18 -7
- package/dist/esm/src/server/utils/WorkerModeHandler.js.map +1 -1
- package/dist/esm/src/shared/logger/quickLogger.js +11 -6
- package/dist/esm/src/shared/logger/quickLogger.js.map +1 -1
- package/dist/esm/src/xhsc/EnvApi.js +111 -3
- package/dist/esm/src/xhsc/EnvApi.js.map +1 -1
- package/dist/esm/src/xhsc/cluster/XHSCWorker.js +12 -2
- package/dist/esm/src/xhsc/cluster/XHSCWorker.js.map +1 -1
- package/dist/esm/src/xhsc/fs/FSCore.js +5 -2
- package/dist/esm/src/xhsc/fs/FSCore.js.map +1 -1
- package/dist/esm/src/xhsc/fs/FileHandle.js +5 -2
- package/dist/esm/src/xhsc/fs/FileHandle.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,17 +1,12 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
/**
|
|
4
|
-
* Lazy accessor for `localSysApi`.
|
|
5
|
-
*
|
|
6
|
-
* Deferred to call-time to break the circular initialization chain:
|
|
7
|
-
* `xhsc.ts` -> `PathApi` -> `XyprissTempDir` -> `xhsc` (localSysApi)
|
|
8
|
-
*/
|
|
9
3
|
function getSysApi() {
|
|
10
4
|
if (typeof globalThis !== "undefined" && globalThis.__sys__) {
|
|
11
5
|
return globalThis.__sys__;
|
|
12
6
|
}
|
|
13
7
|
try {
|
|
14
|
-
return require("../../xhsc")
|
|
8
|
+
return require("../../xhsc")
|
|
9
|
+
?.localSysApi;
|
|
15
10
|
}
|
|
16
11
|
catch {
|
|
17
12
|
return globalThis?.__sys__;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSysApi.js","sources":["../../../../../src/plugins/const/getSysApi.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getSysApi.js","sources":["../../../../../src/plugins/const/getSysApi.ts"],"sourcesContent":[null],"names":[],"mappings":";;SAYgB,SAAS,GAAA;IACrB,IAAI,OAAO,UAAU,KAAK,WAAW,IAAK,UAAkB,CAAC,OAAO,EAAE;QAClE,OAAQ,UAAkB,CAAC,OAAO;IACtC;AACA,IAAA,IAAI;QACA,OAAQ,OAAO,CAAC,YAAY;AACxB,cAAE,WAAW;IACrB;AAAE,IAAA,MAAM;QACJ,OAAQ,UAAkB,EAAE,OAAY;IAC5C;AACJ;;;;"}
|
|
@@ -5,6 +5,7 @@ var CacheManager = require('../components/fastapi/CacheManager.js');
|
|
|
5
5
|
var WorkerPoolComponent = require('../components/fastapi/WorkerPoolComponent.js');
|
|
6
6
|
var FileUploadManager = require('../components/fastapi/upload/FileUploadManager.js');
|
|
7
7
|
var FiUp = require('../../FiUp.js');
|
|
8
|
+
var getSysApi = require('../../plugins/const/getSysApi.js');
|
|
8
9
|
|
|
9
10
|
class ComponentManager {
|
|
10
11
|
constructor(app, logger, options, lifecycleManager, refs) {
|
|
@@ -41,8 +42,9 @@ class ComponentManager {
|
|
|
41
42
|
// Unified manager retrieval happens in initializeDependentComponents
|
|
42
43
|
}
|
|
43
44
|
async initializeWorkerPool() {
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
// Issue #43: Retrieve XYPRISS_WORKER_ID via getSysApi()
|
|
46
|
+
const workerId = getSysApi.getSysApi()?.__env__?.get("XYPRISS_WORKER_ID");
|
|
47
|
+
const isWorker = !!workerId && workerId !== "master";
|
|
46
48
|
if (this.options.workerPool?.enabled) {
|
|
47
49
|
this.refs.workerPoolComponent = new WorkerPoolComponent.WorkerPoolComponent({ workerPool: this.options.workerPool }, { app: this.app, serverOptions: this.options });
|
|
48
50
|
if (!this.options.isAuxiliary &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentManager.js","sources":["../../../../../src/server/FastServer/ComponentManager.ts"],"sourcesContent":[null],"names":["CacheManager","WorkerPoolComponent","FileUploadManager","initializeFileUpload","Configs"],"mappings":"
|
|
1
|
+
{"version":3,"file":"ComponentManager.js","sources":["../../../../../src/server/FastServer/ComponentManager.ts"],"sourcesContent":[null],"names":["CacheManager","getSysApi","WorkerPoolComponent","FileUploadManager","initializeFileUpload","Configs"],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var Logger = require('../../../shared/logger/Logger.js');
|
|
4
4
|
var nehoid = require('nehoid');
|
|
5
|
+
var getSysApi = require('../../../plugins/const/getSysApi.js');
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* WorkerPoolComponent - Delegated to Go (XHSC)
|
|
@@ -27,8 +28,10 @@ class WorkerPoolComponent {
|
|
|
27
28
|
addWorkerPoolMethods() {
|
|
28
29
|
const app = this.dependencies.app;
|
|
29
30
|
// Add task execution method via IPC
|
|
31
|
+
// Issue #43: Access XYPRISS_IPC_PATH through getSysApi()
|
|
30
32
|
app.executeTask = (task) => {
|
|
31
|
-
|
|
33
|
+
const ipcPath = getSysApi.getSysApi()?.__env__?.get("XYPRISS_IPC_PATH");
|
|
34
|
+
if (this.isXHSC && ipcPath) {
|
|
32
35
|
// In worker mode, we send the task to Go via the global IPC handler
|
|
33
36
|
// We'll assume the XHSCWorker instance is available or
|
|
34
37
|
// we use a global sender.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerPoolComponent.js","sources":["../../../../../../src/server/components/fastapi/WorkerPoolComponent.ts"],"sourcesContent":[null],"names":["logger","NehoID"],"mappings":"
|
|
1
|
+
{"version":3,"file":"WorkerPoolComponent.js","sources":["../../../../../../src/server/components/fastapi/WorkerPoolComponent.ts"],"sourcesContent":[null],"names":["logger","getSysApi","NehoID"],"mappings":";;;;;;AAAA;;;AAGG;AAmBH;;AAEG;MACU,mBAAmB,CAAA;IAK5B,WAAA,CACI,OAAmC,EACnC,YAA6C,EAAA;QAJzC,IAAA,CAAA,MAAM,GAAY,KAAK;AAM3B,QAAA,IAAI,CAAC,OAAO,GAAG,OAAO;AACtB,QAAA,IAAI,CAAC,YAAY,GAAG,YAAY;AAChC,QAAA,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,KAAK,KAAK;QAEhE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE;YAClC,IAAI,CAAC,UAAU,EAAE;QACrB;IACJ;IAEQ,UAAU,GAAA;AACd,QAAAA,aAAM,CAAC,KAAK,CACR,OAAO,EACP,yDAAyD,CAC5D;QACD,IAAI,CAAC,oBAAoB,EAAE;IAC/B;IAEQ,oBAAoB,GAAA;AACxB,QAAA,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,GAAU;;;AAIxC,QAAA,GAAG,CAAC,WAAW,GAAG,CAAC,IAAS,KAAU;YAClC,MAAM,OAAO,GAAGC,mBAAS,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC;AAC7D,YAAA,IAAI,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE;;;;AAIvB,gBAAA,GAAW,CAAC,WAAW,EAAE,WAAW,CAAC;AAClC,oBAAA,IAAI,EAAE,MAAM;AACZ,oBAAA,OAAO,EAAE,IAAI;AAChB,iBAAA,CAAC;YACN;iBAAO;AACH,gBAAAD,aAAM,CAAC,IAAI,CACP,SAAS,EACT,yDAAyD,CAC5D;;YAEL;AACJ,QAAA,CAAC;AAED,QAAA,GAAG,CAAC,kBAAkB,GAAG,MAAU;YAC/B,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE;AACxD,QAAA,CAAC;QAED,GAAG,CAAC,cAAc,GAAG,CAAC,QAAa,EAAE,QAAA,GAAmB,CAAC,KAAU;AAC/D,YAAA,MAAM,IAAI,GAAG;gBACT,EAAE,EAAEE,aAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AACtC,gBAAA,IAAI,EAAE,KAAK;gBACX,QAAQ;AACR,gBAAA,UAAU,EAAE,KAAK;AACjB,gBAAA,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;AACrB,gBAAA,IAAI,EAAE,QAAQ;aACjB;AACD,YAAA,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;AACzB,QAAA,CAAC;QAED,GAAG,CAAC,aAAa,GAAG,CAAC,QAAa,EAAE,QAAA,GAAmB,CAAC,KAAU;AAC9D,YAAA,MAAM,IAAI,GAAG;gBACT,EAAE,EAAEA,aAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACrC,gBAAA,IAAI,EAAE,IAAI;gBACV,QAAQ;AACR,gBAAA,UAAU,EAAE,IAAI;AAChB,gBAAA,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;AACrB,gBAAA,IAAI,EAAE,QAAQ;aACjB;AACD,YAAA,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;AACzB,QAAA,CAAC;AAED,QAAA,GAAG,CAAC,mBAAmB,GAAG,MAAe,IAAI;AAE7C,QAAAF,aAAM,CAAC,KAAK,CAAC,OAAO,EAAE,4CAA4C,CAAC;IACvE;IAEO,QAAQ,GAAA;;IAEf;IAEO,KAAK,GAAA;QACR,IAAI,CAAC,UAAU,EAAE;IACrB;AACH;;;;"}
|
|
@@ -5,6 +5,7 @@ var XHSCDirectIPC = require('../../../../xhsc/ipc/XHSCDirectIPC.js');
|
|
|
5
5
|
require('../../../../index.js');
|
|
6
6
|
var mergeWithDefaults = require('../../../../utils/mergeWithDefaults.js');
|
|
7
7
|
var async_hooks = require('async_hooks');
|
|
8
|
+
var getSysApi = require('../../../../plugins/const/getSysApi.js');
|
|
8
9
|
var ConfigurationManager = require('../../../../ConfigurationManager.js');
|
|
9
10
|
|
|
10
11
|
/***************************************************************************
|
|
@@ -52,7 +53,8 @@ class ConsoleInterceptor {
|
|
|
52
53
|
averageOverhead: 0,
|
|
53
54
|
isActive: false,
|
|
54
55
|
};
|
|
55
|
-
|
|
56
|
+
// Issue #43: Access XYPRISS_IPC_PATH via getSysApi()
|
|
57
|
+
this.ipcPath = getSysApi.getSysApi()?.__env__?.get("XYPRISS_IPC_PATH");
|
|
56
58
|
}
|
|
57
59
|
/**
|
|
58
60
|
* Decides whether a log line should be displayed given the current displayLimit config.
|
|
@@ -110,8 +112,8 @@ class ConsoleInterceptor {
|
|
|
110
112
|
this.patchConsole();
|
|
111
113
|
this.isIntercepting = true;
|
|
112
114
|
this.stats.isActive = true;
|
|
113
|
-
// Try to sync config if IPC is already available
|
|
114
|
-
this.ipcPath =
|
|
115
|
+
// Try to sync config if IPC is already available (Issue #43)
|
|
116
|
+
this.ipcPath = this.ipcPath || getSysApi.getSysApi()?.__env__?.get("XYPRISS_IPC_PATH");
|
|
115
117
|
if (this.ipcPath) {
|
|
116
118
|
const ipc = new XHSCDirectIPC.XHSCDirectIPC(this.ipcPath);
|
|
117
119
|
await ipc.sendCommand("console", "update-config", this.config);
|
|
@@ -221,7 +223,8 @@ class ConsoleInterceptor {
|
|
|
221
223
|
});
|
|
222
224
|
}
|
|
223
225
|
async delegateToXHSC(message, level, method, args) {
|
|
224
|
-
|
|
226
|
+
// Issue #43: Retrieve XYPRISS_IPC_PATH via getSysApi()
|
|
227
|
+
const ipcPath = this.ipcPath || getSysApi.getSysApi()?.__env__?.get("XYPRISS_IPC_PATH");
|
|
225
228
|
if (!ipcPath) {
|
|
226
229
|
return;
|
|
227
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleInterceptor.js","sources":["../../../../../../../src/server/components/fastapi/console/ConsoleInterceptor.ts"],"sourcesContent":[null],"names":["AsyncLocalStorage","Configs","mergeWithDefaults","DEFAULT_CONSOLE_CONFIG","XHSCDirectIPC"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ConsoleInterceptor.js","sources":["../../../../../../../src/server/components/fastapi/console/ConsoleInterceptor.ts"],"sourcesContent":[null],"names":["AsyncLocalStorage","Configs","mergeWithDefaults","DEFAULT_CONSOLE_CONFIG","getSysApi","XHSCDirectIPC"],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const sys = getSysApi.getSysApi();
|
|
|
20
20
|
const isDev = sys?.__env__
|
|
21
21
|
? sys.__env__.isDevelopment() &&
|
|
22
22
|
sys.__env__.get("XSEC_TRUST", "true") === "true"
|
|
23
|
-
:
|
|
23
|
+
: __sys__.__env__.isDevelopment();
|
|
24
24
|
/**
|
|
25
25
|
* "Trusted" third-party origins, allowed in the CSP directives ONLY when
|
|
26
26
|
* running in dev mode. Never exposed in production builds.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Defaulthelmetopts.js","sources":["../../../../../src/server/const/Defaulthelmetopts.ts"],"sourcesContent":[null],"names":["getSysApi","logger"],"mappings":";;;;;AAMA;;;;;;;;;;;;AAYG;AACH,MAAM,GAAG,GAAGA,mBAAS,EAAE;AACvB,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"Defaulthelmetopts.js","sources":["../../../../../src/server/const/Defaulthelmetopts.ts"],"sourcesContent":[null],"names":["getSysApi","logger"],"mappings":";;;;;AAMA;;;;;;;;;;;;AAYG;AACH,MAAM,GAAG,GAAGA,mBAAS,EAAE;AACvB,MAAM,KAAK,GAAG,GAAG,EAAE;AACf,MAAE,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK;AAC5C,MAAE,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE;AAErC;;;AAGG;AACH,MAAM,gBAAgB,GAAG;AACrB,IAAA,OAAO,EAAE,CAAC,8BAA8B,EAAE,0BAA0B,CAAC;AACrE,IAAA,MAAM,EAAE,CAAC,8BAA8B,EAAE,8BAA8B,CAAC;IACxE,KAAK,EAAE,CAAC,2BAA2B,CAAC;IACpC,MAAM,EAAE,CAAC,yBAAyB,CAAC;AACnC,IAAA,OAAO,EAAE,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;CACzD;AAEV;;;AAGG;AACH,MAAM,SAAS,GAAG;IACd,oBAAoB;IACpB,oBAAoB;IACpB,kBAAkB;IAClB,kBAAkB;CACrB;AAED;AACA,MAAM,OAAO,GAAG,CAAI,GAAG,OAAY,MAAW,KAAK,GAAG,OAAO,GAAG,EAAE,CAAC;AAEnE;AACA,MAAM,UAAU,GAAG,CAAC,IAAuB,KACvC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE;AAE1B;;;;;;;;;;AAUG;AACI,MAAM,iBAAiB,GAAS;AACnC,IAAA,qBAAqB,EAAE;AACnB,QAAA,UAAU,EAAE;YACR,UAAU,EAAE,CAAC,QAAQ,CAAC;AAEtB,YAAA,SAAS,EAAE;gBACP,QAAQ;AACR,gBAAA,iBAAiB;AACjB,gBAAA,GAAG,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC;AACvC,gBAAA,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC;AAC3B,aAAA;AAED,YAAA,QAAQ,EAAE;gBACN,QAAQ;gBACR,iBAAiB;AACjB,gBAAA,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC;AACtC,gBAAA,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC;AAC3B,aAAA;AAED,YAAA,OAAO,EAAE;gBACL,QAAQ;AACR,gBAAA,GAAG,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;AACxC,aAAA;AAED,YAAA,MAAM,EAAE;gBACJ,QAAQ;gBACR,OAAO;AACP,gBAAA,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC;AACtC,gBAAA,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC;AAC3B,aAAA;AAED,YAAA,UAAU,EAAE;gBACR,QAAQ;AACR,gBAAA,GAAG,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC;AACvC,gBAAA,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC;AAC3B,aAAA;YAED,QAAQ,EAAE,CAAC,QAAQ,CAAC;YACpB,SAAS,EAAE,CAAC,QAAQ,CAAC;YACrB,QAAQ,EAAE,CAAC,QAAQ,CAAC;AACpB,YAAA,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;AACjC,SAAA;AACJ,KAAA;;IAGD,yBAAyB,EAAE,KAAK,GAAG,KAAK,GAAG,IAAI;AAC/C,IAAA,uBAAuB,EAAE,IAAI;AAC7B,IAAA,yBAAyB,EAAE;QACvB,MAAM,EAAE,KAAK,GAAG,cAAc,GAAG,aAAa;AACjD,KAAA;AAED,IAAA,kBAAkB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;AACpC,IAAA,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;AAC9B,IAAA,aAAa,EAAE,IAAI;AAEnB,IAAA,IAAI,EAAE;QACF,MAAM,EAAE,KAAK,GAAG,CAAC,GAAG,QAAQ;QAC5B,iBAAiB,EAAE,CAAC,KAAK;AACzB,QAAA,OAAO,EAAE,KAAK;AACjB,KAAA;AAED,IAAA,QAAQ,EAAE,IAAI;AACd,IAAA,OAAO,EAAE,IAAI;AACb,IAAA,kBAAkB,EAAE,IAAI;AACxB,IAAA,4BAA4B,EAAE,KAAK;AACnC,IAAA,cAAc,EAAE;QACZ,MAAM,EAAE,KAAK,GAAG,aAAa,GAAG,iCAAiC;AACpE,KAAA;AACD,IAAA,SAAS,EAAE,IAAI;;AAGnB;AACA,IAAI,KAAK,EAAE;AACP,IAAAC,aAAM,CAAC,IAAI,CACP,UAAU,EACV,0OAA0O,CAC7O;AACL;;;;"}
|
|
@@ -12,8 +12,8 @@ var xemsKeyPlaceholder = require('./xemsKeyPlaceholder.js');
|
|
|
12
12
|
* This configuration is used when no custom configuration is provided.
|
|
13
13
|
*
|
|
14
14
|
*/
|
|
15
|
-
const DEFAULT_HOST =
|
|
16
|
-
const DEFAULT_PORT = (
|
|
15
|
+
const DEFAULT_HOST = getSysApi.getSysApi()?.__env__?.get("XYPRISS_HOST") || "localhost";
|
|
16
|
+
const DEFAULT_PORT = (getSysApi.getSysApi()?.__env__?.get("XYPRISS_PORT") || 8085);
|
|
17
17
|
// Default configuration
|
|
18
18
|
const DEFAULT_OPTIONS = {
|
|
19
19
|
performance: {
|
|
@@ -203,7 +203,7 @@ const DEFAULT_OPTIONS = {
|
|
|
203
203
|
* once `__sys__` is initialized, deliberately avoiding reliance on Node.js core modules (`node:os`).
|
|
204
204
|
*/
|
|
205
205
|
get tempFileDir() {
|
|
206
|
-
return getSysApi.getSysApi()
|
|
206
|
+
return getSysApi.getSysApi()?.path.tmpUserDir + "/.uploads/";
|
|
207
207
|
},
|
|
208
208
|
createParentPath: true,
|
|
209
209
|
preservePath: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sources":["../../../../../src/server/const/default.ts"],"sourcesContent":[null],"names":["xemsKeyPlaceholder","DEFAULT_LOGGER_CONFIG","getRandomBytes","defaultHelmetOpts"
|
|
1
|
+
{"version":3,"file":"default.js","sources":["../../../../../src/server/const/default.ts"],"sourcesContent":[null],"names":["getSysApi","xemsKeyPlaceholder","DEFAULT_LOGGER_CONFIG","getRandomBytes","defaultHelmetOpts"],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var node_child_process = require('node:child_process');
|
|
4
4
|
var ConfigurationManager = require('../../../ConfigurationManager.js');
|
|
5
5
|
var ProjectDiscovery = require('../../../utils/ProjectDiscovery.js');
|
|
6
|
-
var
|
|
6
|
+
var getSysApi = require('../../../plugins/const/getSysApi.js');
|
|
7
7
|
var buildCoreArgs = require('./cmd/buildCoreArgs.js');
|
|
8
8
|
var buildPerformanceArgs = require('./cmd/buildPerformanceArgs.js');
|
|
9
9
|
var buildNetworkArgs = require('./cmd/buildNetworkArgs.js');
|
|
@@ -65,7 +65,9 @@ class EngineManager {
|
|
|
65
65
|
const pluginArgs = uniquePluginPaths.length > 0
|
|
66
66
|
? ["--plugins", uniquePluginPaths.join(",")]
|
|
67
67
|
: [];
|
|
68
|
-
|
|
68
|
+
// Issue #43: Access project root lazily via getSysApi() to break circular imports between xhsc.ts and engine startup
|
|
69
|
+
const sys = getSysApi.getSysApi();
|
|
70
|
+
const projectRoot = sys?.__root__ ||
|
|
69
71
|
ProjectDiscovery.getCallerProjectRoot() ||
|
|
70
72
|
ProjectDiscovery.identifyProjectRoot(process.cwd()) ||
|
|
71
73
|
process.cwd();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EngineManager.js","sources":["../../../../../../src/server/core/XHSCBridge/EngineManager.ts"],"sourcesContent":[null],"names":["Configs","
|
|
1
|
+
{"version":3,"file":"EngineManager.js","sources":["../../../../../../src/server/core/XHSCBridge/EngineManager.ts"],"sourcesContent":[null],"names":["Configs","getSysApi","getCallerProjectRoot","identifyProjectRoot","buildCoreArgs","buildPerformanceArgs","buildNetworkArgs","buildSecurityArgs","buildClusterArgs","buildRequestArgs","buildWorkerPoolArgs","buildUploadArgs","buildStaticArgs","buildConversionArgs","XHSC_SIGNATURE","spawn","TempFileManager"],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ var XHSCWorker = require('../../../xhsc/cluster/XHSCWorker.js');
|
|
|
7
7
|
var SocketManager = require('./SocketManager.js');
|
|
8
8
|
var LogProcessor = require('./LogProcessor.js');
|
|
9
9
|
var EngineManager = require('./EngineManager.js');
|
|
10
|
+
var getSysApi = require('../../../plugins/const/getSysApi.js');
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* XHSCBridge - The high-performance bridge between Go (XHSC) and Node.js.
|
|
@@ -37,9 +38,12 @@ class XHSCBridge {
|
|
|
37
38
|
}
|
|
38
39
|
// 0. Check if we are a worker spawned by Go (Clustering mode)
|
|
39
40
|
// Auxiliary servers should NEVER act as cluster workers for the primary instance.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
// Issue #43: Access workerId via getSysApi() to adhere to XyPriss zero-trust environment model
|
|
42
|
+
const sysApi = getSysApi.getSysApi();
|
|
43
|
+
const currentWorkerId = sysApi?.__env__?.get("XYPRISS_WORKER_ID");
|
|
44
|
+
if (currentWorkerId && currentWorkerId !== "master" && !this.app.configs?.isAuxiliary) {
|
|
45
|
+
this.logger.info("cluster", `Worker ${currentWorkerId} starting...`);
|
|
46
|
+
const worker = new XHSCWorker.XHSCWorker(this.app, { workerId: currentWorkerId });
|
|
43
47
|
await worker.connect();
|
|
44
48
|
return;
|
|
45
49
|
}
|
|
@@ -71,9 +75,12 @@ class XHSCBridge {
|
|
|
71
75
|
if (!clusterConfig?.enabled) {
|
|
72
76
|
if (!this.app.configs?.isAuxiliary) {
|
|
73
77
|
this.logger.info("server", "Single process mode: Initializing XHSC connection...");
|
|
74
|
-
//
|
|
75
|
-
process.env
|
|
76
|
-
|
|
78
|
+
// Issue #43: Use getSysApi().__env__.set() instead of assigning to process.env directly.
|
|
79
|
+
// In strict JS runtimes like Bun (multi-server mode), mutating process.env when wrapped
|
|
80
|
+
// in an immutable descriptor causes fatal descriptor rejection exceptions.
|
|
81
|
+
const sys = getSysApi.getSysApi();
|
|
82
|
+
sys?.__env__?.set("XYPRISS_WORKER_ID", "master");
|
|
83
|
+
sys?.__env__?.set("XYPRISS_IPC_PATH", this.socketPath);
|
|
77
84
|
}
|
|
78
85
|
else {
|
|
79
86
|
this.logger.info("server", "Auxiliary server: Initializing independent XHSC connection...");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../../src/server/core/XHSCBridge/index.ts"],"sourcesContent":[null],"names":["XyPrissRunner","initializeLogger","Configs","SocketManager","LogProcessor","EngineManager","XHSCWorker"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../../src/server/core/XHSCBridge/index.ts"],"sourcesContent":[null],"names":["XyPrissRunner","initializeLogger","Configs","SocketManager","LogProcessor","EngineManager","getSysApi","XHSCWorker"],"mappings":";;;;;;;;;;;AAYA;;;;AAIG;MACU,UAAU,CAAA;AAWnB,IAAA,WAAA,CACY,GAAe,EACvB,MAAe,EACf,UAAmB,EAAA;QAFX,IAAA,CAAA,GAAG,GAAH,GAAG;QAVP,IAAA,CAAA,MAAM,GAAsB,IAAI;QAEhC,IAAA,CAAA,eAAe,GAAY,KAAK;QAYpC,IAAI,CAAC,MAAM,GAAG,IAAIA,2BAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAC9C,QAAA,IAAI,CAAC,MAAM;YACP,MAAM;AACL,gBAAA,GAAW,CAAC,MAAM;gBACnBC,uBAAgB,CAACC,uBAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE5C,IAAI,CAAC,aAAa,GAAG,IAAIC,2BAAa,CAAC,IAAI,CAAC,MAAM,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,IAAIC,yBAAY,CAAC,IAAI,CAAC,MAAM,CAAC;AACjD,QAAA,IAAI,CAAC,aAAa,GAAG,IAAIC,2BAAa,CAClC,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CACd;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC;IACzE;AAEA;;AAEG;IACI,MAAM,KAAK,CACd,IAAA,GAAe,IAAI,EACnB,IAAA,GAAe,WAAW,EAC1B,kBAAuC,EAAA;QAEvC,IAAI,kBAAkB,EAAE;AACnB,YAAA,IAAI,CAAC,YAAoB,CAAC,kBAAkB,GAAG,kBAAkB;QACtE;;;;AAIA,QAAA,MAAM,MAAM,GAAGC,mBAAS,EAAE;QAC1B,MAAM,eAAe,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,mBAAmB,CAAC;AAEjE,QAAA,IAAI,eAAe,IAAI,eAAe,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE;YACnF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,SAAS,EACT,CAAA,OAAA,EAAU,eAAe,CAAA,YAAA,CAAc,CAC1C;AACD,YAAA,MAAM,MAAM,GAAG,IAAIC,qBAAU,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AACtE,YAAA,MAAM,MAAM,CAAC,OAAO,EAAE;YACtB;QACJ;QAEA,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,6BAA6B,CAAC;QAC7D;;QAGA,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC;;QAG7D,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;;AAGjD,QAAA,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAC1B,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,MAAK;;AAED,YAAA,IAAI,CAAC,eAAe,GAAG,IAAI;AAC/B,QAAA,CAAC,EACD,CAAC,IAAI,EAAE,cAAc,KAAI;;YAErB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE;AAC7B,gBAAA,MAAM,YAAY,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG;AAC9C,sBAAE;AACF,sBAAE,CAAA,OAAA,EAAU,cAAc,CAAA,CAAE;gBAEhC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,QAAQ,EACR,CAAA,6BAAA,EAAgC,IAAI,CAAA,CAAE,CACzC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC;YAC7C;AACA,YAAA,IAAI,CAAC,eAAe,GAAG,KAAK;AAChC,QAAA,CAAC,CACJ;;QAGD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE;AACzC,QAAA,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,IAAIL,uBAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAElE,QAAA,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE;gBAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,QAAQ,EACR,sDAAsD,CACzD;;;;AAID,gBAAA,MAAM,GAAG,GAAGI,mBAAS,EAAE;gBACvB,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC;gBAChD,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,UAAU,CAAC;YAC1D;iBAAO;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,QAAQ,EACR,+DAA+D,CAClE;YACL;YAEA,MAAM,MAAM,GAAG,IAAIC,qBAAU,CAAC,IAAI,CAAC,GAAG,EAAE;AACpC,gBAAA,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,IAAI,CAAC;AACjB,aAAA,CAAC;AACF,YAAA,MAAM,MAAM,CAAC,OAAO,EAAE;QAC1B;IACJ;IAEO,IAAI,GAAA;AACP,QAAA,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;AAEzB,QAAA,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,oCAAoC,CAAC;AACjE,YAAA,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACvB;QAEA,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;AACjD,QAAA,IAAI,CAAC,eAAe,GAAG,KAAK;IAChC;;AAGA,IAAA,IAAW,SAAS,GAAA;QAChB,OAAO,IAAI,CAAC,eAAe;IAC/B;AAEA,IAAA,IAAW,OAAO,GAAA;AACd,QAAA,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;IACtC;AACH;;;;"}
|
|
@@ -8,6 +8,7 @@ var RequestProcessor = require('../components/fastapi/RequestProcessor.js');
|
|
|
8
8
|
var RouteManager = require('../components/fastapi/RouteManager.js');
|
|
9
9
|
var ConsoleInterceptor = require('../components/fastapi/console/ConsoleInterceptor.js');
|
|
10
10
|
var NotFoundHandler = require('../handlers/NotFoundHandler.js');
|
|
11
|
+
var getSysApi = require('../../plugins/const/getSysApi.js');
|
|
11
12
|
|
|
12
13
|
/***************************************************************************
|
|
13
14
|
* XyPriss - Fast And Secure
|
|
@@ -156,13 +157,17 @@ class XyLifecycleManager {
|
|
|
156
157
|
return this.state.httpServer;
|
|
157
158
|
}
|
|
158
159
|
async handleServerStartup(serverPort, host, callback) {
|
|
159
|
-
// Rust-Managed Clustering Mode
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
160
|
+
// Rust/Go-Managed Clustering Mode
|
|
161
|
+
// Issue #43: Retrieve workerId and ipcPath via getSysApi() rather than raw process.env
|
|
162
|
+
const sys = getSysApi.getSysApi();
|
|
163
|
+
const workerId = sys?.__env__?.get("XYPRISS_WORKER_ID");
|
|
164
|
+
const ipcPath = sys?.__env__?.get("XYPRISS_IPC_PATH");
|
|
165
|
+
if (workerId &&
|
|
166
|
+
workerId !== "master" &&
|
|
167
|
+
ipcPath) {
|
|
168
|
+
this.logger.info("cluster", `Managed worker mode detected (Worker ${workerId})`);
|
|
164
169
|
const { XHSCWorker } = await Promise.resolve().then(function () { return require('../../xhsc/cluster/XHSCWorker.js'); });
|
|
165
|
-
const worker = new XHSCWorker(this.app);
|
|
170
|
+
const worker = new XHSCWorker(this.app, { workerId, ipcPath });
|
|
166
171
|
await worker.connect();
|
|
167
172
|
if (callback)
|
|
168
173
|
callback();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyLifecycleManager.js","sources":["../../../../../src/server/core/XyLifecycleManager.ts"],"sourcesContent":[null],"names":["RedirectManager","RequestProcessor","RouteManager","ConsoleInterceptor","createNotFoundHandler","DEFAULT_PORT","DEFAULT_HOST","PortUtility","StartupProcessor"],"mappings":"
|
|
1
|
+
{"version":3,"file":"XyLifecycleManager.js","sources":["../../../../../src/server/core/XyLifecycleManager.ts"],"sourcesContent":[null],"names":["RedirectManager","RequestProcessor","RouteManager","ConsoleInterceptor","createNotFoundHandler","DEFAULT_PORT","DEFAULT_HOST","PortUtility","getSysApi","StartupProcessor"],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ var WorkerModeHandler = require('../utils/WorkerModeHandler.js');
|
|
|
8
8
|
var XPluginManager = require('../../plugins/core/XPluginManager.js');
|
|
9
9
|
var getMime = require('../../utils/getMime.js');
|
|
10
10
|
var Send = require('../../utils/Send.js');
|
|
11
|
+
var getSysApi = require('../../plugins/const/getSysApi.js');
|
|
11
12
|
|
|
12
13
|
/***************************************************************************
|
|
13
14
|
* XyPriss - Fast And Secure
|
|
@@ -36,11 +37,17 @@ class XyServerCreator {
|
|
|
36
37
|
Send.Send.setGlobalConfig(options.send);
|
|
37
38
|
}
|
|
38
39
|
// 3. Setup environment
|
|
40
|
+
// Issue #43: Apply NODE_ENV through getSysApi().__env__.set() to avoid strict descriptor exceptions under Bun
|
|
39
41
|
if (options.env) {
|
|
40
|
-
|
|
41
|
-
if (
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
const sys = getSysApi.getSysApi();
|
|
43
|
+
if (sys?.__env__) {
|
|
44
|
+
sys.__env__.set("NODE_ENV", options.env);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
process.env["NODE_ENV"] = options.env;
|
|
48
|
+
}
|
|
49
|
+
if (sys?.vars) {
|
|
50
|
+
sys.vars.update({
|
|
44
51
|
__env__: options.env,
|
|
45
52
|
});
|
|
46
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyServerCreator.js","sources":["../../../../../src/server/core/XyServerCreator.ts"],"sourcesContent":[null],"names":["configLoader","Logger","Configs","Send","getMimes","handleWorkerMode","XyPrissServer","PluginManager"],"mappings":"
|
|
1
|
+
{"version":3,"file":"XyServerCreator.js","sources":["../../../../../src/server/core/XyServerCreator.ts"],"sourcesContent":[null],"names":["configLoader","Logger","Configs","Send","getSysApi","getMimes","handleWorkerMode","XyPrissServer","PluginManager"],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ var Router = require('../routing/Router.js');
|
|
|
7
7
|
var middleware = require('../routing/modules/middleware.js');
|
|
8
8
|
var XyRoutingManager = require('./XyRoutingManager.js');
|
|
9
9
|
var XyModuleManager = require('./XyModuleManager.js');
|
|
10
|
+
var getSysApi = require('../../plugins/const/getSysApi.js');
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* XyprissApp - Express-free XyPrissApp implementation
|
|
@@ -282,12 +283,12 @@ class XyprissApp {
|
|
|
282
283
|
this.settings = {
|
|
283
284
|
"x-powered-by": false,
|
|
284
285
|
etag: "weak",
|
|
285
|
-
env:
|
|
286
|
+
env: getSysApi.getSysApi()?.__env__?.get("NODE_ENV") || "development",
|
|
286
287
|
"subdomain offset": 2,
|
|
287
288
|
"trust proxy": false,
|
|
288
289
|
"view cache": true,
|
|
289
290
|
"view engine": false,
|
|
290
|
-
views: process.cwd() + "/views",
|
|
291
|
+
views: getSysApi.getSysApi()?.__env__?.get("XYPRISS_VIEWS") || process.cwd() + "/views",
|
|
291
292
|
};
|
|
292
293
|
}
|
|
293
294
|
// ===== HTTP METHOD IMPLEMENTATIONS =====
|