s3db.js 18.0.11-next.47047b5d → 18.0.11-next.e8e71b5b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/concerns/high-performance-inserter.js +6 -34
- package/dist/concerns/high-performance-inserter.js.map +1 -1
- package/dist/database/database-connection.class.js +3 -6
- package/dist/database/database-connection.class.js.map +1 -1
- package/dist/database/database-plugins.class.js +7 -13
- package/dist/database/database-plugins.class.js.map +1 -1
- package/dist/plugins/eventual-consistency/consolidation.js +4 -7
- package/dist/plugins/eventual-consistency/consolidation.js.map +1 -1
- package/dist/plugins/eventual-consistency/garbage-collection.js +3 -6
- package/dist/plugins/eventual-consistency/garbage-collection.js.map +1 -1
- package/dist/plugins/queue-consumer.plugin.js +10 -16
- package/dist/plugins/queue-consumer.plugin.js.map +1 -1
- package/dist/plugins/recon/managers/scheduler-manager.js +3 -5
- package/dist/plugins/recon/managers/scheduler-manager.js.map +1 -1
- package/dist/plugins/replicator.plugin.js +13 -31
- package/dist/plugins/replicator.plugin.js.map +1 -1
- package/dist/plugins/replicators/base-replicator.class.js +10 -23
- package/dist/plugins/replicators/base-replicator.class.js.map +1 -1
- package/dist/s3db.cjs +93 -150
- package/dist/s3db.cjs.map +1 -1
- package/dist/s3db.es.js +93 -150
- package/dist/s3db.es.js.map +1 -1
- package/dist/stream/resource-reader.class.js +5 -7
- package/dist/stream/resource-reader.class.js.map +1 -1
- package/dist/stream/resource-writer.class.js +5 -7
- package/dist/stream/resource-writer.class.js.map +1 -1
- package/dist/tasks/tasks-pool.class.js +31 -0
- package/dist/tasks/tasks-pool.class.js.map +1 -1
- package/dist/types/concerns/high-performance-inserter.d.ts.map +1 -1
- package/dist/types/database/database-connection.class.d.ts.map +1 -1
- package/dist/types/database/database-plugins.class.d.ts.map +1 -1
- package/dist/types/plugins/eventual-consistency/consolidation.d.ts.map +1 -1
- package/dist/types/plugins/eventual-consistency/garbage-collection.d.ts.map +1 -1
- package/dist/types/plugins/queue-consumer.plugin.d.ts.map +1 -1
- package/dist/types/plugins/recon/managers/scheduler-manager.d.ts.map +1 -1
- package/dist/types/plugins/replicator.plugin.d.ts.map +1 -1
- package/dist/types/plugins/replicators/base-replicator.class.d.ts.map +1 -1
- package/dist/types/stream/resource-reader.class.d.ts.map +1 -1
- package/dist/types/stream/resource-writer.class.d.ts.map +1 -1
- package/dist/types/tasks/tasks-pool.class.d.ts +23 -0
- package/dist/types/tasks/tasks-pool.class.d.ts.map +1 -1
- package/package.json +1 -2
- package/src/concerns/high-performance-inserter.ts +18 -57
- package/src/database/database-connection.class.ts +7 -6
- package/src/database/database-plugins.class.ts +15 -13
- package/src/plugins/eventual-consistency/consolidation.ts +8 -7
- package/src/plugins/eventual-consistency/garbage-collection.ts +7 -6
- package/src/plugins/queue-consumer.plugin.ts +21 -19
- package/src/plugins/recon/managers/scheduler-manager.ts +7 -5
- package/src/plugins/replicator.plugin.ts +41 -35
- package/src/plugins/replicators/base-replicator.class.ts +17 -23
- package/src/stream/resource-reader.class.ts +10 -8
- package/src/stream/resource-writer.class.ts +10 -8
- package/src/tasks/tasks-pool.class.ts +46 -0
|
@@ -1,17 +1,5 @@
|
|
|
1
1
|
import { tryFn } from './try-fn.js';
|
|
2
|
-
|
|
3
|
-
async function loadPromisePool() {
|
|
4
|
-
if (PromisePoolCache)
|
|
5
|
-
return PromisePoolCache;
|
|
6
|
-
try {
|
|
7
|
-
const module = await import('@supercharge/promise-pool');
|
|
8
|
-
PromisePoolCache = module;
|
|
9
|
-
return PromisePoolCache;
|
|
10
|
-
}
|
|
11
|
-
catch {
|
|
12
|
-
throw new Error('Failed to load @supercharge/promise-pool. Please install it: pnpm add @supercharge/promise-pool');
|
|
13
|
-
}
|
|
14
|
-
}
|
|
2
|
+
import { TasksPool } from '../tasks/tasks-pool.class.js';
|
|
15
3
|
export class HighPerformanceInserter {
|
|
16
4
|
resource;
|
|
17
5
|
batchSize;
|
|
@@ -77,13 +65,7 @@ export class HighPerformanceInserter {
|
|
|
77
65
|
const batch = this.insertBuffer.splice(0, this.batchSize);
|
|
78
66
|
const startTime = Date.now();
|
|
79
67
|
const [ok] = await tryFn(async () => {
|
|
80
|
-
const {
|
|
81
|
-
const { results, errors } = await PromisePool
|
|
82
|
-
.for(batch)
|
|
83
|
-
.withConcurrency(this.concurrency)
|
|
84
|
-
.process(async (item) => {
|
|
85
|
-
return await this.performInsert(item);
|
|
86
|
-
});
|
|
68
|
+
const { results, errors } = await TasksPool.map(batch, async (item) => this.performInsert(item), { concurrency: this.concurrency });
|
|
87
69
|
const duration = Date.now() - startTime;
|
|
88
70
|
this.stats.inserted += results.filter(r => r.success).length;
|
|
89
71
|
this.stats.failed += errors.length;
|
|
@@ -135,11 +117,7 @@ export class HighPerformanceInserter {
|
|
|
135
117
|
this.partitionProcessor = null;
|
|
136
118
|
return;
|
|
137
119
|
}
|
|
138
|
-
|
|
139
|
-
await PromisePool
|
|
140
|
-
.for(batch)
|
|
141
|
-
.withConcurrency(10)
|
|
142
|
-
.process(async (item) => {
|
|
120
|
+
await TasksPool.map(batch, async (item) => {
|
|
143
121
|
const [ok, err] = await tryFn(() => this.resource.createPartitionReferences(item.data));
|
|
144
122
|
if (ok) {
|
|
145
123
|
this.stats.partitionsPending--;
|
|
@@ -150,7 +128,7 @@ export class HighPerformanceInserter {
|
|
|
150
128
|
error: err
|
|
151
129
|
});
|
|
152
130
|
}
|
|
153
|
-
});
|
|
131
|
+
}, { concurrency: 10 });
|
|
154
132
|
if (this.partitionQueue.length > 0) {
|
|
155
133
|
this.processPartitionsAsync();
|
|
156
134
|
}
|
|
@@ -213,17 +191,11 @@ export class StreamInserter {
|
|
|
213
191
|
return { id, inserted: true };
|
|
214
192
|
}
|
|
215
193
|
async bulkInsert(items) {
|
|
216
|
-
const {
|
|
217
|
-
const { results, errors } = await PromisePool
|
|
218
|
-
.for(items)
|
|
219
|
-
.withConcurrency(this.concurrency)
|
|
220
|
-
.process(async (item) => {
|
|
221
|
-
return await this.fastInsert(item);
|
|
222
|
-
});
|
|
194
|
+
const { results, errors } = await TasksPool.map(items, async (item) => this.fastInsert(item), { concurrency: this.concurrency });
|
|
223
195
|
return {
|
|
224
196
|
success: results.length,
|
|
225
197
|
failed: errors.length,
|
|
226
|
-
errors: errors.slice(0, 10)
|
|
198
|
+
errors: errors.map(e => e.error).slice(0, 10)
|
|
227
199
|
};
|
|
228
200
|
}
|
|
229
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"high-performance-inserter.js","sourceRoot":"","sources":["../../src/concerns/high-performance-inserter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"high-performance-inserter.js","sourceRoot":"","sources":["../../src/concerns/high-performance-inserter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TasksPool } from '../tasks/tasks-pool.class.js';
|
|
2
2
|
import Resource from '../resource.class.js';
|
|
3
3
|
import tryFn, { tryFnSync } from '../concerns/try-fn.js';
|
|
4
4
|
import { streamToString } from '../stream/index.js';
|
|
@@ -156,16 +156,13 @@ export class DatabaseConnection {
|
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
const stopConcurrency = Math.max(1, Number.isFinite(db.executorPool?.concurrency) ? db.executorPool.concurrency : 5);
|
|
159
|
-
await
|
|
160
|
-
.withConcurrency(stopConcurrency)
|
|
161
|
-
.for(db.pluginList)
|
|
162
|
-
.process(async (plugin) => {
|
|
159
|
+
await TasksPool.map(db.pluginList, async (plugin) => {
|
|
163
160
|
await tryFn(async () => {
|
|
164
161
|
if (plugin && typeof plugin.stop === 'function') {
|
|
165
162
|
await plugin.stop();
|
|
166
163
|
}
|
|
167
164
|
});
|
|
168
|
-
});
|
|
165
|
+
}, { concurrency: stopConcurrency });
|
|
169
166
|
}
|
|
170
167
|
if (db.resources && Object.keys(db.resources).length > 0) {
|
|
171
168
|
for (const [, resource] of Object.entries(db.resources)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-connection.class.js","sourceRoot":"","sources":["../../src/database/database-connection.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"database-connection.class.js","sourceRoot":"","sources":["../../src/database/database-connection.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isEmpty, isFunction } from 'lodash-es';
|
|
2
|
-
import {
|
|
2
|
+
import { TasksPool } from '../tasks/tasks-pool.class.js';
|
|
3
3
|
import { DatabaseError } from '../errors.js';
|
|
4
4
|
export class DatabasePlugins {
|
|
5
5
|
database;
|
|
@@ -27,10 +27,7 @@ export class DatabasePlugins {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
const concurrency = Math.max(1, Number.isFinite(db.executorPool?.concurrency) ? db.executorPool.concurrency : 5);
|
|
30
|
-
const installResult = await
|
|
31
|
-
.withConcurrency(concurrency)
|
|
32
|
-
.for(plugins)
|
|
33
|
-
.process(async (plugin) => {
|
|
30
|
+
const installResult = await TasksPool.map(plugins, async (plugin) => {
|
|
34
31
|
const pluginName = this._getPluginName(plugin);
|
|
35
32
|
if (typeof plugin.setInstanceName === 'function') {
|
|
36
33
|
plugin.setInstanceName(pluginName);
|
|
@@ -46,11 +43,11 @@ export class DatabasePlugins {
|
|
|
46
43
|
});
|
|
47
44
|
db.pluginRegistry[pluginName] = plugin;
|
|
48
45
|
return pluginName;
|
|
49
|
-
});
|
|
46
|
+
}, { concurrency });
|
|
50
47
|
if (installResult.errors.length > 0) {
|
|
51
48
|
const errorInfo = installResult.errors[0];
|
|
52
49
|
const failedPlugin = errorInfo.item;
|
|
53
|
-
const error = errorInfo.
|
|
50
|
+
const error = errorInfo.error;
|
|
54
51
|
const failedName = this._getPluginName(failedPlugin);
|
|
55
52
|
throw new DatabaseError(`Failed to install plugin '${failedName}': ${error?.message || error}`, {
|
|
56
53
|
operation: 'startPlugins.install',
|
|
@@ -58,10 +55,7 @@ export class DatabasePlugins {
|
|
|
58
55
|
original: error
|
|
59
56
|
});
|
|
60
57
|
}
|
|
61
|
-
const startResult = await
|
|
62
|
-
.withConcurrency(concurrency)
|
|
63
|
-
.for(plugins)
|
|
64
|
-
.process(async (plugin) => {
|
|
58
|
+
const startResult = await TasksPool.map(plugins, async (plugin) => {
|
|
65
59
|
const pluginName = this._getPluginName(plugin);
|
|
66
60
|
await plugin.start();
|
|
67
61
|
db.emit('db:plugin:metrics', {
|
|
@@ -70,11 +64,11 @@ export class DatabasePlugins {
|
|
|
70
64
|
...this.coordinators.collectMemorySnapshot()
|
|
71
65
|
});
|
|
72
66
|
return plugin;
|
|
73
|
-
});
|
|
67
|
+
}, { concurrency });
|
|
74
68
|
if (startResult.errors.length > 0) {
|
|
75
69
|
const errorInfo = startResult.errors[0];
|
|
76
70
|
const failedPlugin = errorInfo.item;
|
|
77
|
-
const error = errorInfo.
|
|
71
|
+
const error = errorInfo.error;
|
|
78
72
|
const failedName = this._getPluginName(failedPlugin);
|
|
79
73
|
throw new DatabaseError(`Failed to start plugin '${failedName}': ${error?.message || error}`, {
|
|
80
74
|
operation: 'startPlugins.start',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-plugins.class.js","sourceRoot":"","sources":["../../src/database/database-plugins.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"database-plugins.class.js","sourceRoot":"","sources":["../../src/database/database-plugins.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* @module eventual-consistency/consolidation
|
|
4
4
|
*/
|
|
5
5
|
import tryFn from '../../concerns/try-fn.js';
|
|
6
|
-
import {
|
|
6
|
+
import { TasksPool } from '../../tasks/tasks-pool.class.js';
|
|
7
7
|
import { getCronManager } from '../../concerns/cron-manager.js';
|
|
8
8
|
import { createLogger } from '../../concerns/logger.js';
|
|
9
9
|
import { PluginError } from '../../errors.js';
|
|
@@ -75,19 +75,16 @@ export async function runConsolidation(handler, storage, config, emitFn) {
|
|
|
75
75
|
return result;
|
|
76
76
|
}
|
|
77
77
|
const byOriginalId = groupByOriginalId(allTransactions);
|
|
78
|
-
const { results, errors } = await
|
|
79
|
-
.for(Object.entries(byOriginalId))
|
|
80
|
-
.withConcurrency(10)
|
|
81
|
-
.process(async ([originalId, transactions]) => {
|
|
78
|
+
const { results, errors } = await TasksPool.map(Object.entries(byOriginalId), async ([originalId, transactions]) => {
|
|
82
79
|
return consolidateRecord(handler, originalId, transactions, config);
|
|
83
|
-
});
|
|
80
|
+
}, { concurrency: 10 });
|
|
84
81
|
for (const recordResult of results) {
|
|
85
82
|
if (recordResult) {
|
|
86
83
|
result.recordsProcessed++;
|
|
87
84
|
result.transactionsApplied += recordResult.transactionsApplied;
|
|
88
85
|
}
|
|
89
86
|
}
|
|
90
|
-
result.errors = errors;
|
|
87
|
+
result.errors = errors.map(e => e.error);
|
|
91
88
|
result.success = errors.length === 0;
|
|
92
89
|
if (config.enableAnalytics && handler.analyticsResource) {
|
|
93
90
|
const analyticsConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidation.js","sourceRoot":"","sources":["../../../src/plugins/eventual-consistency/consolidation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"consolidation.js","sourceRoot":"","sources":["../../../src/plugins/eventual-consistency/consolidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* @module eventual-consistency/garbage-collection
|
|
4
4
|
*/
|
|
5
5
|
import tryFn from '../../concerns/try-fn.js';
|
|
6
|
-
import {
|
|
6
|
+
import { TasksPool } from '../../tasks/tasks-pool.class.js';
|
|
7
7
|
import { getCronManager } from '../../concerns/cron-manager.js';
|
|
8
8
|
/**
|
|
9
9
|
* Start garbage collection timer for a handler
|
|
@@ -59,13 +59,10 @@ export async function runGarbageCollection(transactionResource, storage, config,
|
|
|
59
59
|
if (!oldTransactions || oldTransactions.length === 0) {
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
|
-
const { results, errors } = await
|
|
63
|
-
.for(oldTransactions)
|
|
64
|
-
.withConcurrency(10)
|
|
65
|
-
.process(async (txn) => {
|
|
62
|
+
const { results, errors } = await TasksPool.map(oldTransactions, async (txn) => {
|
|
66
63
|
const [deleted] = await tryFn(() => transactionResource.delete(txn.id));
|
|
67
64
|
return deleted;
|
|
68
|
-
});
|
|
65
|
+
}, { concurrency: 10 });
|
|
69
66
|
if (emitFn) {
|
|
70
67
|
emitFn('plg:eventual-consistency:gc-completed', {
|
|
71
68
|
resource: config.resource,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"garbage-collection.js","sourceRoot":"","sources":["../../../src/plugins/eventual-consistency/garbage-collection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"garbage-collection.js","sourceRoot":"","sources":["../../../src/plugins/eventual-consistency/garbage-collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TasksPool } from '../tasks/tasks-pool.class.js';
|
|
2
2
|
import { Plugin } from './plugin.class.js';
|
|
3
3
|
import { createConsumer } from './consumers/index.js';
|
|
4
4
|
import tryFn from '../concerns/try-fn.js';
|
|
@@ -51,17 +51,14 @@ export class QueueConsumerPlugin extends Plugin {
|
|
|
51
51
|
if (startTasks.length === 0) {
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
const { errors } = await
|
|
55
|
-
.withConcurrency(this.startConcurrency)
|
|
56
|
-
.for(startTasks)
|
|
57
|
-
.process(async (task) => {
|
|
54
|
+
const { errors } = await TasksPool.map(startTasks, async (task) => {
|
|
58
55
|
await task.start();
|
|
59
56
|
return `${task.driver}:${task.resource}`;
|
|
60
|
-
});
|
|
57
|
+
}, { concurrency: this.startConcurrency });
|
|
61
58
|
if (errors.length > 0) {
|
|
62
|
-
const messages = errors.map((
|
|
63
|
-
const task =
|
|
64
|
-
const reason =
|
|
59
|
+
const messages = errors.map((errorInfo) => {
|
|
60
|
+
const task = errorInfo.item;
|
|
61
|
+
const reason = errorInfo.error;
|
|
65
62
|
const identifier = task ? `${task.driver || 'unknown'}:${task.resource || 'unknown'}` : 'unknown';
|
|
66
63
|
return `[${identifier}] ${reason?.message || reason}`;
|
|
67
64
|
});
|
|
@@ -84,16 +81,13 @@ export class QueueConsumerPlugin extends Plugin {
|
|
|
84
81
|
consumer,
|
|
85
82
|
stop: () => consumer.stop()
|
|
86
83
|
}));
|
|
87
|
-
const { errors } = await
|
|
88
|
-
.withConcurrency(this.stopConcurrency)
|
|
89
|
-
.for(stopTasks)
|
|
90
|
-
.process(async (task) => {
|
|
84
|
+
const { errors } = await TasksPool.map(stopTasks, async (task) => {
|
|
91
85
|
await task.stop();
|
|
92
86
|
return task.consumer;
|
|
93
|
-
});
|
|
87
|
+
}, { concurrency: this.stopConcurrency });
|
|
94
88
|
if (errors.length > 0) {
|
|
95
|
-
errors.forEach((
|
|
96
|
-
const reason =
|
|
89
|
+
errors.forEach((errorInfo) => {
|
|
90
|
+
const reason = errorInfo.error;
|
|
97
91
|
this.logger.warn({ error: reason?.message || reason }, `Failed to stop consumer: ${reason?.message || reason}`);
|
|
98
92
|
});
|
|
99
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-consumer.plugin.js","sourceRoot":"","sources":["../../src/plugins/queue-consumer.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"queue-consumer.plugin.js","sourceRoot":"","sources":["../../src/plugins/queue-consumer.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AA+DrD,MAAM,OAAO,mBAAoB,SAAQ,MAAM;IAI7C,aAAa,CAAqB;IAClC,SAAS,GAAe,EAAE,CAAC;IAC3B,gBAAgB,CAAS;IACzB,eAAe,CAAS;IAExB,YAAY,UAAsC,EAAE;QAClD,KAAK,CAAC,OAAc,CAAC,CAAC;QAEtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAa,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC;YACzC,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,QAAe,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,IAAI,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvF,CAAC;IAEQ,KAAK,CAAC,SAAS;QACtB,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;YAEtF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;gBACvC,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,GAAG,WAAW,CAAC;gBACrD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBAExE,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;oBACpC,UAAU,CAAC,IAAI,CAAC;wBACd,MAAM;wBACN,QAAQ;wBACR,KAAK,EAAE,KAAK,IAAI,EAAE;4BAChB,MAAM,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,cAAc,EAAE,CAAC;4BAC5D,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE;gCAC5C,GAAG,YAAY;gCACf,SAAS,EAAE,CAAC,GAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC;gCACpE,OAAO,EAAE,CAAC,GAAU,EAAE,GAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC;6BAC7E,CAAC,CAAC;4BACH,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC;4BACvB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAChC,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,CACpC,UAAU,EACV,KAAK,EAAE,IAAe,EAAE,EAAE;YACxB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3C,CAAC,EACD,EAAE,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,CACvC,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBACxC,MAAM,IAAI,GAAG,SAAS,CAAC,IAA6B,CAAC;gBACrD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;gBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBAClG,OAAO,IAAI,UAAU,KAAK,MAAM,EAAE,OAAO,IAAI,MAAM,EAAE,CAAC;YACxD,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,UAAU,CAAC,6CAA6C,EAAE;gBAClE,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC5B,UAAU,EAAE,uEAAuE;aACpF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,IAAI;QACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACxD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAe,IAAI,CAAC,SAAS;aACzC,MAAM,CAAC,CAAC,QAAQ,EAAwB,EAAE,CAAC,QAAQ,IAAI,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC;aACnG,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAChB,QAAQ;YACR,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5B,CAAC,CAAC,CAAC;QAEN,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,CACpC,SAAS,EACT,KAAK,EAAE,IAAc,EAAE,EAAE;YACvB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC,EACD,EAAE,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE,CACtC,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,IAAI,MAAM,EAAE,EACpC,4BAA4B,MAAM,EAAE,OAAO,IAAI,MAAM,EAAE,CACxD,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAiB,EAAE,kBAA0B;QAChE,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC;QAC5B,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/D,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC;QAEnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,UAAU,CAAC,+BAA+B,EAAE;gBACpD,SAAS,EAAE,eAAe;gBAC1B,SAAS,EAAE,kBAAkB;gBAC7B,WAAW,EAAE,IAAI;gBACjB,UAAU,EAAE,gFAAgF;aAC7F,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,UAAU,CAAC,6BAA6B,EAAE;gBAClD,SAAS,EAAE,eAAe;gBAC1B,SAAS,EAAE,kBAAkB;gBAC7B,QAAQ;gBACR,WAAW,EAAE,IAAI;gBACjB,UAAU,EAAE,uEAAuE;aACpF,CAAC,CAAC;QACL,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,UAAU,CAAC,aAAa,QAAQ,aAAa,EAAE;gBACvD,SAAS,EAAE,eAAe;gBAC1B,SAAS,EAAE,kBAAkB;gBAC7B,QAAQ;gBACR,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACxD,UAAU,EAAE,6EAA6E;aAC1F,CAAC,CAAC;QACL,CAAC;QAED,IAAI,MAAe,CAAC;QACpB,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAChD,CAAC;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;gBACzD,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,QAAkB,EAAE,gBAAgB,CAAC,CAAC;YAC1E,CAAC;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAE,IAAuB,EAAE,EAAE,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,UAAU,CAAC,uBAAuB,MAAM,GAAG,EAAE;oBACrD,SAAS,EAAE,eAAe;oBAC1B,SAAS,EAAE,kBAAkB;oBAC7B,QAAQ;oBACR,MAAM;oBACN,gBAAgB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;oBAChD,UAAU,EAAE,6DAA6D;iBAC1E,CAAC,CAAC;YACL,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,YAAY,CAAC,IAAW,EAAE,IAAa,EAAE,aAAqB;QAC5D,sDAAsD;IACxD,CAAC;CACF"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* - Triggers scheduled target sweeps
|
|
7
7
|
* - Iterates over enabled targets
|
|
8
8
|
*/
|
|
9
|
-
import {
|
|
9
|
+
import { TasksPool } from '../../../tasks/tasks-pool.class.js';
|
|
10
10
|
import { getCronManager } from '../../../concerns/cron-manager.js';
|
|
11
11
|
export class SchedulerManager {
|
|
12
12
|
plugin;
|
|
@@ -82,9 +82,7 @@ export class SchedulerManager {
|
|
|
82
82
|
targetCount: activeTargets.length,
|
|
83
83
|
targets: activeTargets.map(t => t.id)
|
|
84
84
|
});
|
|
85
|
-
await
|
|
86
|
-
.for(activeTargets)
|
|
87
|
-
.process(async (targetEntry) => {
|
|
85
|
+
await TasksPool.map(activeTargets, async (targetEntry) => {
|
|
88
86
|
try {
|
|
89
87
|
const report = await this.plugin.runDiagnostics(targetEntry.target, {
|
|
90
88
|
behavior: targetEntry.behavior,
|
|
@@ -109,7 +107,7 @@ export class SchedulerManager {
|
|
|
109
107
|
error
|
|
110
108
|
});
|
|
111
109
|
}
|
|
112
|
-
});
|
|
110
|
+
}, { concurrency: this.plugin.config.concurrency || 1 });
|
|
113
111
|
this.plugin.emit('recon:sweep-completed', {
|
|
114
112
|
reason,
|
|
115
113
|
targetCount: activeTargets.length
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler-manager.js","sourceRoot":"","sources":["../../../../src/plugins/recon/managers/scheduler-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"scheduler-manager.js","sourceRoot":"","sources":["../../../../src/plugins/recon/managers/scheduler-manager.ts"],"names":[],"mappings":"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"}
|