@budibase/backend-core 2.6.23 → 2.6.24-alpha.0
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 +19 -8
- package/dist/src/constants/db.d.ts +1 -1
- package/dist/src/constants/db.js +1 -1
- package/dist/src/constants/misc.d.ts +1 -0
- package/dist/src/constants/misc.js +1 -0
- package/dist/src/constants/misc.js.map +1 -1
- package/dist/src/db/couch/DatabaseImpl.d.ts +1 -0
- package/dist/src/db/couch/DatabaseImpl.js +8 -3
- package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
- package/dist/src/db/couch/connections.js +11 -10
- package/dist/src/db/couch/connections.js.map +1 -1
- package/dist/src/db/couch/utils.d.ts +6 -0
- package/dist/src/db/couch/utils.js +9 -3
- package/dist/src/db/couch/utils.js.map +1 -1
- package/dist/src/environment.d.ts +1 -1
- package/dist/src/environment.js +1 -1
- package/dist/src/environment.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/logging/pino/logger.js +1 -1
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/src/redis/init.d.ts +1 -0
- package/dist/src/redis/init.js +15 -3
- package/dist/src/redis/init.js.map +1 -1
- package/dist/src/redis/redis.d.ts +1 -0
- package/dist/src/redis/redis.js +27 -6
- package/dist/src/redis/redis.js.map +1 -1
- package/dist/src/redis/redlockImpl.d.ts +3 -1
- package/dist/src/redis/redlockImpl.js +79 -63
- package/dist/src/redis/redlockImpl.js.map +1 -1
- package/dist/src/redis/utils.d.ts +4 -3
- package/dist/src/redis/utils.js +3 -2
- package/dist/src/redis/utils.js.map +1 -1
- package/dist/src/utils/utils.d.ts +3 -0
- package/dist/src/utils/utils.js +17 -3
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tests/core/utilities/mocks/licenses.d.ts +1 -0
- package/dist/tests/core/utilities/mocks/licenses.js +5 -1
- package/dist/tests/core/utilities/mocks/licenses.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +19 -8
- package/src/cache/tests/writethrough.spec.ts +1 -5
- package/src/constants/db.ts +1 -1
- package/src/constants/misc.ts +1 -0
- package/src/db/couch/DatabaseImpl.ts +10 -4
- package/src/db/couch/connections.ts +8 -8
- package/src/db/couch/utils.ts +15 -1
- package/src/environment.ts +1 -1
- package/src/index.ts +1 -0
- package/src/logging/pino/logger.ts +1 -0
- package/src/redis/init.ts +14 -4
- package/src/redis/redis.ts +25 -7
- package/src/redis/redlockImpl.ts +24 -15
- package/src/redis/utils.ts +3 -2
- package/src/utils/tests/utils.spec.ts +82 -0
- package/src/utils/utils.ts +18 -10
- package/tests/core/utilities/mocks/licenses.ts +4 -0
- package/tsconfig.json +3 -8
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.24-alpha.0",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -15,8 +15,6 @@
|
|
|
15
15
|
"prebuild": "rimraf dist/",
|
|
16
16
|
"prepack": "cp package.json dist",
|
|
17
17
|
"build": "tsc -p tsconfig.build.json",
|
|
18
|
-
"build:pro": "../../scripts/pro/build.sh",
|
|
19
|
-
"postbuild": "yarn run build:pro",
|
|
20
18
|
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
|
|
21
19
|
"test": "bash scripts/test.sh",
|
|
22
20
|
"test:watch": "jest --watchAll"
|
|
@@ -24,7 +22,7 @@
|
|
|
24
22
|
"dependencies": {
|
|
25
23
|
"@budibase/nano": "10.1.2",
|
|
26
24
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
27
|
-
"@budibase/types": "
|
|
25
|
+
"@budibase/types": "2.6.24-alpha.0",
|
|
28
26
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
29
27
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
30
28
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -35,7 +33,7 @@
|
|
|
35
33
|
"correlation-id": "4.0.0",
|
|
36
34
|
"dotenv": "16.0.1",
|
|
37
35
|
"emitter-listener": "1.1.2",
|
|
38
|
-
"ioredis": "
|
|
36
|
+
"ioredis": "5.3.2",
|
|
39
37
|
"joi": "17.6.0",
|
|
40
38
|
"jsonwebtoken": "9.0.0",
|
|
41
39
|
"koa-passport": "4.1.4",
|
|
@@ -64,7 +62,6 @@
|
|
|
64
62
|
"@swc/jest": "^0.2.24",
|
|
65
63
|
"@trendyol/jest-testcontainers": "^2.1.1",
|
|
66
64
|
"@types/chance": "1.1.3",
|
|
67
|
-
"@types/ioredis": "4.28.0",
|
|
68
65
|
"@types/jest": "29.5.0",
|
|
69
66
|
"@types/koa": "2.13.4",
|
|
70
67
|
"@types/lodash": "4.14.180",
|
|
@@ -76,7 +73,7 @@
|
|
|
76
73
|
"@types/tar-fs": "2.0.1",
|
|
77
74
|
"@types/uuid": "8.3.4",
|
|
78
75
|
"chance": "1.1.8",
|
|
79
|
-
"ioredis-mock": "
|
|
76
|
+
"ioredis-mock": "8.7.0",
|
|
80
77
|
"jest": "29.5.0",
|
|
81
78
|
"jest-environment-node": "29.5.0",
|
|
82
79
|
"jest-serial-runner": "^1.2.1",
|
|
@@ -90,5 +87,19 @@
|
|
|
90
87
|
"tsconfig-paths": "4.0.0",
|
|
91
88
|
"typescript": "4.7.3"
|
|
92
89
|
},
|
|
93
|
-
"
|
|
90
|
+
"nx": {
|
|
91
|
+
"targets": {
|
|
92
|
+
"build": {
|
|
93
|
+
"dependsOn": [
|
|
94
|
+
{
|
|
95
|
+
"projects": [
|
|
96
|
+
"@budibase/types"
|
|
97
|
+
],
|
|
98
|
+
"target": "build"
|
|
99
|
+
}
|
|
100
|
+
]
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
"gitHead": "71a9558d12c55e7d9ef87b82995c62497662acf8"
|
|
94
105
|
}
|
|
@@ -19,7 +19,7 @@ export declare enum ViewName {
|
|
|
19
19
|
AUTOMATION_LOGS = "automation_logs",
|
|
20
20
|
ACCOUNT_BY_EMAIL = "account_by_email",
|
|
21
21
|
PLATFORM_USERS_LOWERCASE = "platform_users_lowercase",
|
|
22
|
-
USER_BY_GROUP = "
|
|
22
|
+
USER_BY_GROUP = "user_by_group",
|
|
23
23
|
APP_BACKUP_BY_TRIGGER = "by_trigger"
|
|
24
24
|
}
|
|
25
25
|
export declare const DeprecatedViews: {
|
package/dist/src/constants/db.js
CHANGED
|
@@ -24,7 +24,7 @@ var ViewName;
|
|
|
24
24
|
ViewName["AUTOMATION_LOGS"] = "automation_logs";
|
|
25
25
|
ViewName["ACCOUNT_BY_EMAIL"] = "account_by_email";
|
|
26
26
|
ViewName["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase";
|
|
27
|
-
ViewName["USER_BY_GROUP"] = "
|
|
27
|
+
ViewName["USER_BY_GROUP"] = "user_by_group";
|
|
28
28
|
ViewName["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
|
|
29
29
|
})(ViewName = exports.ViewName || (exports.ViewName = {}));
|
|
30
30
|
exports.DeprecatedViews = {
|
|
@@ -14,6 +14,7 @@ export declare enum Header {
|
|
|
14
14
|
LICENSE_KEY = "x-budibase-license-key",
|
|
15
15
|
API_VER = "x-budibase-api-version",
|
|
16
16
|
APP_ID = "x-budibase-app-id",
|
|
17
|
+
SESSION_ID = "x-budibase-session-id",
|
|
17
18
|
TYPE = "x-budibase-type",
|
|
18
19
|
PREVIEW_ROLE = "x-budibase-role",
|
|
19
20
|
TENANT_ID = "x-budibase-tenant-id",
|
|
@@ -20,6 +20,7 @@ var Header;
|
|
|
20
20
|
Header["LICENSE_KEY"] = "x-budibase-license-key";
|
|
21
21
|
Header["API_VER"] = "x-budibase-api-version";
|
|
22
22
|
Header["APP_ID"] = "x-budibase-app-id";
|
|
23
|
+
Header["SESSION_ID"] = "x-budibase-session-id";
|
|
23
24
|
Header["TYPE"] = "x-budibase-type";
|
|
24
25
|
Header["PREVIEW_ROLE"] = "x-budibase-role";
|
|
25
26
|
Header["TENANT_ID"] = "x-budibase-tenant-id";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/constants/misc.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,mCAAqB,CAAA;AACvB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAED,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,2DAAiD,CAAA;IACjD,oDAA0C,CAAA;IAC1C,8CAAoC,CAAA;AACtC,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAED,IAAY,MAaX;AAbD,WAAY,MAAM;IAChB,wCAA8B,CAAA;IAC9B,gDAAsC,CAAA;IACtC,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,8CAAoC,CAAA;IACpC,kCAAwB,CAAA;IACxB,0CAAgC,CAAA;IAChC,4CAAkC,CAAA;IAClC,oCAA0B,CAAA;IAC1B,qCAA2B,CAAA;IAC3B,sDAA4C,CAAA;IAC5C,yCAA+B,CAAA;AACjC,CAAC,EAbW,MAAM,GAAN,cAAM,KAAN,cAAM,QAajB;AAED,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,6BAAe,CAAA;IACf,iCAAmB,CAAA;IACnB,qDAAuC,CAAA;AACzC,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB;AAED,IAAY,MAQX;AARD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,6BAAmB,CAAA;IACnB,uBAAa,CAAA;IACb,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,mCAAyB,CAAA;IACzB,uBAAa,CAAA;AACf,CAAC,EARW,MAAM,GAAN,cAAM,KAAN,cAAM,QAQjB;AAEY,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,CAAC,aAAa,CAAC,CAAA;AACzC,QAAA,cAAc,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAA;AACxC,QAAA,iBAAiB,GAAG,SAAS,CAAA"}
|
|
@@ -9,6 +9,7 @@ export declare class DatabaseImpl implements Database {
|
|
|
9
9
|
private static nano;
|
|
10
10
|
private readonly instanceNano?;
|
|
11
11
|
private readonly pouchOpts;
|
|
12
|
+
private readonly couchInfo;
|
|
12
13
|
constructor(dbName?: string, opts?: DatabaseOpts, connection?: string);
|
|
13
14
|
static init(): void;
|
|
14
15
|
exists(): Promise<boolean>;
|
|
@@ -39,14 +39,15 @@ function DatabaseWithConnection(dbName, connection, opts) {
|
|
|
39
39
|
exports.DatabaseWithConnection = DatabaseWithConnection;
|
|
40
40
|
class DatabaseImpl {
|
|
41
41
|
constructor(dbName, opts, connection) {
|
|
42
|
+
this.couchInfo = (0, connections_1.getCouchInfo)();
|
|
42
43
|
if (dbName == null) {
|
|
43
44
|
throw new Error("Database name cannot be undefined.");
|
|
44
45
|
}
|
|
45
46
|
this.name = dbName;
|
|
46
47
|
this.pouchOpts = opts || {};
|
|
47
48
|
if (connection) {
|
|
48
|
-
|
|
49
|
-
this.instanceNano = buildNano(couchInfo);
|
|
49
|
+
this.couchInfo = (0, connections_1.getCouchInfo)(connection);
|
|
50
|
+
this.instanceNano = buildNano(this.couchInfo);
|
|
50
51
|
}
|
|
51
52
|
if (!DatabaseImpl.nano) {
|
|
52
53
|
DatabaseImpl.init();
|
|
@@ -58,7 +59,11 @@ class DatabaseImpl {
|
|
|
58
59
|
}
|
|
59
60
|
exists() {
|
|
60
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
|
|
62
|
+
const response = yield (0, utils_1.directCouchUrlCall)({
|
|
63
|
+
url: `${this.couchInfo.url}/${this.name}`,
|
|
64
|
+
method: "HEAD",
|
|
65
|
+
cookie: this.couchInfo.cookie,
|
|
66
|
+
});
|
|
62
67
|
return response.status === 200;
|
|
63
68
|
});
|
|
64
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAiC;AACjC,2CAWwB;AACxB,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"DatabaseImpl.js","sourceRoot":"","sources":["../../../../src/db/couch/DatabaseImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAiC;AACjC,2CAWwB;AACxB,+CAA4C;AAC5C,mCAA4C;AAC5C,uCAAsC;AAEtC,8CAA0C;AAE1C,SAAS,SAAS,CAAC,SAA0C;IAC3D,OAAO,IAAA,cAAI,EAAC;QACV,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,eAAe,EAAE;YACf,OAAO,EAAE;gBACP,aAAa,EAAE,SAAS,CAAC,MAAM;aAChC;SACF;QACD,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,sBAAsB,CACpC,MAAc,EACd,UAAkB,EAClB,IAAmB;IAEnB,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;KACnD;IACD,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;AACnD,CAAC;AATD,wDASC;AAED,MAAa,YAAY;IAQvB,YAAY,MAAe,EAAE,IAAmB,EAAE,UAAmB;QAFpD,cAAS,GAAG,IAAA,0BAAY,GAAE,CAAA;QAGzC,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAC3B,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,SAAS,GAAG,IAAA,0BAAY,EAAC,UAAU,CAAC,CAAA;YACzC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SAC9C;QACD,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;YACtB,YAAY,CAAC,IAAI,EAAE,CAAA;SACpB;IACH,CAAC;IAED,MAAM,CAAC,IAAI;QACT,MAAM,SAAS,GAAG,IAAA,0BAAY,GAAE,CAAA;QAChC,YAAY,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;IAC1C,CAAC;IAEK,MAAM;;YACV,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAkB,EAAC;gBACxC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;gBACzC,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;aAC9B,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAA;QAChC,CAAC;KAAA;IAEO,IAAI;QACV,OAAO,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,IAAI,CAAA;IAC/C,CAAC;IAEK,UAAU;;;YACd,IAAI,YAAY,GAAG,CAAC,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,UAAU,CAAA,CAAA;YAC9C,wCAAwC;YACxC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;YAChC,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;aACrC;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI;oBACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBACvC;gBAAC,OAAO,GAAQ,EAAE;oBACjB,2BAA2B;oBAC3B,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;wBAC1B,MAAM,GAAG,CAAA;qBACV;iBACF;aACF;YACD,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;;KACrC;IAEa,YAAY,CAAC,GAAQ;;YACjC,IAAI;gBACF,OAAO,MAAM,GAAG,EAAE,CAAA;aACnB;YAAC,OAAO,GAAQ,EAAE;gBACjB,IAAI,GAAG,CAAC,UAAU,EAAE;oBAClB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,CAAA;iBAC5B;gBACD,MAAM,GAAG,CAAA;aACV;QACH,CAAC;KAAA;IAEK,GAAG,CAAI,EAAW;;YACtB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,IAAI,CAAC,EAAE,EAAE;gBACP,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;aAC1D;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QAC5C,CAAC;KAAA;IAEK,MAAM,CAAC,OAA0B,EAAE,GAAY;;YACnD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,IAAI,GAAW,CAAA;YACf,IAAI,IAAY,CAAA;YAEhB,IAAI,IAAA,kBAAU,EAAC,OAAO,CAAC,EAAE;gBACvB,GAAG,GAAG,OAAO,CAAC,GAAI,CAAA;gBAClB,IAAI,GAAG,OAAO,CAAC,IAAK,CAAA;aACrB;iBAAM;gBACL,GAAG,GAAG,OAAO,CAAA;gBACb,IAAI,GAAG,GAAI,CAAA;aACZ;YAED,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;aACtE;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;QACvD,CAAC;KAAA;IAEK,IAAI,CAAC,QAAqB,EAAE,IAAsB;;YACtD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;gBACjB,QAAQ,CAAC,GAAG,GAAG,IAAA,aAAK,GAAE,CAAA;aACvB;YACD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACjC,CAAC;KAAA;IAEK,GAAG,CAAC,QAAqB,EAAE,IAAsB;;YACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;aAC5D;YACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;gBACvB,QAAQ,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;aAC9C;YACD,QAAQ,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YAC7C,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,QAAQ,CAAC,GAAG,EAAE;gBAC/B,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;oBAC7C,IAAI,QAAQ,EAAE;wBACZ,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;qBAC9B;iBACF;gBAAC,OAAO,GAAQ,EAAE;oBACjB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;wBACtB,MAAM,GAAG,CAAA;qBACV;iBACF;aACF;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;QACrD,CAAC;KAAA;IAEK,QAAQ,CAAC,SAAwB;;YACrC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAC9D,CAAC;KAAA;IAEK,OAAO,CAAI,MAAyB;;YACxC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QACjD,CAAC;KAAA;IAEK,KAAK,CACT,QAAgB,EAChB,MAAyB;;YAEzB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5C,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;QACjE,CAAC;KAAA;IAEK,OAAO;;YACX,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAQ,EAAE;gBACjB,4BAA4B;gBAC5B,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;oBAC1B,OAAM;iBACP;qBAAM;oBACL,sCAAW,GAAG,KAAE,MAAM,EAAE,GAAG,CAAC,UAAU,IAAE;iBACzC;aACF;QACH,CAAC;KAAA;IAEK,OAAO;;YACX,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAClC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;QAC9C,CAAC;KAAA;IAED,qEAAqE;IACrE,oDAAoD;IAC9C,IAAI,CAAC,MAAmB,EAAE,IAAuB;;YACrD,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,aAAa;YACb,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACjC,CAAC;KAAA;IAEK,IAAI,CAAC,MAAkB;;YAC3B,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,aAAa;YACb,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;KAAA;IAEK,WAAW,CAAC,IAA6B;;YAC7C,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;KAAA;IAEK,WAAW,CAAC,IAA6B;;YAC7C,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;KAAA;IAEK,UAAU;;YACd,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnC,OAAO,KAAK,CAAC,UAAU,EAAE,CAAA;QAC3B,CAAC;KAAA;CACF;AAnMD,oCAmMC"}
|
|
@@ -6,28 +6,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getUrlInfo = exports.getCouchInfo = void 0;
|
|
7
7
|
const environment_1 = __importDefault(require("../../environment"));
|
|
8
8
|
const getCouchInfo = (connection) => {
|
|
9
|
+
var _a, _b;
|
|
9
10
|
const urlInfo = (0, exports.getUrlInfo)(connection);
|
|
10
11
|
let username;
|
|
11
12
|
let password;
|
|
12
|
-
if (
|
|
13
|
-
// set from env
|
|
14
|
-
username = environment_1.default.COUCH_DB_USERNAME;
|
|
15
|
-
}
|
|
16
|
-
else if (urlInfo.auth.username) {
|
|
13
|
+
if ((_a = urlInfo.auth) === null || _a === void 0 ? void 0 : _a.username) {
|
|
17
14
|
// set from url
|
|
18
15
|
username = urlInfo.auth.username;
|
|
19
16
|
}
|
|
17
|
+
else if (environment_1.default.COUCH_DB_USERNAME) {
|
|
18
|
+
// set from env
|
|
19
|
+
username = environment_1.default.COUCH_DB_USERNAME;
|
|
20
|
+
}
|
|
20
21
|
else if (!environment_1.default.isTest()) {
|
|
21
22
|
throw new Error("CouchDB username not set");
|
|
22
23
|
}
|
|
23
|
-
if (
|
|
24
|
-
// set from env
|
|
25
|
-
password = environment_1.default.COUCH_DB_PASSWORD;
|
|
26
|
-
}
|
|
27
|
-
else if (urlInfo.auth.password) {
|
|
24
|
+
if ((_b = urlInfo.auth) === null || _b === void 0 ? void 0 : _b.password) {
|
|
28
25
|
// set from url
|
|
29
26
|
password = urlInfo.auth.password;
|
|
30
27
|
}
|
|
28
|
+
else if (environment_1.default.COUCH_DB_PASSWORD) {
|
|
29
|
+
// set from env
|
|
30
|
+
password = environment_1.default.COUCH_DB_PASSWORD;
|
|
31
|
+
}
|
|
31
32
|
else if (!environment_1.default.isTest()) {
|
|
32
33
|
throw new Error("CouchDB password not set");
|
|
33
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../../src/db/couch/connections.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAmC;AAE5B,MAAM,YAAY,GAAG,CAAC,UAAmB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../../src/db/couch/connections.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,8 @@
|
|
|
1
1
|
export declare function directCouchCall(path: string, method?: string, body?: any): Promise<import("node-fetch").Response>;
|
|
2
|
+
export declare function directCouchUrlCall({ url, cookie, method, body, }: {
|
|
3
|
+
url: string;
|
|
4
|
+
cookie: string;
|
|
5
|
+
method: string;
|
|
6
|
+
body?: any;
|
|
7
|
+
}): Promise<import("node-fetch").Response>;
|
|
2
8
|
export declare function directCouchQuery(path: string, method?: string, body?: any): Promise<any>;
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.directCouchQuery = exports.directCouchCall = void 0;
|
|
15
|
+
exports.directCouchQuery = exports.directCouchUrlCall = exports.directCouchCall = void 0;
|
|
16
16
|
const connections_1 = require("./connections");
|
|
17
17
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
18
18
|
const helpers_1 = require("../../helpers");
|
|
@@ -20,6 +20,12 @@ function directCouchCall(path, method = "GET", body) {
|
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
let { url, cookie } = (0, connections_1.getCouchInfo)();
|
|
22
22
|
const couchUrl = `${url}/${path}`;
|
|
23
|
+
return yield directCouchUrlCall({ url: couchUrl, cookie, method, body });
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.directCouchCall = directCouchCall;
|
|
27
|
+
function directCouchUrlCall({ url, cookie, method, body, }) {
|
|
28
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
29
|
const params = {
|
|
24
30
|
method: method,
|
|
25
31
|
headers: {
|
|
@@ -30,10 +36,10 @@ function directCouchCall(path, method = "GET", body) {
|
|
|
30
36
|
params.body = JSON.stringify(body);
|
|
31
37
|
params.headers["Content-Type"] = "application/json";
|
|
32
38
|
}
|
|
33
|
-
return yield (0, node_fetch_1.default)((0, helpers_1.checkSlashesInUrl)(encodeURI(
|
|
39
|
+
return yield (0, node_fetch_1.default)((0, helpers_1.checkSlashesInUrl)(encodeURI(url)), params);
|
|
34
40
|
});
|
|
35
41
|
}
|
|
36
|
-
exports.
|
|
42
|
+
exports.directCouchUrlCall = directCouchUrlCall;
|
|
37
43
|
function directCouchQuery(path, method = "GET", body) {
|
|
38
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
45
|
const response = yield directCouchCall(path, method, body);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/db/couch/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,4DAA8B;AAC9B,2CAAiD;AAEjD,SAAsB,eAAe,CACnC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,0BAAY,GAAE,CAAA;QACpC,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACjC,MAAM,MAAM,GAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,MAAM;aACtB;SACF,CAAA;QACD,IAAI,IAAI,IAAI,MAAM,KAAK,KAAK,EAAE;YAC5B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;SACpD;QACD,OAAO,MAAM,IAAA,oBAAK,EAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/db/couch/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA4C;AAC5C,4DAA8B;AAC9B,2CAAiD;AAEjD,SAAsB,eAAe,CACnC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,0BAAY,GAAE,CAAA;QACpC,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACjC,OAAO,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1E,CAAC;CAAA;AARD,0CAQC;AAED,SAAsB,kBAAkB,CAAC,EACvC,GAAG,EACH,MAAM,EACN,MAAM,EACN,IAAI,GAML;;QACC,MAAM,MAAM,GAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,MAAM;aACtB;SACF,CAAA;QACD,IAAI,IAAI,IAAI,MAAM,KAAK,KAAK,EAAE;YAC5B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;SACpD;QACD,OAAO,MAAM,IAAA,oBAAK,EAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAC/D,CAAC;CAAA;AAtBD,gDAsBC;AAED,SAAsB,gBAAgB,CACpC,IAAY,EACZ,SAAiB,KAAK,EACtB,IAAU;;QAEV,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1D,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;YACzB,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;aAAM;YACL,MAAM,oCAAoC,CAAA;SAC3C;IACH,CAAC;CAAA;AAXD,4CAWC"}
|
|
@@ -20,7 +20,6 @@ declare const environment: {
|
|
|
20
20
|
REDIS_URL: string;
|
|
21
21
|
REDIS_PASSWORD: string | undefined;
|
|
22
22
|
REDIS_CLUSTERED: string | undefined;
|
|
23
|
-
MOCK_REDIS: string | undefined;
|
|
24
23
|
MINIO_ACCESS_KEY: string | undefined;
|
|
25
24
|
MINIO_SECRET_KEY: string | undefined;
|
|
26
25
|
AWS_REGION: string | undefined;
|
|
@@ -47,6 +46,7 @@ declare const environment: {
|
|
|
47
46
|
GLOBAL_BUCKET_NAME: string;
|
|
48
47
|
PLUGIN_BUCKET_NAME: string;
|
|
49
48
|
USE_COUCH: string | boolean;
|
|
49
|
+
MOCK_REDIS: string | undefined;
|
|
50
50
|
DEFAULT_LICENSE: string | undefined;
|
|
51
51
|
SERVICE: string;
|
|
52
52
|
LOG_LEVEL: string;
|
package/dist/src/environment.js
CHANGED
|
@@ -82,7 +82,6 @@ const environment = {
|
|
|
82
82
|
REDIS_URL: process.env.REDIS_URL || "localhost:6379",
|
|
83
83
|
REDIS_PASSWORD: process.env.REDIS_PASSWORD,
|
|
84
84
|
REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
|
|
85
|
-
MOCK_REDIS: process.env.MOCK_REDIS,
|
|
86
85
|
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
|
|
87
86
|
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
|
|
88
87
|
AWS_REGION: process.env.AWS_REGION,
|
|
@@ -109,6 +108,7 @@ const environment = {
|
|
|
109
108
|
GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
|
|
110
109
|
PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
|
|
111
110
|
USE_COUCH: process.env.USE_COUCH || true,
|
|
111
|
+
MOCK_REDIS: process.env.MOCK_REDIS,
|
|
112
112
|
DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
|
|
113
113
|
SERVICE: process.env.SERVICE || "budibase",
|
|
114
114
|
LOG_LEVEL: process.env.LOG_LEVEL || "info",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":";;AAAA,2BAA6C;AAE7C,SAAS,MAAM;IACb,OAAO,SAAS,EAAE,IAAI,MAAM,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,MAAM;IACb,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC1E,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAA;AAC3C,CAAC;AAED,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAC9C,CAAC;AAED,IAAI,MAAM,GAAG,KAAK,CAAA;AAClB,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;IAC1B,MAAM,GAAG,IAAI,CAAA;CACd;AAED,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,sBAAsB;IAC5B,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;AAE5D,SAAS,mBAAmB;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA,CAAC,+CAA+C;AAC5E,CAAC;AAED,SAAS,WAAW;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS,EAAE;QAC1C,2CAA2C;QAC3C,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;AACjC,CAAC;AAED,SAAS,WAAW;IAClB,SAAS,mBAAmB,CAC1B,QAAgB,EAChB,UAAkB;QAElB,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAA;QAC5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;YACxB,OAAO,QAAQ,CAAA;SAChB;QAED,MAAM,SAAS,GAAG,GAAG,UAAU,KAAK,CAAA;QACpC,IAAI,SAAS,KAAK,UAAU,EAAE;YAC5B,yBAAyB;YACzB,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IACjD,CAAC;IAED,IAAI;QACF,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC1E,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,eAAgB,EAAE,OAAO,CAAC,CAAA;QACvD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;KACnC;IAAC,WAAM;QACN,+EAA+E;QAC/E,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AAED,MAAM,WAAW,GAAG;IAClB,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM,EAAE,GAAG,EAAE;QACX,OAAO,CAAC,KAAK,EAAE,CAAA;IACjB,CAAC;IACD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAC1C,kBAAkB,EAAE,mBAAmB,EAAE;IACzC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IACjE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IAC5C,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAChD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IACpC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,gBAAgB;IACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAC1C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC5C,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":";;AAAA,2BAA6C;AAE7C,SAAS,MAAM;IACb,OAAO,SAAS,EAAE,IAAI,MAAM,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,MAAM;IACb,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AAC1E,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAA;AAC3C,CAAC;AAED,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAC9C,CAAC;AAED,IAAI,MAAM,GAAG,KAAK,CAAA;AAClB,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;IAC1B,MAAM,GAAG,IAAI,CAAA;CACd;AAED,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,sBAAsB;IAC5B,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;AAE5D,SAAS,mBAAmB;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA,CAAC,+CAA+C;AAC5E,CAAC;AAED,SAAS,WAAW;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS,EAAE;QAC1C,2CAA2C;QAC3C,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;AACjC,CAAC;AAED,SAAS,WAAW;IAClB,SAAS,mBAAmB,CAC1B,QAAgB,EAChB,UAAkB;QAElB,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAA;QAC5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;YACxB,OAAO,QAAQ,CAAA;SAChB;QAED,MAAM,SAAS,GAAG,GAAG,UAAU,KAAK,CAAA;QACpC,IAAI,SAAS,KAAK,UAAU,EAAE;YAC5B,yBAAyB;YACzB,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IACjD,CAAC;IAED,IAAI;QACF,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC1E,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,eAAgB,EAAE,OAAO,CAAC,CAAA;QACvD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;KACnC;IAAC,WAAM;QACN,+EAA+E;QAC/E,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AAED,MAAM,WAAW,GAAG;IAClB,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM,EAAE,GAAG,EAAE;QACX,OAAO,CAAC,KAAK,EAAE,CAAA;IACjB,CAAC;IACD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAC1C,kBAAkB,EAAE,mBAAmB,EAAE;IACzC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IACjE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IAC5C,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAChD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IACpC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,gBAAgB;IACpD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAC1C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC5C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC;IAC7C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAChE,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,kBAAkB,EAChB,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,8BAA8B;IAClE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,EAAE;IAChE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;IAC1D,WAAW,EAAE,UAAU;IACvB,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE;IAC5C,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAC1C,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAChE,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;IAC9D,mBAAmB,EACjB,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,iBAAiB,CAAC,OAAO;IAC9D,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,iBAAiB,CAAC,IAAI;IACxE,qBAAqB,EACnB,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,iBAAiB,CAAC,SAAS;IAClE,kBAAkB,EAChB,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,MAAM;IAC5D,kBAAkB,EAChB,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,OAAO;IAC7D,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI;IACxC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC5C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;IAC1C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,MAAM;IAC1C,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;IACxD,sBAAsB,EACpB,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,gBAAgB;IACxD,YAAY,EAAE,WAAW,EAAE;IAC3B,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;IAC9D,OAAO;IACP,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;IACxD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;IAChD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAChD,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACpD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC;;;;OAIG;IACH,2BAA2B,EAAE,UAAU;QACrC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACzC,CAAC,CAAC,KAAK;IACT,OAAO,EAAE,WAAW,EAAE;IACtB,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACpD,IAAI,CAAC,GAAQ,EAAE,KAAU;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACxB,aAAa;QACb,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAC1B,CAAC;CACF,CAAA;AAED,+CAA+C;AAC/C,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;IACpD,iEAAiE;IACjE,IAAI,KAAK,KAAK,GAAG,EAAE;QACjB,aAAa;QACb,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KACrB;IACD,qEAAqE;IACrE,IAAI,KAAK,KAAK,OAAO,EAAE;QACrB,aAAa;QACb,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KACrB;CACF;AAED,kBAAe,WAAW,CAAA"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export * as context from "./context";
|
|
|
21
21
|
export * as cache from "./cache";
|
|
22
22
|
export * as objectStore from "./objectStore";
|
|
23
23
|
export * as redis from "./redis";
|
|
24
|
+
export { Client as RedisClient } from "./redis";
|
|
24
25
|
export * as locks from "./redis/redlockImpl";
|
|
25
26
|
export * as utils from "./utils";
|
|
26
27
|
export * as errors from "./errors";
|
package/dist/src/index.js
CHANGED
|
@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.init = exports.tenancy = exports.docUpdates = exports.blacklist = exports.env = exports.timers = exports.errors = exports.utils = exports.locks = exports.redis = exports.objectStore = exports.cache = exports.context = exports.db = exports.queue = exports.encryption = exports.plugins = exports.middleware = exports.logging = exports.constants = exports.auth = exports.platform = exports.sessions = exports.featureFlags = exports.installation = exports.accounts = exports.permissions = exports.roles = exports.users = exports.migrations = exports.events = exports.configs = void 0;
|
|
32
|
+
exports.init = exports.tenancy = exports.docUpdates = exports.blacklist = exports.env = exports.timers = exports.errors = exports.utils = exports.locks = exports.RedisClient = exports.redis = exports.objectStore = exports.cache = exports.context = exports.db = exports.queue = exports.encryption = exports.plugins = exports.middleware = exports.logging = exports.constants = exports.auth = exports.platform = exports.sessions = exports.featureFlags = exports.installation = exports.accounts = exports.permissions = exports.roles = exports.users = exports.migrations = exports.events = exports.configs = void 0;
|
|
33
33
|
exports.configs = __importStar(require("./configs"));
|
|
34
34
|
exports.events = __importStar(require("./events"));
|
|
35
35
|
exports.migrations = __importStar(require("./migrations"));
|
|
@@ -53,6 +53,8 @@ exports.context = __importStar(require("./context"));
|
|
|
53
53
|
exports.cache = __importStar(require("./cache"));
|
|
54
54
|
exports.objectStore = __importStar(require("./objectStore"));
|
|
55
55
|
exports.redis = __importStar(require("./redis"));
|
|
56
|
+
var redis_1 = require("./redis");
|
|
57
|
+
Object.defineProperty(exports, "RedisClient", { enumerable: true, get: function () { return redis_1.Client; } });
|
|
56
58
|
exports.locks = __importStar(require("./redis/redlockImpl"));
|
|
57
59
|
exports.utils = __importStar(require("./utils"));
|
|
58
60
|
exports.errors = __importStar(require("./errors"));
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC;AACpC,mDAAkC;AAClC,2DAA0C;AAC1C,iDAAgC;AAChC,0DAAyC;AACzC,sEAAqD;AACrD,uDAAsC;AACtC,+DAA8C;AAC9C,+DAA8C;AAC9C,gEAA+C;AAC/C,uDAAsC;AACtC,+CAA8B;AAC9B,yDAAwC;AACxC,qDAAoC;AACpC,2DAA0C;AAC1C,oDAAmC;AACnC,oEAAmD;AACnD,iDAAgC;AAChC,2CAA0B;AAC1B,qDAAoC;AACpC,iDAAgC;AAChC,6DAA4C;AAC5C,iDAAgC;AAChC,6DAA4C;AAC5C,iDAAgC;AAChC,mDAAkC;AAClC,mDAAkC;AAClC,6CAA8C;AAArC,mHAAA,OAAO,OAAO;AACvB,yDAAwC;AACxC,2DAA0C;AAE1C,qDAAqD;AACrD,uDAAuD;AACvD,wBAAwB;AACxB,mDAAoC;AACpC,oDAAqC;AACxB,QAAA,OAAO,mCACf,QAAQ,GACR,OAAO,EACX;AAED,gCAAgC;AAChC,2CAAwB;AAExB,4BAA4B;AAC5B,8CAA2B;AAE3B,+BAA+B;AAC/B,yCAA0B;AACnB,MAAM,IAAI,GAAG,CAAC,OAAY,EAAE,EAAE,EAAE;IACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAClB,CAAC,CAAA;AAFY,QAAA,IAAI,QAEhB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC;AACpC,mDAAkC;AAClC,2DAA0C;AAC1C,iDAAgC;AAChC,0DAAyC;AACzC,sEAAqD;AACrD,uDAAsC;AACtC,+DAA8C;AAC9C,+DAA8C;AAC9C,gEAA+C;AAC/C,uDAAsC;AACtC,+CAA8B;AAC9B,yDAAwC;AACxC,qDAAoC;AACpC,2DAA0C;AAC1C,oDAAmC;AACnC,oEAAmD;AACnD,iDAAgC;AAChC,2CAA0B;AAC1B,qDAAoC;AACpC,iDAAgC;AAChC,6DAA4C;AAC5C,iDAAgC;AAChC,iCAA+C;AAAtC,oGAAA,MAAM,OAAe;AAC9B,6DAA4C;AAC5C,iDAAgC;AAChC,mDAAkC;AAClC,mDAAkC;AAClC,6CAA8C;AAArC,mHAAA,OAAO,OAAO;AACvB,yDAAwC;AACxC,2DAA0C;AAE1C,qDAAqD;AACrD,uDAAuD;AACvD,wBAAwB;AACxB,mDAAoC;AACpC,oDAAqC;AACxB,QAAA,OAAO,mCACf,QAAQ,GACR,OAAO,EACX;AAED,gCAAgC;AAChC,2CAAwB;AAExB,4BAA4B;AAC5B,8CAA2B;AAE3B,+BAA+B;AAC/B,yCAA0B;AACnB,MAAM,IAAI,GAAG,CAAC,OAAY,EAAE,EAAE,EAAE;IACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAClB,CAAC,CAAA;AAFY,QAAA,IAAI,QAEhB"}
|
|
@@ -96,7 +96,7 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
|
96
96
|
correlationId: correlation.getId(),
|
|
97
97
|
};
|
|
98
98
|
}
|
|
99
|
-
const mergingObject = Object.assign({ err: error }, contextObject);
|
|
99
|
+
const mergingObject = Object.assign({ err: error, pid: process.pid }, contextObject);
|
|
100
100
|
if (objects.length) {
|
|
101
101
|
// init generic data object for params supplied that don't have a
|
|
102
102
|
// '_logKey' field. This prints an object using argument index as the key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAmC;AACnC,gDAA0C;AAC1C,uDAAwC;AACxC,4DAA6C;AAE7C,oCAAsC;AAEtC,SAAS;AAET,IAAI,YAAqC,CAAA;AACzC,IAAI,CAAC,qBAAG,CAAC,mBAAmB,EAAE;IAC5B,MAAM,WAAW,GAAkB;QACjC,KAAK,EAAE,qBAAG,CAAC,SAAS;QACpB,UAAU,EAAE;YACV,KAAK,EAAE,KAAK,CAAC,EAAE;gBACb,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAA;YACvC,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,EAAE,CAAA;YACX,CAAC;SACF;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,GAAG;KACxE,CAAA;IAED,IAAI,qBAAG,CAAC,KAAK,EAAE,EAAE;QACf,WAAW,CAAC,SAAS,GAAG;YACtB,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE;gBACP,UAAU,EAAE,IAAI;aACjB;SACF,CAAA;KACF;IAED,YAAY,GAAG,IAAA,cAAI,EAAC,WAAW,CAAC,CAAA;IAehC,SAAS,aAAa,CAAC,GAAQ;QAC7B,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,CAAA;IAC3E,CAAC;IAED,SAAS,OAAO,CAAC,GAAQ;QACvB,OAAO,GAAG,YAAY,KAAK,CAAA;IAC7B,CAAC;IAED,SAAS,SAAS,CAAC,GAAQ;QACzB,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAA;IAChC,CAAC;IAED;;;OAGG;IACH,SAAS,YAAY,CAAC,IAAW;QAC/B,IAAI,KAAK,GAAG,SAAS,CAAA;QACrB,IAAI,OAAO,GAAU,EAAE,CAAA;QACvB,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjB,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE;gBAClB,OAAO,GAAG,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;aAC1C;YACD,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;gBACtB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aAClB;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;gBAChB,KAAK,GAAG,GAAG,CAAA;aACZ;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;QAE9B,IAAI,aAAa,GAAG,EAAE,CAAA;QAEtB,IAAI,mBAAW,EAAE;YACf,aAAa,GAAG;gBACd,QAAQ,EAAE,WAAW,EAAE;gBACvB,KAAK,EAAE,QAAQ,EAAE;gBACjB,YAAY,EAAE,eAAe,EAAE;gBAC/B,UAAU,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG;gBACzB,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;gBAC5B,aAAa,EAAE,WAAW,CAAC,KAAK,EAAE;aACnC,CAAA;SACF;QAED,MAAM,aAAa,mBACjB,GAAG,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/src/redis/init.d.ts
CHANGED
|
@@ -6,3 +6,4 @@ export declare function getAppClient(): Promise<Client>;
|
|
|
6
6
|
export declare function getCacheClient(): Promise<Client>;
|
|
7
7
|
export declare function getWritethroughClient(): Promise<Client>;
|
|
8
8
|
export declare function getLockClient(): Promise<Client>;
|
|
9
|
+
export declare function getSocketClient(): Promise<Client>;
|
package/dist/src/redis/init.js
CHANGED
|
@@ -35,10 +35,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.getLockClient = exports.getWritethroughClient = exports.getCacheClient = exports.getAppClient = exports.getSessionClient = exports.getUserClient = exports.shutdown = void 0;
|
|
38
|
+
exports.getSocketClient = exports.getLockClient = exports.getWritethroughClient = exports.getCacheClient = exports.getAppClient = exports.getSessionClient = exports.getUserClient = exports.shutdown = void 0;
|
|
39
39
|
const redis_1 = __importDefault(require("./redis"));
|
|
40
40
|
const utils = __importStar(require("./utils"));
|
|
41
|
-
let userClient, sessionClient, appClient, cacheClient, writethroughClient, lockClient;
|
|
41
|
+
let userClient, sessionClient, appClient, cacheClient, writethroughClient, lockClient, socketClient;
|
|
42
42
|
function init() {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
44
|
userClient = yield new redis_1.default(utils.Databases.USER_CACHE).init();
|
|
@@ -46,7 +46,8 @@ function init() {
|
|
|
46
46
|
appClient = yield new redis_1.default(utils.Databases.APP_METADATA).init();
|
|
47
47
|
cacheClient = yield new redis_1.default(utils.Databases.GENERIC_CACHE).init();
|
|
48
48
|
lockClient = yield new redis_1.default(utils.Databases.LOCKS).init();
|
|
49
|
-
writethroughClient = yield new redis_1.default(utils.Databases.WRITE_THROUGH
|
|
49
|
+
writethroughClient = yield new redis_1.default(utils.Databases.WRITE_THROUGH).init();
|
|
50
|
+
socketClient = yield new redis_1.default(utils.Databases.SOCKET_IO, utils.SelectableDatabase.SOCKET_IO).init();
|
|
50
51
|
});
|
|
51
52
|
}
|
|
52
53
|
function shutdown() {
|
|
@@ -63,6 +64,8 @@ function shutdown() {
|
|
|
63
64
|
yield writethroughClient.finish();
|
|
64
65
|
if (lockClient)
|
|
65
66
|
yield lockClient.finish();
|
|
67
|
+
if (socketClient)
|
|
68
|
+
yield socketClient.finish();
|
|
66
69
|
});
|
|
67
70
|
}
|
|
68
71
|
exports.shutdown = shutdown;
|
|
@@ -123,4 +126,13 @@ function getLockClient() {
|
|
|
123
126
|
});
|
|
124
127
|
}
|
|
125
128
|
exports.getLockClient = getLockClient;
|
|
129
|
+
function getSocketClient() {
|
|
130
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
131
|
+
if (!socketClient) {
|
|
132
|
+
yield init();
|
|
133
|
+
}
|
|
134
|
+
return socketClient;
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
exports.getSocketClient = getSocketClient;
|
|
126
138
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,+CAAgC;AAEhC,IAAI,UAAkB,EACpB,aAAqB,EACrB,SAAiB,EACjB,WAAmB,EACnB,kBAA0B,EAC1B,UAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,+CAAgC;AAEhC,IAAI,UAAkB,EACpB,aAAqB,EACrB,SAAiB,EACjB,WAAmB,EACnB,kBAA0B,EAC1B,UAAkB,EAClB,YAAoB,CAAA;AAEtB,SAAe,IAAI;;QACjB,UAAU,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;QAChE,aAAa,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;QACjE,SAAS,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAA;QACjE,WAAW,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;QACpE,UAAU,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3D,kBAAkB,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3E,YAAY,GAAG,MAAM,IAAI,eAAM,CAC7B,KAAK,CAAC,SAAS,CAAC,SAAS,EACzB,KAAK,CAAC,kBAAkB,CAAC,SAAS,CACnC,CAAC,IAAI,EAAE,CAAA;IACV,CAAC;CAAA;AAED,SAAsB,QAAQ;;QAC5B,IAAI,UAAU;YAAE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAA;QACzC,IAAI,aAAa;YAAE,MAAM,aAAa,CAAC,MAAM,EAAE,CAAA;QAC/C,IAAI,SAAS;YAAE,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;QACvC,IAAI,WAAW;YAAE,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA;QAC3C,IAAI,kBAAkB;YAAE,MAAM,kBAAkB,CAAC,MAAM,EAAE,CAAA;QACzD,IAAI,UAAU;YAAE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAA;QACzC,IAAI,YAAY;YAAE,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;IAC/C,CAAC;CAAA;AARD,4BAQC;AAED,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAS,EAAE;IAC5B,MAAM,QAAQ,EAAE,CAAA;AAClB,CAAC,CAAA,CAAC,CAAA;AAEF,SAAsB,aAAa;;QACjC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;CAAA;AALD,sCAKC;AAED,SAAsB,gBAAgB;;QACpC,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,aAAa,CAAA;IACtB,CAAC;CAAA;AALD,4CAKC;AAED,SAAsB,YAAY;;QAChC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;CAAA;AALD,oCAKC;AAED,SAAsB,cAAc;;QAClC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;CAAA;AALD,wCAKC;AAED,SAAsB,qBAAqB;;QACzC,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,kBAAkB,CAAA;IAC3B,CAAC;CAAA;AALD,sDAKC;AAED,SAAsB,aAAa;;QACjC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;CAAA;AALD,sCAKC;AAED,SAAsB,eAAe;;QACnC,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,EAAE,CAAA;SACb;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;CAAA;AALD,0CAKC"}
|
|
@@ -7,6 +7,7 @@ declare class RedisWrapper {
|
|
|
7
7
|
finish(): Promise<void>;
|
|
8
8
|
scan(key?: string): Promise<any>;
|
|
9
9
|
keys(pattern: string): Promise<any>;
|
|
10
|
+
exists(key: string): Promise<any>;
|
|
10
11
|
get(key: string): Promise<any>;
|
|
11
12
|
bulkGet(keys: string[]): Promise<any>;
|
|
12
13
|
store(key: string, value: any, expirySeconds?: number | null): Promise<void>;
|
package/dist/src/redis/redis.js
CHANGED
|
@@ -36,8 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const environment_1 = __importDefault(require("../environment"));
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
const ioredis_1 = __importDefault(require("ioredis"));
|
|
40
|
+
// mock-redis doesn't have any typing
|
|
41
|
+
let MockRedis;
|
|
42
|
+
if (environment_1.default.MOCK_REDIS) {
|
|
43
|
+
try {
|
|
44
|
+
// ioredis mock is all in memory
|
|
45
|
+
MockRedis = require("ioredis-mock");
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
console.log("Mock redis unavailable");
|
|
49
|
+
}
|
|
50
|
+
}
|
|
41
51
|
const utils_1 = require("./utils");
|
|
42
52
|
const timers = __importStar(require("../timers"));
|
|
43
53
|
const RETRY_PERIOD_MS = 2000;
|
|
@@ -47,6 +57,7 @@ const DEFAULT_SELECT_DB = utils_1.SelectableDatabase.DEFAULT;
|
|
|
47
57
|
// for testing just generate the client once
|
|
48
58
|
let CLOSED = false;
|
|
49
59
|
let CLIENTS = {};
|
|
60
|
+
0;
|
|
50
61
|
let CONNECTED = false;
|
|
51
62
|
// mock redis always connected
|
|
52
63
|
if (environment_1.default.MOCK_REDIS) {
|
|
@@ -75,6 +86,7 @@ function connectionError(selectDb, timeout, err) {
|
|
|
75
86
|
* will return the ioredis client which will be ready to use.
|
|
76
87
|
*/
|
|
77
88
|
function init(selectDb = DEFAULT_SELECT_DB) {
|
|
89
|
+
const RedisCore = environment_1.default.MOCK_REDIS && MockRedis ? MockRedis : ioredis_1.default;
|
|
78
90
|
let timeout;
|
|
79
91
|
CLOSED = false;
|
|
80
92
|
let client = pickClient(selectDb);
|
|
@@ -84,7 +96,7 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
84
96
|
}
|
|
85
97
|
// testing uses a single in memory client
|
|
86
98
|
if (environment_1.default.MOCK_REDIS) {
|
|
87
|
-
CLIENTS[selectDb] = new
|
|
99
|
+
CLIENTS[selectDb] = new RedisCore((0, utils_1.getRedisOptions)());
|
|
88
100
|
}
|
|
89
101
|
// start the timer - only allowed 5 seconds to connect
|
|
90
102
|
timeout = setTimeout(() => {
|
|
@@ -98,13 +110,13 @@ function init(selectDb = DEFAULT_SELECT_DB) {
|
|
|
98
110
|
}
|
|
99
111
|
const { redisProtocolUrl, opts, host, port } = (0, utils_1.getRedisOptions)();
|
|
100
112
|
if (CLUSTERED) {
|
|
101
|
-
client = new
|
|
113
|
+
client = new RedisCore.Cluster([{ host, port }], opts);
|
|
102
114
|
}
|
|
103
115
|
else if (redisProtocolUrl) {
|
|
104
|
-
client = new
|
|
116
|
+
client = new RedisCore(redisProtocolUrl);
|
|
105
117
|
}
|
|
106
118
|
else {
|
|
107
|
-
client = new
|
|
119
|
+
client = new RedisCore(opts);
|
|
108
120
|
}
|
|
109
121
|
// attach handlers
|
|
110
122
|
client.on("end", (err) => {
|
|
@@ -192,6 +204,9 @@ class RedisWrapper {
|
|
|
192
204
|
CLOSED = false;
|
|
193
205
|
init(this._select);
|
|
194
206
|
yield waitForConnection(this._select);
|
|
207
|
+
if (this._select && !environment_1.default.isTest()) {
|
|
208
|
+
this.getClient().select(this._select);
|
|
209
|
+
}
|
|
195
210
|
return this;
|
|
196
211
|
});
|
|
197
212
|
}
|
|
@@ -222,6 +237,12 @@ class RedisWrapper {
|
|
|
222
237
|
return this.getClient().keys((0, utils_1.addDbPrefix)(db, pattern));
|
|
223
238
|
});
|
|
224
239
|
}
|
|
240
|
+
exists(key) {
|
|
241
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
242
|
+
const db = this._db;
|
|
243
|
+
return yield this.getClient().exists((0, utils_1.addDbPrefix)(db, key));
|
|
244
|
+
});
|
|
245
|
+
}
|
|
225
246
|
get(key) {
|
|
226
247
|
return __awaiter(this, void 0, void 0, function* () {
|
|
227
248
|
const db = this._db;
|