@toa.io/extensions.stash 0.20.0-dev.20 → 0.20.0-dev.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.stash",
-  "version": "0.20.0-dev.20",
+  "version": "0.20.0-dev.22",
   "description": "Toa Stash",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,7 +19,7 @@
   "dependencies": {
     "ioredis": "5.3.2",
     "msgpackr": "1.9.5",
-    "redlock": "5.0.0-beta.2"
+    "redlock-temp-fix": "5.0.0-beta.2"
   },
   "scripts": {
     "prepublishOnly": "npm run transpile",
@@ -29,5 +29,5 @@
     "preset": "ts-jest",
     "testEnvironment": "node"
   },
-  "gitHead": "52c962bc17b71f3e7890ec53870f8b93fda720a0"
+  "gitHead": "7a880cc14c0e1cbde7cd8b83f1eb34b6917aea4e"
 }

package/readme.md

@@ -29,7 +29,7 @@ Values are encoded using [msgpack](https://msgpack.org).
 
 ## Distributed lock manager
 
-`async lock(id: string | string[], routine: async? () => void)`
+`async lock<T>(id: string | string[], routine: async? () => T): T`
 
 Executes `routine` once a lock is succesively acquired. Lock ID is component-scoped.
 

package/source/Aspect.test.ts

@@ -1,4 +1,4 @@
-import Redlock from 'redlock'
+import Redlock from 'redlock-temp-fix'
 import { encode } from 'msgpackr'
 import { generate } from 'randomstring'
 import { Aspect } from './Aspect'
@@ -6,7 +6,7 @@ import * as mock from './Connection.fixtures'
 import type { Connection } from './Connection'
 import type { Cluster } from 'ioredis'
 
-jest.mock('redlock')
+jest.mock('redlock-temp-fix')
 
 let aspect: Aspect
 let connection: jest.MockedObject<Connection>
@@ -81,7 +81,7 @@ describe('buffers', () => {
 })
 
 it('should create DLM', async () => {
-  expect(Redlock).toHaveBeenCalledWith([redis])
+  expect(Redlock).toHaveBeenCalledWith([redis], { retryCount: -1 })
 })
 
 it('should acquire lock', async () => {
@@ -93,6 +93,17 @@ it('should acquire lock', async () => {
   expect(redlock.using).toHaveBeenCalledWith(keys, 5000, callback)
 })
 
+it('should return result', async () => {
+  const keys = [generate(), generate()]
+  const callback = jest.fn()
+
+  redlock.using.mockImplementationOnce(async () => generate())
+
+  const result = await aspect.invoke('lock', keys, callback)
+
+  expect(result).toStrictEqual(await redlock.using.mock.results[0].value)
+})
+
 it('should handle non-array key', async () => {
   const key = generate()
   const callback = jest.fn()

package/source/Aspect.ts

@@ -1,4 +1,4 @@
-import Redlock from 'redlock'
+import Redlock from 'redlock-temp-fix'
 import { encode, decode } from 'msgpackr'
 import { Connector, type extensions } from '@toa.io/core'
 import type { Connection } from './Connection'
@@ -13,25 +13,28 @@ export class Aspect extends Connector implements extensions.Aspect {
     super()
 
     this.redis = connection.redis
-    this.redlock = new Redlock([this.redis])
+    this.redlock = new Redlock([this.redis], { retryCount: -1 })
 
     this.depends(connection)
   }
 
   public async invoke (method: 'store', key: string, value: object): Promise<void>
   public async invoke (method: 'fetch', key: string): Promise<object>
-  public async invoke (method: 'lock', key: string | string[], routine: Routine): Promise<void>
+  public async invoke<T> (method: 'lock', key: Resources, routine: Routine<T>): Promise<T>
   public async invoke (method: string, ...args: unknown[]): Promise<any>
   public async invoke (method: string, ...args: unknown[]): Promise<any> {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     if (typeof this.redis[method] === 'function') return this.redis[method](...args)
 
-    if (method === 'store') await this.store(args[0] as string, args[1] as object, ...args.slice(2))
+    if (method === 'store')
+      await this.store(args[0] as string, args[1] as object, ...args.slice(2))
 
-    if (method === 'fetch') return await this.fetch(args[0] as string)
+    if (method === 'fetch')
+      return await this.fetch(args[0] as string)
 
-    if (method === 'lock') await this.lock(args[0] as string, args[1] as () => Promise<void>)
+    if (method === 'lock')
+      return await this.lock(args[0] as string, args[1] as () => any)
   }
 
   private async store (key: string, value: object, ...args: unknown[]): Promise<void> {
@@ -48,11 +51,12 @@ export class Aspect extends Connector implements extensions.Aspect {
     return buffer === null ? null : decode(buffer)
   }
 
-  private async lock (key: string | string[], routine: Routine): Promise<void> {
+  private async lock<T> (key: string | string[], routine: Routine<T>): Promise<T> {
     if (typeof key === 'string') key = [key]
 
-    await this.redlock.using(key, 5000, routine)
+    return await this.redlock.using<T>(key, 5000, routine)
   }
 }
 
-type Routine = () => Promise<void>
+type Routine<T> = () => Promise<T>
+type Resources = string | string[]

package/source/Connection.test.ts

@@ -31,13 +31,13 @@ it('should be instance of Connector', async () => {
 
 it('should connect', async () => {
   const keyPrefix = `${locator.namespace}:${locator.name}:`
-  const options: redis.ClusterOptions = { keyPrefix, enableReadyCheck: true }
+  const options: redis.ClusterOptions = { keyPrefix, enableReadyCheck: true, lazyConnect: true }
 
   expect(Redis).toHaveBeenCalledWith(url, options)
 
-  // await connection.connect()
-  //
-  // expect(cluster.connect).toHaveBeenCalled()
+  await connection.connect()
+
+  expect(cluster.connect).toHaveBeenCalled()
 })
 
 it('should disconnect', async () => {

package/source/Connection.ts

@@ -8,11 +8,15 @@ export class Connection extends Connector {
     super()
 
     const keyPrefix = `${locator.namespace}:${locator.name}:`
-    const options: ClusterOptions = { keyPrefix, enableReadyCheck: true }
+    const options: ClusterOptions = { keyPrefix, enableReadyCheck: true, lazyConnect: true }
 
     this.redis = new Redis(url, options)
   }
 
+  protected override async open (): Promise<void> {
+    await this.redis.connect()
+  }
+
   protected override async close (): Promise<void> {
     this.redis.disconnect()
   }

package/transpiled/Aspect.d.ts

@@ -1,17 +0,0 @@
-import { Connector, type extensions } from '@toa.io/core';
-import type { Connection } from './Connection';
-export declare class Aspect extends Connector implements extensions.Aspect {
-    readonly name = "stash";
-    private readonly redis;
-    private readonly redlock;
-    constructor(connection: Connection);
-    invoke(method: 'store', key: string, value: object): Promise<void>;
-    invoke(method: 'fetch', key: string): Promise<object>;
-    invoke(method: 'lock', key: string | string[], routine: Routine): Promise<void>;
-    invoke(method: string, ...args: unknown[]): Promise<any>;
-    private store;
-    private fetch;
-    private lock;
-}
-type Routine = () => Promise<void>;
-export {};

package/transpiled/Aspect.fixtures.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="jest" />
-export declare const Redlock: jest.Mock<{
-    using: jest.Mock<Promise<undefined>, []>;
-}, []>;

package/transpiled/Aspect.fixtures.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Redlock = void 0;
-exports.Redlock = jest.fn(() => ({
-    using: jest.fn(async () => undefined)
-}));
-//# sourceMappingURL=Aspect.fixtures.js.map

package/transpiled/Aspect.fixtures.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Aspect.fixtures.js","sourceRoot":"","sources":["../source/Aspect.fixtures.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACpC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;CACtC,CAAC,CAAC,CAAA"}

package/transpiled/Aspect.js

@@ -1,49 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Aspect = void 0;
-const redlock_1 = __importDefault(require("redlock"));
-const msgpackr_1 = require("msgpackr");
-const core_1 = require("@toa.io/core");
-class Aspect extends core_1.Connector {
-    name = 'stash';
-    redis;
-    redlock;
-    constructor(connection) {
-        super();
-        this.redis = connection.redis;
-        this.redlock = new redlock_1.default([this.redis]);
-        this.depends(connection);
-    }
-    async invoke(method, ...args) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        if (typeof this.redis[method] === 'function')
-            return this.redis[method](...args);
-        if (method === 'store')
-            await this.store(args[0], args[1], ...args.slice(2));
-        if (method === 'fetch')
-            return await this.fetch(args[0]);
-        if (method === 'lock')
-            await this.lock(args[0], args[1]);
-    }
-    async store(key, value, ...args) {
-        const buffer = (0, msgpackr_1.encode)(value);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        await this.redis.set(key, buffer, ...args);
-    }
-    async fetch(key) {
-        const buffer = await this.redis.getBuffer(key);
-        return buffer === null ? null : (0, msgpackr_1.decode)(buffer);
-    }
-    async lock(key, routine) {
-        if (typeof key === 'string')
-            key = [key];
-        await this.redlock.using(key, 5000, routine);
-    }
-}
-exports.Aspect = Aspect;
-//# sourceMappingURL=Aspect.js.map

package/transpiled/Aspect.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Aspect.js","sourceRoot":"","sources":["../source/Aspect.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,uCAAyC;AACzC,uCAAyD;AAIzD,MAAa,MAAO,SAAQ,gBAAS;IACnB,IAAI,GAAG,OAAO,CAAA;IACb,KAAK,CAAO;IACZ,OAAO,CAAS;IAEjC,YAAoB,UAAsB;QACxC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAExC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1B,CAAC;IAMM,KAAK,CAAC,MAAM,CAAE,MAAc,EAAE,GAAG,IAAe;QACrD,6DAA6D;QAC7D,mBAAmB;QACnB,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;QAEhF,IAAI,MAAM,KAAK,OAAO;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhG,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,CAAC,CAAA;QAElE,IAAI,MAAM,KAAK,MAAM;YAAE,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAwB,CAAC,CAAA;IAC3F,CAAC;IAEO,KAAK,CAAC,KAAK,CAAE,GAAW,EAAE,KAAa,EAAE,GAAG,IAAe;QACjE,MAAM,MAAM,GAAG,IAAA,iBAAM,EAAC,KAAK,CAAC,CAAA;QAE5B,6DAA6D;QAC7D,mBAAmB;QACnB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAC5C,CAAC;IAEO,KAAK,CAAC,KAAK,CAAE,GAAW;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QAE9C,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,iBAAM,EAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,IAAI,CAAE,GAAsB,EAAE,OAAgB;QAC1D,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QAExC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;CACF;AAjDD,wBAiDC"}

package/transpiled/Aspect.test.d.ts

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

package/transpiled/Aspect.test.js

@@ -1,102 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const redlock_1 = __importDefault(require("redlock"));
-const msgpackr_1 = require("msgpackr");
-const randomstring_1 = require("randomstring");
-const Aspect_1 = require("./Aspect");
-const mock = __importStar(require("./Connection.fixtures"));
-jest.mock('redlock');
-let aspect;
-let connection;
-let redis;
-let redlock;
-const key = (0, randomstring_1.generate)();
-beforeEach(() => {
-    jest.clearAllMocks();
-    connection = new mock.Connection();
-    redis = connection.redis;
-    aspect = new Aspect_1.Aspect(connection);
-    const m = redlock_1.default.mock;
-    redlock = redlock_1.default.mock.instances[0];
-});
-it('should depend on Connection', async () => {
-    expect(connection.link).toHaveBeenCalledWith(aspect);
-});
-it('should set', async () => {
-    const value = (0, randomstring_1.generate)();
-    await aspect.invoke('set', key, value);
-    expect(redis.set).toHaveBeenCalledWith(key, value);
-});
-it('should get', async () => {
-    const value = await aspect.invoke('get', key);
-    expect(redis.get).toHaveBeenCalledWith(key);
-    expect(value).toStrictEqual(await redis.get.mock.results[0].value);
-});
-describe('buffers', () => {
-    it.each([
-        ['object', { [(0, randomstring_1.generate)()]: (0, randomstring_1.generate)() }],
-        ['array', [(0, randomstring_1.generate)(), (0, randomstring_1.generate)()]]
-    ])('should encode %s', async (_, value) => {
-        await aspect.invoke('store', key, value);
-        const buffer = (0, msgpackr_1.encode)(value);
-        expect(redis.set).toHaveBeenCalledWith(key, buffer);
-    });
-    it('should pass arguments', async () => {
-        const value = [1, 2];
-        const buffer = (0, msgpackr_1.encode)(value);
-        await aspect.invoke('store', key, value, 'EX', 1000);
-        expect(redis.set).toHaveBeenCalledWith(key, buffer, 'EX', 1000);
-    });
-    it.each([
-        ['object', { [(0, randomstring_1.generate)()]: (0, randomstring_1.generate)() }],
-        ['array', [(0, randomstring_1.generate)(), (0, randomstring_1.generate)()]]
-    ])('should decode %s', async (_, value) => {
-        const buffer = (0, msgpackr_1.encode)(value);
-        redis.getBuffer.mockImplementationOnce(async () => buffer);
-        const output = await aspect.invoke('fetch', key);
-        expect(redis.getBuffer).toHaveBeenCalledWith(key);
-        expect(output).toStrictEqual(value);
-    });
-});
-it('should create DLM', async () => {
-    expect(redlock_1.default).toHaveBeenCalledWith([redis]);
-});
-it('should acquire lock', async () => {
-    const keys = [(0, randomstring_1.generate)(), (0, randomstring_1.generate)()];
-    const callback = jest.fn();
-    await aspect.invoke('lock', keys, callback);
-    expect(redlock.using).toHaveBeenCalledWith(keys, 5000, callback);
-});
-it('should handle non-array key', async () => {
-    const key = (0, randomstring_1.generate)();
-    const callback = jest.fn();
-    await aspect.invoke('lock', key, callback);
-    expect(redlock.using).toHaveBeenCalledWith([key], 5000, callback);
-});
-//# sourceMappingURL=Aspect.test.js.map

package/transpiled/Aspect.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Aspect.test.js","sourceRoot":"","sources":["../source/Aspect.test.ts"],"names":[],"mappings":"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"}

package/transpiled/Connection.d.ts

@@ -1,7 +0,0 @@
-import { Redis } from 'ioredis';
-import { Connector, type Locator } from '@toa.io/core';
-export declare class Connection extends Connector {
-    readonly redis: Redis;
-    constructor(url: string, locator: Locator);
-    protected close(): Promise<void>;
-}

package/transpiled/Connection.fixtures.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="jest" />
-import type * as redis from 'ioredis';
-export declare const Redis: jest.Mock<typeof redis.Cluster, any>;
-export declare const Connection: jest.Mock<{
-    redis: typeof redis.Cluster;
-    link: jest.Mock<any, any>;
-}, []>;
-export declare const ioredis: {
-    Redis: jest.Mock<typeof redis.Cluster, any>;
-};

package/transpiled/Connection.fixtures.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ioredis = exports.Connection = exports.Redis = void 0;
-const randomstring_1 = require("randomstring");
-exports.Redis = jest.fn(() => ({
-    connect: jest.fn(async () => undefined),
-    disconnect: jest.fn(),
-    get: jest.fn(async () => (0, randomstring_1.generate)()),
-    getBuffer: jest.fn(async () => Buffer.from((0, randomstring_1.generate)())),
-    set: jest.fn(async () => undefined),
-    on: jest.fn()
-}));
-exports.Connection = jest.fn(() => ({
-    redis: new exports.Redis(),
-    link: jest.fn()
-}));
-exports.ioredis = { Redis: exports.Redis };
-//# sourceMappingURL=Connection.fixtures.js.map

package/transpiled/Connection.fixtures.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Connection.fixtures.js","sourceRoot":"","sources":["../source/Connection.fixtures.ts"],"names":[],"mappings":";;;AAAA,+CAAuC;AAG1B,QAAA,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAClC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;IACvC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAA,uBAAQ,GAAE,CAAC;IACpC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAQ,GAAE,CAAC,CAAC;IACvD,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;IACnC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;CACd,CAAC,CAA+C,CAAA;AAEpC,QAAA,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACvC,KAAK,EAAE,IAAI,aAAK,EAAE;IAClB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;CAChB,CAAC,CAAC,CAAA;AAEU,QAAA,OAAO,GAAG,EAAE,KAAK,EAAL,aAAK,EAAE,CAAA"}

package/transpiled/Connection.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-const ioredis_1 = require("ioredis");
-const core_1 = require("@toa.io/core");
-class Connection extends core_1.Connector {
-    redis;
-    constructor(url, locator) {
-        super();
-        const keyPrefix = `${locator.namespace}:${locator.name}:`;
-        const options = { keyPrefix, enableReadyCheck: true };
-        this.redis = new ioredis_1.Redis(url, options);
-    }
-    async close() {
-        this.redis.disconnect();
-    }
-}
-exports.Connection = Connection;
-//# sourceMappingURL=Connection.js.map

package/transpiled/Connection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../source/Connection.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,uCAAsD;AAEtD,MAAa,UAAW,SAAQ,gBAAS;IACvB,KAAK,CAAO;IAE5B,YAAoB,GAAW,EAAE,OAAgB;QAC/C,KAAK,EAAE,CAAA;QAEP,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,GAAG,CAAA;QACzD,MAAM,OAAO,GAAmB,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAA;QAErE,IAAI,CAAC,KAAK,GAAG,IAAI,eAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACtC,CAAC;IAEkB,KAAK,CAAC,KAAK;QAC5B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;IACzB,CAAC;CACF;AAfD,gCAeC"}

package/transpiled/Connection.test.d.ts

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

package/transpiled/Connection.test.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const randomstring_1 = require("randomstring");
-const Connection_1 = require("./Connection");
-const core_1 = require("@toa.io/core");
-const Connection_fixtures_1 = require("./Connection.fixtures");
-jest.mock('ioredis', () => ({
-    Redis: jest.fn((nodes, options) => new Connection_fixtures_1.Redis(nodes, options))
-}));
-let connection;
-let cluster;
-const url = (0, randomstring_1.generate)();
-const locator = {
-    namespace: (0, randomstring_1.generate)(),
-    name: (0, randomstring_1.generate)()
-};
-beforeEach(() => {
-    jest.clearAllMocks();
-    connection = new Connection_1.Connection(url, locator);
-    cluster = Connection_fixtures_1.Redis.mock.results[0].value;
-});
-it('should be instance of Connector', async () => {
-    expect(connection).toBeInstanceOf(core_1.Connector);
-});
-it('should connect', async () => {
-    const keyPrefix = `${locator.namespace}:${locator.name}:`;
-    const options = { keyPrefix, enableReadyCheck: true };
-    expect(Connection_fixtures_1.Redis).toHaveBeenCalledWith(url, options);
-    // await connection.connect()
-    //
-    // expect(cluster.connect).toHaveBeenCalled()
-});
-it('should disconnect', async () => {
-    await connection.disconnect();
-    expect(cluster.disconnect).toHaveBeenCalled();
-});
-it('should expose cluster', async () => {
-    expect(connection.redis).toStrictEqual(cluster);
-});
-//# sourceMappingURL=Connection.test.js.map

package/transpiled/Connection.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Connection.test.js","sourceRoot":"","sources":["../source/Connection.test.ts"],"names":[],"mappings":";;AAAA,+CAAuC;AACvC,6CAAyC;AACzC,uCAAsD;AACtD,+DAA6C;AAG7C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,KAAe,EAAE,OAA6B,EAAE,EAAE,CAAC,IAAI,2BAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;CAC9F,CAAC,CAAC,CAAA;AAEH,IAAI,UAAsB,CAAA;AAC1B,IAAI,OAAyC,CAAA;AAE7C,MAAM,GAAG,GAAG,IAAA,uBAAQ,GAAE,CAAA;AAEtB,MAAM,OAAO,GAAG;IACd,SAAS,EAAE,IAAA,uBAAQ,GAAE;IACrB,IAAI,EAAE,IAAA,uBAAQ,GAAE;CACK,CAAA;AAEvB,UAAU,CAAC,GAAG,EAAE;IACd,IAAI,CAAC,aAAa,EAAE,CAAA;IAEpB,UAAU,GAAG,IAAI,uBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACzC,OAAO,GAAG,2BAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AACvC,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IAC/C,MAAM,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,gBAAS,CAAC,CAAA;AAC9C,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IAC9B,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,GAAG,CAAA;IACzD,MAAM,OAAO,GAAyB,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAA;IAE3E,MAAM,CAAC,2BAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAEhD,6BAA6B;IAC7B,EAAE;IACF,6CAA6C;AAC/C,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;IACjC,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;IAE7B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAA;AAC/C,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACrC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA"}

package/transpiled/extension.d.ts

@@ -1,12 +0,0 @@
-import { uris } from '@toa.io/pointer';
-import type { Locator, extensions } from '@toa.io/core';
-import type { context } from '@toa.io/norm';
-import type * as operations from '@toa.io/operations';
-export declare class Factory implements extensions.Factory {
-    aspect(locator: Locator): extensions.Aspect;
-    private url;
-}
-export declare function deployment(instances: context.Dependency[], annotation: Annotation): Dependency;
-type Dependency = operations.deployment.Dependency;
-type Annotation = uris.URIs | string;
-export {};

package/transpiled/extension.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployment = exports.Factory = void 0;
-const pointer_1 = require("@toa.io/pointer");
-const Aspect_1 = require("./Aspect");
-const Connection_1 = require("./Connection");
-class Factory {
-    aspect(locator) {
-        const url = this.url();
-        const connection = new Connection_1.Connection(url, locator);
-        return new Aspect_1.Aspect(connection);
-    }
-    url() {
-        if (process.env.TOA_DEV === '1')
-            return 'redis://localhost';
-        const url = process.env[URL_VARIABLE];
-        if (url === undefined)
-            throw new Error(`${URL_VARIABLE} is not set`);
-        return url;
-    }
-}
-exports.Factory = Factory;
-function deployment(instances, annotation) {
-    const pointer = pointer_1.uris.construct(annotation);
-    const variables = {};
-    for (const instance of instances) {
-        const resolution = pointer_1.uris.resolve(instance.locator, pointer);
-        const variable = { name: URL_VARIABLE, value: resolution.url.href };
-        variables[instance.locator.label] = [variable];
-    }
-    return { variables };
-}
-exports.deployment = deployment;
-const URL_VARIABLE = 'TOA_STASH';
-//# sourceMappingURL=extension.js.map

package/transpiled/extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../source/extension.ts"],"names":[],"mappings":";;;AAAA,6CAAsC;AACtC,qCAAiC;AACjC,6CAAyC;AAKzC,MAAa,OAAO;IACX,MAAM,CAAE,OAAgB;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAE/C,OAAO,IAAI,eAAM,CAAC,UAAU,CAAC,CAAA;IAC/B,CAAC;IAEO,GAAG;QACT,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,KAAK,GAAG;YAAE,OAAO,mBAAmB,CAAA;QAE3D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAErC,IAAI,GAAG,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,aAAa,CAAC,CAAA;QAEpE,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAjBD,0BAiBC;AAED,SAAgB,UAAU,CAAE,SAA+B,EAAE,UAAsB;IACjF,MAAM,OAAO,GAAG,cAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IAC1C,MAAM,SAAS,GAAc,EAAE,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC1D,MAAM,QAAQ,GAAa,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;QAE7E,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;KAC/C;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;AACtB,CAAC;AAZD,gCAYC;AAED,MAAM,YAAY,GAAG,WAAW,CAAA"}

package/transpiled/index.d.ts

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

package/transpiled/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./extension"), exports);
-//# sourceMappingURL=index.js.map

package/transpiled/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA2B"}

package/transpiled/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"version":"4.9.5"}