Merge pull request #39 from dolittle/grpcjs

woksin · web-flow · commit 8f2b53de709c · 2020-11-17T10:16:26.000+01:00
Upgrading to @grpc/grpc-js
diff --git a/Samples/Environment/event-horizon-consents.json b/Samples/Environment/event-horizon-consents.json
@@ -1,8 +1,8 @@
 {
-    "900893e7-c4cc-4873-8032-884e965e4b97": [
+    "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": [
         {
             "microservice": "a14bb24e-51f3-4d83-9eba-44c4cffe6bb9",
-            "tenant": "900893e7-c4cc-4873-8032-884e965e4b97",
+            "tenant": "445f8ea8-1a6f-40d7-b2fc-796dba92dc44",
             "stream": "2c087657-b318-40b1-ae92-a400de44e507",
             "partition": "00000000-0000-0000-0000-000000000000",
             "consent": "1decd852-3743-4fe8-be01-bb4e76d70ec2"
diff --git a/Samples/Environment/resources-basic.json b/Samples/Environment/resources-basic.json
@@ -1,5 +1,5 @@
 {
-    "900893e7-c4cc-4873-8032-884e965e4b97": {
+    "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": {
         "eventStore": {
             "servers": [
                 "mongo"
diff --git a/Samples/Environment/resources-eventhorizon.json b/Samples/Environment/resources-eventhorizon.json
@@ -1,5 +1,5 @@
 {
-    "900893e7-c4cc-4873-8032-884e965e4b97": {
+    "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": {
         "eventStore": {
             "servers": [
                 "mongo"
diff --git a/Samples/Environment/tenants.json b/Samples/Environment/tenants.json
@@ -1,3 +1,3 @@
 {
-    "900893e7-c4cc-4873-8032-884e965e4b97": {}
+    "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": {}
 }
diff --git a/Samples/EventHorizon/index.ts b/Samples/EventHorizon/index.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { Client } from '@dolittle/sdk';
-
+import { TenantId } from '@dolittle/sdk.execution';
 import { MyEventHandler } from './MyEventHandler';
 import { MyEvent } from './MyEvent';
 import { PartitionId } from '@dolittle/sdk.events';
@@ -15,9 +15,9 @@ const client = Client
     .withEventHandlers(eventHandlers =>
         eventHandlers.register(MyEventHandler))
     .withEventHorizons(_ => {
-        _.forTenant('900893e7-c4cc-4873-8032-884e965e4b97', ts => {
+        _.forTenant(TenantId.development, ts => {
             ts.fromProducerMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb')
-                .fromProducerTenant('900893e7-c4cc-4873-8032-884e965e4b97')
+                .fromProducerTenant(TenantId.development)
                 .fromProducerStream('2c087657-b318-40b1-ae92-a400de44e507')
                 .fromProducerPartition(PartitionId.unspecified.value)
                 .toScope('406d6473-7cc9-44a6-a55f-775c1021d957')
@@ -40,5 +40,5 @@ event.aString = 'Forty two';
 
 client
     .eventStore
-    .forTenant('900893e7-c4cc-4873-8032-884e965e4b97')
+    .forTenant(TenantId.development)
     .commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');
diff --git a/Samples/Kitchen/package.json b/Samples/Kitchen/package.json
@@ -8,7 +8,7 @@
     "scripts": {
         "watch": "nodemon --watch **/*.ts --exec 'ts-node' index.ts",
         "start": "ts-node index.ts",
-        "build": "tsc -p ./tsconfig.json"
+        "build": "tsc -b ./tsconfig.json"
     },
     "dependencies": {
         "@dolittle/sdk": "14.0.1",
diff --git a/Source/artifacts/package.json b/Source/artifacts/package.json
@@ -36,7 +36,7 @@
         "@dolittle/concepts": "5.0.1",
         "@dolittle/rudiments": "5.0.1",
         "@dolittle/types": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19"
+        "@dolittle/runtime.contracts": "5.1.21"
     },
     "devDependencies": {
         "@types/is-natural-number": "^4.0.0"
diff --git a/Source/eventHorizon/EventHorizons.ts b/Source/eventHorizon/EventHorizons.ts
@@ -3,7 +3,7 @@
 
 import { Guid } from '@dolittle/rudiments';
 import { Logger } from 'winston';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import { ExecutionContext } from '@dolittle/sdk.execution';
 import { callContexts, failures, guids } from '@dolittle/sdk.protobuf';
 import { SubscriptionsClient } from '@dolittle/runtime.contracts/Runtime/EventHorizon/Subscriptions_grpc_pb';
diff --git a/Source/eventHorizon/package.json b/Source/eventHorizon/package.json
@@ -34,7 +34,7 @@
     },
     "dependencies": {
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.events": "14.0.1",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.execution": "14.0.1",
diff --git a/Source/events.filtering/package.json b/Source/events.filtering/package.json
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.events": "14.0.1",
         "@dolittle/sdk.events.handling": "14.0.1",
diff --git a/Source/events.handling/package.json b/Source/events.handling/package.json
@@ -34,7 +34,7 @@
     },
     "dependencies": {
         "@dolittle/types": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.common": "14.0.1",
         "@dolittle/sdk.events": "14.0.1",
diff --git a/Source/events.processing/package.json b/Source/events.processing/package.json
@@ -34,7 +34,7 @@
     "dependencies": {
         "@dolittle/concepts": "5.0.1",
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.events": "14.0.1",
         "@dolittle/sdk.execution": "14.0.1",
diff --git a/Source/events/package.json b/Source/events/package.json
@@ -35,7 +35,7 @@
     "dependencies": {
         "@dolittle/rudiments": "5.0.1",
         "@dolittle/concepts": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.execution": "14.0.1",
         "@dolittle/sdk.protobuf": "14.0.1",
diff --git a/Source/protobuf/package.json b/Source/protobuf/package.json
@@ -34,10 +34,10 @@
         "lint:fix": "gulp lint-fix --gulpfile ../../node_modules/@dolittle/typescript.build/Gulpfile.js"
     },
     "dependencies": {
-        "@dolittle/contracts": "5.1.19",
+        "@dolittle/contracts": "5.1.21",
         "@dolittle/concepts": "5.0.1",
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.execution": "14.0.1"
     }
diff --git a/Source/sdk/ClientBuilder.ts b/Source/sdk/ClientBuilder.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Dolittle. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import { createLogger, format, Logger, transports } from 'winston';
 
 import { EventTypes, EventTypesBuilder, EventTypesBuilderCallback } from '@dolittle/sdk.artifacts';
diff --git a/Source/sdk/package.json b/Source/sdk/package.json
@@ -35,7 +35,7 @@
     },
     "dependencies": {
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.artifacts": "14.0.1",
         "@dolittle/sdk.common": "14.0.1",
         "@dolittle/sdk.eventhorizon": "14.0.1",
diff --git a/Source/services/GrpcMethods.ts b/Source/services/GrpcMethods.ts
@@ -1,17 +1,17 @@
 // Copyright (c) Dolittle. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 
 /**
  * Represents a unary gRPC method.
  */
-export type UnaryMethod<TArgument, TResponse> = (argument: TArgument, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<TResponse>) => grpc.ClientUnaryCall;
+export type UnaryMethod<TArgument, TResponse> = (argument: TArgument, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: grpc.requestCallback<TResponse>) => grpc.ClientUnaryCall;
 
 /**
  * Represents a client streaming gRPC method.
  */
-export type ClientStreamMethod<TRequest, TResponse> = (metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<TResponse>) => grpc.ClientWritableStream<TRequest>;
+export type ClientStreamMethod<TRequest, TResponse> = (metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: grpc.requestCallback<TResponse>) => grpc.ClientWritableStream<TRequest>;
 
 /**
  * Represents a server streaming gRPC method.
@@ -21,4 +21,4 @@ export type ServerStreamMethod<TArgument, TResponse> = (argument: TArgument, met
 /**
  * Represents a duplex streaming gRPC method.
  */
-export type DuplexMethod<TRequest, TResponse> = (metadata?: grpc.Metadata | null, options?: grpc.CallOptions | null) => grpc.ClientDuplexStream<TRequest, TResponse>;
+export type DuplexMethod<TRequest, TResponse> = (metadata: grpc.Metadata, options?: Partial<grpc.CallOptions>) => grpc.ClientDuplexStream<TRequest, TResponse>;
diff --git a/Source/services/ReactiveGrpc.ts b/Source/services/ReactiveGrpc.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Dolittle. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import { Observable, Subject } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 
@@ -19,7 +19,8 @@ import { UnaryMethod, ClientStreamMethod, ServerStreamMethod, DuplexMethod } fro
  */
 export function reactiveUnary<TArgument, TResponse>(client: grpc.Client, method: UnaryMethod<TArgument, TResponse>, argument: TArgument, cancellation: Cancellation): Observable<TResponse> {
     const subject = new Subject<TResponse>();
-    const call = method.call(client, argument, null, null, (error: grpc.ServiceError | null, message?: TResponse) => {
+    const metadata = new grpc.Metadata();
+    const call = method.call(client, argument, metadata, {}, (error: grpc.ServiceError | null, message?: TResponse) => {
         if (error) {
             subject.error(error);
         } else {
@@ -41,7 +42,8 @@ export function reactiveUnary<TArgument, TResponse>(client: grpc.Client, method:
  */
 export function reactiveClientStream<TRequest, TResponse>(client: grpc.Client, method: ClientStreamMethod<TRequest, TResponse>, requests: Observable<TRequest>, cancellation: Cancellation): Observable<TResponse> {
     const subject = new Subject<TResponse>();
-    const stream = method.call(client, null, null, (error: grpc.ServiceError | null, message?: TResponse) => {
+    const metadata = new grpc.Metadata();
+    const stream = method.call(client, metadata, {}, (error: grpc.ServiceError | null, message?: TResponse) => {
         if (error) {
             subject.error(error);
         } else {
@@ -80,7 +82,8 @@ export function reactiveServerStream<TArgument, TResponse>(client: grpc.Client,
  */
 export function reactiveDuplex<TRequest, TResponse>(client: grpc.Client, method: DuplexMethod<TRequest, TResponse>, requests: Observable<TRequest>, cancellation: Cancellation): Observable<TResponse> {
     const subject = new Subject<TResponse>();
-    const stream = method.call(client, null, null);
+    const metadata = new grpc.Metadata();
+    const stream = method.call(client, metadata, {});
     handleCancellation(stream, cancellation);
     handleClientRequests(stream, requests, subject);
     handleServerResponses(stream, subject);
diff --git a/Source/services/package.json b/Source/services/package.json
@@ -34,7 +34,7 @@
     },
     "dependencies": {
         "@dolittle/rudiments": "5.0.1",
-        "@dolittle/runtime.contracts": "5.1.19",
+        "@dolittle/runtime.contracts": "5.1.21",
         "@dolittle/sdk.execution": "14.0.1",
         "@dolittle/sdk.resilience": "14.0.1",
         "@dolittle/sdk.protobuf": "14.0.1",

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "900893e7-c4cc-4873-8032-884e965e4b97": [`
	`2`	`+ "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": [`
`3`	`3`	`{`
`4`	`4`	`"microservice": "a14bb24e-51f3-4d83-9eba-44c4cffe6bb9",`
`5`		`- "tenant": "900893e7-c4cc-4873-8032-884e965e4b97",`
	`5`	`+ "tenant": "445f8ea8-1a6f-40d7-b2fc-796dba92dc44",`
`6`	`6`	`"stream": "2c087657-b318-40b1-ae92-a400de44e507",`
`7`	`7`	`"partition": "00000000-0000-0000-0000-000000000000",`
`8`	`8`	`"consent": "1decd852-3743-4fe8-be01-bb4e76d70ec2"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "900893e7-c4cc-4873-8032-884e965e4b97": {`
	`2`	`+ "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": {`
`3`	`3`	`"eventStore": {`
`4`	`4`	`"servers": [`
`5`	`5`	`"mongo"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "900893e7-c4cc-4873-8032-884e965e4b97": {}`
	`2`	`+ "445f8ea8-1a6f-40d7-b2fc-796dba92dc44": {}`
`3`	`3`	`}`