@chevre/domain 22.11.0-alpha.24 → 22.11.0-alpha.26

package/example/src/chevre/task/countTasks.ts

@@ -36,7 +36,8 @@ async function main() {
 
             const runningTasksCountResult = await taskRepo.count({
                 limit: 100,
-                status: { $eq: chevre.factory.taskStatus.Running }
+                status: { $eq: chevre.factory.taskStatus.Running },
+                runsThrough: new Date()
             });
             console.log('runningTasksCountResult:', runningTasksCountResult);
         },

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

@@ -86,9 +86,8 @@ export declare class TaskRepo {
      * Readyのタスクをname指定でひとつRunningに変更する
      */
     executeOneIfExists(params: {
-        name?: {
-            $eq?: factory.taskName;
-            $nin?: factory.taskName[];
+        name: {
+            $eq: factory.taskName;
         };
         executor: {
             name: string;
@@ -96,6 +95,10 @@ export declare class TaskRepo {
         runsAt: {
             $lt: Date;
         };
+        sort: {
+            numberOfTried?: factory.sortType;
+            runsAt?: factory.sortType;
+        };
     }): Promise<IExecutableTask<factory.taskName> | null>;
     /**
      * add(2025-03-16~)
@@ -130,9 +133,6 @@ export declare class TaskRepo {
             runsAt: factory.sortType;
         };
     }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
-    /**
-     * emit OnTaskStatusChanged on delayed tasks
-     */
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */

package/lib/chevre/repo/task.js

@@ -30,10 +30,10 @@ const task_2 = require("./mongoose/schemas/task");
 /**
  * タスク実行時のソート条件
  */
-const sortOrder4executionOfTasks = {
-    // numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先 // discontinue(2025-08-06~)
-    runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
-};
+// const sortOrder4executionOfTasks: { [key in keyof factory.task.IAttributes<factory.taskName>]?: factory.sortType } = {
+//     numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
+//     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
+// };
 const executableTaskProjection = {
     _id: 0,
     id: { $toString: '$_id' },
@@ -394,15 +394,17 @@ class TaskRepo {
      */
     executeOneIfExists(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             if (!(params.runsAt.$lt instanceof Date)) {
                 throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
             }
             const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
+            // const nameNin = params.name?.$nin;
+            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string')
                 ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined
+                    // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+                    )
                 }
                 : undefined), {
                 $set: {
@@ -414,8 +416,9 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection: executableTaskProjection })
-                .sort(sortOrder4executionOfTasks)
+            }, Object.assign({ new: true, projection: executableTaskProjection }, (typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
+                ? { sort: params.sort }
+                : undefined))
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // lean(2024-09-26~)
                 .exec();
@@ -499,107 +502,6 @@ class TaskRepo {
             return doc;
         });
     }
-    // public async findExecutableOne(params: {
-    //     name?: {
-    //         $eq?: factory.taskName;
-    //         $nin?: factory.taskName[];
-    //     };
-    //     runsAt: {
-    //         $lt: Date;
-    //     };
-    // }): Promise<IExecutableTask<factory.taskName> | null> {
-    //     if (!(params.runsAt.$lt instanceof Date)) {
-    //         throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
-    //     }
-    //     const nameEq = params.name?.$eq;
-    //     const nameNin = params.name?.$nin;
-    //     const query = this.taskModel.findOne(
-    //         {
-    //             status: { $eq: factory.taskStatus.Ready },
-    //             runsAt: { $lt: params.runsAt.$lt },
-    //             ...(typeof nameEq === 'string' || Array.isArray(nameNin))
-    //                 ? {
-    //                     name: {
-    //                         ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
-    //                         ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
-    //                     }
-    //                 }
-    //                 : undefined
-    //         },
-    //         executableTaskProjection
-    //     )
-    //         .sort({
-    //             runsAt: factory.sortType.Ascending
-    //         });
-    //     // .hint('executeOneByName');
-    //     // const explainResult = await query.explain();
-    //     // console.dir(explainResult, { depth: null });
-    //     // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-    //     const doc = await query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .lean<IExecutableTask<factory.taskName>>()
-    //         .exec();
-    //     if (doc === null) {
-    //         // tslint:disable-next-line:no-null-keyword
-    //         return null;
-    //     }
-    //     return doc;
-    // }
-    // discontinue(2025-05-26~)
-    /**
-     * emit OnTaskStatusChanged on delayed tasks
-     */
-    // public async emitDelayedTasksEvent(params: {
-    //     now: Date;
-    //     /**
-    //      * 指定期間遅延しているタスクを実行する
-    //      */
-    //     delayInSeconds: number;
-    //     limit: number;
-    //     name: {
-    //         /**
-    //          * 指定タスクのみ実行する
-    //          */
-    //         $in?: factory.taskName[];
-    //         /**
-    //          * 指定タスク以外のみ実行する
-    //          */
-    //         $nin?: factory.taskName[];
-    //     };
-    // }) {
-    //     const runsAtLt = moment(params.now)
-    //         .add(-params.delayInSeconds, 'seconds')
-    //         .toDate();
-    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
-    //         _id: 0,
-    //         id: { $toString: '$_id' },
-    //         name: 1,
-    //         status: 1
-    //     };
-    //     const delayedTasks = await this.taskModel.find(
-    //         {
-    //             status: { $eq: factory.taskStatus.Ready },
-    //             runsAt: { $lt: runsAtLt },
-    //             ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined,
-    //             ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
-    //         },
-    //         projection
-    //     )
-    //         .limit(params.limit)
-    //         .sort(sortOrder4executionOfTasks) // sort(2025-03-03~)
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .lean<IDelayedTask[]>() // lean(2024-09-26~)
-    //         .exec();
-    //     if (delayedTasks.length > 0) {
-    //         delayedTasks.forEach((delayedTask) => {
-    //             taskEventEmitter.emitTaskStatusChanged({
-    //                 id: delayedTask.id,
-    //                 name: delayedTask.name,
-    //                 status: factory.taskStatus.Ready
-    //             });
-    //         });
-    //     }
-    //     return delayedTasks;
-    // }
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */

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

@@ -23,13 +23,9 @@ declare function executeById(params: (IReadyTask | IRunningTask) & {
         name: string;
     };
 }, next?: INextFunction): IOperation<void>;
-/**
- * support no name(2025-03-04~)
- */
 declare function executeOneIfExists(params: {
-    name?: {
-        $eq?: factory.taskName;
-        $nin?: factory.taskName[];
+    name: {
+        $eq: factory.taskName;
     };
     executor: {
         /**
@@ -40,5 +36,9 @@ declare function executeOneIfExists(params: {
     runsAt: {
         $lt: Date;
     };
+    sort: {
+        numberOfTried?: factory.sortType;
+        runsAt?: factory.sortType;
+    };
 }): IOperation<void>;
 export { executeById, executeOneIfExists };

package/lib/chevre/service/task.js

@@ -45,9 +45,6 @@ function executeById(params, next) {
         }
     });
 }
-/**
- * support no name(2025-03-04~)
- */
 function executeOneIfExists(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -56,7 +53,12 @@ function executeOneIfExists(params) {
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneIfExists(Object.assign({ executor: { name: params.executor.name }, runsAt: { $lt: params.runsAt.$lt } }, (params.name !== undefined) ? { name: params.name } : undefined));
+            task = yield taskRepo.executeOneIfExists({
+                executor: { name: params.executor.name },
+                runsAt: { $lt: params.runsAt.$lt },
+                name: params.name,
+                sort: params.sort
+            });
             debug('executable task found.', task, params.runsAt.$lt);
         }
         catch (error) {

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.24"
+  "version": "22.11.0-alpha.26"
 }

package/example/src/chevre/executeOneTask.ts

@@ -1,41 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-    const task = await taskRepo.executeOneIfExists({
-        name: {
-            $nin: [
-                chevre.factory.taskName.DeleteTransaction,
-                chevre.factory.taskName.ImportEventCapacitiesFromCOA,
-                chevre.factory.taskName.ImportEventsFromCOA,
-                chevre.factory.taskName.AcceptCOAOffer,
-                chevre.factory.taskName.CheckMovieTicket,
-                chevre.factory.taskName.AuthorizePayment,
-                chevre.factory.taskName.PublishPaymentUrl
-            ]
-        },
-        executor: { name: 'sample' },
-        runsAt: {
-            $lt: moment()
-                // tslint:disable-next-line:no-magic-numbers
-                .add(-2, 'years')
-                // .add(-60, 'seconds')
-                .toDate()
-        }
-    });
-
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(task, { depth: null });
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/executeTaskIfExists.ts

@@ -1,80 +0,0 @@
-// tslint:disable:no-console
-import { chevre } from '../../../lib/index';
-
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-export async function executeTaskIfExists() {
-    const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
-        socket: {
-            port: Number(<string>process.env.REDIS_PORT),
-            host: <string>process.env.REDIS_HOST
-        },
-        password: <string>process.env.REDIS_KEY
-    });
-    await redisClient.connect();
-
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    let count = 0;
-
-    const MAX_NUBMER_OF_PARALLEL_TASKS = 1;
-    const INTERVAL_MILLISECONDS = 1000;
-
-    setInterval(
-        async () => {
-            if (count > MAX_NUBMER_OF_PARALLEL_TASKS) {
-                return;
-            }
-
-            count += 1;
-
-            try {
-                console.log('executing...', count);
-                await (await chevre.service.task.createService()).executeOneIfExists({
-                    // name: chevre.factory.taskName.AggregateScreeningEvent,
-                    executor: { name: 'sample' },
-                    runsAt: { $lt: new Date() },
-                    name: {
-                        $nin: [
-                            chevre.factory.taskName.DeleteTransaction,
-                            chevre.factory.taskName.ImportEventCapacitiesFromCOA,
-                            chevre.factory.taskName.ImportEventsFromCOA,
-                            chevre.factory.taskName.AcceptCOAOffer,
-                            chevre.factory.taskName.CheckMovieTicket,
-                            chevre.factory.taskName.AuthorizePayment,
-                            chevre.factory.taskName.PublishPaymentUrl
-                        ]
-                    }
-                })({
-                    connection: mongoose.connection,
-                    redisClient,
-                    credentials: {
-                        sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
-                    },
-                    settings: new chevre.settings.Settings({
-                        deliverOrderLimit: 1,
-                        abortedTasksWithoutReport: [],
-                        coa: { timeout: 1000 },
-                        gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
-                        movieticketReserve: { timeout: 1000, timeoutCheck: 1000, minIntervalBetweenPayAndRefund: 0 },
-                        numTryConfirmReserveTransaction: 10,
-                        useExperimentalFeature: false
-                    })
-                });
-                console.log('executed', count);
-            } catch (error) {
-                console.error(error);
-            }
-
-            count -= 1;
-        },
-        INTERVAL_MILLISECONDS
-    );
-}
-
-executeTaskIfExists()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);