@chevre/domain 25.2.0-alpha.49 → 25.2.0-alpha.50

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

@@ -1,8 +1,8 @@
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { IModel, IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
-type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'alternateName' | 'data' | 'description' | 'executionResults' | 'expires' | 'identifier' | 'name' | 'project' | 'runsAt' | 'status'> & {
+type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'expires' | 'name' | 'project' | 'runsAt' | 'status'> & {
     expires: Date;
 };
 export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
@@ -47,18 +47,6 @@ export declare class AsyncActionRepo {
     }, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
         id: string;
     } | undefined)>;
-    /**
-     * Readyのままで期限切れのタスクをExpiredに変更する
-     */
-    makeExpiredMany(params: {
-        expiresLt: Date;
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * taskNameに関わらず、Runningのまま放置された非同期アクションをAbortedに変更する
-     */
-    abortMany(params: {
-        intervalInMinutes: number;
-    }): Promise<UpdateWriteOpResult>;
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする
@@ -72,13 +60,5 @@ export declare class AsyncActionRepo {
         status: factory.taskStatus.Executed | factory.taskStatus.Aborted;
         executionResult: factory.task.IExecutionResult;
     }): Promise<void>;
-    /**
-     * 不要なタスクを削除する
-     */
-    deleteRunsAtPassedCertainPeriod(params: {
-        runsAt: {
-            $lt: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/asyncAction.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncActionRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const asyncAction_1 = require("./mongoose/schemas/asyncAction");
@@ -20,9 +16,6 @@ const executableTaskProjection = {
     expires: 1
 };
 const AVAILABLE_PROJECT_FIELDS = [
-    'alternateName',
-    'identifier',
-    'description',
     'project',
     'name',
     'status',
@@ -71,7 +64,7 @@ class AsyncActionRepo {
             _id: { $eq: params.id },
             status: { $eq: factory_1.factory.taskStatus.Ready }, // Readyのものしか実行しない
             runsAt: { $lt: now },
-            expires: { $exists: true, $gt: now }, // ワンタイムタスクなのでexpiresは必ず存在する
+            expires: { $gt: now }, // ワンタイムタスクなのでexpiresは必ず存在する
         }, {
             $set: {
                 status: factory_1.factory.taskStatus.Running, // 実行中に変更
@@ -116,45 +109,55 @@ class AsyncActionRepo {
         }
         return doc;
     }
-    /**
-     * 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.asyncActionModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            expires: { $exists: true, $lt: expiresLt }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Expired
-            }
-        })
-            .exec();
-    }
-    /**
-     * taskNameに関わらず、Runningのまま放置された非同期アクションをAbortedに変更する
-     */
-    async abortMany(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.asyncActionModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $exists: true,
-                $lt: lastTriedAtShoudBeLessThan
-            }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Aborted,
-                dateAborted: new Date()
-            }
-        })
-            .exec();
-    }
+    // /**
+    //  * Readyのままで期限切れのタスクをExpiredに変更する
+    //  */
+    // public async makeExpiredMany(params: {
+    //     expiresLt: Date;
+    // }): Promise<UpdateWriteOpResult> {
+    //     const { expiresLt } = params;
+    //     if (!(expiresLt instanceof Date)) {
+    //         throw new factory.errors.Argument('expiresLt', 'must be Date');
+    //     }
+    //     return this.asyncActionModel.updateMany(
+    //         {
+    //             status: { $eq: factory.taskStatus.Ready },
+    //             expires: { $lt: expiresLt }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Expired
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    // /**
+    //  * taskNameに関わらず、Runningのまま放置された非同期アクションをAbortedに変更する
+    //  */
+    // public async abortMany(params: {
+    //     intervalInMinutes: number;
+    // }): Promise<UpdateWriteOpResult> {
+    //     const lastTriedAtShoudBeLessThan = moment()
+    //         .add(-params.intervalInMinutes, 'minutes')
+    //         .toDate();
+    //     return this.asyncActionModel.updateMany(
+    //         {
+    //             status: { $eq: factory.taskStatus.Running },
+    //             lastTriedAt: {
+    //                 $exists: true,
+    //                 $lt: lastTriedAtShoudBeLessThan
+    //             }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Aborted,
+    //                 dateAborted: new Date()
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする
@@ -171,21 +174,5 @@ class AsyncActionRepo {
         })
             .exec();
     }
-    /**
-     * 不要なタスクを削除する
-     */
-    async deleteRunsAtPassedCertainPeriod(params) {
-        return this.asyncActionModel.deleteMany({
-            runsAt: { $lt: params.runsAt.$lt },
-            status: {
-                $in: [
-                    factory_1.factory.taskStatus.Aborted,
-                    factory_1.factory.taskStatus.Executed,
-                    factory_1.factory.taskStatus.Expired
-                ]
-            }
-        })
-            .exec();
-    }
 }
 exports.AsyncActionRepo = AsyncActionRepo;

package/lib/chevre/repo/mongoose/schemas/asyncAction.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = Pick<factory.task.ITask<factory.taskName>, 'alternateName' | 'data' | 'dateAborted' | 'description' | 'executionResults' | 'executor' | 'expires' | 'identifier' | 'lastTriedAt' | 'name' | 'project' | 'runsAt' | 'status'>;
+type IDocType = Pick<factory.task.ITask<factory.taskName>, 'data' | 'dateAborted' | 'executionResults' | 'executor' | 'expires' | 'lastTriedAt' | 'name' | 'project' | 'runsAt' | 'status'>;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

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

@@ -8,9 +8,6 @@ const settings_1 = require("../../../settings");
 const modelName = 'AsyncAction';
 exports.modelName = modelName;
 const schemaDefinition = {
-    alternateName: String, // add(2025-03-28~)
-    identifier: String,
-    description: String, // add(2025-03-30~)
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     name: { type: String, required: true },
     status: { type: String, required: true },
@@ -48,98 +45,31 @@ const schemaOptions = {
         versionKey: false
     }
 };
+const EXPIRE_AFTER_SECONDS = 3600; // 1 hour
 const indexes = [
     [
-        { 'project.id': 1, runsAt: -1 },
-        { name: 'projectId' }
-    ],
-    [
-        { name: 1, runsAt: -1 },
-        { name: 'asyncActionName' }
-    ],
-    [
-        { status: 1, runsAt: -1 },
-        { name: 'status' }
-    ],
-    [
-        { runsAt: -1 },
-        { name: 'runsAt' }
-    ],
-    [
-        { identifier: 1, runsAt: -1 },
+        { expires: 1 },
         {
-            name: 'identifier',
-            partialFilterExpression: {
-                identifier: { $exists: true }
-            }
+            name: 'ttlByExpires',
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS
         }
     ],
     [
-        { dateAborted: 1, runsAt: -1 },
-        {
-            name: 'dateAborted',
-            partialFilterExpression: {
-                dateAborted: { $exists: true }
-            }
-        }
-    ],
-    [
-        { lastTriedAt: 1, runsAt: -1 },
-        {
-            name: 'lastTriedAt',
-            partialFilterExpression: {
-                lastTriedAt: { $exists: true }
-            }
-        }
-    ],
-    [
-        { expires: 1, runsAt: -1 },
-        {
-            name: 'expires',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
+        { runsAt: -1 },
+        { name: 'runsAt' }
     ],
     [
-        { status: 1, lastTriedAt: 1 },
-        {
-            name: 'abortMany',
-            partialFilterExpression: {
-                lastTriedAt: { $exists: true }
-            }
-        }
+        { 'project.id': 1, runsAt: -1 },
+        { name: 'projectId' }
     ],
     [
-        { status: 1, expires: 1 },
-        {
-            name: 'makeExpiredMany',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
+        { name: 1, runsAt: -1 },
+        { name: 'asyncActionName' }
     ],
     [
-        // add unique index(2025-03-28~)
-        { alternateName: 1 },
-        {
-            unique: true,
-            name: 'uniqueAlternateName',
-            partialFilterExpression: {
-                alternateName: { $exists: true }
-            }
-        }
+        { status: 1, runsAt: -1 },
+        { name: 'status' }
     ],
-    [
-        { identifier: 1 },
-        {
-            unique: true,
-            name: 'uniqueIdentifier',
-            partialFilterExpression: {
-                identifier: { $exists: true }
-            }
-        }
-    ]
 ];
 exports.indexes = indexes;
 /**

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

@@ -1,5 +1,4 @@
 import type { IExecutedTask } from '../../eventEmitter/task';
-import type { SettingRepo } from '../../repo/setting';
 import type { AsyncActionRepo, IExecutableAsyncAction } from '../../repo/asyncAction';
 /**
  * タスク実行失敗時処理
@@ -9,7 +8,6 @@ declare function onOperationFailed(params: {
     now: Date;
     error: any;
 }): (repos: {
-    setting: SettingRepo;
     asyncAction: AsyncActionRepo;
 }) => Promise<{
     executedTask: IExecutedTask;

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

@@ -9,7 +9,7 @@ function onOperationFailed(params) {
     return async (repos) => {
         let error = params.error;
         const { task, now } = params;
-        if (typeof error !== 'object') {
+        if (error === null || typeof error !== 'object') {
             error = { message: String(error) };
         }
         const endDate = new Date();
@@ -34,7 +34,7 @@ function onOperationFailed(params) {
             id: task.id,
             remainingNumberOfTries: 0,
             name: task.name,
-            status: task.status,
+            status: factory_1.factory.taskStatus.Aborted,
             executionResult: result
         };
         return { executedTask };

package/lib/chevre/service/asyncActionHandler.js

@@ -22,7 +22,6 @@ function executeAsyncAction(task, next) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return async (settings, options) => {
-        const settingRepo = new (await import('../repo/setting.js')).SettingRepo(settings.connection);
         const asyncActionRepo = new (await import('../repo/asyncAction.js')).AsyncActionRepo(settings.connection);
         let executedTask;
         try {
@@ -69,7 +68,7 @@ function executeAsyncAction(task, next) {
         catch (error) {
             const onOperationFailedResult = await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
-            })({ setting: settingRepo, asyncAction: asyncActionRepo });
+            })({ asyncAction: asyncActionRepo });
             executedTask = onOperationFailedResult.executedTask;
         }
         finally {

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

@@ -10,7 +10,7 @@ function onOperationFailed(params) {
     return async (repos) => {
         let error = params.error;
         const { task, now, next } = params;
-        if (typeof error !== 'object') {
+        if (error === null || typeof error !== 'object') {
             error = { message: String(error) };
         }
         const endDate = new Date();

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.49"
+  "version": "25.2.0-alpha.50"
 }