Merge branch 'fix/release-ci' into features-v3

# Conflicts:
#	src/integration-tests/ServiceRegistryClient.test.ts
#	src/integration-tests/TaskManager.test.ts
#	src/integration-tests/WorkerRegistration.test.ts
#	src/integration-tests/metadata/complex_wf_signal_test.ts
#	src/integration-tests/metadata/complex_wf_signal_test_subworkflow_1.ts
#	src/integration-tests/metadata/complex_wf_signal_test_subworkflow_2.ts
#	src/integration-tests/readme.test.ts

Author: ajlai-orkes

.github/workflows/pull_request.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [20, 22, 24]
-        test: ["unit", "integration:orkes-v5", "integration:orkes-v4"]
+        test: ["unit", "integration:v5", "integration:v4"]
     name: Node.js v${{ matrix.node-version }} - ${{ matrix.test }} tests
     steps:
       - name: Checkout

.github/workflows/release.yml

@@ -4,6 +4,13 @@ on:
   release:
     types: [published]
 
+# Required for npm Trusted Publishing (OIDC). Configure the trusted publisher
+# on npm: package → Settings → Trusted publishing → GitHub Actions →
+# workflow filename: release.yml, then your repo owner and repo name.
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build-package-and-publish-release:
     runs-on: ubuntu-latest
@@ -15,6 +22,8 @@ jobs:
         with:
           node-version: "22"
           registry-url: "https://registry.npmjs.org"
+      - name: Ensure npm supports trusted publishing
+        run: npm install -g npm@latest
       - name: Bump version to release
         run: sed -i "s/v0.0.0/$RELEASE_VERSION/" ./package.json
         env:
@@ -25,5 +34,3 @@ jobs:
         run: npm run build
       - name: Publish package
         run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -49,8 +49,8 @@
     "test": "cross-env ORKES_BACKEND_VERSION=5 jest --force-exit --detectOpenHandles",
     "test:unit": "jest --force-exit --detectOpenHandles --testMatch='**/src/**/__tests__/**/*.test.[jt]s?(x)'",
     "test:integration:base": "jest --force-exit --detectOpenHandles --testMatch='**/src/integration-tests/*.test.[jt]s?(x)'",
-    "test:integration:orkes-v5": "cross-env ORKES_BACKEND_VERSION=5 npm run test:integration:base --",
-    "test:integration:orkes-v4": "cross-env ORKES_BACKEND_VERSION=4 npm run test:integration:base --",
+    "test:integration:v5": "cross-env ORKES_BACKEND_VERSION=5 npm run test:integration:base --",
+    "test:integration:v4": "cross-env ORKES_BACKEND_VERSION=4 npm run test:integration:base --",
     "ci": "npm run lint && npm run test",
     "build": "tsup index.ts",
     "generate-openapi-layer": "openapi-ts",

src/integration-tests/EventClient.test.ts

@@ -103,6 +103,7 @@ describe("EventClient", () => {
       const retrievedHandler = await eventClient.getEventHandlerByName(
         handlerName
       );
+      if (!retrievedHandler) throw new Error("Expected handler to exist");
       expect(retrievedHandler.name).toEqual(handlerName);
       expect(retrievedHandler.event).toEqual(eventName);
       expect(retrievedHandler.active).toEqual(true);
@@ -189,6 +190,7 @@ describe("EventClient", () => {
       const retrievedHandler = await eventClient.getEventHandlerByName(
         handlerName
       );
+      if (!retrievedHandler) throw new Error("Expected handler to exist");
       expect(retrievedHandler.active).toEqual(false);
       expect(retrievedHandler.description).toEqual("Updated description");
 
@@ -215,7 +217,7 @@ describe("EventClient", () => {
       const retrievedHandler = await eventClient.getEventHandlerByName(
         handlerName
       );
-
+      if (!retrievedHandler) throw new Error("Expected handler to exist");
       expect(retrievedHandler.name).toEqual(handlerName);
       expect(retrievedHandler.event).toEqual(eventName);
 
@@ -262,6 +264,7 @@ describe("EventClient", () => {
       const retrievedHandler = await eventClient.getEventHandlerByName(
         handlerName
       );
+      if (!retrievedHandler) throw new Error("Expected handler to exist");
       expect(retrievedHandler.name).toEqual(handlerName);
 
       // Remove it
@@ -428,13 +431,18 @@ describe("EventClient", () => {
   });
 
   describe("Error Handling", () => {
-    test("Should throw error when getting non-existent event handler", async () => {
+    test("Should return null or throw when getting non-existent event handler", async () => {
       const eventClient = new EventClient(await orkesConductorClient());
       const nonExistentName = createUniqueName("non-existent-handler");
 
-      await expect(
-        eventClient.getEventHandlerByName(nonExistentName)
-      ).rejects.toThrow();
+      try {
+        const result = await eventClient.getEventHandlerByName(nonExistentName);
+        // V5: server may return null or 200 with empty/non-JSON body (e.g. stream)
+        expect(result == null || typeof (result as EventHandler)?.name !== "string").toBe(true);
+      } catch {
+        // V4: server returns 200 with empty body and SDK throws (e.g. "Response is empty")
+        expect(true).toBe(true);
+      }
     });
 
     test("Should throw error when removing non-existent handler", async () => {
@@ -541,6 +549,7 @@ describe("EventClient", () => {
       const retrievedHandler = await eventClient.getEventHandlerByName(
         handlerName
       );
+      if (!retrievedHandler) throw new Error("Expected handler to exist");
       expect(retrievedHandler.name).toEqual(handlerName);
       expect(retrievedHandler.event).toEqual(eventName);
       expect(retrievedHandler.active).toBe(true);
@@ -563,6 +572,7 @@ describe("EventClient", () => {
       const handlerAfterEvent = await eventClient.getEventHandlerByName(
         handlerName
       );
+      if (!handlerAfterEvent) throw new Error("Expected handler to exist");
       expect(handlerAfterEvent.active).toBe(true);
       expect(handlerAfterEvent.event).toEqual(eventName);
 

src/integration-tests/SchedulerClient.test.ts

@@ -1,4 +1,4 @@
-import { expect, describe, test, jest } from "@jest/globals";
+import { expect, describe, test, jest, afterAll } from "@jest/globals";
 import {
   ExtendedWorkflowDef,
   SaveScheduleRequest,
@@ -21,6 +21,25 @@ describe("SchedulerClient", () => {
   const workflowName = `jsSdkTestScheduleWf_${now}`;
   const workflowVersion = 1;
 
+  afterAll(async () => {
+    const client = await clientPromise;
+    const schedulerClient = new SchedulerClient(client);
+    const metadataClient = new MetadataClient(client);
+    try {
+      await schedulerClient.deleteSchedule(name);
+    } catch (e) {
+      console.debug(`Failed to cleanup schedule ${name}:`, e);
+    }
+    try {
+      await metadataClient.unregisterWorkflow(workflowName, workflowVersion);
+    } catch (e) {
+      console.debug(
+        `Failed to cleanup workflow ${workflowName}:`,
+        e
+      );
+    }
+  });
+
   test("Should be able to register a workflow and retrieve it", async () => {
     const client = await clientPromise;
     const executor = new SchedulerClient(client);

src/integration-tests/ServiceRegistryClient.test.ts

@@ -6,6 +6,12 @@ import * as fs from "fs";
 import * as path from "path";
 import { describeForOrkesV5 } from "./utils/customJestDescribe";
 
+// Conductor must be able to fetch this URL for discovery; use CONDUCTOR_TEST_SERVICE_URI
+// when testing against a remote cluster (e.g. a public Swagger URL it can reach).
+const TEST_SERVICE_URI =
+  process.env.CONDUCTOR_TEST_SERVICE_URI ??
+  "http://httpbin-server:8081/api-docs";
+
 describeForOrkesV5("ServiceRegistryClient", () => {
   const clientPromise = orkesConductorClient();
   let serviceRegistryClient: ServiceRegistryClient;
@@ -37,7 +43,7 @@ describeForOrkesV5("ServiceRegistryClient", () => {
     const testServiceRegistry = {
       name: `jsSdkTest-test_service_registry${Date.now()}`,
       type: ServiceType.HTTP,
-      serviceURI: "https://orkes-api-tester.orkesconductor.com/api",
+      serviceURI: TEST_SERVICE_URI,
       config: {
         circuitBreakerConfig: {
           failureRateThreshold: 50.0,
@@ -114,7 +120,7 @@ describeForOrkesV5("ServiceRegistryClient", () => {
     const testServiceRegistry = {
       name: `jsSdkTest-test_service_registry_to_remove-${Date.now()}`,
       type: ServiceType.HTTP,
-      serviceURI: "https://orkes-api-tester.orkesconductor.com/api",
+      serviceURI: TEST_SERVICE_URI,
     };
 
     // Register the service registry
@@ -143,7 +149,7 @@ describeForOrkesV5("ServiceRegistryClient", () => {
     const testServiceRegistry = {
       name: `jsSdkTest-test_service_registry_with_method-${Date.now()}`,
       type: ServiceType.HTTP,
-      serviceURI: "https://orkes-api-tester.orkesconductor.com/api",
+      serviceURI: TEST_SERVICE_URI,
     };
 
     // Add service to cleanup list
@@ -202,7 +208,7 @@ describeForOrkesV5("ServiceRegistryClient", () => {
     const testServiceRegistry = {
       name: `jsSdkTest-test_service_registry_discovery-${Date.now()}`,
       type: ServiceType.HTTP,
-      serviceURI: "https://orkes-api-tester.orkesconductor.com/api",
+      serviceURI: TEST_SERVICE_URI,
     };
 
     // Add service to cleanup list

src/integration-tests/TaskManager.test.ts

@@ -1,41 +1,39 @@
-import { afterEach, beforeAll, expect, describe, test, jest } from "@jest/globals";
+import { expect, describe, test, jest, afterEach } from "@jest/globals";
 import {
   MetadataClient,
-  OrkesClients,
   simpleTask,
   taskDefinition,
   WorkflowExecutor,
   orkesConductorClient,
   TaskManager,
   ConductorWorker,
 } from "../sdk";
-import { cleanupWorkflowsAndTasks } from "./utils/cleanup";
 import { mockLogger } from "./utils/mockLogger";
 import { waitForWorkflowCompletion } from "./utils/waitForWorkflowCompletion";
 
 const BASE_TIME = 1000;
 describe("TaskManager", () => {
   const clientPromise = orkesConductorClient();
-  let metadataClient: MetadataClient;
   const workflowsToCleanup: { name: string; version: number }[] = [];
   const tasksToCleanup: string[] = [];
 
-  beforeAll(async () => {
-    const client = await clientPromise;
-    metadataClient = new OrkesClients(client).getMetadataClient();
-  });
+  jest.setTimeout(30000);
 
   afterEach(async () => {
-    await cleanupWorkflowsAndTasks(metadataClient, {
-      workflows: workflowsToCleanup,
-      tasks: tasksToCleanup,
-    });
+    const client = await clientPromise;
+    const metadataClient = new MetadataClient(client);
+    await Promise.allSettled(
+      workflowsToCleanup.map((w) =>
+        metadataClient.unregisterWorkflow(w.name, w.version)
+      )
+    );
+    await Promise.allSettled(
+      tasksToCleanup.map((t) => metadataClient.unregisterTask(t))
+    );
     workflowsToCleanup.length = 0;
     tasksToCleanup.length = 0;
   });
 
-  jest.setTimeout(30000);
-
   test("Should run workflow with worker", async () => {
     const client = await clientPromise;
     const executor = new WorkflowExecutor(client);
@@ -69,7 +67,6 @@ describe("TaskManager", () => {
       timeoutSeconds: 0,
     });
     workflowsToCleanup.push({ name: workflowName, version: 1 });
-    tasksToCleanup.push(taskName);
 
     const executionId = await executor.startWorkflow({
       name: workflowName,
@@ -265,7 +262,6 @@ describe("TaskManager", () => {
       timeoutSeconds: 0,
     });
     workflowsToCleanup.push({ name: workflowName, version: 1 });
-    tasksToCleanup.push(...workerNames);
 
     //Start workflow
     const executionId = await executor.startWorkflow({
@@ -401,7 +397,6 @@ describe("TaskManager", () => {
       timeoutSeconds: 0,
     });
     workflowsToCleanup.push({ name: workflowName, version: 1 });
-    tasksToCleanup.push(...workerNames);
 
     //Start workflow
     const executionId = await executor.startWorkflow({

src/integration-tests/TaskRunner.test.ts

@@ -1,18 +1,31 @@
-import { expect, describe, test, jest } from "@jest/globals";
+import { expect, describe, test, jest, afterAll } from "@jest/globals";
 import {
   TaskRunner,
   WorkflowExecutor,
   OrkesClients,
   simpleTask,
   orkesConductorClient,
+  MetadataClient,
 } from "../sdk";
 import { cleanupWorkflowsAndTasks } from "./utils/cleanup";
 import { waitForWorkflowStatus } from "./utils/waitForWorkflowStatus";
 
 describe("TaskRunner", () => {
   const clientPromise = orkesConductorClient();
+  const workflowsToCleanup: { name: string; version: number }[] = [];
 
   jest.setTimeout(30000);
+
+  afterAll(async () => {
+    const client = await clientPromise;
+    const metadataClient = new MetadataClient(client);
+    await Promise.allSettled(
+      workflowsToCleanup.map((w) =>
+        metadataClient.unregisterWorkflow(w.name, w.version)
+      )
+    );
+  });
+
   test("worker example ", async () => {
     const client = await clientPromise;
     const executor = new WorkflowExecutor(client);
@@ -52,6 +65,7 @@ describe("TaskRunner", () => {
       outputParameters: {},
       timeoutSeconds: 0,
     });
+    workflowsToCleanup.push({ name: workflowName, version: 1 });
 
     const { workflowId: executionId } = await executor.executeWorkflow(
       {