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

package/example/stateReserve.js

@@ -14,9 +14,9 @@ const service = new COA.service.Reserve({
 });
 
 service.stateReserve({
-    theaterCode: '112',
-    reserveNum: '588456',
-    telNum: '0362778824'
+    theaterCode: '120',
+    reserveNum: '45699',
+    telNum: '0312345678'
 }).then((result) => {
     fs.writeFileSync(`${__dirname}/output/stateReserve.json`, JSON.stringify(result, null, '    '));
     console.log(result);

package/lib/auth/refreshTokenClient.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshTokenClient = void 0;
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
+const node_fetch_1 = require("node-fetch");
 const request = require("request");
 const transporters_1 = require("../transporters");
 const debug = createDebug('coa-service:auth:refreshTokenClient');
@@ -74,7 +75,7 @@ class RefreshTokenClient {
             debug('requesting an access token...');
             try {
                 const params = new URLSearchParams({ refresh_token: String(this.options.refreshToken) });
-                const res = yield fetch(`${this.options.endpoint}/token/access_token`, {
+                const res = yield (0, node_fetch_1.default)(`${this.options.endpoint}/token/access_token`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/x-www-form-urlencoded'

package/lib/service.d.ts

@@ -13,7 +13,7 @@ export type ICustomRequestOption = Pick<request.CoreOptions, 'timeout'>;
  */
 export declare class Service {
     options: IOptions;
-    requestOptions: request.CoreOptions;
+    requestOptions: ICustomRequestOption;
     constructor(options: IOptions, requestOptions?: ICustomRequestOption);
     /**
      * Create and send request to API

package/lib/service.js

@@ -16,27 +16,16 @@ exports.Service = void 0;
 class Service {
     constructor(options, requestOptions) {
         this.options = options;
-        this.requestOptions = {};
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (requestOptions !== undefined) {
-            this.requestOptions = Object.assign(Object.assign({}, this.requestOptions), requestOptions);
-        }
+        this.requestOptions = Object.assign({}, requestOptions);
     }
     /**
      * Create and send request to API
      */
     request(options, expectedStatusCodes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const defaultOptions = {
-                baseUrl: this.options.endpoint,
-                // simple: false,
-                // resolveWithFullResponse: true,
-                json: true,
-                method: 'GET',
-                useQuerystring: true
-            };
-            const requestOptions = Object.assign(Object.assign(Object.assign({}, defaultOptions), this.requestOptions), options);
+            const requestOptions = Object.assign(Object.assign({ baseUrl: this.options.endpoint, 
+                // json: true,
+                method: 'GET' }, this.requestOptions), options);
             return this.options.auth.request(requestOptions, expectedStatusCodes);
         });
     }

package/lib/transporters.d.ts

@@ -35,7 +35,7 @@ export declare class DefaultTransporter implements Transporter {
     /**
      * Configures request options before making a request.
      */
-    static CONFIGURE(options: IRequestOptions): IRequestOptions;
+    static CONFIGURE(options: IRequestOptions): IRequestOptions & Pick<request.OptionsWithUri, 'json' | 'useQuerystring'>;
     /**
      * Makes a request with given options and invokes callback.
      */

package/lib/transporters.js

@@ -16,6 +16,7 @@ exports.FetchTransporter = exports.DefaultTransporter = exports.COAServiceError
  */
 const createDebug = require("debug");
 const http_status_1 = require("http-status");
+const node_fetch_1 = require("node-fetch");
 const querystring = require("querystring");
 const request = require("request");
 const debug = createDebug('coa-service:transporters');
@@ -70,7 +71,7 @@ class DefaultTransporter {
         else {
             // no operation
         }
-        return options;
+        return Object.assign(Object.assign({}, options), { json: true, useQuerystring: true });
     }
     /**
      * Makes a request with given options and invokes callback.
@@ -100,7 +101,8 @@ class DefaultTransporter {
         if (error instanceof Error) {
             throw new COAServiceError(http_status_1.INTERNAL_SERVER_ERROR, '', error.message, requestOptions);
         }
-        debug('request processed', error, body);
+        debug('request processed', error, body, response.statusCode);
+        const statusFromBody = body === null || body === void 0 ? void 0 : body.status;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (response.statusCode !== undefined) {
@@ -113,8 +115,8 @@ class DefaultTransporter {
                     // エラーレスポンスにステータスがあった場合
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
-                    if (body.status !== undefined) {
-                        err = new COAServiceError(response.statusCode, body.status, body.message, requestOptions);
+                    if (statusFromBody !== undefined) {
+                        err = new COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
                     }
                     else {
                         // no operation
@@ -123,8 +125,8 @@ class DefaultTransporter {
             }
             else {
                 // HTTPステータスコード2xxでも、レスポンス本文のステータスが0でなければBadRequest
-                if (body.status !== undefined && body.status !== exports.RESPONSE_BODY_STAUS_SUCCESS) {
-                    err = new COAServiceError(response.statusCode, body.status, body.message, requestOptions);
+                if (statusFromBody !== undefined && statusFromBody !== exports.RESPONSE_BODY_STAUS_SUCCESS) {
+                    err = new COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
                 }
                 else {
                     if (response.statusCode === http_status_1.NO_CONTENT) {
@@ -182,11 +184,10 @@ class FetchTransporter {
         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))
+            debug('fetching...', input, requestOptions);
+            return (0, node_fetch_1.default)(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); }));
         });
     }

package/package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "debug": "^3.2.7",
     "http-status": "^1.5.2",
+    "node-fetch": "2.7.0",
     "request": "^2.88.2"
   },
   "description": "COA client library for Node.js",
@@ -24,6 +25,7 @@
     "@types/mocha": "^5.2.0",
     "@types/nock": "^9.1.3",
     "@types/node": "18.19.2",
+    "@types/node-fetch": "2.6.11",
     "@types/request": "^2.48.5",
     "@types/sinon": "^4.3.3",
     "coveralls": "^3.0.1",
@@ -78,5 +80,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "9.3.0-alpha.2"
+  "version": "9.3.0-alpha.3"
 }