@serve.zone/dcrouter 11.23.4 → 12.0.0

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 (119) hide show
  1. package/dist_serve/bundle.js +1 -1
  2. package/dist_ts/00_commitinfo_data.js +2 -2
  3. package/dist_ts/classes.cert-provision-scheduler.d.ts +6 -8
  4. package/dist_ts/classes.cert-provision-scheduler.js +37 -17
  5. package/dist_ts/classes.dcrouter.d.ts +15 -29
  6. package/dist_ts/classes.dcrouter.js +96 -91
  7. package/dist_ts/classes.storage-cert-manager.d.ts +3 -6
  8. package/dist_ts/classes.storage-cert-manager.js +35 -25
  9. package/dist_ts/config/classes.api-token-manager.d.ts +1 -3
  10. package/dist_ts/config/classes.api-token-manager.js +45 -15
  11. package/dist_ts/config/classes.route-config-manager.d.ts +1 -3
  12. package/dist_ts/config/classes.route-config-manager.js +63 -25
  13. package/dist_ts/{cache → db}/classes.cache.cleaner.d.ts +3 -3
  14. package/dist_ts/db/classes.cache.cleaner.js +130 -0
  15. package/dist_ts/{cache → db}/classes.cached.document.js +1 -1
  16. package/dist_ts/db/classes.dcrouter-db.d.ts +70 -0
  17. package/dist_ts/db/classes.dcrouter-db.js +146 -0
  18. package/dist_ts/db/documents/classes.accounting-session.doc.d.ts +32 -0
  19. package/dist_ts/db/documents/classes.accounting-session.doc.js +214 -0
  20. package/dist_ts/db/documents/classes.acme-cert.doc.d.ts +13 -0
  21. package/dist_ts/db/documents/classes.acme-cert.doc.js +109 -0
  22. package/dist_ts/db/documents/classes.api-token.doc.d.ts +18 -0
  23. package/dist_ts/db/documents/classes.api-token.doc.js +127 -0
  24. package/dist_ts/{cache → db}/documents/classes.cached.email.js +3 -3
  25. package/dist_ts/{cache → db}/documents/classes.cached.ip.reputation.js +3 -3
  26. package/dist_ts/db/documents/classes.cert-backoff.doc.d.ts +11 -0
  27. package/dist_ts/db/documents/classes.cert-backoff.doc.js +97 -0
  28. package/dist_ts/db/documents/classes.proxy-cert.doc.d.ts +12 -0
  29. package/dist_ts/db/documents/classes.proxy-cert.doc.js +103 -0
  30. package/dist_ts/db/documents/classes.remote-ingress-edge.doc.d.ts +17 -0
  31. package/dist_ts/db/documents/classes.remote-ingress-edge.doc.js +130 -0
  32. package/dist_ts/db/documents/classes.route-override.doc.d.ts +10 -0
  33. package/dist_ts/db/documents/classes.route-override.doc.js +91 -0
  34. package/dist_ts/db/documents/classes.stored-route.doc.d.ts +12 -0
  35. package/dist_ts/db/documents/classes.stored-route.doc.js +103 -0
  36. package/dist_ts/db/documents/classes.vlan-mappings.doc.d.ts +15 -0
  37. package/dist_ts/db/documents/classes.vlan-mappings.doc.js +77 -0
  38. package/dist_ts/db/documents/classes.vpn-client.doc.d.ts +18 -0
  39. package/dist_ts/db/documents/classes.vpn-client.doc.js +136 -0
  40. package/dist_ts/db/documents/classes.vpn-server-keys.doc.d.ts +10 -0
  41. package/dist_ts/db/documents/classes.vpn-server-keys.doc.js +94 -0
  42. package/dist_ts/db/documents/index.d.ts +13 -0
  43. package/dist_ts/db/documents/index.js +20 -0
  44. package/dist_ts/{cache → db}/index.d.ts +1 -1
  45. package/dist_ts/db/index.js +9 -0
  46. package/dist_ts/opsserver/handlers/certificate.handler.js +66 -66
  47. package/dist_ts/opsserver/handlers/config.handler.js +14 -15
  48. package/dist_ts/paths.d.ts +0 -1
  49. package/dist_ts/paths.js +1 -2
  50. package/dist_ts/radius/classes.accounting.manager.d.ts +4 -12
  51. package/dist_ts/radius/classes.accounting.manager.js +80 -93
  52. package/dist_ts/radius/classes.radius.server.d.ts +1 -3
  53. package/dist_ts/radius/classes.radius.server.js +4 -6
  54. package/dist_ts/radius/classes.vlan.manager.d.ts +3 -7
  55. package/dist_ts/radius/classes.vlan.manager.js +21 -28
  56. package/dist_ts/radius/index.d.ts +1 -1
  57. package/dist_ts/radius/index.js +1 -1
  58. package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +3 -5
  59. package/dist_ts/remoteingress/classes.remoteingress-manager.js +41 -21
  60. package/dist_ts/security/classes.ipreputationchecker.d.ts +6 -21
  61. package/dist_ts/security/classes.ipreputationchecker.js +59 -138
  62. package/dist_ts/vpn/classes.vpn-manager.d.ts +4 -22
  63. package/dist_ts/vpn/classes.vpn-manager.js +40 -45
  64. package/dist_ts_oci_container/index.js +4 -4
  65. package/dist_ts_web/00_commitinfo_data.js +2 -2
  66. package/package.json +1 -1
  67. package/readme.storage.md +55 -91
  68. package/ts/00_commitinfo_data.ts +1 -1
  69. package/ts/classes.cert-provision-scheduler.ts +35 -17
  70. package/ts/classes.dcrouter.ts +113 -125
  71. package/ts/classes.storage-cert-manager.ts +34 -22
  72. package/ts/config/classes.api-token-manager.ts +42 -11
  73. package/ts/config/classes.route-config-manager.ts +57 -22
  74. package/ts/{cache → db}/classes.cache.cleaner.ts +6 -6
  75. package/ts/db/classes.dcrouter-db.ts +179 -0
  76. package/ts/db/documents/classes.accounting-session.doc.ts +106 -0
  77. package/ts/db/documents/classes.acme-cert.doc.ts +41 -0
  78. package/ts/db/documents/classes.api-token.doc.ts +56 -0
  79. package/ts/{cache → db}/documents/classes.cached.email.ts +2 -2
  80. package/ts/{cache → db}/documents/classes.cached.ip.reputation.ts +2 -2
  81. package/ts/db/documents/classes.cert-backoff.doc.ts +35 -0
  82. package/ts/db/documents/classes.proxy-cert.doc.ts +38 -0
  83. package/ts/db/documents/classes.remote-ingress-edge.doc.ts +54 -0
  84. package/ts/db/documents/classes.route-override.doc.ts +32 -0
  85. package/ts/db/documents/classes.stored-route.doc.ts +38 -0
  86. package/ts/db/documents/classes.vlan-mappings.doc.ts +32 -0
  87. package/ts/db/documents/classes.vpn-client.doc.ts +57 -0
  88. package/ts/db/documents/classes.vpn-server-keys.doc.ts +31 -0
  89. package/ts/db/documents/index.ts +24 -0
  90. package/ts/{cache → db}/index.ts +6 -2
  91. package/ts/opsserver/handlers/certificate.handler.ts +67 -65
  92. package/ts/opsserver/handlers/config.handler.ts +13 -14
  93. package/ts/paths.ts +0 -1
  94. package/ts/radius/classes.accounting.manager.ts +81 -103
  95. package/ts/radius/classes.radius.server.ts +3 -6
  96. package/ts/radius/classes.vlan.manager.ts +20 -32
  97. package/ts/radius/index.ts +1 -1
  98. package/ts/remoteingress/classes.remoteingress-manager.ts +40 -22
  99. package/ts/security/classes.ipreputationchecker.ts +103 -196
  100. package/ts/vpn/classes.vpn-manager.ts +44 -75
  101. package/ts_web/00_commitinfo_data.ts +1 -1
  102. package/dist_ts/cache/classes.cache.cleaner.js +0 -130
  103. package/dist_ts/cache/classes.cachedb.d.ts +0 -60
  104. package/dist_ts/cache/classes.cachedb.js +0 -126
  105. package/dist_ts/cache/documents/index.d.ts +0 -2
  106. package/dist_ts/cache/documents/index.js +0 -3
  107. package/dist_ts/cache/index.js +0 -7
  108. package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
  109. package/dist_ts/storage/classes.storagemanager.js +0 -348
  110. package/dist_ts/storage/index.d.ts +0 -1
  111. package/dist_ts/storage/index.js +0 -3
  112. package/ts/cache/classes.cachedb.ts +0 -155
  113. package/ts/cache/documents/index.ts +0 -2
  114. package/ts/storage/classes.storagemanager.ts +0 -404
  115. package/ts/storage/index.ts +0 -2
  116. /package/dist_ts/{cache → db}/classes.cached.document.d.ts +0 -0
  117. /package/dist_ts/{cache → db}/documents/classes.cached.email.d.ts +0 -0
  118. /package/dist_ts/{cache → db}/documents/classes.cached.ip.reputation.d.ts +0 -0
  119. /package/ts/{cache → db}/classes.cached.document.ts +0 -0
@@ -1,348 +0,0 @@
1
- import * as plugins from '../plugins.js';
2
- import { logger } from '../logger.js';
3
- // Promisify filesystem operations
4
- const readFile = plugins.util.promisify(plugins.fs.readFile);
5
- const writeFile = plugins.util.promisify(plugins.fs.writeFile);
6
- const unlink = plugins.util.promisify(plugins.fs.unlink);
7
- const rename = plugins.util.promisify(plugins.fs.rename);
8
- const readdir = plugins.util.promisify(plugins.fs.readdir);
9
- /**
10
- * Central storage manager for DcRouter
11
- * Provides unified key-value storage with multiple backend support
12
- */
13
- export class StorageManager {
14
- static MAX_MEMORY_ENTRIES = 10_000;
15
- backend;
16
- memoryStore = new Map();
17
- config;
18
- fsBasePath;
19
- constructor(config) {
20
- this.config = config || {};
21
- // Check if both fsPath and custom functions are provided
22
- if (config?.fsPath && (config?.readFunction || config?.writeFunction)) {
23
- console.warn('⚠️ WARNING: Both fsPath and custom read/write functions are configured.\n' +
24
- ' Using custom read/write functions. fsPath will be ignored.');
25
- }
26
- // Determine backend based on configuration
27
- if (config?.readFunction && config?.writeFunction) {
28
- this.backend = 'custom';
29
- }
30
- else if (config?.fsPath) {
31
- // Set up internal read/write functions for filesystem
32
- this.backend = 'custom'; // Use custom backend with internal functions
33
- this.fsBasePath = plugins.path.resolve(config.fsPath);
34
- this.ensureDirectory(this.fsBasePath);
35
- // Set up internal filesystem read/write functions
36
- this.config.readFunction = (key) => this.fsRead(key);
37
- this.config.writeFunction = async (key, value) => {
38
- await this.fsWrite(key, value);
39
- };
40
- }
41
- else {
42
- this.backend = 'memory';
43
- this.showMemoryWarning();
44
- }
45
- logger.log('info', `StorageManager initialized with ${this.backend} backend`);
46
- }
47
- /**
48
- * Show warning when using memory backend
49
- */
50
- showMemoryWarning() {
51
- console.warn('⚠️ WARNING: StorageManager is using in-memory storage.\n' +
52
- ' Data will be lost when the process restarts.\n' +
53
- ' Configure storage.fsPath or storage functions for persistence.');
54
- }
55
- /**
56
- * Ensure directory exists for filesystem backend
57
- */
58
- async ensureDirectory(dirPath) {
59
- try {
60
- await plugins.fsUtils.ensureDir(dirPath);
61
- }
62
- catch (error) {
63
- logger.log('error', `Failed to create storage directory: ${error.message}`);
64
- throw error;
65
- }
66
- }
67
- /**
68
- * Validate and sanitize storage key
69
- */
70
- validateKey(key) {
71
- if (!key || typeof key !== 'string') {
72
- throw new Error('Storage key must be a non-empty string');
73
- }
74
- // Ensure key starts with /
75
- if (!key.startsWith('/')) {
76
- key = '/' + key;
77
- }
78
- // Remove any dangerous path elements
79
- key = key.replace(/\.\./g, '').replace(/\/+/g, '/');
80
- return key;
81
- }
82
- /**
83
- * Convert key to filesystem path
84
- */
85
- keyToPath(key) {
86
- if (!this.fsBasePath) {
87
- throw new Error('Filesystem base path not configured');
88
- }
89
- // Remove leading slash and convert to path
90
- const relativePath = key.substring(1);
91
- return plugins.path.join(this.fsBasePath, relativePath);
92
- }
93
- /**
94
- * Internal filesystem read function
95
- */
96
- async fsRead(key) {
97
- const filePath = this.keyToPath(key);
98
- try {
99
- const content = await readFile(filePath, 'utf8');
100
- return content;
101
- }
102
- catch (error) {
103
- if (error.code === 'ENOENT') {
104
- return null;
105
- }
106
- throw error;
107
- }
108
- }
109
- /**
110
- * Internal filesystem write function
111
- */
112
- async fsWrite(key, value) {
113
- const filePath = this.keyToPath(key);
114
- const dir = plugins.path.dirname(filePath);
115
- // Ensure directory exists
116
- await plugins.fsUtils.ensureDir(dir);
117
- // Write atomically with temp file
118
- const tempPath = `${filePath}.tmp`;
119
- await writeFile(tempPath, value, 'utf8');
120
- await rename(tempPath, filePath);
121
- }
122
- /**
123
- * Get value by key
124
- */
125
- async get(key) {
126
- key = this.validateKey(key);
127
- try {
128
- switch (this.backend) {
129
- case 'custom': {
130
- if (!this.config.readFunction) {
131
- throw new Error('Read function not configured');
132
- }
133
- try {
134
- return await this.config.readFunction(key);
135
- }
136
- catch (error) {
137
- // Assume null if read fails (key doesn't exist)
138
- return null;
139
- }
140
- }
141
- case 'memory': {
142
- return this.memoryStore.get(key) || null;
143
- }
144
- default:
145
- throw new Error(`Unknown backend: ${this.backend}`);
146
- }
147
- }
148
- catch (error) {
149
- logger.log('error', `Storage get error for key ${key}: ${error.message}`);
150
- throw error;
151
- }
152
- }
153
- /**
154
- * Set value by key
155
- */
156
- async set(key, value) {
157
- key = this.validateKey(key);
158
- if (typeof value !== 'string') {
159
- throw new Error('Storage value must be a string');
160
- }
161
- try {
162
- switch (this.backend) {
163
- case 'filesystem': {
164
- const filePath = this.keyToPath(key);
165
- const dirPath = plugins.path.dirname(filePath);
166
- // Ensure directory exists
167
- await plugins.fsUtils.ensureDir(dirPath);
168
- // Write atomically
169
- const tempPath = filePath + '.tmp';
170
- await writeFile(tempPath, value, 'utf8');
171
- await rename(tempPath, filePath);
172
- break;
173
- }
174
- case 'custom': {
175
- if (!this.config.writeFunction) {
176
- throw new Error('Write function not configured');
177
- }
178
- await this.config.writeFunction(key, value);
179
- break;
180
- }
181
- case 'memory': {
182
- this.memoryStore.set(key, value);
183
- // Evict oldest entries if memory store exceeds limit
184
- while (this.memoryStore.size > StorageManager.MAX_MEMORY_ENTRIES) {
185
- const firstKey = this.memoryStore.keys().next().value;
186
- this.memoryStore.delete(firstKey);
187
- }
188
- break;
189
- }
190
- default:
191
- throw new Error(`Unknown backend: ${this.backend}`);
192
- }
193
- }
194
- catch (error) {
195
- logger.log('error', `Storage set error for key ${key}: ${error.message}`);
196
- throw error;
197
- }
198
- }
199
- /**
200
- * Delete value by key
201
- */
202
- async delete(key) {
203
- key = this.validateKey(key);
204
- try {
205
- switch (this.backend) {
206
- case 'filesystem': {
207
- const filePath = this.keyToPath(key);
208
- try {
209
- await unlink(filePath);
210
- }
211
- catch (error) {
212
- if (error.code !== 'ENOENT') {
213
- throw error;
214
- }
215
- }
216
- break;
217
- }
218
- case 'custom': {
219
- // Try to delete by setting empty value
220
- if (this.config.writeFunction) {
221
- await this.config.writeFunction(key, '');
222
- }
223
- break;
224
- }
225
- case 'memory': {
226
- this.memoryStore.delete(key);
227
- break;
228
- }
229
- default:
230
- throw new Error(`Unknown backend: ${this.backend}`);
231
- }
232
- }
233
- catch (error) {
234
- logger.log('error', `Storage delete error for key ${key}: ${error.message}`);
235
- throw error;
236
- }
237
- }
238
- /**
239
- * List keys by prefix
240
- */
241
- async list(prefix) {
242
- prefix = prefix ? this.validateKey(prefix) : '/';
243
- try {
244
- switch (this.backend) {
245
- case 'custom': {
246
- // If we have fsBasePath, this is actually filesystem backend
247
- if (this.fsBasePath) {
248
- const basePath = this.keyToPath(prefix);
249
- const keys = [];
250
- const walkDir = async (dir, baseDir) => {
251
- try {
252
- const entries = await readdir(dir, { withFileTypes: true });
253
- for (const entry of entries) {
254
- const fullPath = plugins.path.join(dir, entry.name);
255
- if (entry.isDirectory()) {
256
- await walkDir(fullPath, baseDir);
257
- }
258
- else if (entry.isFile()) {
259
- // Convert path back to key
260
- const relativePath = plugins.path.relative(this.fsBasePath, fullPath);
261
- const key = '/' + relativePath.replace(/\\/g, '/');
262
- if (key.startsWith(prefix)) {
263
- keys.push(key);
264
- }
265
- }
266
- }
267
- }
268
- catch (error) {
269
- if (error.code !== 'ENOENT') {
270
- throw error;
271
- }
272
- }
273
- };
274
- await walkDir(basePath, basePath);
275
- return keys.sort();
276
- }
277
- else {
278
- // True custom backends need to implement their own listing
279
- logger.log('warn', 'List operation not supported for custom backend');
280
- return [];
281
- }
282
- }
283
- case 'memory': {
284
- const keys = [];
285
- for (const key of this.memoryStore.keys()) {
286
- if (key.startsWith(prefix)) {
287
- keys.push(key);
288
- }
289
- }
290
- return keys.sort();
291
- }
292
- default:
293
- throw new Error(`Unknown backend: ${this.backend}`);
294
- }
295
- }
296
- catch (error) {
297
- logger.log('error', `Storage list error for prefix ${prefix}: ${error.message}`);
298
- throw error;
299
- }
300
- }
301
- /**
302
- * Check if key exists
303
- */
304
- async exists(key) {
305
- key = this.validateKey(key);
306
- try {
307
- const value = await this.get(key);
308
- return value !== null;
309
- }
310
- catch (error) {
311
- return false;
312
- }
313
- }
314
- /**
315
- * Get storage backend type
316
- */
317
- getBackend() {
318
- // If we're using custom backend with fsBasePath, report it as filesystem
319
- if (this.backend === 'custom' && this.fsBasePath) {
320
- return 'filesystem';
321
- }
322
- return this.backend;
323
- }
324
- /**
325
- * JSON helper: Get and parse JSON value
326
- */
327
- async getJSON(key) {
328
- const value = await this.get(key);
329
- if (value === null || value.trim() === '') {
330
- return null;
331
- }
332
- try {
333
- return JSON.parse(value);
334
- }
335
- catch (error) {
336
- logger.log('error', `Failed to parse JSON for key ${key}: ${error.message}`);
337
- throw error;
338
- }
339
- }
340
- /**
341
- * JSON helper: Set value as JSON
342
- */
343
- async setJSON(key, value) {
344
- const jsonString = JSON.stringify(value, null, 2);
345
- await this.set(key, jsonString);
346
- }
347
- }
348
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.storagemanager.js","sourceRoot":"","sources":["../../../ts/storage/classes.storagemanager.ts"],"names":[],"mappings":"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"}
@@ -1 +0,0 @@
1
- export * from './classes.storagemanager.js';
@@ -1,3 +0,0 @@
1
- // Storage module exports
2
- export * from './classes.storagemanager.js';
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9zdG9yYWdlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHlCQUF5QjtBQUN6QixjQUFjLDZCQUE2QixDQUFDIn0=
@@ -1,155 +0,0 @@
1
- import * as plugins from '../plugins.js';
2
- import { logger } from '../logger.js';
3
- import { defaultTsmDbPath } from '../paths.js';
4
-
5
- /**
6
- * Configuration options for CacheDb
7
- */
8
- export interface ICacheDbOptions {
9
- /** Base storage path for TsmDB data (default: ~/.serve.zone/dcrouter/tsmdb) */
10
- storagePath?: string;
11
- /** Database name (default: dcrouter) */
12
- dbName?: string;
13
- /** Enable debug logging */
14
- debug?: boolean;
15
- }
16
-
17
- /**
18
- * CacheDb - Wrapper around LocalSmartDb and smartdata
19
- *
20
- * Provides persistent caching using smartdata as the ORM layer
21
- * and LocalSmartDb as the embedded database engine.
22
- */
23
- export class CacheDb {
24
- private static instance: CacheDb | null = null;
25
-
26
- private localSmartDb!: plugins.smartdb.LocalSmartDb;
27
- private smartdataDb!: plugins.smartdata.SmartdataDb;
28
- private options: Required<ICacheDbOptions>;
29
- private isStarted: boolean = false;
30
-
31
- constructor(options: ICacheDbOptions = {}) {
32
- this.options = {
33
- storagePath: options.storagePath || defaultTsmDbPath,
34
- dbName: options.dbName || 'dcrouter',
35
- debug: options.debug || false,
36
- };
37
- }
38
-
39
- /**
40
- * Get or create the singleton instance
41
- */
42
- public static getInstance(options?: ICacheDbOptions): CacheDb {
43
- if (!CacheDb.instance) {
44
- CacheDb.instance = new CacheDb(options);
45
- }
46
- return CacheDb.instance;
47
- }
48
-
49
- /**
50
- * Reset the singleton instance (useful for testing)
51
- */
52
- public static resetInstance(): void {
53
- CacheDb.instance = null;
54
- }
55
-
56
- /**
57
- * Start the cache database
58
- * - Initializes LocalSmartDb with file persistence
59
- * - Connects smartdata to the LocalSmartDb via Unix socket
60
- */
61
- public async start(): Promise<void> {
62
- if (this.isStarted) {
63
- logger.log('warn', 'CacheDb already started');
64
- return;
65
- }
66
-
67
- try {
68
- // Ensure storage directory exists
69
- await plugins.fsUtils.ensureDir(this.options.storagePath);
70
-
71
- // Create LocalSmartDb instance
72
- this.localSmartDb = new plugins.smartdb.LocalSmartDb({
73
- folderPath: this.options.storagePath,
74
- });
75
-
76
- // Start LocalSmartDb and get connection info
77
- const connectionInfo = await this.localSmartDb.start();
78
-
79
- if (this.options.debug) {
80
- logger.log('debug', `LocalSmartDb started with URI: ${connectionInfo.connectionUri}`);
81
- }
82
-
83
- // Initialize smartdata with the connection URI
84
- this.smartdataDb = new plugins.smartdata.SmartdataDb({
85
- mongoDbUrl: connectionInfo.connectionUri,
86
- mongoDbName: this.options.dbName,
87
- });
88
- await this.smartdataDb.init();
89
-
90
- this.isStarted = true;
91
- logger.log('info', `CacheDb started at ${this.options.storagePath}`);
92
- } catch (error: unknown) {
93
- logger.log('error', `Failed to start CacheDb: ${(error as Error).message}`);
94
- throw error;
95
- }
96
- }
97
-
98
- /**
99
- * Stop the cache database
100
- */
101
- public async stop(): Promise<void> {
102
- if (!this.isStarted) {
103
- return;
104
- }
105
-
106
- try {
107
- // Close smartdata connection
108
- if (this.smartdataDb) {
109
- await this.smartdataDb.close();
110
- }
111
-
112
- // Stop LocalSmartDb
113
- if (this.localSmartDb) {
114
- await this.localSmartDb.stop();
115
- }
116
-
117
- this.isStarted = false;
118
- logger.log('info', 'CacheDb stopped');
119
- } catch (error: unknown) {
120
- logger.log('error', `Error stopping CacheDb: ${(error as Error).message}`);
121
- throw error;
122
- }
123
- }
124
-
125
- /**
126
- * Get the smartdata database instance
127
- */
128
- public getDb(): plugins.smartdata.SmartdataDb {
129
- if (!this.isStarted) {
130
- throw new Error('CacheDb not started. Call start() first.');
131
- }
132
- return this.smartdataDb;
133
- }
134
-
135
- /**
136
- * Check if the database is ready
137
- */
138
- public isReady(): boolean {
139
- return this.isStarted;
140
- }
141
-
142
- /**
143
- * Get the storage path
144
- */
145
- public getStoragePath(): string {
146
- return this.options.storagePath;
147
- }
148
-
149
- /**
150
- * Get the database name
151
- */
152
- public getDbName(): string {
153
- return this.options.dbName;
154
- }
155
- }
@@ -1,2 +0,0 @@
1
- export * from './classes.cached.email.js';
2
- export * from './classes.cached.ip.reputation.js';