@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

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

@@ -1,25 +1,38 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = triggerWebhook;
-const crypto = require("crypto");
+const crypto = __importStar(require("crypto"));
 const http_status_1 = require("http-status");
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const retryCountMax = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.retryCountMax;
-        const retryIntervalInMS = (_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.retryIntervalInMS;
+    return async (repos) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        const retryCountMax = setting?.triggerWebhook?.retryCountMax;
+        const retryIntervalInMS = setting?.triggerWebhook?.retryIntervalInMS;
         if (typeof retryCountMax !== 'number') {
             throw new factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
         }
@@ -37,9 +50,9 @@ function triggerWebhook(params) {
                 }
                 // retryInterval
                 if (numberOfTry > 1) {
-                    yield sleep(retryIntervalInMS * (numberOfTry - 1));
+                    await sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
-                yield processInformAction(params, setting)(repos);
+                await processInformAction(params, setting)(repos);
                 break;
             }
             catch (error) {
@@ -51,20 +64,17 @@ function triggerWebhook(params) {
                 }
             }
         }
-    });
+    };
 }
-function sleep(waitTime) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => {
-            setTimeout(() => {
-                resolve();
-            }, waitTime);
-        });
+async function sleep(waitTime) {
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, waitTime);
     });
 }
 function createInformActionAttributes(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const { about, object, purpose, recipient, project, id, typeOf } = params;
         // redefine recipient(2025-02-15~)
         let informRecipient;
@@ -72,14 +82,14 @@ function createInformActionAttributes(params) {
         //     ...recipient
         //     // url: target.urlTemplate // discontinue(2025-02-15~)
         // };
-        if ((recipient === null || recipient === void 0 ? void 0 : recipient.typeOf) === factory.organizationType.Corporation && typeof recipient.id === 'string') {
+        if (recipient?.typeOf === factory.organizationType.Corporation && typeof recipient.id === 'string') {
             informRecipient = {
                 id: recipient.id,
                 name: recipient.name,
                 typeOf: recipient.typeOf
             };
         }
-        else if ((recipient === null || recipient === void 0 ? void 0 : recipient.typeOf) === factory.creativeWorkType.WebApplication) {
+        else if (recipient?.typeOf === factory.creativeWorkType.WebApplication) {
             informRecipient = {
                 name: recipient.name,
                 typeOf: recipient.typeOf
@@ -88,7 +98,7 @@ function createInformActionAttributes(params) {
         let target;
         if (typeOf === factory.actionType.InformAction && typeof id === 'string' && id !== '') {
             // find target from potentialAction(2025-02-06~)
-            const potentialInformAction = (yield repos.potentialAction.projectFields({
+            const potentialInformAction = (await repos.potentialAction.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: id },
@@ -97,13 +107,13 @@ function createInformActionAttributes(params) {
             if (potentialInformAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.InformAction);
             }
-            if (typeof ((_a = potentialInformAction.recipient) === null || _a === void 0 ? void 0 : _a.name) === 'string') {
+            if (typeof potentialInformAction.recipient?.name === 'string') {
                 informRecipient = { name: potentialInformAction.recipient.name, typeOf: potentialInformAction.recipient.typeOf };
             }
             target = potentialInformAction.target;
         }
         else {
-            if (((_b = params.target) === null || _b === void 0 ? void 0 : _b.typeOf) === 'EntryPoint') {
+            if (params.target?.typeOf === 'EntryPoint') {
                 target = params.target;
             }
         }
@@ -113,9 +123,17 @@ function createInformActionAttributes(params) {
         if (target === undefined) {
             throw new factory.errors.ArgumentNull('target');
         }
-        return Object.assign(Object.assign(Object.assign({ agent: { id: project.id, typeOf: factory.organizationType.Project }, object, project: { id: project.id, typeOf: factory.organizationType.Project }, recipient: informRecipient, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined), (typeof (target === null || target === void 0 ? void 0 : target.typeOf) === 'string') ? { target } : undefined // add(2025-02-06~)
-        );
-    });
+        return {
+            agent: { id: project.id, typeOf: factory.organizationType.Project },
+            object,
+            project: { id: project.id, typeOf: factory.organizationType.Project },
+            recipient: informRecipient,
+            typeOf: factory.actionType.InformAction,
+            ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
+            ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
+            ...(typeof target?.typeOf === 'string') ? { target } : undefined // add(2025-02-06~)
+        };
+    };
 }
 function signRequest(params) {
     const { requestBody, timestamp, secretKey } = params;
@@ -124,25 +142,27 @@ function signRequest(params) {
         .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, _c, _d, _e, _f;
-        const timeout = (_a = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        const secretKey = (_c = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _c === void 0 ? void 0 : _c.secretKey;
-        const headerIdentifier = (_d = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _d === void 0 ? void 0 : _d.headerIdentifier;
+    return async (repos) => {
+        const timeout = options?.triggerWebhook?.timeout;
+        const useFetchAPI = options?.triggerWebhook?.useFetchAPI === true;
+        const secretKey = options?.triggerWebhook?.secretKey;
+        const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
-        const informActionAttributes = yield createInformActionAttributes(params)(repos);
-        const action = yield repos.action.start(informActionAttributes);
+        const informActionAttributes = await createInformActionAttributes(params)(repos);
+        const action = await repos.action.start(informActionAttributes);
         let result = {};
         try {
-            const urlTemplate = (_e = informActionAttributes.target) === null || _e === void 0 ? void 0 : _e.urlTemplate;
+            const urlTemplate = informActionAttributes.target?.urlTemplate;
             if (typeof urlTemplate === 'string') {
-                const requestBody = JSON.stringify(Object.assign({ data: informActionAttributes.object, id: action.id }, (typeof identifier === 'string' && identifier !== '')
-                    ? { identifier }
-                    : undefined));
+                const requestBody = JSON.stringify({
+                    data: informActionAttributes.object,
+                    id: action.id, // support informAction ID(2025-02-20~)
+                    // 通知識別子を追加(2024-10-24~)
+                    ...(typeof identifier === 'string' && identifier !== '')
+                        ? { identifier }
+                        : undefined
+                });
                 const timestamp = action.startDate.valueOf();
                 // sign request(2024-10-28~)
                 let signature;
@@ -159,12 +179,17 @@ function processInformAction(params, options) {
                                 headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
                             }
                         }
-                        const res = yield fetch(urlTemplate, Object.assign({ method: 'POST', headers, body: requestBody }, (typeof timeout === 'number')
-                            ? { signal: AbortSignal.timeout(timeout) }
-                            : undefined));
+                        const res = await fetch(urlTemplate, {
+                            method: 'POST',
+                            headers,
+                            body: requestBody, // body data type must match "Content-Type" header
+                            ...(typeof timeout === 'number')
+                                ? { signal: AbortSignal.timeout(timeout) }
+                                : undefined
+                        });
                         let body;
                         try {
-                            body = yield res.text();
+                            body = await res.text();
                         }
                         catch (error) {
                             // no op
@@ -195,12 +220,12 @@ function processInformAction(params, options) {
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_f = error.body) === null || _f === void 0 ? void 0 : _f.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && error.body?.message === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {
                 try {
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -208,6 +233,6 @@ function processInformAction(params, options) {
                 throw error;
             }
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+    };
 }

package/lib/chevre/service/offer/any.js

@@ -1,30 +1,47 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptOffer = acceptOffer;
 exports.voidAcceptedOffer = voidAcceptedOffer;
-const createDebug = require("debug");
-const factory = require("../../factory");
-const debug = createDebug('chevre-domain:service:offer');
+const debug_1 = __importDefault(require("debug"));
+const factory = __importStar(require("../../factory"));
+const debug = (0, debug_1.default)('chevre-domain:service:offer');
 function acceptOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.orderInTransaction.acceptOffer({
+    return async (repos) => {
+        await repos.orderInTransaction.acceptOffer({
             orderNumber: params.orderNumber,
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             acceptedOffers: params.acceptedOffers
         });
-    });
+    };
 }
 function voidAcceptedOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { orderNumber } = params;
         // let reservationNumbers: string[] = [];
         // authorizeActions.forEach((authorizeAction) => {
@@ -48,12 +65,12 @@ function voidAcceptedOffer(params) {
                 .map(({ instrument }) => String(instrument.transactionNumber));
             debug('removing acceptedOffers from PlaceOrder...', orderNumber, 'serialNumbers:', serialNumbers);
             if (serialNumbers.length > 0) {
-                const result = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+                const result = await repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
                     orderNumber,
                     acceptedOffers: { serialNumber: { $in: serialNumbers } }
                 });
                 debug('acceptedOffers removed from PlaceOrder by serialNumbers.', result);
             }
         }
-    });
+    };
 }

package/lib/chevre/service/offer/event/authorize/defaultOffer.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_AVAILABLE_OFFER = exports.DEFAULT_TICKET_OFFER = exports.DEFAULT_OFFER_ID = void 0;
-const factory = require("../../../../factory");
+const factory = __importStar(require("../../../../factory"));
 const DEFAULT_OFFER_ID = '****AUTOMATICALLY_APPLIED****';
 exports.DEFAULT_OFFER_ID = DEFAULT_OFFER_ID;
 const DEFAULT_OFFER_IDENTIFIER = '****AUTOMATICALLY_APPLIED****';