@toa.io/extensions.stash 1.0.0-alpha.29 → 1.0.0-alpha.292

package/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [1.0.0-alpha.292](https://github.com/toa-io/toa/compare/v1.0.0-alpha.291...v1.0.0-alpha.292) (2026-09-07)
+
+### Features
+
+* **definitions:** what a package declares is read from one package ([7052341](https://github.com/toa-io/toa/commit/70523411b5d9e2b204c999aa02365173f3bb518d))
+
+
+# [1.0.0-alpha.291](https://github.com/toa-io/toa/compare/v1.0.0-alpha.290...v1.0.0-alpha.291) (2026-09-07)
+
+**Note:** Version bump only for package @toa.io/extensions.stash
+
+
+
+
+
+# [1.0.0-alpha.289](https://github.com/toa-io/toa/compare/v1.0.0-alpha.288...v1.0.0-alpha.289) (2026-09-07)
+
+* A deploy moves only what changed, and a component sees none of the runtime's environment (#1073) ([f38e3db](https://github.com/toa-io/toa/commit/f38e3db533f24db866c57bfa1ef294eff1eaf499)), closes [#1073](https://github.com/toa-io/toa/issues/1073) [#1064](https://github.com/toa-io/toa/issues/1064) [#1066](https://github.com/toa-io/toa/issues/1066) [#1067](https://github.com/toa-io/toa/issues/1067) [#1068](https://github.com/toa-io/toa/issues/1068) [#1069](https://github.com/toa-io/toa/issues/1069) [#1071](https://github.com/toa-io/toa/issues/1071) [#1070](https://github.com/toa-io/toa/issues/1070) [#1072](https://github.com/toa-io/toa/issues/1072)
+
+### BREAKING CHANGES
+
+* a component that read `process.env.TOA_*` reads `context` instead;
+  `echo(input)` no longer substitutes from the environment; a bash operation sees no
+  `TOA_*`; images no longer set `USER node` — see migrations/289.md.
+
+
+# [1.0.0-alpha.287](https://github.com/toa-io/toa/compare/v1.0.0-alpha.286...v1.0.0-alpha.287) (2026-09-06)
+
+**Note:** Version bump only for package @toa.io/extensions.stash

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@toa.io/extensions.stash",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.292",
+  "type": "module",
   "description": "Toa Stash",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -17,17 +18,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@toa.io/pointer": "1.0.0-alpha.29",
-    "ioredis": "5.3.2",
-    "msgpackr": "1.10.1",
-    "redlock-temp-fix": "5.0.0-beta.2"
+    "@toa.io/definitions": "1.0.0-alpha.292",
+    "@toa.io/generic": "1.0.0-alpha.292",
+    "@toa.io/pointer": "1.0.0-alpha.292",
+    "ioredis": "6.0.0",
+    "msgpackr": "2.1.0",
+    "openspan": "1.0.0-alpha.286"
   },
   "scripts": {
     "transpile": "tsc"
   },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node"
-  },
-  "gitHead": "186d0e17c12a9016b8076edf925963cbb32b9219"
+  "gitHead": "0f6aa3ad9dbec86bb632a7975ea61d1dde1d8fc5"
 }

package/readme.md

@@ -1,14 +1,13 @@
 # Toa Stash
 
-Shared cache and distributed lock manager on top of [ioredis](https://github.com/redis/ioredis)
-and [redlock](https://github.com/mike-marcacci/node-redlock).
+Shared cache on top of [ioredis](https://github.com/redis/ioredis).
 
 ## Shared cache
 
 `stash` aspect exposes [`ioredis` methods](https://redis.github.io/ioredis/classes/Cluster.html).
 
 ```javascript
-async function computation (input, context) {
+async function computation(input, context) {
   await context.stash.set('key', 'value')
   await context.stash.get('key')
 }
@@ -27,18 +26,6 @@ starting from third.
 
 Values are encoded using [msgpack](https://msgpack.org).
 
-## Distributed lock manager
-
-`async lock<T>(id: string | string[], routine: async? () => T): T`
-
-Executes `routine` once a lock is successfully acquired. Lock ID is component-scoped.
-
-```javascript
-async function computation (input, context) {
-  await context.stash.lock('lock id', () => console.log('Lock acquired'))
-}
-```
-
 ## Manifest
 
 To enable extension for a component, add `null` definition to its manifest:

package/source/Aspect.ts

@@ -1,47 +1,71 @@
-import Redlock from 'redlock-temp-fix'
+/* eslint-disable @typescript-eslint/no-floating-promises */
 import { encode, decode } from 'msgpackr'
-import { Connector, type extensions } from '@toa.io/core'
-import type { Connection } from './Connection'
-import type { Redis } from 'ioredis'
+import { console, type SpanOptions } from 'openspan'
+import { Connector } from '@toa.io/core'
+import type { extensions } from '@toa.io/core/types'
+import type { Connection } from './Connection.js'
+import type { Redis, ChainableCommander } from 'ioredis'
 
 export class Aspect extends Connector implements extensions.Aspect {
   public readonly name = 'stash'
   private readonly connection: Connection
   private redis: Redis | null = null
-  private redlock: Redlock | null = null
 
-  public constructor (connection: Connection) {
+  public constructor(connection: Connection) {
     super()
 
     this.connection = connection
     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<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> {
+  public invoke(method: 'store', key: string, value: object): any
+  public invoke(method: 'fetch', key: string): any
+  public invoke(method: string, ...args: unknown[]): any
+  // eslint-disable-next-line @typescript-eslint/promise-function-async
+  public invoke(method: string, ...args: unknown[]): 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 (typeof this.redis[method] === 'function') {
+      // multi/pipeline return a sync chainable; the span wraps exec() instead
+      if (method === 'multi' || method === 'pipeline') {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
+        const chain: ChainableCommander = this.redis[method](...args)
+        const exec = chain.exec.bind(chain)
+
+        chain.exec = async () => {
+          const options = span(method, args[0])
+
+          Object.assign(options.attributes!, { 'db.operation.batch.size': chain.length })
+
+          return await console.span(options, exec)
+        }
+
+        return chain
+      }
+
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      return console.span(span(method, args[0]), () => this.redis[method](...args))
+    }
 
     if (method === 'store')
-      await this.store(args[0] as string, args[1] as object, ...args.slice(2))
+      console.span(span(method, args[0]), async () => {
+        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 === 'lock')
-      return await this.lock(args[0] as Resources, args[1] as () => any)
+      return console.span(
+        span(method, args[0]),
+        async () => await this.fetch(args[0] as string)
+      )
   }
 
-  protected override async open (): Promise<void> {
-    this.redis = this.connection.redises[0]
-    this.redlock = new Redlock(this.connection.redises, { retryCount: -1 })
+  protected override async open(): Promise<void> {
+    this.redis = this.connection.redis
   }
 
-  private async store (key: string, value: object, ...args: unknown[]): Promise<void> {
+  private async store(key: string, value: object, ...args: unknown[]): Promise<void> {
     const buffer = encode(value)
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -49,22 +73,27 @@ export class Aspect extends Connector implements extensions.Aspect {
     await this.redis.set(key, buffer, ...args)
   }
 
-  private async fetch (key: string): Promise<object | null> {
+  private async fetch(key: string): Promise<object | null> {
     if (this.redis === null) return null
 
     const buffer = await this.redis.getBuffer(key)
 
     return buffer === null ? null : decode(buffer)
   }
+}
 
-  private async lock<T> (key: Resources, routine: Routine<T>): Promise<T | null> {
-    if (this.redlock === null) return null
+function span(method: string, key: unknown): SpanOptions {
+  // https://opentelemetry.io/docs/specs/semconv/database/redis/
+  // `db.namespace` names the database node on service graphs,
+  // which otherwise displays 'unknown'
+  const attributes: Record<string, unknown> = {
+    'db.system': 'redis',
+    'db.namespace': 'stash',
+    'db.operation.name': method
+  }
 
-    if (typeof key === 'string') key = [key]
+  if (typeof key === 'string') attributes.key = key
+  else if (Array.isArray(key)) attributes.key = key.join(' ')
 
-    return await this.redlock.using<T>(key, 5000, routine)
-  }
+  return { name: `${method} stash`, kind: 'client', attributes }
 }
-
-type Routine<T> = () => Promise<T>
-type Resources = string | string[]

package/source/Connection.ts

@@ -1,48 +1,57 @@
-import { Redis, type ClusterOptions } from 'ioredis'
+import { Redis, type RedisOptions } from 'ioredis'
+import { console } from 'openspan'
 import { Connector, type Locator } from '@toa.io/core'
 import { resolve } from '@toa.io/pointer'
-import { ID } from './extension'
+import { ID } from '@toa.io/definitions/extensions.stash'
+import { environment } from '@toa.io/generic'
 
 export class Connection extends Connector {
-  public readonly redises: Redis[] = []
-  private readonly locator: Locator
+  public redis: Redis | null = null
+  public readonly locator: Locator
 
-  public constructor (locator: Locator) {
+  public constructor(locator: Locator) {
     super()
 
     this.locator = locator
   }
 
-  protected override async open (): Promise<void> {
+  protected override async open(): Promise<void> {
     const keyPrefix = `${this.locator.namespace}:${this.locator.name}:`
-    const options: ClusterOptions = { keyPrefix, enableReadyCheck: true, lazyConnect: true }
-    const urls = await this.resolveURLs()
 
-    for (const url of urls)
-      this.redises.push(new Redis(url, options))
+    const options: RedisOptions = {
+      keyPrefix,
+      enableReadyCheck: true,
+      lazyConnect: true,
+      protocol: 3,
+      replyMapping: 'resp3'
+    }
 
-    const connecting = this.redises.map(this.connectNode.bind(this))
+    this.redis = new Redis(await this.resolveURL(), options)
 
-    await Promise.all(connecting)
+    await this.redis.connect()
+
+    console.info('Stash connected to redis', { host: this.redis.options.host })
   }
 
-  protected override async close (): Promise<void> {
-    for (const redis of this.redises)
-      redis.disconnect()
+  protected override async close(): Promise<void> {
+    this.redis?.disconnect()
+    this.redis = null
 
-    console.log('Stash disconnected')
+    console.info('Stash shutdown complete')
   }
 
-  private async connectNode (redis: Redis): Promise<void> {
-    await redis.connect()
+  private async resolveURL(): Promise<string> {
+    // Toa's own development stack is not on the conventional ports: the applications built on
+    // Toa are, and they share the machine. See CONTRIBUTING.md.
+    if (environment.get('TOA_DEV') === '1') return 'redis://localhost:31040'
 
-    console.log(`Stash connected to ${redis.options.host}:${String(redis.options.port)}`)
-  }
+    const urls = resolve(ID, this.locator.id)
+
+    // several addresses used to be independent masters for the lock manager, which the atom
+    // aspect holds now. A cache is one Redis, and the rest have never been read from
+    if (urls.length > 1)
+      console.warn('Stash takes the first of several addresses', { count: urls.length })
 
-  private async resolveURLs (): Promise<string[]> {
-    if (process.env.TOA_DEV === '1')
-      return ['redis://localhost']
-    else
-      return resolve(ID, this.locator.id)
+    return urls[0]
   }
 }

package/source/Stash.ts

@@ -0,0 +1,12 @@
+import type { RedisCommander } from 'ioredis'
+
+/** What `context.stash` is: every Redis command, and what the aspect adds to them. */
+export interface Stash extends RedisCommander {
+  store: <T>(key: string, value: T) => Promise<void>
+  fetch: <T>(key: string) => Promise<T>
+  lock: <T>(key: Resources, routine: Routine<T>) => Promise<T>
+  count: (name: string, interval: number, amount?: number) => number
+}
+
+type Routine<T> = () => Promise<T>
+type Resources = string | string[]

package/source/extension.ts

@@ -1,30 +1,12 @@
-import { createVariables, type URIMap, type Request } from '@toa.io/pointer'
-import { Aspect } from './Aspect'
-import { Connection } from './Connection'
-import type { Locator, extensions } from '@toa.io/core'
-import type { context } from '@toa.io/norm'
-import type { Dependency } from '@toa.io/operations'
+import { Aspect } from './Aspect.js'
+import { Connection } from './Connection.js'
+import type { Locator } from '@toa.io/core'
+import type { extensions } from '@toa.io/core/types'
 
 export class Factory implements extensions.Factory {
-  public aspect (locator: Locator): extensions.Aspect {
+  public aspect(locator: Locator): extensions.Aspect {
     const connection = new Connection(locator)
 
     return new Aspect(connection)
   }
 }
-
-export function deployment (instances: context.Dependency[], annotation: URIMap): Dependency {
-  const requests: Request[] = instances.map((instance) => createRequest(instance))
-  const variables = createVariables(ID, annotation, requests)
-
-  return { variables }
-}
-
-function createRequest (instance: context.Dependency): Request {
-  return {
-    group: instance.locator.label,
-    selectors: [instance.locator.id]
-  }
-}
-
-export const ID = 'stash'

package/source/index.ts

@@ -1 +1,2 @@
-export * from './extension'
+export * from './extension.js'
+export type { Stash } from './Stash.js'

package/transpiled/Aspect.d.ts

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

package/transpiled/Aspect.js

@@ -1,40 +1,50 @@
-"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_temp_fix_1 = __importDefault(require("redlock-temp-fix"));
-const msgpackr_1 = require("msgpackr");
-const core_1 = require("@toa.io/core");
-class Aspect extends core_1.Connector {
+/* eslint-disable @typescript-eslint/no-floating-promises */
+import { encode, decode } from 'msgpackr';
+import { console } from 'openspan';
+import { Connector } from '@toa.io/core';
+export class Aspect extends Connector {
     name = 'stash';
     connection;
     redis = null;
-    redlock = null;
     constructor(connection) {
         super();
         this.connection = connection;
         this.depends(connection);
     }
-    async invoke(method, ...args) {
+    // eslint-disable-next-line @typescript-eslint/promise-function-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 (typeof this.redis[method] === 'function') {
+            // multi/pipeline return a sync chainable; the span wraps exec() instead
+            if (method === 'multi' || method === 'pipeline') {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-expect-error
+                const chain = this.redis[method](...args);
+                const exec = chain.exec.bind(chain);
+                chain.exec = async () => {
+                    const options = span(method, args[0]);
+                    Object.assign(options.attributes, { 'db.operation.batch.size': chain.length });
+                    return await console.span(options, exec);
+                };
+                return chain;
+            }
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            return console.span(span(method, args[0]), () => this.redis[method](...args));
+        }
         if (method === 'store')
-            await this.store(args[0], args[1], ...args.slice(2));
+            console.span(span(method, args[0]), async () => {
+                await this.store(args[0], args[1], ...args.slice(2));
+            });
         if (method === 'fetch')
-            return await this.fetch(args[0]);
-        if (method === 'lock')
-            return await this.lock(args[0], args[1]);
+            return console.span(span(method, args[0]), async () => await this.fetch(args[0]));
     }
     async open() {
-        this.redis = this.connection.redises[0];
-        this.redlock = new redlock_temp_fix_1.default(this.connection.redises, { retryCount: -1 });
+        this.redis = this.connection.redis;
     }
     async store(key, value, ...args) {
-        const buffer = (0, msgpackr_1.encode)(value);
+        const buffer = encode(value);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
         await this.redis.set(key, buffer, ...args);
@@ -43,15 +53,22 @@ class Aspect extends core_1.Connector {
         if (this.redis === null)
             return null;
         const buffer = await this.redis.getBuffer(key);
-        return buffer === null ? null : (0, msgpackr_1.decode)(buffer);
-    }
-    async lock(key, routine) {
-        if (this.redlock === null)
-            return null;
-        if (typeof key === 'string')
-            key = [key];
-        return await this.redlock.using(key, 5000, routine);
+        return buffer === null ? null : decode(buffer);
     }
 }
-exports.Aspect = Aspect;
+function span(method, key) {
+    // https://opentelemetry.io/docs/specs/semconv/database/redis/
+    // `db.namespace` names the database node on service graphs,
+    // which otherwise displays 'unknown'
+    const attributes = {
+        'db.system': 'redis',
+        'db.namespace': 'stash',
+        'db.operation.name': method
+    };
+    if (typeof key === 'string')
+        attributes.key = key;
+    else if (Array.isArray(key))
+        attributes.key = key.join(' ');
+    return { name: `${method} stash`, kind: 'client', attributes };
+}
 //# sourceMappingURL=Aspect.js.map

package/transpiled/Aspect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Aspect.js","sourceRoot":"","sources":["../source/Aspect.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAsC;AACtC,uCAAyC;AACzC,uCAAyD;AAIzD,MAAa,MAAO,SAAQ,gBAAS;IACnB,IAAI,GAAG,OAAO,CAAA;IACb,UAAU,CAAY;IAC/B,KAAK,GAAiB,IAAI,CAAA;IAC1B,OAAO,GAAmB,IAAI,CAAA;IAEtC,YAAoB,UAAsB;QACxC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,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;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAE1E,IAAI,MAAM,KAAK,OAAO;YACpB,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAW,CAAC,CAAA;QAE5C,IAAI,MAAM,KAAK,MAAM;YACnB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAc,EAAE,IAAI,CAAC,CAAC,CAAc,CAAC,CAAA;IACtE,CAAC;IAEkB,KAAK,CAAC,IAAI;QAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAO,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IACzE,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,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAEpC,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,CAAK,GAAc,EAAE,OAAmB;QACxD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAEtC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QAExC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAI,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC;CACF;AA5DD,wBA4DC"}
+{"version":3,"file":"Aspect.js","sourceRoot":"","sources":["../source/Aspect.ts"],"names":[],"mappings":"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"}

package/transpiled/Connection.d.ts

@@ -1,11 +1,10 @@
 import { Redis } from 'ioredis';
 import { Connector, type Locator } from '@toa.io/core';
 export declare class Connection extends Connector {
-    readonly redises: Redis[];
-    private readonly locator;
+    redis: Redis | null;
+    readonly locator: Locator;
     constructor(locator: Locator);
     protected open(): Promise<void>;
     protected close(): Promise<void>;
-    private connectNode;
-    private resolveURLs;
+    private resolveURL;
 }

package/transpiled/Connection.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-const ioredis_1 = require("ioredis");
-const core_1 = require("@toa.io/core");
-const pointer_1 = require("@toa.io/pointer");
-const extension_1 = require("./extension");
-class Connection extends core_1.Connector {
-    redises = [];
+import { Redis } from 'ioredis';
+import { console } from 'openspan';
+import { Connector } from '@toa.io/core';
+import { resolve } from '@toa.io/pointer';
+import { ID } from '@toa.io/definitions/extensions.stash';
+import { environment } from '@toa.io/generic';
+export class Connection extends Connector {
+    redis = null;
     locator;
     constructor(locator) {
         super();
@@ -14,28 +13,33 @@ class Connection extends core_1.Connector {
     }
     async open() {
         const keyPrefix = `${this.locator.namespace}:${this.locator.name}:`;
-        const options = { keyPrefix, enableReadyCheck: true, lazyConnect: true };
-        const urls = await this.resolveURLs();
-        for (const url of urls)
-            this.redises.push(new ioredis_1.Redis(url, options));
-        const connecting = this.redises.map(this.connectNode.bind(this));
-        await Promise.all(connecting);
+        const options = {
+            keyPrefix,
+            enableReadyCheck: true,
+            lazyConnect: true,
+            protocol: 3,
+            replyMapping: 'resp3'
+        };
+        this.redis = new Redis(await this.resolveURL(), options);
+        await this.redis.connect();
+        console.info('Stash connected to redis', { host: this.redis.options.host });
     }
     async close() {
-        for (const redis of this.redises)
-            redis.disconnect();
-        console.log('Stash disconnected');
+        this.redis?.disconnect();
+        this.redis = null;
+        console.info('Stash shutdown complete');
     }
-    async connectNode(redis) {
-        await redis.connect();
-        console.log(`Stash connected to ${redis.options.host}:${String(redis.options.port)}`);
-    }
-    async resolveURLs() {
-        if (process.env.TOA_DEV === '1')
-            return ['redis://localhost'];
-        else
-            return (0, pointer_1.resolve)(extension_1.ID, this.locator.id);
+    async resolveURL() {
+        // Toa's own development stack is not on the conventional ports: the applications built on
+        // Toa are, and they share the machine. See CONTRIBUTING.md.
+        if (environment.get('TOA_DEV') === '1')
+            return 'redis://localhost:31040';
+        const urls = resolve(ID, this.locator.id);
+        // several addresses used to be independent masters for the lock manager, which the atom
+        // aspect holds now. A cache is one Redis, and the rest have never been read from
+        if (urls.length > 1)
+            console.warn('Stash takes the first of several addresses', { count: urls.length });
+        return urls[0];
     }
 }
-exports.Connection = Connection;
 //# sourceMappingURL=Connection.js.map

package/transpiled/Connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../source/Connection.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,uCAAsD;AACtD,6CAAyC;AACzC,2CAAgC;AAEhC,MAAa,UAAW,SAAQ,gBAAS;IACvB,OAAO,GAAY,EAAE,CAAA;IACpB,OAAO,CAAS;IAEjC,YAAoB,OAAgB;QAClC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEkB,KAAK,CAAC,IAAI;QAC3B,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAA;QACnE,MAAM,OAAO,GAAmB,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;QACxF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QAErC,KAAK,MAAM,GAAG,IAAI,IAAI;YACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,eAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAEhE,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC/B,CAAC;IAEkB,KAAK,CAAC,KAAK;QAC5B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO;YAC9B,KAAK,CAAC,UAAU,EAAE,CAAA;QAEpB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;IACnC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAE,KAAY;QACrC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;QAErB,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvF,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,KAAK,GAAG;YAC7B,OAAO,CAAC,mBAAmB,CAAC,CAAA;;YAE5B,OAAO,IAAA,iBAAO,EAAC,cAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;CACF;AA1CD,gCA0CC"}
+{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../source/Connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,sCAAsC,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,OAAO,UAAW,SAAQ,SAAS;IAChC,KAAK,GAAiB,IAAI,CAAA;IACjB,OAAO,CAAS;IAEhC,YAAmB,OAAgB;QACjC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEkB,KAAK,CAAC,IAAI;QAC3B,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAA;QAEnE,MAAM,OAAO,GAAiB;YAC5B,SAAS;YACT,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,OAAO;SACtB,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,CAAA;QAExD,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;QAE1B,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7E,CAAC;IAEkB,KAAK,CAAC,KAAK;QAC5B,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QAEjB,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACzC,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,0FAA0F;QAC1F,4DAA4D;QAC5D,IAAI,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG;YAAE,OAAO,yBAAyB,CAAA;QAExE,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAEzC,wFAAwF;QACxF,iFAAiF;QACjF,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAEpF,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;CACF"}

package/transpiled/Stash.d.ts

@@ -0,0 +1,11 @@
+import type { RedisCommander } from 'ioredis';
+/** What `context.stash` is: every Redis command, and what the aspect adds to them. */
+export interface Stash extends RedisCommander {
+    store: <T>(key: string, value: T) => Promise<void>;
+    fetch: <T>(key: string) => Promise<T>;
+    lock: <T>(key: Resources, routine: Routine<T>) => Promise<T>;
+    count: (name: string, interval: number, amount?: number) => number;
+}
+type Routine<T> = () => Promise<T>;
+type Resources = string | string[];
+export {};