@chevre/domain 22.5.0-alpha.40 → 22.5.0-alpha.42

package/example/src/chevre/aggregateAllEvents2.ts

@@ -58,7 +58,9 @@ export async function aggregateScreeningEvent() {
                         },
                         notification: {
                             timeout: 1000,
-                            useFetchAPI: true
+                            useFetchAPI: true,
+                            secretKey: 'xx',
+                            headerIdentifier: 'xx'
                         },
                         userPoolIdOld: '',
                         userPoolIdNew: '',

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

@@ -1,6 +1,7 @@
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
+import { IWebhookSettings } from '../settings';
 import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
@@ -37,10 +38,7 @@ declare function triggerWebhook(params: factory.task.IData<factory.taskName.Trig
     project: {
         id: string;
     };
-}, options: {
-    timeout: number;
-    useFetchAPI: boolean;
-}): (repos: {
+}, options: IWebhookSettings): (repos: {
     action: ActionRepo;
 }) => Promise<void>;
 export { lineNotify, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.sendEmailMessage = exports.lineNotify = void 0;
 const sgMail = require("@sendgrid/mail");
+const crypto = require("crypto");
 const http_status_1 = require("http-status");
-// import * as request from 'request';
 const util = require("util");
 const factory = require("../factory");
 function createSendEmailMessageActionAttributes(params) {
@@ -234,22 +234,44 @@ function createInformActionAttributes(params) {
     const { object, purpose, recipient, project } = params;
     return Object.assign({ agent: { id: project.id, typeOf: factory.organizationType.Project }, object, project: { id: project.id, typeOf: factory.organizationType.Project }, recipient, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined);
 }
+function signRequest(params) {
+    const { requestBody, timestamp, secretKey } = params;
+    const payload = `${requestBody}${timestamp.toString()}`;
+    return crypto.createHmac('sha256', secretKey)
+        .update(payload)
+        .digest('hex');
+}
+// tslint:disable-next-line:max-func-body-length
 function processInformAction(params, options) {
+    // tslint:disable-next-line:cyclomatic-complexity
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const { timeout, useFetchAPI } = options;
+        const { timeout, useFetchAPI, secretKey, headerIdentifier } = options;
         const action = yield repos.action.start(createInformActionAttributes(params));
         let result = {};
         try {
             if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
                 const url = params.recipient.url;
+                const requestBody = JSON.stringify(Object.assign({ data: params.object }, (typeof params.identifier === 'string' && params.identifier !== '')
+                    ? { identifier: params.identifier }
+                    : undefined));
+                const timestamp = action.startDate.valueOf();
+                // sign request(2024-10-28~)
+                let signature;
+                if (typeof secretKey === 'string' && secretKey !== ''
+                    && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+                    signature = signRequest({ requestBody, timestamp, secretKey });
+                }
                 if (useFetchAPI) {
                     try {
-                        const res = yield fetch(url, Object.assign({ method: 'POST', headers: {
-                                'Content-Type': 'application/json'
-                            }, body: JSON.stringify(Object.assign({ data: params.object }, (typeof params.identifier === 'string' && params.identifier !== '')
-                                ? { identifier: params.identifier }
-                                : undefined)) }, (typeof timeout === 'number')
+                        const headers = new Headers({ 'Content-Type': 'application/json' });
+                        if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+                            headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+                            if (typeof signature === 'string') {
+                                headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
+                            }
+                        }
+                        const res = yield fetch(url, Object.assign({ method: 'POST', headers, body: requestBody }, (typeof timeout === 'number')
                             ? { signal: AbortSignal.timeout(timeout) }
                             : undefined));
                         let body;

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

@@ -18,8 +18,8 @@ const notification_1 = require("../notification");
 function call(params) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
         const { notification } = settings;
-        const { timeout, useFetchAPI } = notification;
-        yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }), { timeout, useFetchAPI })({
+        const { timeout, useFetchAPI, secretKey, headerIdentifier } = notification;
+        yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }), { timeout, useFetchAPI, secretKey, headerIdentifier })({
             action: new action_1.ActionRepo(connection)
         });
     });

package/lib/chevre/settings.d.ts

@@ -1,5 +1,5 @@
 import * as factory from './factory';
-import { AggregationSettings } from './settings/aggregation';
+import { AggregationSettings, ICallableTaskOperation, ICallResult, IOperationExecute } from './settings/aggregation';
 interface IOnOrderStatusChanged {
     informOrder?: factory.project.IInformParams[];
     informOrder2hub?: factory.project.IInformParams[];
@@ -8,6 +8,21 @@ interface IOnReservationStatusChanged {
     informReservation?: factory.project.IInformParams[];
     informReservation2hub?: factory.project.IInformParams[];
 }
+interface IWebhookSettings {
+    /**
+     * リクエストタイムアウト
+     */
+    timeout: number;
+    useFetchAPI: boolean;
+    /**
+     * 通知署名の鍵
+     */
+    secretKey?: string;
+    /**
+     * 固有署名ヘッダー識別子
+     */
+    headerIdentifier?: string;
+}
 interface IOptions {
     onOrderStatusChanged: IOnOrderStatusChanged;
     onEventChanged: {
@@ -63,13 +78,7 @@ interface IOptions {
     };
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
-    notification: {
-        /**
-         * リクエストタイムアウト
-         */
-        timeout: number;
-        useFetchAPI: boolean;
-    };
+    notification: IWebhookSettings;
 }
 /**
  * domain settings
@@ -135,16 +144,10 @@ declare class Settings {
     /**
      * 通知設定
      */
-    readonly notification: {
-        /**
-         * リクエストタイムアウト
-         */
-        timeout: number;
-        useFetchAPI: boolean;
-    };
+    readonly notification: IWebhookSettings;
     constructor(options: IOptions);
 }
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;
-export { AggregationSettings, Settings };
+export { AggregationSettings, Settings, ICallableTaskOperation, ICallResult, IOperationExecute, IWebhookSettings };

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.40"
+  "version": "22.5.0-alpha.42"
 }