@chevre/domain 22.10.0-alpha.18 → 22.10.0-alpha.19

package/lib/chevre/eventEmitter/task.d.ts

@@ -14,19 +14,35 @@ interface IExecuteSettings {
 }
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
 type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id'>) => IOperationExecute<void>;
-interface IListenArgsOnTaskStatusChanged {
+interface IReadyTask {
     id: string;
     name?: factory.taskName;
-    status: factory.taskStatus.Ready | factory.taskStatus.Running;
+    status: factory.taskStatus.Ready;
     expires?: Date;
+    executionResult?: never;
 }
-type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged, next: INextFunction) => void;
+interface IRunningTask {
+    id: string;
+    status: factory.taskStatus.Running;
+    name?: never;
+    expires?: never;
+    executionResult?: never;
+}
+interface IExecutedTask {
+    id: string;
+    status: factory.taskStatus;
+    executionResult: factory.task.IExecutionResult;
+    name?: never;
+    expires?: never;
+}
+type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;
+type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
 /**
  * タスクイベントエミッター
  */
 declare class TaskEventEmitter extends EventEmitter {
-    onTaskStatusChanged(listner: IOnTaskStatusChangedListener): void;
-    emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged, next?: INextFunction): void;
+    onTaskStatusChanged(listener: IOnTaskStatusChangedListener): void;
+    emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IExecuteSettings, INextFunction, IListenArgsOnTaskStatusChanged, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/eventEmitter/task.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskEventEmitter = void 0;
 const events_1 = require("events");
@@ -15,21 +6,16 @@ var EventName;
 (function (EventName) {
     EventName["OnTaskStatusChanged"] = "OnTaskStatusChanged";
 })(EventName || (EventName = {}));
-const defaultNextFunction = () => {
-    return () => __awaiter(void 0, void 0, void 0, function* () {
-        // no op
-    });
-};
 /**
  * タスクイベントエミッター
  */
 class TaskEventEmitter extends events_1.EventEmitter {
-    onTaskStatusChanged(listner) {
-        this.on(EventName.OnTaskStatusChanged, listner);
+    onTaskStatusChanged(listener) {
+        this.on(EventName.OnTaskStatusChanged, listener);
     }
     // support next function required(2025-05-25~)
-    emitTaskStatusChanged(args, next) {
-        this.emit(EventName.OnTaskStatusChanged, args, (typeof next === 'function') ? next : defaultNextFunction);
+    emitTaskStatusChanged(task, next) {
+        this.emit(EventName.OnTaskStatusChanged, task, (typeof next === 'function') ? next : undefined);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

package/lib/chevre/repo/task.d.ts

@@ -24,7 +24,6 @@ interface IOptionOnCreate {
 }
 export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys>;
-type IDelayedTask = Pick<factory.task.ITask<factory.taskName>, 'id' | 'name' | 'status'>;
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'>;
 /**
@@ -135,24 +134,6 @@ export declare class TaskRepo {
     /**
      * emit OnTaskStatusChanged on delayed tasks
      */
-    emitDelayedTasksEvent(params: {
-        now: Date;
-        /**
-         * 指定期間遅延しているタスクを実行する
-         */
-        delayInSeconds: number;
-        limit: number;
-        name: {
-            /**
-             * 指定タスクのみ実行する
-             */
-            $in?: factory.taskName[];
-            /**
-             * 指定タスク以外のみ実行する
-             */
-            $nin?: factory.taskName[];
-        };
-    }): Promise<IDelayedTask[]>;
     /**
      * make tasks expired
      */
@@ -182,11 +163,13 @@ export declare class TaskRepo {
     /**
      * 実行結果を保管する
      */
-    pushExecutionResultById(
-    /**
-     * タスクID
-     */
-    id: string, status: factory.taskStatus, executionResult: factory.task.IExecutionResult): Promise<void>;
+    pushExecutionResultById(params: {
+        /**
+         * タスクID
+         */
+        id: string;
+        status: factory.taskStatus;
+    }, executionResult: factory.task.IExecutionResult, next?: INextFunction): Promise<void>;
     /**
      * 特定タスク検索
      */

package/lib/chevre/repo/task.js

@@ -625,38 +625,62 @@ class TaskRepo {
             return doc;
         });
     }
+    // discontinue(2025-05-26~)
     /**
      * emit OnTaskStatusChanged on delayed tasks
      */
-    emitDelayedTasksEvent(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const runsAtLt = moment(params.now)
-                .add(-params.delayInSeconds, 'seconds')
-                .toDate();
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                name: 1,
-                status: 1
-            };
-            const delayedTasks = yield this.taskModel.find(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined), projection)
-                .limit(params.limit)
-                .sort(sortOrder4executionOfTasks) // sort(2025-03-03~)
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // lean(2024-09-26~)
-                .exec();
-            if (delayedTasks.length > 0) {
-                delayedTasks.forEach((delayedTask) => {
-                    task_1.taskEventEmitter.emitTaskStatusChanged({
-                        id: delayedTask.id,
-                        name: delayedTask.name,
-                        status: factory.taskStatus.Ready
-                    });
-                });
-            }
-            return delayedTasks;
-        });
-    }
+    // public async emitDelayedTasksEvent(params: {
+    //     now: Date;
+    //     /**
+    //      * 指定期間遅延しているタスクを実行する
+    //      */
+    //     delayInSeconds: number;
+    //     limit: number;
+    //     name: {
+    //         /**
+    //          * 指定タスクのみ実行する
+    //          */
+    //         $in?: factory.taskName[];
+    //         /**
+    //          * 指定タスク以外のみ実行する
+    //          */
+    //         $nin?: factory.taskName[];
+    //     };
+    // }) {
+    //     const runsAtLt = moment(params.now)
+    //         .add(-params.delayInSeconds, 'seconds')
+    //         .toDate();
+    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         name: 1,
+    //         status: 1
+    //     };
+    //     const delayedTasks = await this.taskModel.find(
+    //         {
+    //             status: { $eq: factory.taskStatus.Ready },
+    //             runsAt: { $lt: runsAtLt },
+    //             ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined,
+    //             ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
+    //         },
+    //         projection
+    //     )
+    //         .limit(params.limit)
+    //         .sort(sortOrder4executionOfTasks) // sort(2025-03-03~)
+    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .lean<IDelayedTask[]>() // lean(2024-09-26~)
+    //         .exec();
+    //     if (delayedTasks.length > 0) {
+    //         delayedTasks.forEach((delayedTask) => {
+    //             taskEventEmitter.emitTaskStatusChanged({
+    //                 id: delayedTask.id,
+    //                 name: delayedTask.name,
+    //                 status: factory.taskStatus.Ready
+    //             });
+    //         });
+    //     }
+    //     return delayedTasks;
+    // }
     /**
      * make tasks expired
      */
@@ -772,17 +796,20 @@ class TaskRepo {
     /**
      * 実行結果を保管する
      */
-    pushExecutionResultById(
-    /**
-     * タスクID
-     */
-    id, status, executionResult) {
+    pushExecutionResultById(params, executionResult, 
+    // support customr function(2025-05-25~)
+    next) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { id, status } = params;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
                 $set: { status },
                 $push: { executionResults: executionResult }
             })
                 .exec();
+            // emit event(2025-05-26~)
+            if (typeof next === 'function') {
+                task_1.taskEventEmitter.emitTaskStatusChanged({ id, status, executionResult }, next);
+            }
         });
     }
     /**

package/lib/chevre/service/task.d.ts

@@ -1,5 +1,5 @@
 import { SendGridCredentials } from '../credentials/sendGrid';
-import type { IExecuteSettings as IMinimumExecuteSettings } from '../eventEmitter/task';
+import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import * as factory from '../factory';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
@@ -20,17 +20,17 @@ type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 export type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
-declare function executeById(params: {
-    id: string;
-    status: factory.taskStatus.Ready | factory.taskStatus.Running;
+/**
+ * タスク変更イベントを受けて実行する
+ */
+declare function executeById(params: (IReadyTask | IRunningTask) & {
     executor: {
         /**
          * タスク実行者名称
          */
         name: string;
     };
-    expires?: Date;
-}): IOperation<void>;
+}, next?: INextFunction): IOperation<void>;
 /**
  * support no name(2025-03-04~)
  */
@@ -52,7 +52,7 @@ declare function executeOneIfExists(params: {
 /**
  * タスクを実行する
  */
-declare function execute(task: IExecutableTask<factory.taskName>): IOperationExecute<void>;
+declare function execute(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
 /**
  * add(2025-03-13~)
  */

package/lib/chevre/service/task.js

@@ -21,7 +21,10 @@ const moment = require("moment");
 const factory = require("../factory");
 const factory_1 = require("./notification/factory");
 const debug = createDebug('chevre-domain:service:task');
-function executeById(params) {
+/**
+ * タスク変更イベントを受けて実行する
+ */
+function executeById(params, next) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
         const { id, status, executor, expires } = params;
@@ -39,7 +42,7 @@ function executeById(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task)(settings, {
+            yield execute(task, (typeof next === 'function') ? next : undefined)(settings, {
                 executeById: true,
                 executeByName: false
             });
@@ -77,7 +80,7 @@ function executeOneIfExists(params) {
 /**
  * タスクを実行する
  */
-function execute(task) {
+function execute(task, next) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return (settings, options) => __awaiter(this, void 0, void 0, function* () {
@@ -129,7 +132,10 @@ function execute(task) {
                 error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
                     ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
             };
-            yield taskRepo.pushExecutionResultById(task.id, factory.taskStatus.Executed, result);
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: factory.taskStatus.Executed
+            }, result, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
             debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
@@ -143,7 +149,10 @@ function execute(task) {
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield taskRepo.pushExecutionResultById(task.id, task.status, result);
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: task.status
+            }, result, (typeof next === 'function') ? next : undefined);
         }
     });
 }

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.10.0-alpha.18"
+  "version": "22.10.0-alpha.19"
 }