@hatchet-dev/typescript-sdk 1.26.1 → 1.26.2

package/clients/admin/admin-client.js

@@ -111,7 +111,7 @@ class AdminClient {
                         limit,
                         duration,
                     });
-                }), this.logger);
+                }), this.logger, this.config.retrier);
             }
             catch (e) {
                 throw (0, hatchet_error_1.toHatchetError)(e);

package/clients/event/event-client.js

@@ -54,14 +54,14 @@ class EventClient {
             priority: options.priority,
             scope: options.scope,
         };
-        try {
-            const e = this.retrier(() => __awaiter(this, void 0, void 0, function* () { return this.client.push(req); }), this.logger);
+        return this.retrier(() => __awaiter(this, void 0, void 0, function* () { return this.client.push(req); }), this.logger, this.config.retrier)
+            .then((result) => {
             this.logger.info(`Event pushed: ${namespacedType}`);
-            return e;
-        }
-        catch (e) {
+            return result;
+        })
+            .catch((e) => {
             throw (0, hatchet_error_1.toHatchetError)(e);
-        }
+        });
     }
     /**
      * @important This method is instrumented by HatchetInstrumentor._patchBulkPushEvent.
@@ -85,14 +85,14 @@ class EventClient {
         const req = {
             events,
         };
-        try {
-            const res = this.retrier(() => __awaiter(this, void 0, void 0, function* () { return this.client.bulkPush(req); }), this.logger);
+        return this.retrier(() => __awaiter(this, void 0, void 0, function* () { return this.client.bulkPush(req); }), this.logger, this.config.retrier)
+            .then((result) => {
             this.logger.info(`Bulk events pushed for type: ${namespacedType}`);
-            return res;
-        }
-        catch (e) {
+            return result;
+        })
+            .catch((e) => {
             throw (0, hatchet_error_1.toHatchetError)(e);
-        }
+        });
     }
     putLog(taskRunExternalId, log, level, taskRetryCount, metadata) {
         return __awaiter(this, void 0, void 0, function* () {

package/clients/hatchet-client/client-config.d.ts

@@ -2,6 +2,12 @@ import { ChannelCredentials } from 'nice-grpc';
 import { z } from 'zod/v4';
 import type { Context } from '../../v1/client/worker/context';
 import { Logger, LogLevel } from '../../util/logger';
+export declare const RetrierConfigSchema: z.ZodObject<{
+    maxAttempts: z.ZodOptional<z.ZodNumber>;
+    initialInterval: z.ZodOptional<z.ZodNumber>;
+    maxJitter: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
+export type RetrierConfig = z.infer<typeof RetrierConfigSchema>;
 declare const ClientTLSConfigSchema: z.ZodObject<{
     tls_strategy: z.ZodOptional<z.ZodEnum<{
         tls: "tls";
@@ -60,6 +66,11 @@ export declare const ClientConfigSchema: z.ZodObject<{
     cancellation_warning_threshold: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     grpc_max_recv_message_length: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     grpc_max_send_message_length: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    retrier: z.ZodOptional<z.ZodObject<{
+        maxAttempts: z.ZodOptional<z.ZodNumber>;
+        initialInterval: z.ZodOptional<z.ZodNumber>;
+        maxJitter: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 export type LogConstructor = (context: string, logLevel?: LogLevel) => Logger;
 /**

package/clients/hatchet-client/client-config.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientConfigSchema = exports.OpenTelemetryConfigSchema = void 0;
+exports.ClientConfigSchema = exports.OpenTelemetryConfigSchema = exports.RetrierConfigSchema = void 0;
 const v4_1 = require("zod/v4");
+exports.RetrierConfigSchema = v4_1.z.object({
+    maxAttempts: v4_1.z.number().int().positive().optional(),
+    initialInterval: v4_1.z.number().positive().optional(),
+    maxJitter: v4_1.z.number().nonnegative().optional(),
+});
 const ClientTLSConfigSchema = v4_1.z.object({
     tls_strategy: v4_1.z.enum(['tls', 'mtls', 'none']).optional(),
     cert_file: v4_1.z.string().optional(),
@@ -65,4 +70,5 @@ exports.ClientConfigSchema = v4_1.z.object({
         .positive()
         .optional()
         .default(4 * 1024 * 1024),
+    retrier: exports.RetrierConfigSchema.optional(),
 });

package/package.json

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

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

@@ -6,6 +6,7 @@ interface LoadClientConfigOptions {
 export declare class ConfigLoader {
     static loadClientConfig(override?: Partial<ClientConfig>, config?: LoadClientConfigOptions): Partial<ClientConfig>;
     private static parseIntEnv;
+    private static parseFloatEnv;
     private static parseJsonArray;
     static get default_yaml_config_path(): string;
     static createCredentials(config: ClientConfig['tls_config']): ChannelCredentials;

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

@@ -44,7 +44,7 @@ const token_1 = require("./token");
 const DEFAULT_CONFIG_FILE = '.hatchet.yaml';
 class ConfigLoader {
     static loadClientConfig(override, config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30;
         const yaml = this.loadYamlConfig(config === null || config === void 0 ? void 0 : config.path);
         const tlsConfig = (_a = override === null || override === void 0 ? void 0 : override.tls_config) !== null && _a !== void 0 ? _a : {
             tls_strategy: (_d = (_c = (_b = yaml === null || yaml === void 0 ? void 0 : yaml.tls_config) === null || _b === void 0 ? void 0 : _b.tls_strategy) !== null && _c !== void 0 ? _c : this.env('HATCHET_CLIENT_TLS_STRATEGY')) !== null && _d !== void 0 ? _d : 'tls',
@@ -74,7 +74,7 @@ class ConfigLoader {
             apiUrl =
                 (_x = (_w = (_v = override === null || override === void 0 ? void 0 : override.api_url) !== null && _v !== void 0 ? _v : yaml === null || yaml === void 0 ? void 0 : yaml.api_url) !== null && _w !== void 0 ? _w : this.env('HATCHET_CLIENT_API_URL')) !== null && _x !== void 0 ? _x : addresses.serverUrl;
         }
-        catch (_19) {
+        catch (_31) {
             grpcBroadcastAddress =
                 (_z = (_y = override === null || override === void 0 ? void 0 : override.host_port) !== null && _y !== void 0 ? _y : yaml === null || yaml === void 0 ? void 0 : yaml.host_port) !== null && _z !== void 0 ? _z : this.env('HATCHET_CLIENT_HOST_PORT');
             apiUrl = (_1 = (_0 = override === null || override === void 0 ? void 0 : override.api_url) !== null && _0 !== void 0 ? _0 : yaml === null || yaml === void 0 ? void 0 : yaml.api_url) !== null && _1 !== void 0 ? _1 : this.env('HATCHET_CLIENT_API_URL');
@@ -90,21 +90,13 @@ class ConfigLoader {
         };
         const grpcMaxRecvMessageLength = (_8 = (_7 = (_6 = override === null || override === void 0 ? void 0 : override.grpc_max_recv_message_length) !== null && _6 !== void 0 ? _6 : yaml === null || yaml === void 0 ? void 0 : yaml.grpc_max_recv_message_length) !== null && _7 !== void 0 ? _7 : this.parseIntEnv('HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH')) !== null && _8 !== void 0 ? _8 : 4 * 1024 * 1024;
         const grpcMaxSendMessageLength = (_11 = (_10 = (_9 = override === null || override === void 0 ? void 0 : override.grpc_max_send_message_length) !== null && _9 !== void 0 ? _9 : yaml === null || yaml === void 0 ? void 0 : yaml.grpc_max_send_message_length) !== null && _10 !== void 0 ? _10 : this.parseIntEnv('HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH')) !== null && _11 !== void 0 ? _11 : 4 * 1024 * 1024;
-        return {
-            token: (_13 = (_12 = override === null || override === void 0 ? void 0 : override.token) !== null && _12 !== void 0 ? _12 : yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _13 !== void 0 ? _13 : this.env('HATCHET_CLIENT_TOKEN'),
-            host_port: grpcBroadcastAddress,
-            api_url: apiUrl,
-            tls_config: tlsConfig,
-            healthcheck: healthCheckConfig,
-            log_level: (_16 = (_15 = (_14 = override === null || override === void 0 ? void 0 : override.log_level) !== null && _14 !== void 0 ? _14 : yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _15 !== void 0 ? _15 : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _16 !== void 0 ? _16 : 'INFO',
-            tenant_id: tenantId,
-            namespace: namespace ? `${namespace}`.toLowerCase() : '',
-            otel: otelConfig,
-            grpc_max_recv_message_length: grpcMaxRecvMessageLength,
-            grpc_max_send_message_length: grpcMaxSendMessageLength,
-            cancellation_grace_period: (_17 = override === null || override === void 0 ? void 0 : override.cancellation_grace_period) !== null && _17 !== void 0 ? _17 : yaml === null || yaml === void 0 ? void 0 : yaml.cancellation_grace_period,
-            cancellation_warning_threshold: (_18 = override === null || override === void 0 ? void 0 : override.cancellation_warning_threshold) !== null && _18 !== void 0 ? _18 : yaml === null || yaml === void 0 ? void 0 : yaml.cancellation_warning_threshold,
+        const retrierConfig = {
+            maxAttempts: (_15 = (_13 = (_12 = override === null || override === void 0 ? void 0 : override.retrier) === null || _12 === void 0 ? void 0 : _12.maxAttempts) !== null && _13 !== void 0 ? _13 : (_14 = yaml === null || yaml === void 0 ? void 0 : yaml.retrier) === null || _14 === void 0 ? void 0 : _14.maxAttempts) !== null && _15 !== void 0 ? _15 : this.parseIntEnv('HATCHET_CLIENT_RETRIER_MAX_ATTEMPTS'),
+            initialInterval: (_19 = (_17 = (_16 = override === null || override === void 0 ? void 0 : override.retrier) === null || _16 === void 0 ? void 0 : _16.initialInterval) !== null && _17 !== void 0 ? _17 : (_18 = yaml === null || yaml === void 0 ? void 0 : yaml.retrier) === null || _18 === void 0 ? void 0 : _18.initialInterval) !== null && _19 !== void 0 ? _19 : this.parseFloatEnv('HATCHET_CLIENT_RETRIER_INITIAL_INTERVAL'),
+            maxJitter: (_23 = (_21 = (_20 = override === null || override === void 0 ? void 0 : override.retrier) === null || _20 === void 0 ? void 0 : _20.maxJitter) !== null && _21 !== void 0 ? _21 : (_22 = yaml === null || yaml === void 0 ? void 0 : yaml.retrier) === null || _22 === void 0 ? void 0 : _22.maxJitter) !== null && _23 !== void 0 ? _23 : this.parseIntEnv('HATCHET_CLIENT_RETRIER_MAX_JITTER'),
         };
+        const hasRetrier = Object.values(retrierConfig).some((v) => v !== undefined);
+        return Object.assign({ token: (_25 = (_24 = override === null || override === void 0 ? void 0 : override.token) !== null && _24 !== void 0 ? _24 : yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _25 !== void 0 ? _25 : this.env('HATCHET_CLIENT_TOKEN'), host_port: grpcBroadcastAddress, api_url: apiUrl, tls_config: tlsConfig, healthcheck: healthCheckConfig, log_level: (_28 = (_27 = (_26 = override === null || override === void 0 ? void 0 : override.log_level) !== null && _26 !== void 0 ? _26 : yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _27 !== void 0 ? _27 : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _28 !== void 0 ? _28 : 'INFO', tenant_id: tenantId, namespace: namespace ? `${namespace}`.toLowerCase() : '', otel: otelConfig, grpc_max_recv_message_length: grpcMaxRecvMessageLength, grpc_max_send_message_length: grpcMaxSendMessageLength, cancellation_grace_period: (_29 = override === null || override === void 0 ? void 0 : override.cancellation_grace_period) !== null && _29 !== void 0 ? _29 : yaml === null || yaml === void 0 ? void 0 : yaml.cancellation_grace_period, cancellation_warning_threshold: (_30 = override === null || override === void 0 ? void 0 : override.cancellation_warning_threshold) !== null && _30 !== void 0 ? _30 : yaml === null || yaml === void 0 ? void 0 : yaml.cancellation_warning_threshold }, (hasRetrier ? { retrier: retrierConfig } : {}));
     }
     static parseIntEnv(envName) {
         const value = this.env(envName);
@@ -115,6 +107,16 @@ class ConfigLoader {
         }
         return parseInt(value, 10);
     }
+    static parseFloatEnv(envName) {
+        const value = this.env(envName);
+        if (value === undefined || value === '')
+            return undefined;
+        const parsed = parseFloat(value.trim());
+        if (isNaN(parsed) || parsed <= 0) {
+            throw new Error(`Invalid value for ${envName}: "${value}". Expected a positive number.`);
+        }
+        return parsed;
+    }
     static parseJsonArray(value) {
         try {
             const parsed = JSON.parse(value);

package/util/retrier.d.ts

@@ -1,2 +1,11 @@
 import { Logger } from './logger';
-export declare function retrier<T>(fn: () => Promise<T>, logger: Logger, retries?: number, interval?: number, shouldRetry?: (e: unknown) => boolean): Promise<T>;
+export declare const DEFAULT_RETRY_INTERVAL = 0.1;
+export declare const DEFAULT_RETRY_COUNT = 8;
+export declare const DEFAULT_MAX_JITTER = 100;
+export interface RetrierConfig {
+    maxAttempts?: number;
+    initialInterval?: number;
+    maxJitter?: number;
+    shouldRetry?: (e: unknown) => boolean;
+}
+export declare function retrier<T>(fn: () => Promise<T>, logger: Logger, config?: RetrierConfig): Promise<T>;

package/util/retrier.js

@@ -12,13 +12,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_MAX_JITTER = exports.DEFAULT_RETRY_COUNT = exports.DEFAULT_RETRY_INTERVAL = void 0;
 exports.retrier = retrier;
 const sleep_1 = __importDefault(require("./sleep"));
-const DEFAULT_RETRY_INTERVAL = 0.1; // seconds
-const DEFAULT_RETRY_COUNT = 8;
-const MAX_JITTER = 100; // milliseconds
-function retrier(fn_1, logger_1) {
-    return __awaiter(this, arguments, void 0, function* (fn, logger, retries = DEFAULT_RETRY_COUNT, interval = DEFAULT_RETRY_INTERVAL, shouldRetry = () => true) {
+exports.DEFAULT_RETRY_INTERVAL = 0.1; // seconds
+exports.DEFAULT_RETRY_COUNT = 8;
+exports.DEFAULT_MAX_JITTER = 100; // milliseconds
+function retrier(fn, logger, config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const retries = Math.max(1, (_a = config === null || config === void 0 ? void 0 : config.maxAttempts) !== null && _a !== void 0 ? _a : exports.DEFAULT_RETRY_COUNT);
+        const interval = (_b = config === null || config === void 0 ? void 0 : config.initialInterval) !== null && _b !== void 0 ? _b : exports.DEFAULT_RETRY_INTERVAL;
+        const maxJitter = (_c = config === null || config === void 0 ? void 0 : config.maxJitter) !== null && _c !== void 0 ? _c : exports.DEFAULT_MAX_JITTER;
+        const shouldRetry = (_d = config === null || config === void 0 ? void 0 : config.shouldRetry) !== null && _d !== void 0 ? _d : (() => true);
         let lastError;
         for (let i = 0; i < retries; i++) {
             try {
@@ -30,11 +36,11 @@ function retrier(fn_1, logger_1) {
                 }
                 lastError = e instanceof Error ? e : new Error(String(e));
                 logger.error(`Error: ${lastError.message}`);
-                // Calculate exponential backoff with random jitter
-                const exponentialDelay = interval * 2 ** i * 1000;
-                const jitter = Math.random() * MAX_JITTER;
-                const totalDelay = exponentialDelay + jitter;
-                yield (0, sleep_1.default)(totalDelay);
+                if (i < retries - 1) {
+                    const exponentialDelay = interval * 2 ** i * 1000;
+                    const jitter = Math.random() * maxJitter;
+                    yield (0, sleep_1.default)(exponentialDelay + jitter);
+                }
             }
         }
         throw lastError;

package/v1/client/admin.js

@@ -184,7 +184,7 @@ class AdminClient {
                             trailerMetadata = trailer;
                         },
                     });
-                }), this.logger, undefined, undefined, (e) => !isNiceGrpcAlreadyExists(e));
+                }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isNiceGrpcAlreadyExists(e) }));
                 const id = resp.workflowRunId;
                 const ref = new workflow_run_ref_1.default(id, this.listenerClient, this.runs, options === null || options === void 0 ? void 0 : options.parentId, options === null || options === void 0 ? void 0 : options._standaloneTaskName);
                 yield ref.getWorkflowRunId();
@@ -242,8 +242,8 @@ class AdminClient {
                                 bulkTrailerMetadata = trailer;
                             },
                         });
-                    }), this.logger, undefined, undefined, (e) => !isNiceGrpcAlreadyExists(e) &&
-                        !(isGrpcServiceError(e) && e.code === grpc_js_1.status.ALREADY_EXISTS));
+                    }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isNiceGrpcAlreadyExists(e) &&
+                            !(isGrpcServiceError(e) && e.code === grpc_js_1.status.ALREADY_EXISTS) }));
                     this.logger.debug(`batch ${batchIndex + 1} of ${batches.length}`);
                     // Map the results back to their original indices
                     const batchResults = bulkTriggerWorkflowResponse.workflowRunIds.map((resp, index) => {
@@ -277,7 +277,7 @@ class AdminClient {
                 limit,
                 duration,
             };
-            yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () { return this.workflowsGrpc.putRateLimit(request); }), this.logger);
+            yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () { return this.workflowsGrpc.putRateLimit(request); }), this.logger, this.config.retrier);
         });
     }
 }

package/version.d.ts

@@ -1 +1 @@
-export declare const HATCHET_VERSION = "1.26.1";
+export declare const HATCHET_VERSION = "1.26.2";

package/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HATCHET_VERSION = void 0;
-exports.HATCHET_VERSION = '1.26.1';
+exports.HATCHET_VERSION = '1.26.2';