@hotmeshio/hotmesh 0.3.10 → 0.3.12

package/build/types/manifest.d.ts

@@ -1,10 +1,19 @@
 import { MeshOS } from '../services/meshos';
-import * as Types from './index';
+import { WorkflowSearchSchema } from './meshflow';
+import * as Types from './provider';
+import { ProviderConfig } from './provider';
 export type DB = {
     name: string;
     label: string;
     search: boolean;
-    connection: Types.ProviderConfig;
+    connection?: Types.ProviderConfig;
+    connections?: {
+        store: ProviderConfig;
+        stream: ProviderConfig;
+        sub: ProviderConfig;
+        pub?: ProviderConfig;
+        search?: ProviderConfig;
+    };
 };
 export type SubClassInstance<T extends typeof MeshOS> = T extends abstract new (...args: any) => infer R ? R : never;
 export type AllSubclassInstances = SubClassInstance<(typeof MeshOS)['classes'][keyof (typeof MeshOS)['classes']]>;
@@ -13,7 +22,7 @@ export type SubclassType<T extends MeshOS = MeshOS> = new (...args: any[]) => T;
 export type Entity = {
     name: string;
     label: string;
-    schema: Types.WorkflowSearchSchema;
+    schema: WorkflowSearchSchema;
     class: SubclassType;
 };
 export type Namespace = {

package/build/types/meshflow.d.ts

@@ -1,6 +1,6 @@
 import { WorkflowHandleService } from '../services/meshflow/handle';
 import { LogLevel } from './logger';
-import { ProviderConfig } from './provider';
+import { ProviderConfig, ProvidersConfig } from './provider';
 import { StringAnyType, StringStringType } from './serializer';
 import { StreamData, StreamError } from './stream';
 type WorkflowConfig = {
@@ -106,7 +106,7 @@ type WorkflowDataType = {
     canRetry?: boolean;
     expire?: number;
 };
-type Connection = ProviderConfig;
+type Connection = ProviderConfig | ProvidersConfig;
 type ClientConfig = {
     connection: Connection;
 };

package/build/types/postgres.d.ts

@@ -7,6 +7,7 @@ export interface PostgresClientOptions {
     max?: number;
     idleTimeoutMillis?: number;
 }
+export type PostgresJobEnumType = 'status' | 'jdata' | 'adata' | 'udata' | 'jmark' | 'hmark' | 'other';
 export type PostgresClassType = {
     new (options: PostgresClientOptions): PostgresClientType;
     connect: (options: PostgresClientOptions) => Promise<PostgresClientType>;

package/build/types/provider.d.ts

@@ -9,7 +9,7 @@ export interface ProviderOptions {
 export type Providers = 'redis' | 'nats' | 'postgres' | 'ioredis';
 export interface ProviderTransaction {
     exec(): Promise<any>;
-    [key: string]: any;
+    [key: string]: ((...args: any[]) => Promise<any>) | undefined | any;
 }
 export interface ProviderNativeClient {
     [key: string]: any;
@@ -24,3 +24,53 @@ export type ProviderConfig = {
     class: any;
     options: StringAnyType;
 };
+export type ProvidersConfig = {
+    sub: ProviderConfig;
+    store: ProviderConfig;
+    stream: ProviderConfig;
+    pub?: ProviderConfig;
+    search?: ProviderConfig;
+};
+export interface SetOptions {
+    nx?: boolean;
+    ex?: number;
+}
+export interface HSetOptions {
+    nx?: boolean;
+    ex?: number;
+}
+export interface ZAddOptions {
+    nx?: boolean;
+}
+export interface HScanResult {
+    cursor: string;
+    items: Record<string, string>;
+}
+export interface KVSQLProviderTransaction extends ProviderTransaction {
+    [key: string]: any;
+    exec(): Promise<any[]>;
+    set(key: string, value: string, options?: SetOptions): ProviderTransaction;
+    get(key: string): ProviderTransaction;
+    del(key: string): ProviderTransaction;
+    expire(key: string, seconds: number): ProviderTransaction;
+    hset(key: string, fields: Record<string, string>, options?: HSetOptions): ProviderTransaction;
+    hget(key: string, field: string): ProviderTransaction;
+    hdel(key: string, fields: string[]): ProviderTransaction;
+    hmget(key: string, fields: string[]): ProviderTransaction;
+    hgetall(key: string): ProviderTransaction;
+    hincrbyfloat(key: string, field: string, value: number): ProviderTransaction;
+    hscan(key: string, cursor: string, count?: number): ProviderTransaction;
+    lrange(key: string, start: number, end: number): ProviderTransaction;
+    rpush(key: string, value: string): ProviderTransaction;
+    lpush(key: string, value: string): ProviderTransaction;
+    lpop(key: string): ProviderTransaction;
+    lmove(source: string, destination: string, srcPosition: 'LEFT' | 'RIGHT', destPosition: 'LEFT' | 'RIGHT'): ProviderTransaction;
+    zadd(key: string, score: number, member: string, options?: ZAddOptions): ProviderTransaction;
+    zrange(key: string, start: number, stop: number): ProviderTransaction;
+    zrangebyscore(key: string, min: number, max: number): ProviderTransaction;
+    zrangebyscore_withscores(key: string, min: number, max: number): ProviderTransaction;
+    zrem(key: string, member: string): ProviderTransaction;
+    zrank(key: string, member: string): ProviderTransaction;
+    scan(cursor: number, count?: number): ProviderTransaction;
+    rename(oldKey: string, newKey: string): ProviderTransaction;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Unbreakable Workflows",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -22,18 +22,20 @@
     "lint:fix": "eslint . --fix --ext .ts",
     "start": "ts-node src/index.ts",
     "test": "NODE_ENV=test jest --detectOpenHandles --forceExit --verbose",
-    "test:await": "NODE_ENV=test jest ./tests/functional/awaiter/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:await": "NODE_ENV=test jest ./tests/functional/awaiter/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:compile": "NODE_ENV=test jest ./tests/functional/compile/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:connect": "NODE_ENV=test jest ./tests/unit/services/connector/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:connect": "NODE_ENV=test jest ./tests/unit/services/connector/* --detectOpenHandles --forceExit --verbose",
     "test:connect:ioredis": "NODE_ENV=test jest ./tests/unit/services/connector/providers/ioredis.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:connect:postgres": "NODE_ENV=test jest ./tests/unit/services/connector/providers/postgres.test.ts --detectOpenHandles --forceExit --verbose",
     "test:connect:redis": "NODE_ENV=test jest ./tests/unit/services/connector/providers/redis.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:cycle": "NODE_ENV=test jest ./tests/functional/cycle/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshflow": "NODE_ENV=test jest ./tests/meshflow/*/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "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/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:collision": "NODE_ENV=test HMSH_LOGLEVEL=debug jest ./tests/meshflow/collision/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:fatal": "NODE_ENV=test jest ./tests/meshflow/fatal/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshflow:goodbye": "NODE_ENV=test jest ./tests/meshflow/goodbye/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:meshflow:hello": "HMSH_IS_CLUSTER=true NODE_ENV=test jest ./tests/meshflow/helloworld/index.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/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:interrupt": "NODE_ENV=test jest ./tests/meshflow/interrupt/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:meshflow:loopactivity": "NODE_ENV=test jest ./tests/meshflow/loopactivity/index.test.ts --detectOpenHandles --forceExit --verbose",
@@ -44,23 +46,24 @@
     "test:meshflow:unknown": "NODE_ENV=test jest ./tests/meshflow/unknown/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:emit": "NODE_ENV=test jest ./tests/functional/emit/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:pending": "NODE_ENV=test jest ./tests/functional/pending/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:functional": "NODE_ENV=test jest ./tests/functional/*/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:hmsh": "NODE_ENV=test jest ./tests/functional/index.test.ts --detectOpenHandles --verbose",
+    "test:functional": "NODE_ENV=test jest ./tests/functional/* --detectOpenHandles --forceExit --verbose",
+    "test:hmsh": "NODE_ENV=test jest ./tests/functional/*.test.ts --detectOpenHandles --verbose --forceExit",
     "test:hook": "NODE_ENV=test jest ./tests/functional/hook/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:interrupt": "NODE_ENV=test jest ./tests/functional/interrupt/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:parallel": "NODE_ENV=test jest ./tests/functional/parallel/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:pipe": "NODE_ENV=test jest ./tests/unit/services/pipe/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:quorum": "HMSH_IS_CLUSTER=true NODE_ENV=test jest ./tests/functional/quorum/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:quorum": "HMSH_IS_CLUSTER=true NODE_ENV=test jest ./tests/functional/quorum/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:reclaim": "NODE_ENV=test jest ./tests/functional/reclaim/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:redeploy": "NODE_ENV=test jest ./tests/functional/redeploy/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:redeploy": "NODE_ENV=test jest ./tests/functional/redeploy/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:reporter": "NODE_ENV=test jest ./tests/unit/services/reporter/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:reentrant": "NODE_ENV=test jest ./tests/functional/reentrant/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:retry": "NODE_ENV=test jest ./tests/functional/retry/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:sequence": "NODE_ENV=test jest ./tests/functional/sequence/index.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:sequence": "NODE_ENV=test HMSH_LOGLEVEL=debug jest ./tests/functional/sequence/*.test.ts --detectOpenHandles --forceExit --verbose",
     "test:signal": "NODE_ENV=test jest ./tests/functional/signal/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:status": "NODE_ENV=test jest ./tests/functional/status/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:store:ioredis": "NODE_ENV=test jest ./tests/functional/store/providers/redis/ioredis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:store:redis": "NODE_ENV=test jest ./tests/functional/store/providers/redis/redis.test.ts --detectOpenHandles --forceExit --verbose",
+    "test:store:postgres": "NODE_ENV=test jest ./tests/functional/store/providers/postgres/postgres.test.ts --detectOpenHandles --forceExit --verbose",
     "test:stream:ioredis": "NODE_ENV=test jest ./tests/functional/stream/providers/redis/ioredis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:stream:redis": "NODE_ENV=test jest ./tests/functional/stream/providers/redis/redis.test.ts --detectOpenHandles --forceExit --verbose",
     "test:stream:postgres": "NODE_ENV=test jest ./tests/functional/stream/providers/postgres/postgres.test.ts --detectOpenHandles --forceExit --verbose",
@@ -93,11 +96,13 @@
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
     "nanoid": "^3.3.6",
+    "pg-format": "^1.0.4",
     "winston": "^3.8.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.0",
     "@types/node": "^18.15.11",
+    "@types/pg": "^8.10.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.57.0",
@@ -107,21 +112,20 @@
     "ioredis": "^5.3.2",
     "javascript-obfuscator": "^4.1.1",
     "jest": "^29.5.0",
+    "nats": "^2.28.0",
+    "pg": "^8.10.0",
     "redis": "^4.6.13",
     "rimraf": "^4.4.1",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
     "typedoc": "^0.26.4",
-    "typescript": "^5.0.4",
-    "@types/pg": "^8.10.0",
-    "nats": "^2.28.0",
-    "pg": "^8.10.0"
+    "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "ioredis": "^4.0.0 || ^5.0.0",
-    "redis": "^4.0.0",
     "nats": "^2.0.0",
-    "pg": "^8.0.0"
+    "pg": "^8.0.0",
+    "redis": "^4.0.0"
   }
 }

package/types/hotmesh.ts

@@ -66,6 +66,12 @@ type HotMeshEngine = {
    * @private
    */
   sub?: ProviderClient;
+  /**
+   * set by hotmesh once the connnector service instances the provider
+   * AND if the provider requires a separate channel for publishing
+   * @private
+   */
+  pub?: ProviderClient;
   /**
    * set by hotmesh once the connnector service instances the provider
    * @private
@@ -92,6 +98,7 @@ type HotMeshEngine = {
     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
   };
 
@@ -126,6 +133,13 @@ type HotMeshWorker = {
    */
   topic: string;
 
+  /**
+   * set by hotmesh once the connnector service instances the provider
+   * AND if the provider requires a separate channel for publishing
+   * @private
+   */
+  pub?: ProviderClient;
+
   /**
    * set by hotmesh once the connnector service instances the provider
    * @private
@@ -167,6 +181,7 @@ type HotMeshWorker = {
     store: ProviderConfig;
     stream: ProviderConfig;
     sub: ProviderConfig;
+    pub?: ProviderConfig; //if store channel cannot be used for pub
     search?: ProviderConfig; //inherits from store if not set
   };
 

package/types/manifest.ts

@@ -1,12 +1,21 @@
 import { MeshOS } from '../services/meshos';
+import { WorkflowSearchSchema } from './meshflow';
 
-import * as Types from './index';
+import * as Types from './provider';
+import { ProviderConfig } from './provider';
 
 export type DB = {
   name: string;
   label: string;
   search: boolean;
-  connection: Types.ProviderConfig;
+  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
+  };
 };
 
 export type SubClassInstance<T extends typeof MeshOS> = T extends abstract new (
@@ -25,7 +34,7 @@ export type SubclassType<T extends MeshOS = MeshOS> = new (...args: any[]) => T;
 export type Entity = {
   name: string;
   label: string;
-  schema: Types.WorkflowSearchSchema;
+  schema: WorkflowSearchSchema;
   class: SubclassType;
 };
 

package/types/meshflow.ts

@@ -1,7 +1,7 @@
 import { WorkflowHandleService } from '../services/meshflow/handle';
 
 import { LogLevel } from './logger';
-import { ProviderConfig } from './provider';
+import { ProviderConfig, ProvidersConfig } from './provider';
 import { StringAnyType, StringStringType } from './serializer';
 import { StreamData, StreamError } from './stream';
 
@@ -435,7 +435,7 @@ type WorkflowDataType = {
   expire?: number;
 };
 
-type Connection = ProviderConfig;
+type Connection = ProviderConfig | ProvidersConfig;
 
 type ClientConfig = {
   connection: Connection;

package/types/postgres.ts

@@ -10,6 +10,8 @@ export interface PostgresClientOptions {
   // Add any other options you might need
 }
 
+export type PostgresJobEnumType = 'status' | 'jdata' | 'adata' | 'udata' | 'jmark' | 'hmark' | 'other';
+
 export type PostgresClassType = {
   new (options: PostgresClientOptions): PostgresClientType;
   connect: (options: PostgresClientOptions) => Promise<PostgresClientType>;

package/types/provider.ts

@@ -27,11 +27,10 @@ export type Providers = 'redis' | 'nats' | 'postgres' | 'ioredis';
  * execute as a single transaction.
  */
 export interface ProviderTransaction {
-  //outside callers can execute the transaction, regardless of provider by calling this method
   exec(): Promise<any>;
 
-  // All other transaction methods are provider specific
-  [key: string]: any;
+  // Allows callable properties while avoiding conflicts with ProviderTransaction instances
+  [key: string]: ((...args: any[]) => Promise<any>) | undefined | any;
 }
 
 /**
@@ -69,3 +68,82 @@ export type ProviderConfig = {
   class: any;
   options: StringAnyType;
 };
+
+export type ProvidersConfig  = {
+  sub: ProviderConfig;
+  store: ProviderConfig;
+  stream: ProviderConfig;
+  pub?: ProviderConfig;
+  search?: ProviderConfig;
+}
+
+export interface SetOptions {
+  nx?: boolean;
+  ex?: number; // Expiry time in seconds
+}
+
+export interface HSetOptions {
+  nx?: boolean;
+  ex?: number; // Expiry time in seconds
+}
+
+export interface ZAddOptions {
+  nx?: boolean;
+}
+
+export interface HScanResult {
+  cursor: string;
+  items: Record<string, string>;
+}
+
+export interface KVSQLProviderTransaction extends ProviderTransaction {
+  [key: string]: any;
+  exec(): Promise<any[]>;
+  set(key: string, value: string, options?: SetOptions): ProviderTransaction;
+  get(key: string): ProviderTransaction;
+  del(key: string): ProviderTransaction;
+  expire(key: string, seconds: number): ProviderTransaction;
+  hset(
+    key: string,
+    fields: Record<string, string>,
+    options?: HSetOptions
+  ): ProviderTransaction;
+  hget(key: string, field: string): ProviderTransaction;
+  hdel(key: string, fields: string[]): ProviderTransaction;
+  hmget(key: string, fields: string[]): ProviderTransaction;
+  hgetall(key: string): ProviderTransaction;
+  hincrbyfloat(
+    key: string,
+    field: string,
+    value: number
+  ): ProviderTransaction;
+  hscan(key: string, cursor: string, count?: number): ProviderTransaction;
+  lrange(key: string, start: number, end: number): ProviderTransaction;
+  rpush(key: string, value: string): ProviderTransaction;
+  lpush(key: string, value: string): ProviderTransaction;
+  lpop(key: string): ProviderTransaction;
+  lmove(
+    source: string,
+    destination: string,
+    srcPosition: 'LEFT' | 'RIGHT',
+    destPosition: 'LEFT' | 'RIGHT'
+  ): ProviderTransaction;
+  zadd(
+    key: string,
+    score: number,
+    member: string,
+    options?: ZAddOptions
+  ): ProviderTransaction;
+  zrange(key: string, start: number, stop: number): ProviderTransaction;
+  zrangebyscore(key: string, min: number, max: number): ProviderTransaction;
+  zrangebyscore_withscores(
+    key: string,
+    min: number,
+    max: number
+  ): ProviderTransaction;
+  zrem(key: string, member: string): ProviderTransaction;
+  zrank(key: string, member: string): ProviderTransaction;
+  scan(cursor: number, count?: number): ProviderTransaction;
+  rename(oldKey: string, newKey: string): ProviderTransaction;
+  // Add other methods as needed
+}