@budibase/backend-core 3.33.1 → 3.33.3
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.33.
|
|
3
|
+
"version": "3.33.3",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "636f2bfa98c45e71c604b7a655ddedb16871dd85"
|
|
116
116
|
}
|
package/dist/src/redis/utils.js
CHANGED
|
@@ -100,13 +100,16 @@ function getRedisClusterOptions() {
|
|
|
100
100
|
return {
|
|
101
101
|
slotsRefreshTimeout: 2000,
|
|
102
102
|
dnsLookup: (address, callback) => callback(null, address),
|
|
103
|
-
redisOptions: Object.assign(
|
|
103
|
+
redisOptions: Object.assign({}, getRedisOptions()),
|
|
104
104
|
};
|
|
105
105
|
}
|
|
106
106
|
function getRedisOptions() {
|
|
107
107
|
const { host, password, port, username } = getRedisConnectionDetails();
|
|
108
|
-
|
|
109
|
-
|
|
108
|
+
const tls = environment_1.default.REDIS_URL.toLowerCase().startsWith("rediss://")
|
|
109
|
+
? {}
|
|
110
|
+
: undefined;
|
|
111
|
+
return Object.assign(Object.assign({ connectTimeout: 30000, port: port, host,
|
|
112
|
+
password }, (username && { username })), (tls && { tls }));
|
|
110
113
|
}
|
|
111
114
|
function removeDbPrefix(key) {
|
|
112
115
|
let parts = key.split(exports.SEPARATOR);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":";;;;;;AA+DA,8DA2BC;AAED,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,36 @@ describe("redis utils", () => {
|
|
|
59
59
|
expect(options.username).toBeUndefined();
|
|
60
60
|
expect(options.password).toBe("secret");
|
|
61
61
|
}));
|
|
62
|
+
it("enables tls from a rediss URL in the standard redis options", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
63
|
+
const options = yield (0, environment_1.withEnv)({
|
|
64
|
+
REDIS_URL: "rediss://alice:secret@localhost:6380",
|
|
65
|
+
REDIS_USERNAME: "",
|
|
66
|
+
REDIS_PASSWORD: "",
|
|
67
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisOptions)(); }));
|
|
68
|
+
expect(options).toEqual({
|
|
69
|
+
connectTimeout: 30000,
|
|
70
|
+
host: "localhost",
|
|
71
|
+
password: "secret",
|
|
72
|
+
port: 6380,
|
|
73
|
+
tls: {},
|
|
74
|
+
username: "alice",
|
|
75
|
+
});
|
|
76
|
+
}));
|
|
77
|
+
it("supports rediss URL with username and password provided separately", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
78
|
+
const options = yield (0, environment_1.withEnv)({
|
|
79
|
+
REDIS_URL: "rediss://master.xxxxx.cache.amazonaws.com",
|
|
80
|
+
REDIS_USERNAME: "aaa",
|
|
81
|
+
REDIS_PASSWORD: "bbb",
|
|
82
|
+
}, () => __awaiter(void 0, void 0, void 0, function* () { return (0, utils_1.getRedisOptions)(); }));
|
|
83
|
+
expect(options).toEqual({
|
|
84
|
+
connectTimeout: 30000,
|
|
85
|
+
host: "master.xxxxx.cache.amazonaws.com",
|
|
86
|
+
password: "bbb",
|
|
87
|
+
port: 6379,
|
|
88
|
+
tls: {},
|
|
89
|
+
username: "aaa",
|
|
90
|
+
});
|
|
91
|
+
}));
|
|
62
92
|
});
|
|
63
93
|
});
|
|
64
94
|
//# sourceMappingURL=utils.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../../../tests/redis/utils.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iDAG8B;AAC9B,uDAA+C;AAE/C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,sCAAsC,EAAE,GAAS,EAAE;YACpD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,qCAAqC;gBAChD,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBACtB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,IAAI;aACX,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;YAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,wCAAwC,EAAE,GAAS,EAAE;YACtD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,uCAAuC;gBAClD,cAAc,EAAE,SAAS;gBACzB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,kCAAkC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,uBAAe,GAAE,CAAA,GAAA,CAC9B,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../../../tests/redis/utils.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iDAG8B;AAC9B,uDAA+C;AAE/C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,sCAAsC,EAAE,GAAS,EAAE;YACpD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,qCAAqC;gBAChD,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBACtB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,QAAQ,EAAE,OAAO;gBACjB,IAAI,EAAE,IAAI;aACX,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;YAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,wCAAwC,EAAE,GAAS,EAAE;YACtD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,uCAAuC;gBAClD,cAAc,EAAE,SAAS;gBACzB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,iCAAyB,GAAE,CAAA,GAAA,CACxC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,kCAAkC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,gCAAgC;gBAC3C,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,uBAAe,GAAE,CAAA,GAAA,CAC9B,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAA;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,6DAA6D,EAAE,GAAS,EAAE;YAC3E,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,sCAAsC;gBACjD,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACnB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,uBAAe,GAAE,CAAA,GAAA,CAC9B,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBACtB,cAAc,EAAE,KAAK;gBACrB,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,EAAE;gBACP,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,EAAE,CAAC,oEAAoE,EAAE,GAAS,EAAE;YAClF,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAO,EAC3B;gBACE,SAAS,EAAE,2CAA2C;gBACtD,cAAc,EAAE,KAAK;gBACrB,cAAc,EAAE,KAAK;aACtB,EACD,GAAS,EAAE,kDAAC,OAAA,IAAA,uBAAe,GAAE,CAAA,GAAA,CAC9B,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;gBACtB,cAAc,EAAE,KAAK;gBACrB,IAAI,EAAE,kCAAkC;gBACxC,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,EAAE;gBACP,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.33.
|
|
3
|
+
"version": "3.33.3",
|
|
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",
|
|
@@ -112,5 +112,5 @@
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
},
|
|
115
|
-
"gitHead": "
|
|
115
|
+
"gitHead": "636f2bfa98c45e71c604b7a655ddedb16871dd85"
|
|
116
116
|
}
|