@zyno-io/ts-server-foundation 26.1028.1719 → 26.1029.216

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,7 +9,7 @@ const types_1 = require("../types");
9
9
  const errors_1 = require("./errors");
10
10
  const provider_1 = require("./provider");
11
11
  const module_1 = require("./module");
12
- const __tsf_metadata_type = _a.createCompactMetadataRegistryV2("[2,[{\"kind\":2,\"typeName\":\"Token\",\"typeArguments\":[{\"kind\":2,\"typeName\":\"T\"}]},{\"kind\":2,\"typeName\":\"T\"},{\"kind\":2,\"typeName\":\"Token\"},{\"kind\":7},{\"kind\":8},{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Token\"}},{\"kind\":2},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":14,\"type\":{\"kind\":18,\"types\":[{\"kind\":20,\"name\":\"token\",\"type\":{\"kind\":2,\"typeName\":\"Token\"},\"optional\":false},{\"kind\":20,\"name\":\"provider\",\"type\":{\"kind\":2,\"typeName\":\"Provider\"},\"optional\":false},{\"kind\":20,\"name\":\"moduleId\",\"type\":{\"kind\":7},\"optional\":false},{\"kind\":20,\"name\":\"exported\",\"type\":{\"kind\":8},\"optional\":false}]}},{\"kind\":18,\"typeName\":\"ModuleDefinition\",\"types\":[{\"$tsfNode\":0},{\"$tsfNode\":1},{\"kind\":20,\"name\":\"imports\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":12,\"types\":[{\"kind\":18,\"typeName\":\"ModuleDefinition\",\"types\":[{\"$tsfNode\":0},{\"$tsfNode\":1},{\"kind\":20,\"name\":\"imports\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":12,\"types\":[{\"kind\":2,\"typeName\":\"ModuleDefinition\"},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":18,\"typeName\":\"ModuleInstance\",\"types\":[{\"kind\":20,\"name\":\"definition\",\"type\":{\"kind\":2,\"typeName\":\"ModuleDefinition\"},\"optional\":false}]}],\"typeName\":\"ModuleLike\"}},{\"kind\":4}]},\"optional\":true},{\"$tsfNode\":2},{\"$tsfNode\":3},{\"$tsfNode\":4},{\"$tsfNode\":5},{\"$tsfNode\":6}],\"typeParameters\":[\"C\"]},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":18,\"typeName\":\"ModuleInstance\",\"types\":[{\"kind\":20,\"name\":\"definition\",\"type\":{\"kind\":18,\"typeName\":\"ModuleDefinition\",\"types\":[{\"$tsfNode\":0},{\"$tsfNode\":1},{\"kind\":20,\"name\":\"imports\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":12,\"types\":[{\"kind\":2,\"typeName\":\"ModuleDefinition\"},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":2,\"typeName\":\"ModuleInstance\"}],\"typeName\":\"ModuleLike\"}},{\"kind\":4}]},\"optional\":true},{\"$tsfNode\":2},{\"$tsfNode\":3},{\"$tsfNode\":4},{\"$tsfNode\":5},{\"$tsfNode\":6}],\"typeParameters\":[\"C\"]},\"optional\":false}]}],\"typeName\":\"ModuleLike\"}},{\"kind\":4}]},\"optional\":true},{\"$tsfNode\":2},{\"$tsfNode\":3},{\"$tsfNode\":4},{\"$tsfNode\":5},{\"$tsfNode\":6}],\"typeParameters\":[\"C\"]}],[{\"kind\":20,\"name\":\"config\",\"type\":{\"$tsfNode\":7},\"optional\":true},{\"kind\":20,\"name\":\"defaultConfig\",\"type\":{\"$tsfNode\":8},\"optional\":true},{\"kind\":20,\"name\":\"exports\",\"type\":{\"$tsfNode\":9},\"optional\":true},{\"kind\":20,\"name\":\"providers\",\"type\":{\"$tsfNode\":10},\"optional\":true},{\"kind\":20,\"name\":\"controllers\",\"type\":{\"$tsfNode\":11},\"optional\":true},{\"kind\":20,\"name\":\"listeners\",\"type\":{\"$tsfNode\":11},\"optional\":true},{\"kind\":20,\"name\":\"commands\",\"type\":{\"$tsfNode\":11},\"optional\":true},{\"kind\":12,\"types\":{\"$tsfNode\":12}},{\"kind\":12,\"types\":{\"$tsfNode\":13}},{\"kind\":12,\"types\":{\"$tsfNode\":14}},{\"kind\":12,\"types\":{\"$tsfNode\":15}},{\"kind\":12,\"types\":{\"$tsfNode\":16}},[{\"$tsfNode\":17},{\"kind\":4}],[{\"$tsfNode\":18},{\"kind\":4}],[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Token\"}},{\"kind\":4}],[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Provider\"}},{\"kind\":4}],[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"ClassType\"}},{\"kind\":4}],{\"kind\":2,\"typeName\":\"new (...args: any[]) =\\u003e C\",\"typeName\":\"ClassType\"},{\"kind\":18,\"typeName\":\"Partial\",\"utilityType\":\"Partial\",\"typeArguments\":[{\"kind\":2,\"typeName\":\"C\"}],\"utilityKeys\":[],\"types\":[]}]]", []);
12
+ const __tsf_metadata_type = _a.createCompactMetadataRegistryV2("[2,[{\"kind\":2,\"typeName\":\"Token\",\"typeArguments\":[{\"kind\":2,\"typeName\":\"T\"}]},{\"kind\":2,\"typeName\":\"T\"},{\"kind\":2,\"typeName\":\"Token\"},{\"kind\":7},{\"kind\":8},{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Token\"}},{\"kind\":2},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":14,\"type\":{\"kind\":18,\"types\":[{\"kind\":20,\"name\":\"token\",\"type\":{\"kind\":2,\"typeName\":\"Token\"},\"optional\":false},{\"kind\":20,\"name\":\"provider\",\"type\":{\"kind\":2,\"typeName\":\"Provider\"},\"optional\":false},{\"kind\":20,\"name\":\"moduleId\",\"type\":{\"kind\":7},\"optional\":false},{\"kind\":20,\"name\":\"exported\",\"type\":{\"kind\":8},\"optional\":false}]}},{\"kind\":18,\"typeName\":\"ModuleDefinition\",\"types\":[{\"kind\":20,\"name\":\"config\",\"type\":{\"kind\":12,\"types\":[{\"kind\":2,\"typeName\":\"new (...args: any[]) =\\u003e C\",\"typeName\":\"ClassType\"},{\"kind\":4}]},\"optional\":true},{\"kind\":20,\"name\":\"defaultConfig\",\"type\":{\"kind\":12,\"types\":[{\"kind\":18,\"typeName\":\"Partial\",\"utilityType\":\"Partial\",\"typeArguments\":[{\"kind\":2,\"typeName\":\"C\"}],\"utilityKeys\":[],\"types\":[]},{\"kind\":4}]},\"optional\":true},{\"kind\":20,\"name\":\"imports\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":12,\"types\":[{\"kind\":2,\"typeName\":\"ModuleDefinition\"},{\"kind\":2,\"typeName\":\"ClassType\"},{\"kind\":18,\"typeName\":\"ModuleInstance\",\"types\":[{\"kind\":20,\"name\":\"definition\",\"type\":{\"kind\":2,\"typeName\":\"ModuleDefinition\"},\"optional\":false}]}],\"typeName\":\"ModuleLike\"}},{\"kind\":4}]},\"optional\":true},{\"kind\":20,\"name\":\"exports\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Token\"}},{\"kind\":4}]},\"optional\":true},{\"kind\":20,\"name\":\"providers\",\"type\":{\"kind\":12,\"types\":[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"Provider\"}},{\"kind\":4}]},\"optional\":true},{\"kind\":20,\"name\":\"controllers\",\"type\":{\"$tsfNode\":0},\"optional\":true},{\"kind\":20,\"name\":\"listeners\",\"type\":{\"$tsfNode\":0},\"optional\":true},{\"kind\":20,\"name\":\"commands\",\"type\":{\"$tsfNode\":0},\"optional\":true}],\"typeParameters\":[\"C\"]}],[{\"kind\":12,\"types\":{\"$tsfNode\":1}},[{\"kind\":14,\"type\":{\"kind\":2,\"typeName\":\"ClassType\"}},{\"kind\":4}]]]", []);
13
13
  let _ContainerMetadata_1;
14
14
  class Container {
15
15
  modules = [];
@@ -13,6 +13,7 @@ export * from './redis/cache';
13
13
  export * from './redis/broadcast';
14
14
  export { flattenMutexKey, MutexAcquisitionError, registerMutexObserver, resetMutexRedisConnection, withMutex, withMutexes, type MutexContext, type MutexFn, type MutexKey as HelperMutexKey, type MutexObservation, type MutexObserver, type MutexOptions, type RedisMutexClient, type RedisMutexProvider } from './redis/mutex';
15
15
  export * from './redis/redis';
16
+ export { createRecoveringRedisClient } from './redis/recovery';
16
17
  export * from './security/crypto';
17
18
  export * from './security/validation';
18
19
  export * from './utils/date';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACH,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,yBAAyB,EACzB,SAAS,EACT,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,OAAO,EACZ,KAAK,QAAQ,IAAI,cAAc,EAC/B,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAC1B,MAAM,eAAe,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACH,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,yBAAyB,EACzB,SAAS,EACT,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,OAAO,EACZ,KAAK,QAAQ,IAAI,cAAc,EAC/B,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAC1B,MAAM,eAAe,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.__tsfTypeAliases = exports.withMutexes = exports.withMutex = exports.resetMutexRedisConnection = exports.registerMutexObserver = exports.MutexAcquisitionError = exports.flattenMutexKey = void 0;
3
+ exports.__tsfTypeAliases = exports.createRecoveringRedisClient = exports.withMutexes = exports.withMutex = exports.resetMutexRedisConnection = exports.registerMutexObserver = exports.MutexAcquisitionError = exports.flattenMutexKey = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const _a = tslib_1.__importStar(require("@zyno-io/ts-reflection/type-metadata-runtime"));
6
6
  tslib_1.__exportStar(require("./availability"), exports);
@@ -24,6 +24,8 @@ Object.defineProperty(exports, "resetMutexRedisConnection", { enumerable: true,
24
24
  Object.defineProperty(exports, "withMutex", { enumerable: true, get: function () { return mutex_1.withMutex; } });
25
25
  Object.defineProperty(exports, "withMutexes", { enumerable: true, get: function () { return mutex_1.withMutexes; } });
26
26
  tslib_1.__exportStar(require("./redis/redis"), exports);
27
+ var recovery_1 = require("./redis/recovery");
28
+ Object.defineProperty(exports, "createRecoveringRedisClient", { enumerable: true, get: function () { return recovery_1.createRecoveringRedisClient; } });
27
29
  tslib_1.__exportStar(require("./security/crypto"), exports);
28
30
  tslib_1.__exportStar(require("./security/validation"), exports);
29
31
  tslib_1.__exportStar(require("./utils/date"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA+B;AAC/B,0DAAgC;AAChC,0DAAgC;AAChC,0DAAgC;AAChC,uDAA6B;AAC7B,yDAA+B;AAC/B,+DAAqC;AACrC,6DAAmC;AACnC,uDAA6B;AAC7B,sDAA4B;AAC5B,+DAAqC;AACrC,wDAA8B;AAC9B,4DAAkC;AAClC,uCAeuB;AAdnB,wGAAA,eAAe,OAAA;AACf,8GAAA,qBAAqB,OAAA;AACrB,8GAAA,qBAAqB,OAAA;AACrB,kHAAA,yBAAyB,OAAA;AACzB,kGAAA,SAAS,OAAA;AACT,oGAAA,WAAW,OAAA;AAUf,wDAA8B;AAC9B,4DAAkC;AAClC,gEAAsC;AACtC,uDAA6B;AAC7B,wDAA8B;AAC9B,wDAA8B;AAC9B,uDAA6B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA+B;AAC/B,0DAAgC;AAChC,0DAAgC;AAChC,0DAAgC;AAChC,uDAA6B;AAC7B,yDAA+B;AAC/B,+DAAqC;AACrC,6DAAmC;AACnC,uDAA6B;AAC7B,sDAA4B;AAC5B,+DAAqC;AACrC,wDAA8B;AAC9B,4DAAkC;AAClC,uCAeuB;AAdnB,wGAAA,eAAe,OAAA;AACf,8GAAA,qBAAqB,OAAA;AACrB,8GAAA,qBAAqB,OAAA;AACrB,kHAAA,yBAAyB,OAAA;AACzB,kGAAA,SAAS,OAAA;AACT,oGAAA,WAAW,OAAA;AAUf,wDAA8B;AAC9B,6CAA+D;AAAtD,uHAAA,2BAA2B,OAAA;AACpC,4DAAkC;AAClC,gEAAsC;AACtC,uDAA6B;AAC7B,wDAA8B;AAC9B,wDAA8B;AAC9B,uDAA6B"}
@@ -4,7 +4,7 @@ export interface RedisEndEmitter {
4
4
  /**
5
5
  * Invalidates module-level state that retains Redis clients across application lifetimes.
6
6
  *
7
- * `createRedis()` owns closing each client during app shutdown, but helpers such as Cache, Mutex, and Mesh
7
+ * The recovering client factory owns closing each client during app shutdown, but helpers such as Cache, Mutex, and Mesh
8
8
  * also cache those clients in module-level variables. Those references must be cleared synchronously before
9
9
  * the next app can reuse the helper; waiting only for ioredis's asynchronous `end` event can briefly expose a
10
10
  * closed client to the new app. Managed clients can recover after an unexpected
@@ -15,7 +15,7 @@ export interface RedisEndEmitter {
15
15
  * app cleanup. Supplying multiple clients supports state, such as the broadcast runtime, that becomes invalid
16
16
  * as soon as any one of its clients ends.
17
17
  *
18
- * This helper only invalidates the caller's cached state. Client shutdown remains owned by `createRedis()`.
18
+ * This helper only invalidates the caller's cached state. The client factory registers shutdown separately.
19
19
  */
20
20
  export declare function registerRedisStateReset(clients: RedisEndEmitter | readonly RedisEndEmitter[], reset: () => void): void;
21
21
  //# sourceMappingURL=lifecycle.d.ts.map
@@ -9,7 +9,7 @@ const recovery_1 = require("./recovery");
9
9
  /**
10
10
  * Invalidates module-level state that retains Redis clients across application lifetimes.
11
11
  *
12
- * `createRedis()` owns closing each client during app shutdown, but helpers such as Cache, Mutex, and Mesh
12
+ * The recovering client factory owns closing each client during app shutdown, but helpers such as Cache, Mutex, and Mesh
13
13
  * also cache those clients in module-level variables. Those references must be cleared synchronously before
14
14
  * the next app can reuse the helper; waiting only for ioredis's asynchronous `end` event can briefly expose a
15
15
  * closed client to the new app. Managed clients can recover after an unexpected
@@ -20,7 +20,7 @@ const recovery_1 = require("./recovery");
20
20
  * app cleanup. Supplying multiple clients supports state, such as the broadcast runtime, that becomes invalid
21
21
  * as soon as any one of its clients ends.
22
22
  *
23
- * This helper only invalidates the caller's cached state. Client shutdown remains owned by `createRedis()`.
23
+ * This helper only invalidates the caller's cached state. The client factory registers shutdown separately.
24
24
  */
25
25
  function registerRedisStateReset(clients, reset) {
26
26
  const redisClients = Array.isArray(clients) ? clients : [clients];
@@ -1,6 +1,10 @@
1
1
  import Redis, { type RedisOptions } from 'ioredis';
2
2
  /** Whether an end event is transient rather than an explicit client shutdown. */
3
3
  export declare function isRedisClientRecovering(client: object): boolean;
4
+ /** Own the client through the current app when present; standalone callers close it explicitly. */
4
5
  export declare function createRecoveringRedisClient(options: RedisOptions): Redis;
6
+ export declare function disconnectAllRedis(): Promise<void>;
7
+ /** Close a client and stop recovery, including non-ready connections and failed QUITs. */
8
+ export declare function closeRedisClient(client: Pick<Redis, 'status' | 'quit' | 'disconnect'>): Promise<void>;
5
9
  export declare function isRedisConnectionClosedError(error: unknown): boolean;
6
10
  //# sourceMappingURL=recovery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../src/helpers/redis/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAInD,iFAAiF;AACjF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CAExE;AAqED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpE"}
1
+ {"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../src/helpers/redis/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AASnD,iFAAiF;AACjF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,mGAAmG;AACnG,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CAQxE;AA4FD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIxD;AAED,0FAA0F;AAC1F,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB3G;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpE"}
@@ -2,34 +2,64 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.isRedisClientRecovering = isRedisClientRecovering;
4
4
  exports.createRecoveringRedisClient = createRecoveringRedisClient;
5
+ exports.disconnectAllRedis = disconnectAllRedis;
6
+ exports.closeRedisClient = closeRedisClient;
5
7
  exports.isRedisConnectionClosedError = isRedisConnectionClosedError;
6
8
  const tslib_1 = require("tslib");
7
9
  const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
10
+ const current_1 = require("../../app/current");
8
11
  const recoveringClients = new WeakSet();
12
+ const allClients = new Set();
13
+ const REDIS_SHUTDOWN_GRACE_MS = 1_000;
9
14
  /** Whether an end event is transient rather than an explicit client shutdown. */
10
15
  function isRedisClientRecovering(client) {
11
16
  return recoveringClients.has(client);
12
17
  }
18
+ /** Own the client through the current app when present; standalone callers close it explicitly. */
13
19
  function createRecoveringRedisClient(options) {
14
- return manageRedisClient(new ioredis_1.default(options));
20
+ let owner;
21
+ try {
22
+ owner = (0, current_1.getCurrentApp)();
23
+ }
24
+ catch {
25
+ // Standalone clients, including worker threads, have no application owner.
26
+ }
27
+ return manageRedisClient(new ioredis_1.default(options), owner);
15
28
  }
16
- function manageRedisClient(client) {
29
+ function manageRedisClient(client, owner) {
17
30
  const connect = client.connect.bind(client);
18
31
  const disconnect = client.disconnect.bind(client);
19
32
  const sendCommand = client.sendCommand.bind(client);
20
33
  const duplicate = client.duplicate.bind(client);
21
34
  let timer;
22
35
  let failures = 0;
23
- recoveringClients.add(client);
36
+ let unregisterCleanup;
37
+ const track = () => {
38
+ recoveringClients.add(client);
39
+ if (unregisterCleanup)
40
+ return;
41
+ allClients.add(client);
42
+ const unregisterAppCleanup = owner?.registerCleanup(() => closeRedisClient(client));
43
+ unregisterCleanup = () => {
44
+ allClients.delete(client);
45
+ unregisterAppCleanup?.();
46
+ };
47
+ };
48
+ track();
24
49
  const clearRetry = () => {
25
50
  if (timer)
26
51
  clearTimeout(timer);
27
52
  timer = undefined;
28
53
  };
29
- const stop = () => {
54
+ const pauseRecovery = () => {
30
55
  recoveringClients.delete(client);
31
56
  clearRetry();
32
57
  };
58
+ const stop = () => {
59
+ pauseRecovery();
60
+ unregisterCleanup?.();
61
+ unregisterCleanup = undefined;
62
+ };
33
63
  const reconnect = () => {
34
64
  if (!isRedisClientRecovering(client) || client.status !== 'end')
35
65
  return;
@@ -51,7 +81,7 @@ function manageRedisClient(client) {
51
81
  client.connect = callback => {
52
82
  // BullMQ deliberately disconnects and reconnects blocking clients when
53
83
  // abandoning a stuck read. An explicit connect starts a new lifetime.
54
- recoveringClients.add(client);
84
+ track();
55
85
  clearRetry();
56
86
  return connect(callback);
57
87
  };
@@ -61,13 +91,18 @@ function manageRedisClient(client) {
61
91
  disconnect(reconnect);
62
92
  };
63
93
  client.sendCommand = (command, stream) => {
64
- if (command.name === 'quit')
65
- stop();
94
+ if (command.name === 'quit') {
95
+ // A rejected or blocked QUIT has not released the connection yet.
96
+ pauseRecovery();
97
+ if (client.status === 'end')
98
+ stop();
99
+ }
66
100
  else
67
101
  reconnect();
68
102
  return sendCommand(command, stream);
69
103
  };
70
- client.duplicate = ((...args) => manageRedisClient(duplicate(...args)));
104
+ // Duplicates belong to the original owner even if another app is now current.
105
+ client.duplicate = ((...args) => manageRedisClient(duplicate(...args), owner));
71
106
  client.on('ready', () => {
72
107
  failures = 0;
73
108
  clearRetry();
@@ -75,12 +110,46 @@ function manageRedisClient(client) {
75
110
  client.on('end', () => {
76
111
  if (client.status !== 'end')
77
112
  return;
113
+ const recovering = isRedisClientRecovering(client);
114
+ if (!recovering)
115
+ stop();
78
116
  // Also release Sentinel's separate failover subscription and retry timer.
79
- disconnect(isRedisClientRecovering(client));
117
+ disconnect(recovering);
80
118
  scheduleRetry();
81
119
  });
82
120
  return client;
83
121
  }
122
+ async function disconnectAllRedis() {
123
+ const clients = [...allClients];
124
+ allClients.clear();
125
+ await Promise.all(clients.map(closeRedisClient));
126
+ }
127
+ /** Close a client and stop recovery, including non-ready connections and failed QUITs. */
128
+ async function closeRedisClient(client) {
129
+ if (client.status !== 'ready') {
130
+ client.disconnect();
131
+ return;
132
+ }
133
+ let timer;
134
+ try {
135
+ await Promise.race([
136
+ client.quit(),
137
+ new Promise(resolve => {
138
+ // QUIT may be queued behind an indefinite blocking command.
139
+ timer = setTimeout(resolve, REDIS_SHUTDOWN_GRACE_MS);
140
+ timer.unref();
141
+ })
142
+ ]);
143
+ }
144
+ catch {
145
+ // A disconnected server cannot acknowledge QUIT.
146
+ }
147
+ finally {
148
+ if (timer)
149
+ clearTimeout(timer);
150
+ client.disconnect();
151
+ }
152
+ }
84
153
  function isRedisConnectionClosedError(error) {
85
154
  return error instanceof Error && error.message === 'Connection is closed.';
86
155
  }
@@ -1 +1 @@
1
- {"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../../src/helpers/redis/recovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../../src/helpers/redis/recovery.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
- import Redis, { type RedisOptions } from 'ioredis';
1
+ import type Redis from 'ioredis';
2
+ import type { RedisOptions } from 'ioredis';
3
+ export { disconnectAllRedis } from './recovery';
2
4
  export interface RedisConnection<TClient = Redis> {
3
5
  client: TClient;
4
6
  prefix: string;
@@ -8,5 +10,4 @@ export declare function createRedisOptions(configPrefix?: string): {
8
10
  prefix: string;
9
11
  };
10
12
  export declare function createRedis(configPrefix?: string): RedisConnection;
11
- export declare function disconnectAllRedis(): Promise<void>;
12
13
  //# sourceMappingURL=redis.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../../src/helpers/redis/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAMnD,MAAM,WAAW,eAAe,CAAC,OAAO,GAAG,KAAK;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,kBAAkB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG;IACvD,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAClB,CA6DA;AAID,wBAAgB,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,CAiBlE;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIxD"}
1
+ {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../../src/helpers/redis/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAM5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,eAAe,CAAC,OAAO,GAAG,KAAK;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,kBAAkB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG;IACvD,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAClB,CA6DA;AAED,wBAAgB,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,CAIlE"}
@@ -1,14 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.__tsfTypeAliases = void 0;
3
+ exports.__tsfTypeAliases = exports.disconnectAllRedis = void 0;
4
4
  exports.createRedisOptions = createRedisOptions;
5
5
  exports.createRedis = createRedis;
6
- exports.disconnectAllRedis = disconnectAllRedis;
7
6
  const tslib_1 = require("tslib");
8
7
  const _a = tslib_1.__importStar(require("@zyno-io/ts-reflection/type-metadata-runtime"));
9
8
  const resolver_1 = require("../../app/resolver");
10
9
  const package_1 = require("../io/package");
11
10
  const recovery_1 = require("./recovery");
11
+ var recovery_2 = require("./recovery");
12
+ Object.defineProperty(exports, "disconnectAllRedis", { enumerable: true, get: function () { return recovery_2.disconnectAllRedis; } });
12
13
  function createRedisOptions(configPrefix) {
13
14
  const config = { ...(0, resolver_1.getAppConfig)() };
14
15
  if (configPrefix) {
@@ -67,45 +68,10 @@ function createRedisOptions(configPrefix) {
67
68
  }
68
69
  throw new Error('REDIS_HOST or REDIS_SENTINEL_HOST must be configured');
69
70
  }
70
- const allClients = new Set();
71
71
  function createRedis(configPrefix) {
72
72
  const { options, prefix } = createRedisOptions(configPrefix);
73
73
  const client = (0, recovery_1.createRecoveringRedisClient)(options);
74
- allClients.add(client);
75
- const unregisterCleanup = (0, resolver_1.registerAppCleanup)(async () => {
76
- allClients.delete(client);
77
- await closeRedisClient(client);
78
- });
79
- client.on('end', () => {
80
- if ((0, recovery_1.isRedisClientRecovering)(client))
81
- return;
82
- // QUIT closes the data socket, but ioredis's Sentinel detector owns
83
- // a separate subscription/retry timer. Release that connector too.
84
- client.disconnect();
85
- allClients.delete(client);
86
- unregisterCleanup();
87
- });
88
74
  return { client, prefix };
89
75
  }
90
- async function disconnectAllRedis() {
91
- const clients = [...allClients];
92
- allClients.clear();
93
- await Promise.all(clients.map(closeRedisClient));
94
- }
95
- async function closeRedisClient(client) {
96
- if (client.status !== 'ready') {
97
- client.disconnect();
98
- return;
99
- }
100
- try {
101
- await client.quit();
102
- }
103
- catch {
104
- // A disconnected server cannot acknowledge QUIT.
105
- }
106
- finally {
107
- client.disconnect();
108
- }
109
- }
110
76
  exports.__tsfTypeAliases = _a.decodeCompactMetadataV2("[2,{\"RedisConnection\":{\"kind\":18,\"typeName\":\"RedisConnection\",\"types\":[{\"kind\":20,\"name\":\"client\",\"type\":{\"kind\":2,\"typeName\":\"TClient\"},\"optional\":false},{\"kind\":20,\"name\":\"prefix\",\"type\":{\"kind\":6},\"optional\":false}],\"typeParameters\":[\"TClient\"]}},[]]", []);
111
77
  //# sourceMappingURL=redis.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/helpers/redis/redis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/helpers/redis/redis.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zyno-io/ts-server-foundation",
3
- "version": "26.1028.1719",
3
+ "version": "26.1029.216",
4
4
  "description": "TypeScript server foundation with reflected type metadata",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -96,7 +96,7 @@
96
96
  "@ttsc/graph": "^0.30.1",
97
97
  "@types/ws": "^8.18.1",
98
98
  "@zyno-io/config": "^1.14.0",
99
- "@zyno-io/ts-reflection": "26.1028.1719",
99
+ "@zyno-io/ts-reflection": "26.1029.216",
100
100
  "bcrypt": "^6.0.0",
101
101
  "bullmq": "^6.3.4",
102
102
  "busboy": "^1.6.0",