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

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;
@@ -14,5 +14,5 @@ declare function executeTaskById(params: (Pick<IReadyTask, 'id' | 'status'> | Pi
          */
         name: string;
     };
-}, next?: INextFunction): IOperation<void>;
-export { executeTaskById, };
+}): IOperation<void>;
+export { executeTaskById };

package/lib/chevre/service/task.js

@@ -13,7 +13,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
  */
-function executeTaskById(params, next) {
+function executeTaskById(params) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
         const { id, status, executor } = params;
@@ -33,9 +33,9 @@ function executeTaskById(params, next) {
         }
         // タスクがなければ終了
         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 };

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/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.13"
+  "version": "26.0.0-alpha.15"
 }

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;