Update durabletask-js (#633)

* update durabletask-js Signed-off-by: yaron2 <[email protected]> * update sha Signed-off-by: yaron2 <[email protected]> * adapt durabletask clients initialization --------- Signed-off-by: yaron2 <[email protected]> Co-authored-by: Fabian Martinez <[email protected]>
dapr · Sep 19, 2024 · 76866c8 · 76866c8
1 parent 4c05477
commit 76866c8
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/examples/workflow/authoring/package-lock.json b/examples/workflow/authoring/package-lock.json
diff --git a/examples/workflow/management/package-lock.json b/examples/workflow/management/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.9.3",
     "@js-temporal/polyfill": "^0.3.0",
-    "@microsoft/durabletask-js": "^0.1.0-alpha.1",
+    "@microsoft/durabletask-js": "^0.1.0-alpha.2",
     "@types/google-protobuf": "^3.15.5",
     "@types/node-fetch": "^2.6.2",
     "body-parser": "^1.19.0",

diff --git a/src/workflow/client/DaprWorkflowClient.ts b/src/workflow/client/DaprWorkflowClient.ts
@@ -17,6 +17,7 @@ import { generateApiTokenClientInterceptors, generateEndpoint, getDaprApiToken }
 import { TWorkflow } from "../../types/workflow/Workflow.type";
 import { getFunctionName } from "../internal";
 import { WorkflowClientOptions } from "../../types/workflow/WorkflowClientOption";
+import { GrpcEndpoint } from "../../network/GrpcEndpoint";
 
 /**
  * Class that defines client operations for managing workflow instances.
@@ -34,18 +35,18 @@ export default class DaprWorkflowClient {
   constructor(options: Partial<WorkflowClientOptions> = {}) {
     const grpcEndpoint = generateEndpoint(options);
     options.daprApiToken = getDaprApiToken(options);
-    this._innerClient = this.buildInnerClient(grpcEndpoint.endpoint, options);
+    this._innerClient = this.buildInnerClient(grpcEndpoint, options);
   }
 
-  private buildInnerClient(hostAddress: string, options: Partial<WorkflowClientOptions>): TaskHubGrpcClient {
+  private buildInnerClient(grpcEndpoint: GrpcEndpoint, options: Partial<WorkflowClientOptions>): TaskHubGrpcClient {
     let innerOptions = options?.grpcOptions;
     if (options.daprApiToken !== undefined && options.daprApiToken !== "") {
       innerOptions = {
         ...innerOptions,
         interceptors: [generateApiTokenClientInterceptors(options), ...(innerOptions?.interceptors ?? [])],
       };
     }
-    return new TaskHubGrpcClient(hostAddress, innerOptions);
+    return new TaskHubGrpcClient(grpcEndpoint.endpoint, innerOptions, grpcEndpoint.tls);
   }
 
   /**

diff --git a/src/workflow/internal/index.ts b/src/workflow/internal/index.ts
@@ -48,9 +48,19 @@ export function getFunctionName(fn: TWorkflow | TWorkflowActivity<TInput, TOutpu
  * @returns A GrpcEndpoint representing the Dapr gRPC endpoint.
  */
 export function generateEndpoint(options: Partial<WorkflowClientOptions>): GrpcEndpoint {
+  // NOTE: same logic as src/implementation/Client/GRPCClient/GRPCClient.ts
   const host = options?.daprHost ?? Settings.getDefaultHost();
   const port = options?.daprPort ?? Settings.getDefaultGrpcPort();
-  const uri = `${host}:${port}`;
+  let uri = `${host}:${port}`;
+
+  if (!(options?.daprHost || options?.daprPort)) {
+    // If neither host nor port are specified, check the endpoint environment variable.
+    const endpoint = Settings.getDefaultGrpcEndpoint();
+    if (endpoint != "") {
+      uri = endpoint;
+    }
+  }
+
   return new GrpcEndpoint(uri);
 }
 

diff --git a/src/workflow/runtime/WorkflowRuntime.ts b/src/workflow/runtime/WorkflowRuntime.ts
@@ -20,6 +20,7 @@ import WorkflowContext from "./WorkflowContext";
 import { generateApiTokenClientInterceptors, generateEndpoint, getDaprApiToken } from "../internal/index";
 import { getFunctionName } from "../internal";
 import { WorkflowClientOptions } from "../../types/workflow/WorkflowClientOption";
+import { GrpcEndpoint } from "../../network/GrpcEndpoint";
 
 /**
  * Contains methods to register workflows and activities.
@@ -34,18 +35,18 @@ export default class WorkflowRuntime {
   constructor(options: Partial<WorkflowClientOptions> = {}) {
     const grpcEndpoint = generateEndpoint(options);
     options.daprApiToken = getDaprApiToken(options);
-    this.worker = this.buildInnerWorker(grpcEndpoint.endpoint, options);
+    this.worker = this.buildInnerWorker(grpcEndpoint, options);
   }
 
-  private buildInnerWorker(hostAddress: string, options: Partial<WorkflowClientOptions>): TaskHubGrpcWorker {
+  private buildInnerWorker(grpcEndpoint: GrpcEndpoint, options: Partial<WorkflowClientOptions>): TaskHubGrpcWorker {
     let innerOptions = options?.grpcOptions;
     if (options.daprApiToken !== undefined && options.daprApiToken !== "") {
       innerOptions = {
         ...innerOptions,
         interceptors: [generateApiTokenClientInterceptors(options), ...(innerOptions?.interceptors ?? [])],
       };
     }
-    return new TaskHubGrpcWorker(hostAddress, innerOptions);
+    return new TaskHubGrpcWorker(grpcEndpoint.endpoint, innerOptions, grpcEndpoint.tls);
   }
 
   /**