@chevre/domain 22.0.0-alpha.8 → 22.0.0-alpha.9

package/example/src/chevre/aggregateAllEvents2.ts

@@ -39,8 +39,10 @@ export async function aggregateScreeningEvent() {
                 })({
                     connection: mongoose.connection,
                     redisClient,
+                    credentials: {
+                        sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
+                    },
                     settings: new chevre.settings.Settings({
-                        transactionWebhookUrls: [],
                         onEventChanged: {
                             informEvent: []
                         },
@@ -53,8 +55,9 @@ export async function aggregateScreeningEvent() {
                         onReservationStatusChanged: {
                             informReservation: []
                         },
-                        webhook: {
-                            timeout: 1000
+                        notification: {
+                            timeout: 1000,
+                            useFetchAPI: true
                         },
                         userPoolIdOld: '',
                         userPoolIdNew: '',
@@ -63,11 +66,13 @@ export async function aggregateScreeningEvent() {
                         useOfferRateLimitProjects: [],
                         defaultSenderEmail: 'test@example.com',
                         deliverOrderLimit: 1,
-                        transaction: { confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
+                        transaction: { informUrls: [], confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
                         abortedTasksWithoutReport: [],
                         gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
                         movieticketReserve: { timeout: 1000, timeoutCheck: 1000 },
-                        numTryConfirmReserveTransaction: 10
+                        numTryConfirmReserveTransaction: 10,
+                        useAssetTransactionSyncProcessing: true,
+                        useExperimentalFeature: false
                     })
                 });
                 console.log('executed', count);

package/lib/chevre/credentials/customSearch.d.ts

@@ -0,0 +1,13 @@
+interface IOptions {
+    engineId: string;
+    apiKey: string;
+}
+/**
+ * GoogleCustomSearch認証情報
+ */
+declare class CustomSearchCredentials {
+    readonly engineId: string;
+    readonly apiKey: string;
+    constructor(options: IOptions);
+}
+export { CustomSearchCredentials };

package/lib/chevre/credentials/customSearch.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomSearchCredentials = void 0;
+/**
+ * GoogleCustomSearch認証情報
+ */
+class CustomSearchCredentials {
+    constructor(options) {
+        const { engineId, apiKey } = options;
+        this.engineId = engineId;
+        this.apiKey = apiKey;
+    }
+}
+exports.CustomSearchCredentials = CustomSearchCredentials;

package/lib/chevre/credentials/lineNotify.d.ts

@@ -0,0 +1,17 @@
+interface IOptions {
+    url: string;
+    accessToken: string;
+    accessTokenAlert: string;
+    accessTokenInfo: string;
+}
+/**
+ * 通知認証情報
+ */
+declare class LINENotifyCredentials {
+    readonly url: string;
+    readonly accessToken: string;
+    readonly accessTokenAlert: string;
+    readonly accessTokenInfo: string;
+    constructor(options: IOptions);
+}
+export { LINENotifyCredentials };

package/lib/chevre/credentials/lineNotify.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LINENotifyCredentials = void 0;
+/**
+ * 通知認証情報
+ */
+class LINENotifyCredentials {
+    constructor(options) {
+        const { url, accessToken, accessTokenAlert, accessTokenInfo } = options;
+        this.url = url;
+        this.accessToken = accessToken;
+        this.accessTokenAlert = accessTokenAlert;
+        this.accessTokenInfo = accessTokenInfo;
+    }
+}
+exports.LINENotifyCredentials = LINENotifyCredentials;

package/lib/chevre/credentials/sendGrid.d.ts

@@ -0,0 +1,11 @@
+interface IOptions {
+    apiKey: string;
+}
+/**
+ * SendGrid認証情報
+ */
+declare class SendGridCredentials {
+    readonly apiKey: string;
+    constructor(options: IOptions);
+}
+export { SendGridCredentials };

package/lib/chevre/credentials/sendGrid.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendGridCredentials = void 0;
+/**
+ * SendGrid認証情報
+ */
+class SendGridCredentials {
+    constructor(options) {
+        const { apiKey } = options;
+        this.apiKey = apiKey;
+    }
+}
+exports.SendGridCredentials = SendGridCredentials;

package/lib/chevre/credentials.d.ts

@@ -1,28 +1,30 @@
 import type { COACredentials } from './credentials/coa';
+import type { CustomSearchCredentials } from './credentials/customSearch';
 import type { JWTCredentials } from './credentials/jwt';
+import type { LINENotifyCredentials } from './credentials/lineNotify';
+import type { SendGridCredentials } from './credentials/sendGrid';
 /**
- * 外部サービスを使用するための認証情報
+ * 外部サービス認証情報
  */
 export declare namespace credentials {
-    const customSearch: {
-        engineId: string;
-        apiKey: string;
-    };
-    const lineNotify: {
-        url: string | undefined;
-        accessToken: string | undefined;
-        accessTokenAlert: string | undefined;
-        accessTokenInfo: string | undefined;
-    };
-    const sendGrid: {
-        apiKey: string | undefined;
-    };
     type COA = COACredentials;
     namespace COA {
         function createInstance(...params: ConstructorParameters<typeof COACredentials>): Promise<COACredentials>;
     }
+    type CustomSearch = CustomSearchCredentials;
+    namespace CustomSearch {
+        function createInstance(...params: ConstructorParameters<typeof CustomSearchCredentials>): Promise<CustomSearchCredentials>;
+    }
     type JWT = JWTCredentials;
     namespace JWT {
         function createInstance(...params: ConstructorParameters<typeof JWTCredentials>): Promise<JWTCredentials>;
     }
+    type LINENotify = LINENotifyCredentials;
+    namespace LINENotify {
+        function createInstance(...params: ConstructorParameters<typeof LINENotifyCredentials>): Promise<LINENotifyCredentials>;
+    }
+    type SendGrid = SendGridCredentials;
+    namespace SendGrid {
+        function createInstance(...params: ConstructorParameters<typeof SendGridCredentials>): Promise<SendGridCredentials>;
+    }
 }

package/lib/chevre/credentials.js

@@ -10,80 +10,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.credentials = void 0;
-// export const credentials = {
-// migrate to JWTCredentials(2024-07-11~)
-// jwt: {
-//     secret: <string>process.env.TOKEN_SECRET,
-//     // RESOURCE_SERVER_IDENTIFIERとは分離して指定可能に拡張(2024-05-02~)
-//     // issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
-//     //     ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
-//     //     : <string>process.env.RESOURCE_SERVER_IDENTIFIER,
-//     /**
-//      * トークン検証時の発行者リスト
-//      */
-//     issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
-//         ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
-//         : [], // 追加(2024-05-02~)
-//     version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02', // 追加(2024-05-02~)
-//     payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
-// }
-// };
 /**
- * 外部サービスを使用するための認証情報
+ * 外部サービス認証情報
  */
 var credentials;
 (function (credentials) {
-    // export const aws = {
-    //     accessKeyId: <string>process.env.AWS_ACCESS_KEY_ID,
-    //     secretAccessKey: <string>process.env.AWS_SECRET_ACCESS_KEY,
-    //     tokenIssuerEndpoint: <string>process.env.TOKEN_ISSUER_ENDPOINT
+    // export const customSearch = {
+    //     engineId: <string>process.env.CUSTOM_SEARCH_ENGINE_ID,
+    //     apiKey: <string>process.env.GOOGLE_API_KEY
     // };
-    // export const chevre = {
-    //     authorizeServerDomain: <string>process.env.CHEVRE_AUTHORIZE_SERVER_DOMAIN,
-    //     clientId: <string>process.env.CHEVRE_CLIENT_ID,
-    //     clientSecret: <string>process.env.CHEVRE_CLIENT_SECRET,
-    //     endpoint: <string>process.env.CHEVRE_ENDPOINT
+    // export const lineNotify = {
+    //     url: process.env.LINE_NOTIFY_URL,
+    //     accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
+    //     accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT,
+    //     accessTokenInfo: process.env.LINE_NOTIFY_ACCESS_TOKEN_INFO
     // };
-    // export const coa = {
-    //     endpoint: <string>process.env.COA_ENDPOINT,
-    //     refreshToken: <string>process.env.COA_REFRESH_TOKEN,
-    //     // tslint:disable-next-line:no-magic-numbers
-    //     timeout: (typeof process.env.COA_TIMEOUT === 'string') ? Number(process.env.COA_TIMEOUT) : 20000,
-    //     useFetch: process.env.COA_USE_FETCH === '1'
+    // export const sendGrid = {
+    //     apiKey: process.env.SENDGRID_API_KEY
     // };
-    credentials.customSearch = {
-        engineId: process.env.CUSTOM_SEARCH_ENGINE_ID,
-        apiKey: process.env.GOOGLE_API_KEY
-    };
-    // export const gmo = {
-    //     // tslint:disable-next-line:no-magic-numbers
-    //     timeout: (typeof process.env.GMO_TIMEOUT === 'string') ? Number(process.env.GMO_TIMEOUT) : 5000,
-    //     timeoutBackground: (typeof process.env.GMO_TIMEOUT_BACKGROUND === 'string')
-    //         ? Number(process.env.GMO_TIMEOUT_BACKGROUND)
-    //         : undefined,
-    //     useFetch: process.env.GMO_USE_FETCH === '1'
-    // };
-    credentials.lineNotify = {
-        url: process.env.LINE_NOTIFY_URL,
-        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
-        accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT,
-        accessTokenInfo: process.env.LINE_NOTIFY_ACCESS_TOKEN_INFO
-    };
-    // export const movieticketReserve = {
-    //     /**
-    //      * 着券時タイムアウト
-    //      */
-    //     // tslint:disable-next-line:no-magic-numbers
-    //     timeout: (typeof process.env.MVTK_TIMEOUT === 'string') ? Number(process.env.MVTK_TIMEOUT) : 5000,
-    //     /**
-    //      * 認証時タイムアウト
-    //      */
-    //     // tslint:disable-next-line:no-magic-numbers
-    //     timeoutCheck: (typeof process.env.MVTK_TIMEOUT_CHECK === 'string') ? Number(process.env.MVTK_TIMEOUT_CHECK) : 5000
-    // };
-    credentials.sendGrid = {
-        apiKey: process.env.SENDGRID_API_KEY
-    };
     let COA;
     (function (COA) {
         let cred;
@@ -97,6 +41,19 @@ var credentials;
         }
         COA.createInstance = createInstance;
     })(COA = credentials.COA || (credentials.COA = {}));
+    let CustomSearch;
+    (function (CustomSearch) {
+        let cred;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (cred === undefined) {
+                    cred = (yield Promise.resolve().then(() => require('./credentials/customSearch'))).CustomSearchCredentials;
+                }
+                return new cred(...params);
+            });
+        }
+        CustomSearch.createInstance = createInstance;
+    })(CustomSearch = credentials.CustomSearch || (credentials.CustomSearch = {}));
     let JWT;
     (function (JWT) {
         let cred;
@@ -110,4 +67,30 @@ var credentials;
         }
         JWT.createInstance = createInstance;
     })(JWT = credentials.JWT || (credentials.JWT = {}));
+    let LINENotify;
+    (function (LINENotify) {
+        let cred;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (cred === undefined) {
+                    cred = (yield Promise.resolve().then(() => require('./credentials/lineNotify'))).LINENotifyCredentials;
+                }
+                return new cred(...params);
+            });
+        }
+        LINENotify.createInstance = createInstance;
+    })(LINENotify = credentials.LINENotify || (credentials.LINENotify = {}));
+    let SendGrid;
+    (function (SendGrid) {
+        let cred;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (cred === undefined) {
+                    cred = (yield Promise.resolve().then(() => require('./credentials/sendGrid'))).SendGridCredentials;
+                }
+                return new cred(...params);
+            });
+        }
+        SendGrid.createInstance = createInstance;
+    })(SendGrid = credentials.SendGrid || (credentials.SendGrid = {}));
 })(credentials = exports.credentials || (exports.credentials = {}));

package/lib/chevre/service/assetTransaction/reserve/confirm.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = void 0;
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 const confirmReservation_1 = require("../../reserve/confirmReservation");
 const factory_1 = require("./confirm/factory");
 /**
@@ -53,7 +52,7 @@ function confirm(params) {
             potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
             ? { object: { underName } }
             : undefined));
-        if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+        if (settings.useAssetTransactionSyncProcessing) {
             // sync対応(2023-01-13~)
             yield (0, confirmReservation_1.confirmReservation)({
                 // optimize(2024-07-01~)

package/lib/chevre/service/assetTransaction/reserve/exportTasksById.d.ts

@@ -1,9 +1,10 @@
+import { Settings } from '../../../settings';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { TaskRepo } from '../../../repo/task';
 type ITaskAndTransactionOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<T>;
+}, settings: Settings) => Promise<T>;
 /**
  * 取引タスク出力
  */

package/lib/chevre/service/assetTransaction/reserve/exportTasksById.js

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = void 0;
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 /**
  * 取引タスク出力
  */
 function exportTasksById(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        const { useAssetTransactionSyncProcessing } = settings;
         const transaction = yield repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id
@@ -33,7 +33,7 @@ function exportTasksById(params) {
                 //     if (Array.isArray(potentialActions.reserve) && potentialActions.reserve.length > 0) {
                 //     }
                 // }
-                if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                if (!useAssetTransactionSyncProcessing) {
                     const reserveTask = {
                         project: transaction.project,
                         name: factory.taskName.Reserve,
@@ -49,7 +49,7 @@ function exportTasksById(params) {
                 break;
             case factory.transactionStatusType.Canceled:
                 // sync対応(2023-01-13~)
-                if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                if (!useAssetTransactionSyncProcessing) {
                     // const cancelActionAttributes4canceled = createCancelPendingReservationAction({ transaction });
                     // if (cancelActionAttributes4canceled !== undefined) {
                     // }

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

@@ -2,6 +2,7 @@
  * 取引サービス
  */
 import * as factory from '../factory';
+import { Settings } from '../settings';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
 import type { TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
@@ -37,6 +38,6 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<{
+}, settings: Settings) => Promise<{
     id: string;
 }[] | undefined>;

package/lib/chevre/service/assetTransaction.js

@@ -30,7 +30,7 @@ exports.reserve = ReserveTransactionService;
  * ひとつの取引のタスクをエクスポートする
  */
 function exportTasks(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
                 agent: { name: params.tasksExportAction.agent.name }
             } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
@@ -74,7 +74,7 @@ function exportTasks(params) {
                 createdTasks = yield ReserveTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
-                })(repos);
+                })(repos, settings);
                 break;
             default:
         }

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

@@ -1,11 +1,12 @@
-import { Settings } from '../settings';
+import { LINENotifyCredentials } from '../credentials/lineNotify';
+import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
 import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
-type ILineNotifyOperation<T> = (repos: {
-    useFetchAPI: boolean;
-}, settings: Settings) => Promise<T>;
+type ILineNotifyOperation<T> = (repos: {}, credentials: {
+    lineNotify: LINENotifyCredentials;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -18,6 +19,8 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
     action: ActionRepo;
     message: MessageRepo;
     project: ProjectRepo;
+}, credentials: {
+    sendGrid: SendGridCredentials;
 }) => Promise<void>;
 type LineNotifyLogLevel = 'log' | 'error' | 'info';
 declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }: {
@@ -26,13 +29,18 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageThumbnail?: string;
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
+}, options: {
+    timeout: number;
+    useFetchAPI: boolean;
 }): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
+}, options: {
+    timeout: number;
+    useFetchAPI: boolean;
 }): (repos: {
     action: ActionRepo;
-    useFetchAPI: boolean;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { lineNotify, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -14,7 +14,6 @@ const sgMail = require("@sendgrid/mail");
 const http_status_1 = require("http-status");
 // import * as request from 'request';
 const util = require("util");
-const credentials_1 = require("../credentials");
 const factory = require("../factory");
 function createSendEmailMessageActionAttributes(params) {
     var _a;
@@ -27,7 +26,7 @@ function createSendEmailMessageActionAttributes(params) {
  */
 function sendEmailMessage(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
@@ -37,7 +36,7 @@ function sendEmailMessage(params) {
         const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));
         let result = {};
         try {
-            let apiKey = credentials_1.credentials.sendGrid.apiKey;
+            let apiKey = credentials.sendGrid.apiKey;
             // プロジェクト固有のSendGrid設定があれば、そちらを使用
             if (typeof ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string' && project.settings.sendgridApiKey.length > 0) {
                 apiKey = project.settings.sendgridApiKey;
@@ -124,23 +123,23 @@ function sendEmailMessage(params) {
 }
 exports.sendEmailMessage = sendEmailMessage;
 const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
+function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }, options) {
+    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
+        const { timeout, useFetchAPI } = options;
+        const LINE_NOTIFY_URL = credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
         }
         let accessToken;
         switch (logLevel) {
             case 'error':
-                accessToken = credentials_1.credentials.lineNotify.accessTokenAlert;
+                accessToken = credentials.lineNotify.accessTokenAlert;
                 break;
             case 'info':
-                accessToken = credentials_1.credentials.lineNotify.accessTokenInfo;
+                accessToken = credentials.lineNotify.accessTokenInfo;
                 break;
             default:
-                accessToken = credentials_1.credentials.lineNotify.accessToken;
+                accessToken = credentials.lineNotify.accessToken;
         }
         if (typeof accessToken !== 'string') {
             throw new factory.errors.Internal('credentials.lineNotify.accessToken not set');
@@ -151,7 +150,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, content);
-        if (repos.useFetchAPI) {
+        if (useFetchAPI) {
             try {
                 const form = new FormData();
                 form.set('message', message);
@@ -163,8 +162,8 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
                 }
                 const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
                         Authorization: `Bearer ${accessToken}`
-                    }, body: form }, (typeof ((_a = settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout) === 'number')
-                    ? { signal: AbortSignal.timeout(settings.webhook.timeout) }
+                    }, body: form }, (typeof timeout === 'number')
+                    ? { signal: AbortSignal.timeout(timeout) }
                     : undefined));
                 let body;
                 try {
@@ -193,8 +192,8 @@ exports.lineNotify = lineNotify;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 const TRIGGER_WEBHOOK_MAX_RETRY_COUNT = 2;
 const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = 1000;
-function triggerWebhook(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+function triggerWebhook(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         // retryableにする(2023-05-12~)
         let retry = true;
         let numberOfTry = 0;
@@ -208,7 +207,7 @@ function triggerWebhook(params) {
                 if (numberOfTry > 1) {
                     yield sleep(TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
                 }
-                yield processInformAction(params)(repos, settings);
+                yield processInformAction(params, options)(repos);
                 break;
             }
             catch (error) {
@@ -236,22 +235,23 @@ 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 processInformAction(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+function processInformAction(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { timeout, useFetchAPI } = 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;
-                if (repos.useFetchAPI) {
+                if (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.webhook) === null || _b === void 0 ? void 0 : _b.timeout) === 'number')
-                            ? { signal: AbortSignal.timeout(settings.webhook.timeout) }
+                            }) }, (typeof timeout === 'number')
+                            ? { signal: AbortSignal.timeout(timeout) }
                             : undefined));
                         let body;
                         try {
@@ -267,7 +267,7 @@ function processInformAction(params) {
                             case http_status_1.NO_CONTENT:
                                 result = {
                                     statusCode: res.status,
-                                    useFetchAPI: repos.useFetchAPI
+                                    useFetchAPI
                                 };
                                 break;
                             default:
@@ -286,7 +286,7 @@ function processInformAction(params) {
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_c = error.body) === null || _c === void 0 ? void 0 : _c.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_b = error.body) === null || _b === void 0 ? void 0 : _b.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 function categoryCodeChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
@@ -77,11 +76,11 @@ function createCompoundPriceSpec4event(params) {
     };
     // 必要な属性のみに限定(2023-02-24~)
     const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
         category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
-        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined), (!settings_1.USE_OPTIMIZE_TICKET_OFFER) ? {} : undefined);
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;