@budibase/backend-core 2.13.50 → 2.13.51
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 +654 -657
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/src/queue/queue.js +1 -1
- package/dist/src/queue/queue.js.map +1 -1
- package/dist/src/redis/redis.js +7 -6
- package/dist/src/redis/redis.js.map +1 -1
- package/package.json +4 -4
- package/src/queue/queue.ts +1 -1
- package/src/redis/redis.ts +7 -14
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.51",
|
|
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",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.51",
|
|
27
|
+
"@budibase/types": "2.13.51",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "de9602636388e8008fea9001494a816d5fc387e8"
|
|
101
101
|
}
|
package/dist/src/queue/queue.js
CHANGED
|
@@ -81,7 +81,7 @@ function createQueue(jobQueue, opts = {}) {
|
|
|
81
81
|
cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS);
|
|
82
82
|
// fire off an initial cleanup
|
|
83
83
|
cleanup().catch(err => {
|
|
84
|
-
console.error(`Unable to cleanup
|
|
84
|
+
console.error(`Unable to cleanup ${jobQueue} initially - ${err}`);
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
return queue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/queue/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,0CAAgD;AAEhD,oEAA2C;AAC3C,gDAA8C;AAC9C,2CAAqD;AACrD,oCAAmC;AACnC,kDAAmC;AAEnC,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,GAAwC,EAAE,CAAA;AACpD,IAAI,eAA+B,CAAA;AAEnC,SAAe,OAAO;;QACpB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;SAClD;IACH,CAAC;CAAA;AAED,SAAgB,WAAW,CACzB,QAAkB,EAClB,OAAwC,EAAE;IAE1C,MAAM,SAAS,GAAG,IAAA,uBAAe,GAAE,CAAA;IACnC,MAAM,WAAW,GAAiB;QAChC,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE;YACR,eAAe,EAAE,CAAC;YAClB,YAAY,EAAE,aAAa;YAC3B,aAAa,EAAE,4BAA4B;SAC5C;KACF,CAAA;IACD,IAAI,KAAU,CAAA;IACd,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE;QACjB,KAAK,GAAG,IAAI,cAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;KAC7C;SAAM;QACL,KAAK,GAAG,IAAI,uBAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;KACjD;IACD,IAAA,wBAAY,EAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,CAAC,CAAA;IACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAClB,IAAI,CAAC,eAAe,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE;QACrC,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;QACxD,8BAA8B;QAC9B,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACpB,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/queue/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,0CAAgD;AAEhD,oEAA2C;AAC3C,gDAA8C;AAC9C,2CAAqD;AACrD,oCAAmC;AACnC,kDAAmC;AAEnC,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,GAAwC,EAAE,CAAA;AACpD,IAAI,eAA+B,CAAA;AAEnC,SAAe,OAAO;;QACpB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;SAClD;IACH,CAAC;CAAA;AAED,SAAgB,WAAW,CACzB,QAAkB,EAClB,OAAwC,EAAE;IAE1C,MAAM,SAAS,GAAG,IAAA,uBAAe,GAAE,CAAA;IACnC,MAAM,WAAW,GAAiB;QAChC,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE;YACR,eAAe,EAAE,CAAC;YAClB,YAAY,EAAE,aAAa;YAC3B,aAAa,EAAE,4BAA4B;SAC5C;KACF,CAAA;IACD,IAAI,KAAU,CAAA;IACd,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE;QACjB,KAAK,GAAG,IAAI,cAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;KAC7C;SAAM;QACL,KAAK,GAAG,IAAI,uBAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;KACjD;IACD,IAAA,wBAAY,EAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,CAAC,CAAA;IACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAClB,IAAI,CAAC,eAAe,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE;QACrC,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;QACxD,8BAA8B;QAC9B,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACpB,OAAO,CAAC,KAAK,CAAC,qBAAqB,QAAQ,gBAAgB,GAAG,EAAE,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;KACH;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AA7BD,kCA6BC;AAED,SAAsB,QAAQ;;QAC5B,IAAI,eAAe,EAAE;YACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;SAC9B;QACD,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;gBACxB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;aACpB;YACD,MAAM,GAAG,EAAE,CAAA;SACZ;QACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;CAAA;AAXD,4BAWC"}
|
package/dist/src/redis/redis.js
CHANGED
|
@@ -49,6 +49,7 @@ if (environment_1.default.MOCK_REDIS) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
const utils_1 = require("./utils");
|
|
52
|
+
const logging_1 = require("../logging");
|
|
52
53
|
const timers = __importStar(require("../timers"));
|
|
53
54
|
const RETRY_PERIOD_MS = 2000;
|
|
54
55
|
const STARTUP_TIMEOUT_MS = 5000;
|
|
@@ -65,17 +66,16 @@ if (environment_1.default.MOCK_REDIS) {
|
|
|
65
66
|
function pickClient(selectDb) {
|
|
66
67
|
return CLIENTS[selectDb];
|
|
67
68
|
}
|
|
68
|
-
function connectionError(
|
|
69
|
+
function connectionError(timeout, err) {
|
|
69
70
|
// manually shut down, ignore errors
|
|
70
71
|
if (CLOSED) {
|
|
71
72
|
return;
|
|
72
73
|
}
|
|
73
|
-
pickClient(selectDb).disconnect();
|
|
74
74
|
CLOSED = true;
|
|
75
75
|
// always clear this on error
|
|
76
76
|
clearTimeout(timeout);
|
|
77
77
|
CONNECTED = false;
|
|
78
|
-
|
|
78
|
+
(0, logging_1.logAlert)("Redis connection failed", err);
|
|
79
79
|
setTimeout(() => {
|
|
80
80
|
init();
|
|
81
81
|
}, RETRY_PERIOD_MS);
|
|
@@ -100,7 +100,7 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
100
100
|
// start the timer - only allowed 5 seconds to connect
|
|
101
101
|
timeout = setTimeout(() => {
|
|
102
102
|
if (!CONNECTED) {
|
|
103
|
-
connectionError(
|
|
103
|
+
connectionError(timeout, "Did not successfully connect in timeout");
|
|
104
104
|
}
|
|
105
105
|
}, STARTUP_TIMEOUT_MS);
|
|
106
106
|
// disconnect any lingering client
|
|
@@ -122,12 +122,13 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
122
122
|
// allow the process to exit
|
|
123
123
|
return;
|
|
124
124
|
}
|
|
125
|
-
connectionError(
|
|
125
|
+
connectionError(timeout, err);
|
|
126
126
|
});
|
|
127
127
|
client.on("error", (err) => {
|
|
128
|
-
connectionError(
|
|
128
|
+
connectionError(timeout, err);
|
|
129
129
|
});
|
|
130
130
|
client.on("connect", () => {
|
|
131
|
+
console.log(`Connected to Redis DB: ${selectDb}`);
|
|
131
132
|
clearTimeout(timeout);
|
|
132
133
|
CONNECTED = true;
|
|
133
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/redis/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAgC;AAChC,sDAA2B;AAC3B,qCAAqC;AACrC,IAAI,SAA0B,CAAA;AAC9B,IAAI,qBAAG,CAAC,UAAU,EAAE;IAClB,IAAI;QACF,gCAAgC;QAChC,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;KACtC;CACF;AACD,mCAOgB;AAChB,kDAAmC;AAEnC,MAAM,eAAe,GAAG,IAAI,CAAA;AAC5B,MAAM,kBAAkB,GAAG,IAAI,CAAA;AAC/B,MAAM,SAAS,GAAG,qBAAG,CAAC,eAAe,CAAA;AACrC,MAAM,iBAAiB,GAAG,0BAAkB,CAAC,OAAO,CAAA;AAEpD,4CAA4C;AAC5C,IAAI,MAAM,GAAG,KAAK,CAAA;AAClB,IAAI,OAAO,GAA2B,EAAE,CAAA;AACxC,IAAI,SAAS,GAAG,KAAK,CAAA;AAErB,8BAA8B;AAC9B,IAAI,qBAAG,CAAC,UAAU,EAAE;IAClB,SAAS,GAAG,IAAI,CAAA;CACjB;AAED,SAAS,UAAU,CAAC,QAAgB;IAClC,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/redis/redis.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": "2.13.
|
|
3
|
+
"version": "2.13.51",
|
|
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",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.4",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.13.
|
|
27
|
-
"@budibase/types": "2.13.
|
|
26
|
+
"@budibase/shared-core": "2.13.51",
|
|
27
|
+
"@budibase/types": "2.13.51",
|
|
28
28
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "de9602636388e8008fea9001494a816d5fc387e8"
|
|
101
101
|
}
|
package/src/queue/queue.ts
CHANGED
|
@@ -47,7 +47,7 @@ export function createQueue<T>(
|
|
|
47
47
|
cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS)
|
|
48
48
|
// fire off an initial cleanup
|
|
49
49
|
cleanup().catch(err => {
|
|
50
|
-
console.error(`Unable to cleanup
|
|
50
|
+
console.error(`Unable to cleanup ${jobQueue} initially - ${err}`)
|
|
51
51
|
})
|
|
52
52
|
}
|
|
53
53
|
return queue
|
package/src/redis/redis.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
SelectableDatabase,
|
|
19
19
|
getRedisConnectionDetails,
|
|
20
20
|
} from "./utils"
|
|
21
|
+
import { logAlert } from "../logging"
|
|
21
22
|
import * as timers from "../timers"
|
|
22
23
|
|
|
23
24
|
const RETRY_PERIOD_MS = 2000
|
|
@@ -39,21 +40,16 @@ function pickClient(selectDb: number): any {
|
|
|
39
40
|
return CLIENTS[selectDb]
|
|
40
41
|
}
|
|
41
42
|
|
|
42
|
-
function connectionError(
|
|
43
|
-
selectDb: number,
|
|
44
|
-
timeout: NodeJS.Timeout,
|
|
45
|
-
err: Error | string
|
|
46
|
-
) {
|
|
43
|
+
function connectionError(timeout: NodeJS.Timeout, err: Error | string) {
|
|
47
44
|
// manually shut down, ignore errors
|
|
48
45
|
if (CLOSED) {
|
|
49
46
|
return
|
|
50
47
|
}
|
|
51
|
-
pickClient(selectDb).disconnect()
|
|
52
48
|
CLOSED = true
|
|
53
49
|
// always clear this on error
|
|
54
50
|
clearTimeout(timeout)
|
|
55
51
|
CONNECTED = false
|
|
56
|
-
|
|
52
|
+
logAlert("Redis connection failed", err)
|
|
57
53
|
setTimeout(() => {
|
|
58
54
|
init()
|
|
59
55
|
}, RETRY_PERIOD_MS)
|
|
@@ -79,11 +75,7 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
79
75
|
// start the timer - only allowed 5 seconds to connect
|
|
80
76
|
timeout = setTimeout(() => {
|
|
81
77
|
if (!CONNECTED) {
|
|
82
|
-
connectionError(
|
|
83
|
-
selectDb,
|
|
84
|
-
timeout,
|
|
85
|
-
"Did not successfully connect in timeout"
|
|
86
|
-
)
|
|
78
|
+
connectionError(timeout, "Did not successfully connect in timeout")
|
|
87
79
|
}
|
|
88
80
|
}, STARTUP_TIMEOUT_MS)
|
|
89
81
|
|
|
@@ -106,12 +98,13 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
106
98
|
// allow the process to exit
|
|
107
99
|
return
|
|
108
100
|
}
|
|
109
|
-
connectionError(
|
|
101
|
+
connectionError(timeout, err)
|
|
110
102
|
})
|
|
111
103
|
client.on("error", (err: Error) => {
|
|
112
|
-
connectionError(
|
|
104
|
+
connectionError(timeout, err)
|
|
113
105
|
})
|
|
114
106
|
client.on("connect", () => {
|
|
107
|
+
console.log(`Connected to Redis DB: ${selectDb}`)
|
|
115
108
|
clearTimeout(timeout)
|
|
116
109
|
CONNECTED = true
|
|
117
110
|
})
|