@hatchet-dev/typescript-sdk 0.1.12 → 0.1.14

package/step.d.ts

@@ -3,32 +3,38 @@ export declare const CreateStepSchema: z.ZodObject<{
     name: z.ZodString;
     parents: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     timeout: z.ZodOptional<z.ZodString>;
+    retries: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     name: string;
     parents?: string[] | undefined;
     timeout?: string | undefined;
+    retries?: number | undefined;
 }, {
     name: string;
     parents?: string[] | undefined;
     timeout?: string | undefined;
+    retries?: number | undefined;
 }>;
 export type NextStep = {
     [key: string]: string;
 };
-interface ContextData<T = unknown> {
+interface ContextData<T, K> {
     input: T;
     parents: Record<string, any>;
-    triggered_by_event: string;
+    triggered_by: string;
+    user_data: K;
 }
-export declare class Context<T = unknown> {
-    data: ContextData<T>;
+export declare class Context<T, K> {
+    data: ContextData<T, K>;
     controller: AbortController;
     constructor(payload: string);
     stepOutput(step: string): string;
     triggeredByEvent(): boolean;
-    workflowInput(): any;
+    workflowInput(): T;
+    userData(): K;
 }
-export interface CreateStep<T> extends z.infer<typeof CreateStepSchema> {
-    run: (ctx: Context) => Promise<NextStep> | NextStep | void;
+export type StepRunFunction<T, K> = (ctx: Context<T, K>) => Promise<NextStep> | NextStep | void;
+export interface CreateStep<T, K> extends z.infer<typeof CreateStepSchema> {
+    run: StepRunFunction<T, K>;
 }
 export {};

package/step.js

@@ -34,6 +34,7 @@ exports.CreateStepSchema = z.object({
     name: z.string(),
     parents: z.array(z.string()).optional(),
     timeout: workflow_1.HatchetTimeoutSchema.optional(),
+    retries: z.number().optional(),
 });
 class Context {
     constructor(payload) {
@@ -56,11 +57,15 @@ class Context {
     }
     triggeredByEvent() {
         var _a;
-        return ((_a = this.data) === null || _a === void 0 ? void 0 : _a.triggered_by_event) === 'event';
+        return ((_a = this.data) === null || _a === void 0 ? void 0 : _a.triggered_by) === 'event';
     }
     workflowInput() {
         var _a;
-        return ((_a = this.data) === null || _a === void 0 ? void 0 : _a.input) || {};
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.input;
+    }
+    userData() {
+        var _a;
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.user_data;
     }
 }
 exports.Context = Context;

package/util/config-loader/config-loader.js

@@ -34,7 +34,7 @@ const token_1 = require("./token");
 const DEFAULT_CONFIG_FILE = '.hatchet.yaml';
 class ConfigLoader {
     static loadClientConfig(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const yaml = this.loadYamlConfig(config === null || config === void 0 ? void 0 : config.path);
         const tlsConfig = {
             tls_strategy: (_c = (_b = (_a = yaml === null || yaml === void 0 ? void 0 : yaml.tls_config) === null || _a === void 0 ? void 0 : _a.tls_strategy) !== null && _b !== void 0 ? _b : this.env('HATCHET_CLIENT_TLS_STRATEGY')) !== null && _c !== void 0 ? _c : 'tls',
@@ -45,19 +45,28 @@ class ConfigLoader {
         };
         const token = (_m = yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _m !== void 0 ? _m : this.env('HATCHET_CLIENT_TOKEN');
         let grpcBroadcastAddress;
+        let apiUrl;
+        const tenantId = (0, token_1.getTenantIdFromJWT)(token);
+        if (!tenantId) {
+            throw new Error('Tenant ID not found in subject claim of token');
+        }
         try {
             const addresses = (0, token_1.getAddressesFromJWT)(token);
             grpcBroadcastAddress =
                 (_p = (_o = yaml === null || yaml === void 0 ? void 0 : yaml.host_port) !== null && _o !== void 0 ? _o : this.env('HATCHET_CLIENT_HOST_PORT')) !== null && _p !== void 0 ? _p : addresses.grpcBroadcastAddress;
+            apiUrl = (_r = (_q = yaml === null || yaml === void 0 ? void 0 : yaml.api_url) !== null && _q !== void 0 ? _q : this.env('HATCHET_CLIENT_API_URL')) !== null && _r !== void 0 ? _r : addresses.serverUrl;
         }
         catch (e) {
-            grpcBroadcastAddress = (_q = yaml === null || yaml === void 0 ? void 0 : yaml.host_port) !== null && _q !== void 0 ? _q : this.env('HATCHET_CLIENT_HOST_PORT');
+            grpcBroadcastAddress = (_s = yaml === null || yaml === void 0 ? void 0 : yaml.host_port) !== null && _s !== void 0 ? _s : this.env('HATCHET_CLIENT_HOST_PORT');
+            apiUrl = (_t = yaml === null || yaml === void 0 ? void 0 : yaml.api_url) !== null && _t !== void 0 ? _t : this.env('HATCHET_CLIENT_API_URL');
         }
         return {
-            token: (_r = yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _r !== void 0 ? _r : this.env('HATCHET_CLIENT_TOKEN'),
+            token: (_u = yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _u !== void 0 ? _u : this.env('HATCHET_CLIENT_TOKEN'),
             host_port: grpcBroadcastAddress,
+            api_url: apiUrl,
             tls_config: tlsConfig,
-            log_level: (_t = (_s = yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _s !== void 0 ? _s : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _t !== void 0 ? _t : 'INFO',
+            log_level: (_w = (_v = yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _v !== void 0 ? _v : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _w !== void 0 ? _w : 'INFO',
+            tenant_id: tenantId,
         };
     }
     static get default_yaml_config_path() {

package/util/config-loader/token.d.ts

@@ -1,3 +1,4 @@
+export declare function getTenantIdFromJWT(token: string): string;
 export declare function getAddressesFromJWT(token: string): {
     serverUrl: string;
     grpcBroadcastAddress: string;

package/util/config-loader/token.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddressesFromJWT = void 0;
+exports.getAddressesFromJWT = exports.getTenantIdFromJWT = void 0;
+function getTenantIdFromJWT(token) {
+    const claims = extractClaimsFromJWT(token);
+    return claims.sub;
+}
+exports.getTenantIdFromJWT = getTenantIdFromJWT;
 function getAddressesFromJWT(token) {
     const claims = extractClaimsFromJWT(token);
     return {

package/workflow.d.ts

@@ -5,14 +5,17 @@ declare const StepsSchema: z.ZodArray<z.ZodObject<{
     name: z.ZodString;
     parents: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     timeout: z.ZodOptional<z.ZodString>;
+    retries: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     name: string;
     parents?: string[] | undefined;
     timeout?: string | undefined;
+    retries?: number | undefined;
 }, {
     name: string;
     parents?: string[] | undefined;
     timeout?: string | undefined;
+    retries?: number | undefined;
 }>, "many">;
 export type Steps = z.infer<typeof StepsSchema>;
 export declare const ConcurrencyLimitStrategy: typeof PbConcurrencyLimitStrategy;
@@ -58,14 +61,17 @@ export declare const CreateWorkflowSchema: z.ZodObject<{
         name: z.ZodString;
         parents: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         timeout: z.ZodOptional<z.ZodString>;
+        retries: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         name: string;
         parents?: string[] | undefined;
         timeout?: string | undefined;
+        retries?: number | undefined;
     }, {
         name: string;
         parents?: string[] | undefined;
         timeout?: string | undefined;
+        retries?: number | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     description: string;
@@ -73,6 +79,7 @@ export declare const CreateWorkflowSchema: z.ZodObject<{
         name: string;
         parents?: string[] | undefined;
         timeout?: string | undefined;
+        retries?: number | undefined;
     }[];
     id: string;
     on: {
@@ -90,6 +97,7 @@ export declare const CreateWorkflowSchema: z.ZodObject<{
         name: string;
         parents?: string[] | undefined;
         timeout?: string | undefined;
+        retries?: number | undefined;
     }[];
     id: string;
     on: {
@@ -106,6 +114,6 @@ export interface Workflow extends z.infer<typeof CreateWorkflowSchema> {
     concurrency?: z.infer<typeof WorkflowConcurrency> & {
         key: (ctx: any) => string;
     };
-    steps: CreateStep<any>[];
+    steps: CreateStep<any, any>[];
 }
 export {};