@motionpicture/coa-service 9.7.0-alpha.3 → 10.0.0-alpha.1

package/README.md

@@ -1,4 +1,4 @@
-# COA client library for Node.js
+# COA SDK
 
 [![npm (scoped)](https://img.shields.io/npm/v/@motionpicture/coa-service.svg)](https://www.npmjs.com/package/@motionpicture/coa-service)
 [![CircleCI](https://circleci.com/gh/motionpicture/coa-service.svg?style=shield)](https://circleci.com/gh/motionpicture/coa-service)
@@ -9,7 +9,7 @@ COA SDK for Node.js
 
 ## Table of contents
 
-- [COA client library for Node.js](#coa-client-library-for-nodejs)
+- [COA SDK](#coa-sdk)
   - [Table of contents](#table-of-contents)
   - [Specification](#specification)
   - [Usage](#usage)
@@ -39,7 +39,7 @@ npm install @motionpicture/coa-service
 ```
 
 ```js
-const COA = require('@motionpicture/coa-service');
+const { COA } = require('@motionpicture/coa-service');
 ```
 
 ### Environment variables
@@ -51,7 +51,7 @@ const COA = require('@motionpicture/coa-service');
 ### 劇場情報を取得する
 
 ```js
-const COA = require('@motionpicture/coa-service');
+const { COA } = require('@motionpicture/coa-service');
 
 const masterService = new COA.service.Master({
     endpoint: '',

package/lib/auth/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * リフレッシュトークン認証クライアント
+ */
+export { RefreshTokenClient as RefreshToken } from './refreshTokenClient';
+export * as CredentialsRepo from './repo/credentials';

package/lib/auth/index.js

@@ -0,0 +1,32 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CredentialsRepo = exports.RefreshToken = void 0;
+/**
+ * リフレッシュトークン認証クライアント
+ */
+var refreshTokenClient_1 = require("./refreshTokenClient");
+Object.defineProperty(exports, "RefreshToken", { enumerable: true, get: function () { return refreshTokenClient_1.RefreshTokenClient; } });
+exports.CredentialsRepo = __importStar(require("./repo/credentials"));

package/lib/auth/refreshTokenClient.d.ts

@@ -4,7 +4,6 @@ import { AbstractCredentialsRepo } from './repo/credentials';
 export interface IOptions {
     endpoint: string;
     refreshToken?: string;
-    useFetch: boolean;
     /**
      * カスタム認証情報リポジトリ
      */

package/lib/auth/refreshTokenClient.js

@@ -40,7 +40,7 @@ class RefreshTokenClient {
                 body: params,
                 signal: AbortSignal.timeout(TIMEOUT)
             });
-            let body;
+            let body; // eslint-disable-line @typescript-eslint/no-explicit-any
             try {
                 body = await res.json();
             }
@@ -74,17 +74,16 @@ class RefreshTokenClient {
         catch (err) {
             /* istanbul ignore next */
             if (err.name === 'TimeoutError') {
-                console.error('getTokenWithFetch: Timeout: It took more than 5 seconds to get the result!', err);
+                console.error('COA.RefreshTokenClient.getTokenWithFetch: Timeout: It took more than 10 seconds to get the result', err);
             }
             else if (err.name === 'AbortError') {
-                console.error('getTokenWithFetch: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
-            }
-            else if (err.name === 'TypeError') {
-                console.error('getTokenWithFetch: AbortSignal.timeout() method is not supported', err);
+                console.error('COA.RefreshTokenClient.getTokenWithFetch: Fetch aborted by user action', err);
+                // } else if (err.name === 'TypeError') {
+                //     console.error('getTokenWithFetch: AbortSignal.timeout() method is not supported', err);
             }
             else {
                 // A network error, or some other problem.
-                console.error(`getTokenWithFetch: Error: type: ${err.name}, message: ${err.message}`, err);
+                console.error(`COA.RefreshTokenClient.getTokenWithFetch: Error: type: ${err.name}, message: ${err.message}`, err);
             }
             throw err;
         }
@@ -195,9 +194,7 @@ class RefreshTokenClient {
      * 認証情報が適切である前提でAPIリクエストを投げる
      */
     async makeRequest(options, expectedStatusCodes) {
-        const transporter = (this.options.useFetch === true)
-            ? new transporters_1.FetchTransporter(expectedStatusCodes)
-            : new transporters_1.FetchTransporter(expectedStatusCodes);
+        const transporter = new transporters_1.FetchTransporter(expectedStatusCodes);
         return transporter.request(options);
     }
     /**

package/lib/coa.d.ts

@@ -0,0 +1,4 @@
+export * as auth from './auth/index';
+export * as service from './service/index';
+export { COAFactory as factory } from '@coasystems/factory';
+export { COAServiceError } from './transporter/coaServiceError';

package/lib/coa.js

@@ -0,0 +1,32 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.COAServiceError = exports.factory = exports.service = exports.auth = void 0;
+exports.auth = __importStar(require("./auth/index"));
+exports.service = __importStar(require("./service/index"));
+var factory_1 = require("@coasystems/factory");
+Object.defineProperty(exports, "factory", { enumerable: true, get: function () { return factory_1.COAFactory; } });
+var coaServiceError_1 = require("./transporter/coaServiceError");
+Object.defineProperty(exports, "COAServiceError", { enumerable: true, get: function () { return coaServiceError_1.COAServiceError; } });

package/lib/index.d.ts

@@ -1,32 +1 @@
-/**
- * coa-service
- */
-import { COAFactory } from '@coasystems/factory';
-import { RefreshTokenClient } from './auth/refreshTokenClient';
-import * as CredentialsRepo from './auth/repo/credentials';
-import { MasterService } from './service/master';
-import { ReserveService } from './service/reserve';
-import { COAServiceError } from './transporter/coaServiceError';
-export { COAServiceError, COAFactory as factory };
-export declare namespace auth {
-    /**
-     * リフレッシュトークン認証クライアント
-     */
-    class RefreshToken extends RefreshTokenClient {
-    }
-    namespace repo {
-        export import credentials = CredentialsRepo;
-    }
-}
-export declare namespace service {
-    /**
-     * マスターサービス
-     */
-    class Master extends MasterService {
-    }
-    /**
-     * 予約サービス
-     */
-    class Reserve extends ReserveService {
-    }
-}
+export * as COA from './coa';

package/lib/index.js

@@ -23,43 +23,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.service = exports.auth = exports.factory = exports.COAServiceError = void 0;
-/**
- * coa-service
- */
-const factory_1 = require("@coasystems/factory");
-Object.defineProperty(exports, "factory", { enumerable: true, get: function () { return factory_1.COAFactory; } });
-const refreshTokenClient_1 = require("./auth/refreshTokenClient");
-const CredentialsRepo = __importStar(require("./auth/repo/credentials"));
-const master_1 = require("./service/master");
-const reserve_1 = require("./service/reserve");
-const coaServiceError_1 = require("./transporter/coaServiceError");
-Object.defineProperty(exports, "COAServiceError", { enumerable: true, get: function () { return coaServiceError_1.COAServiceError; } });
-var auth;
-(function (auth) {
-    /**
-     * リフレッシュトークン認証クライアント
-     */
-    class RefreshToken extends refreshTokenClient_1.RefreshTokenClient {
-    }
-    auth.RefreshToken = RefreshToken;
-    let repo;
-    (function (repo) {
-        repo.credentials = CredentialsRepo;
-    })(repo = auth.repo || (auth.repo = {}));
-})(auth || (exports.auth = auth = {}));
-var service;
-(function (service) {
-    /**
-     * マスターサービス
-     */
-    class Master extends master_1.MasterService {
-    }
-    service.Master = Master;
-    /**
-     * 予約サービス
-     */
-    class Reserve extends reserve_1.ReserveService {
-    }
-    service.Reserve = Reserve;
-})(service || (exports.service = service = {}));
+exports.COA = void 0;
+exports.COA = __importStar(require("./coa"));

package/lib/service/index.d.ts

@@ -0,0 +1,2 @@
+export { MasterService as Master } from './master';
+export { ReserveService as Reserve } from './reserve';

package/lib/service/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Reserve = exports.Master = void 0;
+var master_1 = require("./master");
+Object.defineProperty(exports, "Master", { enumerable: true, get: function () { return master_1.MasterService; } });
+var reserve_1 = require("./reserve");
+Object.defineProperty(exports, "Reserve", { enumerable: true, get: function () { return reserve_1.ReserveService; } });

package/lib/transporter/requestOption.d.ts

@@ -1,5 +1,5 @@
-type IHeaders = Record<string, any>;
-type IQS = Record<string, string | number | any[]>;
+type IHeaders = Record<string, string>;
+type IQS = Record<string, string | number | string[] | number[]>;
 export interface IRequestOptions {
     baseUrl?: string;
     auth?: {

package/lib/transporters.js

@@ -27,101 +27,6 @@ exports.RESPONSE_BODY_STAUS_SUCCESS = 0;
 class Transporter {
 }
 exports.Transporter = Transporter;
-// 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 : {};
-//         /* 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;
-//         /* 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 {
-//                     // エラーレスポンスにステータスがあった場合
-//                     /* 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
  */
@@ -129,7 +34,7 @@ class FetchTransporter {
     /**
      * Default user agent.
      */
-    static USER_AGENT = `coa-service/${pkg.version}`;
+    static USER_AGENT = `coa/sdk@${pkg.version}`;
     expectedStatusCodes;
     constructor(expectedStatusCodes) {
         this.expectedStatusCodes = expectedStatusCodes;

package/package.json

@@ -13,32 +13,28 @@
     }
   ],
   "dependencies": {
-    "@coasystems/factory": "1.0.0-alpha.0",
+    "@coasystems/factory": "1.0.0",
     "debug": "4.4.3"
   },
-  "description": "COA client library for Node.js",
+  "description": "COA SDK",
   "devDependencies": {
     "@eslint/js": "9.39.4",
     "@types/debug": "4.1.13",
-    "@types/mocha": "^5.2.0",
     "@types/node": "22.19.17",
-    "@types/sinon": "^4.3.3",
+    "@vitest/coverage-v8": "4.1.3",
+    "@vitest/ui": "4.1.3",
     "eslint": "9.39.4",
-    "mocha": "^5.2.0",
     "moment": "^2.22.1",
-    "nyc": "^15.1.0",
     "redis": "4.6.5",
     "rimraf": "^2.6.2",
-    "sinon": "^5.0.10",
-    "ts-node": "10.8.0",
     "typescript": "5.6.3",
-    "typescript-eslint": "8.58.0"
+    "typescript-eslint": "8.58.0",
+    "vitest": "4.1.3"
   },
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=10.0.0"
   },
-  "keywords": [],
   "license": "UNLICENSED",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -52,16 +48,15 @@
   },
   "scripts": {
     "build": "tsc",
+    "check:all": "npm run clean && npm run build && npm test",
     "eslint": "eslint \"src/**/*.ts\"",
+    "coverage": "vitest run --coverage",
     "clean": "rimraf \"npm-debug.log*\" ./lib ./docs ./coverage ./.nyc_output",
-    "mocha": "mocha",
-    "nyc": "nyc mocha \"src/**/*.spec.ts\"",
-    "coverage": "npm run nyc && nyc report --reporter=text-summary",
     "test": "npm run eslint && npm run coverage",
-    "preversion": "npm run clean && npm run build && npm test",
+    "preversion": "npm run check:all",
     "version": "git add -A",
     "postversion": "git push origin --tags",
-    "prepublishOnly": "npm run clean && npm run build && npm test"
+    "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "9.7.0-alpha.3"
+  "version": "10.0.0-alpha.1"
 }