@budibase/backend-core 2.6.18 → 2.6.19-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +3 -5
- package/dist/src/constants/db.d.ts +1 -1
- package/dist/src/constants/db.js +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/logging/pino/logger.js +25 -1
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/src/queue/listeners.js +12 -3
- package/dist/src/queue/listeners.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/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -5
- package/src/constants/db.ts +1 -1
- 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/logging/pino/logger.ts +27 -2
- package/src/queue/listeners.ts +13 -2
- package/src/utils/tests/utils.spec.ts +82 -0
- package/src/utils/utils.ts +18 -10
- 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.19-alpha.1",
|
|
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.19-alpha.1",
|
|
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",
|
|
@@ -90,5 +88,5 @@
|
|
|
90
88
|
"tsconfig-paths": "4.0.0",
|
|
91
89
|
"typescript": "4.7.3"
|
|
92
90
|
},
|
|
93
|
-
"gitHead": "
|
|
91
|
+
"gitHead": "0c1a7f3a6d7229024e20646bd75ab450abf2f9bb"
|
|
94
92
|
}
|
|
@@ -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 = {
|
|
@@ -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"}
|
|
@@ -96,7 +96,31 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
|
|
|
96
96
|
correlationId: correlation.getId(),
|
|
97
97
|
};
|
|
98
98
|
}
|
|
99
|
-
const mergingObject = Object.assign({
|
|
99
|
+
const mergingObject = Object.assign({ err: error }, contextObject);
|
|
100
|
+
if (objects.length) {
|
|
101
|
+
// init generic data object for params supplied that don't have a
|
|
102
|
+
// '_logKey' field. This prints an object using argument index as the key
|
|
103
|
+
// e.g. { 0: {}, 1: {} }
|
|
104
|
+
const data = {};
|
|
105
|
+
let dataIndex = 0;
|
|
106
|
+
for (let i = 0; i < objects.length; i++) {
|
|
107
|
+
const object = objects[i];
|
|
108
|
+
// the object has specified a log key
|
|
109
|
+
// use this instead of generic key
|
|
110
|
+
const logKey = object._logKey;
|
|
111
|
+
if (logKey) {
|
|
112
|
+
delete object._logKey;
|
|
113
|
+
mergingObject[logKey] = object;
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
data[dataIndex] = object;
|
|
117
|
+
dataIndex++;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if (Object.keys(data).length) {
|
|
121
|
+
mergingObject.data = data;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
100
124
|
return [mergingObject, message];
|
|
101
125
|
}
|
|
102
126
|
console.log = (...arg) => {
|
|
@@ -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,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,
|
|
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,IACP,aAAa,CACjB,CAAA;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,iEAAiE;YACjE,yEAAyE;YACzE,wBAAwB;YACxB,MAAM,IAAI,GAAQ,EAAE,CAAA;YACpB,IAAI,SAAS,GAAG,CAAC,CAAA;YAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACzB,qCAAqC;gBACrC,kCAAkC;gBAClC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAA;gBAC7B,IAAI,MAAM,EAAE;oBACV,OAAO,MAAM,CAAC,OAAO,CAAA;oBACrB,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;iBAC/B;qBAAM;oBACL,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAA;oBACxB,SAAS,EAAE,CAAA;iBACZ;aACF;YAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;gBAC5B,aAAa,CAAC,IAAI,GAAG,IAAI,CAAA;aAC1B;SACF;QAED,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAC9B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAA;IACD,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAC/B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAA;IACD,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAC/B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAA;IACD,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAChC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED;;;;OAIG;IACH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAChC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;YACZ,qBAAqB;YACrB,GAAG,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAA;SACtB;QACD,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,GAAQ,EAAE,EAAE;QAC9B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACpC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED,UAAU;IAEV,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,QAAQ,CAAA;QACZ,IAAI;YACF,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;SACjC;QAAC,OAAO,CAAM,EAAE;YACf,aAAa;SACd;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,IAAI,KAAK,CAAA;QACT,IAAI;YACF,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;SACd;QACD,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,IAAI,KAAK,CAAA;QACT,IAAI;YACF,KAAK,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;SACd;QACD,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,QAAQ,CAAA;QACZ,IAAI;YACF,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;SACd;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;CACF;AAEY,QAAA,MAAM,GAAG,YAAY,CAAA"}
|
|
@@ -60,12 +60,21 @@ function handleStalled(queue, removeStalledCb) {
|
|
|
60
60
|
}));
|
|
61
61
|
}
|
|
62
62
|
function getLogParams(eventType, event, opts = {}, extra = {}) {
|
|
63
|
-
var _a;
|
|
63
|
+
var _a, _b, _c;
|
|
64
64
|
const message = `[BULL] ${eventType}=${event}`;
|
|
65
65
|
const err = opts.error;
|
|
66
|
-
const
|
|
66
|
+
const bullLog = Object.assign({ _logKey: "bull", eventType,
|
|
67
67
|
event, job: opts.job, jobId: opts.jobId || ((_a = opts.job) === null || _a === void 0 ? void 0 : _a.id) }, extra);
|
|
68
|
-
|
|
68
|
+
let automationLog;
|
|
69
|
+
if ((_c = (_b = opts.job) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.automation) {
|
|
70
|
+
automationLog = {
|
|
71
|
+
_logKey: "automation",
|
|
72
|
+
trigger: opts.job
|
|
73
|
+
? opts.job.data.automation.definition.trigger.event
|
|
74
|
+
: undefined,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
return [message, err, bullLog, automationLog];
|
|
69
78
|
}
|
|
70
79
|
var BullEvent;
|
|
71
80
|
(function (BullEvent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAAsC;AACtC,oDAAqC;AAIrC,SAAgB,YAAY,CAC1B,KAAY,EACZ,QAAkB,EAClB,eAA2B;IAE3B,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IACxB,IAAI,eAAe,EAAE;QACnB,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;KACtC;AACH,CAAC;AATD,oCASC;AAED,SAAS,aAAa,CAAC,KAAY,EAAE,eAA2B;IAC9D,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAO,GAAQ,EAAE,EAAE;QACrC,IAAI,eAAe,EAAE;YACnB,MAAM,eAAe,CAAC,GAAG,CAAC,CAAA;SAC3B;aAAM,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;YAC1B,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAA;YACpB,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAA;YAClD,KAAK,IAAI,SAAS,IAAI,UAAU,EAAE;gBAChC,IAAI,SAAS,CAAC,EAAE,KAAK,KAAK,EAAE;oBAC1B,MAAM,KAAK,CAAC,qBAAqB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;iBACjD;aACF;YACD,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC,CAAA;SACvC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,SAAyB,EACzB,KAAgB,EAChB,OAII,EAAE,EACN,QAAa,EAAE;;IAEf,MAAM,OAAO,GAAG,UAAU,SAAS,IAAI,KAAK,EAAE,CAAA;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAA;IAEtB,MAAM,
|
|
1
|
+
{"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { Ctx, Event } from "@budibase/types";
|
|
2
2
|
export declare function resolveAppUrl(ctx: Ctx): Promise<string | undefined>;
|
|
3
3
|
export declare function isServingApp(ctx: Ctx): boolean;
|
|
4
|
+
export declare function isServingBuilder(ctx: Ctx): boolean;
|
|
5
|
+
export declare function isServingBuilderPreview(ctx: Ctx): boolean;
|
|
6
|
+
export declare function isPublicApiRequest(ctx: Ctx): boolean;
|
|
4
7
|
/**
|
|
5
8
|
* Given a request tries to find the appId, which can be located in various places
|
|
6
9
|
* @param {object} ctx The main request body to look through.
|
package/dist/src/utils/utils.js
CHANGED
|
@@ -35,7 +35,7 @@ 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.isAudited = exports.timeout = exports.isClient = exports.clearCookie = exports.setCookie = exports.getCookie = exports.isValidInternalAPIKey = exports.openJwt = exports.getAppIdFromCtx = exports.isServingApp = exports.resolveAppUrl = void 0;
|
|
38
|
+
exports.isAudited = exports.timeout = exports.isClient = exports.clearCookie = exports.setCookie = exports.getCookie = exports.isValidInternalAPIKey = exports.openJwt = exports.getAppIdFromCtx = exports.isPublicApiRequest = exports.isServingBuilderPreview = exports.isServingBuilder = exports.isServingApp = exports.resolveAppUrl = void 0;
|
|
39
39
|
const db_1 = require("../db");
|
|
40
40
|
const constants_1 = require("../constants");
|
|
41
41
|
const environment_1 = __importDefault(require("../environment"));
|
|
@@ -46,7 +46,9 @@ const jwt = require("jsonwebtoken");
|
|
|
46
46
|
const APP_PREFIX = constants_1.DocumentType.APP + constants_1.SEPARATOR;
|
|
47
47
|
const PROD_APP_PREFIX = "/app/";
|
|
48
48
|
const BUILDER_PREVIEW_PATH = "/app/preview";
|
|
49
|
-
const
|
|
49
|
+
const BUILDER_PREFIX = "/builder";
|
|
50
|
+
const BUILDER_APP_PREFIX = `${BUILDER_PREFIX}/app/`;
|
|
51
|
+
const PUBLIC_API_PREFIX = "/api/public/v";
|
|
50
52
|
function confirmAppId(possibleAppId) {
|
|
51
53
|
return possibleAppId && possibleAppId.startsWith(APP_PREFIX)
|
|
52
54
|
? possibleAppId
|
|
@@ -84,6 +86,18 @@ function isServingApp(ctx) {
|
|
|
84
86
|
return false;
|
|
85
87
|
}
|
|
86
88
|
exports.isServingApp = isServingApp;
|
|
89
|
+
function isServingBuilder(ctx) {
|
|
90
|
+
return ctx.path.startsWith(BUILDER_APP_PREFIX);
|
|
91
|
+
}
|
|
92
|
+
exports.isServingBuilder = isServingBuilder;
|
|
93
|
+
function isServingBuilderPreview(ctx) {
|
|
94
|
+
return ctx.path.startsWith(BUILDER_PREVIEW_PATH);
|
|
95
|
+
}
|
|
96
|
+
exports.isServingBuilderPreview = isServingBuilderPreview;
|
|
97
|
+
function isPublicApiRequest(ctx) {
|
|
98
|
+
return ctx.path.startsWith(PUBLIC_API_PREFIX);
|
|
99
|
+
}
|
|
100
|
+
exports.isPublicApiRequest = isPublicApiRequest;
|
|
87
101
|
/**
|
|
88
102
|
* Given a request tries to find the appId, which can be located in various places
|
|
89
103
|
* @param {object} ctx The main request body to look through.
|
|
@@ -121,7 +135,7 @@ function getAppIdFromCtx(ctx) {
|
|
|
121
135
|
// make sure this is performed after prod app url resolution, in case the
|
|
122
136
|
// referer header is present from a builder redirect
|
|
123
137
|
const referer = ctx.request.headers.referer;
|
|
124
|
-
if (!appId && (referer === null || referer === void 0 ? void 0 : referer.includes(
|
|
138
|
+
if (!appId && (referer === null || referer === void 0 ? void 0 : referer.includes(BUILDER_APP_PREFIX))) {
|
|
125
139
|
const refererId = parseAppIdFromUrl(ctx.request.headers.referer);
|
|
126
140
|
appId = confirmAppId(refererId);
|
|
127
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|