@hotmeshio/hotmesh 0.3.19 → 0.3.21

package/index.ts

@@ -7,26 +7,45 @@ import { MeshData } from './services/meshdata';
 import { MeshOS } from './services/meshos';
 import * as Errors from './modules/errors';
 import * as Utils from './modules/utils';
+import * as Enums from './modules/enums';
+import * as KeyStore from './modules/key';
 import { ConnectorService as Connector } from './services/connector/factory';
+import { PostgresConnection as ConnectorPostgres } from './services/connector/providers/postgres';
+import { RedisConnection as ConnectorIORedis } from './services/connector/providers/ioredis';
+import { RedisConnection as ConnectorRedis } from './services/connector/providers/redis';
+import { NatsConnection as ConnectorNATS } from './services/connector/providers/nats';
 
 const { Client, Connection, Search, Worker, workflow } = MeshFlow;
 
 export {
-  Client,
-  Connection,
-  Connector,
-  Errors,
+  //Provider Connectors
+  Connector, //factory
+  ConnectorIORedis,
+  ConnectorNATS,
+  ConnectorPostgres,
+  ConnectorRedis,
+
+  //Top-level Modules
   HotMesh,
   HotMeshConfig,
   MeshCall,
   MeshData,
   MeshFlow,
   MeshOS,
+
+  //MeshFlow Submodules
+  Client,
+  Connection,
   Search,
-  Utils,
   Worker,
   workflow,
   WorkflowHandle,
+
+  //Global Modules
+  Enums,
+  Errors,
+  Utils,
+  KeyStore,
 };
 
 export * as Types from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "Serverless Workflow",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -27,14 +27,14 @@
     "test:connect:nats": "NODE_ENV=test jest ./tests/unit/services/connector/providers/nats.test.ts --detectOpenHandles --forceExit --verbose",
     "test:cycle": "NODE_ENV=test jest ./tests/functional/cycle/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow": "NODE_ENV=test jest ./tests/meshflow/*/*.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshflow:basic": "NODE_ENV=test jest ./tests/meshflow/basic/*.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:meshflow:basic": "HMSH_LOGLEVEL=info NODE_ENV=test jest ./tests/meshflow/basic/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:collision": "NODE_ENV=test jest ./tests/meshflow/collision/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:fatal": "NODE_ENV=test jest ./tests/meshflow/fatal/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:goodbye": "NODE_ENV=test jest ./tests/meshflow/goodbye/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:hello": "HMSH_LOGLEVEL=debug HMSH_IS_CLUSTER=true NODE_ENV=test jest ./tests/meshflow/helloworld/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:hook": "NODE_ENV=test jest ./tests/meshflow/hook/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:interrupt": "NODE_ENV=test jest ./tests/meshflow/interrupt/*.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshflow:loopactivity": "NODE_ENV=test jest ./tests/meshflow/loopactivity/*.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:meshflow:loopactivity": "NODE_ENV=test jest ./tests/meshflow/loopactivity/I.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:nested": "NODE_ENV=test jest ./tests/meshflow/nested/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:retry": "NODE_ENV=test jest ./tests/meshflow/retry/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:sleep": "NODE_ENV=test jest ./tests/meshflow/sleep/*.test.ts --detectOpenHandles --forceExit --verbose",
@@ -68,8 +68,9 @@
     "test:sub:ioredis": "NODE_ENV=test jest ./tests/functional/sub/providers/redis/ioredis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:sub:redis": "NODE_ENV=test jest ./tests/functional/sub/providers/redis/redis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:sub:postgres": "NODE_ENV=test jest ./tests/functional/sub/providers/postgres/postgres.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:sub:nats": "NODE_ENV=test jest ./tests/functional/sub/providers/nats/nats.test.ts --detectOpenHandles --forceExit --verbose",
     "test:trigger": "NODE_ENV=test jest ./tests/unit/services/activities/trigger.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshdata": "NODE_ENV=test jest ./tests/meshdata/postgres.test.ts --forceExit --verbose --detectOpenHandles",
+    "test:meshdata": "NODE_ENV=test jest ./tests/meshdata/*.test.ts --forceExit --verbose --detectOpenHandles",
     "test:meshos": "NODE_ENV=test HMSH_IS_CLUSTER=true jest ./tests/meshos/*.test.ts --forceExit --verbose --detectOpenHandles",
     "test:meshcall": "NODE_ENV=test jest ./tests/meshcall/*.test.ts --forceExit --verbose --detectOpenHandles",
     "test:unit": "NODE_ENV=test jest ./tests/unit/*/*/index.test.ts --detectOpenHandles --forceExit --verbose"

package/types/hotmesh.ts

@@ -4,7 +4,7 @@ import { HotMesh as HotMeshService } from '../services/hotmesh';
 import { HookRules } from './hook';
 import { StreamData, StreamDataResponse } from './stream';
 import { LogLevel } from './logger';
-import { ProviderClient, ProviderConfig } from './provider';
+import { ProviderClient, ProviderConfig, ProvidersConfig } from './provider';
 
 /**
  * the full set of entity types that are stored in the key/value store
@@ -88,19 +88,19 @@ type HotMeshEngine = {
    * short-form format for the connection options for the
    * store, stream, sub, and search clients
    */
-  connection?: ProviderConfig;
+  connection?: ProviderConfig | ProvidersConfig;
 
   /**
    * long-form format for the connection options for the
    * store, stream, sub, and search clients
    */
-  connections?: {
-    store: ProviderConfig;
-    stream: ProviderConfig;
-    sub: ProviderConfig;
-    pub?: ProviderConfig; //system injects if necessary (if store channel cannot be used for pub)
-    search?: ProviderConfig; //inherits from store if not set
-  };
+  // connections?: {
+  //   store: ProviderConfig;
+  //   stream: ProviderConfig;
+  //   sub: ProviderConfig;
+  //   pub?: ProviderConfig; //system injects if necessary (if store channel cannot be used for pub)
+  //   search?: ProviderConfig; //inherits from store if not set
+  // };
 
   /**
    * the number of milliseconds to wait before reclaiming a stream;
@@ -171,19 +171,19 @@ type HotMeshWorker = {
    * short-form format for the connection options for the
    * store, stream, sub, and search clients
    */
-  connection?: ProviderConfig;
+  connection?: ProviderConfig | ProvidersConfig;
 
   /**
    * long-form format for the connection options for the
    * store, stream, sub, and search clients
    */
-  connections?: {
-    store: ProviderConfig;
-    stream: ProviderConfig;
-    sub: ProviderConfig;
-    pub?: ProviderConfig; //if store channel cannot be used for pub
-    search?: ProviderConfig; //inherits from store if not set
-  };
+  // connections?: {
+  //   store: ProviderConfig;
+  //   stream: ProviderConfig;
+  //   sub: ProviderConfig;
+  //   pub?: ProviderConfig; //if store channel cannot be used for pub
+  //   search?: ProviderConfig; //inherits from store if not set
+  // };
 
   /**
    * the number of milliseconds to wait before reclaiming a stream;

package/types/manifest.ts

@@ -1,21 +1,13 @@
 import { MeshOS } from '../services/meshos';
 
 import { WorkflowSearchSchema } from './meshflow';
-import * as Types from './provider';
-import { ProviderConfig } from './provider';
+import { ProviderConfig, ProvidersConfig } from './provider';
 
 export type DB = {
   name: string;
   label: string;
   search: boolean;
-  connection?: Types.ProviderConfig;
-  connections?: {
-    store: ProviderConfig;
-    stream: ProviderConfig;
-    sub: ProviderConfig;
-    pub?: ProviderConfig; //system injects if necessary (if store channel cannot be used for pub)
-    search?: ProviderConfig; //inherits from store if not set
-  };
+  connection: ProviderConfig | ProvidersConfig;
 };
 
 export type SubClassInstance<T extends typeof MeshOS> = T extends abstract new (

package/types/nats.ts

@@ -35,6 +35,40 @@ export interface NatsConnection extends ProviderClient {
   close(): Promise<void>;
 }
 
+export interface NatsSubscriptionType {
+  /**
+   * Unsubscribes from the subject, stopping message delivery.
+   */
+  unsubscribe(): void;
+
+  /**
+   * Drains the subscription, ensuring all pending messages are delivered
+   * before unsubscribing.
+   * @returns Promise<void>
+   */
+  drain(): Promise<void>;
+
+  /**
+   * The subject this subscription is listening to.
+   */
+  subject: string;
+
+  /**
+   * The queue group this subscription belongs to, if any.
+   */
+  queue?: string;
+
+  /**
+   * Indicates whether this subscription is currently active.
+   */
+  isClosed: boolean;
+
+  /**
+   * Async iterator for processing incoming messages.
+   */
+  [Symbol.asyncIterator](): AsyncIterableIterator<NatsMessageType>;
+}
+
 /** Type representing the NATS Connection */
 export type NatsClientType = NatsConnection;
 

package/types/postgres.ts

@@ -21,18 +21,29 @@ export type PostgresJobEnumType =
 
 export type PostgresClassType = {
   new (options: PostgresClientOptions): PostgresClientType;
-  connect: (options: PostgresClientOptions) => Promise<PostgresClientType>;
 };
 
+export type PostgresPoolType = {
+  new (options: PostgresClientOptions): PostgresPoolClientType;
+  connect: (options: PostgresClientOptions) => Promise<PostgresClientType>;
+  //NOTE: query is a shorthand and includes implicit `connect/release` handled by pool
+  query: (text: string, values?: any[]) => Promise<PostgresQueryResultType>;
+};
+  
 export interface PostgresClientType {
+  connect: () => Promise<PostgresClientType>;
   query: (text: string, values?: any[]) => Promise<PostgresQueryResultType>;
   end: () => Promise<void>;
   // Include other methods if necessary
 }
 
 export interface PostgresPoolClientType {
-  query: (text: string, values?: any[]) => Promise<PostgresQueryResultType>;
+  connect: () => Promise<PostgresClientType>;
   release: () => void;
+  end: () => Promise<void>;
+  query: (text: string, values?: any[]) => Promise<PostgresQueryResultType>;
+  idleCount: number;
+  totalCount: number;
   // Include other methods if necessary
 }
 

package/types/provider.ts

@@ -67,8 +67,12 @@ export type TransactionResultList = (string | number)[]; // e.g., [3, 2, '0']
 export type ProviderConfig = {
   class: any;
   options: StringAnyType;
+  /* 'redis' (Class) | 'ioredis' (Class) | 'postgres' (Client module) | 'postgres.pool' | 'postgres.poolclient', 'nats' */
+  provider?: string; 
 };
 
+
+
 export type ProvidersConfig = {
   sub: ProviderConfig;
   store: ProviderConfig;