@motionpicture/coa-service 9.3.0-alpha.4 → 9.3.0

package/lib/auth/refreshTokenClient.d.ts

@@ -17,10 +17,6 @@ export declare class RefreshTokenClient {
     credentials: ICredentials;
     options: IOptions;
     constructor(options: IOptions);
-    /**
-     * トークンエンドポイントからアクセストークンを取得します。
-     */
-    getTokenWithRequest(): Promise<ICredentials>;
     /**
      * トークンエンドポイントからアクセストークンを取得します。
      */

package/lib/auth/refreshTokenClient.js

@@ -13,7 +13,6 @@ 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');
 const TIMEOUT = 10000;
@@ -26,48 +25,6 @@ class RefreshTokenClient {
         this.options = options;
         this.credentials = {};
     }
-    /**
-     * トークンエンドポイントからアクセストークンを取得します。
-     */
-    getTokenWithRequest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                debug('requesting an access token...');
-                request.post({
-                    baseUrl: this.options.endpoint,
-                    uri: '/token/access_token',
-                    form: {
-                        refresh_token: this.options.refreshToken
-                    },
-                    json: true
-                }, (error, response, body) => {
-                    if (error instanceof Error) {
-                        reject(new Error(error.message));
-                        return;
-                    }
-                    if (response.statusCode !== http_status_1.OK) {
-                        let err = new Error('Unexpected error occurred.');
-                        if (typeof body === 'string') {
-                            err = new Error(body);
-                        }
-                        else if (typeof body.message === 'string' && body.message.length > 0) {
-                            // エラーレスポンスにメッセージがあった場合
-                            err = new Error(body.message);
-                        }
-                        else if (body.status !== undefined && body.status !== 0) {
-                            // エラーレスポンスにステータスがあった場合
-                            err = new Error(body.status);
-                        }
-                        reject(err);
-                    }
-                    else {
-                        this.credentials = body;
-                        resolve(this.credentials);
-                    }
-                });
-            });
-        });
-    }
     /**
      * トークンエンドポイントからアクセストークンを取得します。
      */
@@ -238,7 +195,7 @@ class RefreshTokenClient {
         return __awaiter(this, void 0, void 0, function* () {
             const transporter = (this.options.useFetch === true)
                 ? new transporters_1.FetchTransporter(expectedStatusCodes)
-                : new transporters_1.DefaultTransporter(expectedStatusCodes);
+                : new transporters_1.FetchTransporter(expectedStatusCodes);
             return transporter.request(options);
         });
     }

package/lib/service.d.ts

@@ -1,13 +1,14 @@
-import * as request from 'request';
 import { IRequestOptions, RefreshTokenClient } from './auth/refreshTokenClient';
 /**
  * service constructor options
  */
-export interface IOptions {
+interface IOptions {
     endpoint: string;
     auth: RefreshTokenClient;
 }
-export type ICustomRequestOption = Pick<request.CoreOptions, 'timeout'>;
+interface ICustomRequestOption {
+    timeout?: number;
+}
 /**
  * base service class
  */
@@ -20,3 +21,4 @@ export declare class Service {
      */
     request(options: IRequestOptions, expectedStatusCodes: number[]): Promise<import("./transporters").IResponseBodyAsJson>;
 }
+export {};

package/lib/service.js

@@ -23,9 +23,7 @@ class Service {
      */
     request(options, expectedStatusCodes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = Object.assign(Object.assign({ baseUrl: this.options.endpoint, 
-                // json: true,
-                method: 'GET' }, this.requestOptions), options);
+            const requestOptions = Object.assign(Object.assign({ baseUrl: this.options.endpoint, method: 'GET' }, this.requestOptions), options);
             return this.options.auth.request(requestOptions, expectedStatusCodes);
         });
     }

package/lib/transporters.d.ts

@@ -1,4 +1,3 @@
-import * as request from 'request';
 import { COAServiceError } from './transporter/coaServiceError';
 import { IRequestOptions } from './transporter/requestOption';
 /**
@@ -26,29 +25,6 @@ export type IResponseBody = IResponseBodyAsJson;
 export declare abstract class Transporter {
     abstract request(options: IRequestOptions): Promise<IResponseBody>;
 }
-/**
- * DefaultTransporter
- */
-export declare class DefaultTransporter 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 & Pick<request.OptionsWithUri, 'json' | 'useQuerystring'>;
-    /**
-     * Makes a request with given options and invokes callback.
-     */
-    request(options: IRequestOptions): Promise<IResponseBody>;
-    /**
-     * Wraps the response callback.
-     */
-    private wrapCallback;
-}
 /**
  * FetchTransporter
  */

package/lib/transporters.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchTransporter = exports.DefaultTransporter = exports.Transporter = exports.COAServiceError = exports.RESPONSE_BODY_STAUS_SUCCESS = void 0;
+exports.FetchTransporter = exports.Transporter = exports.COAServiceError = exports.RESPONSE_BODY_STAUS_SUCCESS = void 0;
 // tslint:disable:max-classes-per-file
 /**
  * transporters
@@ -18,7 +18,6 @@ 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 coaServiceError_1 = require("./transporter/coaServiceError");
 Object.defineProperty(exports, "COAServiceError", { enumerable: true, get: function () { return coaServiceError_1.COAServiceError; } });
 const debug = createDebug('coa-service:transporters');
@@ -36,111 +35,104 @@ exports.RESPONSE_BODY_STAUS_SUCCESS = 0;
 class Transporter {
 }
 exports.Transporter = Transporter;
-// export type IBodyResponseCallback = Promise<any>;
-/**
- * DefaultTransporter
- */
-class DefaultTransporter {
-    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 Object.assign(Object.assign({}, options), { json: true, useQuerystring: true });
-    }
-    /**
-     * Makes a request with given options and invokes callback.
-     */
-    request(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = DefaultTransporter.CONFIGURE(options);
-            debug('requesting...', requestOptions);
-            return new Promise((resolve, reject) => {
-                request(requestOptions, (error, response, body) => {
-                    try {
-                        resolve(this.wrapCallback(error, response, body, requestOptions));
-                    }
-                    catch (callbackErr) {
-                        reject(callbackErr);
-                    }
-                });
-            });
-        });
-    }
-    /**
-     * Wraps the response callback.
-     */
-    wrapCallback(error, response, body, options) {
-        const requestOptions = { uri: options.uri };
-        let err = new coaServiceError_1.COAServiceError(http_status_1.INTERNAL_SERVER_ERROR, '', 'An unexpected error occurred.', requestOptions);
-        if (error instanceof Error) {
-            throw new coaServiceError_1.COAServiceError(http_status_1.INTERNAL_SERVER_ERROR, '', error.message, requestOptions);
-        }
-        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) {
-            if (this.expectedStatusCodes.indexOf(response.statusCode) < 0) {
-                if (typeof body === 'string') {
-                    // Consider all 4xx and 5xx responses errors.
-                    err = new coaServiceError_1.COAServiceError(response.statusCode, '', body, requestOptions);
-                }
-                else {
-                    // エラーレスポンスにステータスがあった場合
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
-                    if (statusFromBody !== undefined) {
-                        err = new coaServiceError_1.COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
-                    }
-                    else {
-                        // no operation
-                    }
-                }
-            }
-            else {
-                // HTTPステータスコード2xxでも、レスポンス本文のステータスが0でなければBadRequest
-                if (statusFromBody !== undefined && statusFromBody !== exports.RESPONSE_BODY_STAUS_SUCCESS) {
-                    err = new coaServiceError_1.COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
-                }
-                else {
-                    // if (response.statusCode === NO_CONTENT) {
-                    //     // consider 204
-                    //     return;
-                    // } else {
-                    //     // consider 200,201
-                    //     return body;
-                    // }
-                    return body;
-                }
-            }
-        }
-        else {
-            // no operation
-        }
-        throw err;
-    }
-}
-/**
- * Default user agent.
- */
-DefaultTransporter.USER_AGENT = `coa-service/${pkg.version}`;
-exports.DefaultTransporter = DefaultTransporter;
+// export class DefaultTransporter implements Transporter {
+//     /**
+//      * Default user agent.
+//      */
+//     public static readonly USER_AGENT: string = `coa-service/${pkg.version}`;
+//     public expectedStatusCodes: number[];
+//     constructor(expectedStatusCodes: number[]) {
+//         this.expectedStatusCodes = expectedStatusCodes;
+//     }
+//     /**
+//      * Configures request options before making a request.
+//      */
+//     public static CONFIGURE(
+//         options: IRequestOptions
+//     ): IRequestOptions & Pick<request.OptionsWithUri, 'json' | 'useQuerystring'> {
+//         // 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,
+//             json: true,
+//             useQuerystring: true
+//         };
+//     }
+//     /**
+//      * Makes a request with given options and invokes callback.
+//      */
+//     public async request(options: IRequestOptions): Promise<IResponseBody> {
+//         const requestOptions = DefaultTransporter.CONFIGURE(options);
+//         debug('requesting...', requestOptions);
+//         return new Promise<any>((resolve, reject) => {
+//             request(requestOptions, (error, response, body) => {
+//                 try {
+//                     resolve(this.wrapCallback(error, response, body, requestOptions));
+//                 } catch (callbackErr) {
+//                     reject(callbackErr);
+//                 }
+//             });
+//         });
+//     }
+//     /**
+//      * Wraps the response callback.
+//      */
+//     private wrapCallback(error: any, response: request.RequestResponse, body: any, options: IRequestOptions): IResponseBody {
+//         const requestOptions = { uri: options.uri };
+//         let err: COAServiceError =
+//             new COAServiceError(INTERNAL_SERVER_ERROR, '', 'An unexpected error occurred.', requestOptions);
+//         if (error instanceof Error) {
+//             throw new COAServiceError(INTERNAL_SERVER_ERROR, '', error.message, requestOptions);
+//         }
+//         debug('request processed', error, body, response.statusCode);
+//         const statusFromBody = body?.status;
+//         // tslint:disable-next-line:no-single-line-block-comment
+//         /* istanbul ignore else */
+//         if (response.statusCode !== undefined) {
+//             if (this.expectedStatusCodes.indexOf(response.statusCode) < 0) {
+//                 if (typeof body === 'string') {
+//                     // Consider all 4xx and 5xx responses errors.
+//                     err = new COAServiceError(response.statusCode, '', body, requestOptions);
+//                 } else {
+//                     // エラーレスポンスにステータスがあった場合
+//                     // tslint:disable-next-line:no-single-line-block-comment
+//                     /* istanbul ignore else */
+//                     if (statusFromBody !== undefined) {
+//                         err = new COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
+//                     } else {
+//                         // no operation
+//                     }
+//                 }
+//             } else {
+//                 // HTTPステータスコード2xxでも、レスポンス本文のステータスが0でなければBadRequest
+//                 if (statusFromBody !== undefined && statusFromBody !== RESPONSE_BODY_STAUS_SUCCESS) {
+//                     err = new COAServiceError(response.statusCode, statusFromBody, body.message, requestOptions);
+//                 } else {
+//                     // if (response.statusCode === NO_CONTENT) {
+//                     //     // consider 204
+//                     //     return;
+//                     // } else {
+//                     //     // consider 200,201
+//                     //     return body;
+//                     // }
+//                     return body;
+//                 }
+//             }
+//         } else {
+//             // no operation
+//         }
+//         throw err;
+//     }
+// }
 /**
  * FetchTransporter
  */

package/package.json

@@ -15,24 +15,20 @@
   "dependencies": {
     "debug": "^3.2.7",
     "http-status": "^1.5.2",
-    "node-fetch": "2.7.0",
-    "request": "^2.88.2"
+    "node-fetch": "2.7.0"
   },
   "description": "COA client library for Node.js",
   "devDependencies": {
     "@types/debug": "0.0.30",
     "@types/http-status": "^0.2.30",
     "@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",
     "grunt-contrib-watch": "^1.1.0",
     "mocha": "^5.2.0",
     "moment": "^2.22.1",
-    "nock": "^9.3.0",
     "nyc": "^15.1.0",
     "rimraf": "^2.6.2",
     "sinon": "^5.0.10",
@@ -43,7 +39,7 @@
   },
   "engines": {
     "node": ">=18.0.0",
-    "npm": ">=6.0.0"
+    "npm": ">=8.0.0"
   },
   "keywords": [],
   "license": "UNLICENSED",
@@ -80,5 +76,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "9.3.0-alpha.4"
+  "version": "9.3.0"
 }