@motionpicture/coa-service 9.5.0 → 9.6.0

package/example/findKubunNames.js

@@ -3,27 +3,98 @@
  */
 const COA = require('../');
 const fs = require('fs');
+const redis = require('redis');
 
-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,
-            useFetch: true
-        })
+/**
+ * 認証情報リポジトリ
+ */
+class CredentialsRepo {
+    redisClient;
+    options;
+
+    constructor(redisClient, options) {
+        this.redisClient = redisClient;
+        this.options = options;
+    }
+
+    async save(credentials) {
+        const { access_token, expired_at } = credentials;
+        if (typeof credentials.access_token !== 'string') {
+            throw new Error('access_token must be string');
+        }
+        if (typeof credentials.expired_at !== 'string') {
+            throw new Error('expired_at must be string');
+        }
+
+        const key = this.createKey();
+        const value = JSON.stringify({ access_token, expired_at });
+        const multi = this.redisClient.multi();
+        const results = await multi.set(key, value)
+            // .expireAt(key, Number(expired_at))
+            .expire(key, 60)
+            .exec();
+        console.log('credential saved', results);
+        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+        //     return true;
+        // } else {
+        //     throw new Error('unexpected');
+        // }
+    }
+
+    async find() {
+        const key = this.createKey();
+
+        let credentials;
+        try {
+            const credentialsStr = await this.redisClient.get(key);
+            if (typeof credentialsStr === 'string') {
+                credentials = JSON.parse(credentialsStr);
+            }
+        } catch (error) {
+            console.error('credential parse error:', error);
+        }
+
+        return credentials;
     }
-);
-
-// const kubunClass = '000'; // すべて
-// const kubunClass = '050'; // 特別席区分
-const kubunClass = '005'; // 販売区分
-service.kubunName({
-    theaterCode: '120',
-    kubunClass
-}).then((result) => {
-    fs.writeFileSync(`${__dirname}/output/kubunName-${kubunClass}.json`, JSON.stringify(result, null, '    '));
-    console.log(result);
-}).catch((err) => {
-    console.error(err);
+
+    createKey() {
+        return `COA:credentials:${this.options.scope}`;
+    }
+}
+
+const redisClient = redis.createClient({
+    socket: {
+        port: Number(process.env.REDIS_PORT),
+        host: process.env.REDIS_HOST
+    },
+    password: process.env.REDIS_KEY
 });
+redisClient.connect()
+    .then(() => {
+        const credentialsRepo = new CredentialsRepo(redisClient, { scope: 'xxx' });
+        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,
+                    useFetch: true,
+                    credentialsRepo
+                })
+            }
+        );
+
+        // const kubunClass = '000'; // すべて
+        // const kubunClass = '050'; // 特別席区分
+        const kubunClass = '045'; // 販売区分
+        service.kubunName({
+            theaterCode: '120',
+            kubunClass
+        }).then((result) => {
+            fs.writeFileSync(`${__dirname}/output/kubunName-${kubunClass}.json`, JSON.stringify(result, null, '    '));
+            // console.log(result);
+            console.log('result saved.');
+        }).catch((err) => {
+            console.error(err);
+        });
+    });

package/lib/auth/credentials.d.ts

@@ -8,6 +8,7 @@ export interface ICredentials {
     access_token?: string;
     /**
      * 期限UNIXタイムスタンプ
+     * @example 2024-11-20 08:28:47
      */
     expired_at?: string;
 }

package/lib/auth/refreshTokenClient.d.ts

@@ -1,9 +1,14 @@
 import { IRequestOptions } from '../transporters';
 import { ICredentials } from './credentials';
+import { AbstractCredentialsRepo } from './repo/credentials';
 export interface IOptions {
     endpoint: string;
     refreshToken?: string;
     useFetch: boolean;
+    /**
+     * カスタム認証情報リポジトリ
+     */
+    credentialsRepo?: AbstractCredentialsRepo;
 }
 export { IRequestOptions };
 /**

package/lib/auth/refreshTokenClient.js

@@ -93,6 +93,13 @@ class RefreshTokenClient {
                 }
                 throw err;
             }
+            // save in remote
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            if (this.options.credentialsRepo !== undefined) {
+                debug('saving in repo...', this.credentials);
+                yield this.options.credentialsRepo.save(this.credentials);
+            }
             return this.credentials;
         });
     }
@@ -119,6 +126,19 @@ class RefreshTokenClient {
      */
     getAccessToken() {
         return __awaiter(this, void 0, void 0, function* () {
+            // find from remote
+            // localに存在せず、remoteに存在すれば採用
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            if (typeof this.credentials.access_token !== 'string') {
+                if (this.options.credentialsRepo !== undefined) {
+                    const credentialsFromRepo = yield this.options.credentialsRepo.find();
+                    debug('credentials in repo found,', credentialsFromRepo);
+                    if (typeof (credentialsFromRepo === null || credentialsFromRepo === void 0 ? void 0 : credentialsFromRepo.access_token) === 'string') {
+                        this.credentials = credentialsFromRepo;
+                    }
+                }
+            }
             const expiredAt = this.credentials.expired_at;
             const spareTimeInMilliseconds = RefreshTokenClient.DEFAULT_SPARE_TIME_IN_MILLISECONDS;
             let isTokenExpired = true;

package/lib/auth/repo/credentials.d.ts

@@ -0,0 +1,10 @@
+import type { ICredentials } from '../credentials';
+export type ISaveParams = ICredentials;
+export type IFindResult = ICredentials | undefined;
+/**
+ * 抽象認証情報リポジトリ
+ */
+export declare abstract class AbstractCredentialsRepo {
+    abstract save(params: ISaveParams): Promise<void>;
+    abstract find(): Promise<IFindResult>;
+}

package/lib/auth/repo/credentials.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractCredentialsRepo = void 0;
+/**
+ * 抽象認証情報リポジトリ
+ */
+class AbstractCredentialsRepo {
+}
+exports.AbstractCredentialsRepo = AbstractCredentialsRepo;

package/lib/index.d.ts

@@ -3,6 +3,7 @@
  */
 import * as factory from './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';
@@ -13,6 +14,9 @@ export declare namespace auth {
      */
     class RefreshToken extends RefreshTokenClient {
     }
+    namespace repo {
+        export import credentials = CredentialsRepo;
+    }
 }
 export declare namespace service {
     /**

package/lib/index.js

@@ -7,6 +7,7 @@ exports.service = exports.auth = exports.factory = exports.COAServiceError = voi
 const factory = require("./factory");
 exports.factory = factory;
 const refreshTokenClient_1 = require("./auth/refreshTokenClient");
+const CredentialsRepo = require("./auth/repo/credentials");
 const master_1 = require("./service/master");
 const reserve_1 = require("./service/reserve");
 const coaServiceError_1 = require("./transporter/coaServiceError");
@@ -19,6 +20,10 @@ var 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 || (exports.auth = {}));
 var service;
 (function (service) {

package/package.json

@@ -30,6 +30,7 @@
     "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",
@@ -76,5 +77,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "9.5.0"
+  "version": "9.6.0"
 }