Merge pull request #962 from murgatroid99/incoming_metadata_forgiving

Warn instead of failing when constructing metadata from remote end
grpc · Jul 11, 2019 · a456547 · a456547
2 parents ad378d3 + 5b87ceb
commit a456547
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/packages/grpc-js/src/metadata.ts b/packages/grpc-js/src/metadata.ts
@@ -62,7 +62,7 @@ function validate(key: string, value?: MetadataValue): void {
   }
 }
 
-interface MetadataOptions {
+export interface MetadataOptions {
   /* Signal that the request is idempotent. Defaults to false */
   idempotentRequest?: boolean;
   /* Signal that the call should not return UNAVAILABLE before it has
@@ -240,24 +240,29 @@ export class Metadata {
 
       const values = headers[key];
 
-      if (isBinaryKey(key)) {
-        if (Array.isArray(values)) {
-          values.forEach(value => {
-            result.add(key, Buffer.from(value, 'base64'));
-          });
-        } else if (values !== undefined) {
-          values.split(',').forEach(v => {
-            result.add(key, Buffer.from(v.trim(), 'base64'));
-          });
-        }
-      } else {
-        if (Array.isArray(values)) {
-          values.forEach(value => {
-            result.add(key, value);
-          });
-        } else if (values !== undefined) {
-          values.split(',').forEach(v => result.add(key, v.trim()));
+      try {
+        if (isBinaryKey(key)) {
+          if (Array.isArray(values)) {
+            values.forEach(value => {
+              result.add(key, Buffer.from(value, 'base64'));
+            });
+          } else if (values !== undefined) {
+            values.split(',').forEach(v => {
+              result.add(key, Buffer.from(v.trim(), 'base64'));
+            });
+          }
+        } else {
+          if (Array.isArray(values)) {
+            values.forEach(value => {
+              result.add(key, value);
+            });
+          } else if (values !== undefined) {
+            values.split(',').forEach(v => result.add(key, v.trim()));
+          }
         }
+      } catch (error) {
+        error.message = `Failed to add metadata entry ${key}: ${values}. ${error.message}`;
+        process.emitWarning(error);
       }
     });
     return result;