@hatchet-dev/typescript-sdk 1.9.4 → 1.9.6

package/clients/admin/admin-client.d.ts

@@ -59,7 +59,7 @@ export declare class AdminClient {
      * @deprecated use hatchet.ratelimits.upsert instead
      */
     putRateLimit(key: string, limit: number, duration?: RateLimitDuration): Promise<void>;
-    registerWebhook(data: WebhookWorkerCreateRequest): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WebhookWorkerCreated, any>>;
+    registerWebhook(data: WebhookWorkerCreateRequest): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WebhookWorkerCreated, any, {}>>;
     /**
      * @deprecated use runWorkflow instead
      */
@@ -195,7 +195,7 @@ export declare class AdminClient {
     /**
      * @deprecated use getWorkflowMetrics instead
      */
-    get_workflow_metrics(data: WorkflowMetricsQuery): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WorkflowMetrics, any>>;
+    get_workflow_metrics(data: WorkflowMetricsQuery): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WorkflowMetrics, any, {}>>;
     /**
      * Get the metrics for a workflow.
      *
@@ -203,6 +203,6 @@ export declare class AdminClient {
      * @param workflowName the name of the workflow to get metrics for
      * @param query an object containing query parameters to filter the metrics
      */
-    getWorkflowMetrics({ workflowId, workflowName, status, groupKey }: WorkflowMetricsQuery): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WorkflowMetrics, any>>;
+    getWorkflowMetrics({ workflowId, workflowName, status, groupKey }: WorkflowMetricsQuery): Promise<import("axios").AxiosResponse<import("../rest/generated/data-contracts").WorkflowMetrics, any, {}>>;
 }
 export {};

package/clients/dispatcher/action-listener.d.ts

@@ -23,6 +23,7 @@ export declare class ActionListener {
     done: boolean;
     listenStrategy: ListenStrategy;
     heartbeat: Heartbeat;
+    abortController?: AbortController;
     constructor(client: DispatcherClient, workerId: string, retryInterval?: number, retryCount?: number);
     actions: () => AsyncGenerator<Action, void, unknown>;
     setListenStrategy(strategy: ListenStrategy): Promise<void>;

package/clients/dispatcher/action-listener.js

@@ -36,6 +36,7 @@ exports.ActionListener = void 0;
 exports.createActionKey = createActionKey;
 const dispatcher_1 = require("../../protoc/dispatcher");
 const nice_grpc_1 = require("nice-grpc");
+const abort_controller_x_1 = require("abort-controller-x");
 const sleep_1 = __importDefault(require("../../util/sleep"));
 const hatchet_error_1 = __importDefault(require("../../util/errors/hatchet-error"));
 const heartbeat_controller_1 = require("./heartbeat/heartbeat-controller");
@@ -96,6 +97,11 @@ class ActionListener {
                         }
                     }
                     catch (e) {
+                        // If the stream was aborted (e.g., during worker shutdown), exit gracefully
+                        if ((0, abort_controller_x_1.isAbortError)(e)) {
+                            client.logger.info('Listener aborted, exiting generator');
+                            break;
+                        }
                         client.logger.info('Listener error');
                         // if this is a HatchetError, we should throw this error
                         if (e instanceof hatchet_error_1.default) {
@@ -157,15 +163,21 @@ class ActionListener {
                 yield (0, sleep_1.default)(DEFAULT_ACTION_LISTENER_RETRY_INTERVAL);
             }
             try {
+                // Create a new AbortController for this connection
+                this.abortController = new AbortController();
                 if (this.listenStrategy === ListenStrategy.LISTEN_STRATEGY_V1) {
                     const result = this.client.listen({
                         workerId: this.workerId,
+                    }, {
+                        signal: this.abortController.signal,
                     });
                     this.logger.green('Connection established using LISTEN_STRATEGY_V1');
                     return result;
                 }
                 const res = this.client.listenV2({
                     workerId: this.workerId,
+                }, {
+                    signal: this.abortController.signal,
                 });
                 yield this.heartbeat.start();
                 this.logger.green('Connection established using LISTEN_STRATEGY_V2');
@@ -187,6 +199,10 @@ class ActionListener {
         return __awaiter(this, void 0, void 0, function* () {
             this.done = true;
             this.heartbeat.stop();
+            // Abort the gRPC stream to immediately cancel the generator
+            if (this.abortController) {
+                this.abortController.abort('Worker stopping');
+            }
             try {
                 return yield this.client.unsubscribe({
                     workerId: this.workerId,

package/clients/listeners/durable-listener/pooled-durable-listener-client.js

@@ -193,7 +193,7 @@ class DurableEventGrpcPooledListener {
         const subscriptionEntries = Object.entries(this.taskSignalKeyToSubscriptionIds);
         this.client.logger.debug(`Replaying ${subscriptionEntries.length} requests...`);
         for (const [key, _] of subscriptionEntries) {
-            const [taskId, signalKey] = key.split('-');
+            const [taskId, signalKey] = key.split('|');
             this.requestEmitter.emit('subscribe', { taskId, signalKey });
         }
     }
@@ -205,7 +205,7 @@ class DurableEventGrpcPooledListener {
             const existingSubscriptions = new Set();
             for (const key in this.taskSignalKeyToSubscriptionIds) {
                 if (this.taskSignalKeyToSubscriptionIds[key].length > 0) {
-                    const [taskId, signalKey] = key.split('-');
+                    const [taskId, signalKey] = key.split('|');
                     existingSubscriptions.add(key);
                     yield yield __await({ taskId, signalKey });
                 }
@@ -238,4 +238,4 @@ class DurableEventGrpcPooledListener {
     }
 }
 exports.DurableEventGrpcPooledListener = DurableEventGrpcPooledListener;
-const keyHelper = (taskId, signalKey) => `${taskId}-${signalKey}`;
+const keyHelper = (taskId, signalKey) => `${taskId}|${signalKey}`;