@serve.zone/dcrouter 11.0.31 → 11.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist_serve/bundle.js +1 -1
  2. package/dist_ts/cache/classes.cache.cleaner.d.ts +47 -0
  3. package/dist_ts/cache/classes.cache.cleaner.js +130 -0
  4. package/dist_ts/cache/classes.cached.document.d.ts +76 -0
  5. package/dist_ts/cache/classes.cached.document.js +100 -0
  6. package/dist_ts/cache/classes.cachedb.d.ts +60 -0
  7. package/dist_ts/cache/classes.cachedb.js +126 -0
  8. package/dist_ts/cache/documents/classes.cached.email.d.ts +125 -0
  9. package/dist_ts/cache/documents/classes.cached.email.js +337 -0
  10. package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +119 -0
  11. package/dist_ts/cache/documents/classes.cached.ip.reputation.js +323 -0
  12. package/dist_ts/cache/documents/index.d.ts +2 -0
  13. package/dist_ts/cache/documents/index.js +3 -0
  14. package/dist_ts/cache/index.d.ts +4 -0
  15. package/dist_ts/cache/index.js +7 -0
  16. package/dist_ts/classes.cert-provision-scheduler.d.ts +53 -0
  17. package/dist_ts/classes.cert-provision-scheduler.js +110 -0
  18. package/dist_ts/classes.storage-cert-manager.d.ts +18 -0
  19. package/dist_ts/classes.storage-cert-manager.js +43 -0
  20. package/dist_ts/logger.d.ts +21 -0
  21. package/dist_ts/logger.js +81 -0
  22. package/dist_ts/opsserver/handlers/admin.handler.d.ts +31 -0
  23. package/dist_ts/opsserver/handlers/admin.handler.js +180 -0
  24. package/dist_ts/opsserver/handlers/config.handler.d.ts +7 -0
  25. package/dist_ts/opsserver/handlers/config.handler.js +192 -0
  26. package/dist_ts/paths.d.ts +26 -0
  27. package/dist_ts/paths.js +45 -0
  28. package/dist_ts/storage/classes.storagemanager.d.ts +83 -0
  29. package/dist_ts/storage/classes.storagemanager.js +350 -0
  30. package/dist_ts/storage/index.d.ts +1 -0
  31. package/dist_ts/storage/index.js +3 -0
  32. package/dist_ts_web/00_commitinfo_data.js +1 -1
  33. package/package.json +2 -2
  34. package/ts/00_commitinfo_data.ts +1 -1
  35. package/ts_web/00_commitinfo_data.ts +1 -1
@@ -0,0 +1,81 @@
1
+ import * as plugins from './plugins.js';
2
+ import { randomUUID } from 'node:crypto';
3
+ import { SmartlogDestinationBuffer } from '@push.rocks/smartlog/destination-buffer';
4
+ // Map NODE_ENV to valid TEnvironment
5
+ const nodeEnv = process.env.NODE_ENV || 'production';
6
+ const envMap = {
7
+ 'development': 'local',
8
+ 'test': 'test',
9
+ 'staging': 'staging',
10
+ 'production': 'production'
11
+ };
12
+ // In-memory log buffer for the OpsServer UI
13
+ export const logBuffer = new SmartlogDestinationBuffer({ maxEntries: 2000 });
14
+ // Default Smartlog instance (exported so OpsServer can add push destinations)
15
+ export const baseLogger = new plugins.smartlog.Smartlog({
16
+ logContext: {
17
+ environment: envMap[nodeEnv] || 'production',
18
+ runtime: 'node',
19
+ zone: 'serve.zone',
20
+ }
21
+ });
22
+ // Wire the buffer destination so all logs are captured
23
+ baseLogger.addLogDestination(logBuffer);
24
+ // Extended logger compatible with the original enhanced logger API
25
+ class StandardLogger {
26
+ defaultContext = {};
27
+ correlationId = null;
28
+ constructor() { }
29
+ // Log methods
30
+ log(level, message, context = {}) {
31
+ const combinedContext = {
32
+ ...this.defaultContext,
33
+ ...context
34
+ };
35
+ if (this.correlationId) {
36
+ combinedContext.correlation_id = this.correlationId;
37
+ }
38
+ baseLogger.log(level, message, combinedContext);
39
+ }
40
+ error(message, context = {}) {
41
+ this.log('error', message, context);
42
+ }
43
+ warn(message, context = {}) {
44
+ this.log('warn', message, context);
45
+ }
46
+ info(message, context = {}) {
47
+ this.log('info', message, context);
48
+ }
49
+ success(message, context = {}) {
50
+ this.log('success', message, context);
51
+ }
52
+ debug(message, context = {}) {
53
+ this.log('debug', message, context);
54
+ }
55
+ // Context management
56
+ setContext(context, overwrite = false) {
57
+ if (overwrite) {
58
+ this.defaultContext = context;
59
+ }
60
+ else {
61
+ this.defaultContext = {
62
+ ...this.defaultContext,
63
+ ...context
64
+ };
65
+ }
66
+ }
67
+ // Correlation ID management
68
+ setCorrelationId(id = null) {
69
+ this.correlationId = id || randomUUID();
70
+ return this.correlationId;
71
+ }
72
+ getCorrelationId() {
73
+ return this.correlationId;
74
+ }
75
+ clearCorrelationId() {
76
+ this.correlationId = null;
77
+ }
78
+ }
79
+ // Export a singleton instance
80
+ export const logger = new StandardLogger();
81
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDekMsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFcEYscUNBQXFDO0FBQ3JDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxJQUFJLFlBQVksQ0FBQztBQUNyRCxNQUFNLE1BQU0sR0FBZ0U7SUFDMUUsYUFBYSxFQUFFLE9BQU87SUFDdEIsTUFBTSxFQUFFLE1BQU07SUFDZCxTQUFTLEVBQUUsU0FBUztJQUNwQixZQUFZLEVBQUUsWUFBWTtDQUMzQixDQUFDO0FBRUYsNENBQTRDO0FBQzVDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxJQUFJLHlCQUF5QixDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7QUFFN0UsOEVBQThFO0FBQzlFLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO0lBQ3RELFVBQVUsRUFBRTtRQUNWLFdBQVcsRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksWUFBWTtRQUM1QyxPQUFPLEVBQUUsTUFBTTtRQUNmLElBQUksRUFBRSxZQUFZO0tBQ25CO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsdURBQXVEO0FBQ3ZELFVBQVUsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUV4QyxtRUFBbUU7QUFDbkUsTUFBTSxjQUFjO0lBQ1YsY0FBYyxHQUF3QixFQUFFLENBQUM7SUFDekMsYUFBYSxHQUFrQixJQUFJLENBQUM7SUFFNUMsZ0JBQWUsQ0FBQztJQUVoQixjQUFjO0lBQ1AsR0FBRyxDQUFDLEtBQXNELEVBQUUsT0FBZSxFQUFFLFVBQStCLEVBQUU7UUFDbkgsTUFBTSxlQUFlLEdBQUc7WUFDdEIsR0FBRyxJQUFJLENBQUMsY0FBYztZQUN0QixHQUFHLE9BQU87U0FDWCxDQUFDO1FBRUYsSUFBSSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDdkIsZUFBZSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDO1FBQ3RELENBQUM7UUFFRCxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVNLElBQUksQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM1RCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVNLElBQUksQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM1RCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVNLE9BQU8sQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUMvRCxJQUFJLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELHFCQUFxQjtJQUNkLFVBQVUsQ0FBQyxPQUE0QixFQUFFLFlBQXFCLEtBQUs7UUFDeEUsSUFBSSxTQUFTLEVBQUUsQ0FBQztZQUNkLElBQUksQ0FBQyxjQUFjLEdBQUcsT0FBTyxDQUFDO1FBQ2hDLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLGNBQWMsR0FBRztnQkFDcEIsR0FBRyxJQUFJLENBQUMsY0FBYztnQkFDdEIsR0FBRyxPQUFPO2FBQ1gsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQsNEJBQTRCO0lBQ3JCLGdCQUFnQixDQUFDLEtBQW9CLElBQUk7UUFDOUMsSUFBSSxDQUFDLGFBQWEsR0FBRyxFQUFFLElBQUksVUFBVSxFQUFFLENBQUM7UUFDeEMsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFTSxnQkFBZ0I7UUFDckIsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFTSxrQkFBa0I7UUFDdkIsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxJQUFJLGNBQWMsRUFBRSxDQUFDIn0=
@@ -0,0 +1,31 @@
1
+ import * as plugins from '../../plugins.js';
2
+ import type { OpsServer } from '../classes.opsserver.js';
3
+ import * as interfaces from '../../../dist_ts_interfaces/index.js';
4
+ export interface IJwtData {
5
+ userId: string;
6
+ status: 'loggedIn' | 'loggedOut';
7
+ expiresAt: number;
8
+ }
9
+ export declare class AdminHandler {
10
+ private opsServerRef;
11
+ typedrouter: plugins.typedrequest.TypedRouter<interfaces.typedrequestInterfaces.ITypedRequest>;
12
+ smartjwtInstance: plugins.smartjwt.SmartJwt<IJwtData>;
13
+ private users;
14
+ constructor(opsServerRef: OpsServer);
15
+ initialize(): Promise<void>;
16
+ private initializeJwt;
17
+ private initializeDefaultUsers;
18
+ private registerHandlers;
19
+ /**
20
+ * Create a guard for valid identity (matching cloudly pattern)
21
+ */
22
+ validIdentityGuard: plugins.smartguard.Guard<{
23
+ identity: interfaces.data.IIdentity;
24
+ }>;
25
+ /**
26
+ * Create a guard for admin identity (matching cloudly pattern)
27
+ */
28
+ adminIdentityGuard: plugins.smartguard.Guard<{
29
+ identity: interfaces.data.IIdentity;
30
+ }>;
31
+ }
@@ -0,0 +1,180 @@
1
+ import * as plugins from '../../plugins.js';
2
+ import * as interfaces from '../../../dist_ts_interfaces/index.js';
3
+ export class AdminHandler {
4
+ opsServerRef;
5
+ typedrouter = new plugins.typedrequest.TypedRouter();
6
+ // JWT instance
7
+ smartjwtInstance;
8
+ // Simple in-memory user storage (in production, use proper database)
9
+ users = new Map();
10
+ constructor(opsServerRef) {
11
+ this.opsServerRef = opsServerRef;
12
+ // Add this handler's router to the parent
13
+ this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
14
+ }
15
+ async initialize() {
16
+ await this.initializeJwt();
17
+ this.initializeDefaultUsers();
18
+ this.registerHandlers();
19
+ }
20
+ async initializeJwt() {
21
+ this.smartjwtInstance = new plugins.smartjwt.SmartJwt();
22
+ await this.smartjwtInstance.init();
23
+ // For development, create new keypair each time
24
+ // In production, load from storage like cloudly does
25
+ await this.smartjwtInstance.createNewKeyPair();
26
+ }
27
+ initializeDefaultUsers() {
28
+ // Add default admin user
29
+ const adminId = plugins.uuid.v4();
30
+ this.users.set(adminId, {
31
+ id: adminId,
32
+ username: 'admin',
33
+ password: 'admin',
34
+ role: 'admin',
35
+ });
36
+ }
37
+ registerHandlers() {
38
+ // Admin Login Handler
39
+ this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('adminLoginWithUsernameAndPassword', async (dataArg) => {
40
+ try {
41
+ // Find user by username and password
42
+ let user = null;
43
+ for (const [_, userData] of this.users) {
44
+ if (userData.username === dataArg.username && userData.password === dataArg.password) {
45
+ user = userData;
46
+ break;
47
+ }
48
+ }
49
+ if (!user) {
50
+ throw new plugins.typedrequest.TypedResponseError('login failed');
51
+ }
52
+ const expiresAtTimestamp = Date.now() + 3600 * 1000 * 24; // 24 hours
53
+ const jwt = await this.smartjwtInstance.createJWT({
54
+ userId: user.id,
55
+ status: 'loggedIn',
56
+ expiresAt: expiresAtTimestamp,
57
+ });
58
+ return {
59
+ identity: {
60
+ jwt,
61
+ userId: user.id,
62
+ name: user.username,
63
+ expiresAt: expiresAtTimestamp,
64
+ role: user.role,
65
+ type: 'user',
66
+ },
67
+ };
68
+ }
69
+ catch (error) {
70
+ if (error instanceof plugins.typedrequest.TypedResponseError) {
71
+ throw error;
72
+ }
73
+ throw new plugins.typedrequest.TypedResponseError('login failed');
74
+ }
75
+ }));
76
+ // Admin Logout Handler
77
+ this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('adminLogout', async (dataArg) => {
78
+ // In a real implementation, you might want to blacklist the JWT
79
+ // For now, just return success
80
+ return {
81
+ success: true,
82
+ };
83
+ }));
84
+ // Verify Identity Handler
85
+ this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('verifyIdentity', async (dataArg) => {
86
+ if (!dataArg.identity?.jwt) {
87
+ return {
88
+ valid: false,
89
+ };
90
+ }
91
+ try {
92
+ const jwtData = await this.smartjwtInstance.verifyJWTAndGetData(dataArg.identity.jwt);
93
+ // Check if expired
94
+ if (jwtData.expiresAt < Date.now()) {
95
+ return {
96
+ valid: false,
97
+ };
98
+ }
99
+ // Check if logged in
100
+ if (jwtData.status !== 'loggedIn') {
101
+ return {
102
+ valid: false,
103
+ };
104
+ }
105
+ // Find user
106
+ const user = this.users.get(jwtData.userId);
107
+ if (!user) {
108
+ return {
109
+ valid: false,
110
+ };
111
+ }
112
+ return {
113
+ valid: true,
114
+ identity: {
115
+ jwt: dataArg.identity.jwt,
116
+ userId: user.id,
117
+ name: user.username,
118
+ expiresAt: jwtData.expiresAt,
119
+ role: user.role,
120
+ type: 'user',
121
+ },
122
+ };
123
+ }
124
+ catch (error) {
125
+ return {
126
+ valid: false,
127
+ };
128
+ }
129
+ }));
130
+ }
131
+ /**
132
+ * Create a guard for valid identity (matching cloudly pattern)
133
+ */
134
+ validIdentityGuard = new plugins.smartguard.Guard(async (dataArg) => {
135
+ if (!dataArg.identity?.jwt) {
136
+ return false;
137
+ }
138
+ try {
139
+ const jwtData = await this.smartjwtInstance.verifyJWTAndGetData(dataArg.identity.jwt);
140
+ // Check expiration
141
+ if (jwtData.expiresAt < Date.now()) {
142
+ return false;
143
+ }
144
+ // Check status
145
+ if (jwtData.status !== 'loggedIn') {
146
+ return false;
147
+ }
148
+ // Verify data hasn't been tampered with
149
+ if (dataArg.identity.expiresAt !== jwtData.expiresAt) {
150
+ return false;
151
+ }
152
+ if (dataArg.identity.userId !== jwtData.userId) {
153
+ return false;
154
+ }
155
+ return true;
156
+ }
157
+ catch (error) {
158
+ return false;
159
+ }
160
+ }, {
161
+ failedHint: 'identity is not valid',
162
+ name: 'validIdentityGuard',
163
+ });
164
+ /**
165
+ * Create a guard for admin identity (matching cloudly pattern)
166
+ */
167
+ adminIdentityGuard = new plugins.smartguard.Guard(async (dataArg) => {
168
+ // First check if identity is valid
169
+ const isValid = await this.validIdentityGuard.exec(dataArg);
170
+ if (!isValid) {
171
+ return false;
172
+ }
173
+ // Check if user has admin role
174
+ return dataArg.identity.role === 'admin';
175
+ }, {
176
+ failedHint: 'user is not admin',
177
+ name: 'adminIdentityGuard',
178
+ });
179
+ }
180
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRtaW4uaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL29wc3NlcnZlci9oYW5kbGVycy9hZG1pbi5oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxLQUFLLFVBQVUsTUFBTSxpQ0FBaUMsQ0FBQztBQVE5RCxNQUFNLE9BQU8sWUFBWTtJQWNIO0lBYmIsV0FBVyxHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUU1RCxlQUFlO0lBQ1IsZ0JBQWdCLENBQXNDO0lBRTdELHFFQUFxRTtJQUM3RCxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBS25CLENBQUM7SUFFTCxZQUFvQixZQUF1QjtRQUF2QixpQkFBWSxHQUFaLFlBQVksQ0FBVztRQUN6QywwQ0FBMEM7UUFDMUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVU7UUFDckIsTUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDM0IsSUFBSSxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFDOUIsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7SUFDMUIsQ0FBQztJQUVPLEtBQUssQ0FBQyxhQUFhO1FBQ3pCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEQsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLENBQUM7UUFFbkMsZ0RBQWdEO1FBQ2hELHFEQUFxRDtRQUNyRCxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQ2pELENBQUM7SUFFTyxzQkFBc0I7UUFDNUIseUJBQXlCO1FB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
@@ -0,0 +1,7 @@
1
+ import type { OpsServer } from '../classes.opsserver.js';
2
+ export declare class ConfigHandler {
3
+ private opsServerRef;
4
+ constructor(opsServerRef: OpsServer);
5
+ private registerHandlers;
6
+ private getConfiguration;
7
+ }
@@ -0,0 +1,192 @@
1
+ import * as plugins from '../../plugins.js';
2
+ import * as paths from '../../paths.js';
3
+ import * as interfaces from '../../../dist_ts_interfaces/index.js';
4
+ export class ConfigHandler {
5
+ opsServerRef;
6
+ constructor(opsServerRef) {
7
+ this.opsServerRef = opsServerRef;
8
+ this.registerHandlers();
9
+ }
10
+ registerHandlers() {
11
+ // Config endpoint registers directly on viewRouter (valid identity required via middleware)
12
+ const router = this.opsServerRef.viewRouter;
13
+ // Get Configuration Handler (read-only)
14
+ router.addTypedHandler(new plugins.typedrequest.TypedHandler('getConfiguration', async (dataArg, toolsArg) => {
15
+ const config = await this.getConfiguration();
16
+ return {
17
+ config,
18
+ section: dataArg.section,
19
+ };
20
+ }));
21
+ }
22
+ async getConfiguration() {
23
+ const dcRouter = this.opsServerRef.dcRouterRef;
24
+ const opts = dcRouter.options;
25
+ const resolvedPaths = dcRouter.resolvedPaths;
26
+ // --- System ---
27
+ const storageBackend = opts.storage?.readFunction
28
+ ? 'custom'
29
+ : opts.storage?.fsPath
30
+ ? 'filesystem'
31
+ : 'memory';
32
+ // Resolve proxy IPs: fall back to SmartProxy's runtime proxyIPs if not in opts
33
+ let proxyIps = opts.proxyIps || [];
34
+ if (proxyIps.length === 0 && dcRouter.smartProxy) {
35
+ const spSettings = dcRouter.smartProxy.settings;
36
+ if (spSettings?.proxyIPs?.length > 0) {
37
+ proxyIps = spSettings.proxyIPs;
38
+ }
39
+ }
40
+ const system = {
41
+ baseDir: resolvedPaths.dcrouterHomeDir,
42
+ dataDir: resolvedPaths.dataDir,
43
+ publicIp: opts.publicIp || dcRouter.detectedPublicIp || null,
44
+ proxyIps,
45
+ uptime: Math.floor(process.uptime()),
46
+ storageBackend,
47
+ storagePath: opts.storage?.fsPath || null,
48
+ };
49
+ // --- SmartProxy ---
50
+ let acmeInfo = null;
51
+ if (opts.smartProxyConfig?.acme) {
52
+ const acme = opts.smartProxyConfig.acme;
53
+ acmeInfo = {
54
+ enabled: acme.enabled !== false,
55
+ accountEmail: acme.accountEmail || '',
56
+ useProduction: acme.useProduction !== false,
57
+ autoRenew: acme.autoRenew !== false,
58
+ renewThresholdDays: acme.renewThresholdDays || 30,
59
+ };
60
+ }
61
+ let routeCount = 0;
62
+ if (dcRouter.routeConfigManager) {
63
+ try {
64
+ const merged = await dcRouter.routeConfigManager.getMergedRoutes();
65
+ routeCount = merged.routes.length;
66
+ }
67
+ catch {
68
+ routeCount = opts.smartProxyConfig?.routes?.length || 0;
69
+ }
70
+ }
71
+ else if (opts.smartProxyConfig?.routes) {
72
+ routeCount = opts.smartProxyConfig.routes.length;
73
+ }
74
+ const smartProxy = {
75
+ enabled: !!dcRouter.smartProxy,
76
+ routeCount,
77
+ acme: acmeInfo,
78
+ };
79
+ // --- Email ---
80
+ let emailDomains = [];
81
+ if (dcRouter.emailServer && dcRouter.emailServer.domainRegistry) {
82
+ emailDomains = dcRouter.emailServer.domainRegistry.getAllDomains();
83
+ }
84
+ else if (opts.emailConfig?.domains) {
85
+ emailDomains = opts.emailConfig.domains.map((d) => typeof d === 'string' ? d : d.domain);
86
+ }
87
+ let portMapping = null;
88
+ if (opts.emailPortConfig?.portMapping) {
89
+ portMapping = {};
90
+ for (const [ext, int] of Object.entries(opts.emailPortConfig.portMapping)) {
91
+ portMapping[String(ext)] = int;
92
+ }
93
+ }
94
+ const email = {
95
+ enabled: !!dcRouter.emailServer,
96
+ ports: opts.emailConfig?.ports || [],
97
+ portMapping,
98
+ hostname: opts.emailConfig?.hostname || null,
99
+ domains: emailDomains,
100
+ emailRouteCount: opts.emailConfig?.routes?.length || 0,
101
+ receivedEmailsPath: opts.emailPortConfig?.receivedEmailsPath || null,
102
+ };
103
+ // --- DNS ---
104
+ const dnsRecords = (opts.dnsRecords || []).map(r => ({
105
+ name: r.name,
106
+ type: r.type,
107
+ value: r.value,
108
+ ttl: r.ttl,
109
+ }));
110
+ const dns = {
111
+ enabled: !!dcRouter.dnsServer,
112
+ port: 53,
113
+ nsDomains: opts.dnsNsDomains || [],
114
+ scopes: opts.dnsScopes || [],
115
+ recordCount: dnsRecords.length,
116
+ records: dnsRecords,
117
+ dnsChallenge: !!opts.dnsChallenge?.cloudflareApiKey,
118
+ };
119
+ // --- TLS ---
120
+ let tlsSource = 'none';
121
+ if (opts.tls?.certPath && opts.tls?.keyPath) {
122
+ tlsSource = 'static';
123
+ }
124
+ else if (opts.smartProxyConfig?.acme?.enabled !== false && opts.smartProxyConfig?.acme) {
125
+ tlsSource = 'acme';
126
+ }
127
+ const tls = {
128
+ contactEmail: opts.tls?.contactEmail || opts.smartProxyConfig?.acme?.accountEmail || null,
129
+ domain: opts.tls?.domain || null,
130
+ source: tlsSource,
131
+ certPath: opts.tls?.certPath || null,
132
+ keyPath: opts.tls?.keyPath || null,
133
+ };
134
+ // --- Cache ---
135
+ const cacheConfig = opts.cacheConfig;
136
+ const cache = {
137
+ enabled: cacheConfig?.enabled !== false,
138
+ storagePath: cacheConfig?.storagePath || resolvedPaths.defaultTsmDbPath,
139
+ dbName: cacheConfig?.dbName || 'dcrouter',
140
+ defaultTTLDays: cacheConfig?.defaultTTLDays || 30,
141
+ cleanupIntervalHours: cacheConfig?.cleanupIntervalHours || 1,
142
+ ttlConfig: cacheConfig?.ttlConfig ? { ...cacheConfig.ttlConfig } : {},
143
+ };
144
+ // --- RADIUS ---
145
+ const radiusCfg = opts.radiusConfig;
146
+ const radius = {
147
+ enabled: !!dcRouter.radiusServer,
148
+ authPort: radiusCfg?.authPort || null,
149
+ acctPort: radiusCfg?.acctPort || null,
150
+ bindAddress: radiusCfg?.bindAddress || null,
151
+ clientCount: radiusCfg?.clients?.length || 0,
152
+ vlanDefaultVlan: radiusCfg?.vlanAssignment?.defaultVlan ?? null,
153
+ vlanAllowUnknownMacs: radiusCfg?.vlanAssignment?.allowUnknownMacs ?? null,
154
+ vlanMappingCount: radiusCfg?.vlanAssignment?.mappings?.length || 0,
155
+ };
156
+ // --- Remote Ingress ---
157
+ const riCfg = opts.remoteIngressConfig;
158
+ const connectedEdgeIps = dcRouter.tunnelManager?.getConnectedEdgeIps() || [];
159
+ // Determine TLS mode: custom certs > ACME from cert store > self-signed fallback
160
+ let tlsMode = 'self-signed';
161
+ if (riCfg?.tls?.certPath && riCfg?.tls?.keyPath) {
162
+ tlsMode = 'custom';
163
+ }
164
+ else if (riCfg?.hubDomain) {
165
+ try {
166
+ const stored = await dcRouter.storageManager.getJSON(`/proxy-certs/${riCfg.hubDomain}`);
167
+ if (stored?.publicKey && stored?.privateKey) {
168
+ tlsMode = 'acme';
169
+ }
170
+ }
171
+ catch { /* no stored cert */ }
172
+ }
173
+ const remoteIngress = {
174
+ enabled: !!dcRouter.remoteIngressManager,
175
+ tunnelPort: riCfg?.tunnelPort || null,
176
+ hubDomain: riCfg?.hubDomain || null,
177
+ tlsMode,
178
+ connectedEdgeIps,
179
+ };
180
+ return {
181
+ system,
182
+ smartProxy,
183
+ email,
184
+ dns,
185
+ tls,
186
+ cache,
187
+ radius,
188
+ remoteIngress,
189
+ };
190
+ }
191
+ }
192
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/config.handler.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,26 @@
1
+ export declare const packageDir: string;
2
+ export declare const distServe: string;
3
+ export declare const dcrouterHomeDir: string;
4
+ export declare const dataDir: string;
5
+ export declare const defaultTsmDbPath: string;
6
+ export declare const dnsRecordsDir: string;
7
+ /**
8
+ * Resolve all data paths from a given baseDir.
9
+ * When no baseDir is provided, falls back to ~/.serve.zone/dcrouter.
10
+ * Specific overrides (e.g. DATA_DIR env) take precedence.
11
+ */
12
+ export declare function resolvePaths(baseDir?: string): {
13
+ dcrouterHomeDir: string;
14
+ dataDir: string;
15
+ defaultTsmDbPath: string;
16
+ defaultStoragePath: string;
17
+ dnsRecordsDir: string;
18
+ };
19
+ /**
20
+ * Ensure only the data directories that are actually used exist.
21
+ */
22
+ export declare function ensureDataDirectories(resolvedPaths: ReturnType<typeof resolvePaths>): void;
23
+ /**
24
+ * Legacy wrapper — delegates to ensureDataDirectories with module-level defaults.
25
+ */
26
+ export declare function ensureDirectories(): void;
@@ -0,0 +1,45 @@
1
+ import * as plugins from './plugins.js';
2
+ // Code/asset paths (not affected by baseDir)
3
+ export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
4
+ export const distServe = plugins.path.join(packageDir, './dist_serve');
5
+ // Default base for all dcrouter data (always user-writable)
6
+ export const dcrouterHomeDir = plugins.path.join(plugins.os.homedir(), '.serve.zone', 'dcrouter');
7
+ // Configure data directory with environment variable or default to ~/.serve.zone/dcrouter/data
8
+ const DEFAULT_DATA_PATH = plugins.path.join(dcrouterHomeDir, 'data');
9
+ export const dataDir = process.env.DATA_DIR
10
+ ? process.env.DATA_DIR
11
+ : DEFAULT_DATA_PATH;
12
+ // Default TsmDB path for CacheDb
13
+ export const defaultTsmDbPath = plugins.path.join(dcrouterHomeDir, 'tsmdb');
14
+ // DNS records directory (only surviving MTA directory reference)
15
+ export const dnsRecordsDir = plugins.path.join(dataDir, 'dns');
16
+ /**
17
+ * Resolve all data paths from a given baseDir.
18
+ * When no baseDir is provided, falls back to ~/.serve.zone/dcrouter.
19
+ * Specific overrides (e.g. DATA_DIR env) take precedence.
20
+ */
21
+ export function resolvePaths(baseDir) {
22
+ const root = baseDir ?? plugins.path.join(plugins.os.homedir(), '.serve.zone', 'dcrouter');
23
+ const resolvedDataDir = process.env.DATA_DIR ?? plugins.path.join(root, 'data');
24
+ return {
25
+ dcrouterHomeDir: root,
26
+ dataDir: resolvedDataDir,
27
+ defaultTsmDbPath: plugins.path.join(root, 'tsmdb'),
28
+ defaultStoragePath: plugins.path.join(root, 'storage'),
29
+ dnsRecordsDir: plugins.path.join(resolvedDataDir, 'dns'),
30
+ };
31
+ }
32
+ /**
33
+ * Ensure only the data directories that are actually used exist.
34
+ */
35
+ export function ensureDataDirectories(resolvedPaths) {
36
+ plugins.fsUtils.ensureDirSync(resolvedPaths.dataDir);
37
+ plugins.fsUtils.ensureDirSync(resolvedPaths.dnsRecordsDir);
38
+ }
39
+ /**
40
+ * Legacy wrapper — delegates to ensureDataDirectories with module-level defaults.
41
+ */
42
+ export function ensureDirectories() {
43
+ ensureDataDirectories(resolvePaths());
44
+ }
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4Qyw2Q0FBNkM7QUFDN0MsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUN6QyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUMvRCxLQUFLLENBQ04sQ0FBQztBQUNGLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFFdkUsNERBQTREO0FBQzVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUVsRywrRkFBK0Y7QUFDL0YsTUFBTSxpQkFBaUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDckUsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUN6QyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRO0lBQ3RCLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQztBQUV0QixpQ0FBaUM7QUFDakMsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTVFLGlFQUFpRTtBQUNqRSxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRS9EOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFDLE9BQWdCO0lBQzNDLE1BQU0sSUFBSSxHQUFHLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMzRixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDaEYsT0FBTztRQUNMLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE9BQU8sRUFBRSxlQUFlO1FBQ3hCLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUM7UUFDbEQsa0JBQWtCLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUN0RCxhQUFhLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEtBQUssQ0FBQztLQUN6RCxDQUFDO0FBQ0osQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLGFBQThDO0lBQ2xGLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNyRCxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDN0QsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQjtJQUMvQixxQkFBcUIsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO0FBQ3hDLENBQUMifQ==