vona-module-a-redlock 5.0.26 → 5.0.27

package/dist/config/config.d.ts

@@ -1,10 +1,3 @@
-import type * as Redlock from '@sesamecare-oss/redlock';
 import type { VonaApplication } from 'vona';
-import type { IRedisClientRecord } from 'vona-module-a-redis';
-export declare function config(app: VonaApplication): {
-    redlock: {
-        clients: (keyof IRedisClientRecord)[];
-        lockTTL: number;
-        options: Redlock.Settings;
-    };
-};
+import type { ConfigRedlock } from '../types/redlock.ts';
+export declare function config(app: VonaApplication): ConfigRedlock;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BeanInfo, BeanBase, instanceDesp, BeanScopeBase, SymbolModuleBelong } from 'vona';
+import { BeanInfo, BeanBase, instanceDesp, deepExtend, BeanScopeBase, SymbolModuleBelong } from 'vona';
 import { Redlock } from '@sesamecare-oss/redlock';
 import { Service, Scope } from 'vona-module-a-bean';
 import { getRedisClientKeyPrefix } from 'vona-module-a-redis';
@@ -14,7 +14,7 @@ let ServiceRedlock = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   async lock(resource, fn, options) {
     const instanceName = options?.instanceName === undefined ? this.ctx?.instanceName : options?.instanceName;
     const redlock = options?.redlock ?? this.redlockDefault;
-    const lockTTL = options?.lockTTL ?? this.scope.config.redlock.lockTTL;
+    const lockTTL = options?.lockTTL ?? this.scope.config.lockTTL;
     // resource
     const _lockResource = `${getRedisClientKeyPrefix('redlock', this.app)}${instanceDesp(instanceName)}:${resource}`;
     // lock
@@ -54,28 +54,32 @@ let ServiceRedlock = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   }
   get redlockDefault() {
     if (!this._redlockDefault) {
-      this._redlockDefault = this.create(this.scope.config.redlock.options);
+      this._redlockDefault = this._create(this.scope.config.base);
     }
     return this._redlockDefault;
   }
   create(options) {
+    const options2 = options ? deepExtend({}, this.scope.config.base, options) : this.scope.config.base;
+    return this._create(options2);
+  }
+  _create(options) {
     // clients
     const clients = [];
-    for (const clientName of this.scope.config.redlock.clients) {
+    for (const clientName of options.clients) {
       const client = this.app.bean.redis.get(clientName);
       clients.push(client);
     }
     // create
-    return new Redlock(clients, options);
+    return new Redlock(clients, options.options);
   }
 }) || _class$1) || _class$1);
 
 function config(app) {
   const lockTTL = app.meta.isDev ? 8 : app.meta.isTest ? 60 : 30;
-  return {
-    redlock: {
+  const redlock = {
+    lockTTL: lockTTL * 1000,
+    base: {
       clients: ['redlock'],
-      lockTTL: lockTTL * 1000,
       // https://github.com/mike-marcacci/node-redlock#configuration
       options: {
         driftFactor: 0.01,
@@ -85,6 +89,7 @@ function config(app) {
       }
     }
   };
+  return redlock;
 }
 
 var _dec, _dec2, _class;

package/dist/service/redlock.d.ts

@@ -1,6 +1,5 @@
-import type { Settings } from '@sesamecare-oss/redlock';
-import type { FunctionAsync } from 'vona';
-import type { IRedlockLockIsolateOptions, IRedlockLockOptions } from '../types/redlock.ts';
+import type { FunctionAsync, PowerPartial } from 'vona';
+import type { IRedlockClientOptions, IRedlockLockIsolateOptions, IRedlockLockOptions } from '../types/redlock.ts';
 import { Redlock } from '@sesamecare-oss/redlock';
 import { BeanBase } from 'vona';
 export declare class ServiceRedlock extends BeanBase {
@@ -8,5 +7,6 @@ export declare class ServiceRedlock extends BeanBase {
     lock<RESULT>(resource: string, fn: FunctionAsync<RESULT>, options?: IRedlockLockOptions): Promise<RESULT>;
     lockIsolate<RESULT>(resource: string, fn: FunctionAsync<RESULT>, options?: IRedlockLockIsolateOptions): Promise<RESULT>;
     private get redlockDefault();
-    create(options: Settings): Redlock;
+    create(options?: PowerPartial<IRedlockClientOptions>): Redlock;
+    private _create;
 }

package/dist/types/redlock.d.ts

@@ -1,9 +1,18 @@
-import type { Redlock } from '@sesamecare-oss/redlock';
+import type * as Redlock from '@sesamecare-oss/redlock';
 import type { IInstanceRecord } from 'vona';
 import type { IDbInfo } from 'vona-module-a-orm';
+import type { IRedisClientRecord } from 'vona-module-a-redis';
+export interface IRedlockClientOptions {
+    clients: (keyof IRedisClientRecord)[];
+    options: Redlock.Settings;
+}
+export interface ConfigRedlock {
+    lockTTL: number;
+    base: IRedlockClientOptions;
+}
 export interface IRedlockLockOptions {
     instanceName?: keyof IInstanceRecord | undefined | null;
-    redlock?: Redlock;
+    redlock?: Redlock.Redlock;
     lockTTL?: number;
 }
 export interface IRedlockLockIsolateOptions extends IRedlockLockOptions, Partial<IDbInfo> {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-redlock",
   "type": "module",
-  "version": "5.0.26",
+  "version": "5.0.27",
   "title": "a-redlock",
   "vonaModule": {
     "dependencies": {},