@hotmeshio/hotmesh 0.0.33 → 0.0.34

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.0.33",
+    "version": "0.0.34",
     "description": "Unbreakable Workflows",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -23,6 +23,7 @@
         "test:hmsh": "NODE_ENV=test jest ./tests/functional/index.test.ts --detectOpenHandles --verbose",
         "test:compile": "NODE_ENV=test jest ./tests/functional/compile/index.test.ts --detectOpenHandles --forceExit --verbose",
         "test:cycle": "NODE_ENV=test jest ./tests/functional/cycle/index.test.ts --detectOpenHandles --forceExit --verbose",
+        "test:trigger": "NODE_ENV=test jest ./tests/unit/services/activities/trigger.test.ts --detectOpenHandles --forceExit --verbose",
         "test:connect": "NODE_ENV=test jest ./tests/unit/services/connector/index.test.ts --detectOpenHandles --forceExit --verbose",
         "test:connect:redis": "NODE_ENV=test jest ./tests/unit/services/connector/clients/redis.test.ts --detectOpenHandles --forceExit --verbose",
         "test:connect:ioredis": "NODE_ENV=test jest ./tests/unit/services/connector/clients/ioredis.test.ts --detectOpenHandles --forceExit --verbose",

package/build/services/durable/client.js

@@ -178,9 +178,8 @@ class ClientService {
         }
     }
     static async shutdown() {
-        for (const [key, value] of ClientService.instances) {
-            const hotMesh = await value;
-            await hotMesh.stop();
+        for (const [_, hotMeshInstance] of ClientService.instances) {
+            (await hotMeshInstance).stop();
         }
     }
 }

package/build/services/durable/index.d.ts

@@ -12,5 +12,10 @@ export declare const Durable: {
     MeshOS: typeof MeshOSService;
     Worker: typeof WorkerService;
     workflow: typeof WorkflowService;
+    /**
+     * Shutdown everything. All connections, workers, and clients will be closed.
+     * Include in your signal handlers to ensure a clean shutdown.
+     */
+    shutdown(): Promise<void>;
 };
 export type { ContextType };

package/build/services/durable/index.js

@@ -7,6 +7,7 @@ const meshos_1 = require("./meshos");
 const search_1 = require("./search");
 const worker_1 = require("./worker");
 const workflow_1 = require("./workflow");
+const hotmesh_1 = require("../hotmesh");
 exports.Durable = {
     Client: client_1.ClientService,
     Connection: connection_1.ConnectionService,
@@ -14,4 +15,13 @@ exports.Durable = {
     MeshOS: meshos_1.MeshOSService,
     Worker: worker_1.WorkerService,
     workflow: workflow_1.WorkflowService,
+    /**
+     * Shutdown everything. All connections, workers, and clients will be closed.
+     * Include in your signal handlers to ensure a clean shutdown.
+     */
+    async shutdown() {
+        await client_1.ClientService.shutdown();
+        await worker_1.WorkerService.shutdown();
+        await hotmesh_1.HotMeshService.stop();
+    }
 };

package/build/services/durable/meshos.js

@@ -8,7 +8,6 @@ const client_1 = require("./client");
 const search_1 = require("./search");
 const worker_1 = require("./worker");
 const workflow_1 = require("./workflow");
-const stream_1 = require("../signaler/stream");
 /**
  * The base class for running MeshOS workflows.
  * Extend this class, add your Redis config, and add functions to
@@ -47,9 +46,7 @@ class MeshOSService {
      * @returns {Promise<void>}
      */
     static async stopWorkers() {
-        await _1.Durable.Client.shutdown();
-        await _1.Durable.Worker.shutdown();
-        await stream_1.StreamSignaler.stopConsuming();
+        await _1.Durable.shutdown();
     }
     /**
      * Initializes the worker(s). This is a static

package/build/services/durable/worker.js

@@ -240,9 +240,8 @@ class WorkerService {
         };
     }
     static async shutdown() {
-        for (const [key, value] of WorkerService.instances) {
-            const hotMesh = await value;
-            await hotMesh.stop();
+        for (const [_, hotMeshInstance] of WorkerService.instances) {
+            (await hotMeshInstance).stop();
         }
     }
 }

package/build/services/hotmesh/index.d.ts

@@ -16,6 +16,7 @@ declare class HotMeshService {
     quorum: QuorumService | null;
     workers: WorkerService[];
     logger: ILogger;
+    static disconnecting: boolean;
     verifyAndSetNamespace(namespace?: string): void;
     verifyAndSetAppId(appId: string): void;
     static init(config: HotMeshConfig): Promise<HotMeshService>;
@@ -42,7 +43,8 @@ declare class HotMeshService {
     scrub(jobId: string): Promise<void>;
     hook(topic: string, data: JobData, status?: StreamStatus, code?: StreamCode): Promise<string>;
     hookAll(hookTopic: string, data: JobData, query: JobStatsInput, queryFacets?: string[]): Promise<string[]>;
-    stop(): Promise<void>;
+    static stop(): Promise<void>;
+    stop(): void;
     compress(terms: string[]): Promise<boolean>;
 }
 export { HotMeshService };

package/build/services/hotmesh/index.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HotMeshService = void 0;
 const nanoid_1 = require("nanoid");
 const key_1 = require("../../modules/key");
+const redis_1 = require("../connector/clients/redis");
+const ioredis_1 = require("../connector/clients/ioredis");
 const engine_1 = require("../engine");
 const logger_1 = require("../logger");
 const stream_1 = require("../signaler/stream");
@@ -128,8 +130,15 @@ class HotMeshService {
     async hookAll(hookTopic, data, query, queryFacets = []) {
         return await this.engine?.hookAll(hookTopic, data, query, queryFacets);
     }
-    async stop() {
-        await stream_1.StreamSignaler.stopConsuming();
+    static async stop() {
+        if (!this.disconnecting) {
+            this.disconnecting = true;
+            await stream_1.StreamSignaler.stopConsuming();
+            await redis_1.RedisConnection.disconnectAll();
+            await ioredis_1.RedisConnection.disconnectAll();
+        }
+    }
+    stop() {
         this.engine?.task.cancelCleanup();
     }
     async compress(terms) {
@@ -137,3 +146,4 @@ class HotMeshService {
     }
 }
 exports.HotMeshService = HotMeshService;
+HotMeshService.disconnecting = false;

package/build/services/signaler/stream.js

@@ -220,12 +220,12 @@ class StreamSignaler {
         for (const instance of [...StreamSignaler.signalers]) {
             instance.stopConsuming();
         }
+        await (0, utils_1.sleepFor)(BLOCK_TIME_MS);
     }
     async stopConsuming() {
         this.shouldConsume = false;
         this.logger.info(`stream-consumer-stopping`, this.topic ? { topic: this.topic } : undefined);
         this.cancelThrottle();
-        //await sleepFor(BLOCK_TIME_MS);
     }
     cancelThrottle() {
         if (this.currentTimerId !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "Unbreakable Workflows",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,6 +23,7 @@
     "test:hmsh": "NODE_ENV=test jest ./tests/functional/index.test.ts --detectOpenHandles --verbose",
     "test:compile": "NODE_ENV=test jest ./tests/functional/compile/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:cycle": "NODE_ENV=test jest ./tests/functional/cycle/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:trigger": "NODE_ENV=test jest ./tests/unit/services/activities/trigger.test.ts --detectOpenHandles --forceExit --verbose",
     "test:connect": "NODE_ENV=test jest ./tests/unit/services/connector/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:connect:redis": "NODE_ENV=test jest ./tests/unit/services/connector/clients/redis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:connect:ioredis": "NODE_ENV=test jest ./tests/unit/services/connector/clients/ioredis.test.ts --detectOpenHandles --forceExit --verbose",

package/services/durable/client.ts

@@ -198,9 +198,8 @@ export class ClientService {
   }
 
   static async shutdown(): Promise<void> {
-    for (const [key, value] of ClientService.instances) {
-      const hotMesh = await value;
-      await hotMesh.stop();
+    for (const [_, hotMeshInstance] of ClientService.instances) {
+      (await hotMeshInstance).stop();
     }
   }
 }

package/services/durable/index.ts

@@ -4,6 +4,7 @@ import { MeshOSService } from './meshos';
 import { Search } from './search';
 import { WorkerService } from './worker';
 import { WorkflowService } from './workflow';
+import { HotMeshService } from '../hotmesh';
 import { ContextType } from '../../types/durable';
 
 export const Durable = {
@@ -13,6 +14,16 @@ export const Durable = {
   MeshOS: MeshOSService,
   Worker: WorkerService,
   workflow: WorkflowService,
+
+  /**
+   * Shutdown everything. All connections, workers, and clients will be closed.
+   * Include in your signal handlers to ensure a clean shutdown.
+   */
+  async shutdown(): Promise<void> {
+    await ClientService.shutdown();
+    await WorkerService.shutdown();
+    await HotMeshService.stop();
+  }
 };
 
 export type { ContextType };

package/services/durable/meshos.ts

@@ -7,7 +7,6 @@ import { WorkflowHandleService } from './handle';
 import { Search } from './search';
 import { WorkerService as Worker } from './worker';
 import { WorkflowService } from './workflow';
-import { StreamSignaler } from '../signaler/stream';
 import {
   FindOptions,
   FindWhereOptions,
@@ -135,9 +134,7 @@ export class MeshOSService {
    * @returns {Promise<void>}
    */
   static async stopWorkers(): Promise<void> {
-    await Durable.Client.shutdown();
-    await Durable.Worker.shutdown();
-    await StreamSignaler.stopConsuming();
+    await Durable.shutdown();
   }
 
   /**

package/services/durable/worker.ts

@@ -291,9 +291,8 @@ export class WorkerService {
   }
 
   static async shutdown(): Promise<void> {
-    for (const [key, value] of WorkerService.instances) {
-      const hotMesh = await value;
-      await hotMesh.stop();
+    for (const [_, hotMeshInstance] of WorkerService.instances) {
+      (await hotMeshInstance).stop();
     }
   }
 }

package/services/hotmesh/index.ts

@@ -1,5 +1,7 @@
 import { nanoid } from 'nanoid';
 import { HMNS } from '../../modules/key';
+import { RedisConnection } from '../connector/clients/redis';
+import { RedisConnection as IORedisConnection } from '../connector/clients/ioredis';
 import { EngineService } from '../engine';
 import { LoggerService, ILogger } from '../logger';
 import { StreamSignaler } from '../signaler/stream';
@@ -32,6 +34,8 @@ class HotMeshService {
   workers: WorkerService[] = [];
   logger: ILogger;
 
+  static disconnecting = false;
+
   verifyAndSetNamespace(namespace?: string) {
     if (!namespace) {
       this.namespace = HMNS;
@@ -176,8 +180,16 @@ class HotMeshService {
     return await this.engine?.hookAll(hookTopic, data, query, queryFacets);
   }
 
-  async stop() {
-    await StreamSignaler.stopConsuming();
+  static async stop() {
+    if (!this.disconnecting) {
+      this.disconnecting = true;
+      await StreamSignaler.stopConsuming();
+      await RedisConnection.disconnectAll();
+      await IORedisConnection.disconnectAll();
+    }
+  }
+
+  stop() {
     this.engine?.task.cancelCleanup();
   }
 

package/services/signaler/stream.ts

@@ -254,13 +254,13 @@ class StreamSignaler {
     for (const instance of [...StreamSignaler.signalers]) {
       instance.stopConsuming();
     }
+    await sleepFor(BLOCK_TIME_MS);
   }
   
   async stopConsuming() {
     this.shouldConsume = false;
     this.logger.info(`stream-consumer-stopping`, this.topic ? { topic: this.topic } : undefined);
     this.cancelThrottle();
-    //await sleepFor(BLOCK_TIME_MS);
   }
 
   cancelThrottle() {