@chevre/domain 26.0.0-alpha.12 → 26.0.0-alpha.14

package/lib/chevre/service/taskHandler.js

@@ -7,6 +7,7 @@ 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');
@@ -18,7 +19,7 @@ exports.taskLoader = {
 /**
  * タスクを実行する
  */
-function executeTask(task, next) {
+function executeTask(task) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return async (settings, options) => {
@@ -57,17 +58,17 @@ function executeTask(task, next) {
             };
             await taskRepo.setExecutionResultAndStatus({
                 id: task.id,
-                remainingNumberOfTries,
-                name: task.name
+                // remainingNumberOfTries,
+                // name: task.name
             }, {
                 status: factory_1.factory.taskStatus.Executed,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
         catch (error) {
             await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
-                ...(typeof next === 'function') ? { next } : undefined
+                // ...(typeof next === 'function') ? { next } : undefined // discontinue next(2026-08-05~)
             })({ setting: settingRepo, task: taskRepo });
         }
     };

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | Omit<factory.task.voidReserveTransaction.IAttributes, 'expires'>;
 /**
  * 取引のタスクを作成する
  * 取引削除タスクを分離(2026-08-02~)

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -25,24 +25,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
         const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
-        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
-        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
-            // support scheduledTask(2026-08-02~)
-            await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
-            await repos.scheduledTask.addScheduledTasks([{
-                    ...deleteTask,
-                    expires: (0, moment_1.default)(deleteTask.runsAt)
-                        .add(deleteTransactionTaskExpiresInDays, 'days')
-                        .toDate()
-                }]);
-        }
-        else {
-            await repos.task.saveMany([
-                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
-                deleteTask
-            ]);
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
         }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

package/lib/chevre/service/transaction/returnOrder.js

@@ -167,24 +167,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
         const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
-        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
-        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
-            // support scheduledTask(2026-08-02~)
-            await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
-            await repos.scheduledTask.addScheduledTasks([{
-                    ...deleteTask,
-                    expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
-                        .add(deleteTransactionTaskExpiresInDays, 'days')
-                        .toDate()
-                }]);
-        }
-        else {
-            await repos.task.saveMany([
-                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
-                deleteTask
-            ]);
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
         }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

package/lib/chevre/taskSettings.d.ts

@@ -21,8 +21,10 @@ interface IExecuteSettings extends IMinimumExecuteSettings {
     aggregationSettings?: AggregationSettings;
 }
 interface IExecuteOptions {
-    executeById: boolean;
-    executeByName: boolean;
+    /**
+     * 現時点(2026-08-05)でリトライタスク、予定タスク、非同期アクション、全てID指定でしか実行されない
+     */
+    executeById: true;
 }
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.12"
+  "version": "26.0.0-alpha.14"
 }

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

@@ -1,23 +0,0 @@
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
-import { INextFunction } from '../eventEmitter/task';
-import { factory } from '../factory';
-/**
- * 旧非同期アクション(tasksコレクションにて管理)リポジトリ
- */
-export declare class AsyncActionLegacyRepo {
-    private readonly taskModel;
-    constructor(connection: Connection);
-    runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
-        alternateName?: never;
-        identifier?: never;
-        expires: Date;
-    }, next: INextFunction): Promise<{
-        id: string;
-    }>;
-    /**
-     * Readyのままで期限切れのタスクをExpiredに変更する
-     */
-    makeExpiredMany(params: {
-        expiresLt: Date;
-    }): Promise<UpdateWriteOpResult>;
-}

package/lib/chevre/repo/asyncActionLegacy.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncActionLegacyRepo = void 0;
-const task_1 = require("../eventEmitter/task");
-const factory_1 = require("../factory");
-const task_2 = require("./mongoose/schemas/task");
-/**
- * 旧非同期アクション(tasksコレクションにて管理)リポジトリ
- */
-class AsyncActionLegacyRepo {
-    taskModel;
-    constructor(connection) {
-        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
-    }
-    async runImmediately(params, 
-    // support customr function(2025-05-25~)
-    next) {
-        const { expires } = params;
-        if (!(expires instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('expires', 'must be Date');
-        }
-        const savingTask = {
-            ...params,
-            status: factory_1.factory.taskStatus.Ready,
-            numberOfTried: 0,
-            executionResults: []
-        };
-        const result = await this.taskModel.insertMany(savingTask, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory_1.factory.errors.Internal('task not saved');
-        }
-        task_1.taskEventEmitter.emitTaskStatusChanged({
-            id,
-            status: factory_1.factory.taskStatus.Ready,
-            expires // emit expires(2025-03-31~)
-        }, next);
-        return { id };
-    }
-    /**
-     * Readyのままで期限切れのタスクをExpiredに変更する
-     */
-    async makeExpiredMany(params) {
-        const { expiresLt } = params;
-        if (!(expiresLt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('expiresLt', 'must be Date');
-        }
-        return this.taskModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            expires: { $exists: true, $lt: expiresLt }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Expired
-            }
-        })
-            .exec();
-    }
-}
-exports.AsyncActionLegacyRepo = AsyncActionLegacyRepo;

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

@@ -1,39 +0,0 @@
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
-import { factory } from '../factory';
-/**
- * 旧予定タスクリポジトリ
- */
-export declare class ScheduledTaskLegacyRepo {
-    private readonly taskModel;
-    constructor(connection: Connection);
-    /**
-     * $eq:0をAbortedにする(特定のタスクのみ)(これらは中止されてもhubへ通知しない)
-     */
-    abortLegacyTasks(params: {
-        intervalInMinutes: number;
-        name: {
-            $in: factory.taskName[];
-        };
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
-     */
-    emitRunningIfExistsLegacy(params: {
-        /**
-         * 必ずタスク名指定で実行する
-         */
-        name: {
-            $eq: factory.taskName;
-        };
-        runsAt: {
-            $lt: Date;
-        };
-        sort: {
-            numberOfTried?: factory.sortType;
-            runsAt?: factory.sortType;
-        };
-        executor: {
-            name: string;
-        };
-    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
-}

package/lib/chevre/repo/scheduledTaskLegacy.js

@@ -1,96 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduledTaskLegacyRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
-const task_1 = require("../eventEmitter/task");
-const factory_1 = require("../factory");
-const settings_1 = require("../settings");
-const task_2 = require("./mongoose/schemas/task");
-/**
- * 旧予定タスクリポジトリ
- */
-class ScheduledTaskLegacyRepo {
-    taskModel;
-    constructor(connection) {
-        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
-    }
-    /**
-     * $eq:0をAbortedにする(特定のタスクのみ)(これらは中止されてもhubへ通知しない)
-     */
-    async abortLegacyTasks(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $eq: 0 },
-            name: { $in: params.name.$in }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Aborted,
-                dateAborted: new Date()
-            }
-        })
-            .exec();
-    }
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
-     */
-    async emitRunningIfExistsLegacy(params
-    // next?: INextFunction // 現時点でタスク遅延実行ではnext指定なし(2026-07-30)
-    ) {
-        if (!(params.runsAt.$lt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            name: 1
-        };
-        const nameEq = params.name?.$eq;
-        // インデックス'executeOneByNameIfExists'を想定したfilter
-        const filter = {
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            runsAt: { $lt: params.runsAt.$lt },
-            name: params.name
-        };
-        const doc = await this.taskModel.findOneAndUpdate(filter, {
-            $set: {
-                status: factory_1.factory.taskStatus.Running, // 実行中に変更
-                lastTriedAt: new Date(),
-                executor: params.executor
-            },
-            $inc: {
-                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                numberOfTried: 1 // トライ回数増やす
-            }
-        }, {
-            new: true,
-            projection,
-            ...(typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
-                ? { sort: params.sort }
-                : undefined
-        })
-            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        if (doc === null) {
-            return null;
-        }
-        const changedTask = {
-            id: doc.id,
-            status: factory_1.factory.taskStatus.Running,
-            name: nameEq
-        };
-        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
-        return doc;
-    }
-}
-exports.ScheduledTaskLegacyRepo = ScheduledTaskLegacyRepo;