@chevre/domain 26.1.0-alpha.7 → 27.0.0-alpha.0

package/lib/chevre/eventEmitter/task.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import type { Connection } from 'mongoose';
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 import { factory } from '../factory';
 interface IExecuteSettings {
     /**
@@ -45,7 +45,6 @@ interface ITaskAsNextFunctionParam {
 }
 type IAsyncActionNextFunction = (task: ITaskAsNextFunctionParam) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask) => void;
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * タスクイベントエミッター
  */

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

@@ -33,13 +33,13 @@ export declare class AdminTaskRepo {
     }): Promise<{
         count: number;
     }>;
-    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "name" | "description" | "project" | "identifier" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "project" | "name" | "identifier" | "description" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
         expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "name" | "description" | "project" | "identifier" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "project" | "name" | "identifier" | "description" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
         expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;

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

@@ -1,6 +1,5 @@
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 import { AbstractConcurrentLockRepo, ILockParams, IUnlockParams } from './concurrentLockAbstract';
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 同時実行ロックリポジトリ
  */
@@ -13,4 +12,3 @@ export declare class ConcurrentLockRepo implements AbstractConcurrentLockRepo {
     lock(params: ILockParams): Promise<void>;
     unlock(params: IUnlockParams): Promise<void>;
 }
-export {};

package/lib/chevre/repo/concurrentLock.js

@@ -18,15 +18,6 @@ class ConcurrentLockRepo {
         const key = ConcurrentLockRepo.CREATE_REDIS_KEY(params);
         const value = params.audience.identifier;
         // setNXは非推奨のため、setで再実装(2026-08-23~)
-        // const results = await this.redisClient.multi()
-        //     .setNX(key, value)
-        //     .expireAt(key, params.expires)
-        //     .exec();
-        // if (Array.isArray(results) && (results[0] === 1 || (results as any)[0] === true)) { // eslint-disable-line @typescript-eslint/no-explicit-any
-        //     return;
-        // } else {
-        //     throw new factory.errors.AlreadyInUse(params.about.identifier, []);
-        // }
         const expiresAtMs = params.expires.getTime();
         const result = await this.redisClient.set(key, value, {
             NX: true,

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

@@ -1,10 +1,9 @@
 import type { COA } from '@motionpicture/coa-service';
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 interface IOptions {
     scope: string;
     expireInSeconds: number;
 }
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 認証情報リポジトリ
  */

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

@@ -45,4 +45,8 @@ export declare class MigrateActionRepo {
         id: string;
         expires: Date;
     }): Promise<void>;
+    migrateActionRecipeExpires(params: {
+        id: string;
+        expires: Date;
+    }): Promise<void>;
 }

package/lib/chevre/repo/migrateAction.js

@@ -28,5 +28,9 @@ class MigrateActionRepo {
         await this.actionModel.updateOne({ _id: { $eq: params.id } }, { $set: { expires: params.expires } })
             .exec();
     }
+    async migrateActionRecipeExpires(params) {
+        await this.actionRecipeModel.updateOne({ _id: { $eq: params.id } }, { $set: { expires: params.expires } })
+            .exec();
+    }
 }
 exports.MigrateActionRepo = MigrateActionRepo;

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

@@ -1,5 +1,5 @@
 import { JwtPayload } from 'jsonwebtoken';
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 import { factory } from '../factory';
 import { IPassportValidator } from '../factory/transaction';
 export type IVerifiedPassport = factory.waiter.passport.IPassport & {
@@ -20,7 +20,6 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 取引許可証リポジトリ
  */

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

@@ -37,8 +37,8 @@ export declare class PriceSpecificationRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -53,8 +53,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
@@ -70,8 +70,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -86,8 +86,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -1,6 +1,5 @@
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 import { factory } from '../../factory';
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * レート制限キーインターフェース
  */
@@ -35,4 +34,3 @@ export declare class OfferRateLimitRepo {
     unlock(params: IRateLimitKey): Promise<void>;
     getHolder(ratelimitKey: IRateLimitKey): Promise<string | null>;
 }
-export {};

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

@@ -39,13 +39,13 @@ export declare class TaskRepo {
             id: string;
         };
     }): Promise<(import("mongoose").FlattenMaps<{
-        name: factory.taskName;
-        description?: string | undefined;
         project: {
             id: string;
             typeOf: factory.organizationType.Project;
         };
+        name: factory.taskName;
         identifier?: string | undefined;
+        description?: string | undefined;
         data: import("@chevre/factory/lib/chevre/task").IData;
         status: factory.taskStatus;
         runsAt: Date;

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

@@ -1,4 +1,4 @@
-import type { createClient } from 'redis';
+import type { RedisClientType } from '@redis/client';
 import { factory } from '../factory';
 interface IProcessKey {
     typeOf: factory.transactionType;
@@ -13,7 +13,6 @@ interface IProcessKey {
 interface IOptions {
     lockExpiresInSeconds: number;
 }
-type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 取引プロセスリポジトリ
  */

package/package.json

@@ -31,6 +31,7 @@
   "devDependencies": {
     "@eslint/js": "9.39.4",
     "@json2csv/plainjs": "7.0.6",
+    "@redis/client": "6.2.1",
     "@sendgrid/helpers": "8.0.0",
     "@size-limit/preset-big-lib": "12.0.0",
     "@types/debug": "4.1.13",
@@ -45,7 +46,6 @@
     "dependency-cruiser": "17.3.8",
     "eslint": "9.39.2",
     "mongoose": "8.23.0",
-    "redis": "4.7.1",
     "rimraf": "6.1.3",
     "size-limit": "12.0.0",
     "typescript": "5.9.3",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "mongoose": "^8.23.0",
-    "redis": "^4.7.1"
+    "@redis/client": "^6.2.1"
   },
   "engines": {
     "node": ">=22.0.0",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.1.0-alpha.7"
+  "version": "27.0.0-alpha.0"
 }