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

package/lib/chevre/repo/taskDelayed.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskDelayedRepo = void 0;
+const task_1 = require("../eventEmitter/task");
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_2 = require("./mongoose/schemas/task");
+/**
+ * 遅延タスクリポジトリ
+ */
+class TaskDelayedRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
+    }
+    /**
+     * 潜在的に実行されるべきタスクをカウントする
+     * add(2025-03-16~)
+     */
+    async countPotentiallyRunning(params) {
+        const { runsAt, limit, name } = params;
+        const nameEq = name?.$eq;
+        const nameIn = name?.$in;
+        if (!(runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const query = this.taskModel.countDocuments({
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            ...(typeof nameEq === 'string' || Array.isArray(nameIn))
+                ? {
+                    name: {
+                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+                        ...(Array.isArray(nameIn)) ? { $in: nameIn } : undefined
+                    }
+                }
+                : undefined,
+            runsAt: { $lt: params.runsAt.$lt }
+        });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更する
+     */
+    async runDelayedTask(params) {
+        const { filter } = params;
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            name: 1
+        };
+        return 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();
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     */
+    async emitRunningIfExistsByName(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックス'executeOneByNameIfExists'を想定したfilter
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            name: params.name,
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            sort: params.sort,
+            executor: params.executor
+        });
+        if (doc === null) {
+            return null;
+        }
+        const nameEq = params.name?.$eq;
+        let changedTask;
+        if (typeof nameEq === 'string') {
+            changedTask = {
+                id: doc.id,
+                status: factory_1.factory.taskStatus.Running,
+                name: nameEq
+            };
+        }
+        else {
+            changedTask = {
+                id: doc.id,
+                status: factory_1.factory.taskStatus.Running
+            };
+        }
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
+        return doc;
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     * taskNameで絞らない
+     * 2026-08-04~
+     */
+    async emitRunningIfExistsNoName(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックス'executeOneByNameIfExists'を想定したfilter
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            sort: {
+                runsAt: factory_1.factory.sortType.Ascending // ソートはrunsAtのみにしてみる(2026-08-04~)
+            },
+            executor: params.executor
+        });
+        if (doc === null) {
+            return null;
+        }
+        const changedTask = {
+            id: doc.id,
+            status: factory_1.factory.taskStatus.Running
+        };
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
+        return doc;
+    }
+}
+exports.TaskDelayedRepo = TaskDelayedRepo;

package/lib/chevre/repository.d.ts

@@ -16,7 +16,6 @@ import type { CheckThingActionRepo } from './repo/action/checkThing';
 import type { PayActionRepo } from './repo/action/pay';
 import type { RefundActionRepo } from './repo/action/refund';
 import type { AsyncActionRepo } from './repo/asyncAction';
-import type { AsyncActionLegacyRepo } from './repo/asyncActionLegacy';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
 import type { AdminAsyncActionRepo } from './repo/adminAsyncAction';
 import type { AdminScheduledTaskRepo } from './repo/adminScheduledTask';
@@ -93,8 +92,8 @@ import type { RateLimitSettingRepo } from './repo/setting/rateLimit';
 import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { ScheduledTaskRepo } from './repo/scheduledTask';
-import type { ScheduledTaskLegacyRepo } from './repo/scheduledTaskLegacy';
 import type { TaskRepo } from './repo/task';
+import type { TaskDelayedRepo } from './repo/taskDelayed';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
 import type { PlaceOrderRepo } from './repo/transaction/placeOrder';
@@ -499,22 +498,18 @@ export type ScheduledTask = ScheduledTaskRepo;
 export declare namespace ScheduledTask {
     function createInstance(...params: ConstructorParameters<typeof ScheduledTaskRepo>): Promise<ScheduledTaskRepo>;
 }
-export type ScheduledTaskLegacy = ScheduledTaskLegacyRepo;
-export declare namespace ScheduledTaskLegacy {
-    function createInstance(...params: ConstructorParameters<typeof ScheduledTaskLegacyRepo>): Promise<ScheduledTaskLegacyRepo>;
-}
 export type Task = TaskRepo;
 export declare namespace Task {
     function createInstance(...params: ConstructorParameters<typeof TaskRepo>): Promise<TaskRepo>;
 }
+export type TaskDelayed = TaskDelayedRepo;
+export declare namespace TaskDelayed {
+    function createInstance(...params: ConstructorParameters<typeof TaskDelayedRepo>): Promise<TaskDelayedRepo>;
+}
 export type AsyncAction = AsyncActionRepo;
 export declare namespace AsyncAction {
     function createInstance(...params: ConstructorParameters<typeof AsyncActionRepo>): Promise<AsyncActionRepo>;
 }
-export type AsyncActionLegacy = AsyncActionLegacyRepo;
-export declare namespace AsyncActionLegacy {
-    function createInstance(...params: ConstructorParameters<typeof AsyncActionLegacyRepo>): Promise<AsyncActionLegacyRepo>;
-}
 export type Ticket = TicketRepo;
 export declare namespace Ticket {
     function createInstance(...params: ConstructorParameters<typeof TicketRepo>): Promise<TicketRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncActionLegacy = exports.AsyncAction = exports.Task = exports.ScheduledTaskLegacy = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1044,17 +1044,6 @@ var ScheduledTask;
     }
     ScheduledTask.createInstance = createInstance;
 })(ScheduledTask || (exports.ScheduledTask = ScheduledTask = {}));
-var ScheduledTaskLegacy;
-(function (ScheduledTaskLegacy) {
-    let repo;
-    async function createInstance(...params) {
-        if (repo === undefined) {
-            repo = (await import('./repo/scheduledTaskLegacy.js')).ScheduledTaskLegacyRepo;
-        }
-        return new repo(...params);
-    }
-    ScheduledTaskLegacy.createInstance = createInstance;
-})(ScheduledTaskLegacy || (exports.ScheduledTaskLegacy = ScheduledTaskLegacy = {}));
 var Task;
 (function (Task) {
     let repo;
@@ -1066,28 +1055,28 @@ var Task;
     }
     Task.createInstance = createInstance;
 })(Task || (exports.Task = Task = {}));
-var AsyncAction;
-(function (AsyncAction) {
+var TaskDelayed;
+(function (TaskDelayed) {
     let repo;
     async function createInstance(...params) {
         if (repo === undefined) {
-            repo = (await import('./repo/asyncAction.js')).AsyncActionRepo;
+            repo = (await import('./repo/taskDelayed.js')).TaskDelayedRepo;
         }
         return new repo(...params);
     }
-    AsyncAction.createInstance = createInstance;
-})(AsyncAction || (exports.AsyncAction = AsyncAction = {}));
-var AsyncActionLegacy;
-(function (AsyncActionLegacy) {
+    TaskDelayed.createInstance = createInstance;
+})(TaskDelayed || (exports.TaskDelayed = TaskDelayed = {}));
+var AsyncAction;
+(function (AsyncAction) {
     let repo;
     async function createInstance(...params) {
         if (repo === undefined) {
-            repo = (await import('./repo/asyncActionLegacy.js')).AsyncActionLegacyRepo;
+            repo = (await import('./repo/asyncAction.js')).AsyncActionRepo;
         }
         return new repo(...params);
     }
-    AsyncActionLegacy.createInstance = createInstance;
-})(AsyncActionLegacy || (exports.AsyncActionLegacy = AsyncActionLegacy = {}));
+    AsyncAction.createInstance = createInstance;
+})(AsyncAction || (exports.AsyncAction = AsyncAction = {}));
 var Ticket;
 (function (Ticket) {
     let repo;

package/lib/chevre/service/asyncAction.js

@@ -29,7 +29,7 @@ function executeAsyncActionById(params, next) {
         if (task !== null) {
             await (0, asyncActionHandler_1.executeAsyncAction)(task, (typeof next === 'function') ? next : undefined)(settings, {
                 executeById: true,
-                executeByName: false
+                // executeByName: false // discontinue(2026-08-05~)
             });
         }
     };

package/lib/chevre/service/scheduledTask.js

@@ -33,7 +33,7 @@ function executeScheduledTaskById(params) {
         if (task !== null) {
             await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
                 executeById: true,
-                executeByName: false
+                // executeByName: false // discontinue(2026-08-05~)
             });
         }
     };

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -7,9 +7,6 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-// import { OrderNumberRepo } from '../../repo/orderNumber';
-// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -19,14 +16,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
@@ -57,7 +50,6 @@ function call(params) {
             });
         }
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
@@ -86,8 +78,6 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +94,6 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    // orderInTransaction: new OrderInTransactionRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService

package/lib/chevre/service/task/authorizePayment.js

@@ -34,19 +34,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         let callResult;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

package/lib/chevre/service/task/checkMovieTicket.js

@@ -9,23 +9,17 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -10,10 +10,8 @@ const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
-// import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-// import { ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
@@ -24,17 +22,12 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const { savePaymentMethodIdInTransaction: _savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
             await (0, any_1.publishPaymentUrl)({
@@ -51,11 +44,9 @@ function call(params) {
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
                 orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-                // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
-                // project: new ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -24,14 +24,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });

package/lib/chevre/service/task/voidReserveTransaction.js

@@ -16,7 +16,6 @@ const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
@@ -28,16 +27,16 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         const voidByActionId = typeof params.data.id === 'string';
         if (voidByActionId) {
-            // 遅延実行(executeByName)には対応しない
-            if (!options.executeById) {
-                return;
-            }
+            // // 遅延実行(executeByName)には対応しない
+            // if (!options.executeById) {
+            //     return;
+            // }
         }
         if (!coaAuthClientCreated) {
             const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
@@ -53,7 +52,6 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({
                 ...params.data,
@@ -71,7 +69,6 @@ function call(params) {
                 setting: new setting_1.SettingRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 reserveService
             }, settings);
         }

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

@@ -1,4 +1,4 @@
-import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
+import type { IExecuteSettings as IMinimumExecuteSettings, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import type { AggregationSettings } from '../taskSettings';
 interface IExecuteSettings extends IMinimumExecuteSettings {
     aggregationSettings?: AggregationSettings;
@@ -7,12 +7,12 @@ type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * タスク変更イベントを受けて実行する
  */
-declare function executeById(params: (IReadyTask | IRunningTask) & {
+declare function executeTaskById(params: (Pick<IReadyTask, 'id' | 'status'> | Pick<IRunningTask, 'id' | 'status'>) & {
     executor: {
         /**
          * タスク実行者名称
          */
         name: string;
     };
-}, next?: INextFunction): IOperation<void>;
-export { executeById, };
+}): IOperation<void>;
+export { executeTaskById };

package/lib/chevre/service/task.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeById = executeById;
+exports.executeTaskById = executeTaskById;
 /**
  * タスクサービス
  */
@@ -13,10 +13,10 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
  */
-function executeById(params, next) {
+function executeTaskById(params) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
-        const { id, status, executor, expires } = params;
+        const { id, status, executor } = params;
         let task = null;
         try {
             // support status: Running(2025-03-05~)
@@ -24,18 +24,18 @@ function executeById(params, next) {
                 id,
                 status,
                 executor: { name: executor.name },
-                ...(expires instanceof Date) ? { expires } : undefined
+                // ...(expires instanceof Date) ? { expires } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
             });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('service.task.executeTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
+            await (0, taskHandler_1.executeTask)(task)(settings, {
                 executeById: true,
-                executeByName: false
+                // executeByName: false // discontinue(2026-08-05~)
             });
         }
     };

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

@@ -1,4 +1,3 @@
-import type { INextFunction } from '../../eventEmitter/task';
 import { factory } from '../../factory';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -10,7 +9,7 @@ declare function onOperationFailed(params: {
     task: IExecutableTask<factory.taskName>;
     now: Date;
     error: any;
-    next?: INextFunction;
+    next?: never;
 }): (repos: {
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperationFailed = onOperationFailed;
+// import type { INextFunction } from '../../eventEmitter/task';
 const factory_1 = require("../../factory");
 const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
 /**
@@ -9,7 +10,7 @@ const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
 function onOperationFailed(params) {
     return async (repos) => {
         let error = params.error;
-        const { task, now, next } = params;
+        const { task, now } = params;
         if (error === null || typeof error !== 'object') {
             error = { message: String(error) };
         }
@@ -35,12 +36,12 @@ function onOperationFailed(params) {
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
             await repos.task.setExecutionResultAndStatus({
                 id: task.id,
-                remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name
+                // remainingNumberOfTries: task.remainingNumberOfTries,
+                // name: task.name
             }, {
                 status: task.status,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
         else {
             // 分析連携(2025-08-05~)
@@ -61,12 +62,12 @@ function onOperationFailed(params) {
             };
             await repos.task.setExecutionResultAndStatus({
                 id: task.id,
-                remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name
+                // remainingNumberOfTries: task.remainingNumberOfTries,
+                // name: task.name
             }, {
                 status: factory_1.factory.taskStatus.Aborted,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
     };
 }

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

@@ -1,4 +1,3 @@
-import type { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
 import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
 export declare const taskLoader: {
@@ -9,5 +8,5 @@ export declare const taskLoader: {
 /**
  * タスクを実行する
  */
-declare function executeTask(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
+declare function executeTask(task: IExecutableTask<factory.taskName>): IOperationExecute<void>;
 export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeTask };