Merge branch 'master' of github.com:pryv/lib-js

Author: perki

components/pryv-monitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pryv/monitor",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Extends `pryv` with event-driven notifications for changes on a Pryv.io account",
   "keywords": [
     "Pryv",

components/pryv-socket.io/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pryv/socket.io",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Extends `pryv` with Socket.IO transport",
   "keywords": [
     "Pryv",

components/pryv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pryv",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Pryv JavaScript library",
   "keywords": [
     "Pryv",

components/pryv/src/Service.js

@@ -68,6 +68,25 @@ class Service {
     return this._serviceInfo;
   }
 
+  /**
+   * Check if a service supports High Frequency Data Sets
+   * @return true if yes
+   */
+  async supportsHF () {
+    const infos = await this.info();
+    return (infos.features == null || infos.features.noHF !== true);
+  }
+
+  /**
+   * Check if a service has username in the hostname or in the path of the api
+   * @return true if the service does not rely on DNS to find a host related to a username
+   */
+  async isDnsLess () {
+    const infos = await this.info();
+    const hostname = infos.api.split('/')[2];
+    return !hostname.includes('{username}');
+  }
+
   /**
    * @private
    * @param {ServiceInfo} serviceInfo

components/pryv/test/Connection.test.js

@@ -262,7 +262,13 @@ describe('Connection', () => {
     });
   });
 
-  describe('HF events', () => {
+  describe('HF events', async function () {
+    before(async function () {
+      if (!await conn.service.supportsHF()) {
+        this.skip();
+      }
+    });
+
     it('Add data points to HF event', async () => {
       const res = await conn.api([{
         method: 'events.create',

components/pryv/test/Service.test.js

@@ -5,6 +5,8 @@
 /* global describe, it, before, expect, pryv, testData */
 /* eslint-disable no-unused-expressions */
 
+const isNode = (typeof window === 'undefined');
+
 describe('Service', function () {
   before(async function () {
     this.timeout(5000);
@@ -75,7 +77,19 @@ describe('Service', function () {
     it('login() failed on wrong username', async function () {
       this.timeout(5000);
       const pryvService = new pryv.Service(testData.serviceInfoUrl);
-      await expect(pryvService.login('wrong-username', 'bobby', 'jslib-test')).to.be.rejectedWith('getaddrinfo ENOTFOUND wrong');
+      // check if username is in path or domain
+      try {
+        await pryvService.login('wrong-username', 'bobby', 'jslib-test');
+      } catch (error) {
+        let errorMessage = isNode ? 'getaddrinfo ENOTFOUND wrong' : 'Request has been terminated';
+        if (await pryvService.isDnsLess()) {
+          errorMessage = 'Unknown user "wrong-username"';
+        }
+        const receivedMessage = error.message.slice(0, errorMessage.length);
+        expect(receivedMessage).to.be.equal(errorMessage);
+        return;
+      }
+      throw new Error('Should fail');
     });
   });
 });