xypriss 9.10.13 → 9.10.14
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/CONTRIBUTING.md +35 -19
- package/LICENSE +56 -8
- package/README.md +2 -2
- package/dist/cjs/src/ConfigurationManager.js +13 -0
- package/dist/cjs/src/ConfigurationManager.js.map +1 -1
- package/dist/cjs/src/server/ServerFactory.js +1 -4
- package/dist/cjs/src/server/ServerFactory.js.map +1 -1
- package/dist/cjs/src/server/const/default.js +1 -2
- package/dist/cjs/src/server/const/default.js.map +1 -1
- package/dist/cjs/src/server/core/HttpServer.js +12 -2
- package/dist/cjs/src/server/core/HttpServer.js.map +1 -1
- package/dist/cjs/src/server/core/SendFileHandler.js.map +1 -1
- package/dist/cjs/src/server/core/http/HttpErrorHandler.js +6 -1
- package/dist/cjs/src/server/core/http/HttpErrorHandler.js.map +1 -1
- package/dist/cjs/src/server/handlers/NotFoundHandler.js +10 -12
- package/dist/cjs/src/server/handlers/NotFoundHandler.js.map +1 -1
- package/dist/cjs/src/server/handlers/templates/notFoundTemplate.js +390 -645
- package/dist/cjs/src/server/handlers/templates/notFoundTemplate.js.map +1 -1
- package/dist/cjs/src/types/NotFoundConfig.js +2 -1
- package/dist/cjs/src/types/NotFoundConfig.js.map +1 -1
- package/dist/esm/src/ConfigurationManager.js +13 -0
- package/dist/esm/src/ConfigurationManager.js.map +1 -1
- package/dist/esm/src/server/ServerFactory.js +1 -4
- package/dist/esm/src/server/ServerFactory.js.map +1 -1
- package/dist/esm/src/server/const/default.js +1 -2
- package/dist/esm/src/server/const/default.js.map +1 -1
- package/dist/esm/src/server/core/HttpServer.js +12 -2
- package/dist/esm/src/server/core/HttpServer.js.map +1 -1
- package/dist/esm/src/server/core/SendFileHandler.js.map +1 -1
- package/dist/esm/src/server/core/http/HttpErrorHandler.js +6 -1
- package/dist/esm/src/server/core/http/HttpErrorHandler.js.map +1 -1
- package/dist/esm/src/server/handlers/NotFoundHandler.js +10 -12
- package/dist/esm/src/server/handlers/NotFoundHandler.js.map +1 -1
- package/dist/esm/src/server/handlers/templates/notFoundTemplate.js +390 -645
- package/dist/esm/src/server/handlers/templates/notFoundTemplate.js.map +1 -1
- package/dist/esm/src/types/NotFoundConfig.js +2 -1
- package/dist/esm/src/types/NotFoundConfig.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/package.json +2 -1
package/CONTRIBUTING.md
CHANGED
|
@@ -4,46 +4,61 @@ Thank you for your interest in contributing to the XyPriss framework. We welcome
|
|
|
4
4
|
|
|
5
5
|
## License Compliance
|
|
6
6
|
|
|
7
|
-
XyPriss is licensed under the **Nehonix Open Source License (NOSL)
|
|
7
|
+
XyPriss is licensed under the **Nehonix Open Source License (NOSL) v2.0**. By contributing to this project, you agree that:
|
|
8
8
|
|
|
9
9
|
1. **Work for Hire**: All contributions, including code, documentation, and assets, are considered "works made for hire" for Nehonix.
|
|
10
10
|
2. **IP Protection**: Nehonix retains all intellectual property rights. You grant Nehonix a non-exclusive, perpetual, irrevocable, worldwide, royalty-free license to use, modify, and distribute your contributions.
|
|
11
11
|
3. **No Unauthorized Distribution**: You may not distribute derivative works of XyPriss outside the terms specified in the NOSL without explicit written authorization from Nehonix Legal Department.
|
|
12
12
|
|
|
13
|
-
For the full legal text, please refer to the [LICENSE](LICENSE) or visit [https://dll.nehonix.com/licenses/NOSL](https://dll.nehonix.com/licenses/NOSL).
|
|
13
|
+
For the full legal text, please refer to the [LICENSE](LICENSE) or visit [https://dll.nehonix.com/licenses/NOSL/v2](https://dll.nehonix.com/licenses/NOSL/v2).
|
|
14
14
|
|
|
15
15
|
## Technical Standards
|
|
16
16
|
|
|
17
17
|
To maintain the integrity and performance of XyPriss, all contributions must adhere to these standards:
|
|
18
18
|
|
|
19
|
-
-
|
|
20
|
-
-
|
|
21
|
-
-
|
|
22
|
-
-
|
|
23
|
-
-
|
|
24
|
-
-
|
|
25
|
-
-
|
|
19
|
+
- **Language**: Use TypeScript for all application-layer logic and Go for core engine (XHSC) updates.
|
|
20
|
+
- **Modularity**: Code must be modular and maintainable. Avoid monolithic functions or classes.
|
|
21
|
+
- **Style**:
|
|
22
|
+
- Maintain a professional and serious tone in all comments and documentation.
|
|
23
|
+
- **No emojis** are permitted in the codebase or documentation.
|
|
24
|
+
- Use `lucide-react` for frontend icons if applicable.
|
|
25
|
+
- **Tooling**: Use `xfpm` for dependency management and task execution.
|
|
26
26
|
|
|
27
27
|
## Contribution Workflow
|
|
28
28
|
|
|
29
|
-
### 1.
|
|
30
|
-
|
|
29
|
+
### 1. Environment Setup
|
|
30
|
+
|
|
31
|
+
To maintain consistency with the XyPriss security and performance model, contributors must adhere to the following setup:
|
|
31
32
|
|
|
32
|
-
### 2. Implementation
|
|
33
33
|
1. **Fork** the repository and create a feature branch from `master`.
|
|
34
|
-
2. **
|
|
35
|
-
3. **
|
|
34
|
+
2. **Tooling**: Ensure `xfpm` is installed on your system. **npm, yarn, or pnpm are strictly prohibited** for dependency management in this project.
|
|
35
|
+
3. **Native Engine (XHSC)**: You must install the XHSC core in a `bin/` directory at the project root. You can choose one of the following methods:
|
|
36
|
+
- **Automated (Recommended)**:
|
|
37
|
+
- _Linux/macOS_: `curl -sL https://dll.nehonix.com/repo/xypriss/install-xhsc.sh | bash`
|
|
38
|
+
- _Windows_: `iwr -useb https://dll.nehonix.com/repo/xypriss/install-xhsc.ps1 | iex`
|
|
39
|
+
- **Manual**: Download the binary for your platform from [http://dll.nehonix.com/repo/xypriss/xhsc/bin](http://dll.nehonix.com/repo/xypriss/xhsc/bin), create a `bin/` folder at the root, and save the binary as `xhsc` (or `xhsc.exe` on Windows).
|
|
40
|
+
4. **Initialization**: Execute `xfpm install` to resolve dependencies and link the native core.
|
|
41
|
+
|
|
42
|
+
### 2. Implementation & Validation
|
|
43
|
+
|
|
44
|
+
1. **Develop** your changes following the technical standards mentioned above.
|
|
45
|
+
2. **Mandatory Simulation**: Every contribution must be accompanied by a simulation project located in the `simulations/` directory (e.g., `simulations/your-feature`).
|
|
46
|
+
3. **Simulation Architecture**: Your simulation must follow the architecture of `simulations/XCIS`:
|
|
47
|
+
- **TypeScript Configuration**: The `tsconfig.json` must map the `xypriss` module to the local source: `"xypriss": ["../../src/index.ts"]`.
|
|
48
|
+
- **Dependency Management**: The simulation's `package.json` **must not** include `xypriss` in the `dependencies` list.
|
|
49
|
+
4. **Pre-Submission Testing**: Implement the necessary routes, tests, and scenarios within your simulation to verify and approve the feature before opening a Pull Request.
|
|
36
50
|
|
|
37
51
|
### 3. Submission
|
|
52
|
+
|
|
38
53
|
1. Ensure your branch is up-to-date with the upstream `master`.
|
|
39
|
-
2. Submit a **Pull Request (PR)** with a concise, technical description of the changes.
|
|
54
|
+
2. Submit a **Pull Request (PR)** with a concise, technical description of the changes and a link to your simulation for review.
|
|
40
55
|
3. Link the PR to the relevant issue using "Closes #issue-number".
|
|
41
56
|
|
|
42
57
|
## Pull Request Guidelines
|
|
43
58
|
|
|
44
|
-
-
|
|
45
|
-
-
|
|
46
|
-
-
|
|
59
|
+
- **Atomic Commits**: Keep commits focused on a single logical change.
|
|
60
|
+
- **Documentation**: Update relevant `.md` files in `docs/` if your change affects the public API or behavior.
|
|
61
|
+
- **No Breaking Changes**: If a breaking change is necessary, it must be explicitly highlighted in the PR description for architectural review.
|
|
47
62
|
|
|
48
63
|
## Security Disclosures
|
|
49
64
|
|
|
@@ -51,4 +66,5 @@ Do not report security vulnerabilities through public issues. To report a securi
|
|
|
51
66
|
|
|
52
67
|
---
|
|
53
68
|
|
|
54
|
-
|
|
69
|
+
_© 2026 Nehonix Team. All rights reserved._
|
|
70
|
+
|
package/LICENSE
CHANGED
|
@@ -1,13 +1,61 @@
|
|
|
1
|
-
NEHONIX Open Source License (
|
|
1
|
+
# NEHONIX Open Source License (NOSL) v2.0
|
|
2
2
|
|
|
3
|
-
Copyright
|
|
3
|
+
Copyright © 2025–2026 NEHONIX. All Rights Reserved.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software, to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies, subject to the following conditions:
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
## Attribution required
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
|
|
9
|
+
Any distribution must include this notice — in source, docs, or any form visible to users or contributors:
|
|
11
10
|
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
```
|
|
12
|
+
Originally created by NEHONIX (www.nehonix.com)
|
|
13
|
+
Licensed under the NEHONIX Open Source License (NOSL) v2.0
|
|
14
|
+
```
|
|
15
|
+
|
|
16
|
+
For source files, include at the top:
|
|
17
|
+
|
|
18
|
+
```
|
|
19
|
+
// Originally created by NEHONIX — www.nehonix.com
|
|
20
|
+
// Licensed under NOSL v2.0
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
For forks and derivative works:
|
|
24
|
+
|
|
25
|
+
```
|
|
26
|
+
Forked and extended by [Name / Project] — [Year]
|
|
27
|
+
Original work by NEHONIX (www.nehonix.com) — NOSL v2.0
|
|
28
|
+
```
|
|
29
|
+
|
|
30
|
+
## Commercial use
|
|
31
|
+
|
|
32
|
+
Allowed. When publicly referencing a product built on this software, include at least one mention (docs, website, about page, or marketing materials):
|
|
33
|
+
|
|
34
|
+
```
|
|
35
|
+
Built on open-source technology by NEHONIX (www.nehonix.com)
|
|
36
|
+
```
|
|
37
|
+
|
|
38
|
+
## What you can do
|
|
39
|
+
|
|
40
|
+
Use, modify, redistribute, sell, integrate into proprietary or open-source projects, sublicense under compatible terms, keep private modifications private.
|
|
41
|
+
|
|
42
|
+
## What you cannot do
|
|
43
|
+
|
|
44
|
+
Remove or obscure NEHONIX copyright notices — claim the original software as your own independent work — modify this license — use the NEHONIX name or logo to imply endorsement without written permission — use the software for illegal or harmful purposes.
|
|
45
|
+
|
|
46
|
+
## Contributions
|
|
47
|
+
|
|
48
|
+
By submitting a contribution to the original NEHONIX repository, you grant NEHONIX a perpetual, worldwide, royalty-free license to use and distribute it. You retain authorship credit. NEHONIX retains ownership of the project as a whole.
|
|
49
|
+
|
|
50
|
+
## No warranty
|
|
51
|
+
|
|
52
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND. NEHONIX SHALL NOT BE LIABLE FOR ANY DAMAGES ARISING FROM ITS USE.
|
|
53
|
+
|
|
54
|
+
## Governing law
|
|
55
|
+
|
|
56
|
+
Côte d'Ivoire. Disputes submitted to the competent courts of Yamoussoukro.
|
|
57
|
+
|
|
58
|
+
---
|
|
59
|
+
|
|
60
|
+
**Full license:** https://dll.nehonix.com/licenses/NOSL/v2
|
|
61
|
+
**Contact:** opensource@nehonix.com — www.nehonix.com
|
package/README.md
CHANGED
|
@@ -7,7 +7,7 @@ _Stop Coding Backends. Start Deploying Fortresses._
|
|
|
7
7
|
|
|
8
8
|
[](https://xypriss.nehonix.com)
|
|
9
9
|
[](https://www.typescriptlang.org/)
|
|
10
|
-
[](https://dll.nehonix.com/licenses/NOSL)
|
|
10
|
+
[](https://dll.nehonix.com/licenses/NOSL/v2)
|
|
11
11
|
[](https://nehonix.com)
|
|
12
12
|
|
|
13
13
|
[Quick Start](https://xypriss.nehonix.com/docs/QUICK_START) • [Documentation](https://xypriss.nehonix.com/docs/) • [Examples](https://xypriss.nehonix.com/docs/EXAMPLES) • [API Reference](https://xypriss.nehonix.com/docs/api-reference)
|
|
@@ -426,7 +426,7 @@ If XyPriss has been valuable for your projects, consider:
|
|
|
426
426
|
|
|
427
427
|
## License
|
|
428
428
|
|
|
429
|
-
XyPriss is licensed under the [Nehonix OSL (
|
|
429
|
+
XyPriss is licensed under the [Nehonix OSL (NOSL) v2.0 License](https://dll.nehonix.com/licenses/NOSL/v2).
|
|
430
430
|
|
|
431
431
|
---
|
|
432
432
|
|
|
@@ -72,6 +72,7 @@ class ConfigurationManager {
|
|
|
72
72
|
instance.config = ConfigurationManager.deepMerge(instance.config, config);
|
|
73
73
|
// Strict validation for XEMS if persistence is enabled
|
|
74
74
|
ConfigurationManager.validateXemsConfig(instance.config);
|
|
75
|
+
ConfigurationManager.validateGeneralConfig(instance.config);
|
|
75
76
|
instance.initialized = true;
|
|
76
77
|
}
|
|
77
78
|
/**
|
|
@@ -189,6 +190,7 @@ class ConfigurationManager {
|
|
|
189
190
|
instance.config = ConfigurationManager.deepMerge(instance.config, config);
|
|
190
191
|
// Strict validation for XEMS
|
|
191
192
|
ConfigurationManager.validateXemsConfig(instance.config);
|
|
193
|
+
ConfigurationManager.validateGeneralConfig(instance.config);
|
|
192
194
|
// If it should be immutable, wrap it using the global __const__.vars.make
|
|
193
195
|
if (shouldBeImmutable &&
|
|
194
196
|
typeof globalThis.__const__ !== "undefined") {
|
|
@@ -245,6 +247,17 @@ class ConfigurationManager {
|
|
|
245
247
|
* @param config - Current server configuration
|
|
246
248
|
* @throws Error if XEMS persistence is enabled but secret is invalid
|
|
247
249
|
*/
|
|
250
|
+
/**
|
|
251
|
+
* General configuration validation
|
|
252
|
+
* @param config - Current server configuration
|
|
253
|
+
*/
|
|
254
|
+
static validateGeneralConfig(config) {
|
|
255
|
+
// XHSC is mandatory and enabled by default.
|
|
256
|
+
// It cannot be explicitly set to false.
|
|
257
|
+
if (config.server && config.server.xhsc === false) {
|
|
258
|
+
throw new Error("[XSec] XHSC is enabled by default and cannot be disabled.");
|
|
259
|
+
}
|
|
260
|
+
}
|
|
248
261
|
static validateXemsConfig(config) {
|
|
249
262
|
const xems = config.server?.xems;
|
|
250
263
|
if (typeof xems !== "object" || !xems.persistence?.enabled)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigurationManager.js","sources":["../../../src/ConfigurationManager.ts"],"sourcesContent":[null],"names":["DEFAULT_OPTIONS","mergeWithDefaults","timingSafeEqual"],"mappings":";;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmCG;AAOH;;;AAGG;AACH,MAAM,oBAAoB,CAAA;AAKtB;;;AAGG;AACH,IAAA,WAAA,GAAA;QANQ,IAAA,CAAA,WAAW,GAAY,KAAK;;AAQhC,QAAA,IAAI,CAAC,MAAM,GAAG,EAAE,GAAGA,wBAAe,EAAE;IACxC;AAEA;;AAEG;AACK,IAAA,OAAO,WAAW,GAAA;AACtB,QAAA,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE;AAChC,YAAA,oBAAoB,CAAC,QAAQ,GAAG,IAAI,oBAAoB,EAAE;QAC9D;QACA,OAAO,oBAAoB,CAAC,QAAQ;IACxC;AAEA;;;AAGG;IACI,OAAO,GAAG,CAAC,MAAqB,EAAA;AACnC,QAAA,MAAM,QAAQ,GAAG,oBAAoB,CAAC,WAAW,EAAE;AACnD,QAAA,QAAQ,CAAC,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAC5C,QAAQ,CAAC,MAAM,EACf,MAAM,CACT;;AAGD,QAAA,oBAAoB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ConfigurationManager.js","sources":["../../../src/ConfigurationManager.ts"],"sourcesContent":[null],"names":["DEFAULT_OPTIONS","mergeWithDefaults","timingSafeEqual"],"mappings":"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"}
|
|
@@ -111,10 +111,7 @@ function createServer(options = {}) {
|
|
|
111
111
|
// 1. Initial setup
|
|
112
112
|
ConfigLoader.configLoader.loadAndApplySysConfig();
|
|
113
113
|
Logger.Logger.getInstance(options.logging);
|
|
114
|
-
const xms = options?.multiServer?.servers; // XMS = Xypriss
|
|
115
|
-
if (!options.server?.xhsc) {
|
|
116
|
-
throw new Error("[XSec] XHSC is enabled by default and cannot be disabled.");
|
|
117
|
-
}
|
|
114
|
+
const xms = options?.multiServer?.servers; // XMS = Xypriss MultiServer
|
|
118
115
|
// 2. Check for Multi-Server mode
|
|
119
116
|
if (options.multiServer?.enabled) {
|
|
120
117
|
// --- XMS GLOBAL MERGE RULE ---
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerFactory.js","sources":["../../../../src/server/ServerFactory.ts"],"sourcesContent":[null],"names":["rejectInternalFlag","configLoader","Logger","mergeWithDefaults","handleWorkerMode","Configs","initializeLogger","MultiServerManager","MultiServerApp","XyServerCreator"],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AAejF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+DG;AACG,SAAU,YAAY,CAAC,OAAA,GAAyB,EAAE,EAAA;;IAEpDA,yCAAkB,CAAC,OAAO,CAAC;;IAG3BC,yBAAY,CAAC,qBAAqB,EAAE;AACpC,IAAAC,aAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"ServerFactory.js","sources":["../../../../src/server/ServerFactory.ts"],"sourcesContent":[null],"names":["rejectInternalFlag","configLoader","Logger","mergeWithDefaults","handleWorkerMode","Configs","initializeLogger","MultiServerManager","MultiServerApp","XyServerCreator"],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;AAsBiF;AAejF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+DG;AACG,SAAU,YAAY,CAAC,OAAA,GAAyB,EAAE,EAAA;;IAEpDA,yCAAkB,CAAC,OAAO,CAAC;;IAG3BC,yBAAY,CAAC,qBAAqB,EAAE;AACpC,IAAAC,aAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC;;AAG1C,IAAA,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE;;;;AAI9B,QAAA,MAAM,aAAa,GAAG,EAAE,GAAG,OAAO,EAAE;QACpC,OAAO,aAAa,CAAC,WAAW;AAEhC,QAAA,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,KAAI;;AAEvC,YAAA,OAAOC,mCAAiB,CAAC,aAAa,EAAE,MAAa,CAAC;AAC1D,QAAA,CAAC,CAAC;AAEF,QAAA,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;AACtB,YAAA,MAAM,IAAI,KAAK,CACX,wIAAwI,CAC3I;QACL;AAEA,QAAA,MAAM,aAAa,GAAGC,kCAAgB,CAAC,OAAO,CAAC;AAC/C,QAAAC,uBAAO,CAAC,KAAK,CAAC,aAAa,CAAC;QAC5B,MAAM,MAAM,GAAGC,uBAAgB,CAACD,uBAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACvD,QAAA,MAAM,kBAAkB,GAAG,IAAIE,qCAAkB,CAC7CF,uBAAO,CAAC,MAAM,EAAE,EAChB,MAAM,CACT;QAED,MAAM,QAAQ,GAAG,IAAIG,6BAAc,CAC/B,kBAAkB,EAClB,OAAc,EACd,MAAM,CACT;AAED,QAAA,OAAO,QAA4B;IACvC;;AAGA,IAAA,OAAOC,+BAAe,CAAC,MAAM,CAAC,OAAO,CAAC;AAC1C;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sources":["../../../../../src/server/const/default.ts"],"sourcesContent":[null],"names":["DEFAULT_LOGGER_CONFIG"],"mappings":";;;;;AAAA;;;;AAIG;
|
|
1
|
+
{"version":3,"file":"default.js","sources":["../../../../../src/server/const/default.ts"],"sourcesContent":[null],"names":["DEFAULT_LOGGER_CONFIG"],"mappings":"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"}
|
|
@@ -30,7 +30,15 @@ class XyPrissHttpServer {
|
|
|
30
30
|
constructor(logger) {
|
|
31
31
|
this.logger = logger;
|
|
32
32
|
this.middlewareManager = new MiddlewareManager.MiddlewareManager(logger);
|
|
33
|
-
|
|
33
|
+
const cfg = ConfigurationManager.CM.get("notFound");
|
|
34
|
+
const rc = ConfigurationManager.CM.get("responseControl");
|
|
35
|
+
const isNotFoundEnabled = cfg?.enabled !== false;
|
|
36
|
+
if (!isNotFoundEnabled && rc?.enabled) {
|
|
37
|
+
this.notFoundHandler = null;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
this.notFoundHandler = new NotFoundHandler.NotFoundHandler();
|
|
41
|
+
}
|
|
34
42
|
this.responseEnhancer = new ResponseEnhancer.ResponseEnhancer(logger);
|
|
35
43
|
this.requestEnhancer = new RequestEnhancer.RequestEnhancer(logger);
|
|
36
44
|
// Initialize modular components
|
|
@@ -255,7 +263,9 @@ class XyPrissHttpServer {
|
|
|
255
263
|
return this.routeManager.getRoutes();
|
|
256
264
|
}
|
|
257
265
|
setNotFoundHandler(config) {
|
|
258
|
-
this.notFoundHandler
|
|
266
|
+
if (this.notFoundHandler) {
|
|
267
|
+
this.notFoundHandler.updateConfig(config);
|
|
268
|
+
}
|
|
259
269
|
}
|
|
260
270
|
setResponseControl(config) {
|
|
261
271
|
this.responseControlManager.setConfig(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpServer.js","sources":["../../../../../src/server/core/HttpServer.ts"],"sourcesContent":[null],"names":["MiddlewareManager","NotFoundHandler","ResponseEnhancer","RequestEnhancer","RouteManager","RequestForwarder","HttpErrorHandler","ResponseControlManager","VirtualServer","UriNormalizer","HoneypotTarpit","
|
|
1
|
+
{"version":3,"file":"HttpServer.js","sources":["../../../../../src/server/core/HttpServer.ts"],"sourcesContent":[null],"names":["MiddlewareManager","Configs","NotFoundHandler","ResponseEnhancer","RequestEnhancer","RouteManager","RequestForwarder","HttpErrorHandler","ResponseControlManager","VirtualServer","UriNormalizer","HoneypotTarpit","BodyParser","XyPrisRequestApp"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendFileHandler.js","sources":["../../../../../src/server/core/SendFileHandler.ts"],"sourcesContent":[null],"names":["MIME_MAP","__sys__"],"mappings":";;;;;AAKA;AACA;AACA;AACA,SAAS,WAAW,CAAC,GAAW,EAAA;IAC5B,OAAOA,iBAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,0BAA0B;AACpE;
|
|
1
|
+
{"version":3,"file":"SendFileHandler.js","sources":["../../../../../src/server/core/SendFileHandler.ts"],"sourcesContent":[null],"names":["MIME_MAP","__sys__"],"mappings":"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"}
|
|
@@ -14,7 +14,12 @@ class HttpErrorHandler {
|
|
|
14
14
|
if (handled)
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
|
-
this.notFoundHandler
|
|
17
|
+
if (this.notFoundHandler) {
|
|
18
|
+
this.notFoundHandler.handler(req, res);
|
|
19
|
+
}
|
|
20
|
+
else if (!res.headersSent) {
|
|
21
|
+
res.status(404).send("404 Not Found");
|
|
22
|
+
}
|
|
18
23
|
}
|
|
19
24
|
handleError(error, req, res, app, errorHandler, send404Callback) {
|
|
20
25
|
this.logger.error("server", `Request error: ${error.message}`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpErrorHandler.js","sources":["../../../../../../src/server/core/http/HttpErrorHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;AASA;;AAEG;MACU,gBAAgB,CAAA;IAIzB,WAAA,CAAY,MAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"HttpErrorHandler.js","sources":["../../../../../../src/server/core/http/HttpErrorHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;AASA;;AAEG;MACU,gBAAgB,CAAA;IAIzB,WAAA,CAAY,MAAc,EAAE,eAAuC,EAAA;AAC/D,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;AACpB,QAAA,IAAI,CAAC,eAAe,GAAG,eAAe;IAC1C;AAEO,IAAA,MAAM,OAAO,CAChB,GAAkB,EAClB,GAAmB,EACnB,sBAA+C,EAAA;QAE/C,IAAI,sBAAsB,EAAE;YACxB,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,oBAAoB,CAC7D,GAAG,EACH,GAAG,CACN;AACD,YAAA,IAAI,OAAO;gBAAE;QACjB;AAEA,QAAA,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAU,EAAE,GAAU,CAAC;QACxD;AAAO,aAAA,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;YACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QACzC;IACJ;IAEO,WAAW,CACd,KAAU,EACV,GAAkB,EAClB,GAAmB,EACnB,GAAQ,EACR,YAKS,EACT,eAGkB,EAAA;AAElB,QAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA,eAAA,EAAkB,KAAK,CAAC,OAAO,CAAA,CAAE,EAAE,KAAK,CAAC;AAErE,QAAA,MAAM,aAAa,GAAG,GAAG,EAAE,aAAa;AACxC,QAAA,IACI,aAAa;AACb,YAAA,OAAO,aAAa,CAAC,iBAAiB,KAAK,UAAU,EACvD;YACE,aAAa,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;QACpD;QAEA,IAAI,YAAY,EAAE;YACd,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAK;gBAC/B,IAAI,CAAC,GAAG,CAAC,aAAa;oBAClB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,uBAAuB,CAAC;AACjE,YAAA,CAAC,CAAC;QACN;aAAO;YACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,uBAAuB,CAAC;QAC7D;IACJ;AAEO,IAAA,iBAAiB,CACpB,GAAmB,EACnB,UAAkB,EAClB,OAAe,EAAA;QAEf,IAAI,CAAC,GAAG,CAAC,WAAW;AAAE,YAAA,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACzE;AAEO,IAAA,wBAAwB,CAAC,MAAW,EAAA;QACvC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,KAAI;AAC9B,YAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA,cAAA,EAAiB,KAAK,CAAC,OAAO,CAAA,CAAE,CAAC;AACjE,QAAA,CAAC,CAAC;IACN;AACH;;;;"}
|
|
@@ -37,7 +37,7 @@ class NotFoundHandler {
|
|
|
37
37
|
const dt = {
|
|
38
38
|
appName: xhsc.__sys__?.__name__ ||
|
|
39
39
|
xhsc.__sys__?.vars.__name__ ||
|
|
40
|
-
"
|
|
40
|
+
"my-xypriss-app",
|
|
41
41
|
contactEmail: d.contactEmail,
|
|
42
42
|
customCSS: d.customCSS || "",
|
|
43
43
|
faviconUrl: d.faviconUrl || "",
|
|
@@ -47,18 +47,11 @@ class NotFoundHandler {
|
|
|
47
47
|
redirectTo: d.redirectTo || "",
|
|
48
48
|
requestedMethod: req.method,
|
|
49
49
|
requestedPath: req.url,
|
|
50
|
-
|
|
50
|
+
mode: d.mode || "system",
|
|
51
51
|
title: d.title || "404 Not Found",
|
|
52
52
|
};
|
|
53
53
|
const html = notFoundTemplate.notFoundTemplate(dt);
|
|
54
|
-
res.
|
|
55
|
-
res.set("Content-Type", "text/html");
|
|
56
|
-
res.set("Content-Length", Buffer.byteLength(html, "utf8").toString());
|
|
57
|
-
// console.log(
|
|
58
|
-
// "content-length: ",
|
|
59
|
-
// Buffer.byteLength(html, "utf8").toString(),
|
|
60
|
-
// );
|
|
61
|
-
res.send(html);
|
|
54
|
+
res.html(html);
|
|
62
55
|
};
|
|
63
56
|
const config = ConfigurationManager.CM.get("notFound") || {};
|
|
64
57
|
this.config = config;
|
|
@@ -76,8 +69,13 @@ class NotFoundHandler {
|
|
|
76
69
|
*/
|
|
77
70
|
function createNotFoundHandler(options) {
|
|
78
71
|
const cfg = ConfigurationManager.CM.get("notFound");
|
|
79
|
-
|
|
80
|
-
|
|
72
|
+
const rc = ConfigurationManager.CM.get("responseControl");
|
|
73
|
+
const isNotFoundEnabled = cfg?.enabled !== false;
|
|
74
|
+
if (!isNotFoundEnabled) {
|
|
75
|
+
if (!rc?.enabled) {
|
|
76
|
+
throw new Error("The 'notFound' handler cannot be disabled unless 'responseControl.enabled' is set to true in your configuration.");
|
|
77
|
+
}
|
|
78
|
+
return null;
|
|
81
79
|
}
|
|
82
80
|
return new NotFoundHandler();
|
|
83
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["validate404Cfg","__sys__","notFoundTemplate","Configs"],"mappings":";;;;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACAA,6BAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACFC,YAAe,EAAE,QAAQ;oBAC1BA,YAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,
|
|
1
|
+
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["validate404Cfg","__sys__","notFoundTemplate","Configs"],"mappings":";;;;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACAA,6BAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACFC,YAAe,EAAE,QAAQ;oBAC1BA,YAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,gBAAgB;gBACpB,YAAY,EAAE,CAAC,CAAC,YAAY;AAC5B,gBAAA,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;AAC5B,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,OAAO,EAAE,CAAC,CAAC,OAAc;AACzB,gBAAA,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;gBAClC,cAAc,EAAE,CAAC,CAAC,cAAc;AAChC,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,aAAa,EAAE,GAAG,CAAC,GAAG;AACtB,gBAAA,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ;AACxB,gBAAA,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,eAAe;aACpC;AAED,YAAA,MAAM,IAAI,GAAGC,iCAAgB,CAAC,EAAE,CAAC;AAEjC,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;AAClB,QAAA,CAAC;QAhDG,MAAM,MAAM,GAAGC,uBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE;AAE5C,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AA+CA;;AAEG;AACI,IAAA,YAAY,CAAC,SAAkC,EAAA;;AAElD,QAAAA,uBAAO,CAAC,MAAM,CACV,UAAU,EACV,SAAS,CACZ;IACL;AACH;AAED;;AAEG;AACG,SAAU,qBAAqB,CAAC,OAAsB,EAAA;IACxD,MAAM,GAAG,GAAGA,uBAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IACnC,MAAM,EAAE,GAAGA,uBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAEzC,IAAA,MAAM,iBAAiB,GAAG,GAAG,EAAE,OAAO,KAAK,KAAK;IAEhD,IAAI,CAAC,iBAAiB,EAAE;AACpB,QAAA,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE;AACd,YAAA,MAAM,IAAI,KAAK,CACX,kHAAkH,CACrH;QACL;AACA,QAAA,OAAO,IAAI;IACf;IACA,OAAO,IAAI,eAAe,EAAE;AAChC;;;;;"}
|