@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/repo/transactionNumber.js

@@ -1,13 +1,4 @@
 "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.TransactionNumberRepo = void 0;
 const moment = require("moment-timezone");
@@ -20,6 +11,8 @@ const transactionNumberCounter_1 = require("./transactionNumberCounter");
  * 取引番号リポジトリ
  */
 class TransactionNumberRepo {
+    counterRepo;
+    settingModel;
     constructor(params) {
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
         this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
@@ -27,80 +20,74 @@ class TransactionNumberRepo {
     /**
      * タイムスタンプから発行する
      */
-    publishByTimestamp(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version, validFrom } = yield this.findSetting();
-            const timestamp = moment(params.startDate)
-                .valueOf()
-                .toString();
-            let dataFeedExpires;
-            const dataFeedIdentifier = timestamp;
-            let incrReply;
-            dataFeedExpires = moment(params.startDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                .toDate();
-            incrReply = yield this.counterRepo.incrementByMongo({
-                identifier: dataFeedIdentifier,
-                includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.transactionNumber },
-                expires: dataFeedExpires
-            });
-            let transactionNumber;
-            const useVersioning = validFrom instanceof Date && moment(validFrom)
-                .isSameOrBefore(params.startDate);
-            if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
-                const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
-                transactionNumber = transactionFactory.generate(timestamp, incrReply);
-            }
-            else {
-                // discontinue version0(2026-02-10~)
-                throw new factory.errors.NotImplemented('transactionNumber with no version discontinued');
-                // transactionNumber = `${timestamp}${incrReply}`;
-                // // checkdigit
-                // const cd = cdigit.luhn.compute(transactionNumber);
-                // transactionNumber = fpe1({ password: cd })
-                //     .encrypt(transactionNumber);
-                // transactionNumber = `${cd}${transactionNumber}`;
-            }
-            return { transactionNumber, timestamp, incrReply };
+    async publishByTimestamp(params) {
+        const { fpeSecret, version, validFrom } = await this.findSetting();
+        const timestamp = moment(params.startDate)
+            .valueOf()
+            .toString();
+        let dataFeedExpires;
+        const dataFeedIdentifier = timestamp;
+        let incrReply;
+        dataFeedExpires = moment(params.startDate)
+            .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+            .toDate();
+        incrReply = await this.counterRepo.incrementByMongo({
+            identifier: dataFeedIdentifier,
+            includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.transactionNumber },
+            expires: dataFeedExpires
         });
+        let transactionNumber;
+        const useVersioning = validFrom instanceof Date && moment(validFrom)
+            .isSameOrBefore(params.startDate);
+        if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
+            const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+            transactionNumber = transactionFactory.generate(timestamp, incrReply);
+        }
+        else {
+            // discontinue version0(2026-02-10~)
+            throw new factory.errors.NotImplemented('transactionNumber with no version discontinued');
+            // transactionNumber = `${timestamp}${incrReply}`;
+            // // checkdigit
+            // const cd = cdigit.luhn.compute(transactionNumber);
+            // transactionNumber = fpe1({ password: cd })
+            //     .encrypt(transactionNumber);
+            // transactionNumber = `${cd}${transactionNumber}`;
+        }
+        return { transactionNumber, timestamp, incrReply };
     }
-    decrypt(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version } = yield this.findSetting();
-            if (typeof fpeSecret === 'string' && typeof version === 'string') {
-                const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
-                return transactionFactory.decrypt(id);
-            }
-            else {
-                throw new factory.errors.NotImplemented('no version not implemented');
-            }
-        });
+    async decrypt(id) {
+        const { fpeSecret, version } = await this.findSetting();
+        if (typeof fpeSecret === 'string' && typeof version === 'string') {
+            const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+            return transactionFactory.decrypt(id);
+        }
+        else {
+            throw new factory.errors.NotImplemented('no version not implemented');
+        }
     }
-    findSetting() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filterQuery = { 'project.id': { $eq: '*' } };
-            const projection = {
-                _id: 0,
-                transactionNumber: 1
-            };
-            const setting = yield this.settingModel.findOne(filterQuery, projection)
-                .lean()
-                .exec();
-            if (setting === null || setting.transactionNumber === undefined) {
-                return {};
-            }
-            const { fpeSecret, version, validFrom } = setting.transactionNumber;
-            if (typeof fpeSecret !== 'string' || fpeSecret === '') {
-                throw new factory.errors.NotFound('setting.transactionNumber.secret');
-            }
-            if (typeof version !== 'string' || version === '') {
-                throw new factory.errors.NotFound('setting.transactionNumber.version');
-            }
-            if (!(validFrom instanceof Date)) {
-                throw new factory.errors.NotFound('setting.transactionNumber.validFrom must be Date');
-            }
-            return { fpeSecret, version, validFrom };
-        });
+    async findSetting() {
+        const filterQuery = { 'project.id': { $eq: '*' } };
+        const projection = {
+            _id: 0,
+            transactionNumber: 1
+        };
+        const setting = await this.settingModel.findOne(filterQuery, projection)
+            .lean()
+            .exec();
+        if (setting === null || setting.transactionNumber === undefined) {
+            return {};
+        }
+        const { fpeSecret, version, validFrom } = setting.transactionNumber;
+        if (typeof fpeSecret !== 'string' || fpeSecret === '') {
+            throw new factory.errors.NotFound('setting.transactionNumber.secret');
+        }
+        if (typeof version !== 'string' || version === '') {
+            throw new factory.errors.NotFound('setting.transactionNumber.version');
+        }
+        if (!(validFrom instanceof Date)) {
+            throw new factory.errors.NotFound('setting.transactionNumber.validFrom must be Date');
+        }
+        return { fpeSecret, version, validFrom };
     }
 }
 exports.TransactionNumberRepo = TransactionNumberRepo;

package/lib/chevre/repo/transactionNumberCounter.js

@@ -1,13 +1,4 @@
 "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.TransactionNumberCounterRepo = void 0;
 // import { RedisClientType } from 'redis';
@@ -19,6 +10,8 @@ const MAX_RETRY_INCREMENT = 1;
  * 取引番号カウンターリポジトリ
  */
 class TransactionNumberCounterRepo {
+    // private readonly redisClient: RedisClientType;
+    transactionNumberModel;
     constructor(params) {
         const { connection } = params;
         // this.redisClient = redisClient;
@@ -55,79 +48,76 @@ class TransactionNumberCounterRepo {
     //     }
     //     return incrReply;
     // }
-    incrementByMongo(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const now = new Date();
-            const dataFeedExpires = params.expires;
-            const dataFeedIdentifier = params.identifier;
-            const dataFeed = {
-                typeOf: 'DataFeed',
-                includedInDataCatalog: {
-                    identifier: params.includedInDataCatalog.identifier,
-                    typeOf: 'DataCatalog'
-                },
-                dateCreated: now,
-                expires: dataFeedExpires,
-                identifier: dataFeedIdentifier,
-                interactionStatistic: {
-                    typeOf: 'InteractionCounter',
-                    userInteractionCount: 0
-                },
-                project: { id: '*', typeOf: factory.organizationType.Project }
-            };
-            const { typeOf, includedInDataCatalog, dateCreated, expires, identifier, project, interactionStatistic } = dataFeed;
-            let doc;
-            let retryCount = 0;
-            while (retryCount <= MAX_RETRY_INCREMENT) {
-                try {
-                    doc = yield this.transactionNumberModel.findOneAndUpdate({
-                        'project.id': { $eq: dataFeed.project.id },
-                        'includedInDataCatalog.identifier': { $eq: dataFeed.includedInDataCatalog.identifier },
-                        identifier: { $eq: dataFeed.identifier }
-                    }, {
-                        $set: {
-                            dateModified: now
-                        },
-                        $setOnInsert: {
-                            typeOf, includedInDataCatalog, dateCreated, expires, identifier, project,
-                            'interactionStatistic.typeOf': interactionStatistic.typeOf
-                        },
-                        $inc: {
-                            'interactionStatistic.userInteractionCount': 1
-                        }
-                    }, {
-                        upsert: true,
-                        new: true,
-                        projection: { _id: 0, interactionStatistic: 1 }
-                    })
-                        .lean()
-                        .exec();
-                    break;
-                }
-                catch (error) {
-                    if (yield (0, errorHandler_1.isMongoError)(error)) {
-                        if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                            // すでに存在するので、リトライすればincrementに成功するはず
-                            retryCount += 1;
-                            continue;
-                        }
+    async incrementByMongo(params) {
+        const now = new Date();
+        const dataFeedExpires = params.expires;
+        const dataFeedIdentifier = params.identifier;
+        const dataFeed = {
+            typeOf: 'DataFeed',
+            includedInDataCatalog: {
+                identifier: params.includedInDataCatalog.identifier,
+                typeOf: 'DataCatalog'
+            },
+            dateCreated: now,
+            expires: dataFeedExpires,
+            identifier: dataFeedIdentifier,
+            interactionStatistic: {
+                typeOf: 'InteractionCounter',
+                userInteractionCount: 0
+            },
+            project: { id: '*', typeOf: factory.organizationType.Project }
+        };
+        const { typeOf, includedInDataCatalog, dateCreated, expires, identifier, project, interactionStatistic } = dataFeed;
+        let doc;
+        let retryCount = 0;
+        while (retryCount <= MAX_RETRY_INCREMENT) {
+            try {
+                doc = await this.transactionNumberModel.findOneAndUpdate({
+                    'project.id': { $eq: dataFeed.project.id },
+                    'includedInDataCatalog.identifier': { $eq: dataFeed.includedInDataCatalog.identifier },
+                    identifier: { $eq: dataFeed.identifier }
+                }, {
+                    $set: {
+                        dateModified: now
+                    },
+                    $setOnInsert: {
+                        typeOf, includedInDataCatalog, dateCreated, expires, identifier, project,
+                        'interactionStatistic.typeOf': interactionStatistic.typeOf
+                    },
+                    $inc: {
+                        'interactionStatistic.userInteractionCount': 1
                     }
-                    throw error;
-                }
-            }
-            if (doc === undefined) {
-                throw new factory.errors.NotFound('DataFeed');
+                }, {
+                    upsert: true,
+                    new: true,
+                    projection: { _id: 0, interactionStatistic: 1 }
+                })
+                    .lean()
+                    .exec();
+                break;
             }
-            const incrReply = (_a = doc.interactionStatistic) === null || _a === void 0 ? void 0 : _a.userInteractionCount;
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore if */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
+            catch (error) {
+                if (await (0, errorHandler_1.isMongoError)(error)) {
+                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                        // すでに存在するので、リトライすればincrementに成功するはず
+                        retryCount += 1;
+                        continue;
+                    }
+                }
+                throw error;
             }
-            return incrReply;
-        });
+        }
+        if (doc === undefined) {
+            throw new factory.errors.NotFound('DataFeed');
+        }
+        const incrReply = doc.interactionStatistic?.userInteractionCount;
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore if */
+        if (typeof incrReply !== 'number') {
+            // 基本的にありえないフロー
+            throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
+        }
+        return incrReply;
     }
 }
 exports.TransactionNumberCounterRepo = TransactionNumberCounterRepo;

package/lib/chevre/repo/transactionProcess.js

@@ -1,13 +1,4 @@
 "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.TransactionProcessRepo = void 0;
 const createDebug = require("debug");
@@ -20,6 +11,8 @@ const DEFAULT_LOCK_EXPIRES = 120;
  * 取引プロセスリポジトリ
  */
 class TransactionProcessRepo {
+    concurrentLockRepo;
+    options;
     // private readonly redisClient: RedisClientType;
     constructor(redisClient, options) {
         this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
@@ -29,48 +22,44 @@ class TransactionProcessRepo {
     static CREATE_REDIS_KEY(params) {
         return `chvrapi:lockTxn:${params.id}`;
     }
-    lock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
-            const ttl = (typeof this.options.lockExpiresInSeconds === 'number') ? this.options.lockExpiresInSeconds : DEFAULT_LOCK_EXPIRES;
-            const expires = moment()
-                .add(ttl, 'seconds')
-                .toDate();
-            // reimplement using concurrentLockRepo(2025-05-27~)
-            try {
-                yield this.concurrentLockRepo.lock({
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    about: { identifier: key, typeOf: 'Thing' },
-                    expires,
-                    audience: { identifier: '1', typeOf: 'Audience' }
-                });
-                debug('locked,', params.id);
-            }
-            catch (error) {
-                throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
-            }
-            // const results = await this.redisClient.multi()
-            //     .setNX(key, '1')
-            //     .expire(key, ttl)
-            //     .exec();
-            // debug('locked,', params.id, results);
-            // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-            //     return;
-            // } else {
-            //     throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
-            // }
-        });
-    }
-    unlock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
-            // reimplement using concurrentLockRepo(2025-05-27~)
-            yield this.concurrentLockRepo.unlock({
+    async lock(params) {
+        const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
+        const ttl = (typeof this.options.lockExpiresInSeconds === 'number') ? this.options.lockExpiresInSeconds : DEFAULT_LOCK_EXPIRES;
+        const expires = moment()
+            .add(ttl, 'seconds')
+            .toDate();
+        // reimplement using concurrentLockRepo(2025-05-27~)
+        try {
+            await this.concurrentLockRepo.lock({
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 about: { identifier: key, typeOf: 'Thing' },
+                expires,
                 audience: { identifier: '1', typeOf: 'Audience' }
             });
-            // await this.redisClient.del([key]);
+            debug('locked,', params.id);
+        }
+        catch (error) {
+            throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
+        }
+        // const results = await this.redisClient.multi()
+        //     .setNX(key, '1')
+        //     .expire(key, ttl)
+        //     .exec();
+        // debug('locked,', params.id, results);
+        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+        //     return;
+        // } else {
+        //     throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
+        // }
+    }
+    async unlock(params) {
+        const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
+        // reimplement using concurrentLockRepo(2025-05-27~)
+        await this.concurrentLockRepo.unlock({
+            about: { identifier: key, typeOf: 'Thing' },
+            audience: { identifier: '1', typeOf: 'Audience' }
         });
+        // await this.redisClient.del([key]);
     }
 }
 exports.TransactionProcessRepo = TransactionProcessRepo;