Fix DiscoveryServer implementation

Couple of bugs caught by thingpedia-client's tests hitting almond-dev
stanford-oval · Oct 25, 2018 · 6d92a8e · 6d92a8e
1 parent e57885a
commit 6d92a8e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/util/thingpedia-client.js b/util/thingpedia-client.js
@@ -42,14 +42,14 @@ class ThingpediaDiscoveryDatabase {
     // for compatibility until thingpedia-discovery is updated
     getByAnyKind(kind) {
         if (kind.startsWith('bluetooth-'))
-            return this.getByDiscoveryService('bluetooth', kind.substring('bluetooth-').length);
+            return this.getByDiscoveryService('bluetooth', kind.substring('bluetooth-'.length));
         if (kind.startsWith('upnp-'))
-            return this.getByDiscoveryService('upnp', kind.substring('upnp-').length);
+            return this.getByDiscoveryService('upnp', kind.substring('upnp-'.length));
         return db.withClient((dbClient) => device.getByAnyKind(dbClient, kind));
     }
     getAllKinds(deviceId) {
         return this.getAllDiscoveryServices(deviceId).then((services) => services.map((s) => {
-            return s.discovery_type + s.service;
+            return { kind: s.discovery_type + s.service };
         }));
     }