@hatchet-dev/typescript-sdk 0.15.1-alpha0 → 0.15.1-alpha2

package/clients/event/event-client.js

@@ -93,7 +93,7 @@ class EventClient {
             });
         }), this.logger).catch((e) => {
             // log a warning, but this is not a fatal error
-            this.logger.warn(`Could not put log: ${e.message}`);
+            this.logger.warn(`Could not put log: ${e.message.substring(0, 100)}`);
         });
     }
     putStream(stepRunId, data) {

package/clients/listener/child-listener-client.d.ts

@@ -11,6 +11,7 @@ export declare class Streamable {
 export declare class GrpcPooledListener {
     listener: AsyncIterable<WorkflowRunEvent> | undefined;
     requestEmitter: EventEmitter<[never]>;
+    signal: AbortController;
     client: ListenerClient;
     subscribers: Record<string, Streamable>;
     onFinish: () => void;

package/clients/listener/child-listener-client.js

@@ -38,7 +38,7 @@ const events_1 = require("events");
 const dispatcher_1 = require("../../protoc/dispatcher");
 const abort_controller_x_1 = require("abort-controller-x");
 const sleep_1 = __importDefault(require("../../util/sleep"));
-const DEFAULT_EVENT_LISTENER_RETRY_INTERVAL = 0.5; // seconds
+const DEFAULT_EVENT_LISTENER_RETRY_INTERVAL = 5; // seconds
 const DEFAULT_EVENT_LISTENER_RETRY_COUNT = 20;
 class Streamable {
     constructor(listener, id) {
@@ -61,6 +61,7 @@ exports.Streamable = Streamable;
 class GrpcPooledListener {
     constructor(client, onFinish) {
         this.requestEmitter = new events_1.EventEmitter();
+        this.signal = new AbortController();
         this.subscribers = {};
         this.onFinish = () => { };
         this.client = client;
@@ -78,7 +79,10 @@ class GrpcPooledListener {
             }
             try {
                 this.client.logger.debug('Initializing child-listener');
-                this.listener = this.client.client.subscribeToWorkflowRuns(this.request(), {});
+                this.signal = new AbortController();
+                this.listener = this.client.client.subscribeToWorkflowRuns(this.request(), {
+                    signal: this.signal.signal,
+                });
                 if (retries > 0)
                     setTimeout(() => this.replayRequests(), 100);
                 try {
@@ -94,7 +98,8 @@ class GrpcPooledListener {
                                 if (Object.keys(this.subscribers).length === 0) {
                                     // FIXME it would be better to cleanup on parent complete
                                     this.client.logger.debug('All subscriptions finished, cleaning up listener');
-                                    break;
+                                    this.signal.abort();
+                                    this.onFinish();
                                 }
                             }
                         }
@@ -107,16 +112,23 @@ class GrpcPooledListener {
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
+                this.client.logger.debug('Child listener finished');
             }
             catch (e) {
-                if (!(0, abort_controller_x_1.isAbortError)(e)) {
-                    this.client.logger.error(`Error in child-listener: ${e.message}`);
-                    this.init(retries + 1);
+                if ((0, abort_controller_x_1.isAbortError)(e)) {
+                    this.client.logger.debug('Child Listener aborted');
                     return;
                 }
-                this.client.logger.debug('Child Listener aborted');
+                this.client.logger.error(`Error in child-listener: ${e.message}`);
+            }
+            finally {
+                // it is possible the server hangs up early,
+                // restart the listener if we still have subscribers
+                this.client.logger.debug('Child listener finally');
+                if (Object.keys(this.subscribers).length !== 0) {
+                    this.init(retries + 1);
+                }
             }
-            this.onFinish();
         });
     }
     subscribe(request) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hatchet-dev/typescript-sdk",
-  "version": "0.15.1-alpha0",
+  "version": "0.15.1-alpha2",
   "description": "Background task orchestration & visibility for developers",
   "types": "dist/index.d.ts",
   "files": [