@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.21

package/lib/chevre/repo/taskDelayed.js

@@ -0,0 +1,195 @@
+"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");
+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,
+            sort: {
+                runsAt: factory_1.factory.sortType.Ascending // ソートはrunsAtで固定化(2026-08-07~)
+            }
+        })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     */
+    async runDelayedTaskIfExistsByName(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックスについては、name指定であれば'executeOneByName'あるいは'runDelayedTaskByName'を想定
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            name: params.name,
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            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イベントを発生させる
+     * 2026-08-06~
+     */
+    async runDelayedTaskIfExists(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックスについては、name未指定であれば'executeOneByNameIfExists'を想定
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            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;
+    }
+    /**
+     * 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 },
+            remainingNumberOfTries: { $gte: 1 },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            }
+        }, {
+            $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 },
+            remainingNumberOfTries: { $lte: 0 },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            }
+        }, {
+            $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/repository.d.ts

@@ -24,6 +24,7 @@ import type { AggregateActionRepo } from './repo/aggregateAction';
 import type { AggregateOfferRepo } from './repo/aggregateOffer';
 import type { AggregateOrderRepo } from './repo/aggregateOrder';
 import type { AggregateReservationRepo } from './repo/aggregateReservation';
+import type { AggregateScheduledTaskRepo } from './repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from './repo/aggregateTask';
 import type { AggregationRepo } from './repo/aggregation';
 import type { AssetTransactionRepo } from './repo/assetTransaction';
@@ -92,6 +93,7 @@ import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { ScheduledTaskRepo } from './repo/scheduledTask';
 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';
@@ -180,6 +182,10 @@ export type AggregateAction = AggregateActionRepo;
 export declare namespace AggregateAction {
     function createInstance(...params: ConstructorParameters<typeof AggregateActionRepo>): Promise<AggregateActionRepo>;
 }
+export type AggregateScheduledTask = AggregateScheduledTaskRepo;
+export declare namespace AggregateScheduledTask {
+    function createInstance(...params: ConstructorParameters<typeof AggregateScheduledTaskRepo>): Promise<AggregateScheduledTaskRepo>;
+}
 export type AggregateTask = AggregateTaskRepo;
 export declare namespace AggregateTask {
     function createInstance(...params: ConstructorParameters<typeof AggregateTaskRepo>): Promise<AggregateTaskRepo>;
@@ -496,6 +502,10 @@ 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>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentServiceChannel = 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.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.AsyncAction = 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 = void 0;
+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.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;
@@ -214,6 +214,17 @@ var AggregateAction;
     }
     AggregateAction.createInstance = createInstance;
 })(AggregateAction || (exports.AggregateAction = AggregateAction = {}));
+var AggregateScheduledTask;
+(function (AggregateScheduledTask) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateScheduledTask.js')).AggregateScheduledTaskRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateScheduledTask.createInstance = createInstance;
+})(AggregateScheduledTask || (exports.AggregateScheduledTask = AggregateScheduledTask = {}));
 var AggregateTask;
 (function (AggregateTask) {
     let repo;
@@ -1044,6 +1055,17 @@ var Task;
     }
     Task.createInstance = createInstance;
 })(Task || (exports.Task = Task = {}));
+var TaskDelayed;
+(function (TaskDelayed) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/taskDelayed.js')).TaskDelayedRepo;
+        }
+        return new repo(...params);
+    }
+    TaskDelayed.createInstance = createInstance;
+})(TaskDelayed || (exports.TaskDelayed = TaskDelayed = {}));
 var AsyncAction;
 (function (AsyncAction) {
     let repo;

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,4 +1,5 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateScheduledTaskRepo } from '../../repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from '../../repo/aggregateTask';
 import { AggregationRepo } from '../../repo/aggregation';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -10,7 +11,7 @@ interface IAggregateParams {
     aggregateDate: Date;
     aggregateDurationUnit: AggregateDurationUnit;
     aggregationCount: number;
-    excludedProjectId?: string;
+    excludedProjectId?: never;
 }
 declare function aggregateEvent(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
@@ -146,4 +147,11 @@ declare function aggregateTask(params: IAggregateParams): (repos: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+declare function aggregateScheduledTask(params: IAggregateParams): (repos: {
+    agregation: AggregationRepo;
+    aggregateScheduledTask: AggregateScheduledTaskRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateScheduledTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -17,6 +17,7 @@ exports.aggregatePlaceOrder = aggregatePlaceOrder;
 exports.aggregateReserveAction = aggregateReserveAction;
 exports.aggregateReserveTransaction = aggregateReserveTransaction;
 exports.aggregateTask = aggregateTask;
+exports.aggregateScheduledTask = aggregateScheduledTask;
 exports.aggregateUseAction = aggregateUseAction;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
@@ -692,3 +693,44 @@ function aggregateTask(params) {
         return { aggregationCount: i, aggregateDuration };
     };
 }
+function aggregateScheduledTask(params) {
+    return async (repos) => {
+        const { aggregateDate } = params;
+        if (!(aggregateDate instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('aggregateDate', 'must be Date');
+        }
+        const aggregateDuration = moment_timezone_1.default.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const runsFrom = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const runsThrough = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = await repos.aggregateScheduledTask.aggregateScheduledTask({
+                // project: { id: { $ne: params.excludedProjectId } },
+                runsFrom,
+                runsThrough
+            });
+            await repos.agregation.saveAggregation({
+                typeOf: factory_1.factory.aggregation.AggregationType.AggregateScheduledTask,
+                project: { id: '*', typeOf: factory_1.factory.organizationType.Project },
+                aggregateDuration,
+                aggregateStart: runsFrom,
+                aggregateDate,
+                ...aggregateResult
+            });
+        }
+        debug(i, 'aggregations saved');
+        return { aggregationCount: i, aggregateDuration };
+    };
+}

package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -9,7 +9,7 @@ function createStartParams(params) {
         typeOf: factory_1.factory.organizationType.Corporation
     };
     // reservationFor,issuedThrough保管をaddReservationsから移行(2024-07-01~)
-    const reservationFor = createReservationFor(params.event, true);
+    const reservationFor = createReservationFor(params.event);
     const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
     const reservationPackage = {
         issuedThrough, // addReservationsから移行(2024-07-01~)
@@ -33,7 +33,7 @@ function createStartParams(params) {
         instrument
     };
 }
-function createReservationFor(params, useOptimizeReservation) {
+function createReservationFor(params) {
     if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
             endDate: params.endDate,
@@ -41,7 +41,7 @@ function createReservationFor(params, useOptimizeReservation) {
             location: params.location,
             name: params.name,
             startDate: params.startDate,
-            superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation),
+            superEvent: optimizeReservationSuperEvent(params),
             typeOf: params.typeOf,
             ...(params.doorTime instanceof Date)
                 ? { doorTime: params.doorTime }
@@ -52,38 +52,18 @@ function createReservationFor(params, useOptimizeReservation) {
         throw new factory_1.factory.errors.NotImplemented(`typeOf: ${params.typeOf}`);
     }
 }
-function optimizeReservationSuperEvent(params, useOptimizeReservation) {
+function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
     return {
         id: superEvent.id,
-        // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
         location: superEvent.location,
         name: superEvent.name,
-        soundFormat: superEvent.soundFormat,
+        // soundFormat: superEvent.soundFormat, // discontinue(2026-08-01~)
         typeOf: superEvent.typeOf,
         workPerformed: superEvent.workPerformed,
-        // 廃止(2024-01-26~)
-        // ...(superEvent.description !== undefined)
-        //     ? { description: superEvent.description }
-        //     : undefined,
         ...(superEvent.headline !== undefined)
             ? { headline: superEvent.headline }
             : undefined,
-        // 最適化対応(2024-03-16~)
-        ...(useOptimizeReservation)
-            ? {}
-            : {
-                additionalProperty: (Array.isArray(superEvent.additionalProperty))
-                    ? superEvent.additionalProperty
-                    : []
-            }
-        // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
-        // ...(USE_DEPRECATED_VIDEO_FORMAT)
-        //     ? {
-        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-        //         videoFormat: (<any>superEvent).videoFormat
-        //     }
-        //     : undefined
     };
 }
 function createIssuedThrough(params) {

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

@@ -1,4 +1,4 @@
-import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction } from '../eventEmitter/task';
+import type { IExecuteSettings as IMinimumExecuteSettings, IAsyncActionNextFunction } from '../eventEmitter/task';
 type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 declare function executeAsyncActionById(params: {
@@ -12,5 +12,5 @@ declare function executeAsyncActionById(params: {
          */
         name: string;
     };
-}, next?: INextFunction): IOperation<void>;
+}, next: IAsyncActionNextFunction): IOperation<void>;
 export { executeAsyncActionById };

package/lib/chevre/service/asyncAction.js

@@ -27,10 +27,7 @@ function executeAsyncActionById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, asyncActionHandler_1.executeAsyncAction)(task, (typeof next === 'function') ? next : undefined)(settings, {
-                executeById: true,
-                executeByName: false
-            });
+            await (0, asyncActionHandler_1.executeAsyncAction)(task, next)(settings, {});
         }
     };
 }

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

@@ -1,4 +1,4 @@
-import type { IExecutedTask } from '../../eventEmitter/task';
+import type { ITaskAsNextFunctionParam } from '../../eventEmitter/task';
 import type { AsyncActionRepo, IExecutableAsyncAction } from '../../repo/asyncAction';
 /**
  * タスク実行失敗時処理
@@ -10,6 +10,6 @@ declare function onOperationFailed(params: {
 }): (repos: {
     asyncAction: AsyncActionRepo;
 }) => Promise<{
-    executedTask: IExecutedTask;
+    executedTask: ITaskAsNextFunctionParam;
 }>;
 export { onOperationFailed };

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

@@ -32,10 +32,8 @@ function onOperationFailed(params) {
         });
         const executedTask = {
             id: task.id,
-            remainingNumberOfTries: 0,
             name: task.name,
             status: factory_1.factory.taskStatus.Aborted,
-            executionResult: result
         };
         return { executedTask };
     };

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

@@ -1,5 +1,5 @@
-import type { INextFunction } from '../eventEmitter/task';
-import type { ICallResult, ICallableTaskOperation, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+import type { IAsyncActionNextFunction } from '../eventEmitter/task';
+import type { ICallableTaskOperation, IOperationExecute } from '../taskSettings';
 import type { IExecutableAsyncAction } from '../repo/asyncAction';
 export declare const taskLoader: {
     load: (taskName: string) => Promise<{
@@ -9,5 +9,5 @@ export declare const taskLoader: {
 /**
  * 非同期アクションを実行する
  */
-declare function executeAsyncAction(task: IExecutableAsyncAction, next?: INextFunction): IOperationExecute<void>;
-export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeAsyncAction };
+declare function executeAsyncAction(task: IExecutableAsyncAction, next: IAsyncActionNextFunction): IOperationExecute<void>;
+export { executeAsyncAction };