Merge pull request #104 from dolittle/update-handshake

jakhog · web-flow · commit cfcd8bc4c081 · 2022-01-10T19:05:37.000+01:00
Update handshake
diff --git a/Source/artifacts/package.json b/Source/artifacts/package.json
@@ -47,7 +47,7 @@
         "@dolittle/concepts": "6.0.0-gimli.0",
         "@dolittle/rudiments": "6.0.0-gimli.0",
         "@dolittle/types": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2"
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3"
     },
     "devDependencies": {
         "@types/is-natural-number": "^4.0.0"
diff --git a/Source/embeddings/package.json b/Source/embeddings/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
diff --git a/Source/eventHorizon/package.json b/Source/eventHorizon/package.json
@@ -46,7 +46,7 @@
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.events": "21.0.0-gimli.14",
         "@dolittle/sdk.execution": "21.0.0-gimli.14",
         "@dolittle/sdk.protobuf": "21.0.0-gimli.14",
diff --git a/Source/events.filtering/package.json b/Source/events.filtering/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
         "@dolittle/sdk.events": "21.0.0-gimli.14",
diff --git a/Source/events.handling/package.json b/Source/events.handling/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
diff --git a/Source/events.processing/package.json b/Source/events.processing/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
         "@dolittle/sdk.execution": "21.0.0-gimli.14",
diff --git a/Source/events/package.json b/Source/events/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.execution": "21.0.0-gimli.14",
         "@dolittle/sdk.protobuf": "21.0.0-gimli.14",
diff --git a/Source/projections/package.json b/Source/projections/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
diff --git a/Source/protobuf/package.json b/Source/protobuf/package.json
@@ -46,7 +46,7 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.execution": "21.0.0-gimli.14"
diff --git a/Source/resources/package.json b/Source/resources/package.json
@@ -45,9 +45,9 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.execution": "21.0.0-gimli.14",
         "@dolittle/sdk.protobuf": "21.0.0-gimli.14",
         "@dolittle/sdk.resilience": "21.0.0-gimli.14",
diff --git a/Source/sdk/Internal/RuntimeConnector.ts b/Source/sdk/Internal/RuntimeConnector.ts
@@ -3,8 +3,9 @@
 
 import { Logger } from 'winston';
 import { from, Notification, Observable, timer } from 'rxjs';
-import { concatMap, delayWhen, dematerialize, map } from 'rxjs/operators';
+import { concatMap, delayWhen, dematerialize, map, timestamp } from 'rxjs/operators';
 import { status as GrpcStatus } from '@grpc/grpc-js';
+import { Duration } from 'google-protobuf/google/protobuf/duration_pb';
 
 import { Claims, CorrelationId, Environment, ExecutionContext, MicroserviceId, TenantId, Version } from '@dolittle/sdk.execution';
 import { Failures, Guids, Versions } from '@dolittle/sdk.protobuf';
@@ -73,7 +74,6 @@ export class RuntimeConnector extends ICanConnectToARuntime {
                 if (response.hasFailure()) {
                     const failure = Failures.toSDK(response.getFailure()!);
                     throw new RuntimeHandshakeFailed(failure.reason);
-                    // TODO: Handle incompatible versions failure ID
                 }
 
                 return this.createExecutionContextFrom(response);
@@ -119,12 +119,16 @@ export class RuntimeConnector extends ICanConnectToARuntime {
     private createHandshakeRequest(attempt: number, millisecondsSinceStart: number): HandshakeRequest {
         const handshakeRequest = new HandshakeRequest();
 
-        handshakeRequest.setSdk('JS.SDK');
+        handshakeRequest.setSdkidentifier('JavaScript');
         handshakeRequest.setHeadversion(Versions.toProtobuf(this._headVersion));
         handshakeRequest.setSdkversion(Versions.toProtobuf(VersionInfo.currentVersion));
         handshakeRequest.setContractsversion(ContractsVersionInfo.getCurrentVersion());
 
-        // TODO: Add attempt and time since start to request
+        const timeSpent = new Duration();
+        timeSpent.setSeconds(Math.trunc(millisecondsSinceStart/1e3));
+        timeSpent.setNanos((millisecondsSinceStart % 1e3) * 1e6);
+        handshakeRequest.setAttempt(attempt);
+        handshakeRequest.setTimespent(timeSpent);
 
         return handshakeRequest;
     }
@@ -137,7 +141,7 @@ export class RuntimeConnector extends ICanConnectToARuntime {
         this._logger.debug(`Received initial booting configuration from Runtime running version ${runtimeVersion} using Contracts version ${contractsVersion}`);
 
         const microserviceId = MicroserviceId.from(Guids.toSDK(response.getMicroserviceid()));
-        const environment = Environment.from(response.getEnvironment());
+        const environment = Environment.from(response.getEnvironmentname());
 
         return new ExecutionContext(
             microserviceId,
@@ -152,6 +156,6 @@ export class RuntimeConnector extends ICanConnectToARuntime {
         if (!response.hasRuntimeversion()) throw new RuntimeHandshakeMissingInformation('Runtime version');
         if (!response.hasContractsversion()) throw new RuntimeHandshakeMissingInformation('Contracts version');
         if (!response.hasMicroserviceid()) throw new RuntimeHandshakeMissingInformation('microservice ID');
-        if (response.getEnvironment() === '') throw new RuntimeHandshakeMissingInformation('environment');
+        if (response.getEnvironmentname() === '') throw new RuntimeHandshakeMissingInformation('environment');
     }
 }
diff --git a/Source/sdk/package.json b/Source/sdk/package.json
@@ -45,7 +45,7 @@
         "lint:fix": "eslint --quiet --ext .ts ./ --fix"
     },
     "dependencies": {
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.aggregates": "21.0.0-gimli.14",
         "@dolittle/sdk.artifacts": "21.0.0-gimli.14",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
diff --git a/Source/services/package.json b/Source/services/package.json
@@ -46,7 +46,7 @@
     },
     "dependencies": {
         "@dolittle/concepts": "6.0.0-gimli.0",
-        "@dolittle/contracts": "6.4.0-gimli.2",
+        "@dolittle/contracts": "6.4.0-gimli.3",
         "@dolittle/rudiments": "6.0.0-gimli.0",
         "@dolittle/sdk.common": "21.0.0-gimli.14",
         "@dolittle/sdk.dependencyinversion": "21.0.0-gimli.14",
diff --git a/Source/tenancy/package.json b/Source/tenancy/package.json
@@ -45,7 +45,7 @@
     },
     "dependencies": {
         "@dolittle/rudiments": "6.0.0-gimli.0",
-        "@dolittle/runtime.contracts": "6.4.0-gimli.2",
+        "@dolittle/runtime.contracts": "6.4.0-gimli.3",
         "@dolittle/sdk.execution": "21.0.0-gimli.14",
         "@dolittle/sdk.protobuf": "21.0.0-gimli.14",
         "@dolittle/sdk.resilience": "21.0.0-gimli.14",
