@chevre/domain 21.18.0-alpha.1 → 21.18.0-alpha.2

package/example/src/chevre/report2developers.ts

@@ -25,7 +25,10 @@ async function main() {
             typeOf: chevre.factory.creativeWorkType.WebApplication
         },
         object: { sample: 'sample' }
-    })({ action: await chevre.repository.Action.createInstance(mongoose.connection) });
+    })({
+        action: await chevre.repository.Action.createInstance(mongoose.connection),
+        useFetchAPI: true
+    });
 }
 
 main()

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

@@ -1,8 +1,9 @@
 import * as factory from '../factory';
 import type { MongoRepository as ActionRepo } from '../repo/action';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
-export type Operation<T> = (repos: {
+export type IReport2developersOperation<T> = (repos: {
     accessToken: string;
+    useFetchAPI: boolean;
 }) => Promise<T>;
 /**
  * Eメールメッセージを送信する
@@ -16,7 +17,13 @@ export declare function sendEmailMessage(params: factory.action.transfer.send.me
  * 開発者に報告する
  * https://notify-bot.line.me/doc/ja/
  */
-export declare function report2developers(subject: string, content: string, imageThumbnail?: string, imageFullsize?: string): Operation<void>;
+export declare function report2developers({ subject, content, imageThumbnail, imageFullsize }: {
+    subject: string;
+    content: string;
+    imageThumbnail?: string;
+    imageFullsize?: string;
+}): IReport2developersOperation<void>;
 export declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook>): (repos: {
     action: ActionRepo;
+    useFetchAPI: boolean;
 }) => Promise<void>;

package/lib/chevre/service/notification.js

@@ -121,8 +121,8 @@ exports.sendEmailMessage = sendEmailMessage;
  * 開発者に報告する
  * https://notify-bot.line.me/doc/ja/
  */
-// tslint:disable-next-line:max-func-body-length
-function report2developers(subject, content, imageThumbnail, imageFullsize) {
+function report2developers({ subject, content, imageThumbnail, imageFullsize }) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
@@ -133,7 +133,7 @@ function report2developers(subject, content, imageThumbnail, imageFullsize) {
 ${subject}
 --------
 ${content}`;
-        if (settings_1.USE_FETCH_API) {
+        if (repos.useFetchAPI) {
             try {
                 const form = new FormData();
                 form.set('message', message);
@@ -148,12 +148,18 @@ ${content}`;
                     }, body: form }, (typeof ((_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout) === 'number')
                     ? { signal: AbortSignal.timeout(settings_1.settings.webhook.timeout) }
                     : undefined));
-                const body = yield res.json();
+                let body;
+                try {
+                    body = yield res.json();
+                }
+                catch (error) {
+                    // no op
+                }
                 switch (res.status) {
                     case http_status_1.OK:
                         break;
                     default:
-                        throw new Error(`${res.status} ${body.message}`);
+                        throw new Error(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
                 }
             }
             catch (err) {
@@ -257,7 +263,7 @@ function processInformAction(params) {
         try {
             if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
                 const url = params.recipient.url;
-                if (settings_1.USE_FETCH_API) {
+                if (repos.useFetchAPI) {
                     try {
                         const res = yield fetch(url, Object.assign({ method: 'POST', headers: {
                                 'Content-Type': 'application/json'
@@ -279,7 +285,8 @@ function processInformAction(params) {
                             case http_status_1.ACCEPTED:
                             case http_status_1.NO_CONTENT:
                                 result = {
-                                    statusCode: res.status
+                                    statusCode: res.status,
+                                    useFetchAPI: repos.useFetchAPI
                                 };
                                 break;
                             default:
@@ -329,7 +336,8 @@ function processInformAction(params) {
                                     case http_status_1.ACCEPTED:
                                     case http_status_1.NO_CONTENT:
                                         result = {
-                                            statusCode: response.statusCode
+                                            statusCode: response.statusCode,
+                                            useFetchAPI: repos.useFetchAPI
                                             // body: body
                                         };
                                         resolve();

package/lib/chevre/service/task/triggerWebhook.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const settings_1 = require("../../settings");
 const action_1 = require("../../repo/action");
 const NotificationService = require("../notification");
 /**
@@ -17,8 +18,10 @@ const NotificationService = require("../notification");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        yield NotificationService.triggerWebhook(data)({ action: actionRepo });
+        yield NotificationService.triggerWebhook(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            useFetchAPI: settings_1.USE_FETCH_API
+        });
     });
 }
 exports.call = call;

package/lib/chevre/service/task.js

@@ -143,8 +143,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield notification.report2developers(message.subject, message.content)({
-                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            yield notification.report2developers({ subject: message.subject, content: message.content })({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert,
+                useFetchAPI: settings_1.USE_FETCH_API
             });
         }
     });
@@ -155,18 +156,15 @@ function notifyAbortedTasks(params) {
         const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (settings_1.ABORTED_TASKS_WITHOUT_REPORT.length > 0)
             ? { name: { $nin: settings_1.ABORTED_TASKS_WITHOUT_REPORT } }
             : undefined));
-        // 中止を報告しないタスク以外にフィルター
-        // abortedTasks = abortedTasks.filter((task) => {
-        //     return !ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
-        // });
         if (abortedTasks.length > 0) {
             if (notification === undefined) {
                 notification = yield Promise.resolve().then(() => require('./notification'));
             }
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield notification.report2developers(message.subject, message.content)({
-                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            yield notification.report2developers({ subject: message.subject, content: message.content })({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert,
+                useFetchAPI: settings_1.USE_FETCH_API
             });
         }
     });

package/package.json

@@ -43,8 +43,7 @@
     "@types/lodash.difference": "^4.5.6",
     "@types/mocha": "^5.2.7",
     "@types/moment-timezone": "^0.5.30",
-    "@types/nock": "^9.3.1",
-    "@types/node": "14.18.42",
+    "@types/node": "18.19.2",
     "@types/power-assert": "^1.5.3",
     "@types/pug": "^2.0.4",
     "@types/request": "^2.48.5",
@@ -59,13 +58,12 @@
     "json2csv": "4.5.4",
     "mocha": "^5.2.0",
     "mongoose": "7.0.5",
-    "nock": "^9.6.1",
+    "nock": "13.4.0",
     "nyc": "^15.1.0",
     "power-assert": "^1.6.1",
     "redis": "4.6.5",
-    "request-promise-native": "^1.0.9",
     "rimraf": "^2.7.1",
-    "sinon": "^4.5.0",
+    "sinon": "4.5.0",
     "sinon-mongoose": "^2.3.0",
     "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
@@ -78,7 +76,7 @@
     "redis": "^4.6.5"
   },
   "engines": {
-    "node": ">=14.0.0",
+    "node": ">=18.0.0",
     "npm": ">=6.0.0"
   },
   "keywords": [],
@@ -117,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.1"
+  "version": "21.18.0-alpha.2"
 }