@budibase/backend-core 3.7.2 → 3.7.4
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/index.js +10 -10
- package/dist/index.js.map +3 -3
- package/dist/package.json +3 -2
- package/dist/src/cache/docWritethrough.d.ts +8 -2
- package/dist/src/cache/docWritethrough.js +1 -1
- package/dist/src/cache/docWritethrough.js.map +1 -1
- package/dist/src/events/asyncEvents/queue.d.ts +2 -2
- package/dist/src/events/asyncEvents/queue.js +7 -1
- package/dist/src/events/asyncEvents/queue.js.map +1 -1
- package/dist/src/events/processors/AuditLogsProcessor.d.ts +2 -2
- package/dist/src/events/processors/AuditLogsProcessor.js +8 -2
- package/dist/src/events/processors/AuditLogsProcessor.js.map +1 -1
- package/dist/src/queue/inMemoryQueue.js +10 -4
- package/dist/src/queue/inMemoryQueue.js.map +1 -1
- package/dist/src/queue/queue.d.ts +18 -3
- package/dist/src/queue/queue.js +149 -30
- package/dist/src/queue/queue.js.map +1 -1
- package/dist/src/sql/utils.d.ts +1 -1
- package/dist/src/sql/utils.js +7 -7
- package/dist/src/sql/utils.js.map +1 -1
- package/package.json +3 -2
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.4",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"koa-pino-logger": "4.0.0",
|
|
57
57
|
"lodash": "4.17.21",
|
|
58
58
|
"node-fetch": "2.6.7",
|
|
59
|
+
"object-sizeof": "2.6.1",
|
|
59
60
|
"passport-google-oauth": "2.0.0",
|
|
60
61
|
"passport-local": "1.0.0",
|
|
61
62
|
"passport-oauth2-refresh": "^2.1.0",
|
|
@@ -114,5 +115,5 @@
|
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
117
|
},
|
|
117
|
-
"gitHead": "
|
|
118
|
+
"gitHead": "ce3a08a254779376de9dce7a6e121528e324a54e"
|
|
118
119
|
}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { Database, Document } from "@budibase/types";
|
|
2
|
-
import {
|
|
2
|
+
import { BudibaseQueue } from "../queue";
|
|
3
|
+
interface ProcessDocMessage {
|
|
4
|
+
dbName: string;
|
|
5
|
+
docId: string;
|
|
6
|
+
data: Record<string, any>;
|
|
7
|
+
}
|
|
3
8
|
export declare class DocWritethroughProcessor {
|
|
4
9
|
private static _queue;
|
|
5
|
-
static get queue():
|
|
10
|
+
static get queue(): BudibaseQueue<ProcessDocMessage>;
|
|
6
11
|
init(): this;
|
|
7
12
|
private persistToDb;
|
|
8
13
|
}
|
|
@@ -15,3 +20,4 @@ export declare class DocWritethrough<T extends Document = Document> {
|
|
|
15
20
|
}
|
|
16
21
|
export declare function init(): DocWritethroughProcessor;
|
|
17
22
|
export declare function getProcessor(): DocWritethroughProcessor;
|
|
23
|
+
export {};
|
|
@@ -53,7 +53,7 @@ let processor;
|
|
|
53
53
|
class DocWritethroughProcessor {
|
|
54
54
|
static get queue() {
|
|
55
55
|
if (!DocWritethroughProcessor._queue) {
|
|
56
|
-
DocWritethroughProcessor._queue =
|
|
56
|
+
DocWritethroughProcessor._queue = new queue_1.BudibaseQueue(queue_1.JobQueue.DOC_WRITETHROUGH_QUEUE, {
|
|
57
57
|
jobOptions: {
|
|
58
58
|
attempts: PERSIST_MAX_ATTEMPTS,
|
|
59
59
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docWritethrough.js","sourceRoot":"","sources":["../../../src/cache/docWritethrough.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkGA,oBAGC;AAED,oCAKC;AA5GD,2CAA+E;AAE/E,
|
|
1
|
+
{"version":3,"file":"docWritethrough.js","sourceRoot":"","sources":["../../../src/cache/docWritethrough.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkGA,oBAGC;AAED,oCAKC;AA5GD,2CAA+E;AAE/E,oCAAkD;AAClD,+CAAgC;AAQhC,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,IAAI,SAA+C,CAAA;AAEnD,MAAa,wBAAwB;IAG5B,MAAM,KAAK,KAAK;QACrB,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC;YACrC,wBAAwB,CAAC,MAAM,GAAG,IAAI,qBAAa,CACjD,gBAAQ,CAAC,sBAAsB,EAC/B;gBACE,UAAU,EAAE;oBACV,QAAQ,EAAE,oBAAoB;iBAC/B;aACF,CACF,CAAA;QACH,CAAC;QAED,OAAO,wBAAwB,CAAC,MAAM,CAAA;IACxC,CAAC;IAED,IAAI;QACF,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAM,OAAO,EAAC,EAAE;YACrD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBACvB,4GAA4G;oBAC5G,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,CAAC,EAAE,aAAa,OAAO,CAAC,YAAY,EAAE,CAC7E,CAAA;gBACH,CAAC;gBAED,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC,CAAA,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEa,WAAW;6DAAC,EACxB,MAAM,EACN,KAAK,EACL,IAAI,GAKL;YACC,kCAAkC;YAClC,IAAI,KAAK,CAAC,UAAU,CAAC,oBAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5C,OAAM;YACR,CAAC;YACD,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAChC,IAAI,GAA4B,CAAA;YAChC,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAC3B,CAAC;YAAC,WAAM,CAAC;gBACP,GAAG,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;YACtB,CAAC;YAED,GAAG,mCAAQ,GAAG,GAAK,IAAI,CAAE,CAAA;YACzB,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;KAAA;CACF;AA5DD,4DA4DC;AAED,MAAa,eAAe;IAI1B,YAAY,EAAY,EAAE,KAAa;QACrC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAEK,KAAK,CAAC,IAAgB;;YAC1B,MAAM,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC;gBACvC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI;gBACpB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI;aACL,CAAC,CAAA;QACJ,CAAC;KAAA;CACF;AApBD,0CAoBC;AAED,SAAgB,IAAI;IAClB,SAAS,GAAG,IAAI,wBAAwB,EAAE,CAAC,IAAI,EAAE,CAAA;IACjD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAgB,YAAY;IAC1B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,EAAE,CAAA;IACf,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { BudibaseQueue } from "../../queue";
|
|
2
2
|
import { Event, Identity } from "@budibase/types";
|
|
3
3
|
export interface EventPayload {
|
|
4
4
|
event: Event;
|
|
@@ -6,6 +6,6 @@ export interface EventPayload {
|
|
|
6
6
|
properties: any;
|
|
7
7
|
timestamp?: string | number;
|
|
8
8
|
}
|
|
9
|
-
export declare let asyncEventQueue:
|
|
9
|
+
export declare let asyncEventQueue: BudibaseQueue<EventPayload>;
|
|
10
10
|
export declare function init(): void;
|
|
11
11
|
export declare function shutdown(): Promise<void>;
|
|
@@ -14,7 +14,13 @@ exports.init = init;
|
|
|
14
14
|
exports.shutdown = shutdown;
|
|
15
15
|
const queue_1 = require("../../queue");
|
|
16
16
|
function init() {
|
|
17
|
-
exports.asyncEventQueue =
|
|
17
|
+
exports.asyncEventQueue = new queue_1.BudibaseQueue(queue_1.JobQueue.SYSTEM_EVENT_QUEUE, {
|
|
18
|
+
jobTags: (event) => {
|
|
19
|
+
return {
|
|
20
|
+
"event.name": event.event,
|
|
21
|
+
};
|
|
22
|
+
},
|
|
23
|
+
});
|
|
18
24
|
}
|
|
19
25
|
function shutdown() {
|
|
20
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../src/events/asyncEvents/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../src/events/asyncEvents/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;AAYA,oBAWC;AAED,4BAIC;AA7BD,uCAAqD;AAYrD,SAAgB,IAAI;IAClB,uBAAe,GAAG,IAAI,qBAAa,CACjC,gBAAQ,CAAC,kBAAkB,EAC3B;QACE,OAAO,EAAE,CAAC,KAAmB,EAAE,EAAE;YAC/B,OAAO;gBACL,YAAY,EAAE,KAAK,CAAC,KAAK;aAC1B,CAAA;QACH,CAAC;KACF,CACF,CAAA;AACH,CAAC;AAED,SAAsB,QAAQ;;QAC5B,IAAI,uBAAe,EAAE,CAAC;YACpB,MAAM,uBAAe,CAAC,KAAK,EAAE,CAAA;QAC/B,CAAC;IACH,CAAC;CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Event, Identity, AuditLogQueueEvent, AuditLogFn } from "@budibase/types";
|
|
2
2
|
import { EventProcessor } from "./types";
|
|
3
|
-
import
|
|
3
|
+
import { BudibaseQueue } from "../../queue";
|
|
4
4
|
export default class AuditLogsProcessor implements EventProcessor {
|
|
5
5
|
static auditLogsEnabled: boolean;
|
|
6
|
-
static auditLogQueue:
|
|
6
|
+
static auditLogQueue: BudibaseQueue<AuditLogQueueEvent>;
|
|
7
7
|
static init(fn: AuditLogFn): Promise<void>;
|
|
8
8
|
processEvent(event: Event, identity: Identity, properties: any, timestamp?: string): Promise<void>;
|
|
9
9
|
identify(): Promise<void>;
|
|
@@ -22,9 +22,15 @@ class AuditLogsProcessor {
|
|
|
22
22
|
static init(fn) {
|
|
23
23
|
AuditLogsProcessor.auditLogsEnabled = true;
|
|
24
24
|
const writeAuditLogs = fn;
|
|
25
|
-
AuditLogsProcessor.auditLogQueue =
|
|
25
|
+
AuditLogsProcessor.auditLogQueue = new queue_1.BudibaseQueue(queue_1.JobQueue.AUDIT_LOG, {
|
|
26
|
+
jobTags: (event) => {
|
|
27
|
+
return {
|
|
28
|
+
"event.name": event.event,
|
|
29
|
+
};
|
|
30
|
+
},
|
|
31
|
+
});
|
|
26
32
|
return AuditLogsProcessor.auditLogQueue.process((job) => __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
|
|
33
|
+
yield (0, context_1.doInTenant)(job.data.tenantId, () => __awaiter(this, void 0, void 0, function* () {
|
|
28
34
|
let properties = job.data.properties;
|
|
29
35
|
if (properties.audited) {
|
|
30
36
|
properties = Object.assign(Object.assign({}, properties), properties.audited);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuditLogsProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/AuditLogsProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAOwB;AAExB,2CAAiE;
|
|
1
|
+
{"version":3,"file":"AuditLogsProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/AuditLogsProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAOwB;AAExB,2CAAiE;AACjE,uCAAqD;AACrD,uCAAuC;AACvC,oEAAmC;AAEnC,MAAqB,kBAAkB;IAIrC,kDAAkD;IAClD,MAAM,CAAC,IAAI,CAAC,EAAc;QACxB,kBAAkB,CAAC,gBAAgB,GAAG,IAAI,CAAA;QAC1C,MAAM,cAAc,GAAG,EAAE,CAAA;QACzB,kBAAkB,CAAC,aAAa,GAAG,IAAI,qBAAa,CAClD,gBAAQ,CAAC,SAAS,EAClB;YACE,OAAO,EAAE,CAAC,KAAyB,EAAE,EAAE;gBACrC,OAAO;oBACL,YAAY,EAAE,KAAK,CAAC,KAAK;iBAC1B,CAAA;YACH,CAAC;SACF,CACF,CAAA;QACD,OAAO,kBAAkB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAM,GAAG,EAAC,EAAE;YAC1D,MAAM,IAAA,oBAAU,EAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAS,EAAE;gBAC7C,IAAI,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAA;gBACpC,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;oBACvB,UAAU,mCACL,UAAU,GACV,UAAU,CAAC,OAAO,CACtB,CAAA;oBACD,OAAO,UAAU,CAAC,OAAO,CAAA;gBAC3B,CAAC;gBAED,kEAAkE;gBAClE,iEAAiE;gBACjE,2BAA2B;gBAC3B,IAAI,QAAQ,GAAyB,EAAE,CAAA;gBACvC,IAAI,qBAAG,CAAC,wBAAwB,EAAE,CAAC;oBACjC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAA;gBACnC,CAAC;gBAED,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE;oBAC/C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;oBAC5B,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;oBAClC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;oBAC1B,QAAQ;iBACT,CAAC,CAAA;YACJ,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;IAEK,YAAY,CAChB,KAAY,EACZ,QAAkB,EAClB,UAAe,EACf,SAAkB;;YAElB,IAAI,kBAAkB,CAAC,gBAAgB,IAAI,IAAA,iBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,wDAAwD;gBACxD,MAAM,MAAM,GACV,QAAQ,CAAC,IAAI,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;gBAC/D,+DAA+D;gBAC/D,MAAM,kBAAkB,CAAC,aAAa,CAAC,GAAG,CAAC;oBACzC,KAAK;oBACL,UAAU;oBACV,IAAI,EAAE;wBACJ,MAAM;wBACN,SAAS;wBACT,KAAK,EAAE,IAAA,kBAAQ,GAAE;wBACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;qBAC5B;oBACD,QAAQ,EAAE,IAAA,qBAAW,GAAE;iBACxB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;KAAA;IAEK,QAAQ;;YACZ,QAAQ;QACV,CAAC;KAAA;IAEK,aAAa;;YACjB,QAAQ;QACV,CAAC;KAAA;IAED,QAAQ;;QACN,MAAA,kBAAkB,CAAC,aAAa,0CAAE,KAAK,EAAE,CAAA;IAC3C,CAAC;;AAjFM,mCAAgB,GAAG,KAAK,CAAA;kBADZ,kBAAkB"}
|
|
@@ -85,14 +85,20 @@ class InMemoryQueue {
|
|
|
85
85
|
return;
|
|
86
86
|
}
|
|
87
87
|
let resp = func(message);
|
|
88
|
-
function retryFunc(
|
|
89
|
-
return __awaiter(this,
|
|
88
|
+
function retryFunc(fnc_1) {
|
|
89
|
+
return __awaiter(this, arguments, void 0, function* (fnc, attempt = 0) {
|
|
90
90
|
try {
|
|
91
91
|
yield fnc;
|
|
92
92
|
}
|
|
93
93
|
catch (e) {
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
attempt++;
|
|
95
|
+
if (attempt < 3) {
|
|
96
|
+
yield shared_core_1.helpers.wait(100 * attempt);
|
|
97
|
+
yield retryFunc(func(message), attempt);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
throw e;
|
|
101
|
+
}
|
|
96
102
|
}
|
|
97
103
|
});
|
|
98
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,oCAAyC;AAEzC,uDAA+C;AAG/C,SAAS,mBAAmB,CAAC,GAAQ;;IACnC,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,KAAK,GAAG,CAAC,CAAC,CAAA;IACd,IAAI,EAAE,GAAuB,SAAS,CAAA;IACtC,IAAI,OAAO,GAAuB,SAAS,CAAA;IAE3C,MAAM,MAAM,GAAG,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,CAAA;IAC/B,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAC1E,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;QACd,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QACpB,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACtB,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,EAAE;QACR,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE;QACtB,EAAE;QACF,OAAO;QACP,IAAI;QACJ,KAAK;QACL,IAAI,EAAE,CAAC;KACR,CAAA;AACH,CAAC;AAWD;;;;;GAKG;AACH,MAAa,aAAa;IAaxB;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAmB;QAC3C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAM,CAAC,YAAY,EAAE,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAU,CAAA;IACxC,CAAC;IAED;;;;;;;OAOG;IACG,OAAO,CAAC,iBAA+B,EAAE,IAAU;;YACvD,IAAI,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAA;YACvE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAM,OAAO,EAAC,EAAE;;gBAC1C,mEAAmE;gBACnE,6DAA6D;gBAC7D,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,MAAM,KAAI,IAAI,EAAE,CAAC;oBAC3D,OAAM;gBACR,CAAC;gBAED,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;gBAExB,SAAe,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,25 @@
|
|
|
1
1
|
import { JobQueue } from "./constants";
|
|
2
|
-
import BullQueue, { JobOptions } from "bull";
|
|
2
|
+
import BullQueue, { JobOptions, Job } from "bull";
|
|
3
3
|
import { StalledFn } from "./listeners";
|
|
4
4
|
export type { QueueOptions, Queue, JobOptions } from "bull";
|
|
5
|
-
export
|
|
5
|
+
export interface BudibaseQueueOpts<T> {
|
|
6
6
|
removeStalledCb?: StalledFn;
|
|
7
7
|
maxStalledCount?: number;
|
|
8
8
|
jobOptions?: JobOptions;
|
|
9
|
-
|
|
9
|
+
jobTags?: (job: T) => Record<string, any>;
|
|
10
|
+
}
|
|
11
|
+
export declare class BudibaseQueue<T> {
|
|
12
|
+
private queue;
|
|
13
|
+
private opts;
|
|
14
|
+
private jobQueue;
|
|
15
|
+
constructor(jobQueue: JobQueue, opts?: BudibaseQueueOpts<T>);
|
|
16
|
+
private initQueue;
|
|
17
|
+
getBullQueue(): BullQueue.Queue<T>;
|
|
18
|
+
process(concurrency: number, cb: (job: Job<T>) => Promise<void>): Promise<void>;
|
|
19
|
+
process(cb: (job: Job<T>) => Promise<void>): Promise<void>;
|
|
20
|
+
add(data: T, opts?: JobOptions): Promise<Job<T>>;
|
|
21
|
+
private withMetrics;
|
|
22
|
+
private metricTags;
|
|
23
|
+
close(): Promise<void>;
|
|
24
|
+
}
|
|
10
25
|
export declare function shutdown(): Promise<void>;
|
package/dist/src/queue/queue.js
CHANGED
|
@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.
|
|
48
|
+
exports.BudibaseQueue = void 0;
|
|
49
49
|
exports.shutdown = shutdown;
|
|
50
50
|
const environment_1 = __importDefault(require("../environment"));
|
|
51
51
|
const utils_1 = require("../redis/utils");
|
|
@@ -54,6 +54,8 @@ const bull_1 = __importDefault(require("bull"));
|
|
|
54
54
|
const listeners_1 = require("./listeners");
|
|
55
55
|
const utils_2 = require("../utils");
|
|
56
56
|
const timers = __importStar(require("../timers"));
|
|
57
|
+
const dd_trace_1 = __importDefault(require("dd-trace"));
|
|
58
|
+
const object_sizeof_1 = __importDefault(require("object-sizeof"));
|
|
57
59
|
// the queue lock is held for 5 minutes
|
|
58
60
|
const QUEUE_LOCK_MS = utils_2.Duration.fromMinutes(5).toMs();
|
|
59
61
|
// queue lock is refreshed every 30 seconds
|
|
@@ -70,43 +72,160 @@ function cleanup() {
|
|
|
70
72
|
}
|
|
71
73
|
});
|
|
72
74
|
}
|
|
73
|
-
function
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
75
|
+
function withMetrics(name, cb, tags) {
|
|
76
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
77
|
+
const start = performance.now();
|
|
78
|
+
try {
|
|
79
|
+
const result = yield cb();
|
|
80
|
+
dd_trace_1.default.dogstatsd.increment(`${name}.success`, 1, tags);
|
|
81
|
+
return result;
|
|
82
|
+
}
|
|
83
|
+
catch (err) {
|
|
84
|
+
dd_trace_1.default.dogstatsd.increment(`${name}.error`, 1, tags);
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
const durationMs = performance.now() - start;
|
|
89
|
+
dd_trace_1.default.dogstatsd.distribution(`${name}.duration.ms`, durationMs, tags);
|
|
90
|
+
dd_trace_1.default.dogstatsd.increment(name, 1, tags);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
function jobOptsTags(opts) {
|
|
95
|
+
return {
|
|
96
|
+
"job.opts.attempts": opts.attempts,
|
|
97
|
+
"job.opts.backoff": opts.backoff,
|
|
98
|
+
"job.opts.delay": opts.delay,
|
|
99
|
+
"job.opts.jobId": opts.jobId,
|
|
100
|
+
"job.opts.lifo": opts.lifo,
|
|
101
|
+
"job.opts.preventParsingData": opts.preventParsingData,
|
|
102
|
+
"job.opts.priority": opts.priority,
|
|
103
|
+
"job.opts.removeOnComplete": opts.removeOnComplete,
|
|
104
|
+
"job.opts.removeOnFail": opts.removeOnFail,
|
|
105
|
+
"job.opts.repeat": opts.repeat,
|
|
106
|
+
"job.opts.stackTraceLimit": opts.stackTraceLimit,
|
|
107
|
+
"job.opts.timeout": opts.timeout,
|
|
82
108
|
};
|
|
83
|
-
|
|
84
|
-
|
|
109
|
+
}
|
|
110
|
+
function jobTags(job) {
|
|
111
|
+
return Object.assign({ "job.id": job.id, "job.attemptsMade": job.attemptsMade, "job.timestamp": job.timestamp, "job.data.sizeBytes": (0, object_sizeof_1.default)(job.data) }, jobOptsTags(job.opts || {}));
|
|
112
|
+
}
|
|
113
|
+
class BudibaseQueue {
|
|
114
|
+
constructor(jobQueue, opts = {}) {
|
|
115
|
+
this.opts = opts;
|
|
116
|
+
this.jobQueue = jobQueue;
|
|
117
|
+
this.queue = this.initQueue();
|
|
85
118
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
119
|
+
initQueue() {
|
|
120
|
+
const redisOpts = (0, utils_1.getRedisOptions)();
|
|
121
|
+
const queueConfig = {
|
|
122
|
+
redis: redisOpts,
|
|
123
|
+
settings: {
|
|
124
|
+
maxStalledCount: this.opts.maxStalledCount
|
|
125
|
+
? this.opts.maxStalledCount
|
|
126
|
+
: 0,
|
|
127
|
+
lockDuration: QUEUE_LOCK_MS,
|
|
128
|
+
lockRenewTime: QUEUE_LOCK_RENEW_INTERNAL_MS,
|
|
129
|
+
},
|
|
130
|
+
};
|
|
131
|
+
if (this.opts.jobOptions) {
|
|
132
|
+
queueConfig.defaultJobOptions = this.opts.jobOptions;
|
|
133
|
+
}
|
|
134
|
+
let queue;
|
|
135
|
+
if (!environment_1.default.isTest()) {
|
|
136
|
+
queue = new bull_1.default(this.jobQueue, queueConfig);
|
|
137
|
+
}
|
|
138
|
+
else if (process.env.BULL_TEST_REDIS_PORT &&
|
|
139
|
+
!isNaN(+process.env.BULL_TEST_REDIS_PORT)) {
|
|
140
|
+
queue = new bull_1.default(this.jobQueue, {
|
|
141
|
+
redis: { host: "localhost", port: +process.env.BULL_TEST_REDIS_PORT },
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
queue = new inMemoryQueue_1.default(this.jobQueue, queueConfig);
|
|
146
|
+
}
|
|
147
|
+
(0, listeners_1.addListeners)(queue, this.jobQueue, this.opts.removeStalledCb);
|
|
148
|
+
QUEUES.push(queue);
|
|
149
|
+
if (!cleanupInterval && !environment_1.default.isTest()) {
|
|
150
|
+
cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS);
|
|
151
|
+
// fire off an initial cleanup
|
|
152
|
+
cleanup().catch(err => {
|
|
153
|
+
console.error(`Unable to cleanup ${this.jobQueue} initially - ${err}`);
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
return queue;
|
|
89
157
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
queue = new bull_1.default(jobQueue, {
|
|
93
|
-
redis: { host: "localhost", port: +process.env.BULL_TEST_REDIS_PORT },
|
|
94
|
-
});
|
|
158
|
+
getBullQueue() {
|
|
159
|
+
return this.queue;
|
|
95
160
|
}
|
|
96
|
-
|
|
97
|
-
|
|
161
|
+
process(...args) {
|
|
162
|
+
let concurrency = undefined;
|
|
163
|
+
let cb;
|
|
164
|
+
if (args.length === 2) {
|
|
165
|
+
concurrency = args[0];
|
|
166
|
+
cb = args[1];
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
cb = args[0];
|
|
170
|
+
}
|
|
171
|
+
const wrappedCb = (job) => __awaiter(this, void 0, void 0, function* () {
|
|
172
|
+
yield dd_trace_1.default.trace("queue.process", (span) => __awaiter(this, void 0, void 0, function* () {
|
|
173
|
+
// @ts-expect-error monkey patching the parent span id
|
|
174
|
+
if (job.data._parentSpanContext) {
|
|
175
|
+
// @ts-expect-error monkey patching the parent span id
|
|
176
|
+
const parentContext = job.data._parentSpanContext;
|
|
177
|
+
const parent = {
|
|
178
|
+
traceId: parentContext.traceId,
|
|
179
|
+
spanId: parentContext.spanId,
|
|
180
|
+
toTraceId: () => parentContext.traceId,
|
|
181
|
+
toSpanId: () => parentContext.spanId,
|
|
182
|
+
toTraceparent: () => "",
|
|
183
|
+
};
|
|
184
|
+
span.addLink(parent);
|
|
185
|
+
}
|
|
186
|
+
span.addTags(Object.assign({ "queue.name": this.jobQueue }, jobTags(job)));
|
|
187
|
+
if (this.opts.jobTags) {
|
|
188
|
+
span.addTags(this.opts.jobTags(job.data));
|
|
189
|
+
}
|
|
190
|
+
dd_trace_1.default.dogstatsd.distribution("queue.process.sizeBytes", (0, object_sizeof_1.default)(job.data), this.metricTags());
|
|
191
|
+
yield this.withMetrics("queue.process", () => cb(job));
|
|
192
|
+
}));
|
|
193
|
+
});
|
|
194
|
+
if (concurrency) {
|
|
195
|
+
return this.queue.process(concurrency, wrappedCb);
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
return this.queue.process(wrappedCb);
|
|
199
|
+
}
|
|
98
200
|
}
|
|
99
|
-
(
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
201
|
+
add(data, opts) {
|
|
202
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
203
|
+
return yield dd_trace_1.default.trace("queue.add", (span) => __awaiter(this, void 0, void 0, function* () {
|
|
204
|
+
span.addTags(Object.assign({ "queue.name": this.jobQueue, "job.data.sizeBytes": (0, object_sizeof_1.default)(data) }, jobOptsTags(opts || {})));
|
|
205
|
+
if (this.opts.jobTags) {
|
|
206
|
+
span.addTags(this.opts.jobTags(data));
|
|
207
|
+
}
|
|
208
|
+
// @ts-expect-error monkey patching the parent span id
|
|
209
|
+
data._parentSpanContext = {
|
|
210
|
+
traceId: span.context().toTraceId(),
|
|
211
|
+
spanId: span.context().toSpanId(),
|
|
212
|
+
};
|
|
213
|
+
dd_trace_1.default.dogstatsd.distribution("queue.add.sizeBytes", (0, object_sizeof_1.default)(data), this.metricTags());
|
|
214
|
+
return yield this.withMetrics("queue.add", () => this.queue.add(data, opts));
|
|
215
|
+
}));
|
|
106
216
|
});
|
|
107
217
|
}
|
|
108
|
-
|
|
218
|
+
withMetrics(name, cb) {
|
|
219
|
+
return withMetrics(name, cb, this.metricTags());
|
|
220
|
+
}
|
|
221
|
+
metricTags() {
|
|
222
|
+
return { queueName: this.jobQueue };
|
|
223
|
+
}
|
|
224
|
+
close() {
|
|
225
|
+
return this.queue.close();
|
|
226
|
+
}
|
|
109
227
|
}
|
|
228
|
+
exports.BudibaseQueue = BudibaseQueue;
|
|
110
229
|
function shutdown() {
|
|
111
230
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
231
|
if (cleanupInterval) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/queue/queue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/queue/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsOA,4BAWC;AAjPD,iEAAgC;AAChC,0CAAgD;AAEhD,oEAA2C;AAC3C,gDAAsE;AACtE,2CAAqD;AACrD,oCAAmC;AACnC,kDAAmC;AACnC,wDAA6B;AAC7B,kEAAkC;AAIlC,uCAAuC;AACvC,MAAM,aAAa,GAAG,gBAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AACpD,2CAA2C;AAC3C,MAAM,4BAA4B,GAAG,gBAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;AACpE,qCAAqC;AACrC,MAAM,iBAAiB,GAAG,gBAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;AACzD,IAAI,MAAM,GAAY,EAAE,CAAA;AACxB,IAAI,eAA+B,CAAA;AAEnC,SAAe,OAAO;;QACpB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;YACjD,MAAM,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;QAChD,CAAC;IACH,CAAC;CAAA;AAED,SAAe,WAAW,CACxB,IAAY,EACZ,EAAoB,EACpB,IAAsC;;QAEtC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAA;YACzB,kBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;YACtD,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,kBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;YACpD,MAAM,GAAG,CAAA;QACX,CAAC;gBAAS,CAAC;YACT,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAA;YAC5C,kBAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,IAAI,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;YACtE,kBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;CAAA;AAED,SAAS,WAAW,CAAC,IAAgB;IACnC,OAAO;QACL,mBAAmB,EAAE,IAAI,CAAC,QAAQ;QAClC,kBAAkB,EAAE,IAAI,CAAC,OAAO;QAChC,gBAAgB,EAAE,IAAI,CAAC,KAAK;QAC5B,gBAAgB,EAAE,IAAI,CAAC,KAAK;QAC5B,eAAe,EAAE,IAAI,CAAC,IAAI;QAC1B,6BAA6B,EAAE,IAAI,CAAC,kBAAkB;QACtD,mBAAmB,EAAE,IAAI,CAAC,QAAQ;QAClC,2BAA2B,EAAE,IAAI,CAAC,gBAAgB;QAClD,uBAAuB,EAAE,IAAI,CAAC,YAAY;QAC1C,iBAAiB,EAAE,IAAI,CAAC,MAAM;QAC9B,0BAA0B,EAAE,IAAI,CAAC,eAAe;QAChD,kBAAkB,EAAE,IAAI,CAAC,OAAO;KACjC,CAAA;AACH,CAAC;AAED,SAAS,OAAO,CAAC,GAAQ;IACvB,uBACE,QAAQ,EAAE,GAAG,CAAC,EAAE,EAChB,kBAAkB,EAAE,GAAG,CAAC,YAAY,EACpC,eAAe,EAAE,GAAG,CAAC,SAAS,EAC9B,oBAAoB,EAAE,IAAA,uBAAM,EAAC,GAAG,CAAC,IAAI,CAAC,IACnC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAC/B;AACH,CAAC;AASD,MAAa,aAAa;IAKxB,YAAY,QAAkB,EAAE,OAA6B,EAAE;QAC7D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;IAC/B,CAAC;IAEO,SAAS;QACf,MAAM,SAAS,GAAG,IAAA,uBAAe,GAAE,CAAA;QACnC,MAAM,WAAW,GAAiB;YAChC,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE;gBACR,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;oBACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe;oBAC3B,CAAC,CAAC,CAAC;gBACL,YAAY,EAAE,aAAa;gBAC3B,aAAa,EAAE,4BAA4B;aAC5C;SACF,CAAA;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,WAAW,CAAC,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;QACtD,CAAC;QACD,IAAI,KAAe,CAAA;QACnB,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YAClB,KAAK,GAAG,IAAI,cAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QACnD,CAAC;aAAM,IACL,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EACzC,CAAC;YACD,KAAK,GAAG,IAAI,cAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnC,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;aACtE,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,IAAI,uBAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAQ,CAAA;QAC9D,CAAC;QAED,IAAA,wBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClB,IAAI,CAAC,eAAe,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACtC,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;YACxD,8BAA8B;YAC9B,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACpB,OAAO,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,QAAQ,gBAAgB,GAAG,EAAE,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAOD,OAAO,CAAC,GAAG,IAAW;QACpB,IAAI,WAAW,GAAuB,SAAS,CAAA;QAC/C,IAAI,EAAkC,CAAA;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YACrB,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACd,CAAC;aAAM,CAAC;YACN,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACd,CAAC;QAED,MAAM,SAAS,GAAG,CAAO,GAAW,EAAE,EAAE;YACtC,MAAM,kBAAM,CAAC,KAAK,CAAC,eAAe,EAAE,CAAM,IAAI,EAAC,EAAE;gBAC/C,sDAAsD;gBACtD,IAAI,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAChC,sDAAsD;oBACtD,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAA;oBACjD,MAAM,MAAM,GAAG;wBACb,OAAO,EAAE,aAAa,CAAC,OAAO;wBAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;wBAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO;wBACtC,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM;wBACpC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;qBACxB,CAAA;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACtB,CAAC;gBACD,IAAI,CAAC,OAAO,iBAAG,YAAY,EAAE,IAAI,CAAC,QAAQ,IAAK,OAAO,CAAC,GAAG,CAAC,EAAG,CAAA;gBAC9D,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;gBAC3C,CAAC;gBAED,kBAAM,CAAC,SAAS,CAAC,YAAY,CAC3B,yBAAyB,EACzB,IAAA,uBAAM,EAAC,GAAG,CAAC,IAAI,CAAC,EAChB,IAAI,CAAC,UAAU,EAAE,CAClB,CAAA;gBACD,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACxD,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC,CAAA,CAAA;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAEK,GAAG,CAAC,IAAO,EAAE,IAAiB;;YAClC,OAAO,MAAM,kBAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAM,IAAI,EAAC,EAAE;gBAClD,IAAI,CAAC,OAAO,iBACV,YAAY,EAAE,IAAI,CAAC,QAAQ,EAC3B,oBAAoB,EAAE,IAAA,uBAAM,EAAC,IAAI,CAAC,IAC/B,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,EAC1B,CAAA;gBACF,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBACvC,CAAC;gBACD,sDAAsD;gBACtD,IAAI,CAAC,kBAAkB,GAAG;oBACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE;oBACnC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;iBAClC,CAAA;gBAED,kBAAM,CAAC,SAAS,CAAC,YAAY,CAC3B,qBAAqB,EACrB,IAAA,uBAAM,EAAC,IAAI,CAAC,EACZ,IAAI,CAAC,UAAU,EAAE,CAClB,CAAA;gBACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,GAAG,EAAE,CAC9C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAC3B,CAAA;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAEO,WAAW,CAAI,IAAY,EAAE,EAAoB;QACvD,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACjD,CAAC;IAEO,UAAU;QAChB,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAA;IACrC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;CACF;AAjJD,sCAiJC;AAED,SAAsB,QAAQ;;QAC5B,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC/B,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;gBACzB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;YACrB,CAAC;YACD,MAAM,GAAG,EAAE,CAAA;QACb,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;CAAA"}
|
package/dist/src/sql/utils.d.ts
CHANGED
|
@@ -17,8 +17,8 @@ export declare function convertRowId(field: any): any;
|
|
|
17
17
|
export declare function breakRowIdField(_id: string | {
|
|
18
18
|
_id: string;
|
|
19
19
|
}): any[];
|
|
20
|
-
export declare function isInvalidISODateString(str: string): boolean;
|
|
21
20
|
export declare function isValidISODateString(str: string): boolean;
|
|
21
|
+
export declare function isInvalidISODateString(str: string): boolean;
|
|
22
22
|
export declare function isValidFilter(value: any): boolean;
|
|
23
23
|
export declare function isValidTime(value: string): boolean;
|
|
24
24
|
export declare function sqlLog(client: string, query: string, values?: any[]): void;
|
package/dist/src/sql/utils.js
CHANGED
|
@@ -15,8 +15,8 @@ exports.generateRowIdField = generateRowIdField;
|
|
|
15
15
|
exports.isRowId = isRowId;
|
|
16
16
|
exports.convertRowId = convertRowId;
|
|
17
17
|
exports.breakRowIdField = breakRowIdField;
|
|
18
|
-
exports.isInvalidISODateString = isInvalidISODateString;
|
|
19
18
|
exports.isValidISODateString = isValidISODateString;
|
|
19
|
+
exports.isInvalidISODateString = isInvalidISODateString;
|
|
20
20
|
exports.isValidFilter = isValidFilter;
|
|
21
21
|
exports.isValidTime = isValidTime;
|
|
22
22
|
exports.sqlLog = sqlLog;
|
|
@@ -27,7 +27,7 @@ const environment_1 = __importDefault(require("../environment"));
|
|
|
27
27
|
const DOUBLE_SEPARATOR = `${types_1.SEPARATOR}${types_1.SEPARATOR}`;
|
|
28
28
|
const ROW_ID_REGEX = /^\[.*]$/g;
|
|
29
29
|
const ENCODED_SPACE = encodeURIComponent(" ");
|
|
30
|
-
const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}
|
|
30
|
+
const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:.\d{3})?Z)?$/;
|
|
31
31
|
const TIME_REGEX = /^(?:\d{2}:)?(?:\d{2}:)(?:\d{2})$/;
|
|
32
32
|
function isExternalTableID(tableId) {
|
|
33
33
|
return tableId.startsWith(types_1.DocumentType.DATASOURCE + types_1.SEPARATOR);
|
|
@@ -136,16 +136,16 @@ function breakRowIdField(_id) {
|
|
|
136
136
|
return [_id];
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
-
function
|
|
139
|
+
function isValidISODateString(str) {
|
|
140
140
|
const trimmedValue = str.trim();
|
|
141
141
|
if (!ISO_DATE_REGEX.test(trimmedValue)) {
|
|
142
142
|
return false;
|
|
143
143
|
}
|
|
144
|
-
|
|
145
|
-
return isNaN(d.getTime());
|
|
144
|
+
const d = new Date(trimmedValue);
|
|
145
|
+
return !isNaN(d.getTime());
|
|
146
146
|
}
|
|
147
|
-
function
|
|
148
|
-
return
|
|
147
|
+
function isInvalidISODateString(str) {
|
|
148
|
+
return !isValidISODateString(str);
|
|
149
149
|
}
|
|
150
150
|
function isValidFilter(value) {
|
|
151
151
|
return value != null && value !== "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sql/utils.ts"],"names":[],"mappings":";;;;;AAmBA,8CAEC;AAED,8CAEC;AAED,oCAgBC;AAED,0CAaC;AAED,oDAEC;AAED,sCAMC;AAED,oCAEC;AAED,oDAaC;AAED,gDAaC;AAED,0BAKC;AAED,oCAQC;AAGD,0CAeC;AAED,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sql/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.4",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"koa-pino-logger": "4.0.0",
|
|
57
57
|
"lodash": "4.17.21",
|
|
58
58
|
"node-fetch": "2.6.7",
|
|
59
|
+
"object-sizeof": "2.6.1",
|
|
59
60
|
"passport-google-oauth": "2.0.0",
|
|
60
61
|
"passport-local": "1.0.0",
|
|
61
62
|
"passport-oauth2-refresh": "^2.1.0",
|
|
@@ -114,5 +115,5 @@
|
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
117
|
},
|
|
117
|
-
"gitHead": "
|
|
118
|
+
"gitHead": "ce3a08a254779376de9dce7a6e121528e324a54e"
|
|
118
119
|
}
|