@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

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

@@ -1,24 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.informTaskIfNeeded = informTaskIfNeeded;
 const createDebug = require("debug");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service:taskHandler:onOperationFailed');
 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 informTask = setting?.onTaskStatusChanged?.informTask;
+    const informTaskNames = setting?.onTaskStatusChanged?.informTaskNames;
+    const informTaskStatuses = setting?.onTaskStatusChanged?.informTaskStatuses;
     const informTasks = [];
     if (Array.isArray(informTaskNames) && informTaskNames.includes(task.name)) {
         if (Array.isArray(informTaskStatuses)) {
@@ -49,13 +39,12 @@ function createInformTasks(params) {
                 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') {
+                        if (typeof informTaskParams.recipient?.url === 'string') {
                             const informActionAttributes = {
                                 object: task4inform,
                                 recipient: {
                                     id: '',
-                                    name: String((_b = informTaskParams.recipient) === null || _b === void 0 ? void 0 : _b.name),
+                                    name: String(informTaskParams.recipient?.name),
                                     typeOf: factory.creativeWorkType.WebApplication
                                 },
                                 target: {
@@ -87,19 +76,19 @@ function createInformTasks(params) {
     return informTasks;
 }
 function informTaskIfNeeded(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         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 setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
             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 });
+                await repos.task.saveMany(informTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperationFailed = onOperationFailed;
 const factory = require("../../factory");
@@ -17,7 +8,7 @@ const USE_INFORM_TASK_RUNNING = process.env.USE_INFORM_TASK_RUNNING === '1';
  * タスク実行失敗時処理
  */
 function onOperationFailed(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let error = params.error;
         const { task, now, next } = params;
         if (typeof error !== 'object') {
@@ -29,15 +20,21 @@ function onOperationFailed(params) {
         if (isRetryable) {
             // 実験的に実行中タスク連携
             if (USE_INFORM_TASK_RUNNING) {
-                yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+                await (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             }
             const result = {
                 executedAt: now,
                 endDate,
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield repos.task.setExecutionResultAndStatus({
+            await repos.task.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries: task.remainingNumberOfTries,
                 name: task.name
@@ -51,13 +48,19 @@ function onOperationFailed(params) {
             // 設定されたnameの場合連携する
             // もしここで連携タスク作成に失敗したとしても、再度Readyタスクとなりリトライされて、処理は冪等となる想定
             // 最終的に、連携タスクが作成され、実行中タスクがAbortedとなればよい
-            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+            await (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
             };
-            yield repos.task.setExecutionResultAndStatus({
+            await repos.task.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries: task.remainingNumberOfTries,
                 name: task.name
@@ -66,5 +69,5 @@ function onOperationFailed(params) {
                 executionResult: result
             }, (typeof next === 'function') ? next : undefined);
         }
-    });
+    };
 }

package/lib/chevre/service/taskHandler.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeTask = executeTask;
 const createDebug = require("debug");
@@ -18,13 +9,12 @@ const debug = createDebug('chevre-domain:service:taskHandler');
 /**
  * タスクを実行する
  */
-// tslint:disable-next-line:max-func-body-length
 function executeTask(task, next) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
-    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
-        const settingRepo = new (yield Promise.resolve().then(() => require('../repo/setting'))).SettingRepo(settings.connection);
-        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
+    return async (settings, options) => {
+        const settingRepo = new (await Promise.resolve().then(() => require('../repo/setting'))).SettingRepo(settings.connection);
+        const taskRepo = new (await Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
         try {
             // 期限検証(2024-04-23~)
             if (task.expires instanceof Date) {
@@ -43,7 +33,7 @@ function executeTask(task, next) {
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             let callResult;
-            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
+            const { call } = await Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {
                 case factory.taskName.AcceptCOAOffer:
                 case factory.taskName.AggregateOnSystem:
@@ -72,19 +62,23 @@ function executeTask(task, next) {
                 case factory.taskName.SendEmailMessage:
                 case factory.taskName.SyncResourcesFromCOA:
                 case factory.taskName.TriggerWebhook:
-                    callResult = yield call(task)(settings, options);
+                    callResult = await call(task)(settings, options);
                     break;
                 default:
-                    yield call(task.data)(settings);
+                    await call(task.data)(settings);
             }
             const result = {
                 executedAt: now,
                 endDate: new Date(),
                 // enable overwriting task.executionResults.error on Executed(2024-05-29~)
-                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
-                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
+                error: (callResult?.error instanceof Error)
+                    ? {
+                        ...callResult.error,
+                        message: callResult.error.message
+                    }
+                    : ''
             };
-            yield taskRepo.setExecutionResultAndStatus({
+            await taskRepo.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries,
                 name: task.name
@@ -94,8 +88,11 @@ function executeTask(task, next) {
             }, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
-            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
-            yield (0, onOperationFailed_1.onOperationFailed)(Object.assign({ task, now, error }, (typeof next === 'function') ? { next } : undefined))({ setting: settingRepo, task: taskRepo });
+            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error?.name, error?.message);
+            await (0, onOperationFailed_1.onOperationFailed)({
+                task, now, error,
+                ...(typeof next === 'function') ? { next } : undefined
+            })({ setting: settingRepo, task: taskRepo });
         }
-    });
+    };
 }