@chevre/domain 22.6.0-alpha.29 → 22.6.0-alpha.30

package/example/src/chevre/findInterface.ts

@@ -13,29 +13,29 @@ async function main() {
     // tslint:disable-next-line:no-null-keyword
     console.dir(findOneIdResult, { depth: null });
 
-    // const result = await interfaceRepo.findOne({ id: { $eq: '672bf38b5d6d3f5642d658fc' } });
-    // // tslint:disable-next-line:no-null-keyword
-    // console.dir(result, { depth: null });
+    const result = await interfaceRepo.findOne({});
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
 
     if (findOneIdResult === null) {
         if (typeof COA_ENDPOINT === 'string' && typeof COA_REFRESH_TOKEN === 'string') {
-            await interfaceRepo.saveOne({
-                project: { id: 'xxx', typeOf: chevre.factory.organizationType.Project },
-                availableChannel: {
-                    typeOf: 'ServiceChannel',
-                    credentials: {
-                        endpoint: COA_ENDPOINT,
-                        refreshToken: COA_REFRESH_TOKEN,
-                        useFetch: true
-                    },
-                    importEventsInWeeks: 5,
-                    excludeMovieTheaters: [
-                        '007'
-                    ]
-                },
-                typeOf: 'WebAPI'
-            });
-            console.log('saved');
+            // await interfaceRepo.saveOne({
+            //     project: { id: 'xxx', typeOf: chevre.factory.organizationType.Project },
+            //     availableChannel: {
+            //         typeOf: 'ServiceChannel',
+            //         credentials: {
+            //             endpoint: COA_ENDPOINT,
+            //             refreshToken: COA_REFRESH_TOKEN,
+            //             useFetch: true
+            //         },
+            //         importEventsInWeeks: 5,
+            //         excludeMovieTheaters: [
+            //             '007'
+            //         ]
+            //     },
+            //     typeOf: 'WebAPI'
+            // });
+            // console.log('saved');
         }
     }
 }

package/example/src/chevre/retryTasks.ts

@@ -12,19 +12,21 @@ async function main() {
     const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
     const result = await taskRepo.taskModel.updateMany(
         {
+            // _id: { $eq: '673b5f8f5735a0a2dc953cfc' },
+            'project.id': { $eq: project.id },
             status: { $eq: chevre.factory.taskStatus.Aborted },
             lastTriedAt: {
                 $gt: moment()
-                    .add(-1, 'day')
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-2, 'days')
                     .toDate()
             },
-            name: { $eq: chevre.factory.taskName.TriggerWebhook },
-            'project.id': { $eq: project.id }
+            name: { $eq: chevre.factory.taskName.VoidPayment }
         },
         {
             $set: {
                 status: chevre.factory.taskStatus.Ready,
-                remainingNumberOfTries: 20
+                remainingNumberOfTries: 3
             }
         }
     )

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

@@ -0,0 +1,19 @@
+import type * as COA from '@motionpicture/coa-service';
+import type { RedisClientType } from 'redis';
+interface IOptions {
+    scope: string;
+    expireInSeconds: number;
+}
+/**
+ * 認証情報リポジトリ
+ */
+export declare class CredentialsRepo implements COA.auth.repo.credentials.AbstractCredentialsRepo {
+    static KEY_PREFIX: string;
+    private readonly redisClient;
+    private readonly options;
+    constructor(redisClient: RedisClientType, options: IOptions);
+    save(credentials: COA.auth.repo.credentials.ISaveParams): Promise<void>;
+    find(): Promise<COA.auth.repo.credentials.IFindResult>;
+    private createKey;
+}
+export {};

package/lib/chevre/repo/credentials.js

@@ -0,0 +1,66 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CredentialsRepo = void 0;
+/**
+ * 認証情報リポジトリ
+ */
+class CredentialsRepo {
+    constructor(redisClient, options) {
+        this.redisClient = redisClient;
+        this.options = options;
+    }
+    save(credentials) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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();
+            yield multi.set(key, value)
+                // .expireAt(key, Number(expired_at))
+                .expire(key, this.options.expireInSeconds)
+                .exec();
+            // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+            //     return true;
+            // } else {
+            //     throw new Error('unexpected');
+            // }
+        });
+    }
+    find() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = this.createKey();
+            let credentials;
+            try {
+                const credentialsStr = yield this.redisClient.get(key);
+                if (typeof credentialsStr === 'string') {
+                    credentials = JSON.parse(credentialsStr);
+                }
+            }
+            catch (error) {
+                // tslint:disable-next-line:no-console
+                console.error('credential parse error:', error);
+            }
+            return credentials;
+        });
+    }
+    createKey() {
+        return `${CredentialsRepo.KEY_PREFIX}:${this.options.scope}`;
+    }
+}
+CredentialsRepo.KEY_PREFIX = 'credentials';
+exports.CredentialsRepo = CredentialsRepo;

package/lib/chevre/repo/interface.d.ts

@@ -16,7 +16,9 @@ export declare class InterfaceRepo {
                 $eq?: string;
             };
         };
-    }): Promise<factory.service.webAPI.IServiceWithChannel | null>;
+    }): Promise<(factory.service.webAPI.IServiceWithChannel & {
+        id: string;
+    }) | null>;
     findOneId(): Promise<(Pick<factory.service.webAPI.IServiceWithChannel, 'project'> & {
         id: string;
     }) | null>;

package/lib/chevre/repo/interface.js

@@ -36,7 +36,13 @@ class InterfaceRepo {
                 andQuery.push({ 'project.id': { $eq: projectIdEq } });
             }
             const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
-            return this.interfaceModel.findOne(filterQuery)
+            return this.interfaceModel.findOne(filterQuery, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: '$project',
+                availableChannel: '$availableChannel',
+                typeOf: '$typeOf'
+            })
                 .lean()
                 .exec();
         });

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const COA = require("@motionpicture/coa-service");
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
+const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const interface_1 = require("../../repo/interface");
 const transaction_1 = require("../../repo/transaction");
@@ -23,8 +24,9 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
+    // tslint:disable-next-line:max-func-body-length
     return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -39,7 +41,19 @@ function call(params) {
             if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
                 throw new factory.errors.NotFound('WebAPI');
             }
-            coaAuthClient = new COA.auth.RefreshToken(credentials);
+            if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
+                throw new factory.errors.NotFound('WebAPI');
+            }
+            let credentialsRepo;
+            const credentialsExpireInSeconds = (_c = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.expireInSeconds;
+            if (typeof credentialsExpireInSeconds === 'number') {
+                // set credentialsRepo(2024-11-20~)
+                credentialsRepo = new credentials_1.CredentialsRepo(redisClient, {
+                    scope: `COA:${coaAPI.id}`,
+                    expireInSeconds: credentialsExpireInSeconds
+                });
+            }
+            coaAuthClient = new COA.auth.RefreshToken(Object.assign(Object.assign({}, credentials), (credentialsRepo !== undefined) ? { credentialsRepo } : undefined));
         }
         const actionRepo = new action_1.ActionRepo(connection);
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });

package/package.json

@@ -11,9 +11,9 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.18",
+    "@chevre/factory": "4.389.0-alpha.19",
     "@cinerino/sdk": "10.16.0-alpha.9",
-    "@motionpicture/coa-service": "9.5.0",
+    "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.29"
+  "version": "22.6.0-alpha.30"
 }