@cinerino/sdk 10.16.0-alpha.9 → 10.16.0

package/example/src/cloud/adminUseReservation.ts

@@ -28,9 +28,9 @@ async function main() {
 
     const { code } = await orderService.authorize({
         object: {
-            orderNumber: 'TTT5-8958597-4680238',
+            orderNumber: 'TTT1-3713007-5542803',
             customer: {
-                telephone: '+819012345678'
+                telephone: '+819011111111'
             }
         }
     });
@@ -41,7 +41,7 @@ async function main() {
             ticketToken: code // 注文コードなど
         },
         object: {
-            id: '792595246397939-0'
+            id: '439736698844853-0'
         },
         location: { identifier: 'DAITEN_AUTH' }
     });

package/example/src/cloud/transaction/paymentAsyncForce.ts

@@ -69,7 +69,10 @@ export class PaymentAsyncForceService {
         purpose: IPurpose;
     }): Promise<{ id: string }> {
         // 決済承認タスク作成
-        const authorizeTask = await this.paymentService.authorizeMovieTicketAsync(params);
+        const authorizeTask = await this.paymentService.authorizeMovieTicketAsync(
+            params,
+            { giveUpInMS: 3000 }
+        );
         let alreadyGivenUp: boolean = false;
         setTimeout(
             () => { alreadyGivenUp = true; },

package/lib/abstract/chevrePay/payment/factory.d.ts

@@ -33,7 +33,7 @@ export declare type IMovieTicketMkknInfo = factory.action.check.paymentMethod.mo
 };
 export declare type IAuthorizeAnyPaymentObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'name' | 'additionalProperty' | 'ticketToken'>;
 export declare type IAuthorizeCreditCardObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'paymentMethodId' | 'name' | 'additionalProperty' | 'ticketToken'>;
-export declare type IAuthorizeMovieTicketObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty'>;
+export declare type IAuthorizeMovieTicketObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty' | 'ticketToken'>;
 export declare type IAuthorizePaymentCardObject = Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
     description?: string;
 };

package/lib/abstract/chevrePay/payment.d.ts

@@ -202,4 +202,15 @@ export declare class PaymentService extends Service {
         };
         purpose: IPurpose;
     }): Promise<ITicket>;
+    issueTicketThroughMovieTicket(params: {
+        ticketedInvoice: {
+            issuedThrough: {
+                /**
+                 * 発行決済サービスID
+                 */
+                id: string;
+            };
+        };
+        purpose: IPurpose;
+    }): Promise<ITicket>;
 }

package/lib/abstract/chevrePay/payment.js

@@ -441,6 +441,27 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughMovieTicket = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var purpose, ticketedInvoice;
+            var _this = this;
+            return __generator(this, function (_a) {
+                purpose = params.purpose, ticketedInvoice = params.ticketedInvoice;
+                return [2 /*return*/, this.fetch({
+                        uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/tickets",
+                        method: 'POST',
+                        expectedStatusCodes: [http_status_1.CREATED],
+                        body: { purpose: purpose, ticketedInvoice: ticketedInvoice },
+                        qs: {
+                            purpose: { id: params.purpose.id }
+                        }
+                    })
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;

package/lib/abstract/cloud/pay/payment.d.ts

@@ -25,11 +25,16 @@ export declare class PaymentService extends Service {
         id: string;
     }>;
     /**
-     * 決済カード決済承認(非同期)
+     * 決済カード決済承認
      */
     authorizeMovieTicketAsync(params: {
         object: IAuthorizeMovieTicketObject;
         purpose: IPurpose;
+    }, options: {
+        /**
+         * レイテンシ増加時の最大待機時間(milliseconds)
+         */
+        giveUpInMS: number;
     }): Promise<{
         /**
          * task ID
@@ -240,4 +245,5 @@ export declare class PaymentService extends Service {
         };
         purpose: IPurpose;
     }): Promise<ITicket>;
+    private issueTicketThroughMovieTicketUntilSuccess;
 }

package/lib/abstract/cloud/pay/payment.js

@@ -83,6 +83,16 @@ var http_status_1 = require("http-status");
 var factory = require("../../factory");
 var index_1 = require("../../index");
 var service_1 = require("../../service");
+var ISSUE_TICKET_INTERVAL_MS = 5000;
+function wait(waitInMilliseconds) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, new Promise(function (resolve) {
+                    setTimeout(function () { resolve(); }, waitInMilliseconds);
+                })];
+        });
+    });
+}
 /**
  * 決済サービス
  */
@@ -149,11 +159,11 @@ var PaymentService = /** @class */ (function (_super) {
         });
     };
     /**
-     * 決済カード決済承認(非同期)
+     * 決済カード決済承認
      */
-    PaymentService.prototype.authorizeMovieTicketAsync = function (params) {
+    PaymentService.prototype.authorizeMovieTicketAsync = function (params, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, ticketToken, paymentService;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -162,6 +172,9 @@ var PaymentService = /** @class */ (function (_super) {
                         return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
                     case 1:
                         chevrePay = _b.sent();
+                        return [4 /*yield*/, this.issueTicketThroughMovieTicketUntilSuccess(params, options)];
+                    case 2:
+                        ticketToken = (_b.sent()).ticketToken;
                         return [4 /*yield*/, chevrePay.createPaymentInstance({
                                 project: project,
                                 seller: { id: (typeof (seller === null || seller === void 0 ? void 0 : seller.id) === 'string') ? seller.id : '' },
@@ -170,9 +183,12 @@ var PaymentService = /** @class */ (function (_super) {
                                     http_status_1.TOO_MANY_REQUESTS
                                 ])
                             })];
-                    case 2:
+                    case 3:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.authorizeMovieTicket({ object: object, purpose: purpose }, { async: true })];
+                        return [2 /*return*/, paymentService.authorizeMovieTicket({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            }, { async: true })];
                 }
             });
         });
@@ -555,6 +571,72 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughMovieTicketUntilSuccess = function (params, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, giveUpInMS, _b, auth, endpoint, project, seller, disableAutoRetry, chevrePay, paymentService4issueTicket, alreadyGivenUp, giveUpTimeout, result, issueTicketThroughMovieTicketError, error_1;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        object = params.object, purpose = params.purpose;
+                        giveUpInMS = options.giveUpInMS;
+                        if (typeof giveUpInMS !== 'number' || giveUpInMS <= 0) {
+                            throw new factory.errors.Argument('giveUpInMS', 'must be number > 0');
+                        }
+                        _b = this.options, auth = _b.auth, endpoint = _b.endpoint, project = _b.project, seller = _b.seller, disableAutoRetry = _b.disableAutoRetry;
+                        return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
+                    case 1:
+                        chevrePay = _c.sent();
+                        return [4 /*yield*/, chevrePay.createPaymentInstance({
+                                project: project,
+                                seller: { id: (typeof (seller === null || seller === void 0 ? void 0 : seller.id) === 'string') ? seller.id : '' },
+                                retryableStatusCodes: []
+                            })];
+                    case 2:
+                        paymentService4issueTicket = _c.sent();
+                        alreadyGivenUp = false;
+                        giveUpTimeout = setTimeout(function () { alreadyGivenUp = true; }, giveUpInMS);
+                        issueTicketThroughMovieTicketError = new factory.errors.GatewayTimeout('given up');
+                        _c.label = 3;
+                    case 3:
+                        if (!(result === undefined)) return [3 /*break*/, 9];
+                        // 一定時間経過すればあきらめる
+                        if (alreadyGivenUp) {
+                            return [3 /*break*/, 9];
+                        }
+                        _c.label = 4;
+                    case 4:
+                        _c.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, paymentService4issueTicket.issueTicketThroughMovieTicket({
+                                ticketedInvoice: { issuedThrough: { id: (_a = object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id } },
+                                purpose: purpose
+                            })];
+                    case 5:
+                        result = _c.sent();
+                        clearTimeout(giveUpTimeout);
+                        return [3 /*break*/, 9];
+                    case 6:
+                        error_1 = _c.sent();
+                        issueTicketThroughMovieTicketError = error_1;
+                        return [3 /*break*/, 7];
+                    case 7: 
+                    // n秒待機
+                    return [4 /*yield*/, wait(ISSUE_TICKET_INTERVAL_MS)];
+                    case 8:
+                        // n秒待機
+                        _c.sent();
+                        // tslint:disable-next-line:no-console
+                        console.log('retrying issueTicketThroughMovieTicket...', issueTicketThroughMovieTicketError === null || issueTicketThroughMovieTicketError === void 0 ? void 0 : issueTicketThroughMovieTicketError.name, alreadyGivenUp);
+                        return [3 /*break*/, 3];
+                    case 9:
+                        if (typeof (result === null || result === void 0 ? void 0 : result.ticketToken) === 'string') {
+                            return [2 /*return*/, result];
+                        }
+                        throw issueTicketThroughMovieTicketError;
+                }
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;

package/lib/bundle.js

@@ -14577,6 +14577,27 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughMovieTicket = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var purpose, ticketedInvoice;
+            var _this = this;
+            return __generator(this, function (_a) {
+                purpose = params.purpose, ticketedInvoice = params.ticketedInvoice;
+                return [2 /*return*/, this.fetch({
+                        uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/tickets",
+                        method: 'POST',
+                        expectedStatusCodes: [http_status_1.CREATED],
+                        body: { purpose: purpose, ticketedInvoice: ticketedInvoice },
+                        qs: {
+                            purpose: { id: params.purpose.id }
+                        }
+                    })
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;
@@ -20306,6 +20327,16 @@ var http_status_1 = require("http-status");
 var factory = require("../../factory");
 var index_1 = require("../../index");
 var service_1 = require("../../service");
+var ISSUE_TICKET_INTERVAL_MS = 5000;
+function wait(waitInMilliseconds) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, new Promise(function (resolve) {
+                    setTimeout(function () { resolve(); }, waitInMilliseconds);
+                })];
+        });
+    });
+}
 /**
  * 決済サービス
  */
@@ -20372,11 +20403,11 @@ var PaymentService = /** @class */ (function (_super) {
         });
     };
     /**
-     * 決済カード決済承認(非同期)
+     * 決済カード決済承認
      */
-    PaymentService.prototype.authorizeMovieTicketAsync = function (params) {
+    PaymentService.prototype.authorizeMovieTicketAsync = function (params, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService;
+            var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, ticketToken, paymentService;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -20385,6 +20416,9 @@ var PaymentService = /** @class */ (function (_super) {
                         return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
                     case 1:
                         chevrePay = _b.sent();
+                        return [4 /*yield*/, this.issueTicketThroughMovieTicketUntilSuccess(params, options)];
+                    case 2:
+                        ticketToken = (_b.sent()).ticketToken;
                         return [4 /*yield*/, chevrePay.createPaymentInstance({
                                 project: project,
                                 seller: { id: (typeof (seller === null || seller === void 0 ? void 0 : seller.id) === 'string') ? seller.id : '' },
@@ -20393,9 +20427,12 @@ var PaymentService = /** @class */ (function (_super) {
                                     http_status_1.TOO_MANY_REQUESTS
                                 ])
                             })];
-                    case 2:
+                    case 3:
                         paymentService = _b.sent();
-                        return [2 /*return*/, paymentService.authorizeMovieTicket({ object: object, purpose: purpose }, { async: true })];
+                        return [2 /*return*/, paymentService.authorizeMovieTicket({
+                                object: __assign(__assign({}, object), { ticketToken: ticketToken }),
+                                purpose: purpose
+                            }, { async: true })];
                 }
             });
         });
@@ -20778,6 +20815,72 @@ var PaymentService = /** @class */ (function (_super) {
             });
         });
     };
+    PaymentService.prototype.issueTicketThroughMovieTicketUntilSuccess = function (params, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, giveUpInMS, _b, auth, endpoint, project, seller, disableAutoRetry, chevrePay, paymentService4issueTicket, alreadyGivenUp, giveUpTimeout, result, issueTicketThroughMovieTicketError, error_1;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        object = params.object, purpose = params.purpose;
+                        giveUpInMS = options.giveUpInMS;
+                        if (typeof giveUpInMS !== 'number' || giveUpInMS <= 0) {
+                            throw new factory.errors.Argument('giveUpInMS', 'must be number > 0');
+                        }
+                        _b = this.options, auth = _b.auth, endpoint = _b.endpoint, project = _b.project, seller = _b.seller, disableAutoRetry = _b.disableAutoRetry;
+                        return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
+                    case 1:
+                        chevrePay = _c.sent();
+                        return [4 /*yield*/, chevrePay.createPaymentInstance({
+                                project: project,
+                                seller: { id: (typeof (seller === null || seller === void 0 ? void 0 : seller.id) === 'string') ? seller.id : '' },
+                                retryableStatusCodes: []
+                            })];
+                    case 2:
+                        paymentService4issueTicket = _c.sent();
+                        alreadyGivenUp = false;
+                        giveUpTimeout = setTimeout(function () { alreadyGivenUp = true; }, giveUpInMS);
+                        issueTicketThroughMovieTicketError = new factory.errors.GatewayTimeout('given up');
+                        _c.label = 3;
+                    case 3:
+                        if (!(result === undefined)) return [3 /*break*/, 9];
+                        // 一定時間経過すればあきらめる
+                        if (alreadyGivenUp) {
+                            return [3 /*break*/, 9];
+                        }
+                        _c.label = 4;
+                    case 4:
+                        _c.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, paymentService4issueTicket.issueTicketThroughMovieTicket({
+                                ticketedInvoice: { issuedThrough: { id: (_a = object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id } },
+                                purpose: purpose
+                            })];
+                    case 5:
+                        result = _c.sent();
+                        clearTimeout(giveUpTimeout);
+                        return [3 /*break*/, 9];
+                    case 6:
+                        error_1 = _c.sent();
+                        issueTicketThroughMovieTicketError = error_1;
+                        return [3 /*break*/, 7];
+                    case 7: 
+                    // n秒待機
+                    return [4 /*yield*/, wait(ISSUE_TICKET_INTERVAL_MS)];
+                    case 8:
+                        // n秒待機
+                        _c.sent();
+                        // tslint:disable-next-line:no-console
+                        console.log('retrying issueTicketThroughMovieTicket...', issueTicketThroughMovieTicketError === null || issueTicketThroughMovieTicketError === void 0 ? void 0 : issueTicketThroughMovieTicketError.name, alreadyGivenUp);
+                        return [3 /*break*/, 3];
+                    case 9:
+                        if (typeof (result === null || result === void 0 ? void 0 : result.ticketToken) === 'string') {
+                            return [2 /*return*/, result];
+                        }
+                        throw issueTicketThroughMovieTicketError;
+                }
+            });
+        });
+    };
     return PaymentService;
 }(service_1.Service));
 exports.PaymentService = PaymentService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cinerino/sdk",
-  "version": "10.16.0-alpha.9",
+  "version": "10.16.0",
   "description": "Cinerino SDK",
   "main": "./lib/index.js",
   "browser": {