@clairejs/server 3.16.11 → 3.16.13

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/README.md CHANGED
@@ -1,7 +1,9 @@
1
1
  ## Change Log
2
2
 
3
- #### 3.16.11:
3
+ #### 3.16.13:
4
4
 
5
+ - fix AbstractJob
6
+ - fix LocalJobScheduler
5
7
  - add abstract job model, default job repo
6
8
 
7
9
  #### 3.16.10:
@@ -1,9 +1,9 @@
1
- import { AbstractLogger } from "@clairejs/core";
1
+ import { AbstractLogger, IInit } from "@clairejs/core";
2
2
  import Redis from "ioredis";
3
3
  import { AbstractJobScheduler } from "./AbstractJobScheduler";
4
4
  import { JobInfo, ScheduledJob } from "./interfaces";
5
5
  import { AbstractJobRepository } from "./AbstractJobRepository";
6
- export declare class LocalJobScheduler extends AbstractJobScheduler {
6
+ export declare class LocalJobScheduler extends AbstractJobScheduler implements IInit {
7
7
  protected readonly logger: AbstractLogger;
8
8
  protected readonly redisClient: Redis;
9
9
  protected readonly subscribeClient: Redis;
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
- import { AbstractLogger, Errors, LogContext } from "@clairejs/core";
10
+ import { AbstractLogger, Errors, Initable, LogContext } from "@clairejs/core";
11
11
  import Redis from "ioredis";
12
12
  import Redlock from "redlock";
13
13
  import scheduler from "node-schedule";
@@ -150,8 +150,6 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
150
150
  if (this.mutexHoldInterval) {
151
151
  clearInterval(this.mutexHoldInterval);
152
152
  }
153
- this.redisClient.quit();
154
- this.subscribeClient.quit();
155
153
  for (const interval of this.intervals) {
156
154
  clearInterval(interval);
157
155
  }
@@ -265,6 +263,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
265
263
  };
266
264
  LocalJobScheduler = __decorate([
267
265
  LogContext(),
266
+ Initable(),
268
267
  __metadata("design:paramtypes", [AbstractLogger,
269
268
  Redis,
270
269
  Redis,
@@ -2,11 +2,11 @@ import { Constructor } from "@clairejs/core";
2
2
  import { IQueryProvider } from "@clairejs/orm";
3
3
  import { CustomJobInfo } from "./interfaces";
4
4
  import { AbstractJobRepository } from "./AbstractJobRepository";
5
- import { AbstractJobModel } from "./job";
5
+ import { AbstractJob } from "./job";
6
6
  export declare class DefaultJobRepository extends AbstractJobRepository {
7
- protected readonly model: Constructor<AbstractJobModel>;
7
+ protected readonly model: Constructor<AbstractJob>;
8
8
  protected readonly db: IQueryProvider;
9
- constructor(model: Constructor<AbstractJobModel>, db: IQueryProvider);
9
+ constructor(model: Constructor<AbstractJob>, db: IQueryProvider);
10
10
  getJobs(): Promise<CustomJobInfo[]>;
11
11
  saveJob(jobInfo: CustomJobInfo): Promise<string>;
12
12
  removeJobById(jobId: string): Promise<void>;
package/dist/job/job.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AbstractModel } from "@clairejs/core";
2
2
  import { CustomJobInfo } from "./interfaces";
3
- export declare abstract class AbstractJobModel extends AbstractModel implements CustomJobInfo {
3
+ export declare abstract class AbstractJob extends AbstractModel implements CustomJobInfo {
4
4
  jobName: string;
5
5
  at: number;
6
6
  params?: any[];
package/dist/job/job.js CHANGED
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
10
  import { AbstractModel, Column, DataType } from "@clairejs/core";
11
- export class AbstractJobModel extends AbstractModel {
11
+ export class AbstractJob extends AbstractModel {
12
12
  jobName;
13
13
  at;
14
14
  params;
@@ -19,18 +19,19 @@ __decorate([
19
19
  isRequired: true,
20
20
  }),
21
21
  __metadata("design:type", String)
22
- ], AbstractJobModel.prototype, "jobName", void 0);
22
+ ], AbstractJob.prototype, "jobName", void 0);
23
23
  __decorate([
24
24
  Column({
25
25
  description: "Unix timestamp this job will be triggered",
26
26
  isRequired: true,
27
+ isTimestamp: true,
27
28
  }),
28
29
  __metadata("design:type", Number)
29
- ], AbstractJobModel.prototype, "at", void 0);
30
+ ], AbstractJob.prototype, "at", void 0);
30
31
  __decorate([
31
32
  Column({
32
33
  description: "The associated params with this job",
33
34
  vectorProps: { elementDataType: DataType.OBJECT },
34
35
  }),
35
36
  __metadata("design:type", Array)
36
- ], AbstractJobModel.prototype, "params", void 0);
37
+ ], AbstractJob.prototype, "params", void 0);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@clairejs/server",
3
- "version": "3.16.11",
3
+ "version": "3.16.13",
4
4
  "description": "Claire server NodeJs framework written in Typescript.",
5
5
  "types": "dist/index.d.ts",
6
6
  "main": "dist/index.js",