@chevre/domain 26.0.0-alpha.16 → 26.0.0-alpha.17

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

@@ -28,6 +28,14 @@ export declare class AdminTaskRepo {
     }): Promise<{
         count: number;
     }>;
+    /**
+     * 不要なタスクを削除する
+     */
+    deleteRunsAtPassedCertainPeriod(params: {
+        runsAt: {
+            $lt: Date;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
         expires?: never;
     } & {

package/lib/chevre/repo/adminTask.js

@@ -175,6 +175,22 @@ class AdminTaskRepo {
             .exec();
         return { count };
     }
+    /**
+     * 不要なタスクを削除する
+     */
+    async deleteRunsAtPassedCertainPeriod(params) {
+        return this.taskModel.deleteMany({
+            runsAt: { $lt: params.runsAt.$lt },
+            status: {
+                $in: [
+                    factory_1.factory.taskStatus.Aborted,
+                    factory_1.factory.taskStatus.Executed,
+                    // factory.taskStatus.Expired // discontinue(2026-08-06~)
+                ]
+            }
+        })
+            .exec();
+    }
     getCursor(conditions, projection) {
         return this.taskModel.find(conditions, projection)
             .sort({ runsAt: factory_1.factory.sortType.Ascending })

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

@@ -1,7 +1,6 @@
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/task';
-import type { IExecutableTask } from '../taskSettings';
 /**
  * リトライ可能なタスク作成属性
  */
@@ -57,39 +56,6 @@ export declare class TaskRepo {
         identifier: string;
         expires?: never;
     }): Promise<void>;
-    /**
-     * Ready -> remainingNumberOfTriesが1減る
-     * Running -> findOneするだけ
-     */
-    executeOneById(params: {
-        id: string;
-        status: factory.taskStatus.Ready | factory.taskStatus.Running;
-        executor: {
-            name: string;
-        };
-        expires?: never;
-    }): Promise<IExecutableTask<factory.taskName> | null>;
-    /**
-     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
-     */
-    retryTasks(params: {
-        intervalInMinutes: number;
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
-     */
-    retryAbortingTasksByName(params: {
-        intervalInMinutes: number;
-        name: {
-            $in?: factory.taskName[];
-        };
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
-     */
-    retryAbortingTasks(params: {
-        intervalInMinutes: number;
-    }): Promise<UpdateWriteOpResult>;
     /**
      * 実行中止済タスクを強制的にリトライ
      * 中止済タスクでなければ何もしない
@@ -97,27 +63,6 @@ export declare class TaskRepo {
     retryForciblyIfAborted(params: {
         id: string;
         remainingNumberOfTries: number;
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * タスクIDから実行結果とステータスを保管する
-     * Abortedの場合、dateAbortedもセットする
-     */
-    setExecutionResultAndStatus(params: {
-        /**
-         * タスクID
-         */
-        id: string;
-    }, update: {
-        status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
-        executionResult: factory.task.IExecutionResult;
-    }): Promise<void>;
-    /**
-     * 不要なタスクを削除する
-     */
-    deleteRunsAtPassedCertainPeriod(params: {
-        runsAt: {
-            $lt: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

package/lib/chevre/repo/task.js

@@ -1,28 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../errorHandler");
 const task_1 = require("../eventEmitter/task");
 const factory_1 = require("../factory");
-const settings_1 = require("../settings");
 const task_2 = require("./mongoose/schemas/task");
-const executableTaskProjection = {
-    _id: 0,
-    id: { $toString: '$_id' },
-    // 必要最低限にprojection(2024-04-23~)
-    data: 1,
-    name: 1,
-    status: 1,
-    numberOfTried: 1,
-    project: 1,
-    remainingNumberOfTries: 1,
-    runsAt: 1,
-    // expires: 1 // 非同期アクションは移行につきexpires廃止(2026-08-05~)
-};
 /**
  * タスクリポジトリ
  */
@@ -146,123 +128,6 @@ class TaskRepo {
             throw new factory_1.factory.errors.Internal(`falied in creating a task unexpectedly. ${params.identifier}`);
         }
     }
-    /**
-     * Ready -> remainingNumberOfTriesが1減る
-     * Running -> findOneするだけ
-     */
-    async executeOneById(params) {
-        const now = new Date();
-        let doc;
-        if (params.status === factory_1.factory.taskStatus.Running) {
-            doc = await this.taskModel.findOne({
-                _id: { $eq: params.id },
-                status: { $eq: params.status },
-                runsAt: { $lt: now },
-                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
-            }, executableTaskProjection)
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        }
-        else {
-            doc = await this.taskModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                status: { $eq: params.status },
-                runsAt: { $lt: now },
-                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
-            }, {
-                $set: {
-                    status: factory_1.factory.taskStatus.Running, // 実行中に変更
-                    lastTriedAt: now,
-                    executor: params.executor
-                },
-                $inc: {
-                    remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                    numberOfTried: 1 // トライ回数増やす
-                }
-            }, { new: true, projection: executableTaskProjection })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // lean(2024-09-26~)
-                .exec();
-        }
-        if (doc === null) {
-            return null;
-        }
-        return doc;
-    }
-    /**
-     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
-     */
-    async retryTasks(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany(
-        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
-        // @see schemas/task
-        {
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $gte: 1 }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Ready // 実行前に変更
-            }
-        })
-            .exec();
-    }
-    /**
-     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
-     */
-    async retryAbortingTasksByName(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany(
-        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
-        // @see schemas/task
-        {
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $lte: 0 },
-            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Ready // 実行前に変更
-            }
-        })
-            .exec();
-    }
-    /**
-     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
-     */
-    async retryAbortingTasks(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany(
-        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
-        // @see schemas/task
-        {
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $lte: 0 }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Ready // 実行前に変更
-            }
-        })
-            .exec();
-    }
     /**
      * 実行中止済タスクを強制的にリトライ
      * 中止済タスクでなければ何もしない
@@ -281,37 +146,5 @@ class TaskRepo {
         })
             .exec();
     }
-    /**
-     * タスクIDから実行結果とステータスを保管する
-     * Abortedの場合、dateAbortedもセットする
-     */
-    async setExecutionResultAndStatus(params, update) {
-        const { id } = params;
-        const { status, executionResult } = update;
-        await this.taskModel.updateOne({ _id: { $eq: id } }, {
-            $set: {
-                status,
-                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
-            },
-            $push: { executionResults: executionResult }
-        })
-            .exec();
-    }
-    /**
-     * 不要なタスクを削除する
-     */
-    async deleteRunsAtPassedCertainPeriod(params) {
-        return this.taskModel.deleteMany({
-            runsAt: { $lt: params.runsAt.$lt },
-            status: {
-                $in: [
-                    factory_1.factory.taskStatus.Aborted,
-                    factory_1.factory.taskStatus.Executed,
-                    factory_1.factory.taskStatus.Expired
-                ]
-            }
-        })
-            .exec();
-    }
 }
 exports.TaskRepo = TaskRepo;

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { factory } from '../factory';
 /**
  * 遅延タスクリポジトリ
@@ -64,4 +64,25 @@ export declare class TaskDelayedRepo {
             name: string;
         };
     }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    retryTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    retryAbortingTasksByName(params: {
+        intervalInMinutes: number;
+        name: {
+            $in?: factory.taskName[];
+        };
+    }): Promise<UpdateWriteOpResult>;
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    retryAbortingTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
 }

package/lib/chevre/repo/taskDelayed.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskDelayedRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
 const task_1 = require("../eventEmitter/task");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
@@ -144,5 +148,78 @@ class TaskDelayedRepo {
         task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
         return doc;
     }
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    async retryTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $gte: 1 }
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    async retryAbortingTasksByName(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $lte: 0 },
+            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    async retryAbortingTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $lte: 0 }
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
 }
 exports.TaskDelayedRepo = TaskDelayedRepo;

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

@@ -0,0 +1,35 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+import type { IExecutableTask } from '../taskSettings';
+/**
+ * 実行中タスクリポジトリ
+ */
+export declare class TaskRunningRepo {
+    private readonly taskModel;
+    constructor(connection: Connection);
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
+    executeOneById(params: {
+        id: string;
+        status: factory.taskStatus.Ready | factory.taskStatus.Running;
+        executor: {
+            name: string;
+        };
+        expires?: never;
+    }): Promise<IExecutableTask<factory.taskName> | null>;
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    setExecutionResultAndStatus(params: {
+        /**
+         * タスクID
+         */
+        id: string;
+    }, update: {
+        status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
+        executionResult: factory.task.IExecutionResult;
+    }): Promise<void>;
+}

package/lib/chevre/repo/taskRunning.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskRunningRepo = void 0;
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_1 = require("./mongoose/schemas/task");
+const executableTaskProjection = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    // 必要最低限にprojection(2024-04-23~)
+    data: 1,
+    name: 1,
+    status: 1,
+    numberOfTried: 1,
+    project: 1,
+    remainingNumberOfTries: 1,
+    runsAt: 1,
+    // expires: 1 // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+};
+/**
+ * 実行中タスクリポジトリ
+ */
+class TaskRunningRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
+    }
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
+    async executeOneById(params) {
+        const now = new Date();
+        let doc;
+        if (params.status === factory_1.factory.taskStatus.Running) {
+            doc = await this.taskModel.findOne({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+            }, executableTaskProjection)
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        }
+        else {
+            doc = await this.taskModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+            }, {
+                $set: {
+                    status: factory_1.factory.taskStatus.Running, // 実行中に変更
+                    lastTriedAt: now,
+                    executor: params.executor
+                },
+                $inc: {
+                    remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                    numberOfTried: 1 // トライ回数増やす
+                }
+            }, { new: true, projection: executableTaskProjection })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // lean(2024-09-26~)
+                .exec();
+        }
+        if (doc === null) {
+            return null;
+        }
+        return doc;
+    }
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    async setExecutionResultAndStatus(params, update) {
+        const { id } = params;
+        const { status, executionResult } = update;
+        await this.taskModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                status,
+                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+            },
+            $push: { executionResults: executionResult }
+        })
+            .exec();
+    }
+}
+exports.TaskRunningRepo = TaskRunningRepo;

package/lib/chevre/service/task.js

@@ -15,12 +15,12 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
  */
 function executeTaskById(params) {
     return async (settings) => {
-        const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
         const { id, status, executor } = params;
         let task = null;
         try {
             // support status: Running(2025-03-05~)
-            task = await taskRepo.executeOneById({
+            task = await taskRunningRepo.executeOneById({
                 id,
                 status,
                 executor: { name: executor.name },

package/lib/chevre/service/taskHandler/onOperationFailed.d.ts

@@ -1,6 +1,7 @@
 import { factory } from '../../factory';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
+import type { TaskRunningRepo } from '../../repo/taskRunning';
 import type { IExecutableTask } from '../../taskSettings';
 /**
  * タスク実行失敗時処理
@@ -13,5 +14,6 @@ declare function onOperationFailed(params: {
 }): (repos: {
     setting: SettingRepo;
     task: TaskRepo;
+    taskRunning: TaskRunningRepo;
 }) => Promise<void>;
 export { onOperationFailed };

package/lib/chevre/service/taskHandler/onOperationFailed.js

@@ -19,9 +19,6 @@ function onOperationFailed(params) {
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             // 実験的に実行中タスク連携をしてみたが、ひとまず廃止(2026-07-01~)
-            // if (USE_INFORM_TASK_RUNNING) {
-            //     await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
-            // }
             const result = {
                 executedAt: now,
                 endDate,
@@ -34,11 +31,7 @@ function onOperationFailed(params) {
                 }
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            await repos.task.setExecutionResultAndStatus({
-                id: task.id,
-                // remainingNumberOfTries: task.remainingNumberOfTries,
-                // name: task.name
-            }, {
+            await repos.taskRunning.setExecutionResultAndStatus({ id: task.id }, {
                 status: task.status,
                 executionResult: result
             });
@@ -60,11 +53,7 @@ function onOperationFailed(params) {
                     stack: error.stack
                 }
             };
-            await repos.task.setExecutionResultAndStatus({
-                id: task.id,
-                // remainingNumberOfTries: task.remainingNumberOfTries,
-                // name: task.name
-            }, {
+            await repos.taskRunning.setExecutionResultAndStatus({ id: task.id }, {
                 status: factory_1.factory.taskStatus.Aborted,
                 executionResult: result
             });

package/lib/chevre/service/taskHandler.js

@@ -7,7 +7,6 @@ exports.taskLoader = void 0;
 exports.executeTask = executeTask;
 const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
-// import type { INextFunction } from '../eventEmitter/task';
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./taskHandler/onOperationFailed");
 const debug = (0, debug_1.default)('chevre-domain:service:taskHandler');
@@ -25,6 +24,7 @@ function executeTask(task) {
     return async (settings, options) => {
         const settingRepo = new (await import('../repo/setting.js')).SettingRepo(settings.connection);
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
         try {
             // 期限検証(2024-04-23~)
             if (task.expires instanceof Date) {
@@ -56,11 +56,7 @@ function executeTask(task) {
                     }
                     : ''
             };
-            await taskRepo.setExecutionResultAndStatus({
-                id: task.id,
-                // remainingNumberOfTries,
-                // name: task.name
-            }, {
+            await taskRunningRepo.setExecutionResultAndStatus({ id: task.id }, {
                 status: factory_1.factory.taskStatus.Executed,
                 executionResult: result
             });
@@ -69,7 +65,7 @@ function executeTask(task) {
             await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
                 // ...(typeof next === 'function') ? { next } : undefined // discontinue next(2026-08-05~)
-            })({ setting: settingRepo, task: taskRepo });
+            })({ setting: settingRepo, task: taskRepo, taskRunning: taskRunningRepo });
         }
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.5",
+    "@chevre/factory": "10.1.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.16"
+  "version": "26.0.0-alpha.17"
 }