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

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

@@ -22,6 +22,10 @@ interface IOnTaskStatusChanged {
      * 分析連携するtaskNameリスト
      */
     informTaskNames?: factory.taskName[];
+    /**
+     * 分析連携するtaskStatusリスト
+     */
+    informTaskStatuses?: factory.taskStatus[];
 }
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];

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

@@ -130,7 +130,7 @@ export declare class TaskRepo {
             $lt: Date;
         };
         sort: {
-            runsAt: factory.sortType;
+            runsAt?: factory.sortType;
         };
     }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**

package/lib/chevre/repo/task.js

@@ -486,8 +486,9 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection })
-                .sort(params.sort)
+            }, Object.assign({ new: true, projection }, (typeof params.sort.runsAt === 'number')
+                ? { sort: params.sort }
+                : undefined))
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean()
                 .exec();

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

@@ -1,7 +1,10 @@
 import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { IExecutableTask, TaskRepo } from '../../../repo/task';
-declare function informTaskIfNeeded(task: IExecutableTask<factory.taskName>): (repos: {
+declare function informTaskIfNeeded(params: {
+    task: IExecutableTask<factory.taskName>;
+    executionEndDate: Date;
+}): (repos: {
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -13,66 +13,89 @@ exports.informTaskIfNeeded = informTaskIfNeeded;
 const createDebug = require("debug");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service:taskHandler:onOperationFailed');
-function createInformTasks(task, setting) {
-    var _a, _b;
-    const taskRunsAt = new Date();
+function createInformTasks(params) {
+    var _a, _b, _c;
+    const { task, setting, executionEndDate } = params;
     const informTask = (_a = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _a === void 0 ? void 0 : _a.informTask;
     const informTaskNames = (_b = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _b === void 0 ? void 0 : _b.informTaskNames;
+    const informTaskStatuses = (_c = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _c === void 0 ? void 0 : _c.informTaskStatuses;
     const informTasks = [];
     if (Array.isArray(informTaskNames) && informTaskNames.includes(task.name)) {
-        const { id, name, data, project, runsAt } = task;
-        const task4inform = {
-            id, name, data, project, runsAt,
-            status: factory.taskStatus.Aborted,
-            typeOf: 'Task'
-        };
-        const informIdentifier = `Task:${name}:${id}:${task4inform.status}`;
-        if (Array.isArray(informTask) && informTask.length > 0) {
-            informTask.forEach((informTaskParams) => {
-                var _a, _b;
-                if (typeof ((_a = informTaskParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
-                    const informActionAttributes = {
-                        object: task4inform,
-                        recipient: {
-                            id: '',
-                            name: String((_b = informTaskParams.recipient) === null || _b === void 0 ? void 0 : _b.name),
-                            typeOf: factory.creativeWorkType.WebApplication
-                        },
-                        target: {
-                            httpMethod: 'POST',
-                            encodingType: factory.encodingFormat.Application.json,
-                            typeOf: 'EntryPoint',
-                            urlTemplate: informTaskParams.recipient.url
-                        },
-                        identifier: informIdentifier
+        if (Array.isArray(informTaskStatuses)) {
+            const { id, name, data, project, runsAt, remainingNumberOfTries } = task;
+            let task4inform;
+            if (remainingNumberOfTries <= 0) {
+                if (informTaskStatuses.includes(factory.taskStatus.Aborted)) {
+                    const abortingTask = {
+                        id, name, data, project, runsAt,
+                        status: factory.taskStatus.Aborted,
+                        typeOf: 'Task',
+                        dateAborted: executionEndDate
                     };
-                    const description = `inform aborting tasks to agg service: ${name} ${id}`;
-                    informTasks.push({
-                        project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: informActionAttributes,
-                        description
+                    task4inform = abortingTask;
+                }
+            }
+            else {
+                if (informTaskStatuses.includes(factory.taskStatus.Running)) {
+                    const runningTask = {
+                        id, name, data, project, runsAt,
+                        status: factory.taskStatus.Running,
+                        typeOf: 'Task'
+                    };
+                    task4inform = runningTask;
+                }
+            }
+            if (task4inform !== undefined) {
+                const informIdentifier = `Task:${name}:${id}:${task4inform.status}`;
+                if (Array.isArray(informTask) && informTask.length > 0) {
+                    informTask.forEach((informTaskParams) => {
+                        var _a, _b;
+                        if (typeof ((_a = informTaskParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+                            const informActionAttributes = {
+                                object: task4inform,
+                                recipient: {
+                                    id: '',
+                                    name: String((_b = informTaskParams.recipient) === null || _b === void 0 ? void 0 : _b.name),
+                                    typeOf: factory.creativeWorkType.WebApplication
+                                },
+                                target: {
+                                    httpMethod: 'POST',
+                                    encodingType: factory.encodingFormat.Application.json,
+                                    typeOf: 'EntryPoint',
+                                    urlTemplate: informTaskParams.recipient.url
+                                },
+                                identifier: informIdentifier
+                            };
+                            const description = `inform aborting tasks to agg service: ${name} ${id} ${task4inform.status}`;
+                            informTasks.push({
+                                project,
+                                name: factory.taskName.TriggerWebhook,
+                                status: factory.taskStatus.Ready,
+                                runsAt: executionEndDate,
+                                remainingNumberOfTries: 10,
+                                numberOfTried: 0,
+                                executionResults: [],
+                                data: informActionAttributes,
+                                description
+                            });
+                        }
                     });
                 }
-            });
+            }
         }
     }
     return informTasks;
 }
-function informTaskIfNeeded(task) {
+function informTaskIfNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const isAborting = task.status === factory.taskStatus.Running && task.remainingNumberOfTries <= 0;
+        const { executionEndDate, task } = params;
+        const isAborting = task.status === factory.taskStatus.Running;
         const useInform = isAborting
             && task.name !== factory.taskName.HandleNotification // nameで絞る
             && task.name !== factory.taskName.TriggerWebhook;
         if (useInform) {
             const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
-            const informTasks = createInformTasks(task, setting);
+            const informTasks = createInformTasks({ task, setting, executionEndDate });
             debug('informTaskIfNeeded: creating inform tasks...', JSON.stringify(informTasks));
             if (informTasks.length > 0) {
                 yield repos.task.saveMany(informTasks, { emitImmediately: true });

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperationFailed = onOperationFailed;
 const factory = require("../../factory");
 const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
+const USE_INFORM_TASK_RUNNING = process.env.USE_INFORM_TASK_RUNNING === '1';
 /**
  * タスク実行失敗時処理
  */
@@ -22,12 +23,17 @@ function onOperationFailed(params) {
         if (typeof error !== 'object') {
             error = { message: String(error) };
         }
+        const endDate = new Date();
         // remainingNumberOfTries<=0ならAborted(2025-08-04~)
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
+            // 実験的に実行中タスク連携
+            if (USE_INFORM_TASK_RUNNING) {
+                yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+            }
             const result = {
                 executedAt: now,
-                endDate: new Date(),
+                endDate,
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
@@ -45,10 +51,10 @@ function onOperationFailed(params) {
             // 設定されたnameの場合連携する
             // もしここで連携タスク作成に失敗したとしても、再度Readyタスクとなりリトライされて、処理は冪等となる想定
             // 最終的に、連携タスクが作成され、実行中タスクがAbortedとなればよい
-            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)(task)(repos);
+            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
-                endDate: new Date(),
+                endDate,
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             yield repos.task.setExecutionResultAndStatus({

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.396.0-alpha.3",
+    "@chevre/factory": "4.396.0-alpha.4",
     "@cinerino/sdk": "11.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -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.26"
+  "version": "22.11.0-alpha.28"
 }