@hotmeshio/hotmesh 0.1.5 → 0.1.7

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.1.5",
+    "version": "0.1.7",
     "description": "Unbreakable Workflows",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",
@@ -41,7 +41,7 @@
         "test:durable:signal": "NODE_ENV=test jest ./tests/durable/signal/index.test.ts --detectOpenHandles --forceExit --verbose",
         "test:durable:unknown": "NODE_ENV=test jest ./tests/durable/unknown/index.test.ts --detectOpenHandles --forceExit --verbose",
         "test:emit": "NODE_ENV=test jest ./tests/functional/emit/index.test.ts --detectOpenHandles --forceExit --verbose",
-        "test:expired": "NODE_ENV=test jest ./tests/functional/expired/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:hook": "NODE_ENV=test jest ./tests/functional/hook/index.test.ts --detectOpenHandles --forceExit --verbose",

package/build/services/activities/trigger.js

@@ -25,16 +25,16 @@ class Trigger extends activity_1.Activity {
             telemetry.startJobSpan();
             telemetry.startActivitySpan(this.leg);
             this.mapJobData();
-            await this.setStateNX(options?.expired ? -1 : undefined);
+            await this.setStateNX(options?.pending ? -1 : undefined);
             this.adjacencyList = await this.filterAdjacent();
-            await this.setStatus(options?.expired ? -1 : this.adjacencyList.length);
+            await this.setStatus(options?.pending ? -1 : this.adjacencyList.length);
             this.bindSearchData(options);
             this.bindMarkerData(options);
             const multi = this.store.getMulti();
             await this.setState(multi);
             await this.setStats(multi);
-            if (options?.expired) {
-                await this.setExpired(options?.expired, multi);
+            if (options?.pending) {
+                await this.setExpired(options?.pending, multi);
             }
             else {
                 await this.registerJobDependency(multi);
@@ -47,8 +47,7 @@ class Trigger extends activity_1.Activity {
             const jobStatus = Number(this.context.metadata.js);
             telemetry.setJobAttributes({ 'app.job.jss': jobStatus });
             const attrs = { 'app.job.jss': jobStatus };
-            //only transition if not inited in an expired state
-            //todo: enable resume from expired state
+            //todo: enable resume from pending state
             if (jobStatus !== -1) {
                 const messageIds = await this.transition(this.adjacencyList, jobStatus);
                 if (messageIds.length) {

package/build/services/durable/client.js

@@ -76,7 +76,7 @@ class ClientService {
                 const jobId = await hotMeshClient.pub(`${options.namespace ?? factory_1.APP_ID}.execute`, payload, context, {
                     search: options?.search?.data,
                     marker: options?.marker,
-                    expired: options?.expired,
+                    pending: options?.pending,
                 });
                 return new handle_1.WorkflowHandleService(hotMeshClient, workflowTopic, jobId);
             },

package/build/services/durable/exporter.js

@@ -40,23 +40,23 @@ class ExporterService {
                 //transitions
                 this.inflateTransition(match, value, transitionsObject);
             }
-            else if (key.length === 3) {
-                //state
-                state[this.inflateKey(key)] = serializer_1.SerializerService.fromString(value);
-            }
             else if (key.startsWith('_')) {
                 //data
                 data[key.substring(1)] = value;
             }
             else if (key.startsWith('-')) {
                 //timeline
-                const keyParts = this.keyToObject(key); //key parts have meaning
+                const keyParts = this.keyToObject(key);
                 timeline.push({
                     ...keyParts,
                     key,
                     value: this.resolveValue(value, options.values),
                 });
             }
+            else if (key.length === 3) {
+                //state
+                state[this.inflateKey(key)] = serializer_1.SerializerService.fromString(value);
+            }
         });
         return this.filterFields({
             data: (0, utils_1.restoreHierarchy)(data),

package/build/services/engine/index.js

@@ -116,9 +116,9 @@ class EngineService {
         }
     }
     setCacheMode(cacheMode, untilVersion) {
-        this.logger.info(`engine-cache-updated`, {
+        this.logger.info(`engine-executable-cache`, {
             mode: cacheMode,
-            until: untilVersion,
+            [cacheMode === 'cache' ? 'target' : 'until']: untilVersion,
         });
         this.cacheMode = cacheMode;
         this.untilVersion = untilVersion;

package/build/services/store/index.js

@@ -1013,7 +1013,9 @@ class StoreService {
         //if a topic, update one
         const rate = options.throttle.toString();
         if (options.topic) {
-            await this.redisClient[this.commands.hset](key, { [options.topic]: rate });
+            await this.redisClient[this.commands.hset](key, {
+                [options.topic]: rate,
+            });
         }
         else {
             //if no topic, update all
@@ -1029,13 +1031,22 @@ class StoreService {
         return response ?? {};
     }
     async getThrottleRate(topic) {
+        //always return a valid number range
+        const resolveRate = (response, topic) => {
+            const rate = topic in response ? Number(response[topic]) : 0;
+            if (isNaN(rate))
+                return 0;
+            if (rate == -1)
+                return enums_1.MAX_DELAY;
+            return Math.max(Math.min(rate, enums_1.MAX_DELAY), 0);
+        };
         const response = await this.getThrottleRates();
-        const rate = topic in response ? Number(response[topic]) : 0;
-        if (isNaN(rate))
-            return 0;
-        if (rate == -1)
-            return enums_1.MAX_DELAY;
-        return Math.max(Math.min(rate, enums_1.MAX_DELAY), 0);
+        const globalRate = resolveRate(response, ':');
+        if (topic === ':' || !(topic in response)) {
+            //use global rate unless worker specifies rate
+            return globalRate;
+        }
+        return resolveRate(response, topic);
     }
 }
 exports.StoreService = StoreService;

package/build/types/durable.d.ts

@@ -261,16 +261,16 @@ type WorkflowOptions = {
      */
     await?: boolean;
     /**
-     * If provided, the job will initialize in an expired state, reserving
+     * If provided, the job will initialize in a pending state, reserving
      * only the job ID (HSETNX) and persisting search and marker (if provided).
      * If a `resume` signal is sent before the specified number of seconds,
-     * the job will resume as normal, transition to the adjacent children
+     * the job will resume as normal, transitioning to the adjacent children
      * of the trigger. If the job is not resumed within the number
      * of seconds specified, the job will be scrubbed. No dependencies
-     * are added for a job in an expired state; however, dependencies
+     * are added for a job in a pending state; however, dependencies
      * will be added after the job is resumed if relevant.
      */
-    expired?: number;
+    pending?: number;
 };
 /**
  * Options for setting up a hook.

package/build/types/job.d.ts

@@ -78,16 +78,16 @@ type ExtensionType = {
      */
     marker?: StringStringType;
     /**
-     * If provided, the job will initialize in an expired state, reserving
+     * If provided, the job will initialize in a pending state, reserving
      * only the job ID (HSETNX) and persisting search and marker (if provided).
      * If a `resume` signal is sent before the specified number of seconds,
-     * the job will resume as normal, transition the the adjacent children
-     * of the trigger. If the job is not resumed within the
-     * number of seconds specified, the job will be scrubbed. No dependencies
-     * are added for a job in an expired state; however, dependencies will be
-     * added after the job is resumed if relevant.
+     * the job will resume as normal, transitioning to the adjacent children
+     * of the trigger. If the job is not resumed within the number
+     * of seconds specified, the job will be scrubbed. No dependencies
+     * are added for a job in a pending state; however, dependencies
+     * will be added after the job is resumed if relevant.
      */
-    expired?: number;
+    pending?: number;
 };
 /**
  * job_status semaphore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Unbreakable Workflows",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -41,7 +41,7 @@
     "test:durable:signal": "NODE_ENV=test jest ./tests/durable/signal/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:durable:unknown": "NODE_ENV=test jest ./tests/durable/unknown/index.test.ts --detectOpenHandles --forceExit --verbose",
     "test:emit": "NODE_ENV=test jest ./tests/functional/emit/index.test.ts --detectOpenHandles --forceExit --verbose",
-    "test:expired": "NODE_ENV=test jest ./tests/functional/expired/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:hook": "NODE_ENV=test jest ./tests/functional/hook/index.test.ts --detectOpenHandles --forceExit --verbose",

package/types/durable.ts

@@ -315,16 +315,16 @@ type WorkflowOptions = {
   await?: boolean;
 
   /**
-   * If provided, the job will initialize in an expired state, reserving
+   * If provided, the job will initialize in a pending state, reserving
    * only the job ID (HSETNX) and persisting search and marker (if provided).
    * If a `resume` signal is sent before the specified number of seconds,
-   * the job will resume as normal, transition to the adjacent children
+   * the job will resume as normal, transitioning to the adjacent children
    * of the trigger. If the job is not resumed within the number
    * of seconds specified, the job will be scrubbed. No dependencies
-   * are added for a job in an expired state; however, dependencies
+   * are added for a job in a pending state; however, dependencies
    * will be added after the job is resumed if relevant.
    */
-  expired?: number;
+  pending?: number;
 };
 
 /**

package/types/job.ts

@@ -108,16 +108,16 @@ type ExtensionType = {
   marker?: StringStringType;
 
   /**
-   * If provided, the job will initialize in an expired state, reserving
+   * If provided, the job will initialize in a pending state, reserving
    * only the job ID (HSETNX) and persisting search and marker (if provided).
    * If a `resume` signal is sent before the specified number of seconds,
-   * the job will resume as normal, transition the the adjacent children
-   * of the trigger. If the job is not resumed within the
-   * number of seconds specified, the job will be scrubbed. No dependencies
-   * are added for a job in an expired state; however, dependencies will be
-   * added after the job is resumed if relevant.
+   * the job will resume as normal, transitioning to the adjacent children
+   * of the trigger. If the job is not resumed within the number
+   * of seconds specified, the job will be scrubbed. No dependencies
+   * are added for a job in a pending state; however, dependencies
+   * will be added after the job is resumed if relevant.
    */
-  expired?: number;
+  pending?: number;
 };
 
 /**