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

package/example/src/chevre/report2developers.ts

@@ -0,0 +1,36 @@
+// tslint:disable:no-console
+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, { autoIndex: false });
+
+    const notificationService = await chevre.service.notification.createService();
+
+    // await notificationService.report2developers(
+    //     'xxx',
+    //     'xxx'
+    // )({ accessToken: String(process.env.LINE_NOTIFY_ACCESS_TOKEN) });
+
+    await notificationService.triggerWebhook({
+        typeOf: chevre.factory.actionType.InformAction,
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        recipient: {
+            id: 'xxx',
+            url: 'https://example.com',
+            typeOf: chevre.factory.creativeWorkType.WebApplication
+        },
+        object: { sample: 'sample' }
+    })({
+        action: await chevre.repository.Action.createInstance(mongoose.connection),
+        useFetchAPI: true
+    });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/fetch.ts

@@ -0,0 +1,45 @@
+// tslint:disable:no-console
+const url = String(process.env.LINE_NOTIFY_URL);
+const LINE_NOTIFY_ACCESS_TOKEN = String(process.env.LINE_NOTIFY_ACCESS_TOKEN);
+const TIMEOUT = 5000;
+const MESSAGE = 'sample message';
+
+async function main() {
+    try {
+        const form = new FormData();
+        form.set('message', `${MESSAGE} ${(new Date()).toString()}`);
+
+        const res = await fetch(
+            url,
+            {
+                signal: AbortSignal.timeout(TIMEOUT),
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${LINE_NOTIFY_ACCESS_TOKEN}`
+                },
+                body: form
+            }
+        );
+        const result = await res.json();
+        console.log('result', result);
+    } catch (err) {
+        console.error(err);
+        if (err.name === 'TimeoutError') {
+            console.error('Timeout: It took more than 5 seconds to get the result!');
+        } else if (err.name === 'AbortError') {
+            console.error('Fetch aborted by user action (browser stop button, closing tab, etc.');
+        } else if (err.name === 'TypeError') {
+            console.error('AbortSignal.timeout() method is not supported');
+        } else {
+            // A network error, or some other problem.
+            console.error(`Error: type: ${err.name}, message: ${err.message}`);
+        }
+    }
+
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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,10 @@ exports.sendEmailMessage = sendEmailMessage;
  * 開発者に報告する
  * https://notify-bot.line.me/doc/ja/
  */
-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;
         if (LINE_NOTIFY_URL === undefined) {
             throw new Error('Environment variable LINE_NOTIFY_URL not set');
@@ -131,31 +133,83 @@ function report2developers(subject, content, imageThumbnail, imageFullsize) {
 ${subject}
 --------
 ${content}`;
-        // LINE通知APIにPOST
-        const formData = Object.assign(Object.assign({ message: message }, (typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined), (typeof imageFullsize === 'string') ? { imageFullsize } : undefined);
-        return new Promise((resolve, reject) => {
-            var _a;
-            request.post({
-                url: LINE_NOTIFY_URL,
-                auth: { bearer: repos.accessToken },
-                form: formData,
-                json: true,
-                timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-            }, (error, response, body) => {
-                if (error !== null) {
-                    reject(error);
+        if (repos.useFetchAPI) {
+            try {
+                const form = new FormData();
+                form.set('message', message);
+                if (typeof imageThumbnail === 'string') {
+                    form.set('imageThumbnail', imageThumbnail);
+                }
+                if (typeof imageFullsize === 'string') {
+                    form.set('imageFullsize', imageFullsize);
+                }
+                const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
+                        Authorization: `Bearer ${repos.accessToken}`
+                    }, 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));
+                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 === null || body === void 0 ? void 0 : body.message}`);
+                }
+            }
+            catch (err) {
+                if (err.name === 'TimeoutError') {
+                    // tslint:disable-next-line:no-console
+                    console.error('report2developers: Timeout: It took more than 5 seconds to get the result!', err);
+                }
+                else if (err.name === 'AbortError') {
+                    // tslint:disable-next-line:no-console
+                    console.error('report2developers: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
+                }
+                else if (err.name === 'TypeError') {
+                    // tslint:disable-next-line:no-console
+                    console.error('report2developers: AbortSignal.timeout() method is not supported', err);
                 }
                 else {
-                    switch (response.statusCode) {
-                        case http_status_1.OK:
-                            resolve();
-                            break;
-                        default:
-                            reject(new Error(body.message));
-                    }
+                    // A network error, or some other problem.
+                    // tslint:disable-next-line:no-console
+                    console.error(`report2developers: Error: type: ${err.name}, message: ${err.message}`, err);
                 }
+                throw err;
+            }
+        }
+        else {
+            // LINE通知APIにPOST
+            const formData = Object.assign(Object.assign({ message: message }, (typeof imageThumbnail === 'string') ? { imageThumbnail } : undefined), (typeof imageFullsize === 'string') ? { imageFullsize } : undefined);
+            return new Promise((resolve, reject) => {
+                var _a;
+                request.post({
+                    url: LINE_NOTIFY_URL,
+                    auth: { bearer: repos.accessToken },
+                    form: formData,
+                    json: true,
+                    timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
+                }, (error, response, body) => {
+                    if (error !== null) {
+                        reject(error);
+                    }
+                    else {
+                        switch (response.statusCode) {
+                            case http_status_1.OK:
+                                resolve();
+                                break;
+                            default:
+                                reject(new Error(body.message));
+                        }
+                    }
+                });
             });
-        });
+        }
     });
 }
 exports.report2developers = report2developers;
@@ -200,54 +254,107 @@ function sleep(waitTime) {
     });
 }
 function processInformAction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // アクション開始
         const action = yield repos.action.start(params);
         let result = {};
         try {
             if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
                 const url = params.recipient.url;
-                yield new Promise((resolve, reject) => {
-                    var _a;
-                    request.post({
-                        url: url,
-                        body: {
-                            data: params.object
-                        },
-                        json: true,
-                        timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
-                    }, (error, response, body) => {
-                        if (error instanceof Error) {
-                            reject(error);
+                if (repos.useFetchAPI) {
+                    try {
+                        const res = yield fetch(url, Object.assign({ method: 'POST', headers: {
+                                'Content-Type': 'application/json'
+                            }, body: JSON.stringify({
+                                data: params.object
+                            }) }, (typeof ((_b = settings_1.settings.webhook) === null || _b === void 0 ? void 0 : _b.timeout) === 'number')
+                            ? { signal: AbortSignal.timeout(settings_1.settings.webhook.timeout) }
+                            : undefined));
+                        let body;
+                        try {
+                            body = yield res.text();
+                        }
+                        catch (error) {
+                            // no op
+                        }
+                        switch (res.status) {
+                            case http_status_1.OK:
+                            case http_status_1.CREATED:
+                            case http_status_1.ACCEPTED:
+                            case http_status_1.NO_CONTENT:
+                                result = {
+                                    statusCode: res.status,
+                                    useFetchAPI: repos.useFetchAPI
+                                };
+                                break;
+                            default:
+                                throw new Error(`statusCode: ${res.status} body: ${body}`);
+                        }
+                        // return res.json();
+                    }
+                    catch (err) {
+                        if (err.name === 'TimeoutError') {
+                            // tslint:disable-next-line:no-console
+                            console.error('report2developers: Timeout: It took more than 5 seconds to get the result!', err);
+                        }
+                        else if (err.name === 'AbortError') {
+                            // tslint:disable-next-line:no-console
+                            console.error('report2developers: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
+                        }
+                        else if (err.name === 'TypeError') {
+                            // tslint:disable-next-line:no-console
+                            console.error('report2developers: AbortSignal.timeout() method is not supported', err);
                         }
                         else {
-                            switch (response.statusCode) {
-                                case http_status_1.OK:
-                                case http_status_1.CREATED:
-                                case http_status_1.ACCEPTED:
-                                case http_status_1.NO_CONTENT:
-                                    result = {
-                                        statusCode: response.statusCode
-                                        // body: body
-                                    };
-                                    resolve();
-                                    break;
-                                default:
-                                    reject({
-                                        statusCode: response.statusCode,
-                                        body: body
-                                    });
-                            }
+                            // A network error, or some other problem.
+                            // tslint:disable-next-line:no-console
+                            console.error(`report2developers: Error: type: ${err.name}, message: ${err.message}`, err);
                         }
+                        throw err;
+                    }
+                }
+                else {
+                    yield new Promise((resolve, reject) => {
+                        var _a;
+                        request.post({
+                            url: url,
+                            body: {
+                                data: params.object
+                            },
+                            json: true,
+                            timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
+                        }, (error, response, body) => {
+                            if (error instanceof Error) {
+                                reject(error);
+                            }
+                            else {
+                                switch (response.statusCode) {
+                                    case http_status_1.OK:
+                                    case http_status_1.CREATED:
+                                    case http_status_1.ACCEPTED:
+                                    case http_status_1.NO_CONTENT:
+                                        result = {
+                                            statusCode: response.statusCode,
+                                            useFetchAPI: repos.useFetchAPI
+                                            // body: body
+                                        };
+                                        resolve();
+                                        break;
+                                    default:
+                                        reject(new Error(`statusCode: ${response.statusCode} body: ${body}`));
+                                }
+                            }
+                        });
                     });
-                });
+                }
             }
         }
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_b = error.body) === null || _b === void 0 ? void 0 : _b.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_c = error.body) === null || _c === void 0 ? void 0 : _c.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {

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/lib/chevre/settings.d.ts

@@ -40,6 +40,7 @@ export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
 export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const USE_ORDER_PAYMENT_METHOD_TYPE_OF: boolean;
+export declare const USE_FETCH_API: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_ORDER_PAYMENT_METHOD_TYPE_OF = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_FETCH_API = exports.USE_ORDER_PAYMENT_METHOD_TYPE_OF = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -64,6 +64,7 @@ exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1
 exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
 exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1';
 exports.USE_ORDER_PAYMENT_METHOD_TYPE_OF = process.env.USE_ORDER_PAYMENT_METHOD_TYPE_OF === '1';
+exports.USE_FETCH_API = process.env.USE_FETCH_API === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

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.0"
+  "version": "21.18.0-alpha.2"
 }