@chevre/domain 24.1.0-alpha.29 → 24.1.0-alpha.30

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -53,7 +53,7 @@ function payMovieTicket(params, options) {
                     state: '',
                     credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
                 });
-                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeout });
+                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutPay });
                 processSeatInfoSyncResult = await (0, processSeatInfoSync_1.processSeatInfoSync)({ seatInfoSyncIn })({ seatService });
             }
             // add recipe(2024-06-03~)

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -74,7 +74,7 @@ function refundMovieTicket(params, options) {
             state: '',
             credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
         });
-        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeout });
+        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutRefund });
         let seatInfoSyncCancelIn;
         let seatInfoSyncIn;
         const useSeatInfoSyncCancel = availableChannel.credentials?.useSeatInfoSyncCancel === true;

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

@@ -61,11 +61,11 @@ function call(params) {
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
             const { agent, object, potentialActions, purpose } = params.data;
             // agent.idからflgMemberを自動セット(2024-12-16~)
             const isMember = memberClients.includes(agent.id);

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

@@ -54,7 +54,7 @@ function call(params) {
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
             const { object, instrument } = data;
             await (0, cancelReservation_2.cancelPendingReservation)({
                 object,

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

@@ -41,7 +41,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await confirmReserveTransaction({
             ...params.data,
             project: params.project,

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

@@ -57,7 +57,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await EventAggregationService.importFromCOA(params.data)({
             event: new event_1.EventRepo(connection),
             reserveService

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

@@ -64,7 +64,7 @@ function call(params) {
         const masterService = new coa_service_1.COA.service.Master({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
         await EventService.importFromCOA(params.data)({
             action: new action_1.ActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),

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

@@ -67,7 +67,7 @@ function call(params) {
         const masterService = new coa_service_1.COA.service.Master({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
         await OfferService.event.importFromCOA({
             project: { id: params.data.project.id },
             theaterCode: params.data.theaterCode,

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

@@ -75,7 +75,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await returnReserve({
             ...params.data,
             sameAs: { id: params.id }

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

@@ -60,7 +60,7 @@ function call(params) {
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
             const { agent, object } = params.data;
             if (object.typeOf === factory_1.factory.eventType.ScreeningEventSeries) {
                 await syncEventSeries({

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

@@ -50,7 +50,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({

package/lib/chevre/settings.d.ts

@@ -3,7 +3,11 @@ interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
      */
-    timeout: number;
+    timeoutPay: number;
+    /**
+     * 着券取消時タイムアウト
+     */
+    timeoutRefund: number;
     /**
      * 認証時タイムアウト
      */
@@ -23,7 +27,8 @@ interface IOptions {
     numTryConfirmReserveTransaction: number;
     deliverOrderLimit: number;
     coa: {
-        timeout: number;
+        timeoutReserve: number;
+        timeoutMaster: number;
     };
     gmo: {
         timeout: number;
@@ -40,7 +45,7 @@ interface IDBOptions {
  */
 declare class Settings {
     private readonly options;
-    constructor(options: IOptions & IDBOptions);
+    constructor(options: IDBOptions);
     /**
      * 設定名称から設定を参照する
      */

package/lib/chevre/settings.js

@@ -1,44 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
+const factory_1 = require("./factory");
+const defaultOptions = {
+    abortedTasksWithoutReport: [
+        factory_1.factory.taskName.ImportEventCapacitiesFromCOA,
+        factory_1.factory.taskName.ImportEventsFromCOA,
+        factory_1.factory.taskName.ImportOffersFromCOA,
+    ],
+    numTryConfirmReserveTransaction: 10,
+    deliverOrderLimit: 10,
+    coa: {
+        timeoutReserve: 20000,
+        timeoutMaster: 30000
+    },
+    gmo: {
+        timeout: 4000,
+        timeoutBackground: 6000
+    },
+    movieticketReserve: {
+        timeoutPay: 5000,
+        timeoutRefund: 5000,
+        timeoutCheck: 4000,
+        minIntervalBetweenPayAndRefund: 10000,
+        credentialsExpireInSeconds: 600
+    },
+    useExperimentalFeature: false
+};
 /**
  * domain settings
  */
 class Settings {
     // private readonly settingModel: IModel;
     options;
-    // private readonly abortedTasksWithoutReport: string[];
-    // private readonly numTryConfirmReserveTransaction: number;
-    // private readonly deliverOrderLimit: number;
-    // private readonly coa: {
-    //     timeout: number;
-    // };
-    // private readonly gmo: {
-    //     timeout: number;
-    //     timeoutBackground: number;
-    // };
-    // private readonly movieticketReserve: ISurfrockSettings;
-    // private readonly useExperimentalFeature: boolean;
-    constructor(options) {
+    constructor(options
+    // options: IOptions & IDBOptions
+    ) {
         const { connection: _connection, // ひとまず使用しない
-        ...restOptions
-        // abortedTasksWithoutReport,
-        // numTryConfirmReserveTransaction,
-        // deliverOrderLimit,
-        // coa,
-        // gmo,
-        // movieticketReserve,
-        // useExperimentalFeature
+        // ...restOptions
          } = options;
         // this.settingModel = connection.model<IDocType, IModel>(modelName, createSchema());
-        this.options = restOptions;
-        // this.abortedTasksWithoutReport = abortedTasksWithoutReport;
-        // this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
-        // this.deliverOrderLimit = deliverOrderLimit;
-        // this.coa = coa;
-        // this.gmo = gmo;
-        // this.movieticketReserve = movieticketReserve;
-        // this.useExperimentalFeature = useExperimentalFeature;
+        this.options = defaultOptions;
+        // this.options = restOptions; // defaultOptionsでひとまず固定化(2026-05-23~)
     }
     /**
      * 設定名称から設定を参照する

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.29"
+  "version": "24.1.0-alpha.30"
 }