Merge pull request #173 from OpenZWave/feature/revealBadValueId

make populateValueId raise meaningful errors

Author: ekarak

package.json

@@ -4,7 +4,7 @@
   "description": "Node.JS bindings for OpenZWave including management and security functions",
   "main": "./lib/openzwave-shared.js",
   "dependencies": {
-    "nan": "2.5.0"
+    "nan": "2.6.2"
   },
   "scripts": {
     "test": "node test.js",

src/openzwave-nodes.cc

@@ -98,22 +98,18 @@ namespace OZW {
 	{
 		Nan::HandleScope scope;
 		OpenZWave::ValueID* ozwvid = populateValueId(info);
-		if (ozwvid == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (ozwvid) {
 			OpenZWave::Manager::Get()->PressButton(*ozwvid);
 		}
 	}
-	
+
 	// ===================================================================
 	NAN_METHOD(OZW::ReleaseButton)
 	// ===================================================================
 	{
 		Nan::HandleScope scope;
 		OpenZWave::ValueID* ozwvid = populateValueId(info);
-		if (ozwvid == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (ozwvid) {
 			OpenZWave::Manager::Get()->ReleaseButton(*ozwvid);
 		}
 	}

src/openzwave-polling.cc

@@ -111,9 +111,7 @@ namespace OZW {
 		Nan::HandleScope scope;
 		CheckMinArgs(1, "valueId");
 		OpenZWave::ValueID* ozwvid = populateValueId(info);
-		if (ozwvid == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (ozwvid) {
 			bool b = OpenZWave::Manager::Get()->isPolled(*ozwvid);
 			info.GetReturnValue().Set(Nan::New<Boolean>(b));
 		}
@@ -127,9 +125,7 @@ namespace OZW {
 		CheckMinArgs(1, "valueId");
 		OpenZWave::ValueID* ozwvid = populateValueId(info);
 		uint8 intensity;
-		if (ozwvid == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (ozwvid) {
 			uint8 intensity_index = ( info[0]->IsObject() ) ? 1 : 4;
 			intensity = info[intensity_index]->ToNumber()->Value();
 			OpenZWave::Manager::Get()->SetPollIntensity (*ozwvid, intensity);
@@ -144,9 +140,7 @@ namespace OZW {
 		Nan::HandleScope scope;
 		CheckMinArgs(1, "valueId");
 		OpenZWave::ValueID* ozwvid = populateValueId(info);
-		if (ozwvid == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (ozwvid) {
 			uint8 i = OpenZWave::Manager::Get()->GetPollIntensity(*ozwvid);
 			info.GetReturnValue().Set(Nan::New<Integer>(i));
 		}

src/openzwave-scenes.cc

@@ -120,9 +120,7 @@ namespace OZW {
 		CheckMinArgs(2, "sceneid, value");
 		uint8 sceneid  = info[0]->ToNumber()->Value();
 		OpenZWave::ValueID* vit = populateValueId(info, 1);
-		if (vit == NULL) {
-			Nan::ThrowTypeError("OpenZWave valueId not found");
-		} else {
+		if (vit) {
 			uint8 valoffset = ( info[1]->IsObject() ) ? 2 : 5;
 			switch ((*vit).GetType()) {
 				case OpenZWave::ValueID::ValueType_Bool: {
@@ -190,9 +188,7 @@ namespace OZW {
 		SceneInfo *scene;
 		if ((scene = get_scene_info(sceneid))) {
 			OpenZWave::ValueID* vit = populateValueId(info, 1);
-			if (vit == NULL) {
-				Nan::ThrowTypeError("OpenZWave valueId not found");
-			} else {
+			if (vit) {
 				OpenZWave::Manager::Get()->RemoveSceneValue(sceneid, *vit);
 				scene->values.remove(*vit);
 			}