koatty_schedule 1.4.5 → 1.5.2

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/.eslintrc.js CHANGED
@@ -22,12 +22,13 @@ module.exports = {
22
22
  },
23
23
  rules: {
24
24
  "@typescript-eslint/no-explicit-any": "off",
25
- "@typescript-eslint/no-require-imports": "off",
25
+ // "@typescript-eslint/no-require-imports": "off",
26
26
  "@typescript-eslint/no-var-requires": "off",
27
27
  "@typescript-eslint/member-ordering": "off",
28
28
  "@typescript-eslint/consistent-type-assertions": "off",
29
29
  "@typescript-eslint/no-param-reassign": "off",
30
30
  "@typescript-eslint/no-empty-function": "off",
31
+ "@typescript-eslint/no-empty-interface": "off",
31
32
  "@typescript-eslint/explicit-module-boundary-types": "off",
32
33
  "@typescript-eslint/ban-types": ["error",
33
34
  {
package/CHANGELOG.md CHANGED
@@ -2,14 +2,8 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
- ### [1.4.5](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.4...v1.4.5) (2021-07-07)
5
+ ### [1.5.2](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.10...v1.5.2) (2021-12-02)
6
6
 
7
- ### [1.4.4](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.3...v1.4.4) (2021-07-01)
7
+ ### [1.4.10](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.8...v1.4.10) (2021-11-23)
8
8
 
9
- ### [1.4.3](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.2...v1.4.3) (2021-07-01)
10
-
11
- ### [1.4.2](https://github.com/thinkkoa/koatty_schedule/compare/v1.3.2...v1.4.2) (2021-07-01)
12
-
13
- ### [1.3.2](https://github.com/thinkkoa/koatty_schedule/compare/v1.3.1...v1.3.2) (2021-06-29)
14
-
15
- ### 1.3.1 (2021-06-23)
9
+ ### [1.4.8](https://github.com/thinkkoa/koatty_schedule/compare/v1.4.6...v1.4.8) (2021-11-20)
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  BSD 3-Clause License
2
2
 
3
- Copyright (c) 2020, ThinkKoa
3
+ Copyright (c) 2020, Koatty
4
4
  All rights reserved.
5
5
 
6
6
  Redistribution and use in source and binary forms, with or without
package/babel.config.js CHANGED
@@ -1,11 +1,6 @@
1
1
  /*
2
2
  * @Description : babel配置
3
3
  * @usage : 用于jest执行用例
4
- * @Date : 2020-10-19 23:08:40
5
- * @Author : fankerwang<fankerwang@tencent.com>
6
- * @LastEditors : fankerwang<fankerwang@tencent.com>
7
- * @LastEditTime : 2021-05-21 20:27:11
8
- * @FilePath : /tkoatty/babel.config.js
9
4
  */
10
5
 
11
6
  module.exports = {
package/dist/index.d.ts CHANGED
@@ -5,6 +5,21 @@
5
5
  * @ version: 2020-07-06 10:30:11
6
6
  */
7
7
  import "reflect-metadata";
8
+ import { Application } from "koatty_container";
9
+ interface LockerInterface {
10
+ getClient?: () => Promise<any>;
11
+ lock?: (key: string, expire?: number) => Promise<boolean>;
12
+ waitLock?: (key: string, expire: number, interval?: number, waitTime?: number) => Promise<boolean>;
13
+ unLock?: (key: string) => Promise<boolean>;
14
+ }
15
+ /**
16
+ * get instances of cacheStore
17
+ *
18
+ * @export
19
+ * @param {Application} app
20
+ * @returns {*} {CacheStore}
21
+ */
22
+ export declare function GetScheduleLocker(app: Application): Promise<LockerInterface>;
8
23
  /**
9
24
  * Schedule task
10
25
  *
@@ -51,3 +66,4 @@ export declare const Lock: typeof SchedulerLock;
51
66
  * @param {*} target
52
67
  */
53
68
  export declare function injectSchedule(target: any): void;
69
+ export {};
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.injectSchedule = exports.Lock = exports.SchedulerLock = exports.Scheduled = void 0;
3
+ exports.injectSchedule = exports.Lock = exports.SchedulerLock = exports.Scheduled = exports.GetScheduleLocker = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  /**
6
6
  * @ author: richen
@@ -11,7 +11,7 @@ const tslib_1 = require("tslib");
11
11
  // tslint:disable-next-line: no-import-side-effect
12
12
  require("reflect-metadata");
13
13
  const cron_1 = require("cron");
14
- const helper = tslib_1.__importStar(require("koatty_lib"));
14
+ const helper = (0, tslib_1.__importStar)(require("koatty_lib"));
15
15
  const koatty_logger_1 = require("koatty_logger");
16
16
  const koatty_container_1 = require("koatty_container");
17
17
  const locker_1 = require("./locker");
@@ -22,17 +22,21 @@ const ScheduleLocker = {
22
22
  locker: null,
23
23
  };
24
24
  /**
25
- * initiation CacheStore connection and client.
25
+ * get instances of cacheStore
26
26
  *
27
+ * @export
27
28
  * @param {Application} app
28
- * @returns {*} {Promise<LockerInterface>}
29
+ * @returns {*} {CacheStore}
29
30
  */
30
- async function InitCacheStore(app) {
31
+ async function GetScheduleLocker(app) {
31
32
  var _a;
32
33
  if (!ScheduleLocker.locker) {
33
34
  const opt = (_a = app.config("CacheStore", "db")) !== null && _a !== void 0 ? _a : {};
34
35
  if (helper.isEmpty(opt)) {
35
- koatty_logger_1.DefaultLogger.Warn(`Missing CacheStore server configuration. Please write a configuration item with the key name 'CacheStore' in the db.ts file.`);
36
+ koatty_logger_1.DefaultLogger.Warn(`Missing configuration. Please write a configuration item with the key name 'CacheStore' in the db.ts file.`);
37
+ }
38
+ if (opt.type !== "redis") {
39
+ throw Error(`ScheduleLocker depends on redis, please configure redis server. `);
36
40
  }
37
41
  const locker = locker_1.Locker.getInstance(opt);
38
42
  if (locker && helper.isFunction(locker.getClient)) {
@@ -40,11 +44,23 @@ async function InitCacheStore(app) {
40
44
  ScheduleLocker.locker = locker;
41
45
  }
42
46
  else {
43
- throw Error(`CacheStore connection failed. `);
47
+ throw Error(`Redis locker connection failed. `);
44
48
  }
45
49
  }
46
50
  return ScheduleLocker.locker;
47
51
  }
52
+ exports.GetScheduleLocker = GetScheduleLocker;
53
+ /**
54
+ * Initiation schedule locker client.
55
+ *
56
+ * @returns {*}
57
+ */
58
+ async function InitScheduleLocker() {
59
+ const app = koatty_container_1.IOCContainer.getApp();
60
+ app && app.once("appStart", async function () {
61
+ await GetScheduleLocker(app);
62
+ });
63
+ }
48
64
  /**
49
65
  * Schedule task
50
66
  *
@@ -146,7 +162,7 @@ function SchedulerLock(name, lockTimeOut, waitLockInterval, waitLockTimeOut) {
146
162
  }
147
163
  };
148
164
  // bind app_ready hook event
149
- bindSchedulerLockInit();
165
+ InitScheduleLocker();
150
166
  return descriptor;
151
167
  };
152
168
  }
@@ -163,16 +179,6 @@ exports.SchedulerLock = SchedulerLock;
163
179
  * @returns {MethodDecorator}
164
180
  */
165
181
  exports.Lock = SchedulerLock;
166
- /**
167
- * bind scheduler lock init event
168
- *
169
- */
170
- const bindSchedulerLockInit = function () {
171
- const app = koatty_container_1.IOCContainer.getApp();
172
- app && app.once("appStart", async function () {
173
- await InitCacheStore(app);
174
- });
175
- };
176
182
  /**
177
183
  *
178
184
  *
@@ -209,7 +215,7 @@ const execInjectSchedule = function (target, method, cron) {
209
215
  * @param {*} target
210
216
  */
211
217
  function injectSchedule(target) {
212
- const metaDatas = lib_1.recursiveGetMetadata(SCHEDULE_KEY, target);
218
+ const metaDatas = (0, lib_1.recursiveGetMetadata)(SCHEDULE_KEY, target);
213
219
  // tslint:disable-next-line: forin
214
220
  for (const meta in metaDatas) {
215
221
  for (const val of metaDatas[meta]) {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,kDAAkD;AAClD,4BAA0B;AAC1B,+BAA+B;AAC/B,gEAAqC;AACrC,iDAAwD;AACxD,uDAA6D;AAC7D,qCAAkC;AAClC,+BAA6C;AAG7C,MAAM,YAAY,GAAG,cAAc,CAAC;AAiBpC,GAAG;AACH,MAAM,cAAc,GAA4B;IAC5C,MAAM,EAAE,IAAI;CACf,CAAC;AAGF;;;;;;GAMG;AACI,KAAK,UAAU,iBAAiB,CAAC,GAAgB;;IACpD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;QACxB,MAAM,GAAG,GAAiB,MAAA,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,mCAAI,EAAE,CAAC;QAC/D,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACrB,6BAAM,CAAC,IAAI,CAAC,4GAA4G,CAAC,CAAC;SAC7H;QACD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,MAAM,KAAK,CAAC,kEAAkE,CAAC,CAAC;SACnF;QACD,MAAM,MAAM,GAAG,eAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC/C,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;YACzB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC;SAClC;aAAM;YACH,MAAM,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACnD;KACJ;IACD,OAAO,cAAc,CAAC,MAAM,CAAC;AACjC,CAAC;AAlBD,8CAkBC;AAGD;;;;GAIG;AACH,KAAK,UAAU,kBAAkB;IAC7B,MAAM,GAAG,GAAG,+BAAY,CAAC,MAAM,EAAE,CAAC;IAClC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK;QAC7B,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,CAAA;AACN,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,SAAS,CAAC,IAAY;IAClC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACtB,wBAAwB;QACxB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;KAClD;IAED,OAAO,CAAC,MAAM,EAAE,WAAmB,EAAE,UAA8B,EAAE,EAAE;QACnE,MAAM,aAAa,GAAG,+BAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,WAAW,EAAE;YAC9D,MAAM,KAAK,CAAC,0DAA0D,CAAC,CAAC;SAC3E;QACD,kDAAkD;QAClD,YAAY;QACZ,0BAA0B;QAC1B,2BAA2B;QAC3B,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC;AACN,CAAC;AAjBD,8BAiBC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,aAAa,CAAC,IAAa,EAAE,WAAoB,EAAE,gBAAyB,EAAE,eAAwB;IAClH,OAAO,CAAC,MAAW,EAAE,UAAkB,EAAE,UAA8B,EAAE,EAAE;QACvE,MAAM,aAAa,GAAG,+BAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,WAAW,EAAE;YAC9D,MAAM,KAAK,CAAC,0DAA0D,CAAC,CAAC;SAC3E;QACD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC;QACvD,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,MAAM,UAAU,GAAG,+BAAY,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC7G,IAAI,GAAG,GAAG,UAAU,IAAI,UAAU,EAAE,CAAC;SACxC;QAED,UAAU,GAAG;YACT,YAAY;YACZ,UAAU;YACV,QAAQ,EAAE,IAAI;YACd,KAAK,CAAC,KAAK,CAAC,GAAG,KAAY;gBACvB,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC;gBACxC,IAAI,UAAU,GAAG,KAAK,CAAC;gBACvB,IAAI,CAAC,SAAS,EAAE;oBACZ,MAAM,KAAK,CAAC,eAAe,IAAI,oCAAoC,UAAU,mBAAmB,CAAC,CAAC;iBACrG;gBACD,IAAI,gBAAgB,IAAI,eAAe,EAAE;oBACrC,UAAU,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,EACtC,WAAW,EACX,gBAAgB,EAChB,eAAe,CAClB,CAAC,KAAK,CAAC,CAAC,EAAO,EAAE,EAAE;wBAChB,6BAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBACjB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAC;iBACN;qBAAM;oBACH,UAAU,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,EAAO,EAAE,EAAE;wBACnE,6BAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBACjB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAC;iBACN;gBACD,IAAI,UAAU,EAAE;oBACZ,IAAI;wBACA,6BAAM,CAAC,IAAI,CAAC,eAAe,IAAI,aAAa,CAAC,CAAC;wBAC9C,4CAA4C;wBAC5C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;wBAC3C,OAAO,GAAG,CAAC;qBACd;oBAAC,OAAO,CAAC,EAAE;wBACR,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;qBAC5B;4BAAS;wBACN,IAAI,SAAS,CAAC,MAAM,EAAE;4BAClB,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAO,EAAE,EAAE;gCAC3C,6BAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;4BACrB,CAAC,CAAC,CAAC;yBACN;qBACJ;iBACJ;qBAAM;oBACH,6BAAM,CAAC,IAAI,CAAC,eAAe,IAAI,oCAAoC,UAAU,mBAAmB,CAAC,CAAC;oBAClG,OAAO;iBACV;YACL,CAAC;SACJ,CAAC;QAEF,6BAA6B;QAC7B,kBAAkB,EAAE,CAAC;QACrB,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AA/DD,sCA+DC;AAED;;;;;;;;;;GAUG;AACU,QAAA,IAAI,GAAG,aAAa,CAAC;AAElC;;;;;;;GAOG;AACH,MAAM,kBAAkB,GAAG,UAAU,MAAW,EAAE,MAAc,EAAE,IAAY;IAC1E,MAAM,GAAG,GAAG,+BAAY,CAAC,MAAM,EAAE,CAAC;IAClC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QAC7B,MAAM,UAAU,GAAG,+BAAY,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,+BAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAQ,+BAAY,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAElE,IAAI,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE;YACzD,6BAAM,CAAC,KAAK,CAAC,mBAAmB,UAAU,kBAAkB,MAAM,cAAc,IAAI,EAAE,CAAC,CAAC;YACxF,IAAI,cAAO,CAAC,IAAI,EAAE,KAAK;gBACnB,6BAAM,CAAC,IAAI,CAAC,oBAAoB,UAAU,IAAI,MAAM,WAAW,CAAC,CAAC;gBACjE,IAAI;oBACA,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACrC,OAAO,GAAG,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACR,6BAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACnB;YACL,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;SACd;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAAW;IACtC,MAAM,SAAS,GAAG,IAAA,0BAAoB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC7D,kCAAkC;IAClC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC1B,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAClB,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;aAC9C;SACJ;KACJ;AACL,CAAC;AAVD,wCAUC"}
package/dist/locker.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { CacheStore } from "koatty_store";
1
+ import { StoreOptions } from "koatty_store";
2
2
  export declare class Locker {
3
3
  lockMap: Map<any, any>;
4
4
  options: any;
@@ -9,15 +9,15 @@ export declare class Locker {
9
9
  *
10
10
  *
11
11
  * @static
12
- * @param {CacheStore} options
12
+ * @param {StoreOptions} options
13
13
  * @param {boolean} [force=false]
14
14
  * @returns
15
15
  * @memberof Locker
16
16
  */
17
- static getInstance(options: CacheStore, force?: boolean): Locker;
17
+ static getInstance(options: StoreOptions, force?: boolean): Locker;
18
18
  /**
19
19
  * Creates an instance of Locker.
20
- * @param {CacheStore} options
20
+ * @param {StoreOptions} options
21
21
  * @memberof Locker
22
22
  */
23
23
  private constructor();
package/dist/locker.js CHANGED
@@ -8,7 +8,7 @@ const tslib_1 = require("tslib");
8
8
  * @ license: MIT
9
9
  * @ version: 2020-06-05 09:40:35
10
10
  */
11
- const crypto = tslib_1.__importStar(require("crypto"));
11
+ const crypto = (0, tslib_1.__importStar)(require("crypto"));
12
12
  const koatty_store_1 = require("koatty_store");
13
13
  const koatty_logger_1 = require("koatty_logger");
14
14
  /**
@@ -23,7 +23,7 @@ const delay = function (ms = 1000) {
23
23
  class Locker {
24
24
  /**
25
25
  * Creates an instance of Locker.
26
- * @param {CacheStore} options
26
+ * @param {StoreOptions} options
27
27
  * @memberof Locker
28
28
  */
29
29
  constructor(options) {
@@ -36,7 +36,7 @@ class Locker {
36
36
  *
37
37
  *
38
38
  * @static
39
- * @param {CacheStore} options
39
+ * @param {StoreOptions} options
40
40
  * @param {boolean} [force=false]
41
41
  * @returns
42
42
  * @memberof Locker
@@ -1 +1 @@
1
- {"version":3,"file":"locker.js","sourceRoot":"","sources":["../src/locker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"locker.js","sourceRoot":"","sources":["../src/locker.ts"],"names":[],"mappings":"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"}
package/jest.config.js CHANGED
@@ -14,14 +14,21 @@ module.exports = {
14
14
  'jest-html-reporters'
15
15
  ], // 测试用例报告
16
16
  collectCoverage: true, // 是否收集测试时的覆盖率信息
17
- coverageReporters: ['html', 'lcov', 'json', 'text', 'clover', 'text-summary'], // 收集测试时的覆盖率信息
17
+ coverageReporters: [
18
+ 'html',
19
+ 'lcov',
20
+ 'json',
21
+ 'text',
22
+ 'clover',
23
+ 'text-summary',
24
+ ], // 收集测试时的覆盖率信息
18
25
  // 将 `ts-jest` 的配置注入到运行时的全局变量中
19
26
  globals: {
20
27
  'ts-jest': {
21
28
  // 是否使用 babel 配置来转译
22
29
  babelConfig: true,
23
30
  // 编译 Typescript 所依赖的配置
24
- tsConfig: '<rootDir>/tsconfig.json',
31
+ tsconfig: '<rootDir>/tsconfig.json',
25
32
  // 是否启用报告诊断,这里是不启用
26
33
  diagnostics: false,
27
34
  },
@@ -1,5 +1,5 @@
1
1
  <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Type" content="text/html;charset=utf-8"><meta name="keywords" contect="jest, reporters"><meta name="author" contect="hazyzh"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,minimum-scale=1,maximum-scale=1"><link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAHX0lEQVR4Xu2bfWwUVRDAZ/buSsG0Vxq1EAhtL/e2kKISAVEoKJVE4gfiR6wmJsoflpBANLZKqyRIgVg+/CLBNqKoMX5RKWhFsUbRBuJHRCoECLt7x0Jb5IBmr62tx+3dPrNH93Itd7e7xx0ccu+/dmfmzfz2vXmzu3MI1/jAazx+yADIrIBrnMDl2gK4atWqF8+ePXufx+OZFAgEbLG422w2/8SJE7fW1dXVAgBN9f1JOYD6+vqb2trafhUEYZSZYAghA3Pnzp1eXV19xIyeWdmUAli2bNmIY8eOeUVRzDbrmCo/duzYwPz580tqa2vdiegb0UkpgKVLl/7c2to6R3OEYRgoLS2F7OzoPHw+Hxw+fBgURQn7Xl5efqCxsfFWI8EkIpMQAIfDMc1iscxHxFmU0pGxJs7Pz79TkqTQZYfDAVu2bIHx48fH9bOvrw8WL14M+/fvD8nl5uZCT0/Pz1GU/ADQBQBuRPzF7/fvFUXRZxaCKQDFxcUlVqv1NUS8T28iu92uOh4WW7duHSxcuFBPLXR9586dsHz58rBsXl4eeL1ePd1/AGDjwMDA+s7Ozn/1hLXrhgGwLHsbpfQ7RMwzYvwKAAi5RSnlFUUpc7lcZ4z4aQiA0+m8HRF/QMSLMjmlVKV9FAD6hk84bty4OadOnQrNMXXqVGhoaAAVTLzR0dEBlZWV4HZfyHs5OTnQ29sbbQuol7MAYAYiMpE2KaVuWZZniaJ4Wg+CLgCWZR0A8AcAjNaMUUp9iLg6EAg0ud1uIdZ5XVVVtb2lpeVhTS/BJPhnY2Pj1FiBFBUVjcnKylpBKV0yDMTBnp6emR6Ppz8eBF0AhJAmRHw0IvjfZFl+XBRFUY9uZWWlzev1dra3t9+oJxvtupljkGXZ6QDQBACFEbZe5ziuKmEAhJBJiBguRCilXbIsTxZFUTcjaZOqECwWy762trbpsiwb4mCz2aCsrKydZdkFVVVVHYaUAIAQMgURfxvcGmo++BcRJ3Acdy6WjbgrgGXZegAIp2NFUR4UBOErow5FyqkVocfjqQ8Gg9fF07dYLP0FBQU1NTU1hxKZhxBSjYgbIlbsCzzPb0wIACHkCCJOGsyuB3iej1qQ9PrPPaUAPJ2Iw8nSQUBRAeat0VmjDxFCuhFRy7b7OI4rSwQAEkKCiBhaJYqi1AqCoK6I8JColIdycAcA3pWsQC7VDgW6aMbkmWrB8eCgLZnjOPW0iDpibgGn03kDwzDhs1RRlApBELYNAXC++xVEWHmpTidb/57Z974vSdIizW5/f//1XV1d3dHmiQnA4XAQq9XKaUrBYPBel8v1baQRr79brXMNFUbJDjKevZerV/z+/e4fbovwnbhcLvW4vmgkDECiUhHKyvHLGZjRuerrNpxo3tYcPg6DwWAKAMjSXUiVPUadupxyGQCZFZDZApkckBZJ8KjPBd/3tEXNfzmWHLg/rxxusOYnPT+mRRI8T/1wx5FHoDd40WuCcMB2Sw7smfgJ5FpykgohLQCogd96+AHdwL4peR/YEcW6cmYE0gKA6vAbnvdgs+ejmL7Ps8+ChsI1gEn+RJk2AMzctWTKZgBkCqFMIZQphNKiEEpmYjNjK5ME0ykJquVwb6DXzA0cIuvILjRdLqfNCqjpWAdfSEPeopkGUWC7HlrIu5BvNf7mLS0AdAckmHHkIdMBR1PYXFgH99jDbQa6NtMCgAIKzDlaAafls7oOxxNQy+RdJVtNPS+kBQA1qE7/39As7b4kAJNHlkB57kxTNtIGgCmvkyicAZBOx2ASb6xhU5kVkFkBSXgaLCkpKVZ7bbR1N/zboJTOX4ZWrz/Z/PmOCZrviqI4BUFwRdtDMb8NFhQUXGe329XWs9BQFOVJQRA+1v5OZwA1z7/094+te8Zqvvp8vvyTJ09eaFgcNuJ2iBBCehAxV9WhlK7leX7F1QCgYsETfcfdovaqOcBxXMzmbL0WmR0AoHU3HuI47uYwAL80BUE5YDg1XyZBz+kz8MA8rTciNOlejuNmx5o+LgCn0/kkwzCRr3UXcxz3jmbM6+9OeTu7WW51K9bA1zt3hdUURXleEIQ3EgJQWlqaJcvyCQAYM7gNfMFg8Ba32x1qnJD83R8gwFNmnUyV/Jfbv4K1K1+NNN/n8/kKY+1/VVC3T9DpdC5hGOZtzSqlVH26WcTz/C61Rwhk5ScEuCVVQRm1+8mHn8KbGzYNEaeUPsvz/NB/mkmCmizLsp8BQEWkLqV0OwBsav299WDeqNznAOBpxCFNikZ9T0iuv78fXLwbXLwLvm3ZDe1//jXcThPHcY/pGdddAYMGbISQTxHxET2D6XCdUvoFz/NPAEBAzx+jAFQ7DMuyjQDwjJ7RK3mdUtrA8/xStXQx4ocZACF76o8lrFbrKkrp3Yg4wsgkqZahlJ5Xu9kDgcBKt9utNnYbHqYBRFi2OZ3OaYhYRCktZBgmod8FGfZ0mCCldEB950IpPS4Ighq0sUbkRJJgok5eDXqXsgKuhvh0fcwA0EX0Pxf4Dws8WYyVxouxAAAAAElFTkSuQmCC"></head><title>Report</title><body><div id="app"></div><textarea style="display: none;" id="resData">
2
- "{\"numFailedTestSuites\":0,\"numFailedTests\":0,\"numPassedTestSuites\":0,\"numPassedTests\":0,\"numPendingTestSuites\":0,\"numPendingTests\":0,\"numRuntimeErrorTestSuites\":0,\"numTodoTests\":0,\"numTotalTestSuites\":0,\"numTotalTests\":0,\"openHandles\":[],\"snapshot\":{\"added\":0,\"didUpdate\":false,\"failure\":false,\"filesAdded\":0,\"filesRemoved\":0,\"filesRemovedList\":[],\"filesUnmatched\":0,\"filesUpdated\":0,\"matched\":0,\"total\":0,\"unchecked\":0,\"uncheckedKeysByFile\":[],\"unmatched\":0,\"updated\":0},\"startTime\":1625627149788,\"success\":false,\"testResults\":[],\"wasInterrupted\":false,\"coverageMap\":{},\"config\":{\"bail\":0,\"changedFilesWithAncestor\":false,\"collectCoverage\":true,\"collectCoverageFrom\":[],\"coverageDirectory\":\"/Users/richen/Workspace/nodejs/koatty_schedule/coverage\",\"coverageProvider\":\"babel\",\"coverageReporters\":[\"html\",\"lcov\",\"json\",\"text\",\"clover\",\"text-summary\"],\"detectLeaks\":false,\"detectOpenHandles\":false,\"errorOnDeprecated\":false,\"expand\":false,\"findRelatedTests\":false,\"forceExit\":false,\"json\":false,\"lastCommit\":false,\"listTests\":false,\"logHeapUsage\":false,\"maxConcurrency\":5,\"maxWorkers\":7,\"noStackTrace\":false,\"nonFlagArgs\":[],\"notify\":false,\"notifyMode\":\"failure-change\",\"onlyChanged\":false,\"onlyFailures\":false,\"passWithNoTests\":true,\"projects\":[],\"reporters\":[[\"default\",{}],[\"/Users/richen/Workspace/nodejs/koatty_schedule/node_modules/jest-html-reporters/index.js\",{}]],\"rootDir\":\"/Users/richen/Workspace/nodejs/koatty_schedule\",\"runTestsByPath\":false,\"skipFilter\":false,\"testFailureExitCode\":1,\"testPathPattern\":\"\",\"testSequencer\":\"/Users/richen/Workspace/nodejs/koatty_schedule/node_modules/@jest/test-sequencer/build/index.js\",\"updateSnapshot\":\"new\",\"useStderr\":false,\"watch\":false,\"watchAll\":false,\"watchman\":true},\"endTime\":1625627149833,\"_reporterOptions\":{\"publicPath\":\"/Users/richen/Workspace/nodejs/koatty_schedule\",\"filename\":\"jest_html_reporters.html\",\"expand\":false,\"pageTitle\":\"\",\"hideIcon\":false,\"testCommand\":\"npx jest\",\"openReport\":false,\"multipleReportsUnitePath\":\"\",\"failureMessageOnly\":false,\"enableMergeData\":false,\"dataMergeLevel\":1},\"attachInfos\":{}}"
2
+ "{\"numFailedTestSuites\":0,\"numFailedTests\":0,\"numPassedTestSuites\":0,\"numPassedTests\":0,\"numPendingTestSuites\":0,\"numPendingTests\":0,\"numRuntimeErrorTestSuites\":0,\"numTodoTests\":0,\"numTotalTestSuites\":0,\"numTotalTests\":0,\"openHandles\":[],\"snapshot\":{\"added\":0,\"didUpdate\":false,\"failure\":false,\"filesAdded\":0,\"filesRemoved\":0,\"filesRemovedList\":[],\"filesUnmatched\":0,\"filesUpdated\":0,\"matched\":0,\"total\":0,\"unchecked\":0,\"uncheckedKeysByFile\":[],\"unmatched\":0,\"updated\":0},\"startTime\":1638435192993,\"success\":false,\"testResults\":[],\"wasInterrupted\":false,\"coverageMap\":{},\"config\":{\"bail\":0,\"changedFilesWithAncestor\":false,\"collectCoverage\":true,\"collectCoverageFrom\":[],\"coverageDirectory\":\"/Users/richen/Workspace/nodejs/koatty_schedule/coverage\",\"coverageProvider\":\"babel\",\"coverageReporters\":[\"html\",\"lcov\",\"json\",\"text\",\"clover\",\"text-summary\"],\"detectLeaks\":false,\"detectOpenHandles\":false,\"errorOnDeprecated\":false,\"expand\":false,\"findRelatedTests\":false,\"forceExit\":false,\"json\":false,\"lastCommit\":false,\"listTests\":false,\"logHeapUsage\":false,\"maxConcurrency\":5,\"maxWorkers\":7,\"noStackTrace\":false,\"nonFlagArgs\":[],\"notify\":false,\"notifyMode\":\"failure-change\",\"onlyChanged\":false,\"onlyFailures\":false,\"passWithNoTests\":true,\"projects\":[],\"reporters\":[[\"default\",{}],[\"/Users/richen/Workspace/nodejs/koatty_schedule/node_modules/jest-html-reporters/index.js\",{}]],\"rootDir\":\"/Users/richen/Workspace/nodejs/koatty_schedule\",\"runTestsByPath\":false,\"skipFilter\":false,\"testFailureExitCode\":1,\"testPathPattern\":\"\",\"testSequencer\":\"/Users/richen/Workspace/nodejs/koatty_schedule/node_modules/@jest/test-sequencer/build/index.js\",\"updateSnapshot\":\"new\",\"useStderr\":false,\"watch\":false,\"watchAll\":false,\"watchman\":true},\"endTime\":1638435193035,\"_reporterOptions\":{\"publicPath\":\"/Users/richen/Workspace/nodejs/koatty_schedule\",\"filename\":\"jest_html_reporters.html\",\"expand\":false,\"pageTitle\":\"\",\"hideIcon\":false,\"testCommand\":\"npx jest\",\"openReport\":false,\"multipleReportsUnitePath\":\"\",\"failureMessageOnly\":false,\"enableMergeData\":false,\"dataMergeLevel\":1},\"attachInfos\":{}}"
3
3
  </textarea><script>/*! Copyright Harry All rights reserved. */!function(n){var r={};function o(t){if(r[t])return r[t].exports;var e=r[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,o),e.l=!0,e.exports}o.m=n,o.c=r,o.d=function(t,e,n){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)o.d(n,r,function(t){return e[t]}.bind(null,r));return n},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="",o(o.s=1103)}([function(t,e,n){"use strict";t.exports=n(447)},function(t,e,n){t.exports=n(905)()},function(t,e,n){var r;
4
4
  /*!
5
5
  Copyright (c) 2017 Jed Watson.
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "koatty_schedule",
3
- "version": "1.4.5",
3
+ "version": "1.5.2",
4
4
  "description": "Schedule for koatty.",
5
5
  "scripts": {
6
6
  "build": "del-cli --force dist && tsc",
7
7
  "eslint": "eslint --ext .ts,.js ./",
8
8
  "prepublishOnly": "npm test && npm run build",
9
- "release": "npm run build && standard-version",
9
+ "release": "npm run prepublishOnly && standard-version",
10
+ "pub": "git push --follow-tags origin && npm publish",
10
11
  "test": "npm run eslint && jest --passWithNoTests",
11
12
  "test:cov": "jest --collectCoverage --detectOpenHandles",
12
13
  "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
@@ -28,7 +29,7 @@
28
29
  "name": "richenlin",
29
30
  "email": "richenlin@gmail.com"
30
31
  },
31
- "license": "MIT",
32
+ "license": "BSD-3-Clause",
32
33
  "bugs": {
33
34
  "url": "https://github.com/thinkkoa/koatty_schedule/issues"
34
35
  },
@@ -45,24 +46,20 @@
45
46
  "@babel/preset-env": "^7.x.x",
46
47
  "@babel/preset-typescript": "^7.x.x",
47
48
  "@commitlint/cli": "^12.x.x",
48
- "@commitlint/config-conventional": "^12.x.x",
49
- "@types/cls-hooked": "^4.x.x",
50
- "@types/cron": "^1.x.x",
51
- "@types/ioredis": "^4.26.4",
52
- "@types/jest": "^26.0.23",
53
- "@types/koa": "^2.13.3",
54
- "@types/node": "^12.x.x",
55
- "@typescript-eslint/eslint-plugin": "^4.x.x",
56
- "@typescript-eslint/parser": "^4.x.x",
49
+ "@commitlint/config-conventional": "^15.x.x",
50
+ "@types/cron": "^1.7.3",
51
+ "@types/jest": "^27.x.x",
52
+ "@types/koa": "^2.x.x",
53
+ "@types/node": "^16.x.x",
54
+ "@typescript-eslint/eslint-plugin": "^5.x.x",
55
+ "@typescript-eslint/parser": "^5.x.x",
57
56
  "conventional-changelog-cli": "^2.x.x",
58
- "del-cli": "^3.x.x",
59
- "eslint": "^7.x.x",
60
- "eslint-plugin-jest": "^24.x.x",
61
- "husky": "^6.x.x",
62
- "jest": "^27.0.4",
57
+ "del-cli": "^4.x.x",
58
+ "eslint": "^8.x.x",
59
+ "eslint-plugin-jest": "^25.x.x",
60
+ "husky": "^7.x.x",
61
+ "jest": "^27.x.x",
63
62
  "jest-html-reporters": "^2.x.x",
64
- "koatty_cacheable": "^1.x.x",
65
- "koatty_schedule": "^1.x.x",
66
63
  "standard-version": "^9.x.x",
67
64
  "ts-jest": "^27.x.x",
68
65
  "ts-node": "^10.x.x",
@@ -75,7 +72,7 @@
75
72
  "koatty_logger": "^1.x.x",
76
73
  "koatty_store": "^1.x.x",
77
74
  "reflect-metadata": "^0.1.13",
78
- "tslib": "^2.3.0"
75
+ "tslib": "^2.3.1"
79
76
  },
80
77
  "husky": {
81
78
  "hooks": {
package/tsconfig.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "compilerOptions": {
3
3
  /* Basic Options */
4
- "target": "es2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
4
+ "target": "ES2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
5
5
  "module": "commonjs" /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
6
6
  "lib": [
7
7
  "es2019"
@@ -42,7 +42,8 @@
42
42
  // "./typings/*"
43
43
  ] /* List of folders to include type definitions from. */,
44
44
  "types": [
45
- "node"
45
+ "node",
46
+ "jest"
46
47
  ] /* Type declaration files to be included in compilation. */,
47
48
  "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
48
49
  "resolveJsonModule": true,