@memberjunction/queue 2.112.0 → 2.113.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/README.md +3 -3
- package/dist/generic/QueueBase.d.ts +2 -2
- package/dist/generic/QueueBase.d.ts.map +1 -1
- package/dist/generic/QueueBase.js +5 -5
- package/dist/generic/QueueBase.js.map +1 -1
- package/dist/generic/QueueManager.d.ts +3 -3
- package/dist/generic/QueueManager.d.ts.map +1 -1
- package/dist/generic/QueueManager.js +11 -11
- package/dist/generic/QueueManager.js.map +1 -1
- package/package.json +7 -6
package/README.md
CHANGED
|
@@ -143,7 +143,7 @@ Create a custom queue by extending `QueueBase`:
|
|
|
143
143
|
```typescript
|
|
144
144
|
import { QueueBase, TaskBase, TaskResult } from '@memberjunction/queue';
|
|
145
145
|
import { RegisterClass } from '@memberjunction/global';
|
|
146
|
-
import { UserInfo } from '@memberjunction/
|
|
146
|
+
import { UserInfo } from '@memberjunction/core';
|
|
147
147
|
|
|
148
148
|
// Register your queue with a specific queue type name
|
|
149
149
|
@RegisterClass(QueueBase, 'Email Notification')
|
|
@@ -191,7 +191,7 @@ export class EmailNotificationQueue extends QueueBase {
|
|
|
191
191
|
|
|
192
192
|
```typescript
|
|
193
193
|
import { QueueManager } from '@memberjunction/queue';
|
|
194
|
-
import { UserInfo } from '@memberjunction/
|
|
194
|
+
import { UserInfo } from '@memberjunction/core';
|
|
195
195
|
|
|
196
196
|
// Initialize queue manager (typically done once at app startup)
|
|
197
197
|
await QueueManager.Config(contextUser);
|
|
@@ -334,4 +334,4 @@ npm run build
|
|
|
334
334
|
|
|
335
335
|
## License
|
|
336
336
|
|
|
337
|
-
ISC
|
|
337
|
+
ISC
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UserInfo } from '@memberjunction/
|
|
1
|
+
import { UserInfo } from '@memberjunction/core';
|
|
2
2
|
import { QueueEntity, QueueTaskEntity } from '@memberjunction/core-entities';
|
|
3
3
|
export declare class TaskResult {
|
|
4
4
|
success: boolean;
|
|
@@ -16,7 +16,7 @@ export declare const TaskStatus: {
|
|
|
16
16
|
readonly Failed: "Failed";
|
|
17
17
|
readonly Cancelled: "Cancelled";
|
|
18
18
|
};
|
|
19
|
-
export type TaskStatus =
|
|
19
|
+
export type TaskStatus = typeof TaskStatus[keyof typeof TaskStatus];
|
|
20
20
|
export declare class TaskBase {
|
|
21
21
|
private _options;
|
|
22
22
|
private _data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueBase.d.ts","sourceRoot":"","sources":["../../src/generic/QueueBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"QueueBase.d.ts","sourceRoot":"","sources":["../../src/generic/QueueBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAG7E,qBAAa,UAAU;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,GAAG,CAAA;IACX,SAAS,EAAE,GAAG,CAAA;CACf;AAGD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,UAAU;;;;;;CAMb,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAGpE,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,OAAO,CAAkC;IAEjD,IAAW,OAAO,IAAI,WAAW,CAGhC;IACD,IAAW,IAAI,IAAI,GAAG,CAGrB;IACD,IAAW,EAAE,IAAI,MAAM,CAEtB;gBACY,UAAU,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW;IAMzE,IAAW,UAAU,IAAI,eAAe,CAEvC;IAED,IAAW,MAAM,IAAI,UAAU,CAE9B;IACD,IAAW,MAAM,CAAC,KAAK,EAAE,UAAU,EAElC;CAEF;AAGD,8BAAsB,SAAS;IAC7B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAA;IAChC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,cAAc,CAAe;IACrC,OAAO,CAAC,YAAY,CAAa;gBAErB,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ;IAMhF,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,OAAO,CAAC,WAAW,CAAkB;IACrC,SAAS,CAAC,YAAY;IA8BtB,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAehC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;cAE1E,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IA8B9E,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ;CAGtC"}
|
|
@@ -63,8 +63,8 @@ class QueueBase {
|
|
|
63
63
|
// it will re-run itself with a timer to check for new tasks
|
|
64
64
|
// this will be the main loop for the queue
|
|
65
65
|
if (this._queue.length > 0) {
|
|
66
|
-
let processing = this._queue.filter(
|
|
67
|
-
let pending = this._queue.filter(
|
|
66
|
+
let processing = this._queue.filter(t => t.Status === exports.TaskStatus.InProgress);
|
|
67
|
+
let pending = this._queue.filter(t => t.Status === exports.TaskStatus.Pending);
|
|
68
68
|
// we have room to process one or more additional tasks now
|
|
69
69
|
while (processing.length < this._maxTasks && pending.length > 0) {
|
|
70
70
|
let task = pending.shift();
|
|
@@ -102,7 +102,7 @@ class QueueBase {
|
|
|
102
102
|
// run the task
|
|
103
103
|
let result = await this.ProcessTask(task, contextUser);
|
|
104
104
|
// now set the record data for the DB
|
|
105
|
-
task.TaskRecord.Status = result.success ?
|
|
105
|
+
task.TaskRecord.Status = result.success ? "Completed" : "Failed";
|
|
106
106
|
task.TaskRecord.Output = result.output;
|
|
107
107
|
task.TaskRecord.ErrorMessage = result.exception ? JSON.stringify(result.exception) : null;
|
|
108
108
|
await task.TaskRecord.Save();
|
|
@@ -116,12 +116,12 @@ class QueueBase {
|
|
|
116
116
|
success: false,
|
|
117
117
|
output: null,
|
|
118
118
|
userMessage: 'Execution Error: ' + e.message,
|
|
119
|
-
exception: e
|
|
119
|
+
exception: e
|
|
120
120
|
};
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
FindTask(ID) {
|
|
124
|
-
return this._queue.find(
|
|
124
|
+
return this._queue.find(t => t.ID === ID);
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
exports.QueueBase = QueueBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueBase.js","sourceRoot":"","sources":["../../src/generic/QueueBase.ts"],"names":[],"mappings":";;;AAEA,sEAAsE;AAEtE,MAAa,UAAU;CAKtB;AALD,gCAKC;
|
|
1
|
+
{"version":3,"file":"QueueBase.js","sourceRoot":"","sources":["../../src/generic/QueueBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { TaskBase, QueueBase } from
|
|
2
|
-
import { UserInfo } from
|
|
3
|
-
import { QueueTypeEntity } from
|
|
1
|
+
import { TaskBase, QueueBase } from "./QueueBase";
|
|
2
|
+
import { UserInfo } from "@memberjunction/core";
|
|
3
|
+
import { QueueTypeEntity } from "@memberjunction/core-entities";
|
|
4
4
|
/**
|
|
5
5
|
*QueueManager class is a generic manager of all active queues for the process.
|
|
6
6
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../../src/generic/QueueManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAA+B,QAAQ,EAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../../src/generic/QueueManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAA+B,QAAQ,EAAc,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAgC,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAI9F;;;;;;;;;;;;GAYG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,MAAM,CAAC,SAAS,CAA6B;IACrD,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAmC;IAEpE,WAAkB,UAAU,IAAI,eAAe,EAAE,CAEhD;IAED,WAAkB,QAAQ,IAAI,YAAY,CAKzC;IAED,OAAO,CAAC,aAAa,CAA8B;IACtC,MAAM,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;WAcrC,MAAM,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAIhD,cAAc,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;;WA4BhD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAShH,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAqCxH,OAAO,CAAC,qBAAqB,CAAyC;cAEtD,gBAAgB,CAAC,SAAS,EAAE,eAAe,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;cA0BnG,WAAW,CAAC,SAAS,EAAE,eAAe,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IAiDrH,SAAS,KAAK,MAAM,IAAI,SAAS,EAAE,CAElC;CACF"}
|
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.QueueManager = void 0;
|
|
7
7
|
//import { QueueEntity, QueueTaskEntity, QueueTypeEntity } from "mj_generatedentities";
|
|
8
8
|
const QueueBase_1 = require("./QueueBase");
|
|
9
|
+
const core_1 = require("@memberjunction/core");
|
|
9
10
|
const global_1 = require("@memberjunction/global");
|
|
10
|
-
const global_2 = require("@memberjunction/global");
|
|
11
11
|
const os_1 = __importDefault(require("os"));
|
|
12
12
|
/**
|
|
13
13
|
*QueueManager class is a generic manager of all active queues for the process.
|
|
@@ -49,7 +49,7 @@ class QueueManager {
|
|
|
49
49
|
}
|
|
50
50
|
async loadQueueTypes(contextUser) {
|
|
51
51
|
// load all of the queue types from the database
|
|
52
|
-
const rv = new
|
|
52
|
+
const rv = new core_1.RunView();
|
|
53
53
|
const queueTypes = await rv.RunView({
|
|
54
54
|
EntityName: 'Queue Types',
|
|
55
55
|
}, contextUser);
|
|
@@ -64,7 +64,7 @@ class QueueManager {
|
|
|
64
64
|
if (QueueManager._instance === null) {
|
|
65
65
|
// check the global object first to see if we have an instance there since multiple modules might load this code
|
|
66
66
|
// and the static instance colud be different for each module based on JS import paths
|
|
67
|
-
const g =
|
|
67
|
+
const g = global_1.MJGlobal.Instance.GetGlobalObjectStore();
|
|
68
68
|
if (g && g[QueueManager._globalInstanceKey]) {
|
|
69
69
|
QueueManager._instance = g[QueueManager._globalInstanceKey];
|
|
70
70
|
}
|
|
@@ -78,7 +78,7 @@ class QueueManager {
|
|
|
78
78
|
}
|
|
79
79
|
static async AddTask(QueueType, data, options, contextUser) {
|
|
80
80
|
await QueueManager.Config(contextUser);
|
|
81
|
-
const queueType = QueueManager.QueueTypes.find(
|
|
81
|
+
const queueType = QueueManager.QueueTypes.find(qt => qt.Name == QueueType);
|
|
82
82
|
if (queueType == null)
|
|
83
83
|
throw new Error(`Queue Type ${QueueType} not found.`);
|
|
84
84
|
return QueueManager.Instance.AddTask(queueType.ID, data, options, contextUser);
|
|
@@ -86,7 +86,7 @@ class QueueManager {
|
|
|
86
86
|
async AddTask(QueueTypeID, data, options, contextUser) {
|
|
87
87
|
try {
|
|
88
88
|
// STEP 1: Find the queue type
|
|
89
|
-
const queueType = QueueManager.QueueTypes.find(
|
|
89
|
+
const queueType = QueueManager.QueueTypes.find(qt => qt.ID == QueueTypeID);
|
|
90
90
|
if (queueType == null)
|
|
91
91
|
throw new Error(`Queue Type ID ${QueueTypeID} not found.`);
|
|
92
92
|
if (queueType.IsActive === false)
|
|
@@ -95,7 +95,7 @@ class QueueManager {
|
|
|
95
95
|
const queue = await this.CheckCreateQueue(queueType, contextUser);
|
|
96
96
|
if (queue) {
|
|
97
97
|
// STEP 3: Create a task in the database for this new task
|
|
98
|
-
const md = new
|
|
98
|
+
const md = new core_1.Metadata();
|
|
99
99
|
const taskRecord = await md.GetEntityObject('Queue Tasks', contextUser);
|
|
100
100
|
taskRecord.Set('QueueID', queue.QueueID);
|
|
101
101
|
taskRecord.Set('Status', 'Pending');
|
|
@@ -112,11 +112,11 @@ class QueueManager {
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
catch (e) {
|
|
115
|
-
(0,
|
|
115
|
+
(0, core_1.LogError)(e.message);
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
async CheckCreateQueue(queueType, contextUser) {
|
|
119
|
-
let queue = this._queues.find(
|
|
119
|
+
let queue = this._queues.find(q => q.QueueTypeID == queueType.ID);
|
|
120
120
|
if (queue === null || queue === undefined) {
|
|
121
121
|
// If a queue creation for this type is not already in progress, start one
|
|
122
122
|
if (!this.ongoingQueueCreations.has(queueType.ID)) {
|
|
@@ -139,7 +139,7 @@ class QueueManager {
|
|
|
139
139
|
async CreateQueue(queueType, contextUser) {
|
|
140
140
|
try {
|
|
141
141
|
// create a new queue, based on the Queue Type metadata and process info
|
|
142
|
-
const md = new
|
|
142
|
+
const md = new core_1.Metadata();
|
|
143
143
|
const newQueueRecord = await md.GetEntityObject('Queues', contextUser);
|
|
144
144
|
newQueueRecord.NewRecord();
|
|
145
145
|
newQueueRecord.Set('QueueTypeID', queueType.ID);
|
|
@@ -166,7 +166,7 @@ class QueueManager {
|
|
|
166
166
|
newQueueRecord.Set('ProcessUserName', os_1.default.userInfo().username);
|
|
167
167
|
newQueueRecord.Set('LastHeartbeat', new Date());
|
|
168
168
|
if (await newQueueRecord.Save()) {
|
|
169
|
-
const newQueue =
|
|
169
|
+
const newQueue = global_1.MJGlobal.Instance.ClassFactory.CreateInstance(QueueBase_1.QueueBase, queueType.Name, newQueueRecord, queueType.ID, contextUser);
|
|
170
170
|
if (newQueue)
|
|
171
171
|
this._queues.push(newQueue);
|
|
172
172
|
return newQueue;
|
|
@@ -175,7 +175,7 @@ class QueueManager {
|
|
|
175
175
|
throw new Error(`Unable to create new queue for Queue Type ID ${queueType.ID}.`);
|
|
176
176
|
}
|
|
177
177
|
catch (e) {
|
|
178
|
-
(0,
|
|
178
|
+
(0, core_1.LogError)(e.message);
|
|
179
179
|
return null;
|
|
180
180
|
}
|
|
181
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../src/generic/QueueManager.ts"],"names":[],"mappings":";;;;;;AAAA,uFAAuF;AACvF,2CAAkD;AAClD
|
|
1
|
+
{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../src/generic/QueueManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/queue",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.113.1",
|
|
4
4
|
"description": "MemberJunction: Queue Library for managing server side queues",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,11 +19,12 @@
|
|
|
19
19
|
"typescript": "^5.4.5"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@memberjunction/ai": "2.
|
|
23
|
-
"@memberjunction/ai-provider-bundle": "2.
|
|
24
|
-
"@memberjunction/aiengine": "2.
|
|
25
|
-
"@memberjunction/
|
|
26
|
-
"@memberjunction/
|
|
22
|
+
"@memberjunction/ai": "2.113.1",
|
|
23
|
+
"@memberjunction/ai-provider-bundle": "2.113.1",
|
|
24
|
+
"@memberjunction/aiengine": "2.113.1",
|
|
25
|
+
"@memberjunction/core": "2.113.1",
|
|
26
|
+
"@memberjunction/global": "2.113.1",
|
|
27
|
+
"@memberjunction/core-entities": "2.113.1",
|
|
27
28
|
"@types/uuid": "^9.0.1",
|
|
28
29
|
"uuid": "^9.0.0"
|
|
29
30
|
},
|