@budibase/backend-core 2.6.16 → 2.6.18

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.
Files changed (20) hide show
  1. package/dist/package.json +3 -3
  2. package/dist/src/context/mainContext.d.ts +6 -0
  3. package/dist/src/context/mainContext.js +17 -1
  4. package/dist/src/context/mainContext.js.map +1 -1
  5. package/dist/src/context/types.d.ts +1 -0
  6. package/dist/src/index.d.ts +6 -0
  7. package/dist/src/logging/pino/logger.js +11 -0
  8. package/dist/src/logging/pino/logger.js.map +1 -1
  9. package/dist/src/queue/inMemoryQueue.d.ts +1 -1
  10. package/dist/src/queue/inMemoryQueue.js +1 -0
  11. package/dist/src/queue/inMemoryQueue.js.map +1 -1
  12. package/dist/src/queue/listeners.js +116 -48
  13. package/dist/src/queue/listeners.js.map +1 -1
  14. package/dist/tsconfig.build.tsbuildinfo +1 -1
  15. package/package.json +3 -3
  16. package/src/context/mainContext.ts +21 -0
  17. package/src/context/types.ts +1 -0
  18. package/src/logging/pino/logger.ts +12 -0
  19. package/src/queue/inMemoryQueue.ts +1 -0
  20. package/src/queue/listeners.ts +125 -48
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@budibase/backend-core",
3
- "version": "2.6.16",
3
+ "version": "2.6.18",
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",
@@ -24,7 +24,7 @@
24
24
  "dependencies": {
25
25
  "@budibase/nano": "10.1.2",
26
26
  "@budibase/pouchdb-replication-stream": "1.2.10",
27
- "@budibase/types": "^2.6.16",
27
+ "@budibase/types": "^2.6.18",
28
28
  "@shopify/jest-koa-mocks": "5.0.1",
29
29
  "@techpass/passport-openidconnect": "0.3.2",
30
30
  "aws-cloudfront-sign": "2.2.0",
@@ -90,5 +90,5 @@
90
90
  "tsconfig-paths": "4.0.0",
91
91
  "typescript": "4.7.3"
92
92
  },
93
- "gitHead": "d43a6a44bd074e077ea131303c0f7a2b0e0ddb75"
93
+ "gitHead": "6e97c358e00e4a7be0c620858c564960c393c1b8"
94
94
  }
package/dist/src/context/mainContext.d.ts CHANGED
@@ -11,12 +11,18 @@ export declare function isTenancyEnabled(): string | undefined;
11
11
  * @return {null|string} The tenant ID found within the app ID.
12
12
  */
13
13
  export declare function getTenantIDFromAppID(appId: string): string | undefined;
14
+ export declare function doInAutomationContext(params: {
15
+ appId: string;
16
+ automationId: string;
17
+ task: any;
18
+ }): Promise<any>;
14
19
  export declare function doInContext(appId: string, task: any): Promise<any>;
15
20
  export declare function doInTenant<T>(tenantId: string | null, task: () => T): Promise<T>;
16
21
  export declare function doInAppContext(appId: string | null, task: any): Promise<any>;
17
22
  export declare function doInIdentityContext(identity: IdentityContext, task: any): Promise<any>;
18
23
  export declare function getIdentity(): IdentityContext | undefined;
19
24
  export declare function getTenantId(): string;
25
+ export declare function getAutomationId(): string | undefined;
20
26
  export declare function getAppId(): string | undefined;
21
27
  export declare const getProdAppId: () => string;
22
28
  export declare function doInEnvironmentContext(values: Record<string, string>, task: any): Promise<any>;
package/dist/src/context/mainContext.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.isScim = exports.getDevAppDB = exports.getProdAppDB = exports.getAppDB = exports.getAuditLogsDB = exports.getGlobalDB = exports.getEnvironmentVariables = exports.doInScimContext = exports.doInEnvironmentContext = exports.getProdAppId = exports.getAppId = exports.getTenantId = exports.getIdentity = exports.doInIdentityContext = exports.doInAppContext = exports.doInTenant = exports.doInContext = exports.getTenantIDFromAppID = exports.isTenancyEnabled = exports.isTenantIdSet = exports.isMultiTenant = exports.getPlatformURL = exports.baseGlobalDBName = exports.getAuditLogDBName = exports.getGlobalDBName = void 0;
38
+ exports.isScim = exports.getDevAppDB = exports.getProdAppDB = exports.getAppDB = exports.getAuditLogsDB = exports.getGlobalDB = exports.getEnvironmentVariables = exports.doInScimContext = exports.doInEnvironmentContext = exports.getProdAppId = exports.getAppId = exports.getAutomationId = exports.getTenantId = exports.getIdentity = exports.doInIdentityContext = exports.doInAppContext = exports.doInTenant = exports.doInContext = exports.doInAutomationContext = exports.getTenantIDFromAppID = exports.isTenancyEnabled = exports.isTenantIdSet = exports.isMultiTenant = exports.getPlatformURL = exports.baseGlobalDBName = exports.getAuditLogDBName = exports.getGlobalDBName = void 0;
39
39
  // some test cases call functions directly, need to
40
40
  // store an app ID to pretend there is a context
41
41
  const environment_1 = __importDefault(require("../environment"));
@@ -134,6 +134,17 @@ function newContext(updates, task) {
134
134
  return Context_1.default.run(context, task);
135
135
  });
136
136
  }
137
+ function doInAutomationContext(params) {
138
+ return __awaiter(this, void 0, void 0, function* () {
139
+ const tenantId = getTenantIDFromAppID(params.appId);
140
+ return newContext({
141
+ tenantId,
142
+ appId: params.appId,
143
+ automationId: params.automationId,
144
+ }, params.task);
145
+ });
146
+ }
147
+ exports.doInAutomationContext = doInAutomationContext;
137
148
  function doInContext(appId, task) {
138
149
  return __awaiter(this, void 0, void 0, function* () {
139
150
  const tenantId = getTenantIDFromAppID(appId);
@@ -212,6 +223,11 @@ function getTenantId() {
212
223
  return tenantId;
213
224
  }
214
225
  exports.getTenantId = getTenantId;
226
+ function getAutomationId() {
227
+ const context = Context_1.default.get();
228
+ return context === null || context === void 0 ? void 0 : context.automationId;
229
+ }
230
+ exports.getAutomationId = getAutomationId;
215
231
  function getAppId() {
216
232
  const context = Context_1.default.get();
217
233
  const foundId = context === null || context === void 0 ? void 0 : context.appId;
package/dist/src/context/mainContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mainContext.js","sourceRoot":"","sources":["../../../src/context/mainContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,gDAAgD;AAChD,iEAAgC;AAChC,wDAA+B;AAC/B,mEAAoD;AACpD,iCAAgC;AAChC,4CAKqB;AAIrB,IAAI,WAAW,GAAkB,IAAI,CAAA;AAErC,SAAgB,eAAe,CAAC,QAAiB;IAC/C,8DAA8D;IAC9D,sDAAsD;IACtD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,WAAW,EAAE,CAAA;KACzB;IACD,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAA;AACnC,CAAC;AAPD,0CAOC;AAED,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,WAAW,EAAE,CAAA;KACzB;IACD,IAAI,QAAQ,KAAK,6BAAiB,EAAE;QAClC,OAAO,2BAAe,CAAC,UAAU,CAAC,IAAI,CAAA;KACvC;SAAM;QACL,OAAO,GAAG,QAAQ,GAAG,qBAAS,GAAG,2BAAe,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;KACnE;AACH,CAAC;AATD,8CASC;AAED,SAAgB,gBAAgB,CAAC,QAAmC;IAClE,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,6BAAiB,EAAE;QAC/C,OAAO,2BAAe,CAAC,MAAM,CAAC,IAAI,CAAA;KACnC;SAAM;QACL,OAAO,GAAG,QAAQ,GAAG,qBAAS,GAAG,2BAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;KAC/D;AACH,CAAC;AAND,4CAMC;AAED,SAAgB,cAAc;IAC5B,OAAO,qBAAG,CAAC,YAAY,CAAA;AACzB,CAAC;AAFD,wCAEC;AAED,SAAgB,aAAa;IAC3B,OAAO,CAAC,CAAC,qBAAG,CAAC,aAAa,CAAA;AAC5B,CAAC;AAFD,sCAEC;AAED,SAAgB,aAAa;IAC3B,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,OAAO,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAA,CAAA;AAC5B,CAAC;AAHD,sCAGC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,qBAAG,CAAC,aAAa,CAAA;AAC1B,CAAC;AAFD,4CAEC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,KAAa;IAChD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IACD,IAAI,CAAC,aAAa,EAAE,EAAE;QACpB,OAAO,6BAAiB,CAAA;KACzB;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAS,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,wBAAY,CAAC,GAAG,CAAA;IAC5C,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;QACrE,OAAO,SAAS,CAAA;KACjB;IACD,IAAI,MAAM,EAAE;QACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;KAChB;SAAM;QACL,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;KAChB;AACH,CAAC;AAjBD,oDAiBC;AAED,SAAS,aAAa,CAAC,OAAmB;IACxC,IAAI,OAAmB,CAAA;IACvB,IAAI;QACF,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;KACxB;IAAC,OAAO,GAAG,EAAE;QACZ,0BAA0B;QAC1B,OAAO,GAAG,EAAE,CAAA;KACb;IACD,OAAO,mCACF,OAAO,GACP,OAAO,CACX,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAe,UAAU,CAAC,OAAmB,EAAE,IAAS;;QACtD,0CAA0C;QAC1C,IAAI,OAAO,GAAe,aAAa,CAAC,OAAO,CAAC,CAAA;QAChD,OAAO,iBAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;CAAA;AAED,SAAsB,WAAW,CAAC,KAAa,EAAE,IAAS;;QACxD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC5C,OAAO,UAAU,CACf;YACE,QAAQ;YACR,KAAK;SACN,EACD,IAAI,CACL,CAAA;IACH,CAAC;CAAA;AATD,kCASC;AAED,SAAsB,UAAU,CAC9B,QAAuB,EACvB,IAAa;;QAEb,sDAAsD;QACtD,IAAI,CAAC,qBAAG,CAAC,aAAa,EAAE;YACtB,QAAQ,GAAG,QAAQ,IAAI,6BAAiB,CAAA;SACzC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC5C,OAAO,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAClC,CAAC;CAAA;AAXD,gCAWC;AAED,SAAsB,cAAc,CAClC,KAAoB,EACpB,IAAS;;QAET,IAAI,CAAC,KAAK,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACrC;QAED,IAAI,OAAmB,CAAA;QACvB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;SACxB;aAAM;YACL,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC5C,OAAO,GAAG,EAAE,KAAK,EAAE,CAAA;YACnB,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;aAC5B;SACF;QACD,OAAO,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAClC,CAAC;CAAA;AAnBD,wCAmBC;AAED,SAAsB,mBAAmB,CACvC,QAAyB,EACzB,IAAS;;QAET,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SACxC;QAED,MAAM,OAAO,GAAe;YAC1B,QAAQ;SACT,CAAA;QACD,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACrB,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;SACrC;QACD,OAAO,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAClC,CAAC;CAAA;AAfD,kDAeC;AAED,SAAgB,WAAW;IACzB,IAAI;QACF,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;QAC7B,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAA;KACzB;IAAC,OAAO,CAAC,EAAE;QACV,0CAA0C;KAC3C;AACH,CAAC;AAPD,kCAOC;AAED,SAAgB,WAAW;IACzB,IAAI,CAAC,aAAa,EAAE,EAAE;QACpB,OAAO,6BAAiB,CAAA;KACzB;IACD,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAA;IAClC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;KACvC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAVD,kCAUC;AAED,SAAgB,QAAQ;IACtB,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,MAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA;IAC9B,IAAI,CAAC,OAAO,IAAI,qBAAG,CAAC,MAAM,EAAE,IAAI,WAAW,EAAE;QAC3C,OAAO,WAAW,CAAA;KACnB;SAAM;QACL,OAAO,OAAO,CAAA;KACf;AACH,CAAC;AARD,4BAQC;AAEM,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;KACvC;IACD,OAAO,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;AACxC,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB;AAED,SAAgB,sBAAsB,CACpC,MAA8B,EAC9B,IAAS;IAET,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;KACtD;IACD,MAAM,OAAO,GAAG;QACd,oBAAoB,EAAE,MAAM;KAC7B,CAAA;IACD,OAAO,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC;AAXD,wDAWC;AAED,SAAgB,eAAe,CAAC,IAAS;IACvC,MAAM,OAAO,GAAe;QAC1B,MAAM,EAAE,IAAI;KACb,CAAA;IACD,OAAO,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC;AALD,0CAKC;AAED,SAAgB,uBAAuB;IACrC,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;QACjC,OAAO,IAAI,CAAA;KACZ;SAAM;QACL,OAAO,OAAO,CAAC,oBAAoB,CAAA;KACpC;AACH,CAAC;AAPD,0DAOC;AAED,SAAgB,WAAW;IACzB,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,IAAI,CAAC,OAAO,IAAI,CAAC,qBAAG,CAAC,aAAa,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;KACvC;IACD,OAAO,IAAA,UAAK,EAAC,gBAAgB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,CAAC,CAAA;AACnD,CAAC;AAND,kCAMC;AAED,SAAgB,cAAc;IAC5B,IAAI,CAAC,WAAW,EAAE,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;KACjE;IACD,OAAO,IAAA,UAAK,EAAC,iBAAiB,EAAE,CAAC,CAAA;AACnC,CAAC;AALD,wCAKC;AAED;;;GAGG;AACH,SAAgB,QAAQ,CAAC,IAAU;IACjC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,OAAO,IAAA,UAAK,EAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAC3B,CAAC;AAHD,4BAGC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAAC,IAAU;IACrC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;KAC3D;IACD,OAAO,IAAA,UAAK,EAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAA;AACrD,CAAC;AAND,oCAMC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;KAC1D;IACD,OAAO,IAAA,UAAK,EAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAA;AAC5D,CAAC;AAND,kCAMC;AAED,SAAgB,MAAM;IACpB,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA;IAChC,OAAO,CAAC,CAAC,QAAQ,CAAA;AACnB,CAAC;AAJD,wBAIC"}
1
+ {"version":3,"file":"mainContext.js","sourceRoot":"","sources":["../../../src/context/mainContext.ts"],"names":[],"mappings":"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"}
package/dist/src/context/types.d.ts CHANGED
@@ -5,4 +5,5 @@ export declare type ContextMap = {
5
5
  identity?: IdentityContext;
6
6
  environmentVariables?: Record<string, string>;
7
7
  isScim?: boolean;
8
+ automationId?: string;
8
9
  };
package/dist/src/index.d.ts CHANGED
@@ -41,12 +41,18 @@ export declare const tenancy: {
41
41
  isTenantIdSet(): boolean;
42
42
  isTenancyEnabled(): string | undefined;
43
43
  getTenantIDFromAppID(appId: string): string | undefined;
44
+ doInAutomationContext(params: {
45
+ appId: string;
46
+ automationId: string;
47
+ task: any;
48
+ }): Promise<any>;
44
49
  doInContext(appId: string, task: any): Promise<any>;
45
50
  doInTenant<T>(tenantId: string | null, task: () => T): Promise<T>;
46
51
  doInAppContext(appId: string | null, task: any): Promise<any>;
47
52
  doInIdentityContext(identity: import("@budibase/types").IdentityContext, task: any): Promise<any>;
48
53
  getIdentity(): import("@budibase/types").IdentityContext | undefined;
49
54
  getTenantId(): string;
55
+ getAutomationId(): string | undefined;
50
56
  getAppId(): string | undefined;
51
57
  doInEnvironmentContext(values: Record<string, string>, task: any): Promise<any>;
52
58
  doInScimContext(task: any): Promise<any>;
package/dist/src/logging/pino/logger.js CHANGED
@@ -90,6 +90,7 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
90
90
  contextObject = {
91
91
  tenantId: getTenantId(),
92
92
  appId: getAppId(),
93
+ automationId: getAutomationId(),
93
94
  identityId: identity === null || identity === void 0 ? void 0 : identity._id,
94
95
  identityType: identity === null || identity === void 0 ? void 0 : identity.type,
95
96
  correlationId: correlation.getId(),
@@ -152,6 +153,16 @@ if (!environment_1.default.DISABLE_PINO_LOGGER) {
152
153
  }
153
154
  return appId;
154
155
  };
156
+ const getAutomationId = () => {
157
+ let appId;
158
+ try {
159
+ appId = context.getAutomationId();
160
+ }
161
+ catch (e) {
162
+ // do nothing
163
+ }
164
+ return appId;
165
+ };
155
166
  const getIdentity = () => {
156
167
  let identity;
157
168
  try {
package/dist/src/logging/pino/logger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
package/dist/src/queue/inMemoryQueue.d.ts CHANGED
@@ -56,7 +56,7 @@ declare class InMemoryQueue {
56
56
  */
57
57
  clean(): Promise<never[]>;
58
58
  getJob(): Promise<{}>;
59
- on(): void;
59
+ on(): this;
60
60
  waitForCompletion(): Promise<void>;
61
61
  }
62
62
  export default InMemoryQueue;
package/dist/src/queue/inMemoryQueue.js CHANGED
@@ -131,6 +131,7 @@ class InMemoryQueue {
131
131
  }
132
132
  on() {
133
133
  // do nothing
134
+ return this;
134
135
  }
135
136
  waitForCompletion() {
136
137
  return __awaiter(this, void 0, void 0, function* () {
package/dist/src/queue/inMemoryQueue.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,oCAAkC;AAElC;;;;;;;;GAQG;AACH,SAAS,MAAM,CAAC,KAAa,EAAE,OAAY;IACzC,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa;IAOjB;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAI,GAAG,IAAI;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAM,CAAC,YAAY,EAAE,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;IACpB,CAAC;IAED;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAS;QACf,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;YACrC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC9B,OAAM;aACP;YACD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;YAChC,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACpB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;gBACrB,MAAM,IAAI,CAAA;aACX;YACD,IAAI,CAAC,SAAS,EAAE,CAAA;QAClB,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;IAED,2EAA2E;IAC3E;;;;;;;OAOG;IACH,0CAA0C;IAC1C,GAAG,CAAC,GAAQ,EAAE,MAAe;QAC3B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,oCAAoC,CAAA;SAC3C;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAA;QAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED;;;OAGG;IACH,qBAAqB,CAAC,SAAiB;QACrC,8BAA8B;QAC9B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,0CAA0C;IAC1C,UAAU,CAAC,OAAe;QACxB,QAAQ;IACV,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAEK,MAAM;;YACV,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED,EAAE;QACA,aAAa;IACf,CAAC;IAEK,iBAAiB;;YACrB,GAAG;gBACD,MAAM,IAAA,eAAO,EAAC,EAAE,CAAC,CAAA;aAClB,QAAQ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAC;QAC3C,CAAC;KAAA;CACF;AAED,kBAAe,aAAa,CAAA"}
1
+ {"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,oCAAkC;AAElC;;;;;;;;GAQG;AACH,SAAS,MAAM,CAAC,KAAa,EAAE,OAAY;IACzC,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa;IAOjB;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAI,GAAG,IAAI;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAM,CAAC,YAAY,EAAE,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;IACpB,CAAC;IAED;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAS;QACf,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;YACrC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC9B,OAAM;aACP;YACD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;YAChC,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACpB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;gBACrB,MAAM,IAAI,CAAA;aACX;YACD,IAAI,CAAC,SAAS,EAAE,CAAA;QAClB,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;IAED,2EAA2E;IAC3E;;;;;;;OAOG;IACH,0CAA0C;IAC1C,GAAG,CAAC,GAAQ,EAAE,MAAe;QAC3B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,oCAAoC,CAAA;SAC3C;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,SAAS,EAAE,CAAA;QAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED;;;OAGG;IACH,qBAAqB,CAAC,SAAiB;QACrC,8BAA8B;QAC9B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,0CAA0C;IAC1C,UAAU,CAAC,OAAe;QACxB,QAAQ;IACV,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAEK,MAAM;;YACV,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;IAED,EAAE;QACA,aAAa;QACb,OAAO,IAAI,CAAA;IACb,CAAC;IAEK,iBAAiB;;YACrB,GAAG;gBACD,MAAM,IAAA,eAAO,EAAC,EAAE,CAAC,CAAA;aAClB,QAAQ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAC;QAC3C,CAAC;KAAA;CACF;AAED,kBAAe,aAAa,CAAA"}
package/dist/src/queue/listeners.js CHANGED
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
26
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
27
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -11,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
34
  Object.defineProperty(exports, "__esModule", { value: true });
12
35
  exports.addListeners = void 0;
13
36
  const constants_1 = require("./constants");
37
+ const context = __importStar(require("../context"));
14
38
  function addListeners(queue, jobQueue, removeStalledCb) {
15
39
  logging(queue, jobQueue);
16
40
  if (removeStalledCb) {
@@ -35,74 +59,118 @@ function handleStalled(queue, removeStalledCb) {
35
59
  }
36
60
  }));
37
61
  }
62
+ function getLogParams(eventType, event, opts = {}, extra = {}) {
63
+ var _a;
64
+ const message = `[BULL] ${eventType}=${event}`;
65
+ const err = opts.error;
66
+ const data = Object.assign({ eventType,
67
+ event, job: opts.job, jobId: opts.jobId || ((_a = opts.job) === null || _a === void 0 ? void 0 : _a.id) }, extra);
68
+ return [message, err, data];
69
+ }
70
+ var BullEvent;
71
+ (function (BullEvent) {
72
+ BullEvent["ERROR"] = "error";
73
+ BullEvent["WAITING"] = "waiting";
74
+ BullEvent["ACTIVE"] = "active";
75
+ BullEvent["STALLED"] = "stalled";
76
+ BullEvent["PROGRESS"] = "progress";
77
+ BullEvent["COMPLETED"] = "completed";
78
+ BullEvent["FAILED"] = "failed";
79
+ BullEvent["PAUSED"] = "paused";
80
+ BullEvent["RESUMED"] = "resumed";
81
+ BullEvent["CLEANED"] = "cleaned";
82
+ BullEvent["DRAINED"] = "drained";
83
+ BullEvent["REMOVED"] = "removed";
84
+ })(BullEvent || (BullEvent = {}));
85
+ var QueueEventType;
86
+ (function (QueueEventType) {
87
+ QueueEventType["AUTOMATION_EVENT"] = "automation-event";
88
+ QueueEventType["APP_BACKUP_EVENT"] = "app-backup-event";
89
+ QueueEventType["AUDIT_LOG_EVENT"] = "audit-log-event";
90
+ QueueEventType["SYSTEM_EVENT"] = "system-event";
91
+ })(QueueEventType || (QueueEventType = {}));
92
+ const EventTypeMap = {
93
+ [constants_1.JobQueue.AUTOMATION]: QueueEventType.AUTOMATION_EVENT,
94
+ [constants_1.JobQueue.APP_BACKUP]: QueueEventType.APP_BACKUP_EVENT,
95
+ [constants_1.JobQueue.AUDIT_LOG]: QueueEventType.AUDIT_LOG_EVENT,
96
+ [constants_1.JobQueue.SYSTEM_EVENT_QUEUE]: QueueEventType.SYSTEM_EVENT,
97
+ };
38
98
  function logging(queue, jobQueue) {
39
99
  var _a;
40
- let eventType;
41
- switch (jobQueue) {
42
- case constants_1.JobQueue.AUTOMATION:
43
- eventType = "automation-event";
44
- break;
45
- case constants_1.JobQueue.APP_BACKUP:
46
- eventType = "app-backup-event";
47
- break;
48
- case constants_1.JobQueue.AUDIT_LOG:
49
- eventType = "audit-log-event";
50
- break;
51
- case constants_1.JobQueue.SYSTEM_EVENT_QUEUE:
52
- eventType = "system-event";
53
- break;
100
+ const eventType = EventTypeMap[jobQueue];
101
+ function doInJobContext(job, task) {
102
+ var _a;
103
+ // if this is an automation job try to get the app id
104
+ const appId = (_a = job.data.event) === null || _a === void 0 ? void 0 : _a.appId;
105
+ if (appId) {
106
+ return context.doInContext(appId, task);
107
+ }
108
+ else {
109
+ task();
110
+ }
54
111
  }
112
+ queue
113
+ .on(BullEvent.STALLED, (job) => __awaiter(this, void 0, void 0, function* () {
114
+ // A job has been marked as stalled. This is useful for debugging job
115
+ // workers that crash or pause the event loop.
116
+ yield doInJobContext(job, () => {
117
+ console.error(...getLogParams(eventType, BullEvent.STALLED, { job }));
118
+ });
119
+ }))
120
+ .on(BullEvent.ERROR, (error) => {
121
+ // An error occurred.
122
+ console.error(...getLogParams(eventType, BullEvent.ERROR, { error }));
123
+ });
55
124
  if ((_a = process.env.NODE_DEBUG) === null || _a === void 0 ? void 0 : _a.includes("bull")) {
56
125
  queue
57
- .on("error", (error) => {
58
- // An error occurred.
59
- console.error(`${eventType}=error error=${JSON.stringify(error)}`);
60
- })
61
- .on("waiting", (jobId) => {
126
+ .on(BullEvent.WAITING, (jobId) => {
62
127
  // A Job is waiting to be processed as soon as a worker is idling.
63
- console.log(`${eventType}=waiting jobId=${jobId}`);
128
+ console.info(...getLogParams(eventType, BullEvent.WAITING, { jobId }));
64
129
  })
65
- .on("active", (job, jobPromise) => {
130
+ .on(BullEvent.ACTIVE, (job, jobPromise) => __awaiter(this, void 0, void 0, function* () {
66
131
  // A job has started. You can use `jobPromise.cancel()`` to abort it.
67
- console.log(`${eventType}=active jobId=${job.id}`);
68
- })
69
- .on("stalled", (job) => {
70
- // A job has been marked as stalled. This is useful for debugging job
71
- // workers that crash or pause the event loop.
72
- console.error(`${eventType}=stalled jobId=${job.id} job=${JSON.stringify(job)}`);
73
- })
74
- .on("progress", (job, progress) => {
75
- // A job's progress was updated!
76
- console.log(`${eventType}=progress jobId=${job.id} progress=${progress}`);
77
- })
78
- .on("completed", (job, result) => {
132
+ yield doInJobContext(job, () => {
133
+ console.info(...getLogParams(eventType, BullEvent.ACTIVE, { job }));
134
+ });
135
+ }))
136
+ .on(BullEvent.PROGRESS, (job, progress) => __awaiter(this, void 0, void 0, function* () {
137
+ // A job's progress was updated
138
+ yield doInJobContext(job, () => {
139
+ console.info(...getLogParams(eventType, BullEvent.PROGRESS, { job }, { progress }));
140
+ });
141
+ }))
142
+ .on(BullEvent.COMPLETED, (job, result) => __awaiter(this, void 0, void 0, function* () {
79
143
  // A job successfully completed with a `result`.
80
- console.log(`${eventType}=completed jobId=${job.id} result=${result}`);
81
- })
82
- .on("failed", (job, err) => {
144
+ yield doInJobContext(job, () => {
145
+ console.info(...getLogParams(eventType, BullEvent.COMPLETED, { job }, { result }));
146
+ });
147
+ }))
148
+ .on(BullEvent.FAILED, (job, error) => __awaiter(this, void 0, void 0, function* () {
83
149
  // A job failed with reason `err`!
84
- console.log(`${eventType}=failed jobId=${job.id} error=${err}`);
85
- })
86
- .on("paused", () => {
150
+ yield doInJobContext(job, () => {
151
+ console.error(...getLogParams(eventType, BullEvent.FAILED, { job, error }));
152
+ });
153
+ }))
154
+ .on(BullEvent.PAUSED, () => {
87
155
  // The queue has been paused.
88
- console.log(`${eventType}=paused`);
156
+ console.info(...getLogParams(eventType, BullEvent.PAUSED));
89
157
  })
90
- .on("resumed", (job) => {
158
+ .on(BullEvent.RESUMED, () => {
91
159
  // The queue has been resumed.
92
- console.log(`${eventType}=paused jobId=${job.id}`);
160
+ console.info(...getLogParams(eventType, BullEvent.RESUMED));
93
161
  })
94
- .on("cleaned", (jobs, type) => {
162
+ .on(BullEvent.CLEANED, (jobs, type) => {
95
163
  // Old jobs have been cleaned from the queue. `jobs` is an array of cleaned
96
164
  // jobs, and `type` is the type of jobs cleaned.
97
- console.log(`${eventType}=cleaned length=${jobs.length} type=${type}`);
165
+ console.info(...getLogParams(eventType, BullEvent.CLEANED, {}, { length: jobs.length, type }));
98
166
  })
99
- .on("drained", () => {
167
+ .on(BullEvent.DRAINED, () => {
100
168
  // Emitted every time the queue has processed all the waiting jobs (even if there can be some delayed jobs not yet processed)
101
- console.log(`${eventType}=drained`);
169
+ console.info(...getLogParams(eventType, BullEvent.DRAINED));
102
170
  })
103
- .on("removed", (job) => {
171
+ .on(BullEvent.REMOVED, (job) => {
104
172
  // A job successfully removed.
105
- console.log(`${eventType}=removed jobId=${job.id}`);
173
+ console.info(...getLogParams(eventType, BullEvent.REMOVED, { job }));
106
174
  });
107
175
  }
108
176
  }
package/dist/src/queue/listeners.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAsC;AAItC,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,OAAO,CAAC,KAAY,EAAE,QAAkB;;IAC/C,IAAI,SAAiB,CAAA;IACrB,QAAQ,QAAQ,EAAE;QAChB,KAAK,oBAAQ,CAAC,UAAU;YACtB,SAAS,GAAG,kBAAkB,CAAA;YAC9B,MAAK;QACP,KAAK,oBAAQ,CAAC,UAAU;YACtB,SAAS,GAAG,kBAAkB,CAAA;YAC9B,MAAK;QACP,KAAK,oBAAQ,CAAC,SAAS;YACrB,SAAS,GAAG,iBAAiB,CAAA;YAC7B,MAAK;QACP,KAAK,oBAAQ,CAAC,kBAAkB;YAC9B,SAAS,GAAG,cAAc,CAAA;YAC1B,MAAK;KACR;IACD,IAAI,MAAA,OAAO,CAAC,GAAG,CAAC,UAAU,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC5C,KAAK;aACF,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;YAC1B,qBAAqB;YACrB,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,gBAAgB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACpE,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,CAAC,KAAY,EAAE,EAAE;YAC9B,kEAAkE;YAClE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,kBAAkB,KAAK,EAAE,CAAC,CAAA;QACpD,CAAC,CAAC;aACD,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAQ,EAAE,UAAe,EAAE,EAAE;YAC1C,qEAAqE;YACrE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,iBAAiB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC1B,qEAAqE;YACrE,8CAA8C;YAC9C,OAAO,CAAC,KAAK,CACX,GAAG,SAAS,kBAAkB,GAAG,CAAC,EAAE,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAClE,CAAA;QACH,CAAC,CAAC;aACD,EAAE,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,QAAa,EAAE,EAAE;YAC1C,gCAAgC;YAChC,OAAO,CAAC,GAAG,CACT,GAAG,SAAS,mBAAmB,GAAG,CAAC,EAAE,aAAa,QAAQ,EAAE,CAC7D,CAAA;QACH,CAAC,CAAC;aACD,EAAE,CAAC,WAAW,EAAE,CAAC,GAAQ,EAAE,MAAM,EAAE,EAAE;YACpC,gDAAgD;YAChD,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,oBAAoB,GAAG,CAAC,EAAE,WAAW,MAAM,EAAE,CAAC,CAAA;QACxE,CAAC,CAAC;aACD,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAQ,EAAE,EAAE;YAC9B,kCAAkC;YAClC,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,iBAAiB,GAAG,CAAC,EAAE,UAAU,GAAG,EAAE,CAAC,CAAA;QACjE,CAAC,CAAC;aACD,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACjB,6BAA6B;YAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,SAAS,CAAC,CAAA;QACpC,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC1B,8BAA8B;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,iBAAiB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,CAAC,IAAW,EAAE,IAAY,EAAE,EAAE;YAC3C,2EAA2E;YAC3E,gDAAgD;YAChD,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,mBAAmB,IAAI,CAAC,MAAM,SAAS,IAAI,EAAE,CAAC,CAAA;QACxE,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAClB,6HAA6H;YAC7H,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,UAAU,CAAC,CAAA;QACrC,CAAC,CAAC;aACD,EAAE,CAAC,SAAS,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC1B,8BAA8B;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,kBAAkB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;KACL;AACH,CAAC"}
1
+ {"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":"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"}