woonplan-packages-redishelper 2.0.62 → 2.0.64

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.
@@ -14,7 +14,6 @@ export default class ListRunner {
14
14
  addItemsToInProgress(items: string[]): Promise<string[]>;
15
15
  get inProgressSetName(): string;
16
16
  handleFinished(): Promise<void>;
17
- cleanup(): Promise<number>;
18
17
  removeItemsFromToDo(items: string[]): Promise<number>;
19
18
  removeItemsFromInProgress(items: string[]): Promise<number>;
20
19
  }
@@ -59,15 +59,14 @@ class ListRunner {
59
59
  }
60
60
  async handleFinished() {
61
61
  console.log(`finished with ${this.itemsDone} jobs`);
62
- let lock = await (0, lock_1.getLock)([this.inProgressSetName], 2000);
62
+ let lock = await (0, lock_1.getLock)([`lock${this.inProgressSetName}`], 2000);
63
63
  try {
64
- const setStillExists = await this.client.get(this.inProgressSetName);
65
- if (setStillExists == null)
66
- return;
67
64
  const inProgressCount = await this.client.scard(this.inProgressSetName);
68
65
  if (inProgressCount > 0)
69
66
  return;
70
- await this.cleanup.call(this);
67
+ const setAlreadyFinished = await this.client.setnx(`finished${this.inProgressSetName}`, 1);
68
+ if (!setAlreadyFinished)
69
+ return;
71
70
  if (this.finishedevent && this.finishedevent.length > 0) {
72
71
  console.log(`sending message to ${this.finishedevent}`);
73
72
  await this.client.xadd(this.finishedevent, '*', ...(0, utils_1.createRedisMessage)(this.params));
@@ -80,9 +79,6 @@ class ListRunner {
80
79
  (0, lock_1.releaseLock)(lock);
81
80
  }
82
81
  }
83
- cleanup() {
84
- return this.client.del(this.inProgressSetName);
85
- }
86
82
  removeItemsFromToDo(items) {
87
83
  return this.client.srem(this.listname, ...items);
88
84
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ListRunner.js","sourceRoot":"","sources":["../../../src/classes/ListRunner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ListRunner.js","sourceRoot":"","sources":["../../../src/classes/ListRunner.ts"],"names":[],"mappings":";;AACA,2CAAuD;AACvD,6CAAsD;AAGtD,MAAqB,UAAU;IAU7B,YAAa,MAAY,EAAE,QAAe,EAAE,QAAiB,EAAE,MAA2B,EAAE,gBAAuB,EAAE,EAAE,eAAwB,CAAC;QARhJ,cAAS,GAAU,CAAC,CAAA;QASlB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAGD,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAE,CAAA;QAC9D,IAAI,KAAK,IAAI,IAAI,EAAG;YAClB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;YACtC,OAAM;SACP;QAED,IAAG;YACD,MAAM,IAAI,CAAC,QAAQ,CAAE,KAAK,CAAE,CAAA;SAC7B;QAAA,OAAO,CAAK,EAAE;YACb,OAAO,CAAC,GAAG,CAAE,CAAC,CAAE,CAAA;SAEjB;gBAAO;YACN,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAE,IAAI,EAAE,KAAK,CAAE,CAAA;YAClD,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAE,IAAI,EAAE,KAAK,CAAE,CAAA;YACxD,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,CAAA;YAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;SAC7B;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,QAAe;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,QAAQ,CAAE,CAAA;QAClD,IAAI,MAAM,IAAI,SAAS,IAAI,MAAM,IAAI,CAAC;YAAI,OAAO,IAAI,CAAA;QAErD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAE,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAE,CAAA;QAElF,2BAA2B;QAC3B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAE,IAAI,EAAE,aAAa,CAAE,CAAA;QAE7E,+BAA+B;QAC/B,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC;YAAG,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAE,IAAI,EAAE,QAAQ,CAAE,CAAA;QAExE,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAE,KAAc;QACxC,IAAI,UAAU,GAAG,EAAE,CAAA;QAEnB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,yBAAyB;YACzB,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAE,EAAC;gBACzD,UAAU,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;aACxB;SACF;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,GAAG,IAAI,CAAC,QAAQ,aAAa,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,CAAC,GAAG,CAAE,iBAAiB,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;QAGpD,IAAI,IAAI,GAAG,MAAM,IAAA,cAAO,EAAE,CAAC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,IAAI,CAAE,CAAA;QAEnE,IAAG;YACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,IAAI,CAAC,iBAAiB,CAAE,CAAA;YACzE,IAAI,eAAe,GAAG,CAAC;gBAAG,OAAM;YAGhC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,WAAW,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAE,CAAA;YAC5F,IAAI,CAAC,kBAAkB;gBAAG,OAAM;YAEhC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvD,OAAO,CAAC,GAAG,CAAE,sBAAsB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;gBACxD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,IAAI,CAAC,aAAuB,EAAE,GAAG,EAAG,GAAG,IAAA,0BAAkB,EAAE,IAAI,CAAC,MAAM,CAAE,CAAC,CAAA;aAClG;SACF;QAAA,OAAO,CAAK,EAAE;YACb,MAAM,CAAC,CAAA;SACR;gBAAO;YACN,IAAA,kBAAW,EAAE,IAAI,CAAE,CAAA;SACpB;IACH,CAAC;IAED,mBAAmB,CAAE,KAAc;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAE,CAAA;IACpD,CAAC;IAED,yBAAyB,CAAE,KAAc;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,KAAK,CAAE,CAAA;IAC7D,CAAC;CAEF;AA1GD,6BA0GC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "woonplan-packages-redishelper",
3
- "version": "2.0.62",
3
+ "version": "2.0.64",
4
4
  "description": "",
5
5
  "author": "Jasper Denk <jasper@e-trias.nl>",
6
6
  "repository": "https://github.com/e-line-websolutions/woonplan-micro-energyio",