Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1ea38ed5d2 | |||
| 7209903d02 | |||
| 20eda1ab3e | |||
| 44f2a7f0a9 | |||
| 0195a21f30 | |||
| 4dca747386 | |||
| 7663f502fa | |||
| 104cd417d8 | |||
| 93254d5d3d | |||
| 9a3f121a9c | |||
| bef74eb1aa | |||
| 308d8e4851 | |||
| dc010dc3ae | |||
| 61d5d3b1ad | |||
| dd70790d40 | |||
| 2f8c04edc4 | |||
| 474cc328dd | |||
| 39ff159bf7 | |||
| c7fe7aeb50 | |||
| 2cf362020f | |||
| b62bad3616 | |||
| 3d372863a4 | |||
| 1045dc04fe | |||
| 89ef7597df | |||
| 0804544564 | |||
| 671e72452a | |||
| 647c705b81 | |||
| 40c3202082 | |||
| 3b91ed3d5a | |||
| 133b17f136 | |||
| efa45dfdc9 | |||
| 79b4ea6bd9 | |||
| b483412a2e | |||
| d964515ff9 | |||
| e2c453423e | |||
| c44b7d513a | |||
| 2487f77b8a | |||
| ea80ef005c | |||
| dd45b7fbe7 | |||
| ca73da7b9b | |||
| f6e1951aa2 | |||
| 76fd563e21 | |||
| ee831ea057 | |||
| a65c2ec096 | |||
| 65822278d5 | |||
| aa3955fc67 |
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"json.schemas": [
|
"json.schemas": [
|
||||||
{
|
{
|
||||||
"fileMatch": ["/npmextra.json"],
|
"fileMatch": ["/.smartconfig.json"],
|
||||||
"schema": {
|
"schema": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|||||||
137
changelog.md
137
changelog.md
@@ -1,5 +1,142 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-26 - 11.10.7 - fix(sms)
|
||||||
|
update sms service to use async ProjectInfo initialization
|
||||||
|
|
||||||
|
- Replace direct ProjectInfo construction with the async create() factory in the SMS service startup flow
|
||||||
|
- Bump related dependencies including @push.rocks/projectinfo, @push.rocks/smartdata, @push.rocks/smartmongo, @serve.zone/remoteingress, and @git.zone/tstest
|
||||||
|
|
||||||
|
## 2026-03-26 - 11.10.6 - fix(typescript)
|
||||||
|
tighten TypeScript null safety and error handling across backend and ops UI
|
||||||
|
|
||||||
|
- add explicit unknown error typing and safe message access in logging and handler code
|
||||||
|
- mark deferred-initialized class properties with definite assignment assertions to satisfy stricter TypeScript checks
|
||||||
|
- harden ops web state access and action return types with non-null assertions and explicit Promise state typing
|
||||||
|
- update storage reads to allow missing values and align license file references with the lowercase license filename
|
||||||
|
|
||||||
|
## 2026-03-26 - 11.10.5 - fix(build)
|
||||||
|
rename smart tooling config to .smartconfig.json and update package references
|
||||||
|
|
||||||
|
- Moves the shared tool configuration from npmextra.json to .smartconfig.json.
|
||||||
|
- Updates package.json published files and documentation to reference the new config file.
|
||||||
|
- Refreshes several development and runtime dependency versions alongside the config migration.
|
||||||
|
|
||||||
|
## 2026-03-24 - 11.10.4 - fix(monitoring)
|
||||||
|
handle multiple protocol cache entries per backend in metrics output
|
||||||
|
|
||||||
|
- Group detected protocol cache entries by backend host and port so multiple domain-specific records are preserved.
|
||||||
|
- Emit one backend metrics row per cached domain and avoid dropping unmatched protocol cache entries by tracking seen entries with a composite host:port:domain key.
|
||||||
|
- Use cached protocol values when available while keeping backend-only rows for metrics without protocol cache data.
|
||||||
|
|
||||||
|
## 2026-03-23 - 11.10.3 - fix(deps)
|
||||||
|
bump tstest, smartmetrics, and taskbuffer to latest patch releases
|
||||||
|
|
||||||
|
- update @git.zone/tstest from ^3.5.0 to ^3.5.1
|
||||||
|
- update @push.rocks/smartmetrics from ^3.0.2 to ^3.0.3
|
||||||
|
- update @push.rocks/taskbuffer from ^8.0.0 to ^8.0.2
|
||||||
|
|
||||||
|
## 2026-03-23 - 11.10.2 - fix(deps)
|
||||||
|
bump @api.global/typedserver to ^8.4.6 and @push.rocks/smartproxy to ^26.2.1
|
||||||
|
|
||||||
|
- Updates @api.global/typedserver from ^8.4.2 to ^8.4.6
|
||||||
|
- Updates @push.rocks/smartproxy from ^26.2.0 to ^26.2.1
|
||||||
|
|
||||||
|
## 2026-03-23 - 11.10.1 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^26.2.0
|
||||||
|
|
||||||
|
- Updates the @push.rocks/smartproxy dependency from ^26.1.0 to ^26.2.0 in package.json.
|
||||||
|
|
||||||
|
## 2026-03-23 - 11.10.0 - feat(monitoring)
|
||||||
|
add backend protocol metrics to network stats and ops dashboard
|
||||||
|
|
||||||
|
- Expose backend protocol, connection, error, and suppression metrics in stats responses.
|
||||||
|
- Add typed backend info interfaces and app state support for backend metrics.
|
||||||
|
- Render a new backend protocols table in the ops network view with detail modal and suppression badges.
|
||||||
|
- Update smartproxy and lik dependencies to support backend protocol metrics collection.
|
||||||
|
|
||||||
|
## 2026-03-21 - 11.9.1 - fix(lifecycle)
|
||||||
|
clean up service subscriptions, proxy retries, and stale runtime state on shutdown
|
||||||
|
|
||||||
|
- unsubscribe from ServiceManager event streams and use one-time signal handlers to avoid duplicate shutdown execution
|
||||||
|
- reset existing SmartProxy instances before retry setup and prune expired certificate backoff cache entries
|
||||||
|
- add periodic sweeping and shutdown cleanup for stale RADIUS accounting sessions
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.9.0 - feat(dcrouter)
|
||||||
|
add service manager lifecycle orchestration and health-based ops status reporting
|
||||||
|
|
||||||
|
- register dcrouter components with a taskbuffer ServiceManager using dependencies, retries, and critical/optional service roles
|
||||||
|
- update ops stats health output to reflect aggregated service manager state and per-service error or retry details
|
||||||
|
- add @push.rocks/taskbuffer to shared plugins and project dependencies for service lifecycle management
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.11 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.10
|
||||||
|
|
||||||
|
- Updates the @push.rocks/smartproxy dependency from ^25.17.9 to ^25.17.10 in package.json
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.10 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.9
|
||||||
|
|
||||||
|
- Updates @push.rocks/smartproxy from ^25.17.8 to ^25.17.9 in package.json
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.9 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.8
|
||||||
|
|
||||||
|
- Updates the @push.rocks/smartproxy dependency from ^25.17.7 to ^25.17.8.
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.8 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.7
|
||||||
|
|
||||||
|
- Updates the @push.rocks/smartproxy dependency from ^25.17.4 to ^25.17.7 in package.json.
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.7 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.4
|
||||||
|
|
||||||
|
- updates @push.rocks/smartproxy from ^25.17.3 to ^25.17.4 in package.json
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.6 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.3
|
||||||
|
|
||||||
|
- updates @push.rocks/smartproxy from ^25.17.1 to ^25.17.3 in package.json
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.5 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.17.1
|
||||||
|
|
||||||
|
- Updates the @push.rocks/smartproxy dependency from ^25.17.0 to ^25.17.1.
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.4 - fix(deps)
|
||||||
|
bump @serve.zone/remoteingress to ^4.14.0
|
||||||
|
|
||||||
|
- Updates the @serve.zone/remoteingress dependency from ^4.13.2 to ^4.14.0 in package.json.
|
||||||
|
|
||||||
|
## 2026-03-20 - 11.8.3 - fix(deps)
|
||||||
|
bump @serve.zone/remoteingress to ^4.13.2
|
||||||
|
|
||||||
|
- Updates the @serve.zone/remoteingress dependency from ^4.13.1 to ^4.13.2.
|
||||||
|
|
||||||
|
## 2026-03-19 - 11.8.2 - fix(deps)
|
||||||
|
bump smartproxy and remoteingress dependencies
|
||||||
|
|
||||||
|
- updates @push.rocks/smartproxy from ^25.16.3 to ^25.17.0
|
||||||
|
- updates @serve.zone/remoteingress from ^4.13.0 to ^4.13.1
|
||||||
|
|
||||||
|
## 2026-03-19 - 11.8.1 - fix(dcrouter)
|
||||||
|
use constructor routes for remote ingress setup and bump smartproxy dependency
|
||||||
|
|
||||||
|
- Switch remote ingress initialization to use constructorRoutes instead of smartProxyConfig routes so derived edge ports are based on the active route set.
|
||||||
|
- Update @push.rocks/smartproxy from ^25.16.2 to ^25.16.3.
|
||||||
|
|
||||||
|
## 2026-03-19 - 11.8.0 - feat(remoteingress)
|
||||||
|
add UDP listen port derivation and edge configuration support
|
||||||
|
|
||||||
|
- derive UDP ports from remote ingress routes using transport 'udp' or 'all'
|
||||||
|
- expose effective UDP listen ports in allowed edge payloads and remote ingress interfaces
|
||||||
|
- update @push.rocks/smartproxy to ^25.16.2
|
||||||
|
|
||||||
|
## 2026-03-19 - 11.7.1 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.16.0
|
||||||
|
|
||||||
|
- updates the smartproxy dependency from ^25.15.0 to ^25.16.0
|
||||||
|
|
||||||
## 2026-03-19 - 11.7.0 - feat(readme)
|
## 2026-03-19 - 11.7.0 - feat(readme)
|
||||||
document HTTP/3 QUIC support and configuration options
|
document HTTP/3 QUIC support and configuration options
|
||||||
|
|
||||||
|
|||||||
21
license
Normal file
21
license
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2024 Task Venture Capital GmbH
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
37
package.json
37
package.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/dcrouter",
|
"name": "@serve.zone/dcrouter",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "11.7.0",
|
"version": "11.10.7",
|
||||||
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"exports": {
|
"exports": {
|
||||||
@@ -22,47 +22,48 @@
|
|||||||
"watch": "tswatch"
|
"watch": "tswatch"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbuild": "^4.3.0",
|
"@git.zone/tsbuild": "^4.4.0",
|
||||||
"@git.zone/tsbundle": "^2.9.1",
|
"@git.zone/tsbundle": "^2.10.0",
|
||||||
"@git.zone/tsrun": "^2.0.1",
|
"@git.zone/tsrun": "^2.0.2",
|
||||||
"@git.zone/tstest": "^3.5.0",
|
"@git.zone/tstest": "^3.6.1",
|
||||||
"@git.zone/tswatch": "^3.3.0",
|
"@git.zone/tswatch": "^3.3.2",
|
||||||
"@types/node": "^25.5.0"
|
"@types/node": "^25.5.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@api.global/typedrequest": "^3.3.0",
|
"@api.global/typedrequest": "^3.3.0",
|
||||||
"@api.global/typedrequest-interfaces": "^3.0.19",
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
||||||
"@api.global/typedserver": "^8.4.2",
|
"@api.global/typedserver": "^8.4.6",
|
||||||
"@api.global/typedsocket": "^4.1.2",
|
"@api.global/typedsocket": "^4.1.2",
|
||||||
"@apiclient.xyz/cloudflare": "^7.1.0",
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
||||||
"@design.estate/dees-catalog": "^3.48.5",
|
"@design.estate/dees-catalog": "^3.49.0",
|
||||||
"@design.estate/dees-element": "^2.2.3",
|
"@design.estate/dees-element": "^2.2.3",
|
||||||
"@push.rocks/lik": "^6.3.1",
|
"@push.rocks/lik": "^6.4.0",
|
||||||
"@push.rocks/projectinfo": "^5.0.2",
|
"@push.rocks/projectinfo": "^5.1.0",
|
||||||
"@push.rocks/qenv": "^6.1.3",
|
"@push.rocks/qenv": "^6.1.3",
|
||||||
"@push.rocks/smartacme": "^9.3.0",
|
"@push.rocks/smartacme": "^9.3.0",
|
||||||
"@push.rocks/smartdata": "^7.1.0",
|
"@push.rocks/smartdata": "^7.1.3",
|
||||||
"@push.rocks/smartdns": "^7.9.0",
|
"@push.rocks/smartdns": "^7.9.0",
|
||||||
"@push.rocks/smartfile": "^13.1.2",
|
"@push.rocks/smartfile": "^13.1.2",
|
||||||
"@push.rocks/smartguard": "^3.1.0",
|
"@push.rocks/smartguard": "^3.1.0",
|
||||||
"@push.rocks/smartjwt": "^2.2.1",
|
"@push.rocks/smartjwt": "^2.2.1",
|
||||||
"@push.rocks/smartlog": "^3.2.1",
|
"@push.rocks/smartlog": "^3.2.1",
|
||||||
"@push.rocks/smartmetrics": "^3.0.2",
|
"@push.rocks/smartmetrics": "^3.0.3",
|
||||||
"@push.rocks/smartmongo": "^5.1.0",
|
"@push.rocks/smartmongo": "^5.1.1",
|
||||||
"@push.rocks/smartmta": "^5.3.1",
|
"@push.rocks/smartmta": "^5.3.1",
|
||||||
"@push.rocks/smartnetwork": "^4.4.0",
|
"@push.rocks/smartnetwork": "^4.4.0",
|
||||||
"@push.rocks/smartpath": "^6.0.0",
|
"@push.rocks/smartpath": "^6.0.0",
|
||||||
"@push.rocks/smartpromise": "^4.2.3",
|
"@push.rocks/smartpromise": "^4.2.3",
|
||||||
"@push.rocks/smartproxy": "^25.15.0",
|
"@push.rocks/smartproxy": "^26.2.4",
|
||||||
"@push.rocks/smartradius": "^1.1.1",
|
"@push.rocks/smartradius": "^1.1.1",
|
||||||
"@push.rocks/smartrequest": "^5.0.1",
|
"@push.rocks/smartrequest": "^5.0.1",
|
||||||
"@push.rocks/smartrx": "^3.0.10",
|
"@push.rocks/smartrx": "^3.0.10",
|
||||||
"@push.rocks/smartstate": "^2.2.0",
|
"@push.rocks/smartstate": "^2.2.1",
|
||||||
"@push.rocks/smartunique": "^3.0.9",
|
"@push.rocks/smartunique": "^3.0.9",
|
||||||
|
"@push.rocks/taskbuffer": "^8.0.2",
|
||||||
"@serve.zone/catalog": "^2.9.0",
|
"@serve.zone/catalog": "^2.9.0",
|
||||||
"@serve.zone/interfaces": "^5.3.0",
|
"@serve.zone/interfaces": "^5.3.0",
|
||||||
"@serve.zone/remoteingress": "^4.13.0",
|
"@serve.zone/remoteingress": "^4.14.3",
|
||||||
"@tsclass/tsclass": "^9.4.0",
|
"@tsclass/tsclass": "^9.5.0",
|
||||||
"lru-cache": "^11.2.7",
|
"lru-cache": "^11.2.7",
|
||||||
"uuid": "^13.0.0"
|
"uuid": "^13.0.0"
|
||||||
},
|
},
|
||||||
@@ -111,7 +112,7 @@
|
|||||||
"dist_ts_apiclient/**/*",
|
"dist_ts_apiclient/**/*",
|
||||||
"assets/**/*",
|
"assets/**/*",
|
||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
".smartconfig.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
1462
pnpm-lock.yaml
generated
1462
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -133,7 +133,7 @@ The project now uses tswatch for development:
|
|||||||
```bash
|
```bash
|
||||||
pnpm run watch
|
pnpm run watch
|
||||||
```
|
```
|
||||||
Configuration in `npmextra.json`:
|
Configuration in `.smartconfig.json`:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"@git.zone/tswatch": {
|
"@git.zone/tswatch": {
|
||||||
|
|||||||
@@ -1449,7 +1449,7 @@ The Docker build supports multi-platform (`linux/amd64`, `linux/arm64`) via [tsd
|
|||||||
|
|
||||||
## License and Legal Information
|
## License and Legal Information
|
||||||
|
|
||||||
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file.
|
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file.
|
||||||
|
|
||||||
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/dcrouter',
|
name: '@serve.zone/dcrouter',
|
||||||
version: '11.7.0',
|
version: '11.10.7',
|
||||||
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
||||||
}
|
}
|
||||||
|
|||||||
20
ts/cache/classes.cache.cleaner.ts
vendored
20
ts/cache/classes.cache.cleaner.ts
vendored
@@ -48,14 +48,14 @@ export class CacheCleaner {
|
|||||||
this.isRunning = true;
|
this.isRunning = true;
|
||||||
|
|
||||||
// Run cleanup immediately on start
|
// Run cleanup immediately on start
|
||||||
this.runCleanup().catch((error) => {
|
this.runCleanup().catch((error: unknown) => {
|
||||||
logger.log('error', `Initial cache cleanup failed: ${error.message}`);
|
logger.log('error', `Initial cache cleanup failed: ${(error as Error).message}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Schedule periodic cleanup
|
// Schedule periodic cleanup
|
||||||
this.cleanupInterval = setInterval(() => {
|
this.cleanupInterval = setInterval(() => {
|
||||||
this.runCleanup().catch((error) => {
|
this.runCleanup().catch((error: unknown) => {
|
||||||
logger.log('error', `Cache cleanup failed: ${error.message}`);
|
logger.log('error', `Cache cleanup failed: ${(error as Error).message}`);
|
||||||
});
|
});
|
||||||
}, this.options.intervalMs);
|
}, this.options.intervalMs);
|
||||||
|
|
||||||
@@ -113,8 +113,8 @@ export class CacheCleaner {
|
|||||||
`Cache cleanup completed. Deleted ${totalDeleted} expired documents. ${summary || 'No deletions.'}`
|
`Cache cleanup completed. Deleted ${totalDeleted} expired documents. ${summary || 'No deletions.'}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Cache cleanup error: ${error.message}`);
|
logger.log('error', `Cache cleanup error: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -138,14 +138,14 @@ export class CacheCleaner {
|
|||||||
try {
|
try {
|
||||||
await doc.delete();
|
await doc.delete();
|
||||||
deletedCount++;
|
deletedCount++;
|
||||||
} catch (deleteError) {
|
} catch (deleteError: unknown) {
|
||||||
logger.log('warn', `Failed to delete expired document: ${deleteError.message}`);
|
logger.log('warn', `Failed to delete expired document: ${(deleteError as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return deletedCount;
|
return deletedCount;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error cleaning collection: ${error.message}`);
|
logger.log('error', `Error cleaning collection: ${(error as Error).message}`);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
ts/cache/classes.cached.document.ts
vendored
2
ts/cache/classes.cached.document.ts
vendored
@@ -22,7 +22,7 @@ export abstract class CachedDocument<T extends CachedDocument<T>> extends plugin
|
|||||||
* Timestamp when the document expires and should be cleaned up
|
* Timestamp when the document expires and should be cleaned up
|
||||||
* NOTE: Subclasses must add @svDb() decorator
|
* NOTE: Subclasses must add @svDb() decorator
|
||||||
*/
|
*/
|
||||||
public expiresAt: Date;
|
public expiresAt!: Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Timestamp of last access (for LRU-style eviction if needed)
|
* Timestamp of last access (for LRU-style eviction if needed)
|
||||||
|
|||||||
12
ts/cache/classes.cachedb.ts
vendored
12
ts/cache/classes.cachedb.ts
vendored
@@ -23,8 +23,8 @@ export interface ICacheDbOptions {
|
|||||||
export class CacheDb {
|
export class CacheDb {
|
||||||
private static instance: CacheDb | null = null;
|
private static instance: CacheDb | null = null;
|
||||||
|
|
||||||
private localTsmDb: plugins.smartmongo.LocalTsmDb;
|
private localTsmDb!: plugins.smartmongo.LocalTsmDb;
|
||||||
private smartdataDb: plugins.smartdata.SmartdataDb;
|
private smartdataDb!: plugins.smartdata.SmartdataDb;
|
||||||
private options: Required<ICacheDbOptions>;
|
private options: Required<ICacheDbOptions>;
|
||||||
private isStarted: boolean = false;
|
private isStarted: boolean = false;
|
||||||
|
|
||||||
@@ -89,8 +89,8 @@ export class CacheDb {
|
|||||||
|
|
||||||
this.isStarted = true;
|
this.isStarted = true;
|
||||||
logger.log('info', `CacheDb started at ${this.options.storagePath}`);
|
logger.log('info', `CacheDb started at ${this.options.storagePath}`);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to start CacheDb: ${error.message}`);
|
logger.log('error', `Failed to start CacheDb: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -116,8 +116,8 @@ export class CacheDb {
|
|||||||
|
|
||||||
this.isStarted = false;
|
this.isStarted = false;
|
||||||
logger.log('info', 'CacheDb stopped');
|
logger.log('info', 'CacheDb stopped');
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error stopping CacheDb: ${error.message}`);
|
logger.log('error', `Error stopping CacheDb: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
28
ts/cache/documents/classes.cached.email.ts
vendored
28
ts/cache/documents/classes.cached.email.ts
vendored
@@ -35,55 +35,55 @@ export class CachedEmail extends CachedDocument<CachedEmail> {
|
|||||||
*/
|
*/
|
||||||
@plugins.smartdata.unI()
|
@plugins.smartdata.unI()
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public id: string;
|
public id!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Email message ID (RFC 822 Message-ID header)
|
* Email message ID (RFC 822 Message-ID header)
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public messageId: string;
|
public messageId!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sender email address (envelope from)
|
* Sender email address (envelope from)
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public from: string;
|
public from!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recipient email addresses
|
* Recipient email addresses
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public to: string[];
|
public to!: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CC recipients
|
* CC recipients
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public cc: string[];
|
public cc!: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BCC recipients
|
* BCC recipients
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public bcc: string[];
|
public bcc!: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Email subject
|
* Email subject
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public subject: string;
|
public subject!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Raw RFC822 email content
|
* Raw RFC822 email content
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public rawContent: string;
|
public rawContent!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current status of the email
|
* Current status of the email
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public status: TCachedEmailStatus;
|
public status!: TCachedEmailStatus;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of delivery attempts
|
* Number of delivery attempts
|
||||||
@@ -101,25 +101,25 @@ export class CachedEmail extends CachedDocument<CachedEmail> {
|
|||||||
* Timestamp for next delivery attempt
|
* Timestamp for next delivery attempt
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public nextAttempt: Date;
|
public nextAttempt!: Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Last error message if delivery failed
|
* Last error message if delivery failed
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public lastError: string;
|
public lastError!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Timestamp when the email was successfully delivered
|
* Timestamp when the email was successfully delivered
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public deliveredAt: Date;
|
public deliveredAt!: Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sender domain (for querying/filtering)
|
* Sender domain (for querying/filtering)
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public senderDomain: string;
|
public senderDomain!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Priority level (higher = more important)
|
* Priority level (higher = more important)
|
||||||
@@ -131,7 +131,7 @@ export class CachedEmail extends CachedDocument<CachedEmail> {
|
|||||||
* JSON-serialized route data
|
* JSON-serialized route data
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public routeData: string;
|
public routeData!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DKIM signature status
|
* DKIM signature status
|
||||||
|
|||||||
@@ -45,61 +45,61 @@ export class CachedIPReputation extends CachedDocument<CachedIPReputation> {
|
|||||||
*/
|
*/
|
||||||
@plugins.smartdata.unI()
|
@plugins.smartdata.unI()
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public ipAddress: string;
|
public ipAddress!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reputation score (0-100, higher = better)
|
* Reputation score (0-100, higher = better)
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public score: number;
|
public score!: number;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the IP is flagged as spam source
|
* Whether the IP is flagged as spam source
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public isSpam: boolean;
|
public isSpam!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the IP is a known proxy
|
* Whether the IP is a known proxy
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public isProxy: boolean;
|
public isProxy!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the IP is a Tor exit node
|
* Whether the IP is a Tor exit node
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public isTor: boolean;
|
public isTor!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the IP is a VPN endpoint
|
* Whether the IP is a VPN endpoint
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public isVPN: boolean;
|
public isVPN!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Country code (ISO 3166-1 alpha-2)
|
* Country code (ISO 3166-1 alpha-2)
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public country: string;
|
public country!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Autonomous System Number
|
* Autonomous System Number
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public asn: string;
|
public asn!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Organization name
|
* Organization name
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public org: string;
|
public org!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of blacklists the IP appears on
|
* List of blacklists the IP appears on
|
||||||
*/
|
*/
|
||||||
@plugins.smartdata.svDb()
|
@plugins.smartdata.svDb()
|
||||||
public blacklists: string[];
|
public blacklists!: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of times this IP has been checked
|
* Number of times this IP has been checked
|
||||||
|
|||||||
@@ -61,14 +61,21 @@ export class CertProvisionScheduler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a domain is currently in backoff
|
* Check if a domain is currently in backoff.
|
||||||
|
* Expired entries are pruned from the cache to prevent unbounded growth.
|
||||||
*/
|
*/
|
||||||
async isInBackoff(domain: string): Promise<boolean> {
|
async isInBackoff(domain: string): Promise<boolean> {
|
||||||
const entry = await this.loadBackoff(domain);
|
const entry = await this.loadBackoff(domain);
|
||||||
if (!entry) return false;
|
if (!entry) return false;
|
||||||
|
|
||||||
const retryAfter = new Date(entry.retryAfter);
|
const retryAfter = new Date(entry.retryAfter);
|
||||||
return retryAfter.getTime() > Date.now();
|
if (retryAfter.getTime() > Date.now()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Backoff has expired — prune the stale entry
|
||||||
|
this.backoffCache.delete(domain);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -124,9 +131,12 @@ export class CertProvisionScheduler {
|
|||||||
const entry = await this.loadBackoff(domain);
|
const entry = await this.loadBackoff(domain);
|
||||||
if (!entry) return null;
|
if (!entry) return null;
|
||||||
|
|
||||||
// Only return if still in backoff
|
// Only return if still in backoff — prune expired entries
|
||||||
const retryAfter = new Date(entry.retryAfter);
|
const retryAfter = new Date(entry.retryAfter);
|
||||||
if (retryAfter.getTime() <= Date.now()) return null;
|
if (retryAfter.getTime() <= Date.now()) {
|
||||||
|
this.backoffCache.delete(domain);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
failures: entry.failures,
|
failures: entry.failures,
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ export class DcRouter {
|
|||||||
public emailServer?: UnifiedEmailServer;
|
public emailServer?: UnifiedEmailServer;
|
||||||
public radiusServer?: RadiusServer;
|
public radiusServer?: RadiusServer;
|
||||||
public storageManager: StorageManager;
|
public storageManager: StorageManager;
|
||||||
public opsServer: OpsServer;
|
public opsServer!: OpsServer;
|
||||||
public metricsManager?: MetricsManager;
|
public metricsManager?: MetricsManager;
|
||||||
|
|
||||||
// Cache system (smartdata + LocalTsmDb)
|
// Cache system (smartdata + LocalTsmDb)
|
||||||
@@ -252,6 +252,11 @@ export class DcRouter {
|
|||||||
// Certificate provisioning scheduler with per-domain backoff
|
// Certificate provisioning scheduler with per-domain backoff
|
||||||
public certProvisionScheduler?: CertProvisionScheduler;
|
public certProvisionScheduler?: CertProvisionScheduler;
|
||||||
|
|
||||||
|
// Service lifecycle management
|
||||||
|
public serviceManager: plugins.taskbuffer.ServiceManager;
|
||||||
|
private serviceSubjectSubscription?: plugins.smartrx.rxjs.Subscription;
|
||||||
|
public smartAcmeReady = false;
|
||||||
|
|
||||||
// TypedRouter for API endpoints
|
// TypedRouter for API endpoints
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
|
|
||||||
@@ -279,67 +284,253 @@ export class DcRouter {
|
|||||||
|
|
||||||
// Initialize storage manager
|
// Initialize storage manager
|
||||||
this.storageManager = new StorageManager(this.options.storage);
|
this.storageManager = new StorageManager(this.options.storage);
|
||||||
|
|
||||||
|
// Initialize service manager and register all services
|
||||||
|
this.serviceManager = new plugins.taskbuffer.ServiceManager({
|
||||||
|
name: 'dcrouter',
|
||||||
|
startupTimeoutMs: 120_000,
|
||||||
|
shutdownTimeoutMs: 30_000,
|
||||||
|
});
|
||||||
|
this.registerServices();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register all dcrouter services with the ServiceManager.
|
||||||
|
* Services are started in dependency order, with failure isolation for optional services.
|
||||||
|
*/
|
||||||
|
private registerServices(): void {
|
||||||
|
// OpsServer: critical, no dependencies — provides visibility
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('OpsServer')
|
||||||
|
.critical()
|
||||||
|
.withStart(async () => {
|
||||||
|
this.opsServer = new OpsServer(this);
|
||||||
|
await this.opsServer.start();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
await this.opsServer?.stop();
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 0 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
// CacheDb: optional, no dependencies
|
||||||
|
if (this.options.cacheConfig?.enabled !== false) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('CacheDb')
|
||||||
|
.optional()
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupCacheDb();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.cacheCleaner) {
|
||||||
|
this.cacheCleaner.stop();
|
||||||
|
this.cacheCleaner = undefined;
|
||||||
|
}
|
||||||
|
if (this.cacheDb) {
|
||||||
|
await this.cacheDb.stop();
|
||||||
|
CacheDb.resetInstance();
|
||||||
|
this.cacheDb = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 2, baseDelayMs: 1000, maxDelayMs: 5000 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MetricsManager: optional, depends on OpsServer
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('MetricsManager')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('OpsServer')
|
||||||
|
.withStart(async () => {
|
||||||
|
this.metricsManager = new MetricsManager(this);
|
||||||
|
await this.metricsManager.start();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.metricsManager) {
|
||||||
|
await this.metricsManager.stop();
|
||||||
|
this.metricsManager = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 1, baseDelayMs: 1000 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
// SmartProxy: critical, depends on CacheDb (if enabled)
|
||||||
|
const smartProxyDeps: string[] = [];
|
||||||
|
if (this.options.cacheConfig?.enabled !== false) {
|
||||||
|
smartProxyDeps.push('CacheDb');
|
||||||
|
}
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('SmartProxy')
|
||||||
|
.critical()
|
||||||
|
.dependsOn(...smartProxyDeps)
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupSmartProxy();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.smartProxy) {
|
||||||
|
this.smartProxy.removeAllListeners();
|
||||||
|
await this.smartProxy.stop();
|
||||||
|
this.smartProxy = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 0 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
// SmartAcme: optional, depends on SmartProxy — aggressive retry for rate limits
|
||||||
|
// Only registered if DNS challenge is configured
|
||||||
|
if (this.options.dnsChallenge?.cloudflareApiKey) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('SmartAcme')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('SmartProxy')
|
||||||
|
.withStart(async () => {
|
||||||
|
if (this.smartAcme) {
|
||||||
|
await this.smartAcme.start();
|
||||||
|
this.smartAcmeReady = true;
|
||||||
|
logger.log('info', 'SmartAcme DNS-01 provider is now ready');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
this.smartAcmeReady = false;
|
||||||
|
if (this.smartAcme) {
|
||||||
|
await this.smartAcme.stop();
|
||||||
|
this.smartAcme = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 20, baseDelayMs: 5000, maxDelayMs: 3_600_000, backoffFactor: 2 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConfigManagers: optional, depends on SmartProxy
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('ConfigManagers')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('SmartProxy')
|
||||||
|
.withStart(async () => {
|
||||||
|
this.routeConfigManager = new RouteConfigManager(
|
||||||
|
this.storageManager,
|
||||||
|
() => this.getConstructorRoutes(),
|
||||||
|
() => this.smartProxy,
|
||||||
|
() => this.options.http3,
|
||||||
|
);
|
||||||
|
this.apiTokenManager = new ApiTokenManager(this.storageManager);
|
||||||
|
await this.apiTokenManager.initialize();
|
||||||
|
await this.routeConfigManager.initialize();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
this.routeConfigManager = undefined;
|
||||||
|
this.apiTokenManager = undefined;
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 2, baseDelayMs: 1000 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Email Server: optional, depends on SmartProxy
|
||||||
|
if (this.options.emailConfig) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('EmailServer')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('SmartProxy')
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupUnifiedEmailHandling();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.emailServer) {
|
||||||
|
if ((this.emailServer as any).deliverySystem) {
|
||||||
|
(this.emailServer as any).deliverySystem.removeAllListeners();
|
||||||
|
}
|
||||||
|
this.emailServer.removeAllListeners();
|
||||||
|
await this.emailServer.stop();
|
||||||
|
this.emailServer = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 3, baseDelayMs: 2000, maxDelayMs: 30_000 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// DNS Server: optional, depends on SmartProxy
|
||||||
|
if (this.options.dnsNsDomains && this.options.dnsNsDomains.length > 0 && this.options.dnsScopes && this.options.dnsScopes.length > 0) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('DnsServer')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('SmartProxy')
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupDnsWithSocketHandler();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
// Flush pending DNS batch log
|
||||||
|
if (this.dnsBatchTimer) {
|
||||||
|
clearTimeout(this.dnsBatchTimer);
|
||||||
|
if (this.dnsBatchCount > 0) {
|
||||||
|
logger.log('info', `DNS: ${this.dnsBatchCount} queries processed (final flush)`, { zone: 'dns' });
|
||||||
|
}
|
||||||
|
this.dnsBatchTimer = null;
|
||||||
|
this.dnsBatchCount = 0;
|
||||||
|
this.dnsLogWindowSecond = 0;
|
||||||
|
this.dnsLogWindowCount = 0;
|
||||||
|
}
|
||||||
|
if (this.dnsServer) {
|
||||||
|
this.dnsServer.removeAllListeners();
|
||||||
|
await this.dnsServer.stop();
|
||||||
|
this.dnsServer = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 3, baseDelayMs: 2000, maxDelayMs: 30_000 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// RADIUS Server: optional, no dependency on SmartProxy
|
||||||
|
if (this.options.radiusConfig) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('RadiusServer')
|
||||||
|
.optional()
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupRadiusServer();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.radiusServer) {
|
||||||
|
await this.radiusServer.stop();
|
||||||
|
this.radiusServer = undefined;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 3, baseDelayMs: 2000, maxDelayMs: 30_000 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remote Ingress: optional, depends on SmartProxy
|
||||||
|
if (this.options.remoteIngressConfig?.enabled) {
|
||||||
|
this.serviceManager.addService(
|
||||||
|
new plugins.taskbuffer.Service('RemoteIngress')
|
||||||
|
.optional()
|
||||||
|
.dependsOn('SmartProxy')
|
||||||
|
.withStart(async () => {
|
||||||
|
await this.setupRemoteIngress();
|
||||||
|
})
|
||||||
|
.withStop(async () => {
|
||||||
|
if (this.tunnelManager) {
|
||||||
|
await this.tunnelManager.stop();
|
||||||
|
this.tunnelManager = undefined;
|
||||||
|
}
|
||||||
|
this.remoteIngressManager = undefined;
|
||||||
|
})
|
||||||
|
.withRetry({ maxRetries: 3, baseDelayMs: 2000, maxDelayMs: 30_000 }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wire up aggregated events for logging
|
||||||
|
this.serviceSubjectSubscription = this.serviceManager.serviceSubject.subscribe((event) => {
|
||||||
|
const level = event.type === 'failed' ? 'error' : event.type === 'retrying' ? 'warn' : 'info';
|
||||||
|
logger.log(level as any, `Service '${event.serviceName}': ${event.type}`, {
|
||||||
|
state: event.state,
|
||||||
|
...(event.error ? { error: event.error } : {}),
|
||||||
|
...(event.attempt ? { attempt: event.attempt } : {}),
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public async start() {
|
public async start() {
|
||||||
logger.log('info', 'Starting DcRouter Services');
|
logger.log('info', 'Starting DcRouter Services');
|
||||||
|
await this.serviceManager.start();
|
||||||
|
this.logStartupSummary();
|
||||||
this.opsServer = new OpsServer(this);
|
|
||||||
await this.opsServer.start();
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Initialize cache database if enabled (default: enabled)
|
|
||||||
if (this.options.cacheConfig?.enabled !== false) {
|
|
||||||
await this.setupCacheDb();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize MetricsManager
|
|
||||||
this.metricsManager = new MetricsManager(this);
|
|
||||||
await this.metricsManager.start();
|
|
||||||
|
|
||||||
// Set up SmartProxy for HTTP/HTTPS and all traffic including email routes
|
|
||||||
await this.setupSmartProxy();
|
|
||||||
|
|
||||||
// Initialize programmatic config API managers
|
|
||||||
this.routeConfigManager = new RouteConfigManager(
|
|
||||||
this.storageManager,
|
|
||||||
() => this.getConstructorRoutes(),
|
|
||||||
() => this.smartProxy,
|
|
||||||
() => this.options.http3,
|
|
||||||
);
|
|
||||||
this.apiTokenManager = new ApiTokenManager(this.storageManager);
|
|
||||||
await this.apiTokenManager.initialize();
|
|
||||||
await this.routeConfigManager.initialize();
|
|
||||||
|
|
||||||
// Set up unified email handling if configured
|
|
||||||
if (this.options.emailConfig) {
|
|
||||||
await this.setupUnifiedEmailHandling();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up DNS server if configured with nameservers and scopes
|
|
||||||
if (this.options.dnsNsDomains && this.options.dnsNsDomains.length > 0 &&
|
|
||||||
this.options.dnsScopes && this.options.dnsScopes.length > 0) {
|
|
||||||
await this.setupDnsWithSocketHandler();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up RADIUS server if configured
|
|
||||||
if (this.options.radiusConfig) {
|
|
||||||
await this.setupRadiusServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up Remote Ingress hub if configured
|
|
||||||
if (this.options.remoteIngressConfig?.enabled) {
|
|
||||||
await this.setupRemoteIngress();
|
|
||||||
}
|
|
||||||
|
|
||||||
this.logStartupSummary();
|
|
||||||
} catch (error) {
|
|
||||||
logger.log('error', 'Error starting DcRouter', { error: String(error) });
|
|
||||||
// Try to clean up any services that may have started
|
|
||||||
await this.stop();
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -399,7 +590,21 @@ export class DcRouter {
|
|||||||
logger.log('info', `Cache Database: storage=${this.cacheDb.getStoragePath()}, db=${this.cacheDb.getDbName()}, cleaner=${this.cacheCleaner?.isActive() ? 'active' : 'inactive'} (${(this.options.cacheConfig?.cleanupIntervalHours || 1)}h interval)`);
|
logger.log('info', `Cache Database: storage=${this.cacheDb.getStoragePath()}, db=${this.cacheDb.getDbName()}, cleaner=${this.cacheCleaner?.isActive() ? 'active' : 'inactive'} (${(this.options.cacheConfig?.cleanupIntervalHours || 1)}h interval)`);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.log('info', 'All services are running');
|
// Service status summary from ServiceManager
|
||||||
|
const health = this.serviceManager.getHealth();
|
||||||
|
const statuses = health.services;
|
||||||
|
const running = statuses.filter(s => s.state === 'running').length;
|
||||||
|
const failed = statuses.filter(s => s.state === 'failed').length;
|
||||||
|
const retrying = statuses.filter(s => s.state === 'starting' || s.state === 'degraded').length;
|
||||||
|
|
||||||
|
if (failed > 0) {
|
||||||
|
const failedNames = statuses.filter(s => s.state === 'failed').map(s => `${s.name}: ${s.lastError || 'unknown'}`);
|
||||||
|
logger.log('warn', `DcRouter started in degraded mode — ${running} running, ${failed} failed: ${failedNames.join('; ')}`);
|
||||||
|
} else if (retrying > 0) {
|
||||||
|
logger.log('info', `DcRouter started — ${running} running, ${retrying} still initializing`);
|
||||||
|
} else {
|
||||||
|
logger.log('info', `All ${running} services are running`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -435,6 +640,13 @@ export class DcRouter {
|
|||||||
*/
|
*/
|
||||||
private async setupSmartProxy(): Promise<void> {
|
private async setupSmartProxy(): Promise<void> {
|
||||||
logger.log('info', 'Setting up SmartProxy...');
|
logger.log('info', 'Setting up SmartProxy...');
|
||||||
|
|
||||||
|
// Clean up any existing SmartProxy instance (e.g. from a retry)
|
||||||
|
if (this.smartProxy) {
|
||||||
|
this.smartProxy.removeAllListeners();
|
||||||
|
this.smartProxy = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
let routes: plugins.smartproxy.IRouteConfig[] = [];
|
let routes: plugins.smartproxy.IRouteConfig[] = [];
|
||||||
let acmeConfig: plugins.smartproxy.IAcmeOptions | undefined;
|
let acmeConfig: plugins.smartproxy.IAcmeOptions | undefined;
|
||||||
|
|
||||||
@@ -535,10 +747,13 @@ export class DcRouter {
|
|||||||
// Initialize cert provision scheduler
|
// Initialize cert provision scheduler
|
||||||
this.certProvisionScheduler = new CertProvisionScheduler(this.storageManager);
|
this.certProvisionScheduler = new CertProvisionScheduler(this.storageManager);
|
||||||
|
|
||||||
// If we have DNS challenge handlers, create SmartAcme and wire to certProvisionFunction
|
// If we have DNS challenge handlers, create SmartAcme instance and wire certProvisionFunction
|
||||||
|
// Note: SmartAcme.start() is NOT called here — it runs as a separate optional service
|
||||||
|
// via the ServiceManager, with aggressive retry for rate-limit resilience.
|
||||||
if (challengeHandlers.length > 0) {
|
if (challengeHandlers.length > 0) {
|
||||||
// Stop old SmartAcme if it exists (e.g., during updateSmartProxyConfig)
|
// Stop old SmartAcme if it exists (e.g., during updateSmartProxyConfig)
|
||||||
if (this.smartAcme) {
|
if (this.smartAcme) {
|
||||||
|
this.smartAcmeReady = false;
|
||||||
await this.smartAcme.stop().catch(err =>
|
await this.smartAcme.stop().catch(err =>
|
||||||
logger.log('error', 'Error stopping old SmartAcme', { error: String(err) })
|
logger.log('error', 'Error stopping old SmartAcme', { error: String(err) })
|
||||||
);
|
);
|
||||||
@@ -550,10 +765,15 @@ export class DcRouter {
|
|||||||
challengeHandlers: challengeHandlers,
|
challengeHandlers: challengeHandlers,
|
||||||
challengePriority: ['dns-01'],
|
challengePriority: ['dns-01'],
|
||||||
});
|
});
|
||||||
await this.smartAcme.start();
|
|
||||||
|
|
||||||
const scheduler = this.certProvisionScheduler;
|
const scheduler = this.certProvisionScheduler;
|
||||||
smartProxyConfig.certProvisionFunction = async (domain, eventComms) => {
|
smartProxyConfig.certProvisionFunction = async (domain, eventComms) => {
|
||||||
|
// If SmartAcme is not yet ready (still starting or retrying), fall back to HTTP-01
|
||||||
|
if (!this.smartAcmeReady) {
|
||||||
|
eventComms.warn(`SmartAcme not yet initialized, falling back to http-01 for ${domain}`);
|
||||||
|
return 'http01';
|
||||||
|
}
|
||||||
|
|
||||||
// Check backoff before attempting provision
|
// Check backoff before attempting provision
|
||||||
if (await scheduler.isInBackoff(domain)) {
|
if (await scheduler.isInBackoff(domain)) {
|
||||||
const info = await scheduler.getBackoffInfo(domain);
|
const info = await scheduler.getBackoffInfo(domain);
|
||||||
@@ -567,7 +787,7 @@ export class DcRouter {
|
|||||||
eventComms.log(`Attempting DNS-01 via SmartAcme for ${domain}`);
|
eventComms.log(`Attempting DNS-01 via SmartAcme for ${domain}`);
|
||||||
eventComms.setSource('smartacme-dns-01');
|
eventComms.setSource('smartacme-dns-01');
|
||||||
const isWildcardDomain = domain.startsWith('*.');
|
const isWildcardDomain = domain.startsWith('*.');
|
||||||
const cert = await this.smartAcme.getCertificateForDomain(domain, {
|
const cert = await this.smartAcme!.getCertificateForDomain(domain, {
|
||||||
includeWildcard: !isWildcardDomain,
|
includeWildcard: !isWildcardDomain,
|
||||||
});
|
});
|
||||||
if (cert.validUntil) {
|
if (cert.validUntil) {
|
||||||
@@ -586,10 +806,10 @@ export class DcRouter {
|
|||||||
// Success — clear any backoff
|
// Success — clear any backoff
|
||||||
await scheduler.clearBackoff(domain);
|
await scheduler.clearBackoff(domain);
|
||||||
return result;
|
return result;
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
// Record failure for backoff tracking
|
// Record failure for backoff tracking
|
||||||
await scheduler.recordFailure(domain, err.message);
|
await scheduler.recordFailure(domain, (err as Error).message);
|
||||||
eventComms.warn(`SmartAcme DNS-01 failed for ${domain}: ${err.message}, falling back to http-01`);
|
eventComms.warn(`SmartAcme DNS-01 failed for ${domain}: ${(err as Error).message}, falling back to http-01`);
|
||||||
return 'http01';
|
return 'http01';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -914,105 +1134,29 @@ export class DcRouter {
|
|||||||
public async stop() {
|
public async stop() {
|
||||||
logger.log('info', 'Stopping DcRouter services...');
|
logger.log('info', 'Stopping DcRouter services...');
|
||||||
|
|
||||||
// Flush pending DNS batch log
|
// Unsubscribe from service events before stopping services
|
||||||
if (this.dnsBatchTimer) {
|
if (this.serviceSubjectSubscription) {
|
||||||
clearTimeout(this.dnsBatchTimer);
|
this.serviceSubjectSubscription.unsubscribe();
|
||||||
if (this.dnsBatchCount > 0) {
|
this.serviceSubjectSubscription = undefined;
|
||||||
logger.log('info', `DNS: ${this.dnsBatchCount} queries processed (rate limited, final flush)`, { zone: 'dns' });
|
|
||||||
}
|
|
||||||
this.dnsBatchTimer = null;
|
|
||||||
this.dnsBatchCount = 0;
|
|
||||||
this.dnsLogWindowSecond = 0;
|
|
||||||
this.dnsLogWindowCount = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.opsServer.stop();
|
// ServiceManager handles reverse-dependency-ordered shutdown
|
||||||
|
await this.serviceManager.stop();
|
||||||
|
|
||||||
try {
|
// Clear backoff cache in cert scheduler
|
||||||
// Remove event listeners before stopping services to prevent leaks
|
if (this.certProvisionScheduler) {
|
||||||
if (this.smartProxy) {
|
this.certProvisionScheduler.clear();
|
||||||
this.smartProxy.removeAllListeners();
|
|
||||||
}
|
|
||||||
if (this.emailServer) {
|
|
||||||
if ((this.emailServer as any).deliverySystem) {
|
|
||||||
(this.emailServer as any).deliverySystem.removeAllListeners();
|
|
||||||
}
|
|
||||||
this.emailServer.removeAllListeners();
|
|
||||||
}
|
|
||||||
if (this.dnsServer) {
|
|
||||||
this.dnsServer.removeAllListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop all services in parallel for faster shutdown
|
|
||||||
await Promise.all([
|
|
||||||
// Stop cache cleaner if running
|
|
||||||
this.cacheCleaner ? Promise.resolve(this.cacheCleaner.stop()) : Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop metrics manager if running
|
|
||||||
this.metricsManager ? this.metricsManager.stop().catch(err => logger.log('error', 'Error stopping MetricsManager', { error: String(err) })) : Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop unified email server if running
|
|
||||||
this.emailServer ? this.emailServer.stop().catch(err => logger.log('error', 'Error stopping email server', { error: String(err) })) : Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop SmartAcme if running
|
|
||||||
this.smartAcme ? this.smartAcme.stop().catch(err => logger.log('error', 'Error stopping SmartAcme', { error: String(err) })) : Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop HTTP SmartProxy if running
|
|
||||||
this.smartProxy ? this.smartProxy.stop().catch(err => logger.log('error', 'Error stopping SmartProxy', { error: String(err) })) : Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop DNS server if running
|
|
||||||
this.dnsServer ?
|
|
||||||
this.dnsServer.stop().catch(err => logger.log('error', 'Error stopping DNS server', { error: String(err) })) :
|
|
||||||
Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop RADIUS server if running
|
|
||||||
this.radiusServer ?
|
|
||||||
this.radiusServer.stop().catch(err => logger.log('error', 'Error stopping RADIUS server', { error: String(err) })) :
|
|
||||||
Promise.resolve(),
|
|
||||||
|
|
||||||
// Stop Remote Ingress tunnel manager if running
|
|
||||||
this.tunnelManager ?
|
|
||||||
this.tunnelManager.stop().catch(err => logger.log('error', 'Error stopping TunnelManager', { error: String(err) })) :
|
|
||||||
Promise.resolve()
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Stop cache database after other services (they may need it during shutdown)
|
|
||||||
if (this.cacheDb) {
|
|
||||||
await this.cacheDb.stop().catch(err => logger.log('error', 'Error stopping CacheDb', { error: String(err) }));
|
|
||||||
CacheDb.resetInstance();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear backoff cache in cert scheduler
|
|
||||||
if (this.certProvisionScheduler) {
|
|
||||||
this.certProvisionScheduler.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow GC of stopped services by nulling references
|
|
||||||
this.smartProxy = undefined;
|
|
||||||
this.emailServer = undefined;
|
|
||||||
this.dnsServer = undefined;
|
|
||||||
this.metricsManager = undefined;
|
|
||||||
this.cacheCleaner = undefined;
|
|
||||||
this.cacheDb = undefined;
|
|
||||||
this.tunnelManager = undefined;
|
|
||||||
this.radiusServer = undefined;
|
|
||||||
this.smartAcme = undefined;
|
|
||||||
this.certProvisionScheduler = undefined;
|
this.certProvisionScheduler = undefined;
|
||||||
this.remoteIngressManager = undefined;
|
|
||||||
this.routeConfigManager = undefined;
|
|
||||||
this.apiTokenManager = undefined;
|
|
||||||
this.certificateStatusMap.clear();
|
|
||||||
|
|
||||||
// Reset security singletons to allow GC
|
|
||||||
SecurityLogger.resetInstance();
|
|
||||||
ContentScanner.resetInstance();
|
|
||||||
IPReputationChecker.resetInstance();
|
|
||||||
|
|
||||||
logger.log('info', 'All DcRouter services stopped');
|
|
||||||
} catch (error) {
|
|
||||||
logger.log('error', 'Error during DcRouter shutdown', { error: String(error) });
|
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.certificateStatusMap.clear();
|
||||||
|
|
||||||
|
// Reset security singletons to allow GC
|
||||||
|
SecurityLogger.resetInstance();
|
||||||
|
ContentScanner.resetInstance();
|
||||||
|
IPReputationChecker.resetInstance();
|
||||||
|
|
||||||
|
logger.log('info', 'All DcRouter services stopped');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1104,21 +1248,21 @@ export class DcRouter {
|
|||||||
// Wire delivery events to MetricsManager and logger
|
// Wire delivery events to MetricsManager and logger
|
||||||
if (this.metricsManager && this.emailServer.deliverySystem) {
|
if (this.metricsManager && this.emailServer.deliverySystem) {
|
||||||
this.emailServer.deliverySystem.on('deliveryStart', (item: any) => {
|
this.emailServer.deliverySystem.on('deliveryStart', (item: any) => {
|
||||||
this.metricsManager.trackEmailReceived(item?.from);
|
this.metricsManager!.trackEmailReceived(item?.from);
|
||||||
logger.log('info', `Email delivery started: ${item?.from} → ${item?.to}`, { zone: 'email' });
|
logger.log('info', `Email delivery started: ${item?.from} → ${item?.to}`, { zone: 'email' });
|
||||||
});
|
});
|
||||||
this.emailServer.deliverySystem.on('deliverySuccess', (item: any) => {
|
this.emailServer.deliverySystem.on('deliverySuccess', (item: any) => {
|
||||||
this.metricsManager.trackEmailSent(item?.to);
|
this.metricsManager!.trackEmailSent(item?.to);
|
||||||
logger.log('info', `Email delivered to ${item?.to}`, { zone: 'email' });
|
logger.log('info', `Email delivered to ${item?.to}`, { zone: 'email' });
|
||||||
});
|
});
|
||||||
this.emailServer.deliverySystem.on('deliveryFailed', (item: any, error: any) => {
|
this.emailServer.deliverySystem.on('deliveryFailed', (item: any, error: any) => {
|
||||||
this.metricsManager.trackEmailFailed(item?.to, error?.message);
|
this.metricsManager!.trackEmailFailed(item?.to, error?.message);
|
||||||
logger.log('warn', `Email delivery failed to ${item?.to}: ${error?.message}`, { zone: 'email' });
|
logger.log('warn', `Email delivery failed to ${item?.to}: ${error?.message}`, { zone: 'email' });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (this.metricsManager && this.emailServer) {
|
if (this.metricsManager && this.emailServer) {
|
||||||
this.emailServer.on('bounceProcessed', () => {
|
this.emailServer.on('bounceProcessed', () => {
|
||||||
this.metricsManager.trackEmailBounced();
|
this.metricsManager!.trackEmailBounced();
|
||||||
logger.log('warn', 'Email bounce processed', { zone: 'email' });
|
logger.log('warn', 'Email bounce processed', { zone: 'email' });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1161,8 +1305,8 @@ export class DcRouter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.log('info', 'All unified email components stopped');
|
logger.log('info', 'All unified email components stopped');
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error stopping unified email components: ${error.message}`);
|
logger.log('error', `Error stopping unified email components: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1324,7 +1468,7 @@ export class DcRouter {
|
|||||||
this.dnsServer.on('query', (event: plugins.smartdns.dnsServerMod.IDnsQueryCompletedEvent) => {
|
this.dnsServer.on('query', (event: plugins.smartdns.dnsServerMod.IDnsQueryCompletedEvent) => {
|
||||||
// Metrics tracking
|
// Metrics tracking
|
||||||
for (const question of event.questions) {
|
for (const question of event.questions) {
|
||||||
this.metricsManager.trackDnsQuery(
|
this.metricsManager?.trackDnsQuery(
|
||||||
question.type,
|
question.type,
|
||||||
question.name,
|
question.name,
|
||||||
false,
|
false,
|
||||||
@@ -1409,8 +1553,8 @@ export class DcRouter {
|
|||||||
// Use the built-in socket handler from smartdns
|
// Use the built-in socket handler from smartdns
|
||||||
// This handles HTTP/2, DoH protocol, etc.
|
// This handles HTTP/2, DoH protocol, etc.
|
||||||
await (this.dnsServer as any).handleHttpsSocket(socket);
|
await (this.dnsServer as any).handleHttpsSocket(socket);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `DNS socket handler error: ${error.message}`);
|
logger.log('error', `DNS socket handler error: ${(error as Error).message}`);
|
||||||
if (!socket.destroyed) {
|
if (!socket.destroyed) {
|
||||||
socket.destroy();
|
socket.destroy();
|
||||||
}
|
}
|
||||||
@@ -1551,12 +1695,12 @@ export class DcRouter {
|
|||||||
} else {
|
} else {
|
||||||
logger.log('warn', `Invalid DKIM record structure in ${file}`);
|
logger.log('warn', `Invalid DKIM record structure in ${file}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to load DKIM record from ${file}: ${error.message}`);
|
logger.log('error', `Failed to load DKIM record from ${file}: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to load DKIM records: ${error.message}`);
|
logger.log('error', `Failed to load DKIM records: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return records;
|
return records;
|
||||||
@@ -1590,8 +1734,8 @@ export class DcRouter {
|
|||||||
// This ensures keys are ready even if DNS mode changes later
|
// This ensures keys are ready even if DNS mode changes later
|
||||||
await dkimCreator.handleDKIMKeysForDomain(domainConfig.domain);
|
await dkimCreator.handleDKIMKeysForDomain(domainConfig.domain);
|
||||||
logger.log('info', `DKIM keys initialized for ${domainConfig.domain}`);
|
logger.log('info', `DKIM keys initialized for ${domainConfig.domain}`);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to initialize DKIM for ${domainConfig.domain}: ${error.message}`);
|
logger.log('error', `Failed to initialize DKIM for ${domainConfig.domain}: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1635,8 +1779,8 @@ export class DcRouter {
|
|||||||
} else {
|
} else {
|
||||||
logger.log('warn', 'Could not auto-discover public IPv4 address');
|
logger.log('warn', 'Could not auto-discover public IPv4 address');
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to auto-discover public IP: ${error.message}`);
|
logger.log('error', `Failed to auto-discover public IP: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!publicIp) {
|
if (!publicIp) {
|
||||||
@@ -1732,8 +1876,8 @@ export class DcRouter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('warn', `Failed to detect public IP: ${error.message}`);
|
logger.log('warn', `Failed to detect public IP: ${(error as Error).message}`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1753,7 +1897,7 @@ export class DcRouter {
|
|||||||
await this.remoteIngressManager.initialize();
|
await this.remoteIngressManager.initialize();
|
||||||
|
|
||||||
// Pass current routes so the manager can derive edge ports from remoteIngress-tagged routes
|
// Pass current routes so the manager can derive edge ports from remoteIngress-tagged routes
|
||||||
const currentRoutes = this.options.smartProxyConfig?.routes || [];
|
const currentRoutes = this.constructorRoutes;
|
||||||
this.remoteIngressManager.setRoutes(currentRoutes as any[]);
|
this.remoteIngressManager.setRoutes(currentRoutes as any[]);
|
||||||
|
|
||||||
// Resolve TLS certs for tunnel: explicit paths > ACME for hubDomain > self-signed (Rust default)
|
// Resolve TLS certs for tunnel: explicit paths > ACME for hubDomain > self-signed (Rust default)
|
||||||
@@ -1767,8 +1911,8 @@ export class DcRouter {
|
|||||||
const keyPem = plugins.fs.readFileSync(riCfg.tls.keyPath, 'utf8');
|
const keyPem = plugins.fs.readFileSync(riCfg.tls.keyPath, 'utf8');
|
||||||
tlsConfig = { certPem, keyPem };
|
tlsConfig = { certPem, keyPem };
|
||||||
logger.log('info', 'Using explicit TLS cert/key for RemoteIngress tunnel');
|
logger.log('info', 'Using explicit TLS cert/key for RemoteIngress tunnel');
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
logger.log('warn', `Failed to read RemoteIngress TLS cert/key files: ${err.message}`);
|
logger.log('warn', `Failed to read RemoteIngress TLS cert/key files: ${(err as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ export class ConfigValidator {
|
|||||||
} else if (rules.items.schema && itemType === 'object') {
|
} else if (rules.items.schema && itemType === 'object') {
|
||||||
const itemResult = this.validate(value[i], rules.items.schema);
|
const itemResult = this.validate(value[i], rules.items.schema);
|
||||||
if (!itemResult.valid) {
|
if (!itemResult.valid) {
|
||||||
errors.push(...itemResult.errors.map(err => `${key}[${i}].${err}`));
|
errors.push(...itemResult.errors!.map(err => `${key}[${i}].${err}`));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -181,7 +181,7 @@ export class ConfigValidator {
|
|||||||
if (rules.schema) {
|
if (rules.schema) {
|
||||||
const nestedResult = this.validate(value, rules.schema);
|
const nestedResult = this.validate(value, rules.schema);
|
||||||
if (!nestedResult.valid) {
|
if (!nestedResult.valid) {
|
||||||
errors.push(...nestedResult.errors.map(err => `${key}.${err}`));
|
errors.push(...nestedResult.errors!.map(err => `${key}.${err}`));
|
||||||
}
|
}
|
||||||
validatedConfig[key] = nestedResult.config;
|
validatedConfig[key] = nestedResult.config;
|
||||||
}
|
}
|
||||||
@@ -234,7 +234,7 @@ export class ConfigValidator {
|
|||||||
// Apply defaults to array items
|
// Apply defaults to array items
|
||||||
if (result[key] && rules.type === 'array' && rules.items && rules.items.schema) {
|
if (result[key] && rules.type === 'array' && rules.items && rules.items.schema) {
|
||||||
result[key] = result[key].map(item =>
|
result[key] = result[key].map(item =>
|
||||||
typeof item === 'object' ? this.applyDefaults(item, rules.items.schema) : item
|
typeof item === 'object' ? this.applyDefaults(item, rules.items!.schema!) : item
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -255,7 +255,7 @@ export class ConfigValidator {
|
|||||||
|
|
||||||
if (!result.valid) {
|
if (!result.valid) {
|
||||||
throw new ValidationError(
|
throw new ValidationError(
|
||||||
`Configuration validation failed: ${result.errors.join(', ')}`,
|
`Configuration validation failed: ${result.errors!.join(', ')}`,
|
||||||
'CONFIG_VALIDATION_ERROR',
|
'CONFIG_VALIDATION_ERROR',
|
||||||
{ data: { errors: result.errors } }
|
{ data: { errors: result.errors } }
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ export class PlatformError extends Error {
|
|||||||
const { retry } = this.context;
|
const { retry } = this.context;
|
||||||
if (!retry) return false;
|
if (!retry) return false;
|
||||||
|
|
||||||
return retry.currentRetry < retry.maxRetries;
|
return (retry.currentRetry ?? 0) < (retry.maxRetries ?? 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -35,6 +35,6 @@ export const runCli = async () => {
|
|||||||
await dcRouter.stop();
|
await dcRouter.stop();
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
};
|
};
|
||||||
process.on('SIGINT', shutdown);
|
process.once('SIGINT', shutdown);
|
||||||
process.on('SIGTERM', shutdown);
|
process.once('SIGTERM', shutdown);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -296,11 +296,11 @@ export class MetricsManager {
|
|||||||
const proxyMetrics = this.dcRouter.smartProxy ? this.dcRouter.smartProxy.getMetrics() : null;
|
const proxyMetrics = this.dcRouter.smartProxy ? this.dcRouter.smartProxy.getMetrics() : null;
|
||||||
|
|
||||||
if (!proxyMetrics) {
|
if (!proxyMetrics) {
|
||||||
return [];
|
return [] as Array<{ type: string; count: number; source: string; lastActivity: Date }>;
|
||||||
}
|
}
|
||||||
|
|
||||||
const connectionsByRoute = proxyMetrics.connections.byRoute();
|
const connectionsByRoute = proxyMetrics.connections.byRoute();
|
||||||
const connectionInfo = [];
|
const connectionInfo: Array<{ type: string; count: number; source: string; lastActivity: Date }> = [];
|
||||||
|
|
||||||
for (const [routeName, count] of connectionsByRoute) {
|
for (const [routeName, count] of connectionsByRoute) {
|
||||||
connectionInfo.push({
|
connectionInfo.push({
|
||||||
@@ -558,6 +558,7 @@ export class MetricsManager {
|
|||||||
throughputByIP: new Map<string, { in: number; out: number }>(),
|
throughputByIP: new Map<string, { in: number; out: number }>(),
|
||||||
requestsPerSecond: 0,
|
requestsPerSecond: 0,
|
||||||
requestsTotal: 0,
|
requestsTotal: 0,
|
||||||
|
backends: [] as Array<any>,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -590,6 +591,110 @@ export class MetricsManager {
|
|||||||
const requestsPerSecond = proxyMetrics.requests.perSecond();
|
const requestsPerSecond = proxyMetrics.requests.perSecond();
|
||||||
const requestsTotal = proxyMetrics.requests.total();
|
const requestsTotal = proxyMetrics.requests.total();
|
||||||
|
|
||||||
|
// Collect backend protocol data
|
||||||
|
const backendMetrics = proxyMetrics.backends.byBackend();
|
||||||
|
const protocolCache = proxyMetrics.backends.detectedProtocols();
|
||||||
|
|
||||||
|
// Group protocol cache entries by host:port so we can match them to backend metrics.
|
||||||
|
// The protocol cache is keyed by (host, port, domain) in Rust, so the same host:port
|
||||||
|
// can have multiple entries for different domains.
|
||||||
|
const cacheByBackend = new Map<string, (typeof protocolCache)[number][]>();
|
||||||
|
for (const entry of protocolCache) {
|
||||||
|
const backendKey = `${entry.host}:${entry.port}`;
|
||||||
|
let entries = cacheByBackend.get(backendKey);
|
||||||
|
if (!entries) {
|
||||||
|
entries = [];
|
||||||
|
cacheByBackend.set(backendKey, entries);
|
||||||
|
}
|
||||||
|
entries.push(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
const backends: Array<any> = [];
|
||||||
|
const seenCacheKeys = new Set<string>();
|
||||||
|
|
||||||
|
for (const [key, bm] of backendMetrics) {
|
||||||
|
const cacheEntries = cacheByBackend.get(key);
|
||||||
|
if (!cacheEntries || cacheEntries.length === 0) {
|
||||||
|
// No protocol cache entry — emit one row with backend metrics only
|
||||||
|
backends.push({
|
||||||
|
backend: key,
|
||||||
|
domain: null,
|
||||||
|
protocol: bm.protocol,
|
||||||
|
activeConnections: bm.activeConnections,
|
||||||
|
totalConnections: bm.totalConnections,
|
||||||
|
connectErrors: bm.connectErrors,
|
||||||
|
handshakeErrors: bm.handshakeErrors,
|
||||||
|
requestErrors: bm.requestErrors,
|
||||||
|
avgConnectTimeMs: Math.round(bm.avgConnectTimeMs * 10) / 10,
|
||||||
|
poolHitRate: Math.round(bm.poolHitRate * 1000) / 1000,
|
||||||
|
h2Failures: bm.h2Failures,
|
||||||
|
h2Suppressed: false,
|
||||||
|
h3Suppressed: false,
|
||||||
|
h2CooldownRemainingSecs: null,
|
||||||
|
h3CooldownRemainingSecs: null,
|
||||||
|
h2ConsecutiveFailures: null,
|
||||||
|
h3ConsecutiveFailures: null,
|
||||||
|
h3Port: null,
|
||||||
|
cacheAgeSecs: null,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// One row per domain, each enriched with the shared backend metrics
|
||||||
|
for (const cache of cacheEntries) {
|
||||||
|
const compositeKey = `${cache.host}:${cache.port}:${cache.domain ?? ''}`;
|
||||||
|
seenCacheKeys.add(compositeKey);
|
||||||
|
backends.push({
|
||||||
|
backend: key,
|
||||||
|
domain: cache.domain ?? null,
|
||||||
|
protocol: cache.protocol ?? bm.protocol,
|
||||||
|
activeConnections: bm.activeConnections,
|
||||||
|
totalConnections: bm.totalConnections,
|
||||||
|
connectErrors: bm.connectErrors,
|
||||||
|
handshakeErrors: bm.handshakeErrors,
|
||||||
|
requestErrors: bm.requestErrors,
|
||||||
|
avgConnectTimeMs: Math.round(bm.avgConnectTimeMs * 10) / 10,
|
||||||
|
poolHitRate: Math.round(bm.poolHitRate * 1000) / 1000,
|
||||||
|
h2Failures: bm.h2Failures,
|
||||||
|
h2Suppressed: cache.h2Suppressed,
|
||||||
|
h3Suppressed: cache.h3Suppressed,
|
||||||
|
h2CooldownRemainingSecs: cache.h2CooldownRemainingSecs,
|
||||||
|
h3CooldownRemainingSecs: cache.h3CooldownRemainingSecs,
|
||||||
|
h2ConsecutiveFailures: cache.h2ConsecutiveFailures,
|
||||||
|
h3ConsecutiveFailures: cache.h3ConsecutiveFailures,
|
||||||
|
h3Port: cache.h3Port,
|
||||||
|
cacheAgeSecs: cache.ageSecs,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Include protocol cache entries with no matching backend metric
|
||||||
|
for (const entry of protocolCache) {
|
||||||
|
const compositeKey = `${entry.host}:${entry.port}:${entry.domain ?? ''}`;
|
||||||
|
if (!seenCacheKeys.has(compositeKey)) {
|
||||||
|
backends.push({
|
||||||
|
backend: `${entry.host}:${entry.port}`,
|
||||||
|
domain: entry.domain,
|
||||||
|
protocol: entry.protocol,
|
||||||
|
activeConnections: 0,
|
||||||
|
totalConnections: 0,
|
||||||
|
connectErrors: 0,
|
||||||
|
handshakeErrors: 0,
|
||||||
|
requestErrors: 0,
|
||||||
|
avgConnectTimeMs: 0,
|
||||||
|
poolHitRate: 0,
|
||||||
|
h2Failures: 0,
|
||||||
|
h2Suppressed: entry.h2Suppressed,
|
||||||
|
h3Suppressed: entry.h3Suppressed,
|
||||||
|
h2CooldownRemainingSecs: entry.h2CooldownRemainingSecs,
|
||||||
|
h3CooldownRemainingSecs: entry.h3CooldownRemainingSecs,
|
||||||
|
h2ConsecutiveFailures: entry.h2ConsecutiveFailures,
|
||||||
|
h3ConsecutiveFailures: entry.h3ConsecutiveFailures,
|
||||||
|
h3Port: entry.h3Port,
|
||||||
|
cacheAgeSecs: entry.ageSecs,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
connectionsByIP,
|
connectionsByIP,
|
||||||
throughputRate,
|
throughputRate,
|
||||||
@@ -599,6 +704,7 @@ export class MetricsManager {
|
|||||||
throughputByIP,
|
throughputByIP,
|
||||||
requestsPerSecond,
|
requestsPerSecond,
|
||||||
requestsTotal,
|
requestsTotal,
|
||||||
|
backends,
|
||||||
};
|
};
|
||||||
}, 1000); // 1s cache — matches typical dashboard poll interval
|
}, 1000); // 1s cache — matches typical dashboard poll interval
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { requireValidIdentity, requireAdminIdentity } from './helpers/guards.js'
|
|||||||
|
|
||||||
export class OpsServer {
|
export class OpsServer {
|
||||||
public dcRouterRef: DcRouter;
|
public dcRouterRef: DcRouter;
|
||||||
public server: plugins.typedserver.utilityservers.UtilityWebsiteServer;
|
public server!: plugins.typedserver.utilityservers.UtilityWebsiteServer;
|
||||||
|
|
||||||
// Main TypedRouter — unauthenticated endpoints (login/logout/verify) and own-auth handlers
|
// Main TypedRouter — unauthenticated endpoints (login/logout/verify) and own-auth handlers
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
@@ -17,17 +17,17 @@ export class OpsServer {
|
|||||||
public adminRouter = new plugins.typedrequest.TypedRouter<{ request: { identity: interfaces.data.IIdentity } }>();
|
public adminRouter = new plugins.typedrequest.TypedRouter<{ request: { identity: interfaces.data.IIdentity } }>();
|
||||||
|
|
||||||
// Handler instances
|
// Handler instances
|
||||||
public adminHandler: handlers.AdminHandler;
|
public adminHandler!: handlers.AdminHandler;
|
||||||
private configHandler: handlers.ConfigHandler;
|
private configHandler!: handlers.ConfigHandler;
|
||||||
private logsHandler: handlers.LogsHandler;
|
private logsHandler!: handlers.LogsHandler;
|
||||||
private securityHandler: handlers.SecurityHandler;
|
private securityHandler!: handlers.SecurityHandler;
|
||||||
private statsHandler: handlers.StatsHandler;
|
private statsHandler!: handlers.StatsHandler;
|
||||||
private radiusHandler: handlers.RadiusHandler;
|
private radiusHandler!: handlers.RadiusHandler;
|
||||||
private emailOpsHandler: handlers.EmailOpsHandler;
|
private emailOpsHandler!: handlers.EmailOpsHandler;
|
||||||
private certificateHandler: handlers.CertificateHandler;
|
private certificateHandler!: handlers.CertificateHandler;
|
||||||
private remoteIngressHandler: handlers.RemoteIngressHandler;
|
private remoteIngressHandler!: handlers.RemoteIngressHandler;
|
||||||
private routeManagementHandler: handlers.RouteManagementHandler;
|
private routeManagementHandler!: handlers.RouteManagementHandler;
|
||||||
private apiTokenHandler: handlers.ApiTokenHandler;
|
private apiTokenHandler!: handlers.ApiTokenHandler;
|
||||||
|
|
||||||
constructor(dcRouterRefArg: DcRouter) {
|
constructor(dcRouterRefArg: DcRouter) {
|
||||||
this.dcRouterRef = dcRouterRefArg;
|
this.dcRouterRef = dcRouterRefArg;
|
||||||
@@ -39,7 +39,7 @@ export class OpsServer {
|
|||||||
public async start() {
|
public async start() {
|
||||||
this.server = new plugins.typedserver.utilityservers.UtilityWebsiteServer({
|
this.server = new plugins.typedserver.utilityservers.UtilityWebsiteServer({
|
||||||
domain: 'localhost',
|
domain: 'localhost',
|
||||||
feedMetadata: null,
|
feedMetadata: undefined,
|
||||||
serveDir: paths.distServe,
|
serveDir: paths.distServe,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export class AdminHandler {
|
|||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
|
|
||||||
// JWT instance
|
// JWT instance
|
||||||
public smartjwtInstance: plugins.smartjwt.SmartJwt<IJwtData>;
|
public smartjwtInstance!: plugins.smartjwt.SmartJwt<IJwtData>;
|
||||||
|
|
||||||
// Simple in-memory user storage (in production, use proper database)
|
// Simple in-memory user storage (in production, use proper database)
|
||||||
private users = new Map<string, {
|
private users = new Map<string, {
|
||||||
|
|||||||
@@ -311,8 +311,8 @@ export class CertificateHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return { success: true, message: `Certificate reprovisioning triggered for route '${routeName}'` };
|
return { success: true, message: `Certificate reprovisioning triggered for route '${routeName}'` };
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
return { success: false, message: err.message || 'Failed to reprovision certificate' };
|
return { success: false, message: (err as Error).message || 'Failed to reprovision certificate' };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -340,8 +340,8 @@ export class CertificateHandler {
|
|||||||
try {
|
try {
|
||||||
await dcRouter.smartAcme.getCertificateForDomain(domain);
|
await dcRouter.smartAcme.getCertificateForDomain(domain);
|
||||||
return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}'` };
|
return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}'` };
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
|
return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -351,8 +351,8 @@ export class CertificateHandler {
|
|||||||
try {
|
try {
|
||||||
await smartProxy.provisionCertificate(routeNames[0]);
|
await smartProxy.provisionCertificate(routeNames[0]);
|
||||||
return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}' via route '${routeNames[0]}'` };
|
return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}' via route '${routeNames[0]}'` };
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
|
return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ export class RadiusHandler {
|
|||||||
try {
|
try {
|
||||||
await radiusServer.addClient(dataArg.client);
|
await radiusServer.addClient(dataArg.client);
|
||||||
return { success: true };
|
return { success: true };
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return { success: false, message: error.message };
|
return { success: false, message: (error as Error).message };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -144,8 +144,8 @@ export class RadiusHandler {
|
|||||||
updatedAt: mapping.updatedAt,
|
updatedAt: mapping.updatedAt,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return { success: false, message: error.message };
|
return { success: false, message: (error as Error).message };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ export class SecurityHandler {
|
|||||||
throughputByIP,
|
throughputByIP,
|
||||||
requestsPerSecond: networkStats.requestsPerSecond || 0,
|
requestsPerSecond: networkStats.requestsPerSecond || 0,
|
||||||
requestsTotal: networkStats.requestsTotal || 0,
|
requestsTotal: networkStats.requestsTotal || 0,
|
||||||
|
backends: networkStats.backends || [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +115,7 @@ export class SecurityHandler {
|
|||||||
throughputByIP: [],
|
throughputByIP: [],
|
||||||
requestsPerSecond: 0,
|
requestsPerSecond: 0,
|
||||||
requestsTotal: 0,
|
requestsTotal: 0,
|
||||||
|
backends: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ export class StatsHandler {
|
|||||||
if (sections.network && this.opsServerRef.dcRouterRef.metricsManager) {
|
if (sections.network && this.opsServerRef.dcRouterRef.metricsManager) {
|
||||||
promises.push(
|
promises.push(
|
||||||
(async () => {
|
(async () => {
|
||||||
const stats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
|
const stats = await this.opsServerRef.dcRouterRef.metricsManager!.getNetworkStats();
|
||||||
const serverStats = await this.collectServerStats();
|
const serverStats = await this.collectServerStats();
|
||||||
|
|
||||||
// Build per-IP bandwidth lookup from throughputByIP
|
// Build per-IP bandwidth lookup from throughputByIP
|
||||||
@@ -309,6 +309,7 @@ export class StatsHandler {
|
|||||||
throughputHistory: stats.throughputHistory || [],
|
throughputHistory: stats.throughputHistory || [],
|
||||||
requestsPerSecond: stats.requestsPerSecond || 0,
|
requestsPerSecond: stats.requestsPerSecond || 0,
|
||||||
requestsTotal: stats.requestsTotal || 0,
|
requestsTotal: stats.requestsTotal || 0,
|
||||||
|
backends: stats.backends || [],
|
||||||
};
|
};
|
||||||
})()
|
})()
|
||||||
);
|
);
|
||||||
@@ -489,43 +490,40 @@ export class StatsHandler {
|
|||||||
message?: string;
|
message?: string;
|
||||||
}>;
|
}>;
|
||||||
}> {
|
}> {
|
||||||
const services: Array<{
|
const dcRouter = this.opsServerRef.dcRouterRef;
|
||||||
name: string;
|
const health = dcRouter.serviceManager.getHealth();
|
||||||
status: 'healthy' | 'degraded' | 'unhealthy';
|
|
||||||
message?: string;
|
|
||||||
}> = [];
|
|
||||||
|
|
||||||
// Check HTTP Proxy
|
const services = health.services.map((svc) => {
|
||||||
if (this.opsServerRef.dcRouterRef.smartProxy) {
|
let status: 'healthy' | 'degraded' | 'unhealthy';
|
||||||
services.push({
|
switch (svc.state) {
|
||||||
name: 'HTTP/HTTPS Proxy',
|
case 'running':
|
||||||
status: 'healthy',
|
status = 'healthy';
|
||||||
});
|
break;
|
||||||
}
|
case 'starting':
|
||||||
|
case 'degraded':
|
||||||
|
status = 'degraded';
|
||||||
|
break;
|
||||||
|
case 'failed':
|
||||||
|
status = svc.criticality === 'critical' ? 'unhealthy' : 'degraded';
|
||||||
|
break;
|
||||||
|
case 'stopped':
|
||||||
|
case 'stopping':
|
||||||
|
default:
|
||||||
|
status = 'degraded';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// Check Email Server
|
let message: string | undefined;
|
||||||
if (this.opsServerRef.dcRouterRef.emailServer) {
|
if (svc.state === 'failed' && svc.lastError) {
|
||||||
services.push({
|
message = svc.lastError;
|
||||||
name: 'Email Server',
|
} else if (svc.retryCount > 0 && svc.state !== 'running') {
|
||||||
status: 'healthy',
|
message = `Retry attempt ${svc.retryCount}`;
|
||||||
});
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Check DNS Server
|
return { name: svc.name, status, message };
|
||||||
if (this.opsServerRef.dcRouterRef.dnsServer) {
|
|
||||||
services.push({
|
|
||||||
name: 'DNS Server',
|
|
||||||
status: 'healthy',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check OpsServer
|
|
||||||
services.push({
|
|
||||||
name: 'OpsServer',
|
|
||||||
status: 'healthy',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const healthy = services.every(s => s.status === 'healthy');
|
const healthy = health.overall === 'healthy';
|
||||||
|
|
||||||
return {
|
return {
|
||||||
healthy,
|
healthy,
|
||||||
|
|||||||
@@ -62,8 +62,9 @@ import * as smartradius from '@push.rocks/smartradius';
|
|||||||
import * as smartrequest from '@push.rocks/smartrequest';
|
import * as smartrequest from '@push.rocks/smartrequest';
|
||||||
import * as smartrx from '@push.rocks/smartrx';
|
import * as smartrx from '@push.rocks/smartrx';
|
||||||
import * as smartunique from '@push.rocks/smartunique';
|
import * as smartunique from '@push.rocks/smartunique';
|
||||||
|
import * as taskbuffer from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
export { projectinfo, qenv, smartacme, smartdata, smartdns, smartfile, smartguard, smartjwt, smartlog, smartmetrics, smartmongo, smartmta, smartnetwork, smartpath, smartproxy, smartpromise, smartradius, smartrequest, smartrx, smartunique };
|
export { projectinfo, qenv, smartacme, smartdata, smartdns, smartfile, smartguard, smartjwt, smartlog, smartmetrics, smartmongo, smartmta, smartnetwork, smartpath, smartproxy, smartpromise, smartradius, smartrequest, smartrx, smartunique, taskbuffer };
|
||||||
|
|
||||||
// Define SmartLog types for use in error handling
|
// Define SmartLog types for use in error handling
|
||||||
export type TLogLevel = 'error' | 'warn' | 'info' | 'success' | 'debug';
|
export type TLogLevel = 'error' | 'warn' | 'info' | 'success' | 'debug';
|
||||||
|
|||||||
@@ -92,6 +92,8 @@ export interface IAccountingManagerConfig {
|
|||||||
detailedLogging?: boolean;
|
detailedLogging?: boolean;
|
||||||
/** Maximum active sessions to track in memory */
|
/** Maximum active sessions to track in memory */
|
||||||
maxActiveSessions?: number;
|
maxActiveSessions?: number;
|
||||||
|
/** Stale session timeout in hours — sessions with no update for this long are evicted (default: 24) */
|
||||||
|
staleSessionTimeoutHours?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -105,6 +107,7 @@ export class AccountingManager {
|
|||||||
private activeSessions: Map<string, IAccountingSession> = new Map();
|
private activeSessions: Map<string, IAccountingSession> = new Map();
|
||||||
private config: Required<IAccountingManagerConfig>;
|
private config: Required<IAccountingManagerConfig>;
|
||||||
private storageManager?: StorageManager;
|
private storageManager?: StorageManager;
|
||||||
|
private staleSessionSweepTimer?: ReturnType<typeof setInterval>;
|
||||||
|
|
||||||
// Counters for statistics
|
// Counters for statistics
|
||||||
private stats = {
|
private stats = {
|
||||||
@@ -121,6 +124,7 @@ export class AccountingManager {
|
|||||||
retentionDays: config?.retentionDays ?? 30,
|
retentionDays: config?.retentionDays ?? 30,
|
||||||
detailedLogging: config?.detailedLogging ?? false,
|
detailedLogging: config?.detailedLogging ?? false,
|
||||||
maxActiveSessions: config?.maxActiveSessions ?? 10000,
|
maxActiveSessions: config?.maxActiveSessions ?? 10000,
|
||||||
|
staleSessionTimeoutHours: config?.staleSessionTimeoutHours ?? 24,
|
||||||
};
|
};
|
||||||
this.storageManager = storageManager;
|
this.storageManager = storageManager;
|
||||||
}
|
}
|
||||||
@@ -132,9 +136,60 @@ export class AccountingManager {
|
|||||||
if (this.storageManager) {
|
if (this.storageManager) {
|
||||||
await this.loadActiveSessions();
|
await this.loadActiveSessions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Start periodic sweep to evict stale sessions (every 15 minutes)
|
||||||
|
this.staleSessionSweepTimer = setInterval(() => {
|
||||||
|
this.sweepStaleSessions();
|
||||||
|
}, 15 * 60 * 1000);
|
||||||
|
// Allow the process to exit even if the timer is pending
|
||||||
|
if (this.staleSessionSweepTimer.unref) {
|
||||||
|
this.staleSessionSweepTimer.unref();
|
||||||
|
}
|
||||||
|
|
||||||
logger.log('info', `AccountingManager initialized with ${this.activeSessions.size} active sessions`);
|
logger.log('info', `AccountingManager initialized with ${this.activeSessions.size} active sessions`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop the accounting manager and clean up timers
|
||||||
|
*/
|
||||||
|
stop(): void {
|
||||||
|
if (this.staleSessionSweepTimer) {
|
||||||
|
clearInterval(this.staleSessionSweepTimer);
|
||||||
|
this.staleSessionSweepTimer = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sweep stale active sessions that have not received any update
|
||||||
|
* within the configured timeout. These are orphaned sessions where
|
||||||
|
* the Stop packet was never received.
|
||||||
|
*/
|
||||||
|
private sweepStaleSessions(): void {
|
||||||
|
const timeoutMs = this.config.staleSessionTimeoutHours * 60 * 60 * 1000;
|
||||||
|
const cutoff = Date.now() - timeoutMs;
|
||||||
|
let swept = 0;
|
||||||
|
|
||||||
|
for (const [sessionId, session] of this.activeSessions) {
|
||||||
|
if (session.lastUpdateTime < cutoff) {
|
||||||
|
session.status = 'terminated';
|
||||||
|
session.terminateCause = 'StaleSessionTimeout';
|
||||||
|
session.endTime = Date.now();
|
||||||
|
session.sessionTime = Math.floor((session.endTime - session.startTime) / 1000);
|
||||||
|
|
||||||
|
if (this.storageManager) {
|
||||||
|
this.archiveSession(session).catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
this.activeSessions.delete(sessionId);
|
||||||
|
swept++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (swept > 0) {
|
||||||
|
logger.log('info', `Swept ${swept} stale RADIUS sessions (no update for ${this.config.staleSessionTimeoutHours}h)`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle accounting start request
|
* Handle accounting start request
|
||||||
*/
|
*/
|
||||||
@@ -463,8 +518,8 @@ export class AccountingManager {
|
|||||||
if (deletedCount > 0) {
|
if (deletedCount > 0) {
|
||||||
logger.log('info', `Cleaned up ${deletedCount} old accounting sessions`);
|
logger.log('info', `Cleaned up ${deletedCount} old accounting sessions`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to cleanup old sessions: ${error.message}`);
|
logger.log('error', `Failed to cleanup old sessions: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return deletedCount;
|
return deletedCount;
|
||||||
@@ -527,8 +582,8 @@ export class AccountingManager {
|
|||||||
// Ignore individual errors
|
// Ignore individual errors
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('warn', `Failed to load active sessions: ${error.message}`);
|
logger.log('warn', `Failed to load active sessions: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -543,8 +598,8 @@ export class AccountingManager {
|
|||||||
const key = `${this.config.storagePrefix}/active/${session.sessionId}.json`;
|
const key = `${this.config.storagePrefix}/active/${session.sessionId}.json`;
|
||||||
try {
|
try {
|
||||||
await this.storageManager.setJSON(key, session);
|
await this.storageManager.setJSON(key, session);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to persist session ${session.sessionId}: ${error.message}`);
|
logger.log('error', `Failed to persist session ${session.sessionId}: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -565,8 +620,8 @@ export class AccountingManager {
|
|||||||
const date = new Date(session.endTime);
|
const date = new Date(session.endTime);
|
||||||
const archiveKey = `${this.config.storagePrefix}/archive/${date.getFullYear()}/${String(date.getMonth() + 1).padStart(2, '0')}/${String(date.getDate()).padStart(2, '0')}/${session.sessionId}.json`;
|
const archiveKey = `${this.config.storagePrefix}/archive/${date.getFullYear()}/${String(date.getMonth() + 1).padStart(2, '0')}/${String(date.getDate()).padStart(2, '0')}/${session.sessionId}.json`;
|
||||||
await this.storageManager.setJSON(archiveKey, session);
|
await this.storageManager.setJSON(archiveKey, session);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to archive session ${session.sessionId}: ${error.message}`);
|
logger.log('error', `Failed to archive session ${session.sessionId}: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -598,8 +653,8 @@ export class AccountingManager {
|
|||||||
// Ignore individual errors
|
// Ignore individual errors
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('warn', `Failed to get archived sessions: ${error.message}`);
|
logger.log('warn', `Failed to get archived sessions: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return sessions;
|
return sessions;
|
||||||
|
|||||||
@@ -183,6 +183,8 @@ export class RadiusServer {
|
|||||||
this.radiusServer = undefined;
|
this.radiusServer = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.accountingManager.stop();
|
||||||
|
|
||||||
this.running = false;
|
this.running = false;
|
||||||
logger.log('info', 'RADIUS server stopped');
|
logger.log('info', 'RADIUS server stopped');
|
||||||
}
|
}
|
||||||
@@ -308,8 +310,8 @@ export class RadiusServer {
|
|||||||
default:
|
default:
|
||||||
logger.log('debug', `RADIUS Acct Unknown status type: ${statusType}`);
|
logger.log('debug', `RADIUS Acct Unknown status type: ${statusType}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `RADIUS accounting error: ${error.message}`);
|
logger.log('error', `RADIUS accounting error: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
|
return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ export class VlanManager {
|
|||||||
if (this.normalizedMacCache.size > 10000) {
|
if (this.normalizedMacCache.size > 10000) {
|
||||||
const iterator = this.normalizedMacCache.keys();
|
const iterator = this.normalizedMacCache.keys();
|
||||||
for (let i = 0; i < 1000; i++) {
|
for (let i = 0; i < 1000; i++) {
|
||||||
this.normalizedMacCache.delete(iterator.next().value);
|
this.normalizedMacCache.delete(iterator.next().value!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,8 +348,8 @@ export class VlanManager {
|
|||||||
}
|
}
|
||||||
logger.log('info', `Loaded ${data.length} VLAN mappings from storage`);
|
logger.log('info', `Loaded ${data.length} VLAN mappings from storage`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('warn', `Failed to load VLAN mappings from storage: ${error.message}`);
|
logger.log('warn', `Failed to load VLAN mappings from storage: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -364,8 +364,8 @@ export class VlanManager {
|
|||||||
try {
|
try {
|
||||||
const mappings = Array.from(this.mappings.values());
|
const mappings = Array.from(this.mappings.values());
|
||||||
await this.storageManager.setJSON(this.config.storagePrefix, mappings);
|
await this.storageManager.setJSON(this.config.storagePrefix, mappings);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to save VLAN mappings to storage: ${error.message}`);
|
logger.log('error', `Failed to save VLAN mappings to storage: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ Manages the Rust-based RemoteIngressHub lifecycle. Syncs allowed edges, tracks c
|
|||||||
|
|
||||||
## License and Legal Information
|
## License and Legal Information
|
||||||
|
|
||||||
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](../LICENSE) file.
|
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](../license) file.
|
||||||
|
|
||||||
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
|||||||
@@ -94,6 +94,38 @@ export class RemoteIngressManager {
|
|||||||
return [...ports].sort((a, b) => a - b);
|
return [...ports].sort((a, b) => a - b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Derive UDP listen ports for an edge from routes with transport 'udp' or 'all'.
|
||||||
|
* These ports need UDP listeners on the edge (e.g. for QUIC/HTTP3).
|
||||||
|
*/
|
||||||
|
public deriveUdpPortsForEdge(edgeId: string, edgeTags?: string[]): number[] {
|
||||||
|
const ports = new Set<number>();
|
||||||
|
|
||||||
|
for (const route of this.routes) {
|
||||||
|
if (!route.remoteIngress?.enabled) continue;
|
||||||
|
|
||||||
|
// Apply edge filter if present
|
||||||
|
const filter = route.remoteIngress.edgeFilter;
|
||||||
|
if (filter && filter.length > 0) {
|
||||||
|
const idMatch = filter.includes(edgeId);
|
||||||
|
const tagMatch = edgeTags?.some((tag) => filter.includes(tag)) ?? false;
|
||||||
|
if (!idMatch && !tagMatch) continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only include ports from routes that listen on UDP
|
||||||
|
const transport = route.match?.transport;
|
||||||
|
if (transport === 'udp' || transport === 'all') {
|
||||||
|
if (route.match?.ports) {
|
||||||
|
for (const p of extractPorts(route.match.ports)) {
|
||||||
|
ports.add(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...ports].sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the effective listen ports for an edge.
|
* Get the effective listen ports for an edge.
|
||||||
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
||||||
@@ -106,6 +138,18 @@ export class RemoteIngressManager {
|
|||||||
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the effective UDP listen ports for an edge.
|
||||||
|
* Manual UDP ports are always included. Auto-derived UDP ports are added when autoDerivePorts is true.
|
||||||
|
*/
|
||||||
|
public getEffectiveListenPortsUdp(edge: IRemoteIngress): number[] {
|
||||||
|
const manualPorts = edge.listenPortsUdp || [];
|
||||||
|
const shouldDerive = edge.autoDerivePorts !== false;
|
||||||
|
if (!shouldDerive) return [...manualPorts].sort((a, b) => a - b);
|
||||||
|
const derivedPorts = this.deriveUdpPortsForEdge(edge.id, edge.tags);
|
||||||
|
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get manual and derived port breakdown for an edge (used in API responses).
|
* Get manual and derived port breakdown for an edge (used in API responses).
|
||||||
* Derived ports exclude any ports already present in the manual list.
|
* Derived ports exclude any ports already present in the manual list.
|
||||||
@@ -241,15 +285,18 @@ export class RemoteIngressManager {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the list of allowed edges (enabled only) for the Rust hub.
|
* Get the list of allowed edges (enabled only) for the Rust hub.
|
||||||
|
* Includes listenPortsUdp when routes with transport 'udp' or 'all' are present.
|
||||||
*/
|
*/
|
||||||
public getAllowedEdges(): Array<{ id: string; secret: string; listenPorts: number[] }> {
|
public getAllowedEdges(): Array<{ id: string; secret: string; listenPorts: number[]; listenPortsUdp?: number[] }> {
|
||||||
const result: Array<{ id: string; secret: string; listenPorts: number[] }> = [];
|
const result: Array<{ id: string; secret: string; listenPorts: number[]; listenPortsUdp?: number[] }> = [];
|
||||||
for (const edge of this.edges.values()) {
|
for (const edge of this.edges.values()) {
|
||||||
if (edge.enabled) {
|
if (edge.enabled) {
|
||||||
|
const listenPortsUdp = this.getEffectiveListenPortsUdp(edge);
|
||||||
result.push({
|
result.push({
|
||||||
id: edge.id,
|
id: edge.id,
|
||||||
secret: edge.secret,
|
secret: edge.secret,
|
||||||
listenPorts: this.getEffectiveListenPorts(edge),
|
listenPorts: this.getEffectiveListenPorts(edge),
|
||||||
|
...(listenPortsUdp.length > 0 ? { listenPortsUdp } : {}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ export enum ThreatCategory {
|
|||||||
* Content Scanner for detecting malicious email content
|
* Content Scanner for detecting malicious email content
|
||||||
*/
|
*/
|
||||||
export class ContentScanner {
|
export class ContentScanner {
|
||||||
private static instance: ContentScanner;
|
private static instance: ContentScanner | undefined;
|
||||||
private scanCache: LRUCache<string, IScanResult>;
|
private scanCache: LRUCache<string, IScanResult>;
|
||||||
private options: Required<IContentScannerOptions>;
|
private options: Required<IContentScannerOptions>;
|
||||||
|
|
||||||
@@ -258,10 +258,10 @@ export class ContentScanner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error scanning email: ${error.message}`, {
|
logger.log('error', `Error scanning email: ${(error as Error).message}`, {
|
||||||
messageId: email.getMessageId(),
|
messageId: email.getMessageId(),
|
||||||
error: error.stack
|
error: (error as Error).stack
|
||||||
});
|
});
|
||||||
|
|
||||||
// Return a safe default with error indication
|
// Return a safe default with error indication
|
||||||
@@ -271,7 +271,7 @@ export class ContentScanner {
|
|||||||
scannedElements: ['error'],
|
scannedElements: ['error'],
|
||||||
timestamp: Date.now(),
|
timestamp: Date.now(),
|
||||||
threatType: 'scan_error',
|
threatType: 'scan_error',
|
||||||
threatDetails: `Scan error: ${error.message}`
|
threatDetails: `Scan error: ${(error as Error).message}`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -625,8 +625,8 @@ export class ContentScanner {
|
|||||||
return sample.toString('utf8')
|
return sample.toString('utf8')
|
||||||
.replace(/[\x00-\x09\x0B-\x1F\x7F-\x9F]/g, '') // Remove control chars
|
.replace(/[\x00-\x09\x0B-\x1F\x7F-\x9F]/g, '') // Remove control chars
|
||||||
.replace(/\uFFFD/g, ''); // Remove replacement char
|
.replace(/\uFFFD/g, ''); // Remove replacement char
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('warn', `Error extracting text from buffer: ${error.message}`);
|
logger.log('warn', `Error extracting text from buffer: ${(error as Error).message}`);
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -699,7 +699,7 @@ export class ContentScanner {
|
|||||||
subject: email.subject
|
subject: email.subject
|
||||||
},
|
},
|
||||||
success: false,
|
success: false,
|
||||||
domain: email.getFromDomain()
|
domain: email.getFromDomain() ?? undefined
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -722,7 +722,7 @@ export class ContentScanner {
|
|||||||
subject: email.subject
|
subject: email.subject
|
||||||
},
|
},
|
||||||
success: false,
|
success: false,
|
||||||
domain: email.getFromDomain()
|
domain: email.getFromDomain() ?? undefined
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ export interface IIPReputationOptions {
|
|||||||
* Class for checking IP reputation of inbound email senders
|
* Class for checking IP reputation of inbound email senders
|
||||||
*/
|
*/
|
||||||
export class IPReputationChecker {
|
export class IPReputationChecker {
|
||||||
private static instance: IPReputationChecker;
|
private static instance: IPReputationChecker | undefined;
|
||||||
private reputationCache: LRUCache<string, IReputationResult>;
|
private reputationCache: LRUCache<string, IReputationResult>;
|
||||||
private options: Required<IIPReputationOptions>;
|
private options: Required<IIPReputationOptions>;
|
||||||
private storageManager?: any; // StorageManager instance
|
private storageManager?: any; // StorageManager instance
|
||||||
@@ -127,8 +127,8 @@ export class IPReputationChecker {
|
|||||||
// Load cache from disk if enabled
|
// Load cache from disk if enabled
|
||||||
if (this.options.enableLocalCache) {
|
if (this.options.enableLocalCache) {
|
||||||
// Fire and forget the load operation
|
// Fire and forget the load operation
|
||||||
this.loadCache().catch(error => {
|
this.loadCache().catch((error: unknown) => {
|
||||||
logger.log('error', `Failed to load IP reputation cache during initialization: ${error.message}`);
|
logger.log('error', `Failed to load IP reputation cache during initialization: ${(error as Error).message}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -237,13 +237,13 @@ export class IPReputationChecker {
|
|||||||
this.logReputationCheck(ip, result);
|
this.logReputationCheck(ip, result);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error checking IP reputation for ${ip}: ${error.message}`, {
|
logger.log('error', `Error checking IP reputation for ${ip}: ${(error as Error).message}`, {
|
||||||
ip,
|
ip,
|
||||||
stack: error.stack
|
stack: (error as Error).stack
|
||||||
});
|
});
|
||||||
|
|
||||||
return this.createErrorResult(ip, error.message);
|
return this.createErrorResult(ip, (error as Error).message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,8 +266,8 @@ export class IPReputationChecker {
|
|||||||
const lookupDomain = `${reversedIP}.${server}`;
|
const lookupDomain = `${reversedIP}.${server}`;
|
||||||
await plugins.dns.promises.resolve(lookupDomain);
|
await plugins.dns.promises.resolve(lookupDomain);
|
||||||
return server; // IP is listed in this DNSBL
|
return server; // IP is listed in this DNSBL
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
if (error.code === 'ENOTFOUND') {
|
if ((error as any).code === 'ENOTFOUND') {
|
||||||
return null; // IP is not listed in this DNSBL
|
return null; // IP is not listed in this DNSBL
|
||||||
}
|
}
|
||||||
throw error; // Other error
|
throw error; // Other error
|
||||||
@@ -286,8 +286,8 @@ export class IPReputationChecker {
|
|||||||
listCount: lists.length,
|
listCount: lists.length,
|
||||||
lists
|
lists
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error checking DNSBL for ${ip}: ${error.message}`);
|
logger.log('error', `Error checking DNSBL for ${ip}: ${(error as Error).message}`);
|
||||||
return {
|
return {
|
||||||
listCount: 0,
|
listCount: 0,
|
||||||
lists: []
|
lists: []
|
||||||
@@ -349,8 +349,8 @@ export class IPReputationChecker {
|
|||||||
org: this.determineOrg(ip), // Simplified, would use real org data
|
org: this.determineOrg(ip), // Simplified, would use real org data
|
||||||
type
|
type
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error getting IP info for ${ip}: ${error.message}`);
|
logger.log('error', `Error getting IP info for ${ip}: ${(error as Error).message}`);
|
||||||
return {
|
return {
|
||||||
type: IPType.UNKNOWN
|
type: IPType.UNKNOWN
|
||||||
};
|
};
|
||||||
@@ -468,8 +468,8 @@ export class IPReputationChecker {
|
|||||||
}
|
}
|
||||||
this.saveCacheTimer = setTimeout(() => {
|
this.saveCacheTimer = setTimeout(() => {
|
||||||
this.saveCacheTimer = null;
|
this.saveCacheTimer = null;
|
||||||
this.saveCache().catch(error => {
|
this.saveCache().catch((error: unknown) => {
|
||||||
logger.log('error', `Failed to save IP reputation cache: ${error.message}`);
|
logger.log('error', `Failed to save IP reputation cache: ${(error as Error).message}`);
|
||||||
});
|
});
|
||||||
}, IPReputationChecker.SAVE_CACHE_DEBOUNCE_MS);
|
}, IPReputationChecker.SAVE_CACHE_DEBOUNCE_MS);
|
||||||
}
|
}
|
||||||
@@ -506,8 +506,8 @@ export class IPReputationChecker {
|
|||||||
|
|
||||||
logger.log('info', `Saved ${entries.length} IP reputation cache entries to disk`);
|
logger.log('info', `Saved ${entries.length} IP reputation cache entries to disk`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to save IP reputation cache: ${error.message}`);
|
logger.log('error', `Failed to save IP reputation cache: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -542,12 +542,12 @@ export class IPReputationChecker {
|
|||||||
plugins.fs.unlinkSync(cacheFile);
|
plugins.fs.unlinkSync(cacheFile);
|
||||||
logger.log('info', 'Old cache file removed after migration');
|
logger.log('info', 'Old cache file removed after migration');
|
||||||
} catch (deleteError) {
|
} catch (deleteError) {
|
||||||
logger.log('warn', `Could not delete old cache file: ${deleteError.message}`);
|
logger.log('warn', `Could not delete old cache file: ${(deleteError as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Error loading from StorageManager: ${error.message}`);
|
logger.log('error', `Error loading from StorageManager: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No storage manager, load from filesystem
|
// No storage manager, load from filesystem
|
||||||
@@ -578,8 +578,8 @@ export class IPReputationChecker {
|
|||||||
const source = fromFilesystem ? 'disk' : 'StorageManager';
|
const source = fromFilesystem ? 'disk' : 'StorageManager';
|
||||||
logger.log('info', `Loaded ${validEntries.length} IP reputation cache entries from ${source}`);
|
logger.log('info', `Loaded ${validEntries.length} IP reputation cache entries from ${source}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to load IP reputation cache: ${error.message}`);
|
logger.log('error', `Failed to load IP reputation cache: ${(error as Error).message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -611,8 +611,8 @@ export class IPReputationChecker {
|
|||||||
|
|
||||||
// If cache is enabled and we have entries, save them to the new storage manager
|
// If cache is enabled and we have entries, save them to the new storage manager
|
||||||
if (this.options.enableLocalCache && this.reputationCache.size > 0) {
|
if (this.options.enableLocalCache && this.reputationCache.size > 0) {
|
||||||
this.saveCache().catch(error => {
|
this.saveCache().catch((error: unknown) => {
|
||||||
logger.log('error', `Failed to save cache to new storage manager: ${error.message}`);
|
logger.log('error', `Failed to save cache to new storage manager: ${(error as Error).message}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ export interface ISecurityEvent {
|
|||||||
* Security logger for enhanced security monitoring
|
* Security logger for enhanced security monitoring
|
||||||
*/
|
*/
|
||||||
export class SecurityLogger {
|
export class SecurityLogger {
|
||||||
private static instance: SecurityLogger;
|
private static instance: SecurityLogger | undefined;
|
||||||
private securityEvents: ISecurityEvent[] = [];
|
private securityEvents: ISecurityEvent[] = [];
|
||||||
private maxEventHistory: number;
|
private maxEventHistory: number;
|
||||||
private enableNotifications: boolean;
|
private enableNotifications: boolean;
|
||||||
@@ -154,11 +154,13 @@ export class SecurityLogger {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (filter.fromTimestamp) {
|
if (filter.fromTimestamp) {
|
||||||
filteredEvents = filteredEvents.filter(event => event.timestamp >= filter.fromTimestamp);
|
const fromTs = filter.fromTimestamp;
|
||||||
|
filteredEvents = filteredEvents.filter(event => event.timestamp >= fromTs);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filter.toTimestamp) {
|
if (filter.toTimestamp) {
|
||||||
filteredEvents = filteredEvents.filter(event => event.timestamp <= filter.toTimestamp);
|
const toTs = filter.toTimestamp;
|
||||||
|
filteredEvents = filteredEvents.filter(event => event.timestamp <= toTs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { smsConfigSchema } from './config/sms.schema.js';
|
|||||||
import { ConfigValidator } from '../config/validator.js';
|
import { ConfigValidator } from '../config/validator.js';
|
||||||
|
|
||||||
export class SmsService {
|
export class SmsService {
|
||||||
public projectinfo: plugins.projectinfo.ProjectInfo;
|
public projectinfo!: plugins.projectinfo.ProjectInfo;
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
public config: ISmsConfig;
|
public config: ISmsConfig;
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ export class SmsService {
|
|||||||
const validationResult = ConfigValidator.validate(options, smsConfigSchema);
|
const validationResult = ConfigValidator.validate(options, smsConfigSchema);
|
||||||
|
|
||||||
if (!validationResult.valid) {
|
if (!validationResult.valid) {
|
||||||
logger.warn(`SMS service configuration has validation errors: ${validationResult.errors.join(', ')}`);
|
logger.warn(`SMS service configuration has validation errors: ${validationResult.errors!.join(', ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set configuration with defaults
|
// Set configuration with defaults
|
||||||
@@ -30,7 +30,7 @@ export class SmsService {
|
|||||||
*/
|
*/
|
||||||
public async start() {
|
public async start() {
|
||||||
logger.log('info', `starting sms service`);
|
logger.log('info', `starting sms service`);
|
||||||
this.projectinfo = new plugins.projectinfo.ProjectInfo(paths.packageDir);
|
this.projectinfo = await plugins.projectinfo.ProjectInfo.create(paths.packageDir);
|
||||||
this.typedrouter.addTypedHandler(
|
this.typedrouter.addTypedHandler(
|
||||||
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.platformservice.sms.IRequest_SendSms>(
|
new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.platformservice.sms.IRequest_SendSms>(
|
||||||
'sendSms',
|
'sendSms',
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export interface IStorageConfig {
|
|||||||
/** Filesystem path for storage */
|
/** Filesystem path for storage */
|
||||||
fsPath?: string;
|
fsPath?: string;
|
||||||
/** Custom read function */
|
/** Custom read function */
|
||||||
readFunction?: (key: string) => Promise<string>;
|
readFunction?: (key: string) => Promise<string | null>;
|
||||||
/** Custom write function */
|
/** Custom write function */
|
||||||
writeFunction?: (key: string, value: string) => Promise<void>;
|
writeFunction?: (key: string, value: string) => Promise<void>;
|
||||||
}
|
}
|
||||||
@@ -57,9 +57,7 @@ export class StorageManager {
|
|||||||
this.ensureDirectory(this.fsBasePath);
|
this.ensureDirectory(this.fsBasePath);
|
||||||
|
|
||||||
// Set up internal filesystem read/write functions
|
// Set up internal filesystem read/write functions
|
||||||
this.config.readFunction = async (key: string) => {
|
this.config.readFunction = (key: string): Promise<string | null> => this.fsRead(key);
|
||||||
return this.fsRead(key);
|
|
||||||
};
|
|
||||||
this.config.writeFunction = async (key: string, value: string) => {
|
this.config.writeFunction = async (key: string, value: string) => {
|
||||||
await this.fsWrite(key, value);
|
await this.fsWrite(key, value);
|
||||||
};
|
};
|
||||||
@@ -88,8 +86,8 @@ export class StorageManager {
|
|||||||
private async ensureDirectory(dirPath: string): Promise<void> {
|
private async ensureDirectory(dirPath: string): Promise<void> {
|
||||||
try {
|
try {
|
||||||
await plugins.fsUtils.ensureDir(dirPath);
|
await plugins.fsUtils.ensureDir(dirPath);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to create storage directory: ${error.message}`);
|
logger.log('error', `Failed to create storage directory: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,13 +127,13 @@ export class StorageManager {
|
|||||||
/**
|
/**
|
||||||
* Internal filesystem read function
|
* Internal filesystem read function
|
||||||
*/
|
*/
|
||||||
private async fsRead(key: string): Promise<string> {
|
private async fsRead(key: string): Promise<string | null> {
|
||||||
const filePath = this.keyToPath(key);
|
const filePath = this.keyToPath(key);
|
||||||
try {
|
try {
|
||||||
const content = await readFile(filePath, 'utf8');
|
const content = await readFile(filePath, 'utf8');
|
||||||
return content;
|
return content;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
if (error.code === 'ENOENT') {
|
if ((error as any).code === 'ENOENT') {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
@@ -186,8 +184,8 @@ export class StorageManager {
|
|||||||
default:
|
default:
|
||||||
throw new Error(`Unknown backend: ${this.backend}`);
|
throw new Error(`Unknown backend: ${this.backend}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Storage get error for key ${key}: ${error.message}`);
|
logger.log('error', `Storage get error for key ${key}: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,7 +228,7 @@ export class StorageManager {
|
|||||||
this.memoryStore.set(key, value);
|
this.memoryStore.set(key, value);
|
||||||
// Evict oldest entries if memory store exceeds limit
|
// Evict oldest entries if memory store exceeds limit
|
||||||
while (this.memoryStore.size > StorageManager.MAX_MEMORY_ENTRIES) {
|
while (this.memoryStore.size > StorageManager.MAX_MEMORY_ENTRIES) {
|
||||||
const firstKey = this.memoryStore.keys().next().value;
|
const firstKey = this.memoryStore.keys().next().value!;
|
||||||
this.memoryStore.delete(firstKey);
|
this.memoryStore.delete(firstKey);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -239,8 +237,8 @@ export class StorageManager {
|
|||||||
default:
|
default:
|
||||||
throw new Error(`Unknown backend: ${this.backend}`);
|
throw new Error(`Unknown backend: ${this.backend}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Storage set error for key ${key}: ${error.message}`);
|
logger.log('error', `Storage set error for key ${key}: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -257,8 +255,8 @@ export class StorageManager {
|
|||||||
const filePath = this.keyToPath(key);
|
const filePath = this.keyToPath(key);
|
||||||
try {
|
try {
|
||||||
await unlink(filePath);
|
await unlink(filePath);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
if (error.code !== 'ENOENT') {
|
if ((error as any).code !== 'ENOENT') {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -281,8 +279,8 @@ export class StorageManager {
|
|||||||
default:
|
default:
|
||||||
throw new Error(`Unknown backend: ${this.backend}`);
|
throw new Error(`Unknown backend: ${this.backend}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Storage delete error for key ${key}: ${error.message}`);
|
logger.log('error', `Storage delete error for key ${key}: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -319,8 +317,8 @@ export class StorageManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
if (error.code !== 'ENOENT') {
|
if ((error as any).code !== 'ENOENT') {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -348,8 +346,8 @@ export class StorageManager {
|
|||||||
default:
|
default:
|
||||||
throw new Error(`Unknown backend: ${this.backend}`);
|
throw new Error(`Unknown backend: ${this.backend}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Storage list error for prefix ${prefix}: ${error.message}`);
|
logger.log('error', `Storage list error for prefix ${prefix}: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -390,8 +388,8 @@ export class StorageManager {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
return JSON.parse(value) as T;
|
return JSON.parse(value) as T;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
logger.log('error', `Failed to parse JSON for key ${key}: ${error.message}`);
|
logger.log('error', `Failed to parse JSON for key ${key}: ${(error as Error).message}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ Resource classes (`Route`, `Certificate`, `ApiToken`, `RemoteIngress`, `Email`)
|
|||||||
|
|
||||||
## License and Legal Information
|
## License and Legal Information
|
||||||
|
|
||||||
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](../LICENSE) file.
|
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](../license) file.
|
||||||
|
|
||||||
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ export interface IRemoteIngress {
|
|||||||
name: string;
|
name: string;
|
||||||
secret: string;
|
secret: string;
|
||||||
listenPorts: number[];
|
listenPorts: number[];
|
||||||
|
/** UDP listen ports (e.g. for QUIC/HTTP3). Derived from routes with transport 'udp' or 'all'. */
|
||||||
|
listenPortsUdp?: number[];
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
/** Whether to auto-derive ports from remoteIngress-tagged routes. Defaults to true. */
|
/** Whether to auto-derive ports from remoteIngress-tagged routes. Defaults to true. */
|
||||||
autoDerivePorts: boolean;
|
autoDerivePorts: boolean;
|
||||||
@@ -20,6 +22,8 @@ export interface IRemoteIngress {
|
|||||||
manualPorts?: number[];
|
manualPorts?: number[];
|
||||||
/** Ports auto-derived from route configs — only present in API responses. */
|
/** Ports auto-derived from route configs — only present in API responses. */
|
||||||
derivedPorts?: number[];
|
derivedPorts?: number[];
|
||||||
|
/** Effective UDP ports (union of manual + derived) — only present in API responses. */
|
||||||
|
effectiveListenPortsUdp?: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -165,6 +165,7 @@ export interface INetworkMetrics {
|
|||||||
throughputHistory?: Array<{ timestamp: number; in: number; out: number }>;
|
throughputHistory?: Array<{ timestamp: number; in: number; out: number }>;
|
||||||
requestsPerSecond?: number;
|
requestsPerSecond?: number;
|
||||||
requestsTotal?: number;
|
requestsTotal?: number;
|
||||||
|
backends?: IBackendInfo[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IConnectionDetails {
|
export interface IConnectionDetails {
|
||||||
@@ -175,3 +176,25 @@ export interface IConnectionDetails {
|
|||||||
bytesIn: number;
|
bytesIn: number;
|
||||||
bytesOut: number;
|
bytesOut: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IBackendInfo {
|
||||||
|
backend: string;
|
||||||
|
domain: string | null;
|
||||||
|
protocol: string;
|
||||||
|
activeConnections: number;
|
||||||
|
totalConnections: number;
|
||||||
|
connectErrors: number;
|
||||||
|
handshakeErrors: number;
|
||||||
|
requestErrors: number;
|
||||||
|
avgConnectTimeMs: number;
|
||||||
|
poolHitRate: number;
|
||||||
|
h2Failures: number;
|
||||||
|
h2Suppressed: boolean;
|
||||||
|
h3Suppressed: boolean;
|
||||||
|
h2CooldownRemainingSecs: number | null;
|
||||||
|
h3CooldownRemainingSecs: number | null;
|
||||||
|
h2ConsecutiveFailures: number | null;
|
||||||
|
h3ConsecutiveFailures: number | null;
|
||||||
|
h3Port: number | null;
|
||||||
|
cacheAgeSecs: number | null;
|
||||||
|
}
|
||||||
@@ -280,7 +280,7 @@ console.log('Connection token:', tokenResponse.token);
|
|||||||
|
|
||||||
## License and Legal Information
|
## License and Legal Information
|
||||||
|
|
||||||
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](../LICENSE) file.
|
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](../license) file.
|
||||||
|
|
||||||
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
|||||||
@@ -179,5 +179,6 @@ export interface IReq_GetNetworkStats extends plugins.typedrequestInterfaces.imp
|
|||||||
throughputByIP: Array<{ ip: string; in: number; out: number }>;
|
throughputByIP: Array<{ ip: string; in: number; out: number }>;
|
||||||
requestsPerSecond: number;
|
requestsPerSecond: number;
|
||||||
requestsTotal: number;
|
requestsTotal: number;
|
||||||
|
backends?: statsInterfaces.IBackendInfo[];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/dcrouter',
|
name: '@serve.zone/dcrouter',
|
||||||
version: '11.7.0',
|
version: '11.10.7',
|
||||||
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ export interface INetworkState {
|
|||||||
throughputHistory: Array<{ timestamp: number; in: number; out: number }>;
|
throughputHistory: Array<{ timestamp: number; in: number; out: number }>;
|
||||||
requestsPerSecond: number;
|
requestsPerSecond: number;
|
||||||
requestsTotal: number;
|
requestsTotal: number;
|
||||||
|
backends: interfaces.data.IBackendInfo[];
|
||||||
lastUpdated: number;
|
lastUpdated: number;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
@@ -148,6 +149,7 @@ export const networkStatePart = await appState.getStatePart<INetworkState>(
|
|||||||
throughputHistory: [],
|
throughputHistory: [],
|
||||||
requestsPerSecond: 0,
|
requestsPerSecond: 0,
|
||||||
requestsTotal: 0,
|
requestsTotal: 0,
|
||||||
|
backends: [],
|
||||||
lastUpdated: 0,
|
lastUpdated: 0,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -238,7 +240,7 @@ interface IActionContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const getActionContext = (): IActionContext => {
|
const getActionContext = (): IActionContext => {
|
||||||
const identity = loginStatePart.getState().identity;
|
const identity = loginStatePart.getState()!.identity;
|
||||||
// Treat expired JWTs as no identity — prevents stale persisted sessions from firing requests
|
// Treat expired JWTs as no identity — prevents stale persisted sessions from firing requests
|
||||||
if (identity && identity.expiresAt && identity.expiresAt < Date.now()) {
|
if (identity && identity.expiresAt && identity.expiresAt < Date.now()) {
|
||||||
return { identity: null };
|
return { identity: null };
|
||||||
@@ -250,7 +252,7 @@ const getActionContext = (): IActionContext => {
|
|||||||
export const loginAction = loginStatePart.createAction<{
|
export const loginAction = loginStatePart.createAction<{
|
||||||
username: string;
|
username: string;
|
||||||
password: string;
|
password: string;
|
||||||
}>(async (statePartArg, dataArg) => {
|
}>(async (statePartArg, dataArg): Promise<ILoginState> => {
|
||||||
const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
interfaces.requests.IReq_AdminLoginWithUsernameAndPassword
|
interfaces.requests.IReq_AdminLoginWithUsernameAndPassword
|
||||||
>('/typedrequest', 'adminLoginWithUsernameAndPassword');
|
>('/typedrequest', 'adminLoginWithUsernameAndPassword');
|
||||||
@@ -267,10 +269,10 @@ export const loginAction = loginStatePart.createAction<{
|
|||||||
isLoggedIn: true,
|
isLoggedIn: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return statePartArg.getState();
|
return statePartArg.getState()!;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
console.error('Login failed:', error);
|
console.error('Login failed:', error);
|
||||||
return statePartArg.getState();
|
return statePartArg.getState()!;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -298,9 +300,9 @@ export const logoutAction = loginStatePart.createAction(async (statePartArg) =>
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Fetch All Stats Action - Using combined endpoint for efficiency
|
// Fetch All Stats Action - Using combined endpoint for efficiency
|
||||||
export const fetchAllStatsAction = statsStatePart.createAction(async (statePartArg) => {
|
export const fetchAllStatsAction = statsStatePart.createAction(async (statePartArg): Promise<IStatsState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -330,19 +332,19 @@ export const fetchAllStatsAction = statsStatePart.createAction(async (statePartA
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: error.message || 'Failed to fetch statistics',
|
error: (error as Error).message || 'Failed to fetch statistics',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fetch Configuration Action (read-only)
|
// Fetch Configuration Action (read-only)
|
||||||
export const fetchConfigurationAction = configStatePart.createAction(async (statePartArg) => {
|
export const fetchConfigurationAction = configStatePart.createAction(async (statePartArg): Promise<IConfigState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -359,11 +361,11 @@ export const fetchConfigurationAction = configStatePart.createAction(async (stat
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: error.message || 'Failed to fetch configuration',
|
error: (error as Error).message || 'Failed to fetch configuration',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -373,9 +375,9 @@ export const fetchRecentLogsAction = logStatePart.createAction<{
|
|||||||
limit?: number;
|
limit?: number;
|
||||||
level?: 'debug' | 'info' | 'warn' | 'error';
|
level?: 'debug' | 'info' | 'warn' | 'error';
|
||||||
category?: 'smtp' | 'dns' | 'security' | 'system' | 'email';
|
category?: 'smtp' | 'dns' | 'security' | 'system' | 'email';
|
||||||
}>(async (statePartArg, dataArg) => {
|
}>(async (statePartArg, dataArg): Promise<ILogState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
if (!context.identity) return statePartArg.getState();
|
if (!context.identity) return statePartArg.getState()!;
|
||||||
|
|
||||||
const logsRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const logsRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
interfaces.requests.IReq_GetRecentLogs
|
interfaces.requests.IReq_GetRecentLogs
|
||||||
@@ -389,14 +391,14 @@ export const fetchRecentLogsAction = logStatePart.createAction<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...statePartArg.getState(),
|
...statePartArg.getState()!,
|
||||||
recentLogs: response.logs,
|
recentLogs: response.logs,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// Toggle Auto Refresh Action
|
// Toggle Auto Refresh Action
|
||||||
export const toggleAutoRefreshAction = uiStatePart.createAction(async (statePartArg) => {
|
export const toggleAutoRefreshAction = uiStatePart.createAction(async (statePartArg): Promise<IUiState> => {
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
autoRefresh: !currentState.autoRefresh,
|
autoRefresh: !currentState.autoRefresh,
|
||||||
@@ -404,8 +406,8 @@ export const toggleAutoRefreshAction = uiStatePart.createAction(async (statePart
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Set Active View Action
|
// Set Active View Action
|
||||||
export const setActiveViewAction = uiStatePart.createAction<string>(async (statePartArg, viewName) => {
|
export const setActiveViewAction = uiStatePart.createAction<string>(async (statePartArg, viewName): Promise<IUiState> => {
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
// If switching to network view, ensure we fetch network data
|
// If switching to network view, ensure we fetch network data
|
||||||
if (viewName === 'network' && currentState.activeView !== 'network') {
|
if (viewName === 'network' && currentState.activeView !== 'network') {
|
||||||
@@ -449,9 +451,9 @@ export const setActiveViewAction = uiStatePart.createAction<string>(async (state
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Fetch Network Stats Action
|
// Fetch Network Stats Action
|
||||||
export const fetchNetworkStatsAction = networkStatePart.createAction(async (statePartArg) => {
|
export const fetchNetworkStatsAction = networkStatePart.createAction(async (statePartArg): Promise<INetworkState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -503,6 +505,7 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
|
|||||||
throughputHistory: networkStatsResponse.throughputHistory || [],
|
throughputHistory: networkStatsResponse.throughputHistory || [],
|
||||||
requestsPerSecond: networkStatsResponse.requestsPerSecond || 0,
|
requestsPerSecond: networkStatsResponse.requestsPerSecond || 0,
|
||||||
requestsTotal: networkStatsResponse.requestsTotal || 0,
|
requestsTotal: networkStatsResponse.requestsTotal || 0,
|
||||||
|
backends: networkStatsResponse.backends || [],
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -522,9 +525,9 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
|
|||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
// Fetch All Emails Action
|
// Fetch All Emails Action
|
||||||
export const fetchAllEmailsAction = emailOpsStatePart.createAction(async (statePartArg) => {
|
export const fetchAllEmailsAction = emailOpsStatePart.createAction(async (statePartArg): Promise<IEmailOpsState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -555,9 +558,9 @@ export const fetchAllEmailsAction = emailOpsStatePart.createAction(async (stateP
|
|||||||
// Certificate Actions
|
// Certificate Actions
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
export const fetchCertificateOverviewAction = certificateStatePart.createAction(async (statePartArg) => {
|
export const fetchCertificateOverviewAction = certificateStatePart.createAction(async (statePartArg): Promise<ICertificateState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -586,9 +589,9 @@ export const fetchCertificateOverviewAction = certificateStatePart.createAction(
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const reprovisionCertificateAction = certificateStatePart.createAction<string>(
|
export const reprovisionCertificateAction = certificateStatePart.createAction<string>(
|
||||||
async (statePartArg, domain, actionContext) => {
|
async (statePartArg, domain, actionContext): Promise<ICertificateState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -596,13 +599,13 @@ export const reprovisionCertificateAction = certificateStatePart.createAction<st
|
|||||||
>('/typedrequest', 'reprovisionCertificateDomain');
|
>('/typedrequest', 'reprovisionCertificateDomain');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
domain,
|
domain,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Re-fetch overview after reprovisioning
|
// Re-fetch overview after reprovisioning
|
||||||
return await actionContext.dispatch(fetchCertificateOverviewAction, null);
|
return await actionContext!.dispatch(fetchCertificateOverviewAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to reprovision certificate',
|
error: error instanceof Error ? error.message : 'Failed to reprovision certificate',
|
||||||
@@ -612,9 +615,9 @@ export const reprovisionCertificateAction = certificateStatePart.createAction<st
|
|||||||
);
|
);
|
||||||
|
|
||||||
export const deleteCertificateAction = certificateStatePart.createAction<string>(
|
export const deleteCertificateAction = certificateStatePart.createAction<string>(
|
||||||
async (statePartArg, domain, actionContext) => {
|
async (statePartArg, domain, actionContext): Promise<ICertificateState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -622,13 +625,13 @@ export const deleteCertificateAction = certificateStatePart.createAction<string>
|
|||||||
>('/typedrequest', 'deleteCertificate');
|
>('/typedrequest', 'deleteCertificate');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
domain,
|
domain,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Re-fetch overview after deletion
|
// Re-fetch overview after deletion
|
||||||
return await actionContext.dispatch(fetchCertificateOverviewAction, null);
|
return await actionContext!.dispatch(fetchCertificateOverviewAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to delete certificate',
|
error: error instanceof Error ? error.message : 'Failed to delete certificate',
|
||||||
@@ -646,9 +649,9 @@ export const importCertificateAction = certificateStatePart.createAction<{
|
|||||||
publicKey: string;
|
publicKey: string;
|
||||||
csr: string;
|
csr: string;
|
||||||
}>(
|
}>(
|
||||||
async (statePartArg, cert, actionContext) => {
|
async (statePartArg, cert, actionContext): Promise<ICertificateState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -656,13 +659,13 @@ export const importCertificateAction = certificateStatePart.createAction<{
|
|||||||
>('/typedrequest', 'importCertificate');
|
>('/typedrequest', 'importCertificate');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
cert,
|
cert,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Re-fetch overview after import
|
// Re-fetch overview after import
|
||||||
return await actionContext.dispatch(fetchCertificateOverviewAction, null);
|
return await actionContext!.dispatch(fetchCertificateOverviewAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to import certificate',
|
error: error instanceof Error ? error.message : 'Failed to import certificate',
|
||||||
@@ -678,7 +681,7 @@ export async function fetchCertificateExport(domain: string) {
|
|||||||
>('/typedrequest', 'exportCertificate');
|
>('/typedrequest', 'exportCertificate');
|
||||||
|
|
||||||
return request.fire({
|
return request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
domain,
|
domain,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -692,16 +695,16 @@ export async function fetchConnectionToken(edgeId: string) {
|
|||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
interfaces.requests.IReq_GetRemoteIngressConnectionToken
|
interfaces.requests.IReq_GetRemoteIngressConnectionToken
|
||||||
>('/typedrequest', 'getRemoteIngressConnectionToken');
|
>('/typedrequest', 'getRemoteIngressConnectionToken');
|
||||||
return request.fire({ identity: context.identity, edgeId });
|
return request.fire({ identity: context.identity!, edgeId });
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Remote Ingress Actions
|
// Remote Ingress Actions
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
export const fetchRemoteIngressAction = remoteIngressStatePart.createAction(async (statePartArg) => {
|
export const fetchRemoteIngressAction = remoteIngressStatePart.createAction(async (statePartArg): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -740,9 +743,9 @@ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
listenPorts?: number[];
|
listenPorts?: number[];
|
||||||
autoDerivePorts?: boolean;
|
autoDerivePorts?: boolean;
|
||||||
tags?: string[];
|
tags?: string[];
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -750,7 +753,7 @@ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
>('/typedrequest', 'createRemoteIngress');
|
>('/typedrequest', 'createRemoteIngress');
|
||||||
|
|
||||||
const response = await request.fire({
|
const response = await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
name: dataArg.name,
|
name: dataArg.name,
|
||||||
listenPorts: dataArg.listenPorts,
|
listenPorts: dataArg.listenPorts,
|
||||||
autoDerivePorts: dataArg.autoDerivePorts,
|
autoDerivePorts: dataArg.autoDerivePorts,
|
||||||
@@ -759,16 +762,16 @@ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
// Refresh the list
|
// Refresh the list
|
||||||
await actionContext.dispatch(fetchRemoteIngressAction, null);
|
await actionContext!.dispatch(fetchRemoteIngressAction, null);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...statePartArg.getState(),
|
...statePartArg.getState()!,
|
||||||
newEdgeId: response.edge.id,
|
newEdgeId: response.edge.id,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return currentState;
|
return currentState;
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to create edge',
|
error: error instanceof Error ? error.message : 'Failed to create edge',
|
||||||
@@ -777,9 +780,9 @@ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const deleteRemoteIngressAction = remoteIngressStatePart.createAction<string>(
|
export const deleteRemoteIngressAction = remoteIngressStatePart.createAction<string>(
|
||||||
async (statePartArg, edgeId, actionContext) => {
|
async (statePartArg, edgeId, actionContext): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -787,12 +790,12 @@ export const deleteRemoteIngressAction = remoteIngressStatePart.createAction<str
|
|||||||
>('/typedrequest', 'deleteRemoteIngress');
|
>('/typedrequest', 'deleteRemoteIngress');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: edgeId,
|
id: edgeId,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchRemoteIngressAction, null);
|
return await actionContext!.dispatch(fetchRemoteIngressAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to delete edge',
|
error: error instanceof Error ? error.message : 'Failed to delete edge',
|
||||||
@@ -807,9 +810,9 @@ export const updateRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
listenPorts?: number[];
|
listenPorts?: number[];
|
||||||
autoDerivePorts?: boolean;
|
autoDerivePorts?: boolean;
|
||||||
tags?: string[];
|
tags?: string[];
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -817,7 +820,7 @@ export const updateRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
>('/typedrequest', 'updateRemoteIngress');
|
>('/typedrequest', 'updateRemoteIngress');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: dataArg.id,
|
id: dataArg.id,
|
||||||
name: dataArg.name,
|
name: dataArg.name,
|
||||||
listenPorts: dataArg.listenPorts,
|
listenPorts: dataArg.listenPorts,
|
||||||
@@ -825,8 +828,8 @@ export const updateRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
tags: dataArg.tags,
|
tags: dataArg.tags,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchRemoteIngressAction, null);
|
return await actionContext!.dispatch(fetchRemoteIngressAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to update edge',
|
error: error instanceof Error ? error.message : 'Failed to update edge',
|
||||||
@@ -835,9 +838,9 @@ export const updateRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const regenerateRemoteIngressSecretAction = remoteIngressStatePart.createAction<string>(
|
export const regenerateRemoteIngressSecretAction = remoteIngressStatePart.createAction<string>(
|
||||||
async (statePartArg, edgeId) => {
|
async (statePartArg, edgeId): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -845,7 +848,7 @@ export const regenerateRemoteIngressSecretAction = remoteIngressStatePart.create
|
|||||||
>('/typedrequest', 'regenerateRemoteIngressSecret');
|
>('/typedrequest', 'regenerateRemoteIngressSecret');
|
||||||
|
|
||||||
const response = await request.fire({
|
const response = await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: edgeId,
|
id: edgeId,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -867,9 +870,9 @@ export const regenerateRemoteIngressSecretAction = remoteIngressStatePart.create
|
|||||||
);
|
);
|
||||||
|
|
||||||
export const clearNewEdgeIdAction = remoteIngressStatePart.createAction(
|
export const clearNewEdgeIdAction = remoteIngressStatePart.createAction(
|
||||||
async (statePartArg) => {
|
async (statePartArg): Promise<IRemoteIngressState> => {
|
||||||
return {
|
return {
|
||||||
...statePartArg.getState(),
|
...statePartArg.getState()!,
|
||||||
newEdgeId: null,
|
newEdgeId: null,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -878,9 +881,9 @@ export const clearNewEdgeIdAction = remoteIngressStatePart.createAction(
|
|||||||
export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
|
export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
|
||||||
id: string;
|
id: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRemoteIngressState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -888,13 +891,13 @@ export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
>('/typedrequest', 'updateRemoteIngress');
|
>('/typedrequest', 'updateRemoteIngress');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: dataArg.id,
|
id: dataArg.id,
|
||||||
enabled: dataArg.enabled,
|
enabled: dataArg.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchRemoteIngressAction, null);
|
return await actionContext!.dispatch(fetchRemoteIngressAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to toggle edge',
|
error: error instanceof Error ? error.message : 'Failed to toggle edge',
|
||||||
@@ -906,9 +909,9 @@ export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
|
|||||||
// Route Management Actions
|
// Route Management Actions
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
export const fetchMergedRoutesAction = routeManagementStatePart.createAction(async (statePartArg) => {
|
export const fetchMergedRoutesAction = routeManagementStatePart.createAction(async (statePartArg): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -940,9 +943,9 @@ export const fetchMergedRoutesAction = routeManagementStatePart.createAction(asy
|
|||||||
export const createRouteAction = routeManagementStatePart.createAction<{
|
export const createRouteAction = routeManagementStatePart.createAction<{
|
||||||
route: any;
|
route: any;
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -950,13 +953,13 @@ export const createRouteAction = routeManagementStatePart.createAction<{
|
|||||||
>('/typedrequest', 'createRoute');
|
>('/typedrequest', 'createRoute');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
route: dataArg.route,
|
route: dataArg.route,
|
||||||
enabled: dataArg.enabled,
|
enabled: dataArg.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchMergedRoutesAction, null);
|
return await actionContext!.dispatch(fetchMergedRoutesAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to create route',
|
error: error instanceof Error ? error.message : 'Failed to create route',
|
||||||
@@ -965,9 +968,9 @@ export const createRouteAction = routeManagementStatePart.createAction<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const deleteRouteAction = routeManagementStatePart.createAction<string>(
|
export const deleteRouteAction = routeManagementStatePart.createAction<string>(
|
||||||
async (statePartArg, routeId, actionContext) => {
|
async (statePartArg, routeId, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -975,12 +978,12 @@ export const deleteRouteAction = routeManagementStatePart.createAction<string>(
|
|||||||
>('/typedrequest', 'deleteRoute');
|
>('/typedrequest', 'deleteRoute');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: routeId,
|
id: routeId,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchMergedRoutesAction, null);
|
return await actionContext!.dispatch(fetchMergedRoutesAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to delete route',
|
error: error instanceof Error ? error.message : 'Failed to delete route',
|
||||||
@@ -992,9 +995,9 @@ export const deleteRouteAction = routeManagementStatePart.createAction<string>(
|
|||||||
export const toggleRouteAction = routeManagementStatePart.createAction<{
|
export const toggleRouteAction = routeManagementStatePart.createAction<{
|
||||||
id: string;
|
id: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -1002,13 +1005,13 @@ export const toggleRouteAction = routeManagementStatePart.createAction<{
|
|||||||
>('/typedrequest', 'toggleRoute');
|
>('/typedrequest', 'toggleRoute');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: dataArg.id,
|
id: dataArg.id,
|
||||||
enabled: dataArg.enabled,
|
enabled: dataArg.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchMergedRoutesAction, null);
|
return await actionContext!.dispatch(fetchMergedRoutesAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to toggle route',
|
error: error instanceof Error ? error.message : 'Failed to toggle route',
|
||||||
@@ -1019,9 +1022,9 @@ export const toggleRouteAction = routeManagementStatePart.createAction<{
|
|||||||
export const setRouteOverrideAction = routeManagementStatePart.createAction<{
|
export const setRouteOverrideAction = routeManagementStatePart.createAction<{
|
||||||
routeName: string;
|
routeName: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -1029,13 +1032,13 @@ export const setRouteOverrideAction = routeManagementStatePart.createAction<{
|
|||||||
>('/typedrequest', 'setRouteOverride');
|
>('/typedrequest', 'setRouteOverride');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
routeName: dataArg.routeName,
|
routeName: dataArg.routeName,
|
||||||
enabled: dataArg.enabled,
|
enabled: dataArg.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchMergedRoutesAction, null);
|
return await actionContext!.dispatch(fetchMergedRoutesAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to set override',
|
error: error instanceof Error ? error.message : 'Failed to set override',
|
||||||
@@ -1044,9 +1047,9 @@ export const setRouteOverrideAction = routeManagementStatePart.createAction<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const removeRouteOverrideAction = routeManagementStatePart.createAction<string>(
|
export const removeRouteOverrideAction = routeManagementStatePart.createAction<string>(
|
||||||
async (statePartArg, routeName, actionContext) => {
|
async (statePartArg, routeName, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -1054,12 +1057,12 @@ export const removeRouteOverrideAction = routeManagementStatePart.createAction<s
|
|||||||
>('/typedrequest', 'removeRouteOverride');
|
>('/typedrequest', 'removeRouteOverride');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
routeName,
|
routeName,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchMergedRoutesAction, null);
|
return await actionContext!.dispatch(fetchMergedRoutesAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to remove override',
|
error: error instanceof Error ? error.message : 'Failed to remove override',
|
||||||
@@ -1072,9 +1075,9 @@ export const removeRouteOverrideAction = routeManagementStatePart.createAction<s
|
|||||||
// API Token Actions
|
// API Token Actions
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
export const fetchApiTokensAction = routeManagementStatePart.createAction(async (statePartArg) => {
|
export const fetchApiTokensAction = routeManagementStatePart.createAction(async (statePartArg): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
if (!context.identity) return currentState;
|
if (!context.identity) return currentState;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -1105,7 +1108,7 @@ export async function createApiToken(name: string, scopes: interfaces.data.TApiT
|
|||||||
>('/typedrequest', 'createApiToken');
|
>('/typedrequest', 'createApiToken');
|
||||||
|
|
||||||
return request.fire({
|
return request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
name,
|
name,
|
||||||
scopes,
|
scopes,
|
||||||
expiresInDays,
|
expiresInDays,
|
||||||
@@ -1119,15 +1122,15 @@ export async function rollApiToken(id: string) {
|
|||||||
>('/typedrequest', 'rollApiToken');
|
>('/typedrequest', 'rollApiToken');
|
||||||
|
|
||||||
return request.fire({
|
return request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id,
|
id,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export const revokeApiTokenAction = routeManagementStatePart.createAction<string>(
|
export const revokeApiTokenAction = routeManagementStatePart.createAction<string>(
|
||||||
async (statePartArg, tokenId, actionContext) => {
|
async (statePartArg, tokenId, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -1135,12 +1138,12 @@ export const revokeApiTokenAction = routeManagementStatePart.createAction<string
|
|||||||
>('/typedrequest', 'revokeApiToken');
|
>('/typedrequest', 'revokeApiToken');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: tokenId,
|
id: tokenId,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchApiTokensAction, null);
|
return await actionContext!.dispatch(fetchApiTokensAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to revoke token',
|
error: error instanceof Error ? error.message : 'Failed to revoke token',
|
||||||
@@ -1152,9 +1155,9 @@ export const revokeApiTokenAction = routeManagementStatePart.createAction<string
|
|||||||
export const toggleApiTokenAction = routeManagementStatePart.createAction<{
|
export const toggleApiTokenAction = routeManagementStatePart.createAction<{
|
||||||
id: string;
|
id: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}>(async (statePartArg, dataArg, actionContext) => {
|
}>(async (statePartArg, dataArg, actionContext): Promise<IRouteManagementState> => {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
const currentState = statePartArg.getState();
|
const currentState = statePartArg.getState()!;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
@@ -1162,13 +1165,13 @@ export const toggleApiTokenAction = routeManagementStatePart.createAction<{
|
|||||||
>('/typedrequest', 'toggleApiToken');
|
>('/typedrequest', 'toggleApiToken');
|
||||||
|
|
||||||
await request.fire({
|
await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
id: dataArg.id,
|
id: dataArg.id,
|
||||||
enabled: dataArg.enabled,
|
enabled: dataArg.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
return await actionContext.dispatch(fetchApiTokensAction, null);
|
return await actionContext!.dispatch(fetchApiTokensAction, null);
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
error: error instanceof Error ? error.message : 'Failed to toggle token',
|
error: error instanceof Error ? error.message : 'Failed to toggle token',
|
||||||
@@ -1188,13 +1191,13 @@ socketRouter.addTypedHandler(
|
|||||||
new plugins.domtools.plugins.typedrequest.TypedHandler<interfaces.requests.IReq_PushLogEntry>(
|
new plugins.domtools.plugins.typedrequest.TypedHandler<interfaces.requests.IReq_PushLogEntry>(
|
||||||
'pushLogEntry',
|
'pushLogEntry',
|
||||||
async (dataArg) => {
|
async (dataArg) => {
|
||||||
const current = logStatePart.getState();
|
const current = logStatePart.getState()!;
|
||||||
const updated = [...current.recentLogs, dataArg.entry];
|
const updated = [...current.recentLogs, dataArg.entry];
|
||||||
// Cap at 2000 entries
|
// Cap at 2000 entries
|
||||||
if (updated.length > 2000) {
|
if (updated.length > 2000) {
|
||||||
updated.splice(0, updated.length - 2000);
|
updated.splice(0, updated.length - 2000);
|
||||||
}
|
}
|
||||||
logStatePart.setState({ ...current, recentLogs: updated });
|
logStatePart.setState({ ...current, recentLogs: updated } as ILogState);
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -1229,7 +1232,7 @@ async function disconnectSocket() {
|
|||||||
async function dispatchCombinedRefreshAction() {
|
async function dispatchCombinedRefreshAction() {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
if (!context.identity) return;
|
if (!context.identity) return;
|
||||||
const currentView = uiStatePart.getState().activeView;
|
const currentView = uiStatePart.getState()!.activeView;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Always fetch basic stats for dashboard widgets
|
// Always fetch basic stats for dashboard widgets
|
||||||
@@ -1249,12 +1252,13 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Update all stats from combined response
|
// Update all stats from combined response
|
||||||
|
const currentStatsState = statsStatePart.getState()!;
|
||||||
statsStatePart.setState({
|
statsStatePart.setState({
|
||||||
...statsStatePart.getState(),
|
...currentStatsState,
|
||||||
serverStats: combinedResponse.metrics.server || statsStatePart.getState().serverStats,
|
serverStats: combinedResponse.metrics.server || currentStatsState.serverStats,
|
||||||
emailStats: combinedResponse.metrics.email || statsStatePart.getState().emailStats,
|
emailStats: combinedResponse.metrics.email || currentStatsState.emailStats,
|
||||||
dnsStats: combinedResponse.metrics.dns || statsStatePart.getState().dnsStats,
|
dnsStats: combinedResponse.metrics.dns || currentStatsState.dnsStats,
|
||||||
securityMetrics: combinedResponse.metrics.security || statsStatePart.getState().securityMetrics,
|
securityMetrics: combinedResponse.metrics.security || currentStatsState.securityMetrics,
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -1281,7 +1285,7 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
networkStatePart.setState({
|
networkStatePart.setState({
|
||||||
...networkStatePart.getState(),
|
...networkStatePart.getState()!,
|
||||||
connections: connectionsResponse.connections,
|
connections: connectionsResponse.connections,
|
||||||
connectionsByIP,
|
connectionsByIP,
|
||||||
throughputRate: {
|
throughputRate: {
|
||||||
@@ -1294,14 +1298,15 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
throughputHistory: network.throughputHistory || [],
|
throughputHistory: network.throughputHistory || [],
|
||||||
requestsPerSecond: network.requestsPerSecond || 0,
|
requestsPerSecond: network.requestsPerSecond || 0,
|
||||||
requestsTotal: network.requestsTotal || 0,
|
requestsTotal: network.requestsTotal || 0,
|
||||||
|
backends: network.backends || [],
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error: unknown) {
|
||||||
console.error('Failed to fetch connections:', error);
|
console.error('Failed to fetch connections:', error);
|
||||||
networkStatePart.setState({
|
networkStatePart.setState({
|
||||||
...networkStatePart.getState(),
|
...networkStatePart.getState()!,
|
||||||
connections: [],
|
connections: [],
|
||||||
connectionsByIP,
|
connectionsByIP,
|
||||||
throughputRate: {
|
throughputRate: {
|
||||||
@@ -1314,6 +1319,7 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
throughputHistory: network.throughputHistory || [],
|
throughputHistory: network.throughputHistory || [],
|
||||||
requestsPerSecond: network.requestsPerSecond || 0,
|
requestsPerSecond: network.requestsPerSecond || 0,
|
||||||
requestsTotal: network.requestsTotal || 0,
|
requestsTotal: network.requestsTotal || 0,
|
||||||
|
backends: network.backends || [],
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -1356,8 +1362,8 @@ let currentRefreshRate = 1000; // Track current refresh rate to avoid unnecessar
|
|||||||
// Initialize auto-refresh when UI state is ready
|
// Initialize auto-refresh when UI state is ready
|
||||||
(() => {
|
(() => {
|
||||||
const startAutoRefresh = () => {
|
const startAutoRefresh = () => {
|
||||||
const uiState = uiStatePart.getState();
|
const uiState = uiStatePart.getState()!;
|
||||||
const loginState = loginStatePart.getState();
|
const loginState = loginStatePart.getState()!;
|
||||||
|
|
||||||
// Only start if conditions are met and not already running at the same rate
|
// Only start if conditions are met and not already running at the same rate
|
||||||
if (uiState.autoRefresh && loginState.isLoggedIn) {
|
if (uiState.autoRefresh && loginState.isLoggedIn) {
|
||||||
@@ -1384,9 +1390,9 @@ let currentRefreshRate = 1000; // Track current refresh rate to avoid unnecessar
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Watch for relevant changes only
|
// Watch for relevant changes only
|
||||||
let previousAutoRefresh = uiStatePart.getState().autoRefresh;
|
let previousAutoRefresh = uiStatePart.getState()!.autoRefresh;
|
||||||
let previousRefreshInterval = uiStatePart.getState().refreshInterval;
|
let previousRefreshInterval = uiStatePart.getState()!.refreshInterval;
|
||||||
let previousIsLoggedIn = loginStatePart.getState().isLoggedIn;
|
let previousIsLoggedIn = loginStatePart.getState()!.isLoggedIn;
|
||||||
|
|
||||||
uiStatePart.state.subscribe((state) => {
|
uiStatePart.state.subscribe((state) => {
|
||||||
// Only restart if relevant values changed
|
// Only restart if relevant values changed
|
||||||
@@ -1417,7 +1423,7 @@ let currentRefreshRate = 1000; // Track current refresh rate to avoid unnecessar
|
|||||||
startAutoRefresh();
|
startAutoRefresh();
|
||||||
|
|
||||||
// Connect TypedSocket if already logged in (e.g., persistent session)
|
// Connect TypedSocket if already logged in (e.g., persistent session)
|
||||||
if (loginStatePart.getState().isLoggedIn) {
|
if (loginStatePart.getState()!.isLoggedIn) {
|
||||||
connectSocket();
|
connectSocket();
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
@@ -195,17 +195,18 @@ export class OpsDashboard extends DeesElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async firstUpdated() {
|
public async firstUpdated() {
|
||||||
const simpleLogin = this.shadowRoot.querySelector('dees-simple-login');
|
const simpleLogin = this.shadowRoot!.querySelector('dees-simple-login') as any;
|
||||||
simpleLogin.addEventListener('login', (e: CustomEvent) => {
|
simpleLogin.addEventListener('login', (e: Event) => {
|
||||||
// Handle logout event
|
// Handle logout event
|
||||||
this.login(e.detail.data.username, e.detail.data.password);
|
const detail = (e as CustomEvent).detail;
|
||||||
|
this.login(detail.data.username, detail.data.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle view changes
|
// Handle view changes
|
||||||
const appDash = this.shadowRoot.querySelector('dees-simple-appdash');
|
const appDash = this.shadowRoot!.querySelector('dees-simple-appdash');
|
||||||
if (appDash) {
|
if (appDash) {
|
||||||
appDash.addEventListener('view-select', (e: CustomEvent) => {
|
appDash.addEventListener('view-select', (e: Event) => {
|
||||||
const viewName = e.detail.view.name.toLowerCase();
|
const viewName = (e as CustomEvent).detail.view.name.toLowerCase();
|
||||||
// Use router for navigation instead of direct state update
|
// Use router for navigation instead of direct state update
|
||||||
appRouter.navigateToView(viewName);
|
appRouter.navigateToView(viewName);
|
||||||
});
|
});
|
||||||
@@ -217,7 +218,7 @@ export class OpsDashboard extends DeesElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle initial state - check if we have a stored session that's still valid
|
// Handle initial state - check if we have a stored session that's still valid
|
||||||
const loginState = appstate.loginStatePart.getState();
|
const loginState = appstate.loginStatePart.getState()!;
|
||||||
if (loginState.identity?.jwt) {
|
if (loginState.identity?.jwt) {
|
||||||
if (loginState.identity.expiresAt > Date.now()) {
|
if (loginState.identity.expiresAt > Date.now()) {
|
||||||
// Client-side expiry looks valid — verify with server (keypair may have changed)
|
// Client-side expiry looks valid — verify with server (keypair may have changed)
|
||||||
@@ -229,7 +230,7 @@ export class OpsDashboard extends DeesElement {
|
|||||||
if (response.valid) {
|
if (response.valid) {
|
||||||
// JWT confirmed valid by server
|
// JWT confirmed valid by server
|
||||||
this.loginState = loginState;
|
this.loginState = loginState;
|
||||||
await simpleLogin.switchToSlottedContent();
|
await (simpleLogin as any).switchToSlottedContent();
|
||||||
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
||||||
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
||||||
} else {
|
} else {
|
||||||
@@ -250,8 +251,8 @@ export class OpsDashboard extends DeesElement {
|
|||||||
private async login(username: string, password: string) {
|
private async login(username: string, password: string) {
|
||||||
const domtools = await this.domtoolsPromise;
|
const domtools = await this.domtoolsPromise;
|
||||||
console.log(`Attempting to login...`);
|
console.log(`Attempting to login...`);
|
||||||
const simpleLogin = this.shadowRoot.querySelector('dees-simple-login');
|
const simpleLogin = this.shadowRoot!.querySelector('dees-simple-login') as any;
|
||||||
const form = simpleLogin.shadowRoot.querySelector('dees-form');
|
const form = simpleLogin.shadowRoot!.querySelector('dees-form') as any;
|
||||||
form.setStatus('pending', 'Logging in...');
|
form.setStatus('pending', 'Logging in...');
|
||||||
|
|
||||||
const state = await appstate.loginStatePart.dispatchAction(appstate.loginAction, {
|
const state = await appstate.loginStatePart.dispatchAction(appstate.loginAction, {
|
||||||
@@ -262,14 +263,14 @@ export class OpsDashboard extends DeesElement {
|
|||||||
if (state.identity) {
|
if (state.identity) {
|
||||||
console.log('Login successful');
|
console.log('Login successful');
|
||||||
this.loginState = state;
|
this.loginState = state;
|
||||||
form.setStatus('success', 'Logged in!');
|
form!.setStatus('success', 'Logged in!');
|
||||||
await simpleLogin.switchToSlottedContent();
|
await simpleLogin!.switchToSlottedContent();
|
||||||
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
||||||
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
||||||
} else {
|
} else {
|
||||||
form.setStatus('error', 'Login failed!');
|
form!.setStatus('error', 'Login failed!');
|
||||||
await domtools.convenience.smartdelay.delayFor(2000);
|
await domtools.convenience.smartdelay.delayFor(2000);
|
||||||
form.reset();
|
form!.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,7 @@ declare global {
|
|||||||
@customElement('ops-view-certificates')
|
@customElement('ops-view-certificates')
|
||||||
export class OpsViewCertificates extends DeesElement {
|
export class OpsViewCertificates extends DeesElement {
|
||||||
@state()
|
@state()
|
||||||
accessor certState: appstate.ICertificateState = appstate.certificateStatePart.getState();
|
accessor certState: appstate.ICertificateState = appstate.certificateStatePart.getState()!;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
@@ -264,10 +264,10 @@ export class OpsViewCertificates extends DeesElement {
|
|||||||
{
|
{
|
||||||
name: 'Import',
|
name: 'Import',
|
||||||
iconName: 'lucide:upload',
|
iconName: 'lucide:upload',
|
||||||
action: async (modal) => {
|
action: async (modal: any) => {
|
||||||
const { DeesToast } = await import('@design.estate/dees-catalog');
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
||||||
try {
|
try {
|
||||||
const form = modal.shadowRoot.querySelector('dees-form') as any;
|
const form = modal.shadowRoot!.querySelector('dees-form') as any;
|
||||||
const formData = await form.collectFormData();
|
const formData = await form.collectFormData();
|
||||||
const files = formData.certJsonFile;
|
const files = formData.certJsonFile;
|
||||||
if (!files || files.length === 0) {
|
if (!files || files.length === 0) {
|
||||||
@@ -287,8 +287,8 @@ export class OpsViewCertificates extends DeesElement {
|
|||||||
);
|
);
|
||||||
DeesToast.show({ message: `Certificate imported for ${cert.domainName}`, type: 'success', duration: 3000 });
|
DeesToast.show({ message: `Certificate imported for ${cert.domainName}`, type: 'success', duration: 3000 });
|
||||||
modal.destroy();
|
modal.destroy();
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
DeesToast.show({ message: `Import failed: ${err.message}`, type: 'error', duration: 4000 });
|
DeesToast.show({ message: `Import failed: ${(err as Error).message}`, type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -339,8 +339,8 @@ export class OpsViewCertificates extends DeesElement {
|
|||||||
} else {
|
} else {
|
||||||
DeesToast.show({ message: response.message || 'Export failed', type: 'error', duration: 4000 });
|
DeesToast.show({ message: response.message || 'Export failed', type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
DeesToast.show({ message: `Export failed: ${err.message}`, type: 'error', duration: 4000 });
|
DeesToast.show({ message: `Export failed: ${(err as Error).message}`, type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -363,7 +363,7 @@ export class OpsViewCertificates extends DeesElement {
|
|||||||
{
|
{
|
||||||
name: 'Delete',
|
name: 'Delete',
|
||||||
iconName: 'lucide:trash-2',
|
iconName: 'lucide:trash-2',
|
||||||
action: async (modal) => {
|
action: async (modal: any) => {
|
||||||
try {
|
try {
|
||||||
await appstate.certificateStatePart.dispatchAction(
|
await appstate.certificateStatePart.dispatchAction(
|
||||||
appstate.deleteCertificateAction,
|
appstate.deleteCertificateAction,
|
||||||
@@ -371,8 +371,8 @@ export class OpsViewCertificates extends DeesElement {
|
|||||||
);
|
);
|
||||||
DeesToast.show({ message: `Certificate deleted for ${cert.domain}`, type: 'success', duration: 3000 });
|
DeesToast.show({ message: `Certificate deleted for ${cert.domain}`, type: 'success', duration: 3000 });
|
||||||
modal.destroy();
|
modal.destroy();
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
DeesToast.show({ message: `Delete failed: ${err.message}`, type: 'error', duration: 4000 });
|
DeesToast.show({ message: `Delete failed: ${(err as Error).message}`, type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderSystemSection(sys: appstate.IConfigState['config']['system']): TemplateResult {
|
private renderSystemSection(sys: NonNullable<appstate.IConfigState['config']>['system']): TemplateResult {
|
||||||
// Annotate proxy IPs with source hint when Remote Ingress is active
|
// Annotate proxy IPs with source hint when Remote Ingress is active
|
||||||
const ri = this.configState.config?.remoteIngress;
|
const ri = this.configState.config?.remoteIngress;
|
||||||
let proxyIpValues: string[] | null = sys.proxyIps.length > 0 ? [...sys.proxyIps] : null;
|
let proxyIpValues: string[] | null = sys.proxyIps.length > 0 ? [...sys.proxyIps] : null;
|
||||||
@@ -133,7 +133,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderSmartProxySection(proxy: appstate.IConfigState['config']['smartProxy']): TemplateResult {
|
private renderSmartProxySection(proxy: NonNullable<appstate.IConfigState['config']>['smartProxy']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Route Count', value: proxy.routeCount },
|
{ key: 'Route Count', value: proxy.routeCount },
|
||||||
];
|
];
|
||||||
@@ -164,7 +164,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderEmailSection(email: appstate.IConfigState['config']['email']): TemplateResult {
|
private renderEmailSection(email: NonNullable<appstate.IConfigState['config']>['email']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Ports', value: email.ports.length > 0 ? email.ports.map(String) : null, type: 'pills' },
|
{ key: 'Ports', value: email.ports.length > 0 ? email.ports.map(String) : null, type: 'pills' },
|
||||||
{ key: 'Hostname', value: email.hostname },
|
{ key: 'Hostname', value: email.hostname },
|
||||||
@@ -196,7 +196,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderDnsSection(dns: appstate.IConfigState['config']['dns']): TemplateResult {
|
private renderDnsSection(dns: NonNullable<appstate.IConfigState['config']>['dns']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Port', value: dns.port },
|
{ key: 'Port', value: dns.port },
|
||||||
{ key: 'NS Domains', value: dns.nsDomains.length > 0 ? dns.nsDomains : null, type: 'pills' },
|
{ key: 'NS Domains', value: dns.nsDomains.length > 0 ? dns.nsDomains : null, type: 'pills' },
|
||||||
@@ -216,7 +216,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderTlsSection(tls: appstate.IConfigState['config']['tls']): TemplateResult {
|
private renderTlsSection(tls: NonNullable<appstate.IConfigState['config']>['tls']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Contact Email', value: tls.contactEmail },
|
{ key: 'Contact Email', value: tls.contactEmail },
|
||||||
{ key: 'Domain', value: tls.domain },
|
{ key: 'Domain', value: tls.domain },
|
||||||
@@ -242,7 +242,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderCacheSection(cache: appstate.IConfigState['config']['cache']): TemplateResult {
|
private renderCacheSection(cache: NonNullable<appstate.IConfigState['config']>['cache']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Storage Path', value: cache.storagePath },
|
{ key: 'Storage Path', value: cache.storagePath },
|
||||||
{ key: 'DB Name', value: cache.dbName },
|
{ key: 'DB Name', value: cache.dbName },
|
||||||
@@ -267,7 +267,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderRadiusSection(radius: appstate.IConfigState['config']['radius']): TemplateResult {
|
private renderRadiusSection(radius: NonNullable<appstate.IConfigState['config']>['radius']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Auth Port', value: radius.authPort },
|
{ key: 'Auth Port', value: radius.authPort },
|
||||||
{ key: 'Accounting Port', value: radius.acctPort },
|
{ key: 'Accounting Port', value: radius.acctPort },
|
||||||
@@ -296,7 +296,7 @@ export class OpsViewConfig extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderRemoteIngressSection(ri: appstate.IConfigState['config']['remoteIngress']): TemplateResult {
|
private renderRemoteIngressSection(ri: NonNullable<appstate.IConfigState['config']>['remoteIngress']): TemplateResult {
|
||||||
const fields: IConfigField[] = [
|
const fields: IConfigField[] = [
|
||||||
{ key: 'Tunnel Port', value: ri.tunnelPort },
|
{ key: 'Tunnel Port', value: ri.tunnelPort },
|
||||||
{ key: 'Hub Domain', value: ri.hubDomain },
|
{ key: 'Hub Domain', value: ri.hubDomain },
|
||||||
|
|||||||
@@ -83,13 +83,13 @@ export class OpsViewEmails extends DeesElement {
|
|||||||
private async handleEmailClick(e: CustomEvent<interfaces.requests.IEmail>) {
|
private async handleEmailClick(e: CustomEvent<interfaces.requests.IEmail>) {
|
||||||
const emailSummary = e.detail;
|
const emailSummary = e.detail;
|
||||||
try {
|
try {
|
||||||
const context = appstate.loginStatePart.getState();
|
const context = appstate.loginStatePart.getState()!;
|
||||||
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
interfaces.requests.IReq_GetEmailDetail
|
interfaces.requests.IReq_GetEmailDetail
|
||||||
>('/typedrequest', 'getEmailDetail');
|
>('/typedrequest', 'getEmailDetail');
|
||||||
|
|
||||||
const response = await request.fire({
|
const response = await request.fire({
|
||||||
identity: context.identity,
|
identity: context.identity!,
|
||||||
emailId: emailSummary.id,
|
emailId: emailSummary.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { DeesElement, property, html, customElement, type TemplateResult, css, state, cssManager } from '@design.estate/dees-element';
|
import { DeesElement, property, html, customElement, type TemplateResult, css, state, cssManager } from '@design.estate/dees-element';
|
||||||
import * as appstate from '../appstate.js';
|
import * as appstate from '../appstate.js';
|
||||||
|
import * as interfaces from '../../dist_ts_interfaces/index.js';
|
||||||
import { viewHostCss } from './shared/css.js';
|
import { viewHostCss } from './shared/css.js';
|
||||||
import { type IStatsTile } from '@design.estate/dees-catalog';
|
import { type IStatsTile } from '@design.estate/dees-catalog';
|
||||||
|
|
||||||
@@ -28,10 +29,10 @@ interface INetworkRequest {
|
|||||||
@customElement('ops-view-network')
|
@customElement('ops-view-network')
|
||||||
export class OpsViewNetwork extends DeesElement {
|
export class OpsViewNetwork extends DeesElement {
|
||||||
@state()
|
@state()
|
||||||
accessor statsState = appstate.statsStatePart.getState();
|
accessor statsState = appstate.statsStatePart.getState()!;
|
||||||
|
|
||||||
@state()
|
@state()
|
||||||
accessor networkState = appstate.networkStatePart.getState();
|
accessor networkState = appstate.networkStatePart.getState()!;
|
||||||
|
|
||||||
|
|
||||||
@state()
|
@state()
|
||||||
@@ -198,6 +199,38 @@ export class OpsViewNetwork extends DeesElement {
|
|||||||
color: ${cssManager.bdTheme('#00796b', '#4db6ac')};
|
color: ${cssManager.bdTheme('#00796b', '#4db6ac')};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.protocolBadge.h1 {
|
||||||
|
background: ${cssManager.bdTheme('#e3f2fd', '#1a2c3a')};
|
||||||
|
color: ${cssManager.bdTheme('#1976d2', '#5a9fd4')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.protocolBadge.h2 {
|
||||||
|
background: ${cssManager.bdTheme('#e8f5e9', '#1a3a1a')};
|
||||||
|
color: ${cssManager.bdTheme('#388e3c', '#66bb6a')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.protocolBadge.h3 {
|
||||||
|
background: ${cssManager.bdTheme('#f3e5f5', '#2a1a3a')};
|
||||||
|
color: ${cssManager.bdTheme('#7b1fa2', '#ba68c8')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.protocolBadge.unknown {
|
||||||
|
background: ${cssManager.bdTheme('#f5f5f5', '#2a2a2a')};
|
||||||
|
color: ${cssManager.bdTheme('#757575', '#999999')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.suppressionBadge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 2px 6px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 500;
|
||||||
|
background: ${cssManager.bdTheme('#fff3e0', '#3a2a1a')};
|
||||||
|
color: ${cssManager.bdTheme('#f57c00', '#ff9933')};
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.statusBadge {
|
.statusBadge {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -265,6 +298,9 @@ export class OpsViewNetwork extends DeesElement {
|
|||||||
<!-- Top IPs Section -->
|
<!-- Top IPs Section -->
|
||||||
${this.renderTopIPs()}
|
${this.renderTopIPs()}
|
||||||
|
|
||||||
|
<!-- Backend Protocols Section -->
|
||||||
|
${this.renderBackendProtocols()}
|
||||||
|
|
||||||
<!-- Requests Table -->
|
<!-- Requests Table -->
|
||||||
<dees-table
|
<dees-table
|
||||||
.data=${this.networkRequests}
|
.data=${this.networkRequests}
|
||||||
@@ -519,6 +555,106 @@ export class OpsViewNetwork extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private renderBackendProtocols(): TemplateResult {
|
||||||
|
const backends = this.networkState.backends;
|
||||||
|
if (!backends || backends.length === 0) {
|
||||||
|
return html``;
|
||||||
|
}
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<dees-table
|
||||||
|
.data=${backends}
|
||||||
|
.displayFunction=${(item: interfaces.data.IBackendInfo) => {
|
||||||
|
const totalErrors = item.connectErrors + item.handshakeErrors + item.requestErrors;
|
||||||
|
const protocolClass = item.protocol.toLowerCase().replace(/[^a-z0-9]/g, '');
|
||||||
|
|
||||||
|
return {
|
||||||
|
'Backend': item.backend,
|
||||||
|
'Domain': item.domain || '-',
|
||||||
|
'Protocol': html`
|
||||||
|
<span class="protocolBadge ${protocolClass}">${item.protocol.toUpperCase()}</span>
|
||||||
|
${item.h2Suppressed ? html`<span class="suppressionBadge" title="H2 suppressed: ${item.h2ConsecutiveFailures ?? 0} failures, cooldown ${item.h2CooldownRemainingSecs ?? 0}s">H2 suppressed</span>` : ''}
|
||||||
|
${item.h3Suppressed ? html`<span class="suppressionBadge" title="H3 suppressed: ${item.h3ConsecutiveFailures ?? 0} failures, cooldown ${item.h3CooldownRemainingSecs ?? 0}s">H3 suppressed</span>` : ''}
|
||||||
|
`,
|
||||||
|
'Active': item.activeConnections,
|
||||||
|
'Total': this.formatNumber(item.totalConnections),
|
||||||
|
'Avg Connect': item.avgConnectTimeMs > 0 ? `${item.avgConnectTimeMs.toFixed(1)}ms` : '-',
|
||||||
|
'Pool Hit Rate': item.poolHitRate > 0 ? `${(item.poolHitRate * 100).toFixed(1)}%` : '-',
|
||||||
|
'Errors': totalErrors > 0
|
||||||
|
? html`<span class="statusBadge error">${totalErrors}</span>`
|
||||||
|
: html`<span class="statusBadge success">0</span>`,
|
||||||
|
'Cache Age': item.cacheAgeSecs != null ? `${Math.round(item.cacheAgeSecs)}s` : '-',
|
||||||
|
};
|
||||||
|
}}
|
||||||
|
.dataActions=${[
|
||||||
|
{
|
||||||
|
name: 'View Details',
|
||||||
|
iconName: 'lucide:info',
|
||||||
|
type: ['inRow', 'doubleClick', 'contextmenu'] as any,
|
||||||
|
actionFunc: async (actionData: any) => {
|
||||||
|
await this.showBackendDetails(actionData.item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
heading1="Backend Protocols"
|
||||||
|
heading2="Auto-detected backend protocols and connection pool health"
|
||||||
|
searchable
|
||||||
|
.pagination=${false}
|
||||||
|
dataName="backend"
|
||||||
|
></dees-table>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async showBackendDetails(backend: interfaces.data.IBackendInfo) {
|
||||||
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
||||||
|
|
||||||
|
await DeesModal.createAndShow({
|
||||||
|
heading: `Backend: ${backend.backend}`,
|
||||||
|
content: html`
|
||||||
|
<div style="padding: 20px;">
|
||||||
|
<dees-dataview-codebox
|
||||||
|
.heading=${'Backend Details'}
|
||||||
|
progLang="json"
|
||||||
|
.codeToDisplay=${JSON.stringify({
|
||||||
|
backend: backend.backend,
|
||||||
|
domain: backend.domain,
|
||||||
|
protocol: backend.protocol,
|
||||||
|
activeConnections: backend.activeConnections,
|
||||||
|
totalConnections: backend.totalConnections,
|
||||||
|
avgConnectTimeMs: backend.avgConnectTimeMs,
|
||||||
|
poolHitRate: backend.poolHitRate,
|
||||||
|
errors: {
|
||||||
|
connect: backend.connectErrors,
|
||||||
|
handshake: backend.handshakeErrors,
|
||||||
|
request: backend.requestErrors,
|
||||||
|
h2Failures: backend.h2Failures,
|
||||||
|
},
|
||||||
|
suppression: {
|
||||||
|
h2Suppressed: backend.h2Suppressed,
|
||||||
|
h3Suppressed: backend.h3Suppressed,
|
||||||
|
h2CooldownRemainingSecs: backend.h2CooldownRemainingSecs,
|
||||||
|
h3CooldownRemainingSecs: backend.h3CooldownRemainingSecs,
|
||||||
|
h2ConsecutiveFailures: backend.h2ConsecutiveFailures,
|
||||||
|
h3ConsecutiveFailures: backend.h3ConsecutiveFailures,
|
||||||
|
},
|
||||||
|
h3Port: backend.h3Port,
|
||||||
|
cacheAgeSecs: backend.cacheAgeSecs,
|
||||||
|
}, null, 2)}
|
||||||
|
></dees-dataview-codebox>
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
menuOptions: [
|
||||||
|
{
|
||||||
|
name: 'Copy Backend Key',
|
||||||
|
iconName: 'lucide:Copy',
|
||||||
|
action: async () => {
|
||||||
|
await navigator.clipboard.writeText(backend.backend);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private async updateNetworkData() {
|
private async updateNetworkData() {
|
||||||
// Track requests/sec history for the trend sparkline (moved out of render)
|
// Track requests/sec history for the trend sparkline (moved out of render)
|
||||||
const reqPerSec = this.networkState.requestsPerSecond || 0;
|
const reqPerSec = this.networkState.requestsPerSecond || 0;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ declare global {
|
|||||||
@customElement('ops-view-remoteingress')
|
@customElement('ops-view-remoteingress')
|
||||||
export class OpsViewRemoteIngress extends DeesElement {
|
export class OpsViewRemoteIngress extends DeesElement {
|
||||||
@state()
|
@state()
|
||||||
accessor riState: appstate.IRemoteIngressState = appstate.remoteIngressStatePart.getState();
|
accessor riState: appstate.IRemoteIngressState = appstate.remoteIngressStatePart.getState()!;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
@@ -184,7 +184,7 @@ export class OpsViewRemoteIngress extends DeesElement {
|
|||||||
@click=${async () => {
|
@click=${async () => {
|
||||||
const { DeesToast } = await import('@design.estate/dees-catalog');
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
||||||
try {
|
try {
|
||||||
const response = await appstate.fetchConnectionToken(this.riState.newEdgeId);
|
const response = await appstate.fetchConnectionToken(this.riState.newEdgeId!);
|
||||||
if (response.success && response.token) {
|
if (response.success && response.token) {
|
||||||
if (navigator.clipboard && typeof navigator.clipboard.writeText === 'function') {
|
if (navigator.clipboard && typeof navigator.clipboard.writeText === 'function') {
|
||||||
await navigator.clipboard.writeText(response.token);
|
await navigator.clipboard.writeText(response.token);
|
||||||
@@ -202,8 +202,8 @@ export class OpsViewRemoteIngress extends DeesElement {
|
|||||||
} else {
|
} else {
|
||||||
DeesToast.show({ message: response.message || 'Failed to get token', type: 'error', duration: 4000 });
|
DeesToast.show({ message: response.message || 'Failed to get token', type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
DeesToast.show({ message: `Failed: ${err.message}`, type: 'error', duration: 4000 });
|
DeesToast.show({ message: `Failed: ${(err as Error).message}`, type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
>Copy Connection Token</dees-button>
|
>Copy Connection Token</dees-button>
|
||||||
@@ -399,8 +399,8 @@ export class OpsViewRemoteIngress extends DeesElement {
|
|||||||
} else {
|
} else {
|
||||||
DeesToast.show({ message: response.message || 'Failed to get token', type: 'error', duration: 4000 });
|
DeesToast.show({ message: response.message || 'Failed to get token', type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err: unknown) {
|
||||||
DeesToast.show({ message: `Failed: ${err.message}`, type: 'error', duration: 4000 });
|
DeesToast.show({ message: `Failed: ${(err as Error).message}`, type: 'error', duration: 4000 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ export class OpsViewMyView extends DeesElement {
|
|||||||
|
|
||||||
## License and Legal Information
|
## License and Legal Information
|
||||||
|
|
||||||
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](../LICENSE) file.
|
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](../license) file.
|
||||||
|
|
||||||
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
|||||||
@@ -71,12 +71,12 @@ class AppRouter {
|
|||||||
|
|
||||||
private updateViewState(view: string): void {
|
private updateViewState(view: string): void {
|
||||||
this.suppressStateUpdate = true;
|
this.suppressStateUpdate = true;
|
||||||
const currentState = appstate.uiStatePart.getState();
|
const currentState = appstate.uiStatePart.getState()!;
|
||||||
if (currentState.activeView !== view) {
|
if (currentState.activeView !== view) {
|
||||||
appstate.uiStatePart.setState({
|
appstate.uiStatePart.setState({
|
||||||
...currentState,
|
...currentState,
|
||||||
activeView: view,
|
activeView: view,
|
||||||
});
|
} as appstate.IUiState);
|
||||||
}
|
}
|
||||||
this.suppressStateUpdate = false;
|
this.suppressStateUpdate = false;
|
||||||
}
|
}
|
||||||
@@ -94,7 +94,7 @@ class AppRouter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public getCurrentView(): string {
|
public getCurrentView(): string {
|
||||||
return appstate.uiStatePart.getState().activeView;
|
return appstate.uiStatePart.getState()!.activeView;
|
||||||
}
|
}
|
||||||
|
|
||||||
public destroy(): void {
|
public destroy(): void {
|
||||||
|
|||||||
Reference in New Issue
Block a user