@zajno/common 2.0.18 → 2.0.19

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.
@@ -1,6 +1,7 @@
1
1
  import type { Predicate } from '../types';
2
2
  import { ILogger } from '../logger';
3
3
  export type EventHandler<T = any> = (data?: T) => void | Promise<void>;
4
+ type Unsubscribe = () => void;
4
5
  export interface IEvent<T = any> {
5
6
  on(handler: EventHandler<T>): () => void;
6
7
  off(handler: EventHandler<T>): void;
@@ -8,10 +9,10 @@ export interface IEvent<T = any> {
8
9
  export declare class Event<T = any> implements IEvent<T> {
9
10
  private _handlers;
10
11
  private _logger;
11
- constructor();
12
- constructor(logger?: ILogger);
13
- constructor(name?: string);
14
- on(handler: EventHandler<T>): () => void;
12
+ constructor(withDefaultLogger?: boolean);
13
+ withLogger(logger?: ILogger): this;
14
+ withLogger(name?: string): this;
15
+ on(handler: EventHandler<T>): Unsubscribe;
15
16
  off(handler: EventHandler<T>): void;
16
17
  trigger(data?: T): void;
17
18
  triggerAsync(data?: T): Promise<Error[]>;
@@ -19,4 +20,5 @@ export declare class Event<T = any> implements IEvent<T> {
19
20
  private logError;
20
21
  }
21
22
  export declare function oneTimeSubscription<T>(e: IEvent<T>, filter?: Predicate<T>): Promise<T>;
23
+ export {};
22
24
  //# sourceMappingURL=event.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/observing/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAgB,MAAM,WAAW,CAAC;AAElD,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvE,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,GAAG;IAC3B,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IACzC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,qBAAa,KAAK,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,OAAO,CAAiB;;gBAGpB,MAAM,CAAC,EAAE,OAAO;gBAChB,IAAI,CAAC,EAAE,MAAM;IAQlB,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAOxC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAInC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAeV,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB9C,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IAI1B,OAAO,CAAC,QAAQ;CAGnB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAStF"}
1
+ {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/observing/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAgB,MAAM,WAAW,CAAC;AAElD,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvE,KAAK,WAAW,GAAG,MAAM,IAAI,CAAC;AAE9B,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,GAAG;IAC3B,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IACzC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,qBAAa,KAAK,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,OAAO,CAAiB;gBAEpB,iBAAiB,UAAO;IAM7B,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAClC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAS/B,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW;IAOzC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAInC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAeV,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB9C,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IAI1B,OAAO,CAAC,QAAQ;CAGnB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAYtF"}
@@ -4,12 +4,18 @@ exports.oneTimeSubscription = exports.Event = void 0;
4
4
  const arrays_1 = require("../async/arrays");
5
5
  const logger_1 = require("../logger");
6
6
  class Event {
7
- constructor(loggerOrName) {
7
+ constructor(withDefaultLogger = true) {
8
8
  this._handlers = [];
9
9
  this._logger = null;
10
+ if (withDefaultLogger) {
11
+ this.withLogger();
12
+ }
13
+ }
14
+ withLogger(loggerOrName) {
10
15
  this._logger = (!loggerOrName || typeof loggerOrName === 'string')
11
16
  ? (0, logger_1.createLogger)(`[Event:${loggerOrName || '?'}]`)
12
17
  : loggerOrName;
18
+ return this;
13
19
  }
14
20
  on(handler) {
15
21
  this._handlers.push(handler);
@@ -55,15 +61,19 @@ class Event {
55
61
  return this;
56
62
  }
57
63
  logError(data, cb, err) {
58
- this._logger.error(`[Event.${typeof data}] Handler ${cb.name} thrown an exception: `, err);
64
+ var _a;
65
+ (_a = this._logger) === null || _a === void 0 ? void 0 : _a.error(`[Event.${typeof data}] Handler ${cb.name} thrown an exception: `, err);
59
66
  }
60
67
  }
61
68
  exports.Event = Event;
62
69
  function oneTimeSubscription(e, filter) {
63
70
  return new Promise((resolve) => {
64
- const unsub = e.on(v => {
71
+ let unsubscribe = null;
72
+ unsubscribe = e.on(v => {
65
73
  if (!filter || filter(v)) {
66
- unsub();
74
+ // the callback can be called during subscription, so unsubscribe may not be initialized yet.
75
+ // in that case assume that unsubscribing is not needed
76
+ unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
67
77
  resolve(v);
68
78
  }
69
79
  });
@@ -1 +1 @@
1
- {"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/observing/event.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAC/C,sCAAkD;AASlD,MAAa,KAAK;IAQd,YAAY,YAA+B;QAPnC,cAAS,GAAsB,EAAE,CAAC;QAClC,YAAO,GAAY,IAAI,CAAC;QAO5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,CAAC;YAC9D,CAAC,CAAC,IAAA,qBAAY,EAAC,UAAU,YAAY,IAAI,GAAG,GAAG,CAAC;YAChD,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEM,EAAE,CAAC,OAAwB;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IAEM,GAAG,CAAC,OAAwB;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEM,OAAO,CAAC,IAAQ;QACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO;SACV;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,CAAC;aACZ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAQ;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAY,EAAE,CAAC;QAE3B,MAAM,IAAA,qBAAY,EAAC,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YACjD,IAAI;gBACA,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,IAAO,EAAE,EAAmB,EAAE,GAAU;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,aAAa,EAAE,CAAC,IAAI,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC/F,CAAC;CACJ;AApED,sBAoEC;AAED,SAAgB,mBAAmB,CAAI,CAAY,EAAE,MAAqB;IACtE,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;gBACtB,KAAK,EAAE,CAAC;gBACR,OAAO,CAAC,CAAC,CAAC,CAAC;aACd;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AATD,kDASC"}
1
+ {"version":3,"file":"event.js","sourceRoot":"","sources":["../../src/observing/event.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zajno/common",
3
- "version": "2.0.18",
3
+ "version": "2.0.19",
4
4
  "description": "Zajno's re-usable utilities for JS/TS projects",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1 +1 @@
1
- {"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../src/structures/queue/parallel.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAInD,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IAEzC,IAAW,eAAe,WAAiC;IAC3D,IAAW,UAAU,YAA+B;IAEpD,IAAW,iBAAiB,mDAA+C;IAC3E,IAAW,gBAAgB,mDAA8C;IAEzE,IAAW,QAAQ,gDAAsC;IAElD,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM;IAK/B,8DAA8D;IACvD,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAkC/C,KAAK;IAgBlB,OAAO,CAAC,QAAQ;YAUF,aAAa;IAsC3B,OAAO,CAAC,cAAc,CAOpB;CACL"}
1
+ {"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../src/structures/queue/parallel.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAInD,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,IAAW,eAAe,WAAiC;IAC3D,IAAW,UAAU,YAA+B;IAEpD,IAAW,iBAAiB,mDAA+C;IAC3E,IAAW,gBAAgB,mDAA8C;IAEzE,IAAW,QAAQ,gDAAsC;IAElD,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM;IAK/B,8DAA8D;IACvD,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAkC/C,KAAK;IAgBlB,OAAO,CAAC,QAAQ;YAUF,aAAa;IA2C3B,OAAO,CAAC,cAAc,CAOpB;CACL"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ParallelQueue = void 0;
4
4
  const logger_1 = require("../../logger");
5
5
  const event_1 = require("../../observing/event");
6
+ const event_late_1 = require("../../observing/event.late");
6
7
  class ParallelQueue {
7
8
  constructor() {
8
9
  this._queues = {};
@@ -12,7 +13,7 @@ class ParallelQueue {
12
13
  this._logger = null;
13
14
  this._beforePriorityRun = new event_1.Event();
14
15
  this._afterPriorityRun = new event_1.Event();
15
- this._finished = new event_1.Event();
16
+ this._finished = new event_late_1.OneTimeLateEvent();
16
17
  this._executeLoader = async (l, priority, index) => {
17
18
  var _a, _b;
18
19
  try {
@@ -65,7 +66,7 @@ class ParallelQueue {
65
66
  }
66
67
  async start() {
67
68
  var _a;
68
- if (this._inProgress) {
69
+ if (this._inProgress != null) {
69
70
  return undefined;
70
71
  }
71
72
  this._inProgress = true;
@@ -87,28 +88,32 @@ class ParallelQueue {
87
88
  return q;
88
89
  }
89
90
  async tryStartQueue() {
90
- var _a, _b, _c, _d;
91
+ var _a, _b, _c, _d, _e;
91
92
  let current = null;
92
93
  let iterations = 0;
94
+ let totalItems = 0;
93
95
  await this._beforePriorityRun.triggerAsync(this._currentIndex);
96
+ const MAX_ATTEMPTS = 5;
94
97
  while ((_a = (current = this._queues[this._currentIndex])) === null || _a === void 0 ? void 0 : _a.length) {
95
- if (iterations++ > 5) {
98
+ if (iterations++ > MAX_ATTEMPTS) {
99
+ (_b = this._logger) === null || _b === void 0 ? void 0 : _b.warn('Tried to purge queue for priority =', this._currentIndex, 'for too many times of', MAX_ATTEMPTS, '; totalItems =', totalItems, '; skipping.');
96
100
  break;
97
101
  }
98
- (_b = this._logger) === null || _b === void 0 ? void 0 : _b.log('Processing priority =', this._currentIndex, '; count =', current.length);
102
+ (_c = this._logger) === null || _c === void 0 ? void 0 : _c.log('Processing priority =', this._currentIndex, '; count =', current.length);
99
103
  const items = current.slice();
100
104
  current.length = 0;
105
+ totalItems += items.length;
101
106
  await Promise.all(items.map((loader, index) => this._executeLoader(loader, this._currentIndex, index)));
102
107
  }
103
108
  if (!(current === null || current === void 0 ? void 0 : current.length) && iterations === 0) {
104
- (_c = this._logger) === null || _c === void 0 ? void 0 : _c.log('Skipping priority =', this._currentIndex, '; no items');
109
+ (_d = this._logger) === null || _d === void 0 ? void 0 : _d.log('Skipping priority =', this._currentIndex, '; no items');
105
110
  }
106
111
  await this._afterPriorityRun.triggerAsync(this._currentIndex);
107
112
  const next = this._currentIndex + 1;
108
113
  if (next > this._maxIndex) {
109
114
  // looks like we've finished!
110
115
  this._inProgress = false;
111
- (_d = this._logger) === null || _d === void 0 ? void 0 : _d.log('Finished processing at index =', this._currentIndex);
116
+ (_e = this._logger) === null || _e === void 0 ? void 0 : _e.log('Finished processing at index =', this._currentIndex);
112
117
  this._finished.trigger();
113
118
  return;
114
119
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../../src/structures/queue/parallel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../../src/structures/queue/parallel.ts"],"names":[],"mappings":"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"}