@chevre/domain 21.31.0 → 21.32.0-alpha.1

package/lib/chevre/credentials.d.ts

@@ -25,6 +25,7 @@ export declare const credentials: {
     };
     gmo: {
         timeout: number;
+        timeoutBackground: number | undefined;
         useFetch: boolean;
     };
     lineNotify: {

package/lib/chevre/credentials.js

@@ -30,6 +30,9 @@ exports.credentials = {
     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'
     },
     lineNotify: {

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

@@ -98,6 +98,16 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
     useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
+    /**
+     * 実行者
+     */
+    executor?: {
+        /**
+         * task ID
+         * taskによって実行されている場合値が存在する
+         */
+        id?: string;
+    };
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定

package/lib/chevre/service/assetTransaction/pay.js

@@ -143,7 +143,7 @@ exports.check = check;
  */
 function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // 金額をfix
         const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
         if (typeof amount !== 'number') {
@@ -173,7 +173,7 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({}, (options.pendingPaymentAgencyTransaction !== undefined)
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ executor: (typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
                         ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
                         : undefined))(repos);
                 break;
@@ -331,7 +331,8 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false }, (options.pendingPaymentAgencyTransaction !== undefined)
+        var _a;
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({

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

@@ -365,7 +365,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

package/lib/chevre/service/payment/creditCard.d.ts

@@ -29,6 +29,16 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
      * 決済URL発行処理かどうか
      */
     processPublishPaymentUrl: boolean;
+    /**
+     * 実行者
+     */
+    executor?: {
+        /**
+         * task ID
+         * taskによって実行されている場合値が存在する
+         */
+        id?: string;
+    };
 }): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/creditCard.js

@@ -26,7 +26,7 @@ const debug = createDebug('chevre-domain:service:payment');
  */
 function authorize(params, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -49,14 +49,25 @@ function authorize(params, paymentServiceId, options) {
         }
         let authorizeResult;
         try {
+            // タスクによって実行されているかどうか
+            const executedByTask = typeof ((_c = options.executor) === null || _c === void 0 ? void 0 : _c.id) === 'string' && options.executor.id !== '';
+            // 非同期承認時に長時間対応(2024-05-18~)
+            const timeout = (executedByTask && typeof credentials_1.credentials.gmo.timeoutBackground === 'number')
+                ? credentials_1.credentials.gmo.timeoutBackground
+                : credentials_1.credentials.gmo.timeout;
+            debug('processAuthorizeCreditCard processing... executor:', (_d = options.executor) === null || _d === void 0 ? void 0 : _d.id, 'timeout:', timeout);
+            const creditCardService = new GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl),
+                useFetch: credentials_1.credentials.gmo.useFetch
+            }, { timeout });
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
-            const redirectUrl = (_c = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _c === void 0 ? void 0 : _c.redirectUrl;
+            const redirectUrl = (_e = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _e === void 0 ? void 0 : _e.redirectUrl;
             if (pendingPaymentAgencyTransaction !== undefined
                 && typeof redirectUrl === 'string' && redirectUrl.length > 0) {
                 authorizeResult = yield processAuthorizeCreditCard3ds({
                     availableChannel,
                     pendingPaymentAgencyTransaction
-                })();
+                })({ creditCardService });
             }
             else {
                 authorizeResult = yield processAuthorizeCreditCard({
@@ -68,7 +79,7 @@ function authorize(params, paymentServiceId, options) {
                     availableChannel: availableChannel,
                     object: params.object.paymentMethod,
                     processPublishPaymentUrl: options.processPublishPaymentUrl
-                })();
+                })({ creditCardService });
             }
         }
         catch (error) {
@@ -86,17 +97,13 @@ function authorize(params, paymentServiceId, options) {
 exports.authorize = authorize;
 function processAuthorizeCreditCard(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // GMOオーソリ取得
         let entryTranArgs;
         let entryTranResult;
         let execTranArgs;
         let execTranResult;
-        const creditCardService = new GMO.service.Credit({
-            endpoint: String(params.availableChannel.serviceUrl),
-            useFetch: credentials_1.credentials.gmo.useFetch
-        }, { timeout: credentials_1.credentials.gmo.timeout });
         const creditCard = params.object.creditCard;
         const { cardSeq, memberId } = creditCard;
         if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
@@ -132,9 +139,9 @@ function processAuthorizeCreditCard(params) {
                 // tdTenantName: '',
                 tds2Type: GMO.utils.util.Tds2Type.Error
             };
-            entryTranResult = yield creditCardService.entryTran(entryTranArgs);
+            entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
             execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.orderId, method: params.object.method, siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId, sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass, seqMode: GMO.utils.util.SeqMode.Physics, retUrl, callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post }, (typeof cardNo === 'string') ? { cardNo } : undefined), (typeof cardPass === 'string') ? { cardPass } : undefined), (typeof expire === 'string') ? { expire } : undefined), (typeof token === 'string') ? { token } : undefined), (typeof memberId === 'string') ? { memberId } : undefined), (typeof cardSeq === 'number') ? { cardSeq } : undefined);
-            execTranResult = yield creditCardService.execTran3ds(execTranArgs);
+            execTranResult = yield repos.creditCardService.execTran3ds(execTranArgs);
         }
         else {
             entryTranArgs = {
@@ -148,22 +155,18 @@ function processAuthorizeCreditCard(params) {
                 siteId: (_c = params.availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
                 sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             };
-            entryTranResult = yield creditCardService.entryTran(entryTranArgs);
+            entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
             execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.orderId, method: params.object.method, siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId, sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass, seqMode: GMO.utils.util.SeqMode.Physics }, (typeof cardNo === 'string') ? { cardNo } : undefined), (typeof cardPass === 'string') ? { cardPass } : undefined), (typeof expire === 'string') ? { expire } : undefined), (typeof token === 'string') ? { token } : undefined), (typeof memberId === 'string') ? { memberId } : undefined), (typeof cardSeq === 'number') ? { cardSeq } : undefined);
-            execTranResult = yield creditCardService.execTran(execTranArgs);
+            execTranResult = yield repos.creditCardService.execTran(execTranArgs);
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
     });
 }
 function processAuthorizeCreditCard3ds(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        const creditCardService = new GMO.service.Credit({
-            endpoint: String(params.availableChannel.serviceUrl),
-            useFetch: credentials_1.credentials.gmo.useFetch
-        }, { timeout: credentials_1.credentials.gmo.timeout });
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = params.pendingPaymentAgencyTransaction;
         const { accessId, accessPass } = entryTranResult;
-        const secureTran2Result = yield creditCardService.secureTran2({ accessId, accessPass });
+        const secureTran2Result = yield repos.creditCardService.secureTran2({ accessId, accessPass });
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     });
 }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.31.0"
+  "version": "21.32.0-alpha.1"
 }