vona-module-a-redlock 5.0.8 → 5.0.10

package/dist/.metadata/index.d.ts

@@ -0,0 +1,54 @@
+import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
+import type { config } from '../config/config.ts';
+/** service: end */
+/** service: begin */
+/** service: end */
+/** service: begin */
+import type { ServiceRedlock } from '../service/redlock.ts';
+/** config: end */
+/** scope: begin */
+import { BeanScopeBase } from 'vona';
+/** service: end */
+/** config: begin */
+import 'vona';
+import 'vona';
+import 'vona';
+export * from '../config/config.ts';
+declare module 'vona-module-a-web' {
+    interface IServiceRecord {
+        'a-redlock:redlock': never;
+    }
+}
+declare module 'vona-module-a-redlock' {
+    interface ServiceRedlock {
+    }
+}
+export interface IModuleService {
+    redlock: ServiceRedlock;
+}
+declare module 'vona' {
+    interface IBeanRecordGeneral {
+        'a-redlock.service.redlock': ServiceRedlock;
+    }
+}
+/** service: begin */
+export * from '../service/redlock.ts';
+export declare class ScopeModuleARedlock extends BeanScopeBase {
+}
+export interface ScopeModuleARedlock {
+    util: BeanScopeUtil;
+    config: TypeModuleConfig<typeof config>;
+    service: IModuleService;
+}
+declare module 'vona' {
+    interface IBeanScopeRecord {
+        'a-redlock': ScopeModuleARedlock;
+    }
+    interface IBeanScopeContainer {
+        redlock: ScopeModuleARedlock;
+    }
+    interface IBeanScopeConfig {
+        'a-redlock': ReturnType<typeof config>;
+    }
+}
+/** scope: end */

package/dist/.metadata/index.js

@@ -0,0 +1,25 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+/** config: end */
+/** scope: begin */
+import { BeanScopeBase } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+/** service: end */
+/** config: begin */
+import 'vona';
+import 'vona';
+import 'vona';
+export * from "../config/config.js";
+/** service: begin */
+export * from "../service/redlock.js";
+let ScopeModuleARedlock = class ScopeModuleARedlock extends BeanScopeBase {
+};
+ScopeModuleARedlock = __decorate([
+    Scope()
+], ScopeModuleARedlock);
+export { ScopeModuleARedlock };
+/** scope: end */

package/dist/.metadata/this.d.ts

@@ -0,0 +1,2 @@
+export declare const __ThisModule__ = "a-redlock";
+export { ScopeModuleARedlock as ScopeModule } from './index.ts';

package/dist/.metadata/this.js

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'a-redlock';
+export { ScopeModuleARedlock as ScopeModule } from "./index.js";

package/dist/config/config.d.ts

@@ -0,0 +1,10 @@
+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;
+    };
+};

package/dist/config/config.js

@@ -0,0 +1,16 @@
+export function config(app) {
+    const lockTTL = app.meta.isLocal ? 8 : app.meta.isTest ? 60 : 30;
+    return {
+        redlock: {
+            clients: ['redlock'],
+            lockTTL: lockTTL * 1000,
+            // https://github.com/mike-marcacci/node-redlock#configuration
+            options: {
+                driftFactor: 0.01,
+                retryCount: -1,
+                retryDelay: 200,
+                retryJitter: 100,
+            },
+        },
+    };
+}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export * from './.metadata/index.ts';
+export * from './lib/index.ts';
+export * from './types/index.ts';

package/dist/index.js

@@ -0,0 +1,3 @@
+export * from "./.metadata/index.js";
+export * from "./lib/index.js";
+export * from "./types/index.js";

package/dist/lib/beanRedlockBase.d.ts

@@ -0,0 +1,7 @@
+import type { FunctionAsync } from 'vona';
+import type { IRedlockLockIsolateOptions } from '../types/redlock.ts';
+import { BeanBase } from 'vona';
+export declare class BeanRedlockBase extends BeanBase {
+    protected __get__(prop: string): ((resource: string, fn: FunctionAsync<any>, options?: IRedlockLockIsolateOptions) => Promise<any>) | undefined;
+    private _prepareResource;
+}

package/dist/lib/beanRedlockBase.js

@@ -0,0 +1,18 @@
+import { BeanBase, SymbolModuleBelong } from 'vona';
+export class BeanRedlockBase extends BeanBase {
+    __get__(prop) {
+        if (prop === 'lock') {
+            return (resource, fn, options) => {
+                return this.$scope.redlock.service.redlock.lock(this._prepareResource(resource), fn, options);
+            };
+        }
+        else if (prop === 'lockIsolate') {
+            return (resource, fn, options) => {
+                return this.$scope.redlock.service.redlock.lockIsolate(this._prepareResource(resource), fn, options);
+            };
+        }
+    }
+    _prepareResource(resource) {
+        return `${this[SymbolModuleBelong]}.${resource}`;
+    }
+}

package/dist/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './beanRedlockBase.ts';

package/dist/lib/index.js

@@ -0,0 +1 @@
+export * from "./beanRedlockBase.js";

package/dist/service/redlock.d.ts

@@ -0,0 +1,12 @@
+import type { Settings } from '@sesamecare-oss/redlock';
+import type { FunctionAsync } from 'vona';
+import type { IRedlockLockIsolateOptions, IRedlockLockOptions } from '../types/redlock.ts';
+import { Redlock } from '@sesamecare-oss/redlock';
+import { BeanBase } from 'vona';
+export declare class ServiceRedlock extends BeanBase {
+    private _redlockDefault;
+    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;
+}

package/dist/service/redlock.js

@@ -0,0 +1,76 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Redlock } from '@sesamecare-oss/redlock';
+import { BeanBase, instanceDesp } from 'vona';
+import { Service } from 'vona-module-a-web';
+let ServiceRedlock = class ServiceRedlock extends BeanBase {
+    _redlockDefault;
+    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;
+        // resource
+        const _lockResource = `redlock_${this.app.name}:${instanceDesp(instanceName)}:${resource}`;
+        // lock
+        let _lock = await redlock.acquire([_lockResource], lockTTL);
+        // timer
+        let _lockTimer = null;
+        const _lockDone = () => {
+            if (_lockTimer) {
+                clearInterval(_lockTimer);
+                _lockTimer = null;
+            }
+        };
+        _lockTimer = setInterval(() => {
+            _lock
+                .extend(lockTTL)
+                .then(lock => {
+                _lock = lock;
+            })
+                .catch(_err => {
+                // need not logger error
+                // this.$logger.error(err);
+                _lockDone();
+            });
+        }, lockTTL / 2);
+        try {
+            return await fn();
+        }
+        finally {
+            _lockDone();
+            // not await, and throw error
+            _lock.release().catch(_err => {
+                // do nothing
+            });
+        }
+    }
+    async lockIsolate(resource, fn, options) {
+        return await this.lock(resource, async () => {
+            return await this.bean.database.newDbIsolate(fn, options);
+        }, options);
+    }
+    get redlockDefault() {
+        if (!this._redlockDefault) {
+            this._redlockDefault = this.create(this.scope.config.redlock.options);
+        }
+        return this._redlockDefault;
+    }
+    create(options) {
+        // clients
+        const clients = [];
+        for (const clientName of this.scope.config.redlock.clients) {
+            const client = this.app.bean.redis.get(clientName);
+            clients.push(client);
+        }
+        // create
+        return new Redlock(clients, options);
+    }
+};
+ServiceRedlock = __decorate([
+    Service()
+], ServiceRedlock);
+export { ServiceRedlock };

package/dist/types/index.d.ts

@@ -0,0 +1 @@
+export * from './redlock.ts';

package/dist/types/index.js

@@ -0,0 +1 @@
+export * from "./redlock.js";

package/dist/types/redlock.d.ts

@@ -0,0 +1,9 @@
+import type { Redlock } from '@sesamecare-oss/redlock';
+import type { IDbInfo } from 'vona-module-a-database';
+export interface IRedlockLockOptions {
+    instanceName?: string | undefined | null;
+    redlock?: Redlock;
+    lockTTL?: number;
+}
+export interface IRedlockLockIsolateOptions extends IRedlockLockOptions, IDbInfo {
+}

package/dist/types/redlock.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-redlock",
   "type": "module",
-  "version": "5.0.8",
+  "version": "5.0.10",
   "title": "a-redlock",
   "vonaModule": {
     "dependencies": {},
@@ -39,8 +39,12 @@
   "dependencies": {
     "@sesamecare-oss/redlock": "^1.4.0"
   },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "scripts": {
-    "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc"
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && tsc -p tsconfig.build.json"
   }
 }