@chevre/domain 26.0.0-alpha.13 → 26.0.0-alpha.15

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

@@ -58,15 +58,16 @@ interface IExecutedTask {
 }
 type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
-type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
+type ITaskAsNextFunctionParam = Pick<IExecutedTask, 'id' | 'name' | 'status'>;
+type IAsyncActionNextFunction = (task: ITaskAsNextFunctionParam) => IOperationExecute<void>;
+type IOnTaskStatusChangedListener = (task: IChangedTask) => void;
 type RedisClientType = ReturnType<typeof createClient>;
 /**
  * タスクイベントエミッター
  */
 declare class TaskEventEmitter extends EventEmitter {
     onTaskStatusChanged(listener: IOnTaskStatusChangedListener): void;
-    emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
+    emitTaskStatusChanged(task: IChangedTask): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, IOnTaskStatusChangedListener, taskEventEmitter, ITaskAsNextFunctionParam, IAsyncActionNextFunction };

package/lib/chevre/eventEmitter/task.js

@@ -14,8 +14,8 @@ class TaskEventEmitter extends events_1.EventEmitter {
         this.on(EventName.OnTaskStatusChanged, listener);
     }
     // support next function required(2025-05-25~)
-    emitTaskStatusChanged(task, next) {
-        this.emit(EventName.OnTaskStatusChanged, task, (typeof next === 'function') ? next : undefined);
+    emitTaskStatusChanged(task) {
+        this.emit(EventName.OnTaskStatusChanged, task);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

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

@@ -16,6 +16,18 @@ export declare class AdminTaskRepo {
      * 検索する
      */
     findTasks(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
+    /**
+     * cron:notifyLatency専用
+     */
+    countDelayedTasks(params: {
+        delayInSeconds: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
+        limit?: number;
+    }): Promise<{
+        count: number;
+    }>;
     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

@@ -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.AdminTaskRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const task_1 = require("./mongoose/schemas/task");
@@ -151,6 +155,26 @@ class AdminTaskRepo {
             .lean() // lean(2024-09-26~)
             .exec();
     }
+    /**
+     * cron:notifyLatency専用
+     */
+    async countDelayedTasks(params) {
+        const { limit } = params;
+        const runsAtLt = (0, moment_1.default)()
+            .add(-params.delayInSeconds, 'seconds')
+            .toDate();
+        const query = this.taskModel.countDocuments({
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: runsAtLt },
+            ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
+        });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
+    }
     getCursor(conditions, projection) {
         return this.taskModel.find(conditions, projection)
             .sort({ runsAt: factory_1.factory.sortType.Ascending })

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

@@ -124,7 +124,7 @@ export declare class AssetTransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction, "id" | "typeOf" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction, "id" | "status" | "typeOf">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -178,6 +178,10 @@ const indexes = [
         { status: 1, runsAt: 1, name: 1 },
         { name: 'executeOneByNameIfExists' } // add(2025-03-08~)
     ],
+    [
+        { status: 1, name: 1, runsAt: 1 },
+        { name: 'runDelayedTaskByName' } // add(2026-08-05~)
+    ],
     [
         { status: 1, remainingNumberOfTries: 1, lastTriedAt: 1 },
         {

package/lib/chevre/repo/scheduledTask.js

@@ -40,15 +40,6 @@ class ScheduledTaskRepo {
                 .map((objectId) => {
                 return { id: objectId.toHexString() };
             });
-            // イベントは発火しない
-            // if (emitImmediately) {
-            //     savedTasks.forEach((savedTask) => {
-            //         taskEventEmitter.emitTaskStatusChanged({
-            //             id: savedTask.id,
-            //             status: factory.taskStatus.Ready
-            //         });
-            //     });
-            // }
             return savedTasks;
         }
         else {
@@ -116,18 +107,6 @@ class ScheduledTaskRepo {
         if (doc === null) {
             return null;
         }
-        // if (!noEmitEvent) {
-        //     const changedTask: IRunningTaskByName = {
-        //         id: doc.id,
-        //         status: factory.taskStatus.Running,
-        //         name: nameEq
-        //     };
-        //     taskEventEmitter.emitTaskStatusChanged(
-        //         changedTask,
-        //         // 現時点でタスク遅延実行ではnext指定なし(2026-07-30)
-        //         // (typeof next === 'function') ? next : undefined
-        //     );
-        // }
         return doc;
     }
     /**

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

@@ -1,5 +1,4 @@
 import type { Connection, UpdateWriteOpResult } from 'mongoose';
-import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/task';
 import type { IExecutableTask } from '../taskSettings';
@@ -54,11 +53,10 @@ export declare class TaskRepo {
      * reimplement runTaskByIdentifier(2026-08-03~)
      */
     runTaskByIdentifier(params: ICreatingTask & {
-        alternateName: string;
+        alternateName?: never;
         identifier: string;
         expires?: never;
     }): Promise<void>;
-    createOnAssetTransactionStatusChangedTaskIfNotExist(params: Pick<factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>): Promise<void>;
     /**
      * Ready -> remainingNumberOfTriesが1減る
      * Running -> findOneするだけ
@@ -71,64 +69,6 @@ export declare class TaskRepo {
         };
         expires?: never;
     }): Promise<IExecutableTask<factory.taskName> | null>;
-    /**
-     * 潜在的に実行されるべきタスクをカウントする
-     * add(2025-03-16~)
-     */
-    countPotentiallyRunning(params: {
-        name?: {
-            $eq?: factory.taskName;
-            $in?: factory.taskName[];
-        };
-        runsAt: {
-            $lt: Date;
-        };
-        limit: number;
-    }): Promise<{
-        count: number;
-    }>;
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更する
-     */
-    private runDelayedTask;
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
-     */
-    emitRunningIfExistsByName(params: {
-        /**
-         * 必ずタスク名指定で実行する
-         */
-        name: {
-            $eq: factory.taskName;
-            $in?: never;
-        } | {
-            $eq?: never;
-            $in: 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>;
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
-     * taskNameで絞らない
-     * 2026-08-04~
-     */
-    emitRunningIfExistsNoName(params: {
-        runsAt: {
-            $lt: Date;
-        };
-        executor: {
-            name: string;
-        };
-    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**
      * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
@@ -167,16 +107,9 @@ export declare class TaskRepo {
          * タスクID
          */
         id: string;
-        remainingNumberOfTries: number;
-        name: factory.taskName;
     }, update: {
         status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
         executionResult: factory.task.IExecutionResult;
-    }, next?: INextFunction): Promise<void>;
-    deleteByProject(params: {
-        project: {
-            id: string;
-        };
     }): Promise<void>;
     /**
      * 不要なタスクを削除する
@@ -186,14 +119,5 @@ export declare class TaskRepo {
             $lt: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    countDelayedTasks(params: {
-        delayInSeconds: number;
-        name: {
-            $nin?: factory.taskName[];
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
 }
 export {};