@hatchet-dev/typescript-sdk 0.9.0 → 0.10.0

package/clients/worker/worker.js

@@ -25,7 +25,7 @@ const dispatcher_1 = require("../../protoc/dispatcher");
 const hatchet_promise_1 = __importDefault(require("../../util/hatchet-promise/hatchet-promise"));
 const workflows_1 = require("../../protoc/workflows");
 const logger_1 = require("../../util/logger");
-// import sleep from '../../util/sleep.js';
+const handler_1 = require("./handler");
 const step_1 = require("../../step");
 class Worker {
     constructor(client, options) {
@@ -42,6 +42,33 @@ class Worker {
         this.handle_kill = options.handleKill === undefined ? true : options.handleKill;
         this.logger = new logger_1.Logger(`Worker/${this.name}`, this.client.config.log_level);
     }
+    registerActions(workflow) {
+        var _a;
+        const newActions = workflow.steps.reduce((acc, step) => {
+            acc[`${workflow.id}:${step.name}`] = step.run;
+            return acc;
+        }, {});
+        const onFailureAction = workflow.onFailure
+            ? {
+                [`${workflow.id}-on-failure:${workflow.onFailure.name}`]: workflow.onFailure.run,
+            }
+            : {};
+        this.action_registry = Object.assign(Object.assign(Object.assign({}, this.action_registry), newActions), onFailureAction);
+        this.action_registry = ((_a = workflow.concurrency) === null || _a === void 0 ? void 0 : _a.name)
+            ? Object.assign(Object.assign({}, this.action_registry), { [`${workflow.id}:${workflow.concurrency.name}`]: workflow.concurrency.key }) : Object.assign({}, this.action_registry);
+    }
+    getHandler(workflows) {
+        for (const workflow of workflows) {
+            const wf = Object.assign(Object.assign({}, workflow), { id: this.client.config.namespace + workflow.id });
+            this.registerActions(wf);
+        }
+        return new handler_1.WebhookHandler(this, workflows);
+    }
+    registerWebhook(webhook) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.client.admin.registerWebhook(Object.assign({}, webhook));
+        });
+    }
     /**
      * @deprecated use registerWorkflow instead
      */
@@ -52,7 +79,7 @@ class Worker {
     }
     registerWorkflow(initWorkflow) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b;
             const workflow = Object.assign(Object.assign({}, initWorkflow), { id: this.client.config.namespace + initWorkflow.id });
             try {
                 const concurrency = ((_a = workflow.concurrency) === null || _a === void 0 ? void 0 : _a.name)
@@ -118,145 +145,154 @@ class Worker {
             catch (e) {
                 throw new hatchet_error_1.default(`Could not register workflow: ${e.message}`);
             }
-            const newActions = workflow.steps.reduce((acc, step) => {
-                acc[`${workflow.id}:${step.name}`] = step.run;
-                return acc;
-            }, {});
-            const onFailureAction = workflow.onFailure
-                ? {
-                    [`${workflow.id}-on-failure:${workflow.onFailure.name}`]: workflow.onFailure.run,
-                }
-                : {};
-            this.action_registry = Object.assign(Object.assign(Object.assign({}, this.action_registry), newActions), onFailureAction);
-            this.action_registry = ((_c = workflow.concurrency) === null || _c === void 0 ? void 0 : _c.name)
-                ? Object.assign(Object.assign({}, this.action_registry), { [`${workflow.id}:${workflow.concurrency.name}`]: workflow.concurrency.key }) : Object.assign({}, this.action_registry);
+            this.registerActions(workflow);
         });
     }
     registerAction(actionId, action) {
         this.action_registry[actionId] = action;
     }
     handleStartStepRun(action) {
-        const { actionId } = action;
-        try {
-            const context = new step_1.Context(action, this.client);
-            this.contexts[action.stepRunId] = context;
-            const step = this.action_registry[actionId];
-            if (!step) {
-                this.logger.error(`Could not find step '${actionId}'`);
-                return;
-            }
-            const run = () => __awaiter(this, void 0, void 0, function* () {
-                return step(context);
-            });
-            const success = (result) => {
-                this.logger.info(`Step run ${action.stepRunId} succeeded`);
-                try {
-                    // Send the action event to the dispatcher
-                    const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_COMPLETED, result || null);
-                    this.client.dispatcher.sendStepActionEvent(event).catch((e) => {
-                        this.logger.error(`Could not send completed action event: ${e.message}`);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { actionId } = action;
+            try {
+                const context = new step_1.Context(action, this.client);
+                this.contexts[action.stepRunId] = context;
+                const step = this.action_registry[actionId];
+                if (!step) {
+                    this.logger.error(`Could not find step '${actionId}'`);
+                    return;
+                }
+                const run = () => __awaiter(this, void 0, void 0, function* () {
+                    return step(context);
+                });
+                const success = (result) => __awaiter(this, void 0, void 0, function* () {
+                    this.logger.info(`Step run ${action.stepRunId} succeeded`);
+                    try {
+                        // Send the action event to the dispatcher
+                        const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_COMPLETED, result || null);
+                        yield this.client.dispatcher.sendStepActionEvent(event);
+                        // delete the run from the futures
+                        delete this.futures[action.stepRunId];
+                    }
+                    catch (actionEventError) {
+                        this.logger.error(`Could not send completed action event: ${actionEventError.message}`);
                         // send a failure event
-                        const failureEvent = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_FAILED, e.message);
-                        this.client.dispatcher.sendStepActionEvent(failureEvent).catch((err2) => {
-                            this.logger.error(`Could not send failed action event: ${err2.message}`);
+                        const failureEvent = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_FAILED, actionEventError.message);
+                        try {
+                            yield this.client.dispatcher.sendStepActionEvent(failureEvent);
+                        }
+                        catch (failureEventError) {
+                            this.logger.error(`Could not send failed action event: ${failureEventError.message}`);
+                        }
+                        this.logger.error(`Could not send action event: ${actionEventError.message}`);
+                    }
+                });
+                const failure = (error) => __awaiter(this, void 0, void 0, function* () {
+                    this.logger.error(`Step run ${action.stepRunId} failed: ${error.message}`);
+                    if (error.stack) {
+                        this.logger.error(error.stack);
+                    }
+                    try {
+                        // Send the action event to the dispatcher
+                        const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_FAILED, {
+                            message: error === null || error === void 0 ? void 0 : error.message,
+                            stack: error === null || error === void 0 ? void 0 : error.stack,
                         });
-                    });
-                    // delete the run from the futures
-                    delete this.futures[action.stepRunId];
-                }
-                catch (e) {
-                    this.logger.error(`Could not send action event: ${e.message}`);
-                }
-            };
-            const failure = (error) => {
-                this.logger.error(`Step run ${action.stepRunId} failed: ${error.message}`);
-                if (error.stack) {
-                    this.logger.error(error.stack);
-                }
-                try {
-                    // Send the action event to the dispatcher
-                    const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_FAILED, {
-                        message: error === null || error === void 0 ? void 0 : error.message,
-                        stack: error === null || error === void 0 ? void 0 : error.stack,
-                    });
-                    this.client.dispatcher.sendStepActionEvent(event).catch((e) => {
+                        yield this.client.dispatcher.sendStepActionEvent(event);
+                        // delete the run from the futures
+                        delete this.futures[action.stepRunId];
+                    }
+                    catch (e) {
                         this.logger.error(`Could not send action event: ${e.message}`);
-                    });
-                    // delete the run from the futures
-                    delete this.futures[action.stepRunId];
-                }
-                catch (e) {
+                    }
+                });
+                const future = new hatchet_promise_1.default((() => __awaiter(this, void 0, void 0, function* () {
+                    let result;
+                    try {
+                        result = yield run();
+                    }
+                    catch (e) {
+                        yield failure(e);
+                        return;
+                    }
+                    yield success(result);
+                }))());
+                this.futures[action.stepRunId] = future;
+                // Send the action event to the dispatcher
+                const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_STARTED);
+                this.client.dispatcher.sendStepActionEvent(event).catch((e) => {
                     this.logger.error(`Could not send action event: ${e.message}`);
-                }
-            };
-            const future = new hatchet_promise_1.default(run().then(success).catch(failure));
-            this.futures[action.stepRunId] = future;
-            // Send the action event to the dispatcher
-            const event = this.getStepActionEvent(action, dispatcher_1.StepActionEventType.STEP_EVENT_TYPE_STARTED);
-            this.client.dispatcher.sendStepActionEvent(event).catch((e) => {
+                });
+                yield future.promise;
+            }
+            catch (e) {
                 this.logger.error(`Could not send action event: ${e.message}`);
-            });
-        }
-        catch (e) {
-            this.logger.error(`Could not send action event: ${e.message}`);
-        }
+            }
+        });
     }
     handleStartGroupKeyRun(action) {
-        const { actionId } = action;
-        try {
-            const context = new step_1.Context(action, this.client);
-            const key = action.getGroupKeyRunId;
-            this.contexts[key] = context;
-            this.logger.debug(`Starting group key run ${key}`);
-            const step = this.action_registry[actionId];
-            if (!step) {
-                this.logger.error(`Could not find step '${actionId}'`);
-                return;
-            }
-            const run = () => __awaiter(this, void 0, void 0, function* () {
-                return step(context);
-            });
-            const success = (result) => {
-                this.logger.info(`Step run ${action.stepRunId} succeeded`);
-                try {
-                    // Send the action event to the dispatcher
-                    const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_COMPLETED, result);
-                    this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
-                        this.logger.error(`Could not send action event: ${e.message}`);
-                    });
-                    // delete the run from the futures
-                    delete this.futures[key];
+        return __awaiter(this, void 0, void 0, function* () {
+            const { actionId } = action;
+            try {
+                const context = new step_1.Context(action, this.client);
+                const key = action.getGroupKeyRunId;
+                if (!key) {
+                    this.logger.error(`No group key run id provided for action ${actionId}`);
+                    return;
                 }
-                catch (e) {
-                    this.logger.error(`Could not send action event: ${e.message}`);
+                this.contexts[key] = context;
+                this.logger.debug(`Starting group key run ${key}`);
+                const step = this.action_registry[actionId];
+                if (!step) {
+                    this.logger.error(`Could not find step '${actionId}'`);
+                    return;
                 }
-            };
-            const failure = (error) => {
-                this.logger.error(`Step run ${key} failed: ${error.message}`);
-                try {
-                    // Send the action event to the dispatcher
-                    const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_FAILED, error);
-                    this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
+                const run = () => __awaiter(this, void 0, void 0, function* () {
+                    return step(context);
+                });
+                const success = (result) => {
+                    this.logger.info(`Step run ${action.stepRunId} succeeded`);
+                    try {
+                        // Send the action event to the dispatcher
+                        const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_COMPLETED, result);
+                        this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
+                            this.logger.error(`Could not send action event: ${e.message}`);
+                        });
+                        // delete the run from the futures
+                        delete this.futures[key];
+                    }
+                    catch (e) {
                         this.logger.error(`Could not send action event: ${e.message}`);
-                    });
-                    // delete the run from the futures
-                    delete this.futures[key];
-                }
-                catch (e) {
+                    }
+                };
+                const failure = (error) => {
+                    this.logger.error(`Step run ${key} failed: ${error.message}`);
+                    try {
+                        // Send the action event to the dispatcher
+                        const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_FAILED, error);
+                        this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
+                            this.logger.error(`Could not send action event: ${e.message}`);
+                        });
+                        // delete the run from the futures
+                        delete this.futures[key];
+                    }
+                    catch (e) {
+                        this.logger.error(`Could not send action event: ${e.message}`);
+                    }
+                };
+                const future = new hatchet_promise_1.default(run().then(success).catch(failure));
+                this.futures[key] = future;
+                // Send the action event to the dispatcher
+                const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_STARTED);
+                this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
                     this.logger.error(`Could not send action event: ${e.message}`);
-                }
-            };
-            const future = new hatchet_promise_1.default(run().then(success).catch(failure));
-            this.futures[action.getGroupKeyRunId] = future;
-            // Send the action event to the dispatcher
-            const event = this.getGroupKeyActionEvent(action, dispatcher_1.GroupKeyActionEventType.GROUP_KEY_EVENT_TYPE_STARTED);
-            this.client.dispatcher.sendGroupKeyActionEvent(event).catch((e) => {
+                });
+                yield future.promise;
+            }
+            catch (e) {
                 this.logger.error(`Could not send action event: ${e.message}`);
-            });
-        }
-        catch (e) {
-            this.logger.error(`Could not send action event: ${e.message}`);
-        }
+            }
+        });
     }
     getStepActionEvent(action, eventType, payload = '') {
         return {
@@ -272,6 +308,9 @@ class Worker {
         };
     }
     getGroupKeyActionEvent(action, eventType, payload = '') {
+        if (!action.getGroupKeyRunId) {
+            throw new hatchet_error_1.default('No group key run id provided');
+        }
         return {
             workerId: this.name,
             workflowRunId: action.workflowRunId,
@@ -283,26 +322,29 @@ class Worker {
         };
     }
     handleCancelStepRun(action) {
-        try {
-            this.logger.info(`Cancelling step run ${action.stepRunId}`);
-            const { stepRunId } = action;
-            const future = this.futures[stepRunId];
-            const context = this.contexts[stepRunId];
-            if (context && context.controller) {
-                context.controller.abort('Cancelled by worker');
-                delete this.contexts[stepRunId];
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.logger.info(`Cancelling step run ${action.stepRunId}`);
+                const { stepRunId } = action;
+                const future = this.futures[stepRunId];
+                const context = this.contexts[stepRunId];
+                if (context && context.controller) {
+                    context.controller.abort('Cancelled by worker');
+                    delete this.contexts[stepRunId];
+                }
+                if (future) {
+                    future.promise.catch(() => {
+                        this.logger.info(`Cancelled step run ${action.stepRunId}`);
+                    });
+                    future.cancel('Cancelled by worker');
+                    yield future.promise;
+                    delete this.futures[stepRunId];
+                }
             }
-            if (future) {
-                future.promise.catch(() => {
-                    this.logger.info(`Cancelled step run ${action.stepRunId}`);
-                });
-                future.cancel('Cancelled by worker');
-                delete this.futures[stepRunId];
+            catch (e) {
+                this.logger.error(`Could not cancel step run: ${e.message}`);
             }
-        }
-        catch (e) {
-            this.logger.error(`Could not cancel step run: ${e.message}`);
-        }
+        });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -350,18 +392,7 @@ class Worker {
                         _d = false;
                         const action = _c;
                         this.logger.info(`Worker ${this.name} received action ${action.actionId}:${action.actionType}`);
-                        if (action.actionType === dispatcher_1.ActionType.START_STEP_RUN) {
-                            this.handleStartStepRun(action);
-                        }
-                        else if (action.actionType === dispatcher_1.ActionType.CANCEL_STEP_RUN) {
-                            this.handleCancelStepRun(action);
-                        }
-                        else if (action.actionType === dispatcher_1.ActionType.START_GET_GROUP_KEY) {
-                            this.handleStartGroupKeyRun(action);
-                        }
-                        else {
-                            this.logger.error(`Worker ${this.name} received unknown action type ${action.actionType}`);
-                        }
+                        void this.handleAction(action);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -383,5 +414,24 @@ class Worker {
             }
         });
     }
+    handleAction(action) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const type = action.actionType
+                ? (0, dispatcher_1.actionTypeFromJSON)(action.actionType)
+                : dispatcher_1.ActionType.START_STEP_RUN;
+            if (type === dispatcher_1.ActionType.START_STEP_RUN) {
+                yield this.handleStartStepRun(action);
+            }
+            else if (type === dispatcher_1.ActionType.CANCEL_STEP_RUN) {
+                yield this.handleCancelStepRun(action);
+            }
+            else if (type === dispatcher_1.ActionType.START_GET_GROUP_KEY) {
+                yield this.handleStartGroupKeyRun(action);
+            }
+            else {
+                this.logger.error(`Worker ${this.name} received unknown action type ${type}`);
+            }
+        });
+    }
 }
 exports.Worker = Worker;

package/package.json

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