CHANGELOG.md

 
+<a name="v3.2.0"></a>
+## [v3.2.0] - 2023-01-06
+### Add Features
+- connect return now a promise
+
+
 <a name="v3.1.2"></a>
 ## [v3.1.2] - 2023-01-06
 ### Bug Fixes
@@ -143,6 +149,7 @@
 <a name="1.8.0"></a>
 ## 1.8.0 - 2021-08-15
 
+[v3.2.0]: https://gitlab.schukai.com/oss/libraries/javascript/monster/compare/v3.1.2...v3.2.0
 [v3.1.2]: https://gitlab.schukai.com/oss/libraries/javascript/monster/compare/v3.1.1...v3.1.2
 [v3.1.1]: https://gitlab.schukai.com/oss/libraries/javascript/monster/compare/v3.1.0...v3.1.1
 [v3.1.0]: https://gitlab.schukai.com/oss/libraries/javascript/monster/compare/v3.0.0...v3.1.0

application/package.json

 {
   "name": "@schukai/monster",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Monster is a simple library for creating fast, robust and lightweight websites.",
   "keywords": [
     "framework",

application/source/data/datasource/websocket.mjs

@@ -56,52 +56,31 @@ const connectionStatusCode = {
 };
 
 /**
- * The RestAPI is a class that enables a REST API server.
- *
- * @externalExample ../../../example/data/storage/restapi.mjs
- * @license AGPLv3
- * @since 3.1.0
- * @copyright schukai GmbH
- * @memberOf Monster.Data.Datasource
- * @summary The LocalStorage class encapsulates the access to data objects.
- */
-class WebSocketDatasource extends Datasource {
-
-    /**
-     *
-     * @param {Object} [options] options contains definitions for the datasource.
+ * @private
+ * @this {WebSocketDatasource}
+ * @throws {Error} No url defined for websocket datasource.
  */
-    constructor(options) {
-        super();
+function connectServer(resolve, reject) {
+    const self = this;
 
-        if (isString(options)) {
-            options = {url: options};
+    let promiseAllredyResolved = false;
+    let connectionTimeout = self.getOption('connection.timeout');
+    if (!isInteger(connectionTimeout) || connectionTimeout < 100) {
+        connectionTimeout = 5000;
     }
 
-        if (!isObject(options)) options = {};
-        this.setOptions(options);
-        this[receiveQueueSymbol] = new Queue();
-
-        this[connectionSymbol] = {};
-        this[connectionSymbol].socket = null;
-        this[connectionSymbol].reconnectCounter = 0;
-        this[manualCloseSymbol]=false;
+    setTimeout(() => {
+        if (promiseAllredyResolved) {
+            return;
         }
+        reject(new Error("Connection timeout"));
+    }, connectionTimeout);
 
-    /**
-     *
-     * @returns {Websocketdatasource}
-     * @throws {Error} No url defined for websocket datasource.
-     */
-    connect() {
-        const self = this;
-
-        let connected = false;
-        let reconnectTimeout = self.getOption('reconnect.timeout');
+    let reconnectTimeout = self.getOption('connection.reconnect.timeout');
     if (!isInteger(reconnectTimeout) || reconnectTimeout < 1000) reconnectTimeout = 1000;
-        let reconnectAttempts = self.getOption('reconnect.attempts');
+    let reconnectAttempts = self.getOption('connection.reconnect.attempts');
     if (!isInteger(reconnectAttempts) || reconnectAttempts < 1) reconnectAttempts = 1;
-        let reconnectEnabled = self.getOption('reconnect.enabled');
+    let reconnectEnabled = self.getOption('connection.reconnect.enabled');
     if (reconnectEnabled !== true) reconnectEnabled = false;
 
     self[manualCloseSymbol] = false;
@@ -113,7 +92,10 @@ class WebSocketDatasource extends Datasource {
     self[connectionSymbol].socket = null;
 
     const url = self.getOption('url');
-        if (!url) throw new Error('No url defined for websocket datasource.');
+    if (!url) {
+        reject('No url defined for websocket datasource.');
+        return;
+    }
 
     self[connectionSymbol].socket = new WebSocket(url);
 
@@ -121,12 +103,15 @@ class WebSocketDatasource extends Datasource {
         self[receiveQueueSymbol].add(event);
         setTimeout(function () {
             self.read();
-            }, 0);
+        }, 1);
     };
 
     self[connectionSymbol].socket.onopen = function () {
-            connected = true;
         self[connectionSymbol].reconnectCounter = 0;
+        if (typeof resolve === 'function' && !promiseAllredyResolved) {
+            promiseAllredyResolved = true;
+            resolve();
+        }
     };
 
     self[connectionSymbol].socket.close = function (event) {
@@ -150,13 +135,66 @@ class WebSocketDatasource extends Datasource {
             setTimeout(() => {
                 self.connect();
             }, reconnectTimeout * this[connectionSymbol].reconnectCounter);
+        } else {
+            if (typeof reject === 'function' && !promiseAllredyResolved) {
+                promiseAllredyResolved = true;
+                reject(error);
+            }
         }
 
     };
 }
 
+/**
+ * The RestAPI is a class that enables a REST API server.
+ *
+ * @externalExample ../../../example/data/storage/restapi.mjs
+ * @license AGPLv3
+ * @since 3.1.0
+ * @copyright schukai GmbH
+ * @memberOf Monster.Data.Datasource
+ * @summary The LocalStorage class encapsulates the access to data objects.
+ */
+class WebSocketDatasource extends Datasource {
+
+    /**
+     *
+     * @param {Object} [options] options contains definitions for the datasource.
+     */
+    constructor(options) {
+        super();
+
+        if (isString(options)) {
+            options = {url: options};
+        }
+
+        if (!isObject(options)) options = {};
+        this.setOptions(options);
+        this[receiveQueueSymbol] = new Queue();
+
+        this[connectionSymbol] = {};
+        this[connectionSymbol].socket = null;
+        this[connectionSymbol].reconnectCounter = 0;
+        this[manualCloseSymbol] = false;
+    }
+
+    /**
+     *
+     * @returns {Promise}
+     */
+    connect() {
+        const self = this;
+
+        return new Promise((resolve, reject) => {
+            connectServer.call(this, resolve, reject);
+        });
+    }
+
+    /**
+     * @returns {boolean}
+     */
     isConnected() {
-        return this[connectionSymbol].socket && this[connectionSymbol].socket.readyState === 1;
+      return this[connectionSymbol]?.socket?.readyState === 1;
     }
 
     /**
@@ -169,9 +207,11 @@ class WebSocketDatasource extends Datasource {
 
     /**
      * @property {string} url=undefined Defines the resource that you wish to fetch.
-     * @property {Number} reconnect.timeout The timeout in milliseconds for the reconnect.
-     * @property {Number} reconnect.attempts The maximum number of reconnects.
-     * @property {Bool} reconnect.enabled If the reconnect is enabled.
+     * @property {Object} connection
+     * @property {Object} connection.timeout=5000 Defines the timeout for the connection.
+     * @property {Number} connection.reconnect.timeout The timeout in milliseconds for the reconnect.
+     * @property {Number} connection.reconnect.attempts The maximum number of reconnects.
+     * @property {Bool} connection.reconnect.enabled If the reconnect is enabled.
      * @property {Object} write={} Options
      * @property {Object} write.mapping the mapping is applied before writing.
      * @property {String} write.mapping.transformer Transformer to select the appropriate entries
@@ -208,10 +248,13 @@ class WebSocketDatasource extends Datasource {
                     callbacks: []
                 },
             },
+            connection: {
+                timeout: 5000,
                 reconnect: {
                     timeout: 1000,
-                attempts: 10,
-                enabled: true
+                    attempts: 1,
+                    enabled: false,
+                }
             }
         });
     }

application/source/types/version.mjs

@@ -149,7 +149,7 @@ function getMonsterVersion() {
     }
 
     /** don't touch, replaced by make with package.json version */
-    monsterVersion = new Version('3.1.1')
+    monsterVersion = new Version('3.1.2')
 
     return monsterVersion;
 

development/package.json

 {
   "name": "monster",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "monster",
   "repository": {
     "type": "git",

development/test/cases/monster.mjs

@@ -7,7 +7,7 @@ describe('Monster', function () {
         let monsterVersion
 
         /** don´t touch, replaced by make with package.json version */
-        monsterVersion = new Version('3.1.1')
+        monsterVersion = new Version('3.1.2')
 
         let m = getMonsterVersion();
 

release.json

-{"version":"3.1.2"}
+{"version":"3.2.0"}