Merge pull request #179 from emilbayes/master

Better error handling for taken objects and names

Author: Shouqun

lib/dbus.js

@@ -85,12 +85,10 @@ DBus.registerService = function(busName, serviceName) {
 	serviceMap[serviceHash] = service;
 
 	if (serviceName) {
-		process.nextTick(function() {
-			DBus._requestName(bus, _serviceName);
-		});
+		DBus._requestName(bus, _serviceName);
 	}
 
-	return service;
+	return service
 };
 
 /* Deprecated */

src/dbus.cc

@@ -310,6 +310,8 @@ namespace NodeDBus {
 	}
 
 	NAN_METHOD(RequestName) {
+		DBusError error;
+
 		if (!info[0]->IsObject()) {
 			return Nan::ThrowTypeError("First argument must be an object (bus)");
 		}
@@ -321,12 +323,19 @@ namespace NodeDBus {
 		BusObject *bus = static_cast<BusObject *>(Nan::GetInternalFieldPointer(info[0]->ToObject(), 0));
 		char *service_name = strdup(*String::Utf8Value(info[1]->ToString()));
 
+		dbus_error_init(&error);
+
 		// Request bus name
-		dbus_bus_request_name(bus->connection, service_name, 0, NULL);
+		dbus_bus_request_name(bus->connection, service_name, 0, &error);
 		dbus_connection_flush(bus->connection);
 
-		dbus_free(service_name);
+		if (dbus_error_is_set(&error)) {
+			dbus_free(service_name);
 
+			return Nan::ThrowError(error.message);
+		}
+
+		dbus_free(service_name);
 		return;
 	}
 

src/object_handler.cc

@@ -99,6 +99,7 @@ namespace ObjectHandler {
 	DBusObjectPathVTable vtable = CreateVTable();
 
 	NAN_METHOD(RegisterObjectPath) {
+		DBusError error;
 		if (!info[0]->IsObject()) {
 			return Nan::ThrowTypeError("First parameter must be an object (bus)");
 		}
@@ -111,14 +112,16 @@ namespace ObjectHandler {
 
 		// Register object path
 		char *object_path = strdup(*Nan::Utf8String(info[1]));
-		dbus_bool_t ret = dbus_connection_register_object_path(bus->connection,
+		dbus_error_init(&error);
+		dbus_bool_t ret = dbus_connection_try_register_object_path(bus->connection,
 			object_path,
 			&vtable,
-			NULL);
+			NULL,
+			&error);
 		dbus_connection_flush(bus->connection);
 		dbus_free(object_path);
-		if (!ret) {
-			return Nan::ThrowError("Out of Memory");
+		if (dbus_error_is_set(&error)) {
+			return Nan::ThrowError(error.message);
 		}
 
 		return;

test/service-duplicate-error.test.js

@@ -0,0 +1,21 @@
+var tap = require('tap');
+var DBus = require('../');
+
+tap.plan(1);
+
+var service = DBus.registerService('session', 'test.dbus.TestService');
+var object = service.createObject('/test/dbus/TestService');
+var iface = object.createInterface('test.dbus.TestService.Interface1');
+iface.addSignal('Test', { types: [DBus.Define(String)] });
+iface.update()
+
+setTimeout(function() {
+	tap.throws(function() {
+    var objectd = service.createObject('/test/dbus/TestService');
+    var ifaced = objectd.createInterface('test.dbus.TestService.Interface1');
+    ifaced.addSignal('Test', { types: [DBus.Define(String)] });
+    ifaced.update();
+	})
+
+	service.disconnect()
+}, 100);