redis-smq-common 8.1.0 → 8.2.1
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/CHANGELOG.md +20 -0
- package/dist/cjs/src/logger/console-logger/console-logger.d.ts +14 -0
- package/dist/cjs/src/logger/console-logger/console-logger.d.ts.map +1 -0
- package/dist/cjs/src/logger/console-logger/console-logger.js +61 -0
- package/dist/cjs/src/logger/console-logger/console-logger.js.map +1 -0
- package/dist/cjs/src/logger/console-logger/console-message-formatter.d.ts +17 -0
- package/dist/cjs/src/logger/console-logger/console-message-formatter.d.ts.map +1 -0
- package/dist/cjs/src/logger/console-logger/console-message-formatter.js +48 -0
- package/dist/cjs/src/logger/console-logger/console-message-formatter.js.map +1 -0
- package/dist/cjs/src/logger/console-logger/index.d.ts +3 -0
- package/dist/cjs/src/logger/console-logger/index.d.ts.map +1 -0
- package/dist/cjs/src/logger/console-logger/index.js +19 -0
- package/dist/cjs/src/logger/console-logger/index.js.map +1 -0
- package/dist/cjs/src/logger/console-logger/types/console-logger.d.ts +15 -0
- package/dist/cjs/src/logger/console-logger/types/console-logger.d.ts.map +1 -0
- package/dist/cjs/src/logger/console-logger/types/console-logger.js +11 -0
- package/dist/cjs/src/logger/console-logger/types/console-logger.js.map +1 -0
- package/dist/cjs/src/logger/console-logger/types/index.d.ts +2 -0
- package/dist/cjs/src/logger/console-logger/types/index.d.ts.map +1 -0
- package/dist/cjs/src/logger/console-logger/types/index.js +18 -0
- package/dist/cjs/src/logger/console-logger/types/index.js.map +1 -0
- package/dist/cjs/src/logger/index.d.ts +1 -0
- package/dist/cjs/src/logger/index.d.ts.map +1 -1
- package/dist/cjs/src/logger/index.js +1 -0
- package/dist/cjs/src/logger/index.js.map +1 -1
- package/dist/cjs/src/logger/logger.d.ts +1 -1
- package/dist/cjs/src/logger/logger.d.ts.map +1 -1
- package/dist/cjs/src/logger/logger.js +27 -5
- package/dist/cjs/src/logger/logger.js.map +1 -1
- package/dist/cjs/src/logger/types/index.d.ts +1 -7
- package/dist/cjs/src/logger/types/index.d.ts.map +1 -1
- package/dist/cjs/src/logger/types/index.js +1 -1
- package/dist/cjs/src/logger/types/logger.d.ts +12 -0
- package/dist/cjs/src/logger/types/logger.d.ts.map +1 -0
- package/dist/cjs/src/logger/types/{config.js → logger.js} +1 -1
- package/dist/cjs/src/logger/types/logger.js.map +1 -0
- package/dist/cjs/src/redis-lock/redis-lock.d.ts +2 -0
- package/dist/cjs/src/redis-lock/redis-lock.d.ts.map +1 -1
- package/dist/cjs/src/redis-lock/redis-lock.js +114 -19
- package/dist/cjs/src/redis-lock/redis-lock.js.map +1 -1
- package/dist/cjs/src/worker/worker-callable.d.ts +2 -1
- package/dist/cjs/src/worker/worker-callable.d.ts.map +1 -1
- package/dist/cjs/src/worker/worker-callable.js +31 -3
- package/dist/cjs/src/worker/worker-callable.js.map +1 -1
- package/dist/cjs/src/worker/worker-resource-group.d.ts.map +1 -1
- package/dist/cjs/src/worker/worker-resource-group.js +100 -17
- package/dist/cjs/src/worker/worker-resource-group.js.map +1 -1
- package/dist/cjs/src/worker/worker-runnable.d.ts +2 -1
- package/dist/cjs/src/worker/worker-runnable.d.ts.map +1 -1
- package/dist/cjs/src/worker/worker-runnable.js +33 -4
- package/dist/cjs/src/worker/worker-runnable.js.map +1 -1
- package/dist/cjs/src/worker/worker.d.ts +4 -1
- package/dist/cjs/src/worker/worker.d.ts.map +1 -1
- package/dist/cjs/src/worker/worker.js +206 -57
- package/dist/cjs/src/worker/worker.js.map +1 -1
- package/dist/esm/src/logger/console-logger/console-logger.d.ts +14 -0
- package/dist/esm/src/logger/console-logger/console-logger.d.ts.map +1 -0
- package/dist/esm/src/logger/console-logger/console-logger.js +59 -0
- package/dist/esm/src/logger/console-logger/console-logger.js.map +1 -0
- package/dist/esm/src/logger/console-logger/console-message-formatter.d.ts +17 -0
- package/dist/esm/src/logger/console-logger/console-message-formatter.d.ts.map +1 -0
- package/dist/esm/src/logger/console-logger/console-message-formatter.js +47 -0
- package/dist/esm/src/logger/console-logger/console-message-formatter.js.map +1 -0
- package/dist/esm/src/logger/console-logger/index.d.ts +3 -0
- package/dist/esm/src/logger/console-logger/index.d.ts.map +1 -0
- package/dist/esm/src/logger/console-logger/index.js +3 -0
- package/dist/esm/src/logger/console-logger/index.js.map +1 -0
- package/dist/esm/src/logger/console-logger/types/console-logger.d.ts +15 -0
- package/dist/esm/src/logger/console-logger/types/console-logger.d.ts.map +1 -0
- package/dist/esm/src/logger/console-logger/types/console-logger.js +8 -0
- package/dist/esm/src/logger/console-logger/types/console-logger.js.map +1 -0
- package/dist/esm/src/logger/console-logger/types/index.d.ts +2 -0
- package/dist/esm/src/logger/console-logger/types/index.d.ts.map +1 -0
- package/dist/esm/src/logger/console-logger/types/index.js +2 -0
- package/dist/esm/src/logger/console-logger/types/index.js.map +1 -0
- package/dist/esm/src/logger/index.d.ts +1 -0
- package/dist/esm/src/logger/index.d.ts.map +1 -1
- package/dist/esm/src/logger/index.js +1 -0
- package/dist/esm/src/logger/index.js.map +1 -1
- package/dist/esm/src/logger/logger.d.ts +1 -1
- package/dist/esm/src/logger/logger.d.ts.map +1 -1
- package/dist/esm/src/logger/logger.js +25 -3
- package/dist/esm/src/logger/logger.js.map +1 -1
- package/dist/esm/src/logger/types/index.d.ts +1 -7
- package/dist/esm/src/logger/types/index.d.ts.map +1 -1
- package/dist/esm/src/logger/types/index.js +1 -1
- package/dist/esm/src/logger/types/logger.d.ts +12 -0
- package/dist/esm/src/logger/types/logger.d.ts.map +1 -0
- package/dist/esm/src/logger/types/logger.js +2 -0
- package/dist/esm/src/logger/types/logger.js.map +1 -0
- package/dist/esm/src/redis-lock/redis-lock.d.ts +2 -0
- package/dist/esm/src/redis-lock/redis-lock.d.ts.map +1 -1
- package/dist/esm/src/redis-lock/redis-lock.js +114 -19
- package/dist/esm/src/redis-lock/redis-lock.js.map +1 -1
- package/dist/esm/src/worker/worker-callable.d.ts +2 -1
- package/dist/esm/src/worker/worker-callable.d.ts.map +1 -1
- package/dist/esm/src/worker/worker-callable.js +31 -3
- package/dist/esm/src/worker/worker-callable.js.map +1 -1
- package/dist/esm/src/worker/worker-resource-group.d.ts.map +1 -1
- package/dist/esm/src/worker/worker-resource-group.js +100 -17
- package/dist/esm/src/worker/worker-resource-group.js.map +1 -1
- package/dist/esm/src/worker/worker-runnable.d.ts +2 -1
- package/dist/esm/src/worker/worker-runnable.d.ts.map +1 -1
- package/dist/esm/src/worker/worker-runnable.js +33 -4
- package/dist/esm/src/worker/worker-runnable.js.map +1 -1
- package/dist/esm/src/worker/worker.d.ts +4 -1
- package/dist/esm/src/worker/worker.d.ts.map +1 -1
- package/dist/esm/src/worker/worker.js +206 -55
- package/dist/esm/src/worker/worker.js.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/src/logger/types/config.d.ts +0 -4
- package/dist/cjs/src/logger/types/config.d.ts.map +0 -1
- package/dist/cjs/src/logger/types/config.js.map +0 -1
- package/dist/esm/src/logger/types/config.d.ts +0 -4
- package/dist/esm/src/logger/types/config.d.ts.map +0 -1
- package/dist/esm/src/logger/types/config.js +0 -2
- package/dist/esm/src/logger/types/config.js.map +0 -1
|
@@ -21,43 +21,76 @@ class RedisLock extends index_js_3.Runnable {
|
|
|
21
21
|
constructor(redisClient, logger, lockKey, ttl, retryOnFail = false, autoExtendInterval = 0) {
|
|
22
22
|
super();
|
|
23
23
|
this.lock = (cb) => {
|
|
24
|
+
this.logger.debug(`Attempting to acquire lock for key: ${this.lockKey}`);
|
|
24
25
|
this.redisClient.set(this.lockKey, this.id, {
|
|
25
26
|
expire: { mode: 'PX', value: this.ttl },
|
|
26
27
|
exists: 'NX',
|
|
27
28
|
}, (err, reply) => {
|
|
28
|
-
if (err)
|
|
29
|
+
if (err) {
|
|
30
|
+
this.logger.error(`Error acquiring lock: ${err.message}`, err);
|
|
29
31
|
return cb(err);
|
|
30
|
-
|
|
32
|
+
}
|
|
33
|
+
if (!this.powerSwitch.isGoingUp()) {
|
|
34
|
+
this.logger.warn('Lock acquisition aborted: power switch is no longer in going-up state');
|
|
31
35
|
return cb(new index_js_2.AbortError());
|
|
36
|
+
}
|
|
32
37
|
if (!reply) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
if (this.retryOnFail) {
|
|
39
|
+
this.logger.debug('Lock already held by another instance, retrying in 1 second');
|
|
40
|
+
return this.timer.setTimeout(() => this.lock(cb), 1000);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
this.logger.warn('Failed to acquire lock: already held by another instance');
|
|
44
|
+
return cb(new index_js_5.LockAcquireError());
|
|
45
|
+
}
|
|
36
46
|
}
|
|
47
|
+
this.logger.info(`Lock acquired successfully for key: ${this.lockKey}`);
|
|
37
48
|
cb();
|
|
38
49
|
});
|
|
39
50
|
};
|
|
40
51
|
this.extend = (cb) => {
|
|
41
|
-
if (!this.isRunning())
|
|
52
|
+
if (!this.isRunning()) {
|
|
53
|
+
this.logger.warn('Cannot extend lock: lock is not currently held');
|
|
42
54
|
return cb(new index_js_5.LockNotAcquiredError());
|
|
55
|
+
}
|
|
56
|
+
this.logger.debug(`Attempting to extend lock TTL for key: ${this.lockKey}`);
|
|
43
57
|
this.redisClient.runScript(ELuaScript.EXTEND_LOCK, [this.lockKey], [this.id, this.ttl], (err, reply) => {
|
|
44
|
-
if (err)
|
|
58
|
+
if (err) {
|
|
59
|
+
this.logger.error(`Error extending lock TTL: ${err.message}`, err);
|
|
45
60
|
return cb(err);
|
|
46
|
-
|
|
61
|
+
}
|
|
62
|
+
if (!this.powerSwitch.isRunning()) {
|
|
63
|
+
this.logger.warn('Lock extension aborted: power switch is no longer in running state');
|
|
47
64
|
return cb(new index_js_2.AbortError());
|
|
48
|
-
|
|
65
|
+
}
|
|
66
|
+
if (reply !== 1) {
|
|
67
|
+
this.logger.warn('Failed to extend lock: lock no longer held by this instance');
|
|
49
68
|
return this.shutdown(() => cb(new index_js_5.LockExtendError()));
|
|
69
|
+
}
|
|
70
|
+
this.logger.debug(`Lock TTL extended successfully for key: ${this.lockKey}`);
|
|
50
71
|
cb();
|
|
51
72
|
});
|
|
52
73
|
};
|
|
53
74
|
this.release = (cb) => {
|
|
54
|
-
this.
|
|
75
|
+
this.logger.debug(`Attempting to release lock for key: ${this.lockKey}`);
|
|
76
|
+
this.redisClient.runScript(ELuaScript.RELEASE_LOCK, [this.lockKey], [this.id], (err) => {
|
|
77
|
+
if (err) {
|
|
78
|
+
this.logger.error(`Error releasing lock: ${err.message}`, err);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
this.logger.info(`Lock released successfully for key: ${this.lockKey}`);
|
|
82
|
+
}
|
|
83
|
+
cb(err);
|
|
84
|
+
});
|
|
55
85
|
};
|
|
56
86
|
this.resetTimer = (cb) => {
|
|
87
|
+
this.logger.debug('Resetting auto-extension timer');
|
|
57
88
|
this.timer.reset();
|
|
89
|
+
this.logger.debug('Auto-extension timer reset successfully');
|
|
58
90
|
cb();
|
|
59
91
|
};
|
|
60
92
|
this.handleError = (err) => {
|
|
93
|
+
this.logger.error(`RedisLock error: ${err.message}`, err);
|
|
61
94
|
this.emit('locker.error', err, this.id);
|
|
62
95
|
super.handleError(err);
|
|
63
96
|
};
|
|
@@ -66,62 +99,124 @@ class RedisLock extends index_js_3.Runnable {
|
|
|
66
99
|
this.retryOnFail = retryOnFail;
|
|
67
100
|
this.autoExtendInterval = autoExtendInterval;
|
|
68
101
|
this.logger = logger;
|
|
102
|
+
this.logger.info(`RedisLock instance created for key: ${lockKey}`);
|
|
103
|
+
this.logger.debug('RedisLock initialization details', {
|
|
104
|
+
id: this.id,
|
|
105
|
+
lockKey,
|
|
106
|
+
ttl,
|
|
107
|
+
retryOnFail,
|
|
108
|
+
autoExtendInterval,
|
|
109
|
+
});
|
|
69
110
|
this.redisClient = redisClient;
|
|
70
111
|
this.redisClient.on('error', this.handleError);
|
|
71
|
-
this.
|
|
112
|
+
this.logger.debug('Loading Redis Lua scripts');
|
|
113
|
+
this.redisClient.loadScriptFiles(luaScriptMap, (err) => {
|
|
114
|
+
if (err) {
|
|
115
|
+
this.logger.error(`Failed to load Redis Lua scripts: ${err.message}`, err);
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
this.logger.debug('Redis Lua scripts loaded successfully');
|
|
119
|
+
}
|
|
120
|
+
});
|
|
72
121
|
this.timer = new index_js_4.Timer();
|
|
73
122
|
this.timer.on('error', this.handleError);
|
|
123
|
+
this.logger.info('RedisLock initialization complete');
|
|
74
124
|
}
|
|
75
125
|
autoExtendLock() {
|
|
76
126
|
if (this.autoExtendInterval) {
|
|
127
|
+
this.logger.debug(`Scheduling auto-extension of lock in ${this.autoExtendInterval}ms`);
|
|
77
128
|
this.timer.setTimeout(() => this.extend((err) => {
|
|
78
129
|
if (err && !(err instanceof index_js_2.AbortError)) {
|
|
130
|
+
this.logger.error(`Auto-extension of lock failed: ${err.message}`, err);
|
|
79
131
|
this.handleError(err);
|
|
80
132
|
}
|
|
81
133
|
else if (!err) {
|
|
134
|
+
this.logger.debug('Auto-extension of lock successful, scheduling next extension');
|
|
82
135
|
this.autoExtendLock();
|
|
83
136
|
}
|
|
137
|
+
else {
|
|
138
|
+
this.logger.debug('Auto-extension of lock aborted');
|
|
139
|
+
}
|
|
84
140
|
}), this.autoExtendInterval);
|
|
85
141
|
}
|
|
142
|
+
else {
|
|
143
|
+
this.logger.debug('Auto-extension of lock is disabled');
|
|
144
|
+
}
|
|
86
145
|
}
|
|
87
146
|
goingUp() {
|
|
147
|
+
this.logger.debug('RedisLock transitioning to going-up state');
|
|
148
|
+
this.emit('locker.goingUp', this.id);
|
|
88
149
|
return super.goingUp().concat([this.lock]);
|
|
89
150
|
}
|
|
90
151
|
goingDown() {
|
|
152
|
+
this.logger.debug('RedisLock transitioning to going-down state');
|
|
153
|
+
this.emit('locker.goingDown', this.id);
|
|
91
154
|
return [this.resetTimer, this.release].concat(super.goingDown());
|
|
92
155
|
}
|
|
93
156
|
getLogger() {
|
|
94
157
|
return this.logger;
|
|
95
158
|
}
|
|
159
|
+
up(cb) {
|
|
160
|
+
this.logger.info(`RedisLock transitioned to up state for key: ${this.lockKey}`);
|
|
161
|
+
this.emit('locker.up', this.id);
|
|
162
|
+
super.up(cb);
|
|
163
|
+
}
|
|
164
|
+
down(cb) {
|
|
165
|
+
this.logger.info(`RedisLock transitioned to down state for key: ${this.lockKey}`);
|
|
166
|
+
this.emit('locker.down', this.id);
|
|
167
|
+
super.down(cb);
|
|
168
|
+
}
|
|
96
169
|
run(cb) {
|
|
170
|
+
this.logger.info(`Attempting to run RedisLock for key: ${this.lockKey}`);
|
|
97
171
|
super.run((err, reply) => {
|
|
98
|
-
if (err instanceof index_js_5.LockAcquireError)
|
|
172
|
+
if (err instanceof index_js_5.LockAcquireError) {
|
|
173
|
+
this.logger.info(`Lock already held by another instance for key: ${this.lockKey}`);
|
|
99
174
|
return cb(null, false);
|
|
100
|
-
|
|
175
|
+
}
|
|
176
|
+
if (err) {
|
|
177
|
+
this.logger.error(`Error running RedisLock: ${err.message}`, err);
|
|
101
178
|
return cb(err);
|
|
102
|
-
|
|
103
|
-
|
|
179
|
+
}
|
|
180
|
+
if (reply) {
|
|
181
|
+
this.logger.info(`RedisLock running successfully for key: ${this.lockKey}`);
|
|
182
|
+
if (this.autoExtendInterval) {
|
|
183
|
+
this.logger.debug(`Auto-extension enabled with interval: ${this.autoExtendInterval}ms`);
|
|
184
|
+
this.autoExtendLock();
|
|
185
|
+
}
|
|
186
|
+
}
|
|
104
187
|
cb(null, Boolean(reply));
|
|
105
188
|
});
|
|
106
189
|
}
|
|
107
190
|
acquireLock(cb) {
|
|
191
|
+
this.logger.info(`Acquiring lock for key: ${this.lockKey}`);
|
|
108
192
|
this.run(cb);
|
|
109
193
|
}
|
|
110
194
|
releaseLock(cb) {
|
|
195
|
+
this.logger.info(`Releasing lock for key: ${this.lockKey}`);
|
|
111
196
|
this.shutdown(cb);
|
|
112
197
|
}
|
|
113
198
|
extendLock(cb) {
|
|
114
|
-
|
|
199
|
+
this.logger.debug(`Manual extension of lock requested for key: ${this.lockKey}`);
|
|
200
|
+
if (this.autoExtendInterval) {
|
|
201
|
+
this.logger.warn('Cannot manually extend lock: auto-extension is enabled');
|
|
115
202
|
return cb(new index_js_5.LockMethodNotAllowedError());
|
|
116
|
-
|
|
203
|
+
}
|
|
204
|
+
if (!this.powerSwitch.isRunning()) {
|
|
205
|
+
this.logger.warn('Cannot extend lock: lock is not currently held');
|
|
117
206
|
return cb(new index_js_5.LockNotAcquiredError());
|
|
207
|
+
}
|
|
208
|
+
this.logger.debug('Extending lock TTL');
|
|
118
209
|
this.extend(cb);
|
|
119
210
|
}
|
|
120
211
|
isLocked() {
|
|
121
|
-
|
|
212
|
+
const locked = this.powerSwitch.isRunning();
|
|
213
|
+
this.logger.debug(`Lock status check for key ${this.lockKey}: ${locked ? 'locked' : 'not locked'}`);
|
|
214
|
+
return locked;
|
|
122
215
|
}
|
|
123
216
|
isReleased() {
|
|
124
|
-
|
|
217
|
+
const released = this.powerSwitch.isDown();
|
|
218
|
+
this.logger.debug(`Lock release status check for key ${this.lockKey}: ${released ? 'released' : 'not released'}`);
|
|
219
|
+
return released;
|
|
125
220
|
}
|
|
126
221
|
}
|
|
127
222
|
exports.RedisLock = RedisLock;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-lock.js","sourceRoot":"","sources":["../../../../src/redis-lock/redis-lock.ts"],"names":[],"mappings":";;;AASA,+BAA+B;AAE/B,8CAAsC;AACtC,iDAAgD;AAGhD,mDAAgD;AAChD,gDAA0C;AAC1C,gDAK2B;AAE3B,MAAM,GAAG,GAAG,cAAG,CAAC,aAAa,EAAE,CAAC;AAUhC,IAAK,UAGJ;AAHD,WAAK,UAAU;IACb,2CAA6B,CAAA;IAC7B,yCAA2B,CAAA;AAC7B,CAAC,EAHI,UAAU,KAAV,UAAU,QAGd;AAED,MAAM,YAAY,GAAG;IACnB,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,IAAA,cAAO,EAAC,GAAG,EAAE,gCAAgC,CAAC;IACzE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,GAAG,EAAE,+BAA+B,CAAC;CACxE,CAAC;AAMF,MAAa,SAAU,SAAQ,mBAAsB;IASnD,YACE,WAAyB,EACzB,MAAe,EACf,OAAe,EACf,GAAW,EACX,WAAW,GAAG,KAAK,EACnB,qBAA6B,CAAC;QAE9B,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"redis-lock.js","sourceRoot":"","sources":["../../../../src/redis-lock/redis-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ICallback } from '../common/index.js';
|
|
2
|
+
import { ILogger } from '../logger/index.js';
|
|
2
3
|
import { EWorkerType, IWorkerCallable } from './types/index.js';
|
|
3
4
|
import { Worker } from './worker.js';
|
|
4
5
|
export declare class WorkerCallable<Payload, Reply> extends Worker<Payload, Reply> implements IWorkerCallable<Payload, Reply> {
|
|
5
6
|
protected readonly type: EWorkerType;
|
|
6
|
-
constructor(workerFilename: string);
|
|
7
|
+
constructor(workerFilename: string, logger?: ILogger);
|
|
7
8
|
call(payload: Payload, cb: ICallback<Reply>): void;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=worker-callable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-callable.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-callable.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-callable.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-callable.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAEL,WAAW,EACX,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,qBAAa,cAAc,CAAC,OAAO,EAAE,KAAK,CACxC,SAAQ,MAAM,CAAC,OAAO,EAAE,KAAK,CAC7B,YAAW,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAwB;gBAEhD,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAWpD,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC;CAgC5C"}
|
|
@@ -5,17 +5,45 @@ const index_js_1 = require("./errors/index.js");
|
|
|
5
5
|
const index_js_2 = require("./types/index.js");
|
|
6
6
|
const worker_js_1 = require("./worker.js");
|
|
7
7
|
class WorkerCallable extends worker_js_1.Worker {
|
|
8
|
-
constructor(workerFilename) {
|
|
8
|
+
constructor(workerFilename, logger) {
|
|
9
9
|
super(workerFilename);
|
|
10
10
|
this.type = index_js_2.EWorkerType.CALLABLE;
|
|
11
|
+
this.logger = logger !== null && logger !== void 0 ? logger : this.logger;
|
|
12
|
+
this.logger.info(`WorkerCallable instance created for ${workerFilename}`);
|
|
13
|
+
this.logger.debug('WorkerCallable initialization details', {
|
|
14
|
+
id: this.id,
|
|
15
|
+
type: index_js_2.EWorkerType[this.type],
|
|
16
|
+
hasCustomLogger: !!logger,
|
|
17
|
+
});
|
|
11
18
|
}
|
|
12
19
|
call(payload, cb) {
|
|
20
|
+
this.logger.info(`Calling worker ${this.id}`);
|
|
21
|
+
this.logger.debug('Call details', {
|
|
22
|
+
hasPayload: payload !== null && payload !== undefined,
|
|
23
|
+
payloadType: payload !== null && payload !== undefined
|
|
24
|
+
? typeof payload
|
|
25
|
+
: 'null/undefined',
|
|
26
|
+
});
|
|
13
27
|
if (payload === null || payload === undefined) {
|
|
28
|
+
this.logger.error('Worker call failed: payload is required');
|
|
14
29
|
cb(new index_js_1.WorkerPayloadRequiredError());
|
|
15
30
|
}
|
|
16
31
|
else {
|
|
17
|
-
|
|
18
|
-
|
|
32
|
+
try {
|
|
33
|
+
this.logger.debug('Registering worker thread event handlers');
|
|
34
|
+
this.registerEvents(cb);
|
|
35
|
+
this.logger.debug('Posting CALL message to worker thread');
|
|
36
|
+
this.postMessage({ type: index_js_2.EWorkerThreadParentMessage.CALL, payload });
|
|
37
|
+
this.logger.debug('Worker call initiated successfully');
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
const error = err instanceof Error ? err : new Error('Unknown error');
|
|
41
|
+
this.logger.error(`Worker call failed: ${error.message}`, {
|
|
42
|
+
error: error.message,
|
|
43
|
+
stack: error.stack,
|
|
44
|
+
});
|
|
45
|
+
cb(error);
|
|
46
|
+
}
|
|
19
47
|
}
|
|
20
48
|
}
|
|
21
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-callable.js","sourceRoot":"","sources":["../../../../src/worker/worker-callable.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"worker-callable.js","sourceRoot":"","sources":["../../../../src/worker/worker-callable.ts"],"names":[],"mappings":";;;AAWA,gDAA+D;AAC/D,+CAI0B;AAC1B,2CAAqC;AAErC,MAAa,cACX,SAAQ,kBAAsB;IAK9B,YAAY,cAAsB,EAAE,MAAgB;QAClD,KAAK,CAAC,cAAc,CAAC,CAAC;QAHL,SAAI,GAAgB,sBAAW,CAAC,QAAQ,CAAC;QAI1D,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,cAAc,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;YACzD,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,sBAAW,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5B,eAAe,EAAE,CAAC,CAAC,MAAM;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAgB,EAAE,EAAoB;QACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE;YAChC,UAAU,EAAE,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS;YACrD,WAAW,EACT,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS;gBACvC,CAAC,CAAC,OAAO,OAAO;gBAChB,CAAC,CAAC,gBAAgB;SACvB,CAAC,CAAC;QAEH,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,EAAE,CAAC,IAAI,qCAA0B,EAAE,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC9D,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;gBAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;gBAC3D,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,qCAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAErE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAC1D,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACtB,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;gBACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,OAAO,EAAE,EAAE;oBACxD,KAAK,EAAE,KAAK,CAAC,OAAO;oBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB,CAAC,CAAC;gBACH,EAAE,CAAC,KAAK,CAAC,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAjDD,wCAiDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-resource-group.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-resource-group.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,yBAAyB,GAAG;IACtC,2BAA2B,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;CACnD,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,QAAQ,CAAC,yBAAyB,CAAC;IAC1E,SAAS,CAAC,QAAQ,CAAC,YAAY,cAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,YAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,WAAW,eAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,MAAM,UAAC;IAC1B,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,CAAM;IAClD,SAAS,CAAC,gBAAgB,UAAS;gBAGjC,WAAW,EAAE,YAAY,EACzB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"worker-resource-group.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-resource-group.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,yBAAyB,GAAG;IACtC,2BAA2B,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;CACnD,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,QAAQ,CAAC,yBAAyB,CAAC;IAC1E,SAAS,CAAC,QAAQ,CAAC,YAAY,cAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,YAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,WAAW,eAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,MAAM,UAAC;IAC1B,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,CAAM;IAClD,SAAS,CAAC,gBAAgB,UAAS;gBAGjC,WAAW,EAAE,YAAY,EACzB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM;IAuCzB,SAAS,CAAC,IAAI,OAAQ,SAAS,CAAC,IAAI,CAAC,UAgBnC;IAEF,SAAS,CAAC,UAAU,OAAQ,SAAS,CAAC,IAAI,CAAC,UAwCzC;IAEF,SAAS,CAAC,eAAe,OAAQ,SAAS,CAAC,IAAI,CAAC,KAAG,IAAI,CAoCrD;IAEF,SAAS,CAAC,WAAW,OAAQ,SAAS,CAAC,IAAI,CAAC,UAU1C;cAEiB,SAAS,IAAI,OAAO;cAIpB,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAK5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAK9C,WAAW,CAAC,GAAG,EAAE,KAAK;IAQzC,SAAS,aAAc,MAAM,WAAW,OAAO,KAAG,IAAI,CAWpD;IAEF,WAAW,eACG,MAAM,WACT,OAAO,MACZ,SAAS,CAAC,IAAI,CAAC,KAClB,IAAI,CAqDL;CACH"}
|
|
@@ -18,89 +18,172 @@ class WorkerResourceGroup extends index_js_5.Runnable {
|
|
|
18
18
|
this.workers = [];
|
|
19
19
|
this.runWorkersLocked = false;
|
|
20
20
|
this.lock = (cb) => {
|
|
21
|
-
this.
|
|
22
|
-
|
|
21
|
+
this.logger.debug('Attempting to acquire lock...');
|
|
22
|
+
this.locker.acquireLock((err, acquired) => {
|
|
23
|
+
if (err) {
|
|
24
|
+
this.logger.error(`Failed to acquire lock: ${err.message}`, err);
|
|
23
25
|
cb(err);
|
|
24
|
-
|
|
26
|
+
}
|
|
27
|
+
else if (acquired) {
|
|
25
28
|
this.logger.info(`Workers are exclusively running from this instance (Lock ID ${this.locker.getId()}).`);
|
|
26
29
|
cb();
|
|
27
30
|
}
|
|
31
|
+
else {
|
|
32
|
+
this.logger.warn('Lock was not acquired, but no error was returned');
|
|
33
|
+
cb();
|
|
34
|
+
}
|
|
28
35
|
});
|
|
29
36
|
};
|
|
30
37
|
this.runWorkers = (cb) => {
|
|
31
38
|
if (!this.runWorkersLocked) {
|
|
39
|
+
this.logger.info(`Starting ${this.workers.length} workers...`);
|
|
32
40
|
this.runWorkersLocked = true;
|
|
33
|
-
index_js_1.async.
|
|
34
|
-
worker.
|
|
41
|
+
index_js_1.async.eachOf(this.workers, (worker, index, done) => {
|
|
42
|
+
this.logger.debug(`Starting worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()})`);
|
|
43
|
+
worker.run((err) => {
|
|
44
|
+
if (err) {
|
|
45
|
+
this.logger.error(`Failed to start worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()}): ${err.message}`, err);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
this.logger.debug(`Worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()}) started successfully`);
|
|
49
|
+
}
|
|
50
|
+
done(err);
|
|
51
|
+
});
|
|
35
52
|
}, (err) => {
|
|
36
53
|
this.runWorkersLocked = false;
|
|
54
|
+
if (err) {
|
|
55
|
+
this.logger.error(`Error starting workers: ${err.message}`, err);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
this.logger.info(`All ${this.workers.length} workers started successfully`);
|
|
59
|
+
}
|
|
37
60
|
cb(err);
|
|
38
61
|
});
|
|
39
62
|
}
|
|
40
|
-
else
|
|
63
|
+
else {
|
|
64
|
+
this.logger.warn('Attempted to run workers while already locked');
|
|
41
65
|
cb(new index_js_2.AbortError());
|
|
66
|
+
}
|
|
42
67
|
};
|
|
43
68
|
this.shutDownWorkers = (cb) => {
|
|
44
69
|
if (!this.runWorkersLocked) {
|
|
70
|
+
this.logger.info(`Shutting down ${this.workers.length} workers...`);
|
|
45
71
|
this.runWorkersLocked = true;
|
|
46
|
-
index_js_1.async.
|
|
47
|
-
|
|
72
|
+
index_js_1.async.eachOf(this.workers, (worker, index, done) => {
|
|
73
|
+
this.logger.debug(`Shutting down worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()})`);
|
|
74
|
+
worker.shutdown((err) => {
|
|
75
|
+
if (err) {
|
|
76
|
+
this.logger.warn(`Error shutting down worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()}): ${err.message}`);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
this.logger.debug(`Worker ${index + 1}/${this.workers.length} (ID: ${worker.getId()}) shut down successfully`);
|
|
80
|
+
}
|
|
81
|
+
done();
|
|
82
|
+
});
|
|
48
83
|
}, () => {
|
|
49
84
|
this.workers = [];
|
|
50
85
|
this.runWorkersLocked = false;
|
|
86
|
+
this.logger.info('All workers have been shut down');
|
|
51
87
|
cb();
|
|
52
88
|
});
|
|
53
89
|
}
|
|
54
|
-
else
|
|
90
|
+
else {
|
|
91
|
+
this.logger.debug('Workers shutdown requested but workers are locked, retrying in 1 second...');
|
|
55
92
|
setTimeout(() => this.shutDownWorkers(cb), 1000);
|
|
93
|
+
}
|
|
56
94
|
};
|
|
57
95
|
this.releaseLock = (cb) => {
|
|
58
|
-
this.
|
|
96
|
+
this.logger.debug('Releasing lock...');
|
|
97
|
+
this.locker.releaseLock((err) => {
|
|
98
|
+
if (err) {
|
|
99
|
+
this.logger.error(`Failed to release lock: ${err.message}`, err);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.logger.info('Lock released successfully');
|
|
103
|
+
}
|
|
104
|
+
cb(err);
|
|
105
|
+
});
|
|
59
106
|
};
|
|
60
107
|
this.addWorker = (filename, payload) => {
|
|
61
|
-
|
|
62
|
-
worker.
|
|
108
|
+
this.logger.debug(`Adding worker from file: ${filename}`);
|
|
109
|
+
const worker = new worker_runnable_js_1.WorkerRunnable(filename, payload, this.logger);
|
|
110
|
+
worker.on('worker.error', (err) => {
|
|
111
|
+
this.logger.error(`Worker error from ${filename}: ${err.message}`, err);
|
|
112
|
+
this.handleError(err);
|
|
113
|
+
});
|
|
63
114
|
this.workers.push(worker);
|
|
115
|
+
this.logger.info(`Worker added from file: ${filename}, total workers: ${this.workers.length}`);
|
|
64
116
|
};
|
|
65
117
|
this.loadFromDir = (workersDir, payload, cb) => {
|
|
66
118
|
if (this.isDown() && !this.isGoingUp()) {
|
|
119
|
+
this.logger.info(`Loading workers from directory: ${workersDir}`);
|
|
67
120
|
(0, fs_1.readdir)(workersDir, (err, files) => {
|
|
68
|
-
if (err)
|
|
121
|
+
if (err) {
|
|
122
|
+
this.logger.error(`Failed to read workers directory ${workersDir}: ${err.message}`, err);
|
|
69
123
|
cb(err);
|
|
124
|
+
}
|
|
70
125
|
else {
|
|
71
|
-
|
|
126
|
+
this.logger.debug(`Found ${files.length} files in workers directory`);
|
|
127
|
+
let workerCount = 0;
|
|
128
|
+
index_js_1.async.eachOf(files !== null && files !== void 0 ? files : [], (file, index, done) => {
|
|
72
129
|
if (file.endsWith('.worker.js')) {
|
|
73
130
|
const filepath = path_1.default.resolve(workersDir, file);
|
|
131
|
+
this.logger.debug(`Loading worker file ${index + 1}/${files.length}: ${file}`);
|
|
74
132
|
this.addWorker(filepath, payload);
|
|
133
|
+
workerCount++;
|
|
75
134
|
done();
|
|
76
135
|
}
|
|
77
|
-
else
|
|
136
|
+
else {
|
|
137
|
+
this.logger.debug(`Skipping non-worker file: ${file}`);
|
|
78
138
|
done();
|
|
79
|
-
|
|
139
|
+
}
|
|
140
|
+
}, (err) => {
|
|
141
|
+
if (err) {
|
|
142
|
+
this.logger.error(`Error loading workers: ${err.message}`, err);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
this.logger.info(`Successfully loaded ${workerCount} workers from ${files.length} files`);
|
|
146
|
+
}
|
|
147
|
+
cb(err);
|
|
148
|
+
});
|
|
80
149
|
}
|
|
81
150
|
});
|
|
82
151
|
}
|
|
152
|
+
else {
|
|
153
|
+
this.logger.warn('Cannot load workers: WorkerResourceGroup is not in DOWN state');
|
|
154
|
+
cb(new Error('Cannot load workers: WorkerResourceGroup is not in DOWN state'));
|
|
155
|
+
}
|
|
83
156
|
};
|
|
84
157
|
this.powerManager = new index_js_4.PowerSwitch();
|
|
85
158
|
this.logger = logger;
|
|
159
|
+
this.logger.info(`Initializing WorkerResourceGroup with ID: ${resourceGroupId}`);
|
|
86
160
|
this.redisClient = redisClient;
|
|
87
|
-
this.redisClient.once('error', (err) =>
|
|
161
|
+
this.redisClient.once('error', (err) => {
|
|
162
|
+
this.logger.error(`Redis client error: ${err.message}`, err);
|
|
163
|
+
this.handleError(err);
|
|
164
|
+
});
|
|
165
|
+
this.logger.debug(`Creating RedisLock for resource group: ${resourceGroupId}`);
|
|
88
166
|
this.locker = new index_js_3.RedisLock(redisClient, logger, resourceGroupId, 60000, true, 15000);
|
|
89
167
|
this.locker.on('locker.error', (err) => {
|
|
168
|
+
this.logger.error(`Locker error: ${err.message}`, err);
|
|
90
169
|
this.handleError(err);
|
|
91
170
|
});
|
|
171
|
+
this.logger.info(`WorkerResourceGroup initialized with ID: ${resourceGroupId}`);
|
|
92
172
|
}
|
|
93
173
|
getLogger() {
|
|
94
174
|
return this.logger;
|
|
95
175
|
}
|
|
96
176
|
goingUp() {
|
|
177
|
+
this.logger.debug('WorkerResourceGroup going up...');
|
|
97
178
|
return super.goingUp().concat([this.lock, this.runWorkers]);
|
|
98
179
|
}
|
|
99
180
|
goingDown() {
|
|
181
|
+
this.logger.debug('WorkerResourceGroup going down...');
|
|
100
182
|
return [this.shutDownWorkers, this.releaseLock].concat(super.goingDown());
|
|
101
183
|
}
|
|
102
184
|
handleError(err) {
|
|
103
185
|
if (this.isRunning()) {
|
|
186
|
+
this.logger.error(`WorkerResourceGroup error: ${err.message}`, err);
|
|
104
187
|
this.emit('workerResourceGroup.error', err);
|
|
105
188
|
super.handleError(err);
|
|
106
189
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-resource-group.js","sourceRoot":"","sources":["../../../../src/worker/worker-resource-group.ts"],"names":[],"mappings":";;;;;;AASA,2BAA6B;AAC7B,gDAAwB;AACxB,gDAA0C;AAE1C,iDAAgD;AAChD,qDAAmD;AAEnD,uDAAuD;AAEvD,mDAAgD;AAChD,6DAAsD;AAMtD,MAAa,mBAAoB,SAAQ,mBAAmC;IAQ1E,YACE,WAAyB,EACzB,MAAe,EACf,eAAuB;QAEvB,KAAK,EAAE,CAAC;QARA,YAAO,GAA8B,EAAE,CAAC;QACxC,qBAAgB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-resource-group.js","sourceRoot":"","sources":["../../../../src/worker/worker-resource-group.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { ICallback } from '../common/index.js';
|
|
2
|
+
import { ILogger } from '../logger/index.js';
|
|
2
3
|
import { PowerSwitch } from '../power-switch/index.js';
|
|
3
4
|
import { EWorkerType, IWorkerRunnable } from './types/index.js';
|
|
4
5
|
import { Worker } from './worker.js';
|
|
5
6
|
export declare class WorkerRunnable<InitialPayload> extends Worker<void, void> implements IWorkerRunnable {
|
|
6
7
|
protected readonly type: EWorkerType;
|
|
7
8
|
protected readonly powerSwitch: PowerSwitch;
|
|
8
|
-
constructor(workerFilename: string, initialPayload?: InitialPayload);
|
|
9
|
+
constructor(workerFilename: string, initialPayload?: InitialPayload, logger?: ILogger);
|
|
9
10
|
run(cb: ICallback<void>): void;
|
|
10
11
|
shutdown(cb: ICallback<void>): void;
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-runnable.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-runnable.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,OAAO,EAEL,WAAW,EACX,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,qBAAa,cAAc,CAAC,cAAc,CACxC,SAAQ,MAAM,CAAC,IAAI,EAAE,IAAI,CACzB,YAAW,eAAe;IAE1B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAwB;IAC5D,SAAS,CAAC,QAAQ,CAAC,WAAW,cAAC;
|
|
1
|
+
{"version":3,"file":"worker-runnable.d.ts","sourceRoot":"","sources":["../../../../src/worker/worker-runnable.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,OAAO,EAEL,WAAW,EACX,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,qBAAa,cAAc,CAAC,cAAc,CACxC,SAAQ,MAAM,CAAC,IAAI,EAAE,IAAI,CACzB,YAAW,eAAe;IAE1B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAwB;IAC5D,SAAS,CAAC,QAAQ,CAAC,WAAW,cAAC;gBAG7B,cAAc,EAAE,MAAM,EACtB,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,CAAC,EAAE,OAAO;IAclB,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC;IAwBd,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC;CA4BtC"}
|