@motionpicture/coa-service 9.3.0-alpha.0 → 9.3.0-alpha.2

package/example/findFilms.js

@@ -12,7 +12,8 @@ const service = new COA.service.Master(
             endpoint: process.env.COA_ENDPOINT,
             refreshToken: process.env.COA_REFRESH_TOKEN
         })
-    }
+    },
+    { timeout: 1000 }
 );
 
 service.title({

package/example/findKubunNames.js

@@ -9,7 +9,8 @@ const service = new COA.service.Master(
         endpoint: process.env.COA_ENDPOINT,
         auth: new COA.auth.RefreshToken({
             endpoint: process.env.COA_ENDPOINT,
-            refreshToken: process.env.COA_REFRESH_TOKEN
+            refreshToken: process.env.COA_REFRESH_TOKEN,
+            useFetch: true
         })
     }
 );

package/example/findPerformances.js

@@ -16,7 +16,7 @@ const service = new COA.service.Master(
 );
 
 service.schedule({
-    theaterCode: '012',
+    theaterCode: '120',
     begin: '20200213',
     end: '20200218'
 }).then((result) => {

package/example/findScreen.js

@@ -15,7 +15,7 @@ const service = new COA.service.Master(
 );
 
 service.screen({
-    theaterCode: '118'
+    theaterCode: '120'
 }).then((result) => {
     fs.writeFileSync(`${__dirname}/output/screen.json`, JSON.stringify(result, null, '    '));
     console.log(result);

package/example/findTheater.js

@@ -15,7 +15,7 @@ const service = new COA.service.Master(
 );
 
 service.theater({
-    theaterCode: '118'
+    theaterCode: '120'
 }).then((result) => {
     fs.writeFileSync(`${__dirname}/output/theater.json`, JSON.stringify(result, null, '    '));
     console.log(result);

package/example/findTickets.js

@@ -15,7 +15,7 @@ const service = new COA.service.Master(
 );
 
 service.ticket({
-    theaterCode: '118'
+    theaterCode: '120'
 }).then((result) => {
     fs.writeFileSync(`${__dirname}/output/ticket.json`, JSON.stringify(result, null, '    '));
     console.log(result);

package/example/stateReserve.js

@@ -8,14 +8,15 @@ const service = new COA.service.Reserve({
     endpoint: process.env.COA_ENDPOINT,
     auth: new COA.auth.RefreshToken({
         endpoint: process.env.COA_ENDPOINT,
-        refreshToken: process.env.COA_REFRESH_TOKEN
+        refreshToken: process.env.COA_REFRESH_TOKEN,
+        useFetch: true
     })
 });
 
 service.stateReserve({
-    theaterCode: '118',
-    reserveNum: '99150',
-    telNum: '09012345678'
+    theaterCode: '112',
+    reserveNum: '588456',
+    telNum: '0362778824'
 }).then((result) => {
     fs.writeFileSync(`${__dirname}/output/stateReserve.json`, JSON.stringify(result, null, '    '));
     console.log(result);

package/example/stateReserveSeat.js

@@ -15,7 +15,7 @@ const service = new COA.service.Reserve(
 );
 
 service.stateReserveSeat({
-    theaterCode: '118',
+    theaterCode: '120',
     dateJouei: '20190605',
     titleCode: '16421',
     titleBranchNum: '0',

package/example/updReserve.js

@@ -0,0 +1,21 @@
+/**
+ * 購入チケット内容取得の例
+ */
+const COA = require('../');
+const fs = require('fs');
+
+const service = new COA.service.Reserve({
+    endpoint: process.env.COA_ENDPOINT,
+    auth: new COA.auth.RefreshToken({
+        endpoint: process.env.COA_ENDPOINT,
+        refreshToken: process.env.COA_REFRESH_TOKEN
+    })
+});
+
+service.updReserve({
+}).then((result) => {
+    fs.writeFileSync(`${__dirname}/output/updReserve.json`, JSON.stringify(result, null, '    '));
+    console.log(result);
+}).catch((err) => {
+    console.error(err);
+});

package/lib/auth/refreshTokenClient.d.ts

@@ -3,6 +3,7 @@ import { ICredentials } from './credentials';
 export interface IOptions {
     endpoint: string;
     refreshToken?: string;
+    useFetch: boolean;
 }
 export { IRequestOptions };
 /**

package/lib/auth/refreshTokenClient.js

@@ -208,6 +208,8 @@ class RefreshTokenClient {
                     /* istanbul ignore else */
                     if (error instanceof Error) {
                         const statusCode = error.code;
+                        // tslint:disable-next-line:no-single-line-block-comment
+                        /* istanbul ignore else */
                         if (statusCode === http_status_1.UNAUTHORIZED || statusCode === http_status_1.FORBIDDEN) {
                             if (retry) {
                                 // 多くの場合、認証エラーは、トークンの期限が原因なので、一度だけリフレッシュするのは有効なはず。
@@ -234,10 +236,11 @@ class RefreshTokenClient {
     /**
      * 認証情報が適切である前提でAPIリクエストを投げる
      */
-    // tslint:disable-next-line:prefer-function-over-method
     makeRequest(options, expectedStatusCodes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const transporter = new transporters_1.DefaultTransporter(expectedStatusCodes);
+            const transporter = (this.options.useFetch === true)
+                ? new transporters_1.FetchTransporter(expectedStatusCodes)
+                : new transporters_1.DefaultTransporter(expectedStatusCodes);
             return transporter.request(options);
         });
     }

package/lib/transporters.d.ts

@@ -1,5 +1,10 @@
 import * as request from 'request';
-export type IRequestOptions = Pick<request.OptionsWithUri, 'uri' | 'method' | 'qs' | 'auth' | 'headers'>;
+/**
+ * リクエスト成功の場合のレスポンス本文のstatus属性の値
+ * 失敗の場合はstring型だが、成功の場合のみnumber型が返却されるので注意すること。
+ */
+export declare const RESPONSE_BODY_STAUS_SUCCESS = 0;
+export type IRequestOptions = Pick<request.OptionsWithUri, 'uri' | 'method' | 'qs' | 'auth' | 'headers' | 'baseUrl' | 'timeout'>;
 /**
  * transporter abstract class
  * トランスポーター抽象クラス
@@ -34,7 +39,30 @@ export declare class DefaultTransporter implements Transporter {
     /**
      * Makes a request with given options and invokes callback.
      */
-    request(options: Pick<request.OptionsWithUri, 'uri' | 'method' | 'qs' | 'headers'>): Promise<any>;
+    request(options: IRequestOptions): Promise<any>;
+    /**
+     * Wraps the response callback.
+     */
+    private wrapCallback;
+}
+/**
+ * FetchTransporter
+ */
+export declare class FetchTransporter implements Transporter {
+    /**
+     * Default user agent.
+     */
+    static readonly USER_AGENT: string;
+    expectedStatusCodes: number[];
+    constructor(expectedStatusCodes: number[]);
+    /**
+     * Configures request options before making a request.
+     */
+    static CONFIGURE(options: IRequestOptions): IRequestOptions;
+    /**
+     * Makes a request with given options and invokes callback.
+     */
+    request(options: IRequestOptions): Promise<any>;
     /**
      * Wraps the response callback.
      */

package/lib/transporters.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultTransporter = exports.COAServiceError = exports.Transporter = void 0;
+exports.FetchTransporter = exports.DefaultTransporter = exports.COAServiceError = exports.Transporter = exports.RESPONSE_BODY_STAUS_SUCCESS = void 0;
 // tslint:disable:max-classes-per-file
 /**
  * transporters
  */
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
+const querystring = require("querystring");
 const request = require("request");
 const debug = createDebug('coa-service:transporters');
 // tslint:disable-next-line
@@ -24,7 +25,7 @@ const pkg = require('../package.json');
  * リクエスト成功の場合のレスポンス本文のstatus属性の値
  * 失敗の場合はstring型だが、成功の場合のみnumber型が返却されるので注意すること。
  */
-const RESPONSE_BODY_STAUS_SUCCESS = 0;
+exports.RESPONSE_BODY_STAUS_SUCCESS = 0;
 /**
  * transporter abstract class
  * トランスポーター抽象クラス
@@ -122,7 +123,7 @@ class DefaultTransporter {
             }
             else {
                 // HTTPステータスコード2xxでも、レスポンス本文のステータスが0でなければBadRequest
-                if (body.status !== undefined && body.status !== RESPONSE_BODY_STAUS_SUCCESS) {
+                if (body.status !== undefined && body.status !== exports.RESPONSE_BODY_STAUS_SUCCESS) {
                     err = new COAServiceError(response.statusCode, body.status, body.message, requestOptions);
                 }
                 else {
@@ -148,3 +149,113 @@ class DefaultTransporter {
  */
 DefaultTransporter.USER_AGENT = `coa-service/${pkg.version}`;
 exports.DefaultTransporter = DefaultTransporter;
+/**
+ * FetchTransporter
+ */
+class FetchTransporter {
+    constructor(expectedStatusCodes) {
+        this.expectedStatusCodes = expectedStatusCodes;
+    }
+    /**
+     * Configures request options before making a request.
+     */
+    static CONFIGURE(options) {
+        // set transporter user agent
+        options.headers = (options.headers !== undefined) ? options.headers : {};
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (!options.headers['User-Agent']) {
+            options.headers['User-Agent'] = DefaultTransporter.USER_AGENT;
+        }
+        else if (options.headers['User-Agent'].indexOf(DefaultTransporter.USER_AGENT) === -1) {
+            options.headers['User-Agent'] = `${options.headers['User-Agent']} ${DefaultTransporter.USER_AGENT}`;
+        }
+        else {
+            // no operation
+        }
+        return options;
+    }
+    /**
+     * Makes a request with given options and invokes callback.
+     */
+    request(options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = FetchTransporter.CONFIGURE(options);
+            debug('requesting...', requestOptions);
+            const input = `${requestOptions.baseUrl}${requestOptions.uri}?${querystring.stringify(requestOptions.qs)}`;
+            const accessToken = (_a = requestOptions.auth) === null || _a === void 0 ? void 0 : _a.bearer;
+            debug('fetching...', input);
+            return fetch(input, Object.assign({ method: requestOptions.method, headers: Object.assign(Object.assign({}, requestOptions.headers), (typeof accessToken === 'string') ? { Authorization: `Bearer ${accessToken}` } /* istanbul ignore else */ : undefined) }, (typeof requestOptions.timeout === 'number') ? { signal: AbortSignal.timeout(requestOptions.timeout) } : undefined))
+                .then((res) => __awaiter(this, void 0, void 0, function* () { return this.wrapCallback(res, requestOptions); }));
+        });
+    }
+    /**
+     * Wraps the response callback.
+     */
+    wrapCallback(res, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = { uri: options.uri };
+            let err = new COAServiceError(http_status_1.INTERNAL_SERVER_ERROR, '', 'An unexpected error occurred.', requestOptions);
+            debug('fetch processed. res.status:', res.status, 'content-type:', res.headers.get('content-type'));
+            let body = {};
+            try {
+                if (res.headers.get('content-type') === 'text/plain') {
+                    body = yield res.text();
+                }
+                else {
+                    body = yield res.json();
+                }
+            }
+            catch (error) {
+                // no op
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (res.status !== undefined) {
+                if (this.expectedStatusCodes.indexOf(res.status) < 0) {
+                    if (typeof body === 'string') {
+                        // Consider all 4xx and 5xx responses errors.
+                        err = new COAServiceError(res.status, '', body, requestOptions);
+                    }
+                    else {
+                        // エラーレスポンスにステータスがあった場合
+                        // tslint:disable-next-line:no-single-line-block-comment
+                        /* istanbul ignore else */
+                        if (body.status !== undefined) {
+                            err = new COAServiceError(res.status, body.status, body.message, requestOptions);
+                        }
+                        else {
+                            // no operation
+                        }
+                    }
+                }
+                else {
+                    // HTTPステータスコード2xxでも、レスポンス本文のステータスが0でなければBadRequest
+                    if (body.status !== undefined && body.status !== exports.RESPONSE_BODY_STAUS_SUCCESS) {
+                        err = new COAServiceError(res.status, body.status, body.message, requestOptions);
+                    }
+                    else {
+                        if (res.status === http_status_1.NO_CONTENT) {
+                            // consider 204
+                            return;
+                        }
+                        else {
+                            // consider 200,201
+                            return body;
+                        }
+                    }
+                }
+            }
+            else {
+                // no operation
+            }
+            throw err;
+        });
+    }
+}
+/**
+ * Default user agent.
+ */
+FetchTransporter.USER_AGENT = `coa-service/${pkg.version}`;
+exports.FetchTransporter = FetchTransporter;

package/package.json

@@ -78,5 +78,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "9.3.0-alpha.0"
+  "version": "9.3.0-alpha.2"
 }