Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration-tests/common/executor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { MetadataClient } from "../../src/core";
describe("Executor", () => {
const clientPromise = orkesConductorClient();

jest.setTimeout(30000);
jest.setTimeout(60000);
const name = `jsSdkTest-Workflow-${Date.now()}`;
const version = 1;
test("Should be able to register a workflow", async () => {
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/utils/waitForWorkflowStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export const waitForWorkflowStatus = async (
workflowClient: WorkflowExecutor,
workflowId: string,
expectedStatus: string,
maxWaitTimeMs = 30000,
pollIntervalMs = 1000
maxWaitTimeMs = 60000,
pollIntervalMs = 3000
): Promise<Workflow> => {
const startTime = Date.now();

Expand Down
17 changes: 17 additions & 0 deletions src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,20 @@ export type { ExtendedTaskDef, SignalResponse } from "./types";

// todo: remove after April 2026 (backward compatibility types)
export * from "./deprecated-types";

/**
* Export types needed for client's return type in case if user is building another lib on top of sdk with declaration files
* @deprecated
* to import all the types below manually while using SDK since these types could change in future without backward compatibility
* TODO: remove after April 2026
*/
export type {
Auth,
ClientOptions,
Config,
QuerySerializerOptions,
RequestOptions,
ResolvedRequestOptions,
} from "./open-api/client";
export type { Middleware } from "./open-api/client/utils.gen";
export type { StreamEvent } from "./open-api/core/serverSentEvents.gen";
6 changes: 4 additions & 2 deletions src/orkes/OrkesConductorClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import {
} from "./helpers";
import type { OrkesApiConfig } from "./types";
import { createClient } from "../common/open-api/client";
import { addResourcesBackwardCompatibility } from "./helpers/addResourcesBackwardCompatibility";

/**
* Takes a config with keyId and keySecret returns a promise with an instance of Client
*
* @param config (optional) OrkesApiConfig with keyId and keySecret
* @param customFetch (optional) custom fetch function
* @param requestHandler DEPRECATED! (optional) ConductorHttpRequest handler, replaced with customFetch
* @returns
* @returns Client
*/
export const orkesConductorClient = async (
config?: OrkesApiConfig,
Expand Down Expand Up @@ -41,5 +42,6 @@ export const orkesConductorClient = async (
await handleAuth(openApiClient, keyId, keySecret, refreshTokenInterval);
}

return openApiClient;
// DEPRECATED, should be replaced with return openApiClient after April 2026:
return addResourcesBackwardCompatibility(openApiClient);
};
Loading