@eggjs/tegg-background-task 3.51.2 → 4.0.0-beta.1

package/README.md

@@ -1,6 +1,7 @@
 # `@eggjs/tegg-background-task`
 
 ## install
+
 ```sh
 npm i --save @eggjs/tegg-background-task
 ```
@@ -31,6 +32,6 @@ Please use the `backgroundTaskHelper`, the release process will wait all the bac
 ## Timeout
 
 The release process will wait tasks done, but not forever. The default timeout is 5s, if task will cost more than 5s, two ways to resolve
+
 - use the `SingletonProto` to do the work, `SingletonProto` never release
 - set longer timeout to `backgroundTaskHelper.timeout`
-

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eggjs/tegg-background-task",
   "description": "background util for tegg",
-  "version": "3.51.2",
+  "version": "4.0.0-beta.1",
   "keywords": [
     "egg",
     "typescript",
@@ -9,18 +9,22 @@
     "async",
     "tegg"
   ],
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    }
+  },
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "src/**/*.js",
+    "src/**/*.d.ts"
   ],
-  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "cross-env NODE_ENV=test NODE_OPTIONS='--no-deprecation' mocha",
     "clean": "tsc -b --clean",
     "tsc": "npm run clean && tsc -p ./tsconfig.json",
-    "tsc:pub": "npm run clean && tsc -p ./tsconfig.pub.json",
-    "prepublishOnly": "npm run tsc:pub"
+    "tsc:pub": "npm run tsc",
+    "prepublishOnly": "npm run tsc"
   },
   "homepage": "https://github.com/eggjs/tegg",
   "bugs": {
@@ -32,28 +36,26 @@
     "directory": "core/background-task"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=20.0.0"
   },
   "author": "killagu <killa123@126.com>",
   "license": "MIT",
   "dependencies": {
-    "@eggjs/core-decorator": "^3.51.2",
-    "@eggjs/tegg-lifecycle": "^3.51.2",
-    "@eggjs/tegg-runtime": "^3.51.2",
-    "@eggjs/tegg-types": "^3.51.2"
+    "@eggjs/core-decorator": "^4.0.0-beta.1",
+    "@eggjs/tegg-lifecycle": "^4.0.0-beta.1",
+    "@eggjs/tegg-runtime": "^4.0.0-beta.1",
+    "@eggjs/tegg-types": "^4.0.0-beta.1"
   },
   "devDependencies": {
-    "@eggjs/tegg-common-util": "^3.51.2",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.2.4",
-    "cross-env": "^7.0.3",
-    "egg": "^3.9.1",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "@eggjs/tegg-common-util": "^4.0.0-beta.1",
+    "@types/node": "22",
+    "egg": "4",
+    "mocha": "10",
+    "ts-node": "10",
+    "typescript": "5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b310ec3c772067b98b4f91342d877bebcee4e673"
+  "gitHead": "79a22905272d6de7fe06152231dff65d213d9166"
 }

package/src/BackgroundTaskHelper.js

@@ -0,0 +1,114 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import assert from 'node:assert';
+import { ContextProto, Inject } from '@eggjs/core-decorator';
+import { AccessLevel } from '@eggjs/tegg-types';
+import { ContextHandler, EggContextLifecycleUtil } from '@eggjs/tegg-runtime';
+let BackgroundTaskHelper = class BackgroundTaskHelper {
+    logger;
+    // default timeout for async task
+    timeout = 5000;
+    config;
+    backgroundTasks = [];
+    async init() {
+        const ctx = ContextHandler.getContext();
+        assert(ctx, 'background task helper must be init in context');
+        EggContextLifecycleUtil.registerObjectLifecycle(ctx, {
+            preDestroy: async () => {
+                await this.doPreDestroy();
+            },
+        });
+        if (this.config.backgroundTask?.timeout) {
+            this.timeout = this.config.backgroundTask.timeout;
+        }
+    }
+    run(fn) {
+        const backgroundTask = new Promise(resolve => {
+            try {
+                fn()
+                    // fn is resolve, resolve the task
+                    .then(resolve)
+                    .catch(e => {
+                    e.message = '[BackgroundTaskHelper] background throw error:' + e.message;
+                    this.logger.error(e);
+                    // fn is rejected, resolve the task
+                    resolve();
+                });
+            }
+            catch (e) {
+                e.message = '[BackgroundTaskHelper] create background throw error:' + e.message;
+                this.logger.error(e);
+                // create task failed, resolve the task
+                resolve();
+            }
+        });
+        this.backgroundTasks.push(backgroundTask);
+    }
+    async doPreDestroy() {
+        // quick quit
+        if (!this.backgroundTasks.length)
+            return;
+        const backgroundTasks = this.backgroundTasks.slice();
+        if (this.timeout <= 0 || this.timeout === Infinity) {
+            await Promise.all(backgroundTasks);
+        }
+        else {
+            const { promise: timeout, resolve } = this.sleep();
+            await Promise.race([
+                // not block the pre destroy process too long
+                timeout,
+                // ensure all background task are done before destroy the context
+                Promise.all(backgroundTasks),
+            ]);
+            // always resolve the sleep promise
+            resolve();
+        }
+        if (this.backgroundTasks.length !== backgroundTasks.length) {
+            this.backgroundTasks = this.backgroundTasks.slice(backgroundTasks.length);
+            return this.doPreDestroy();
+        }
+    }
+    sleep() {
+        let timer;
+        let promiseResolve;
+        const now = Date.now();
+        const p = new Promise(r => {
+            promiseResolve = r;
+            timer = setTimeout(() => {
+                this.logger.error(`[BackgroundTaskHelper] task is timeout actual is ${Date.now() - now} expect is ${this.timeout}`);
+                r();
+            }, this.timeout);
+        });
+        function resolve() {
+            // clear timeout and resolve the promise
+            clearTimeout(timer);
+            promiseResolve();
+        }
+        return {
+            promise: p,
+            resolve,
+        };
+    }
+};
+__decorate([
+    Inject(),
+    __metadata("design:type", Function)
+], BackgroundTaskHelper.prototype, "logger", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", Object)
+], BackgroundTaskHelper.prototype, "config", void 0);
+BackgroundTaskHelper = __decorate([
+    ContextProto({
+        accessLevel: AccessLevel.PUBLIC,
+    })
+], BackgroundTaskHelper);
+export { BackgroundTaskHelper };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFja2dyb3VuZFRhc2tIZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJCYWNrZ3JvdW5kVGFza0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFFakMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsT0FBTyxFQUFFLGNBQWMsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBS3ZFLElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQW9CO0lBRS9CLE1BQU0sQ0FBWTtJQUVsQixpQ0FBaUM7SUFDakMsT0FBTyxHQUFHLElBQUksQ0FBQztJQUdmLE1BQU0sQ0FBZTtJQUViLGVBQWUsR0FBeUIsRUFBRSxDQUFDO0lBRW5ELEtBQUssQ0FBQyxJQUFJO1FBQ1IsTUFBTSxHQUFHLEdBQUcsY0FBYyxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsZ0RBQWdELENBQUMsQ0FBQztRQUM5RCx1QkFBdUIsQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUU7WUFDbkQsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFO2dCQUNyQixNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUM1QixDQUFDO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsRUFBRSxPQUFPLEVBQUUsQ0FBQztZQUN4QyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQztRQUNwRCxDQUFDO0lBQ0gsQ0FBQztJQUVELEdBQUcsQ0FBQyxFQUF1QjtRQUN6QixNQUFNLGNBQWMsR0FBRyxJQUFJLE9BQU8sQ0FBTyxPQUFPLENBQUMsRUFB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

package/src/index.d.ts

@@ -0,0 +1 @@
+export * from './BackgroundTaskHelper.js';

package/src/index.js

@@ -0,0 +1,2 @@
+export * from './BackgroundTaskHelper.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDIn0=

package/dist/index.d.ts

@@ -1 +0,0 @@
-export * from './src/BackgroundTaskHelper';

package/dist/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/BackgroundTaskHelper"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQTJDIn0=

package/dist/src/BackgroundTaskHelper.js

@@ -1,121 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BackgroundTaskHelper = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const core_decorator_1 = require("@eggjs/core-decorator");
-const tegg_types_1 = require("@eggjs/tegg-types");
-const tegg_runtime_1 = require("@eggjs/tegg-runtime");
-let BackgroundTaskHelper = class BackgroundTaskHelper {
-    constructor() {
-        // default timeout for async task
-        this.timeout = 5000;
-        this.backgroundTasks = [];
-    }
-    async init() {
-        var _a;
-        const ctx = tegg_runtime_1.ContextHandler.getContext();
-        (0, node_assert_1.default)(ctx, 'background task helper must be init in context');
-        tegg_runtime_1.EggContextLifecycleUtil.registerObjectLifecycle(ctx, {
-            preDestroy: async () => {
-                await this.doPreDestroy();
-            },
-        });
-        if ((_a = this.config.backgroundTask) === null || _a === void 0 ? void 0 : _a.timeout) {
-            this.timeout = this.config.backgroundTask.timeout;
-        }
-    }
-    run(fn) {
-        const backgroundTask = new Promise(resolve => {
-            try {
-                fn()
-                    // fn is resolve, resolve the task
-                    .then(resolve)
-                    .catch(e => {
-                    e.message = '[BackgroundTaskHelper] background throw error:' + e.message;
-                    this.logger.error(e);
-                    // fn is rejected, resolve the task
-                    resolve();
-                });
-            }
-            catch (e) {
-                e.message = '[BackgroundTaskHelper] create background throw error:' + e.message;
-                this.logger.error(e);
-                // create task failed, resolve the task
-                resolve();
-            }
-        });
-        this.backgroundTasks.push(backgroundTask);
-    }
-    async doPreDestroy() {
-        // quick quit
-        if (!this.backgroundTasks.length)
-            return;
-        const backgroundTasks = this.backgroundTasks.slice();
-        if (this.timeout <= 0 || this.timeout === Infinity) {
-            await Promise.all(backgroundTasks);
-        }
-        else {
-            const { promise: timeout, resolve } = this.sleep();
-            await Promise.race([
-                // not block the pre destroy process too long
-                timeout,
-                // ensure all background task are done before destroy the context
-                Promise.all(backgroundTasks),
-            ]);
-            // always resolve the sleep promise
-            resolve();
-        }
-        if (this.backgroundTasks.length !== backgroundTasks.length) {
-            this.backgroundTasks = this.backgroundTasks.slice(backgroundTasks.length);
-            return this.doPreDestroy();
-        }
-    }
-    sleep() {
-        let timer;
-        let promiseResolve;
-        const now = Date.now();
-        const p = new Promise(r => {
-            promiseResolve = r;
-            timer = setTimeout(() => {
-                this.logger.error(`[BackgroundTaskHelper] task is timeout actual is ${Date.now() - now} expect is ${this.timeout}`);
-                r();
-            }, this.timeout);
-        });
-        function resolve() {
-            // clear timeout and resolve the promise
-            clearTimeout(timer);
-            promiseResolve();
-        }
-        return {
-            promise: p,
-            resolve,
-        };
-    }
-};
-exports.BackgroundTaskHelper = BackgroundTaskHelper;
-__decorate([
-    (0, core_decorator_1.Inject)(),
-    __metadata("design:type", Object)
-], BackgroundTaskHelper.prototype, "logger", void 0);
-__decorate([
-    (0, core_decorator_1.Inject)(),
-    __metadata("design:type", Object)
-], BackgroundTaskHelper.prototype, "config", void 0);
-exports.BackgroundTaskHelper = BackgroundTaskHelper = __decorate([
-    (0, core_decorator_1.ContextProto)({
-        accessLevel: tegg_types_1.AccessLevel.PUBLIC,
-    })
-], BackgroundTaskHelper);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFja2dyb3VuZFRhc2tIZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQmFja2dyb3VuZFRhc2tIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWlDO0FBRWpDLDBEQUE2RDtBQUM3RCxrREFBZ0Q7QUFFaEQsc0RBQThFO0FBS3ZFLElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQW9CO0lBQTFCO1FBSUwsaUNBQWlDO1FBQ2pDLFlBQU8sR0FBRyxJQUFJLENBQUM7UUFLUCxvQkFBZSxHQUF5QixFQUFFLENBQUM7SUFzRnJELENBQUM7SUFwRkMsS0FBSyxDQUFDLElBQUk7O1FBQ1IsTUFBTSxHQUFHLEdBQUcsNkJBQWMsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUN4QyxJQUFBLHFCQUFNLEVBQUMsR0FBRyxFQUFFLGdEQUFnRCxDQUFDLENBQUM7UUFDOUQsc0NBQXVCLENBQUMsdUJBQXVCLENBQUMsR0FBRyxFQUFFO1lBQ25ELFVBQVUsRUFBRSxLQUFLLElBQUksRUFBRTtnQkFDckIsTUFBTSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDNUIsQ0FBQztTQUNGLENBQUMsQ0FBQztRQUNILElBQUksTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsMENBQUUsT0FBTyxFQUFFLENBQUM7WUFDeEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUM7UUFDcEQsQ0FBQztJQUNILENBQUM7SUFFRCxHQUFHLENBQUMsRUFBdUI7UUFDekIsTUFBTSxjQUFjLEdBQUcsSUFBSSxPQUFPLENBQU8sT0FBTyxDQUFDLEVBQUU7WUFDakQsSUFBSSxDQUFDO2dCQUNILEVBQUUsRUFBRTtvQkFDRixrQ0FBa0M7cUJBQ2pDLElBQUksQ0FBQyxPQUFPLENBQUM7cUJBQ2IsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFO29CQUNULENB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