@hatchet-dev/typescript-sdk 1.13.0 → 1.14.0

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

@@ -16,7 +16,7 @@ interface GetActionListenerOptions {
     durableSlots?: number;
     /** @deprecated use slots */
     maxRuns?: number;
-    labels: Record<string, string | number | undefined>;
+    labels: WorkerLabels;
 }
 type StepActionEventInput = StepActionEvent & {
     /** @deprecated use taskId */

package/clients/dispatcher/heartbeat/heartbeat-controller.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,9 +37,10 @@ class Heartbeat {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.heartbeatWorker) {
+                const _a = this.config, { middleware: _m, logger: _l } = _a, clonableConfig = __rest(_a, ["middleware", "logger"]);
                 this.heartbeatWorker = (0, thread_helper_1.runThreaded)(path_1.default.join(__dirname, './heartbeat-worker'), {
                     workerData: {
-                        config: Object.assign(Object.assign({}, this.config), { logger: undefined }),
+                        config: clonableConfig,
                         workerId: this.workerId,
                     },
                 });

package/clients/dispatcher/heartbeat/heartbeat-worker.js

@@ -55,7 +55,7 @@ class HeartbeatWorker {
                     const actualInterval = now - this.timeLastHeartbeat;
                     if (actualInterval > HEARTBEAT_INTERVAL * 1.2) {
                         const message = `Heartbeat interval delay (${actualInterval}ms >> ${HEARTBEAT_INTERVAL}ms)`;
-                        this.logger.warn(message);
+                        this.logger.debug(message);
                         postMessage({
                             type: 'warn',
                             message,
@@ -102,6 +102,7 @@ class HeartbeatWorker {
 }
 const heartbeat = new HeartbeatWorker(worker_threads_1.workerData.config, worker_threads_1.workerData.workerId);
 heartbeat.start();
-worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.on(heartbeat_controller_1.STOP_HEARTBEAT, () => {
-    heartbeat.stop();
+worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.on('message', (msg) => {
+    if (msg === heartbeat_controller_1.STOP_HEARTBEAT)
+        heartbeat.stop();
 });

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

@@ -4,7 +4,6 @@ import { ClientConfig } from '../hatchet-client/client-config';
 import { Logger } from '../../util/logger';
 import { retrier } from '../../util/retrier';
 import { HatchetClient } from '../../v1';
-import { LegacyHatchetClient } from '../hatchet-client';
 export declare enum LogLevel {
     INFO = "INFO",
     WARN = "WARN",
@@ -29,7 +28,7 @@ export declare class EventClient {
     api: HatchetClient['api'];
     tenantId: string;
     logger: Logger;
-    constructor(config: ClientConfig, channel: Channel, factory: ClientFactory, hatchetClient: LegacyHatchetClient);
+    constructor(config: ClientConfig, channel: Channel, factory: ClientFactory, api: HatchetClient['api']);
     push<T>(type: string, input: T, options?: PushEventOptions): Promise<import("../../protoc/events/events").Event>;
     bulkPush<T>(type: string, inputs: EventWithMetadata<T>[], options?: PushEventOptions): Promise<import("../../protoc/events/events").Events>;
     putLog(taskRunExternalId: string, log: string, level?: LogLevel, taskRetryCount?: number, metadata?: Record<string, any>): Promise<void>;

package/clients/event/event-client.js

@@ -26,12 +26,12 @@ var LogLevel;
     LogLevel["DEBUG"] = "DEBUG";
 })(LogLevel || (exports.LogLevel = LogLevel = {}));
 class EventClient {
-    constructor(config, channel, factory, hatchetClient) {
+    constructor(config, channel, factory, api) {
         this.config = config;
         this.client = factory.create(events_1.EventsServiceDefinition, channel);
         this.logger = config.logger(`Dispatcher`, config.log_level);
         this.retrier = retrier_1.retrier;
-        this.api = hatchetClient.api;
+        this.api = api;
         this.tenantId = config.tenant_id;
     }
     push(type, input, options = {}) {

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

@@ -46,11 +46,11 @@ export declare const ClientConfigSchema: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
-        enabled: boolean;
         port: number;
+        enabled: boolean;
     }, {
-        enabled?: boolean | undefined;
         port?: number | undefined;
+        enabled?: boolean | undefined;
     }>>;
     host_port: z.ZodString;
     api_url: z.ZodString;
@@ -67,6 +67,8 @@ export declare const ClientConfigSchema: z.ZodObject<{
         before?: any;
         after?: any;
     }>>;
+    cancellation_grace_period: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    cancellation_warning_threshold: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
     token: string;
     tls_config: {
@@ -79,9 +81,11 @@ export declare const ClientConfigSchema: z.ZodObject<{
     host_port: string;
     api_url: string;
     tenant_id: string;
+    cancellation_grace_period: number;
+    cancellation_warning_threshold: number;
     healthcheck?: {
-        enabled: boolean;
         port: number;
+        enabled: boolean;
     } | undefined;
     log_level?: "OFF" | "DEBUG" | "INFO" | "WARN" | "ERROR" | undefined;
     namespace?: string | undefined;
@@ -102,8 +106,8 @@ export declare const ClientConfigSchema: z.ZodObject<{
     api_url: string;
     tenant_id: string;
     healthcheck?: {
-        enabled?: boolean | undefined;
         port?: number | undefined;
+        enabled?: boolean | undefined;
     } | undefined;
     log_level?: "OFF" | "DEBUG" | "INFO" | "WARN" | "ERROR" | undefined;
     namespace?: string | undefined;
@@ -111,6 +115,8 @@ export declare const ClientConfigSchema: z.ZodObject<{
         before?: any;
         after?: any;
     } | undefined;
+    cancellation_grace_period?: number | undefined;
+    cancellation_warning_threshold?: number | undefined;
 }>;
 export type LogConstructor = (context: string, logLevel?: LogLevel) => Logger;
 /**
@@ -152,7 +158,11 @@ export type InferMiddlewareBefore<M> = M extends {
 export type InferMiddlewareAfter<M> = M extends {
     after: infer P;
 } ? P extends (...args: any[]) => any ? NonVoidReturn<P> : P extends readonly any[] ? MergeReturns<P> : {} : {};
-export type ClientConfig = z.infer<typeof ClientConfigSchema> & {
+type ClientConfigInferred = z.infer<typeof ClientConfigSchema>;
+export type ClientConfig = Omit<ClientConfigInferred, 'cancellation_grace_period' | 'cancellation_warning_threshold'> & {
+    cancellation_grace_period?: number;
+    cancellation_warning_threshold?: number;
+} & {
     credentials?: ChannelCredentials;
 } & {
     logger: LogConstructor;

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

@@ -19,6 +19,7 @@ const TaskMiddlewareSchema = zod_1.z
     after: zod_1.z.any().optional(),
 })
     .optional();
+const DurationMsSchema = zod_1.z.number().int().nonnegative().finite();
 exports.ClientConfigSchema = zod_1.z.object({
     token: zod_1.z.string(),
     tls_config: ClientTLSConfigSchema,
@@ -29,4 +30,6 @@ exports.ClientConfigSchema = zod_1.z.object({
     tenant_id: zod_1.z.string(),
     namespace: zod_1.z.string().optional(),
     middleware: TaskMiddlewareSchema,
+    cancellation_grace_period: DurationMsSchema.optional().default(1000),
+    cancellation_warning_threshold: DurationMsSchema.optional().default(300),
 });

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

@@ -72,6 +72,7 @@ class HatchetLogger {
             yield this.log('ERROR', error ? `${message} ${error}` : message, '91');
         });
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     util(key, message, extra) {
         if (key === 'trace') {
             this.log('INFO', `trace: ${message}`, '35');

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

@@ -1,3 +1,3 @@
-export * from './hatchet-client';
+export * from '../../legacy/legacy-client';
 export * from './client-config';
 export { HatchetLogger } from './hatchet-logger';

package/clients/hatchet-client/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HatchetLogger = void 0;
-__exportStar(require("./hatchet-client"), exports);
+__exportStar(require("../../legacy/legacy-client"), exports);
 __exportStar(require("./client-config"), exports);
 var hatchet_logger_1 = require("./hatchet-logger");
 Object.defineProperty(exports, "HatchetLogger", { enumerable: true, get: function () { return hatchet_logger_1.HatchetLogger; } });

package/clients/listeners/durable-listener/durable-listener-client.d.ts

@@ -16,6 +16,12 @@ export declare class DurableListenerClient {
         taskId: string;
         signalKey: string;
     }): import("./pooled-durable-listener-client").DurableEventStreamable;
+    result(request: {
+        taskId: string;
+        signalKey: string;
+    }, opts?: {
+        signal?: AbortSignal;
+    }): Promise<import("../../../protoc/v1/dispatcher").DurableEvent>;
     registerDurableEvent(request: {
         taskId: string;
         signalKey: string;

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

@@ -18,6 +18,14 @@ class DurableListenerClient {
         }
         return this.pooledListener.subscribe(request);
     }
+    result(request, opts) {
+        if (!this.pooledListener) {
+            this.pooledListener = new pooled_durable_listener_client_1.DurableEventGrpcPooledListener(this, () => {
+                this.pooledListener = undefined;
+            });
+        }
+        return this.pooledListener.result(request, opts);
+    }
     registerDurableEvent(request) {
         if (!this.pooledListener) {
             this.pooledListener = new pooled_durable_listener_client_1.DurableEventGrpcPooledListener(this, () => {

package/clients/listeners/durable-listener/pooled-durable-listener-client.d.ts

@@ -6,9 +6,13 @@ export declare class DurableEventStreamable {
     listener: AsyncIterable<DurableEvent>;
     taskId: string;
     signalKey: string;
+    subscriptionId: string;
+    onCleanup: () => void;
     responseEmitter: EventEmitter<[never]>;
-    constructor(listener: AsyncIterable<DurableEvent>, taskId: string, signalKey: string);
-    get(): Promise<DurableEvent>;
+    constructor(listener: AsyncIterable<DurableEvent>, taskId: string, signalKey: string, subscriptionId: string, onCleanup: () => void);
+    get(opts?: {
+        signal?: AbortSignal;
+    }): Promise<DurableEvent>;
 }
 export declare class DurableEventGrpcPooledListener {
     listener: AsyncIterable<DurableEvent> | undefined;
@@ -24,6 +28,7 @@ export declare class DurableEventGrpcPooledListener {
     constructor(client: DurableListenerClient, onFinish: () => void);
     private scheduleInterrupt;
     private init;
+    private cleanupSubscription;
     subscribe(request: {
         taskId: string;
         signalKey: string;
@@ -31,6 +36,8 @@ export declare class DurableEventGrpcPooledListener {
     result(request: {
         taskId: string;
         signalKey: string;
+    }, opts?: {
+        signal?: AbortSignal;
     }): Promise<DurableEvent>;
     registerDurableEvent(request: {
         taskId: string;

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

@@ -37,17 +37,60 @@ exports.DurableEventGrpcPooledListener = exports.DurableEventStreamable = void 0
 const events_1 = require("events");
 const abort_controller_x_1 = require("abort-controller-x");
 const sleep_1 = __importDefault(require("../../../util/sleep"));
+const abort_error_1 = require("../../../util/abort-error");
 class DurableEventStreamable {
-    constructor(listener, taskId, signalKey) {
+    constructor(listener, taskId, signalKey, subscriptionId, onCleanup) {
         this.responseEmitter = new events_1.EventEmitter();
         this.listener = listener;
         this.taskId = taskId;
         this.signalKey = signalKey;
+        this.subscriptionId = subscriptionId;
+        this.onCleanup = onCleanup;
     }
-    get() {
+    get(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
-                this.responseEmitter.once('response', resolve);
+            const signal = opts === null || opts === void 0 ? void 0 : opts.signal;
+            return new Promise((resolve, reject) => {
+                let cleanedUp = false;
+                const cleanup = () => {
+                    if (cleanedUp)
+                        return;
+                    cleanedUp = true;
+                    this.responseEmitter.removeListener('response', onResponse);
+                    if (signal) {
+                        signal.removeEventListener('abort', onAbort);
+                    }
+                    this.onCleanup();
+                };
+                const onResponse = (event) => {
+                    cleanup();
+                    resolve(event);
+                };
+                const onAbort = () => {
+                    cleanup();
+                    reject((0, abort_error_1.createAbortError)('Operation cancelled by AbortSignal'));
+                };
+                if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                    onAbort();
+                    return;
+                }
+                this.responseEmitter.once('response', onResponse);
+                if (signal) {
+                    /**
+                     * Node defaults AbortSignal max listeners to 10, which is easy to exceed with
+                     * legitimate high-concurrency waits (e.g. multiple concurrent `ctx.waitFor(...)`
+                     * calls in the same task).
+                     *
+                     * If the signal is still at the default cap, bump it to a reasonable level
+                     * to avoid noisy `MaxListenersExceededWarning` while still keeping protection
+                     * against true leaks in unusual cases.
+                     */
+                    const max = (0, events_1.getMaxListeners)(signal);
+                    if (max !== 0 && max < 50) {
+                        (0, events_1.setMaxListeners)(50, signal);
+                    }
+                    signal.addEventListener('abort', onAbort, { once: true });
+                }
             });
         });
     }
@@ -115,13 +158,7 @@ class DurableEventGrpcPooledListener {
                             const emitter = this.subscribers[subId];
                             if (emitter) {
                                 emitter.responseEmitter.emit('response', event);
-                                delete this.subscribers[subId];
-                                // Remove this subscription from the mapping
-                                this.taskSignalKeyToSubscriptionIds[subscriptionKey] =
-                                    this.taskSignalKeyToSubscriptionIds[subscriptionKey].filter((id) => id !== subId);
-                                if (this.taskSignalKeyToSubscriptionIds[subscriptionKey].length === 0) {
-                                    delete this.taskSignalKeyToSubscriptionIds[subscriptionKey];
-                                }
+                                this.cleanupSubscription(subId);
                             }
                         }
                     }
@@ -152,13 +189,28 @@ class DurableEventGrpcPooledListener {
             }
         });
     }
+    cleanupSubscription(subscriptionId) {
+        const emitter = this.subscribers[subscriptionId];
+        if (!emitter) {
+            return;
+        }
+        const subscriptionKey = keyHelper(emitter.taskId, emitter.signalKey);
+        delete this.subscribers[subscriptionId];
+        // Remove from the mapping
+        if (this.taskSignalKeyToSubscriptionIds[subscriptionKey]) {
+            this.taskSignalKeyToSubscriptionIds[subscriptionKey] = this.taskSignalKeyToSubscriptionIds[subscriptionKey].filter((id) => id !== subscriptionId);
+            if (this.taskSignalKeyToSubscriptionIds[subscriptionKey].length === 0) {
+                delete this.taskSignalKeyToSubscriptionIds[subscriptionKey];
+            }
+        }
+    }
     subscribe(request) {
         const { taskId, signalKey } = request;
         if (!this.listener)
             throw new Error('listener not initialized');
         // eslint-disable-next-line no-plusplus
         const subscriptionId = (this.subscriptionCounter++).toString();
-        const subscriber = new DurableEventStreamable(this.listener, taskId, signalKey);
+        const subscriber = new DurableEventStreamable(this.listener, taskId, signalKey, subscriptionId, () => this.cleanupSubscription(subscriptionId));
         this.subscribers[subscriptionId] = subscriber;
         const key = keyHelper(taskId, signalKey);
         if (!this.taskSignalKeyToSubscriptionIds[key]) {
@@ -168,10 +220,10 @@ class DurableEventGrpcPooledListener {
         this.requestEmitter.emit('subscribe', { taskId, signalKey });
         return subscriber;
     }
-    result(request) {
+    result(request, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const subscriber = this.subscribe(request);
-            const event = yield subscriber.get();
+            const event = yield subscriber.get({ signal: opts === null || opts === void 0 ? void 0 : opts.signal });
             return event;
         });
     }
@@ -192,7 +244,7 @@ class DurableEventGrpcPooledListener {
     replayRequests() {
         const subscriptionEntries = Object.entries(this.taskSignalKeyToSubscriptionIds);
         this.client.logger.debug(`Replaying ${subscriptionEntries.length} requests...`);
-        for (const [key, _] of subscriptionEntries) {
+        for (const [key] of subscriptionEntries) {
             const [taskId, signalKey] = key.split('|');
             this.requestEmitter.emit('subscribe', { taskId, signalKey });
         }

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

@@ -186,6 +186,7 @@ class RunEventListener {
                 this.eventEmitter.emit('event');
             });
             try {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 for (var _d = true, _e = __asyncValues((0, events_1.on)(this.eventEmitter, 'event')), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
                     _c = _f.value;
                     _d = false;

package/clients/listeners/run-listener/pooled-child-listener-client.d.ts

@@ -4,9 +4,17 @@ import { RunListenerClient } from './child-listener-client';
 export declare class Streamable {
     listener: AsyncIterable<WorkflowRunEvent>;
     id: string;
+    onCleanup: () => void;
+    private cleanedUp;
     responseEmitter: EventEmitter<[never]>;
-    constructor(listener: AsyncIterable<WorkflowRunEvent>, id: string);
-    stream(): AsyncGenerator<WorkflowRunEvent, void, unknown>;
+    constructor(listener: AsyncIterable<WorkflowRunEvent>, id: string, onCleanup: () => void);
+    private cleanupOnce;
+    get(opts?: {
+        signal?: AbortSignal;
+    }): Promise<WorkflowRunEvent>;
+    stream(opts?: {
+        signal?: AbortSignal;
+    }): AsyncGenerator<WorkflowRunEvent, void, unknown>;
 }
 export declare class RunGrpcPooledListener {
     listener: AsyncIterable<WorkflowRunEvent> | undefined;

package/clients/listeners/run-listener/pooled-child-listener-client.js

@@ -38,19 +38,73 @@ 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 abort_error_1 = require("../../../util/abort-error");
 class Streamable {
-    constructor(listener, id) {
+    constructor(listener, id, onCleanup) {
+        this.cleanedUp = false;
         this.responseEmitter = new events_1.EventEmitter();
         this.listener = listener;
         this.id = id;
+        this.onCleanup = onCleanup;
     }
-    stream() {
+    cleanupOnce() {
+        if (this.cleanedUp)
+            return;
+        this.cleanedUp = true;
+        this.onCleanup();
+    }
+    get(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const signal = opts === null || opts === void 0 ? void 0 : opts.signal;
+            return new Promise((resolve, reject) => {
+                const cleanupListeners = () => {
+                    this.responseEmitter.removeListener('response', onResponse);
+                    if (signal) {
+                        signal.removeEventListener('abort', onAbort);
+                    }
+                };
+                const onResponse = (event) => {
+                    cleanupListeners();
+                    resolve(event);
+                };
+                const onAbort = () => {
+                    cleanupListeners();
+                    this.cleanupOnce();
+                    reject((0, abort_error_1.createAbortError)('Operation cancelled by AbortSignal'));
+                };
+                if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                    onAbort();
+                    return;
+                }
+                this.responseEmitter.once('response', onResponse);
+                if (signal) {
+                    /**
+                     * Node defaults AbortSignal max listeners to 10, which is easy to exceed with
+                     * legitimate high-concurrency waits (e.g. a cancelled parent task fanning out
+                     * to many child `.result()` waits).
+                     *
+                     * If the signal is still at the default cap, bump it to a reasonable level
+                     * to avoid noisy `MaxListenersExceededWarning` while still keeping protection
+                     * against true leaks in unusual cases.
+                     */
+                    const max = (0, events_1.getMaxListeners)(signal);
+                    if (max !== 0 && max < 50) {
+                        (0, events_1.setMaxListeners)(50, signal);
+                    }
+                    signal.addEventListener('abort', onAbort, { once: true });
+                }
+            });
+        });
+    }
+    stream(opts) {
         return __asyncGenerator(this, arguments, function* stream_1() {
             while (true) {
-                const req = yield __await(new Promise((resolve) => {
-                    this.responseEmitter.once('response', resolve);
-                }));
-                yield yield __await(req);
+                const event = yield __await(this.get(opts));
+                yield yield __await(event);
+                if (event.eventType === dispatcher_1.WorkflowRunEventType.WORKFLOW_RUN_EVENT_TYPE_FINISHED) {
+                    this.cleanupOnce();
+                    break;
+                }
             }
         });
     }
@@ -128,7 +182,9 @@ class RunGrpcPooledListener {
     subscribe(request) {
         if (!this.listener)
             throw new Error('listener not initialized');
-        this.subscribers[request.workflowRunId] = new Streamable(this.listener, request.workflowRunId);
+        this.subscribers[request.workflowRunId] = new Streamable(this.listener, request.workflowRunId, () => {
+            delete this.subscribers[request.workflowRunId];
+        });
         this.requestEmitter.emit('subscribe', request);
         return this.subscribers[request.workflowRunId];
     }

package/clients/rest/api.js

@@ -3,11 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const https_1 = __importDefault(require("https"));
 const qs_1 = __importDefault(require("qs"));
 const Api_1 = require("./generated/Api");
+function getDefaultAxiosOpts(serverUrl) {
+    const opts = {};
+    if (serverUrl.startsWith('https://') && process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
+        opts.httpsAgent = new https_1.default.Agent({ rejectUnauthorized: false });
+    }
+    return opts;
+}
 const api = (serverUrl, token, axiosOpts) => {
-    return new Api_1.Api(Object.assign({ baseURL: serverUrl, headers: {
+    return new Api_1.Api(Object.assign(Object.assign({ baseURL: serverUrl, headers: {
             Authorization: `Bearer ${token}`,
-        }, paramsSerializer: (params) => qs_1.default.stringify(params, { arrayFormat: 'repeat' }) }, axiosOpts));
+        }, paramsSerializer: (params) => qs_1.default.stringify(params, { arrayFormat: 'repeat' }) }, getDefaultAxiosOpts(serverUrl)), axiosOpts));
 };
 exports.default = api;

package/clients/rest/generated/Api.d.ts

@@ -1,4 +1,4 @@
-import { APIErrors, APIMeta, AcceptInviteRequest, BulkCreateEventRequest, CancelEventRequest, CreateAPITokenRequest, CreateAPITokenResponse, CreateCronWorkflowTriggerRequest, CreateEventRequest, CreateSNSIntegrationRequest, CreateTenantAlertEmailGroupRequest, CreateTenantInviteRequest, CreateTenantRequest, CronWorkflows, CronWorkflowsList, CronWorkflowsOrderByField, Event, EventData, EventKey, EventKeyList, EventList, EventOrderByDirection, EventOrderByField, EventSearch, Events, ListAPIMetaIntegration, ListAPITokensResponse, ListSNSIntegrations, ListSlackWebhooks, LogLineLevelField, LogLineList, LogLineOrderByDirection, LogLineOrderByField, LogLineSearch, RateLimitList, RateLimitOrderByDirection, RateLimitOrderByField, RejectInviteRequest, ReplayEventRequest, ReplayWorkflowRunsRequest, ReplayWorkflowRunsResponse, RerunStepRunRequest, SNSIntegration, ScheduleWorkflowRunRequest, ScheduledRunStatus, ScheduledWorkflows, ScheduledWorkflowsBulkDeleteRequest, ScheduledWorkflowsBulkDeleteResponse, ScheduledWorkflowsBulkUpdateRequest, ScheduledWorkflowsBulkUpdateResponse, ScheduledWorkflowsList, ScheduledWorkflowsOrderByField, StepRun, StepRunArchiveList, StepRunEventList, TaskStats, Tenant, TenantAlertEmailGroup, TenantAlertEmailGroupList, TenantAlertingSettings, TenantInvite, TenantInviteList, TenantMember, TenantMemberList, TenantQueueMetrics, TenantResourcePolicy, TenantStepRunQueueMetrics, TriggerWorkflowRunRequest, UpdateCronWorkflowTriggerRequest, UpdateScheduledWorkflowRunRequest, UpdateTenantAlertEmailGroupRequest, UpdateTenantInviteRequest, UpdateTenantMemberRequest, UpdateTenantRequest, UpdateWorkerRequest, User, UserChangePasswordRequest, UserLoginRequest, UserRegisterRequest, UserTenantMembershipsList, V1CELDebugRequest, V1CELDebugResponse, V1CancelTaskRequest, V1CancelledTasks, V1CreateFilterRequest, V1CreateWebhookRequest, V1DagChildren, V1Event, V1EventList, V1Filter, V1FilterList, V1LogLineLevel, V1LogLineList, V1LogLineOrderByDirection, V1ReplayTaskRequest, V1ReplayedTasks, V1TaskEventList, V1TaskPointMetrics, V1TaskRunMetrics, V1TaskStatus, V1TaskSummary, V1TaskSummaryList, V1TaskTimingList, V1TriggerWorkflowRunRequest, V1UpdateFilterRequest, V1UpdateWebhookRequest, V1Webhook, V1WebhookList, V1WebhookSourceName, V1WorkflowRunDetails, V1WorkflowRunDisplayNameList, V1WorkflowRunExternalIdList, WebhookWorkerCreateRequest, WebhookWorkerCreated, WebhookWorkerListResponse, WebhookWorkerRequestListResponse, Worker, WorkerList, Workflow, WorkflowID, WorkflowKindList, WorkflowList, WorkflowMetrics, WorkflowRun, WorkflowRunList, WorkflowRunOrderByDirection, WorkflowRunOrderByField, WorkflowRunShape, WorkflowRunStatus, WorkflowRunStatusList, WorkflowRunsCancelRequest, WorkflowRunsMetrics, WorkflowUpdateRequest, WorkflowVersion, WorkflowWorkersCount } from './data-contracts';
+import { APIErrors, APIMeta, AcceptInviteRequest, BulkCreateEventRequest, CancelEventRequest, CreateAPITokenRequest, CreateAPITokenResponse, CreateCronWorkflowTriggerRequest, CreateEventRequest, CreateSNSIntegrationRequest, CreateTenantAlertEmailGroupRequest, CreateTenantInviteRequest, CreateTenantRequest, CronWorkflows, CronWorkflowsList, CronWorkflowsOrderByField, Event, EventData, EventKey, EventKeyList, EventList, EventOrderByDirection, EventOrderByField, EventSearch, Events, ListAPIMetaIntegration, ListAPITokensResponse, ListSNSIntegrations, ListSlackWebhooks, LogLineLevelField, LogLineList, LogLineOrderByDirection, LogLineOrderByField, LogLineSearch, RateLimitList, RateLimitOrderByDirection, RateLimitOrderByField, RejectInviteRequest, ReplayEventRequest, ReplayWorkflowRunsRequest, ReplayWorkflowRunsResponse, RerunStepRunRequest, SNSIntegration, ScheduleWorkflowRunRequest, ScheduledRunStatus, ScheduledWorkflows, ScheduledWorkflowsBulkDeleteRequest, ScheduledWorkflowsBulkDeleteResponse, ScheduledWorkflowsBulkUpdateRequest, ScheduledWorkflowsBulkUpdateResponse, ScheduledWorkflowsList, ScheduledWorkflowsOrderByField, StepRun, StepRunArchiveList, StepRunEventList, TaskStats, Tenant, TenantAlertEmailGroup, TenantAlertEmailGroupList, TenantAlertingSettings, TenantInvite, TenantInviteList, TenantMember, TenantMemberList, TenantQueueMetrics, TenantResourcePolicy, TenantStepRunQueueMetrics, TriggerWorkflowRunRequest, UpdateCronWorkflowTriggerRequest, UpdateScheduledWorkflowRunRequest, UpdateTenantAlertEmailGroupRequest, UpdateTenantInviteRequest, UpdateTenantMemberRequest, UpdateTenantRequest, UpdateWorkerRequest, User, UserChangePasswordRequest, UserLoginRequest, UserRegisterRequest, UserTenantMembershipsList, V1CELDebugRequest, V1CELDebugResponse, V1CancelTaskRequest, V1CancelledTasks, V1CreateFilterRequest, V1CreateWebhookRequest, V1DagChildren, V1Event, V1EventList, V1Filter, V1FilterList, V1LogLineLevel, V1LogLineList, V1LogLineOrderByDirection, V1ReplayTaskRequest, V1ReplayedTasks, V1TaskEventList, V1TaskPointMetrics, V1TaskRunMetrics, V1TaskStatus, V1TaskSummary, V1TaskSummaryList, V1TaskTimingList, V1TriggerWorkflowRunRequest, V1UpdateFilterRequest, V1UpdateWebhookRequest, V1Webhook, V1WebhookList, V1WebhookResponse, V1WebhookSourceName, V1WorkflowRunDetails, V1WorkflowRunDisplayNameList, V1WorkflowRunExternalIdList, WebhookWorkerCreateRequest, WebhookWorkerCreated, WebhookWorkerListResponse, WebhookWorkerRequestListResponse, Worker, WorkerList, Workflow, WorkflowID, WorkflowKindList, WorkflowList, WorkflowMetrics, WorkflowRun, WorkflowRunList, WorkflowRunOrderByDirection, WorkflowRunOrderByField, WorkflowRunShape, WorkflowRunStatus, WorkflowRunStatusList, WorkflowRunsCancelRequest, WorkflowRunsMetrics, WorkflowUpdateRequest, WorkflowVersion, WorkflowWorkersCount } from './data-contracts';
 import { HttpClient, RequestParams } from './http-client';
 export declare class Api<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
     /**
@@ -528,7 +528,7 @@ export declare class Api<SecurityDataType = unknown> extends HttpClient<Security
      * @summary Post a webhook message
      * @request POST:/api/v1/stable/tenants/{tenant}/webhooks/{v1-webhook}
      */
-    v1WebhookReceive: (tenant: string, v1Webhook: string, data?: any, params?: RequestParams) => Promise<import("axios").AxiosResponse<Record<string, any>, any, {}>>;
+    v1WebhookReceive: (tenant: string, v1Webhook: string, data?: any, params?: RequestParams) => Promise<import("axios").AxiosResponse<V1WebhookResponse, any, {}>>;
     /**
      * @description Update a webhook
      *

package/clients/rest/generated/data-contracts.d.ts

@@ -877,6 +877,12 @@ export type V1CreateWebhookRequestHMAC = V1CreateWebhookRequestBase & {
     auth: V1WebhookHMACAuth;
 };
 export type V1CreateWebhookRequest = V1CreateWebhookRequestBasicAuth | V1CreateWebhookRequestAPIKey | V1CreateWebhookRequestHMAC;
+export interface V1WebhookResponse {
+    /** The message for the webhook response */
+    message?: string;
+    event?: V1Event;
+    challenge?: string;
+}
 export interface V1UpdateWebhookRequest {
     /** The CEL expression to use for the event key. This is used to create the event key from the webhook payload. */
     eventKeyExpression?: string;

package/index.d.ts

@@ -1,10 +1,9 @@
 import { HatchetClient as Hatchet } from './v1/client/client';
-export * from './workflow';
-export * from './step';
-export * from './clients/worker';
 export * from './clients/rest';
 export * from './clients/admin';
 export * from './util/workflow-run-ref';
 export * from './v1';
+export * from './workflow';
+export * from './step';
 export default Hatchet;
 export { Hatchet };

package/index.js

@@ -17,11 +17,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hatchet = void 0;
 const client_1 = require("./v1/client/client");
 Object.defineProperty(exports, "Hatchet", { enumerable: true, get: function () { return client_1.HatchetClient; } });
-__exportStar(require("./workflow"), exports);
-__exportStar(require("./step"), exports);
-__exportStar(require("./clients/worker"), exports);
 __exportStar(require("./clients/rest"), exports);
 __exportStar(require("./clients/admin"), exports);
 __exportStar(require("./util/workflow-run-ref"), exports);
 __exportStar(require("./v1"), exports);
+__exportStar(require("./workflow"), exports);
+__exportStar(require("./step"), exports);
 exports.default = client_1.HatchetClient;

package/{examples → legacy/examples}/affinity-workers.js

@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const workflows_1 = require("../protoc/workflows");
-const sdk_1 = __importDefault(require("../sdk"));
+const workflows_1 = require("../../protoc/workflows");
+const sdk_1 = __importDefault(require("../../sdk"));
 const hatchet = sdk_1.default.init();
 // > AffinityWorkflow
 const workflow = {

package/{examples → legacy/examples}/bulk-fanout-trigger.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sdk_1 = __importDefault(require("../sdk"));
+const sdk_1 = __importDefault(require("../../sdk"));
 const hatchet = sdk_1.default.init();
 function main() {
     return __awaiter(this, void 0, void 0, function* () {

package/{examples → legacy/examples}/bulk-fanout-worker.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sdk_1 = __importDefault(require("../sdk"));
+const sdk_1 = __importDefault(require("../../sdk"));
 const hatchet = sdk_1.default.init();
 const parentWorkflow = {
     id: 'bulk-parent-workflow',