@hatchet-dev/typescript-sdk 1.33.1 → 1.34.0-alpha.0

package/v1/client/admin.js

@@ -28,95 +28,36 @@ const hatchet_error_1 = __importDefault(require("../../util/errors/hatchet-error
 const idempotency_collision_error_1 = require("../../util/errors/idempotency-collision-error");
 const bulk_trigger_idempotency_collision_error_1 = require("../../util/errors/bulk-trigger-idempotency-collision-error");
 const workflow_run_ref_1 = __importDefault(require("../../util/workflow-run-ref"));
-const grpc_js_1 = require("@grpc/grpc-js");
-const status_1 = require("../../protoc/google/rpc/status");
-const workflows_1 = require("../../protoc/v1/workflows");
-const nice_grpc_common_1 = require("nice-grpc-common");
+const connect_1 = require("@connectrpc/connect");
+const workflows_pb_1 = require("../../protoc-es/v1/workflows_pb");
+const nice_grpc_1 = require("nice-grpc");
 const grpc_helpers_1 = require("../../util/grpc-helpers");
+const config_loader_1 = require("../../util/config-loader");
 const child_listener_client_1 = require("../../clients/listeners/run-listener/child-listener-client");
-const workflows_2 = require("../../protoc/workflows");
-const workflows_3 = require("../../protoc/v1/workflows");
+const workflows_1 = require("../../protoc/workflows");
+const rpc_1 = require("../../clients/admin/rpc");
+const transport_1 = require("../../clients/transport");
 const retrier_1 = require("../../util/retrier");
 const batch_1 = require("../../util/batch");
 const apply_namespace_1 = require("../../util/apply-namespace");
-function isGrpcServiceError(e) {
-    return e instanceof Error && 'code' in e && 'metadata' in e;
+/**
+ * The engine answers a trigger whose idempotency key is already taken with `ALREADY_EXISTS`
+ * and attaches the collision details to the status. The Connect client decodes those details
+ * from the trailer, so the error carries everything needed to build the SDK's collision errors.
+ */
+function isAlreadyExists(e) {
+    return e instanceof connect_1.ConnectError && e.code === connect_1.Code.AlreadyExists;
 }
-function extractExistingRunIdFromGrpcError(e) {
+function extractExistingRunId(e) {
     var _a;
-    try {
-        const [binData] = e.metadata.get('grpc-status-details-bin');
-        if (!binData)
-            return '';
-        const status = status_1.Status.decode(binData instanceof Buffer ? binData : Buffer.from(binData));
-        for (const detail of status.details) {
-            if (detail.typeUrl.includes('IdempotencyCollisionError')) {
-                return (_a = workflows_1.IdempotencyCollisionError.decode(detail.value).existingRunExternalId) !== null && _a !== void 0 ? _a : '';
-            }
-        }
-    }
-    catch (_b) {
-        // ignore decoding errors
-    }
-    return '';
+    const [detail] = e.findDetails(workflows_pb_1.IdempotencyCollisionErrorSchema);
+    return (_a = detail === null || detail === void 0 ? void 0 : detail.existingRunExternalId) !== null && _a !== void 0 ? _a : '';
 }
-function isNiceGrpcAlreadyExists(e) {
-    return e instanceof nice_grpc_common_1.ClientError && e.code === nice_grpc_common_1.Status.ALREADY_EXISTS;
-}
-function decodeBulkTriggerCollision(status) {
-    for (const detail of status.details) {
-        if (detail.typeUrl.includes('BulkTriggerIdempotencyCollisionError')) {
-            const proto = workflows_1.BulkTriggerIdempotencyCollisionError.decode(detail.value);
-            return new bulk_trigger_idempotency_collision_error_1.BulkTriggerIdempotencyCollisionError(proto.successfulWorkflowRunExternalIds, proto.collisions.map((c) => new idempotency_collision_error_1.IdempotencyCollisionError(c.existingRunExternalId)));
-        }
-    }
-    return null;
-}
-function extractBulkTriggerCollisionFromGrpcError(e) {
-    try {
-        const [binData] = e.metadata.get('grpc-status-details-bin');
-        if (!binData)
-            return null;
-        const status = status_1.Status.decode(binData instanceof Buffer ? binData : Buffer.from(binData));
-        return decodeBulkTriggerCollision(status);
-    }
-    catch (_a) {
-        return null;
-    }
-}
-function extractBulkTriggerCollisionFromNiceGrpcMetadata(metadata) {
-    if (!metadata)
-        return null;
-    try {
-        const binData = metadata.get('grpc-status-details-bin');
-        if (!binData)
-            return null;
-        const status = status_1.Status.decode(binData);
-        return decodeBulkTriggerCollision(status);
-    }
-    catch (_a) {
+function extractBulkTriggerCollision(e) {
+    const [detail] = e.findDetails(workflows_pb_1.BulkTriggerIdempotencyCollisionErrorSchema);
+    if (!detail)
         return null;
-    }
-}
-function extractRunIdFromNiceGrpcMetadata(metadata) {
-    var _a;
-    if (!metadata)
-        return '';
-    try {
-        const binData = metadata.get('grpc-status-details-bin');
-        if (!binData)
-            return '';
-        const status = status_1.Status.decode(binData);
-        for (const detail of status.details) {
-            if (detail.typeUrl.includes('IdempotencyCollisionError')) {
-                return (_a = workflows_1.IdempotencyCollisionError.decode(detail.value).existingRunExternalId) !== null && _a !== void 0 ? _a : '';
-            }
-        }
-    }
-    catch (_b) {
-        // ignore decoding errors
-    }
-    return '';
+    return new bulk_trigger_idempotency_collision_error_1.BulkTriggerIdempotencyCollisionError(detail.successfulWorkflowRunExternalIds, detail.collisions.map((c) => new idempotency_collision_error_1.IdempotencyCollisionError(c.existingRunExternalId)));
 }
 function convertDesiredWorkerLabels(labels) {
     return Object.fromEntries(Object.entries(labels).map(([key, label]) => [
@@ -131,12 +72,14 @@ function convertDesiredWorkerLabels(labels) {
     ]));
 }
 class AdminClient {
-    constructor(config, api, runs) {
+    constructor(config, api, runs, transport = (0, transport_1.createNodeTransport)(config)) {
         this.config = config;
         this.logger = config.logger(`Admin`, config.log_level);
-        const { client, channel, factory } = (0, grpc_helpers_1.createGrpcClient)(config, workflows_2.WorkflowServiceDefinition);
-        this.workflowsGrpc = client;
-        this.adminGrpc = factory.create(workflows_3.AdminServiceDefinition, channel);
+        this.workflowsGrpc = (0, rpc_1.createWorkflowsRpc)(transport);
+        this.adminGrpc = (0, rpc_1.createV1AdminRpc)(transport);
+        // The run listener streams, which stay on the nice-grpc channel.
+        const channel = (0, grpc_helpers_1.channelFactory)(config, config_loader_1.ConfigLoader.createCredentials(config.tls_config));
+        const factory = (0, nice_grpc_1.createClientFactory)().use((0, grpc_helpers_1.addTokenMiddleware)(config.token));
         this.listenerClient = new child_listener_client_1.RunListenerClient(config, channel, factory, api);
         this.runs = runs;
     }
@@ -167,7 +110,6 @@ class AdminClient {
      */
     runWorkflow(workflowName, input, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let trailerMetadata;
             try {
                 const computedName = (0, apply_namespace_1.applyNamespace)(workflowName, this.config.namespace).toLowerCase();
                 const inputStr = JSON.stringify(input);
@@ -178,24 +120,15 @@ class AdminClient {
                     parentTaskRunExternalId: parentTaskRunExternalId !== null && parentTaskRunExternalId !== void 0 ? parentTaskRunExternalId : parentStepRunId, additionalMetadata: additionalMetadata ? JSON.stringify(additionalMetadata) : undefined, priority: opts.priority, desiredWorkerLabels: desiredWorkerLabels
                         ? convertDesiredWorkerLabels(desiredWorkerLabels)
                         : {} });
-                const resp = yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () {
-                    return this.workflowsGrpc.triggerWorkflow(request, {
-                        onTrailer: (trailer) => {
-                            trailerMetadata = trailer;
-                        },
-                    });
-                }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isNiceGrpcAlreadyExists(e) }));
+                const resp = yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () { return this.workflowsGrpc.triggerWorkflow(request); }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isAlreadyExists(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();
                 return ref;
             }
             catch (e) {
-                if (isGrpcServiceError(e) && e.code === grpc_js_1.status.ALREADY_EXISTS) {
-                    throw new idempotency_collision_error_1.IdempotencyCollisionError(extractExistingRunIdFromGrpcError(e));
-                }
-                if (isNiceGrpcAlreadyExists(e)) {
-                    throw new idempotency_collision_error_1.IdempotencyCollisionError(extractRunIdFromNiceGrpcMetadata(trailerMetadata));
+                if (isAlreadyExists(e)) {
+                    throw new idempotency_collision_error_1.IdempotencyCollisionError(extractExistingRunId(e));
                 }
                 throw new hatchet_error_1.default(e instanceof Error ? e.message : String(e));
             }
@@ -227,23 +160,15 @@ class AdminClient {
             });
             const batches = (0, batch_1.batch)(workflowRequests, batchSize, (_a = this.config.grpc_max_send_message_length) !== null && _a !== void 0 ? _a : 4 * 1024 * 1024);
             this.logger.debug(`batching ${batches.length} batches`);
-            let bulkTrailerMetadata;
             try {
                 const results = [];
                 // for loop to ensure serial execution of batches
                 for (const { payloads, originalIndices, batchIndex } of batches) {
-                    const request = workflows_2.BulkTriggerWorkflowRequest.create({
+                    const request = workflows_1.BulkTriggerWorkflowRequest.create({
                         workflows: payloads,
                     });
                     // Call the bulk trigger workflow method for this batch
-                    const bulkTriggerWorkflowResponse = yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () {
-                        return this.workflowsGrpc.bulkTriggerWorkflow(request, {
-                            onTrailer: (trailer) => {
-                                bulkTrailerMetadata = trailer;
-                            },
-                        });
-                    }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isNiceGrpcAlreadyExists(e) &&
-                            !(isGrpcServiceError(e) && e.code === grpc_js_1.status.ALREADY_EXISTS) }));
+                    const bulkTriggerWorkflowResponse = yield (0, retrier_1.retrier)(() => __awaiter(this, void 0, void 0, function* () { return this.workflowsGrpc.bulkTriggerWorkflow(request); }), this.logger, Object.assign(Object.assign({}, this.config.retrier), { shouldRetry: (e) => !isAlreadyExists(e) }));
                     this.logger.debug(`batch ${batchIndex + 1} of ${batches.length}`);
                     // Map the results back to their original indices
                     const batchResults = bulkTriggerWorkflowResponse.workflowRunIds.map((resp, index) => {
@@ -256,13 +181,8 @@ class AdminClient {
                 return results;
             }
             catch (e) {
-                if (isGrpcServiceError(e) && e.code === grpc_js_1.status.ALREADY_EXISTS) {
-                    const collision = extractBulkTriggerCollisionFromGrpcError(e);
-                    if (collision)
-                        throw collision;
-                }
-                if (isNiceGrpcAlreadyExists(e)) {
-                    const collision = extractBulkTriggerCollisionFromNiceGrpcMetadata(bulkTrailerMetadata);
+                if (isAlreadyExists(e)) {
+                    const collision = extractBulkTriggerCollision(e);
                     if (collision)
                         throw collision;
                 }

package/v1/client/client.d.ts

@@ -39,6 +39,7 @@ export declare class HatchetClient<GlobalInput extends Record<string, any> = {},
     private _axiosConfig;
     private _clientFactory;
     private _credentials;
+    private _transport;
     /**
      * @deprecated v0 client will be removed in a future release, please upgrade to v1
      * @hidden

package/v1/client/client.js

@@ -29,6 +29,7 @@ const dispatcher_client_1 = require("../../clients/dispatcher/dispatcher-client"
 const child_listener_client_1 = require("../../clients/listeners/run-listener/child-listener-client");
 const durable_listener_client_1 = require("../../clients/listeners/durable-listener/durable-listener-client");
 const grpc_helpers_1 = require("../../util/grpc-helpers");
+const transport_1 = require("../../clients/transport");
 const nice_grpc_1 = require("nice-grpc");
 const declaration_1 = require("../declaration");
 const legacy_transformer_1 = require("../../legacy/legacy-transformer");
@@ -50,7 +51,8 @@ class HatchetClient {
      */
     get v0() {
         if (!this._v0) {
-            this._v0 = new hatchet_client_1.LegacyHatchetClient(this._config, this._options, this._axiosConfig, this.runs, this._listener, this.events, this.dispatcher, this.logger, this.durableListener);
+            // The legacy facade shares this client's unary transport rather than building its own.
+            this._v0 = new hatchet_client_1.LegacyHatchetClient(this._config, Object.assign(Object.assign({}, this._options), { transport: this._transport }), this._axiosConfig, this.runs, this._listener, this.events, this.dispatcher, this.logger, this.durableListener);
         }
         return this._v0;
     }
@@ -62,7 +64,7 @@ class HatchetClient {
      * @internal
      */
     constructor(config, options, axiosConfig) {
-        var _a;
+        var _a, _b;
         try {
             const loaded = config_loader_1.ConfigLoader.loadClientConfig(config, {
                 path: options === null || options === void 0 ? void 0 : options.config_path,
@@ -80,6 +82,7 @@ class HatchetClient {
             this._clientFactory = (0, nice_grpc_1.createClientFactory)().use((0, grpc_helpers_1.addTokenMiddleware)(this.config.token));
             this._credentials =
                 (_a = options === null || options === void 0 ? void 0 : options.credentials) !== null && _a !== void 0 ? _a : config_loader_1.ConfigLoader.createCredentials(this.config.tls_config);
+            this._transport = (_b = options === null || options === void 0 ? void 0 : options.transport) !== null && _b !== void 0 ? _b : (0, transport_1.createNodeTransport)(this.config);
             this._listener = new child_listener_client_1.RunListenerClient(this.config, (0, grpc_helpers_1.channelFactory)(this.config, this._credentials), this._clientFactory, this.api);
             this._options = options;
             this._axiosConfig = axiosConfig;
@@ -104,7 +107,7 @@ class HatchetClient {
                 // Do nothing here
             });
         }
-        catch (_b) {
+        catch (_c) {
             // Do nothing here
         }
     }
@@ -295,7 +298,7 @@ class HatchetClient {
      */
     get events() {
         if (!this._event) {
-            this._event = new event_client_1.EventClient(this._config, (0, grpc_helpers_1.channelFactory)(this._config, this._credentials), this._clientFactory, this.api);
+            this._event = new event_client_1.EventClient(this._config, (0, grpc_helpers_1.channelFactory)(this._config, this._credentials), this._clientFactory, this.api, this._transport);
         }
         return this._event;
     }
@@ -437,7 +440,7 @@ class HatchetClient {
      */
     get admin() {
         if (!this._admin) {
-            this._admin = new admin_1.AdminClient(this._config, this.api, this.runs);
+            this._admin = new admin_1.AdminClient(this._config, this.api, this.runs, this._transport);
         }
         return this._admin;
     }

package/v1/client/features/schedules.d.ts

@@ -1,6 +1,6 @@
 import { ScheduledWorkflows, ScheduledWorkflowsBulkDeleteFilter, ScheduledWorkflowsBulkDeleteResponse, ScheduledWorkflowsBulkUpdateResponse, ScheduledWorkflowsList } from '../../../clients/rest/generated/data-contracts';
 import { z } from 'zod/v4';
-import { Workflow } from '../../../workflow';
+import type { Workflow } from '../../../legacy/workflow';
 import { BaseWorkflowDeclaration, WorkflowDefinition } from '../..';
 import { HatchetClient } from '../client';
 import { WorkflowsClient } from './workflows';

package/v1/examples/concurrency-rr/workflow.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multipleConcurrencyKeys = exports.simpleConcurrency = void 0;
-const workflow_1 = require("../../../workflow");
+const v1_1 = require("../..");
 const hatchet_client_1 = require("../hatchet-client");
 const sleep = (ms) => new Promise((resolve) => {
     setTimeout(resolve, ms);
@@ -20,7 +20,7 @@ exports.simpleConcurrency = hatchet_client_1.hatchet.workflow({
     name: 'simple-concurrency',
     concurrency: {
         maxRuns: 1,
-        limitStrategy: workflow_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
+        limitStrategy: v1_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
         expression: 'input.GroupKey',
     },
 });
@@ -40,12 +40,12 @@ exports.multipleConcurrencyKeys = hatchet_client_1.hatchet.workflow({
     concurrency: [
         {
             maxRuns: 1,
-            limitStrategy: workflow_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
+            limitStrategy: v1_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
             expression: 'input.Tier',
         },
         {
             maxRuns: 1,
-            limitStrategy: workflow_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
+            limitStrategy: v1_1.ConcurrencyLimitStrategy.GROUP_ROUND_ROBIN,
             expression: 'input.Account',
         },
     ],

package/version.d.ts

@@ -1 +1 @@
-export declare const HATCHET_VERSION = "1.33.1";
+export declare const HATCHET_VERSION = "1.34.0-alpha.0";

package/version.js

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

package/workflow.js

@@ -18,6 +18,4 @@ exports.StickyStrategy = exports.ConcurrencyLimitStrategy = void 0;
 const v1_1 = require("./v1");
 Object.defineProperty(exports, "ConcurrencyLimitStrategy", { enumerable: true, get: function () { return v1_1.ConcurrencyLimitStrategy; } });
 Object.defineProperty(exports, "StickyStrategy", { enumerable: true, get: function () { return v1_1.StickyStrategy; } });
-const v0_deprecation_warning_1 = require("./util/v0-deprecation-warning");
 __exportStar(require("./legacy/workflow"), exports);
-(0, v0_deprecation_warning_1.emitV0RemovedWarning)('workflow', 'ConcurrencyLimitStrategy and StickyStrategy have been moved to @hatchet-dev/typescript-sdk/v1.');