@chevre/domain 23.2.0-alpha.43 → 23.2.0-alpha.45

package/example/src/chevre/confirmationNumber/testRandomness.ts

@@ -0,0 +1,49 @@
+// tslint:disable:object-literal-key-quotes no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function testGeneration() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance({
+        connection: mongoose.connection
+    });
+
+    const ts = new Date(); // 同一ミリ秒固定
+    const results: Record<string, string>[] = [];
+
+    console.log(`--- 同一ミリ秒(${ts})内での連続生成テスト ---`);
+
+    // tslint:disable-next-line:no-magic-numbers
+    for (let i = 0; i < 100; i += 1) {
+        // 同一ミリ秒内でシーケンス(00-99)だけが変わる状況を再現
+        const confirmationNumber = await confirmationNumberRepo.publish({
+            orderDate: ts
+
+        });
+
+        // 復号して元のデータに戻るかチェック
+        const decoded = await confirmationNumberRepo.decrypt(confirmationNumber);
+        const decodedShouldBe = `${i.toString()
+            // tslint:disable-next-line:no-magic-numbers
+            .padStart(4, '0')}`;
+        const isSuccess = decoded === decodedShouldBe;
+
+        results.push({
+            timestamp: ts.valueOf()
+                .toString(),
+            'シーケンス': i.toString(),
+            '生成された番号': confirmationNumber,
+            // tslint:disable-next-line:no-magic-numbers
+            'ソルト': confirmationNumber[0],
+            '復号結果': decoded,
+            '復号結果(should be)': decodedShouldBe,
+            '復号確認': isSuccess ? '✅OK' : '❌NG'
+        });
+    }
+
+    console.table(results);
+}
+
+testGeneration();

package/example/src/chevre/settings/addSettings.ts

@@ -3,42 +3,47 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
 
-const { INFORM_TASK_AGG_URL } = process.env;
-if (typeof INFORM_TASK_AGG_URL !== 'string') {
-    throw new Error('INFORM_TASK_AGG_URL required');
-}
+const { FPE_SECRET } = process.env;
 
 async function main() {
+    if (typeof FPE_SECRET !== 'string') {
+        throw new Error('FPE_SECRET required');
+    }
+
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
-    // const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
-    // update
-    await settingRepo.updateByProject(
-        { project: { id: { $eq: '*' } } },
-        {
-            onTaskStatusChanged: {
-                informTask: [{
-                    recipient: {
-                        name: 'Aggregation Service',
-                        url: INFORM_TASK_AGG_URL
-                    }
-                }],
-                informTaskNames: [
-                    chevre.factory.taskName.Pay,
-                    chevre.factory.taskName.InvalidatePaymentUrl,
-                    chevre.factory.taskName.Refund,
-                    chevre.factory.taskName.VoidPayment
-                    // chevre.factory.taskName.ConfirmReserveTransaction
-                ],
-                informTaskStatuses: [
-                    chevre.factory.taskStatus.Aborted
-                    // chevre.factory.taskStatus.Running
-                ]
+
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['orderNumber', 'transactionNumber']);
+    console.log(setting);
+
+    if (typeof setting?.orderNumber?.version !== 'string') {
+        console.log('updating orderNumber...');
+        await settingRepo.updateByProject(
+            { project: { id: { $eq: '*' } } },
+            {
+                orderNumber: {
+                    fpeSecret: FPE_SECRET,
+                    version: 'A'
+                }
+            }
+        );
+        console.log('orderNumber updated.');
+    }
+
+    if (typeof setting?.transactionNumber?.version !== 'string') {
+        console.log('updating orderNumber...');
+        await settingRepo.updateByProject(
+            { project: { id: { $eq: '*' } } },
+            {
+                transactionNumber: {
+                    fpeSecret: FPE_SECRET,
+                    version: '1'
+                }
             }
-        }
-    );
-    console.log('updated.');
+        );
+        console.log('transactionNumber updated.');
+    }
 }
 
 main()

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

@@ -16,4 +16,5 @@ export declare class ConfirmationNumberRepo {
     publish(params: {
         orderDate: Date;
     }): Promise<string>;
+    decrypt(id: string): Promise<string>;
 }

package/lib/chevre/repo/confirmationNumber.js

@@ -10,12 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmationNumberRepo = void 0;
-const cdigit = require("cdigit");
+// import * as cdigit from 'cdigit';
+const crypto_1 = require("crypto");
 const moment = require("moment-timezone");
-// import { RedisClientType } from 'redis';
+const fpe2Module = require("node-fpe-v2");
+// 型定義が新しいtypescriptに適合しないので、強制的に型変更
+const fpe2 = fpe2Module;
 // tslint:disable-next-line:no-require-imports no-var-requires
-const fpe = require('node-fpe-v1');
-// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
+// const fpe = require('node-fpe-v1');
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
@@ -25,8 +27,6 @@ const TIMEZONE = 'Asia/Tokyo';
  */
 class ConfirmationNumberRepo {
     constructor(params) {
-        // const { connection } = params;
-        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     static alignDigits(params) {
@@ -37,32 +37,32 @@ class ConfirmationNumberRepo {
         }
         return aligndNumber;
     }
-    // private static createKey(params: {
-    //     orderDate: Date;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s',
-    //         ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW,
-    //         moment(params.orderDate)
-    //             .tz(TIMEZONE)
-    //             .format('YYMM')
-    //     );
-    // }
     static createDataFeedIdentifier(params) {
         return moment(params.orderDate)
             .tz(TIMEZONE)
             .format('YYMM');
     }
+    // private static count2confirmationNumberUsingFPE1(params: { count: number }): string {
+    //     // 桁数調整
+    //     let confirmationNumber: string = ConfirmationNumberRepo.alignDigits(params.count);
+    //     // checkdigit
+    //     const cd = cdigit.luhn.compute(confirmationNumber);
+    //     // debug('check digit:', cd);
+    //     confirmationNumber = fpe({ password: cd })
+    //         .encrypt(confirmationNumber);
+    //     confirmationNumber = `${cd}${confirmationNumber}`;
+    //     return confirmationNumber;
+    // }
+    // reimplement using fpe2(2026-02-02~)
     static count2confirmationNumber(params) {
         // 桁数調整
-        let confirmationNumber = ConfirmationNumberRepo.alignDigits(params.count);
-        // checkdigit
-        const cd = cdigit.luhn.compute(confirmationNumber);
-        // debug('check digit:', cd);
-        confirmationNumber = fpe({ password: cd })
-            .encrypt(confirmationNumber);
-        confirmationNumber = `${cd}${confirmationNumber}`;
-        return confirmationNumber;
+        const rawBody = ConfirmationNumberRepo.alignDigits(params.count);
+        // tslint:disable-next-line:no-magic-numbers
+        const saltDigit = (0, crypto_1.randomInt)(0, 10);
+        const saltStr = saltDigit.toString();
+        const cipher = fpe2({ secret: `${saltStr}` });
+        const encryptedBody = cipher.encrypt(rawBody);
+        return `${saltStr}${encryptedBody}`;
     }
     /**
      * 発行する
@@ -87,5 +87,12 @@ class ConfirmationNumberRepo {
             return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
         });
     }
+    // tslint:disable-next-line:prefer-function-over-method
+    decrypt(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cipher = fpe2({ secret: id[0] });
+            return cipher.decrypt(id.slice(1));
+        });
+    }
 }
 exports.ConfirmationNumberRepo = ConfirmationNumberRepo;

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

@@ -22,7 +22,7 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter' | 'orderNumber' | 'transactionNumber'>): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
+            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter, orderNumber, transactionNumber } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined), (orderNumber !== undefined) ? { orderNumber } : undefined), (transactionNumber !== undefined) ? { transactionNumber } : undefined)
             })
                 .exec();
         });

package/package.json

@@ -44,7 +44,7 @@
     "@types/lodash.difference": "^4.5.6",
     "@types/mocha": "10.0.7",
     "@types/moment-timezone": "^0.5.30",
-    "@types/node": "18.19.2",
+    "@types/node": "22.19.7",
     "@types/power-assert": "^1.5.3",
     "@types/pug": "^2.0.4",
     "@types/sinon": "^4.3.3",
@@ -78,7 +78,7 @@
   },
   "engines": {
     "node": ">=18.0.0",
-    "npm": ">=6.0.0"
+    "npm": ">=10.0.0"
   },
   "keywords": [],
   "license": "UNLICENSED",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.43"
+  "version": "23.2.0-alpha.45"
 }