From 08b39b5991e69e70788412b982b3a2572e1cd5b0 Mon Sep 17 00:00:00 2001 From: Colby Blair Date: Fri, 16 Mar 2018 09:58:53 -0600 Subject: [PATCH 1/2] FIX-MISSING-FILE adding error handling for missing files on load --- package.json | 2 +- packages/grpc-native-core/index.js | 5 +++++ packages/grpc-native-core/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5310e7f5c..8cab5dcb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc-js-repository", - "version": "0.1.0", + "version": "0.1.1", "description": "Dummy package for the grpc-node repository", "private": true, "keywords": [], diff --git a/packages/grpc-native-core/index.js b/packages/grpc-native-core/index.js index 30a6ff3c2..b7deb73b7 100644 --- a/packages/grpc-native-core/index.js +++ b/packages/grpc-native-core/index.js @@ -143,6 +143,11 @@ exports.load = function load(filename, format, options) { } finally { ProtoBuf.convertFieldsToCamelCase = convertFieldsToCamelCaseOriginal; } + + if (!builder) { + throw new Error('Could not load file "' + filename + '"'); + } + return loadObject(builder.ns, options); }; diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 3eaa3a83f..a3e3ce2be 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.10.0-dev", + "version": "1.10.1-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From cc02d6550ada6dd2f89620d2e296b4288012ce68 Mon Sep 17 00:00:00 2001 From: Colby Blair Date: Fri, 16 Mar 2018 10:38:18 -0600 Subject: [PATCH 2/2] FIX-MISSING-FILE revert package versions bumps --- package.json | 2 +- packages/grpc-native-core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8cab5dcb9..5310e7f5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc-js-repository", - "version": "0.1.1", + "version": "0.1.0", "description": "Dummy package for the grpc-node repository", "private": true, "keywords": [], diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index a3e3ce2be..3eaa3a83f 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.10.1-dev", + "version": "1.10.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",