grpc-js-core: fixes for interop test

Author: kjin

packages/grpc-js-core/src/call-credentials.ts

@@ -46,7 +46,7 @@ class ComposedCallCredentials implements CallCredentials {
 class SingleCallCredentials implements CallCredentials {
   constructor(private metadataGenerator: CallMetadataGenerator) {}
 
-  async generateMetadata(options: {}): Promise<Metadata> {
+  generateMetadata(options: {}): Promise<Metadata> {
     return new Promise<Metadata>((resolve, reject) => {
       this.metadataGenerator(options, (err, metadata) => {
         if (metadata !== undefined) {
@@ -64,8 +64,8 @@ class SingleCallCredentials implements CallCredentials {
 }
 
 class EmptyCallCredentials implements CallCredentials {
-  async generateMetadata(options: {}): Promise<Metadata> {
-    return new Metadata();
+  generateMetadata(options: {}): Promise<Metadata> {
+    return Promise.resolve(new Metadata());
   }
 
   compose(other: CallCredentials): CallCredentials {

packages/grpc-js-core/src/call-stream.ts

@@ -282,6 +282,9 @@ export class Http2CallStream extends Duplex implements CallStream {
         let code: Status;
         let details = '';
         switch (errorCode) {
+          case http2.constants.NGHTTP2_NO_ERROR:
+            code = Status.OK;
+            break;
           case http2.constants.NGHTTP2_REFUSED_STREAM:
             code = Status.UNAVAILABLE;
             break;

packages/grpc-js-core/src/call.ts

@@ -38,6 +38,17 @@ export interface Call extends EventEmitter {
       event: 'metadata', listener: (metadata: Metadata) => void): this;
   removeListener(event: 'metadata', listener: (metadata: Metadata) => void):
       this;
+
+  addListener(event: 'status', listener: (status: StatusObject) => void): this;
+  emit(event: 'status', status: StatusObject): boolean;
+  on(event: 'status', listener: (status: StatusObject) => void): this;
+  once(event: 'status', listener: (status: StatusObject) => void): this;
+  prependListener(event: 'status', listener: (status: StatusObject) => void):
+      this;
+  prependOnceListener(
+      event: 'status', listener: (status: StatusObject) => void): this;
+  removeListener(event: 'status', listener: (status: StatusObject) => void):
+      this;
 }
 
 export interface ClientUnaryCall extends Call {}
@@ -48,6 +59,9 @@ export class ClientUnaryCallImpl extends EventEmitter implements Call {
     call.on('metadata', (metadata: Metadata) => {
       this.emit('metadata', metadata);
     });
+    call.on('status', (status: StatusObject) => {
+      this.emit('status', status);
+    });
   }
 
   cancel(): void {
@@ -70,17 +84,6 @@ export interface ClientReadableStream<ResponseType> extends
   prependListener(event: string, listener: Function): this;
   prependOnceListener(event: string, listener: Function): this;
   removeListener(event: string, listener: Function): this;
-
-  addListener(event: 'status', listener: (status: StatusObject) => void): this;
-  emit(event: 'status', status: StatusObject): boolean;
-  on(event: 'status', listener: (status: StatusObject) => void): this;
-  once(event: 'status', listener: (status: StatusObject) => void): this;
-  prependListener(event: 'status', listener: (status: StatusObject) => void):
-      this;
-  prependOnceListener(
-      event: 'status', listener: (status: StatusObject) => void): this;
-  removeListener(event: 'status', listener: (status: StatusObject) => void):
-      this;
 }
 
 export interface ClientWritableStream<RequestType> extends

packages/grpc-js-core/src/deadline-filter.ts

@@ -9,7 +9,7 @@ const units: [string, number][] =
 
 function getDeadline(deadline: number) {
   let now = (new Date()).getTime();
-  let timeoutMs = deadline - now;
+  let timeoutMs = Math.max(deadline - now, 0);
   for (let [unit, factor] of units) {
     let amount = timeoutMs / factor;
     if (amount < 1e8) {