@schukai/monster 3.4.0 → 3.4.2

package/example/data/datasource/server/restapi.mjs

@@ -0,0 +1,14 @@
+import {RestAPI} from '@schukai/monster/source/data/datasource/server/restapi.mjs';
+
+const ds = new RestAPI({
+    write: {
+        url: 'https://httpbin.org/get'    
+    },
+    read: {
+        url: 'https://httpbin.org/get'
+    }
+});
+
+ds.set({flag: true})
+ds.write().then(() => console.log('done'));
+ds.read().then(() => console.log('done'));

package/example/data/datasource/server/webconnect.mjs

@@ -0,0 +1,9 @@
+import {WebConnect} from '@schukai/monster/source/data/datasource/server/webconnect.mjs';
+
+const ds = new WebConnect({
+    url: 'https://httpbin.org/get'
+});
+
+ds.set({flag: true})
+ds.write().then(() => console.log('done'));
+ds.read().then(() => console.log('done'));

package/example/net/webconnect.mjs

@@ -0,0 +1,16 @@
+import {WebConnect} from '@schukai/monster/source/net/webconnect.mjs';
+
+const connection = new WebConnect({
+    url: 'https://httpbin.org/get'
+});
+
+connection.connect().then(()=>{
+
+    connection.send({message:"Hello World!"}).then((response)=>{
+        console.log(response);
+    });
+    
+    const message = connection.poll()
+    
+    
+})

package/package.json

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

package/source/data/datasource/{restapi → server}/namespace.mjs

@@ -4,9 +4,9 @@
  */
 
 /**
- * Namespace for storages
+ * Namespace for server
  *
- * @namespace Monster.Data.Datasource.RestAPI
+ * @namespace Monster.Data.Datasource.Server
  * @memberOf Monster.Data.Datasource
  * @author schukai GmbH
  */

package/source/data/datasource/server/restapi/namespace.mjs

@@ -0,0 +1,13 @@
+/**
+ * Copyright 2022 schukai GmbH
+ * SPDX-License-Identifier: AGPL-3.0
+ */
+
+/**
+ * Namespace for storages
+ *
+ * @namespace Monster.Data.Datasource.Server.RestAPI
+ * @memberOf Monster.Data.Datasource.Server
+ * @author schukai GmbH
+ */
+const ns = {};

package/source/data/datasource/{restapi → server/restapi}/writeerror.mjs

@@ -5,7 +5,7 @@
  * License text available at https://www.gnu.org/licenses/agpl-3.0.en.html
  */
 
-import {internalSymbol,instanceSymbol} from "../../../constants.mjs";
+import {internalSymbol,instanceSymbol} from "../../../../constants.mjs";
 
 export {WriteError}
 
@@ -15,7 +15,7 @@ export {WriteError}
  * @license AGPLv3
  * @since 1.24.0
  * @copyright schukai GmbH
- * @memberOf Monster.Data.Datasource.RestAPI
+ * @memberOf Monster.Data.Datasource.Server.RestAPI
  * @summary the error is thrown by the rest api in case of error
  */
 class WriteError extends Error {
@@ -38,7 +38,7 @@ class WriteError extends Error {
      * @since 2.1.0
      */
     static get [instanceSymbol]() {
-        return Symbol.for("@schukai/monster/data/datasource/restapi/writeerror");
+        return Symbol.for("@schukai/monster/data/datasource/server/restapi/writeerror");
     }
 
     /**

package/source/data/datasource/server/restapi.mjs

@@ -10,14 +10,14 @@ import {isObject} from "../../../types/is.mjs";
 import {Server} from "../server.mjs";
 import {Pathfinder} from "../../pathfinder.mjs";
 import {Pipe} from "../../pipe.mjs";
-import {WriteError} from "../restapi/writeerror.mjs";
+import {WriteError} from "./restapi/writeerror.mjs";
 
 export {RestAPI}
 
 /**
  * The RestAPI is a class that enables a REST API server.
  *
- * @externalExample ../../../example/data/storage/restapi.mjs
+ * @externalExample ../../../../example/data/datasource/server/restapi.mjs
  * @license AGPLv3
  * @since 1.22.0
  * @copyright schukai GmbH
@@ -114,44 +114,17 @@ class RestAPI extends Server {
      * @throws {Error} the data cannot be read
      */
     read() {
+
         const self = this;
-        let response;
 
         let init = self.getOption('read.init');
         if (!isObject(init)) init = {};
+        if (!init['method']) init['method'] = 'GET';
 
-        return new Promise((resolve, reject) => {
-            fetch(self.getOption('read.url'), init).then(resp => {
-                response = resp;
-
-                const acceptedStatus = self.getOption('read.acceptedStatus', [200]);
-
-                if (acceptedStatus.indexOf(resp.status) === -1) {
-                    throw Error('the data cannot be read (response ' + resp.status + ')')
-                }
-
-                return resp.text()
-            }).then(body => {
-
-                let obj;
-
-                try {
-                    obj = JSON.parse(body);
-
-                } catch (e) {
-
-                    if (body.length > 100) {
-                        body = body.substring(0, 97) + '...';
-                    }
-
-                    throw new Error('the response does not contain a valid json (actual: ' + body + ').');
-                }
-
-                self.set(self.transformServerPayload.call(self, obj));
-                resolve(response);
-            }).catch(reject);
+        return fetchData.call(this, 'read', (obj) => {
+            self.set(self.transformServerPayload.call(self, obj));
+        });
 
-        })
     }
 
     /**
@@ -159,6 +132,7 @@ class RestAPI extends Server {
      * @throws {WriteError} the data cannot be written
      */
     write() {
+
         const self = this;
 
         let init = self.getOption('write.init');
@@ -168,60 +142,65 @@ class RestAPI extends Server {
                 'Content-Type': 'application/json'
             }
         }
+        if (!init['method']) init['method'] = 'POST';
 
         let obj = self.prepareServerPayload(self.get());
         init['body'] = JSON.stringify(obj);
 
-        return new Promise((resolve, reject) => {
-            fetch(self.getOption('write.url'), init).then(response => {
-                const acceptedStatus = self.getOption('write.acceptedStatus', [200, 201]);
+        return fetchData.call(this, init, 'write');
+    }
 
-                if (acceptedStatus.indexOf(response.status) > -1) {
-                    reject(response);
-                    return;
-                }
 
-                response.text().then((body) => {
+    /**
+     * @return {RestAPI}
+     */
+    getClone() {
+        const self = this;
+        return new RestAPI(self[internalSymbol].getRealSubject()['options'].read, self[internalSymbol].getRealSubject()['options'].write);
+    }
 
-                    let obj = {}, validation = {};
-                    try {
-                        obj = JSON.parse(body);
+}
 
-                        if (reportPath) {
-                            validation = (new Pathfinder(obj)).getVia(reportPath);
-                        }
 
+function fetchData(init, key, callback) {
 
-                    } catch (e) {
+    const self = this;
+    let response;
 
-                        if (body.length > 100) {
-                            body = body.substring(0, 97) + '...';
-                        }
 
-                        reject(new Error('the response does not contain a valid json (actual: ' + body + ').'));
-                        return;
-                    }
+    return fetch(self.getOption(key + '.url'), init).then(resp => {
+        response = resp;
 
-                    reject(new WriteError('the data cannot be written (response ' + response.status + ')', response, validation))
-                    return;
+        const acceptedStatus = self.getOption(key + '.acceptedStatus', [200]);
 
-                }).catch(reject);
+        if (acceptedStatus.indexOf(resp.status) === -1) {
+            throw Error('the data cannot be ' + key + ' (response ' + resp.status + ')')
+        }
 
+        return resp.text()
+    }).then(body => {
 
-            }).catch(reject);
+        let obj;
 
-        })
+        try {
+            obj = JSON.parse(body);
 
-    }
+        } catch (e) {
 
+            if (body.length > 100) {
+                body = body.substring(0, 97) + '...';
+            }
+
+            throw new Error('the response does not contain a valid json (actual: ' + body + ').');
+        }
+
+        if (callback && isFunction(callback)) {
+            callback(obj);
+        }
+        return response;
+
+    });
 
-    /**
-     * @return {RestAPI}
-     */
-    getClone() {
-        const self = this;
-        return new RestAPI(self[internalSymbol].getRealSubject()['options'].read, self[internalSymbol].getRealSubject()['options'].write);
-    }
 
 }
 

package/source/data/datasource/server/webconnect.mjs

@@ -11,10 +11,8 @@ import {WebConnect as NetWebConnect} from "../../../net/webconnect.mjs";
 import {Message} from "../../../net/webconnect/message.mjs";
 import {Server} from "../server.mjs";
 
-
 export {WebConnect}
 
-
 /**
  * @private
  * @type {Symbol}
@@ -28,7 +26,7 @@ const webConnectSymbol = Symbol("connection");
 /**
  * The RestAPI is a class that enables a REST API server.
  *
- * @externalExample ../../../example/data/storage/restapi.mjs
+ * @externalExample ../../../../example/data/datasource/server/webconnect.mjs
  * @license AGPLv3
  * @since 3.1.0
  * @copyright schukai GmbH

package/source/monster.mjs

@@ -192,7 +192,7 @@ export {SessionStorage} from "./data/datasource/storage/sessionstorage.mjs"
 export {LocalStorage} from "./data/datasource/storage/localstorage.mjs"
 export {RestAPI} from "./data/datasource/server/restapi.mjs"
 export {WebConnect} from "./data/datasource/server/webconnect.mjs"
-export {WriteError} from "./data/datasource/restapi/writeerror.mjs"
+export {WriteError} from "./data/datasource/server/restapi/writeerror.mjs"
 export {Storage, storageObjectSymbol} from "./data/datasource/storage.mjs"
 export {random} from "./math/random.mjs"
 

package/source/net/namespace.mjs

@@ -0,0 +1,15 @@
+/**
+ * Copyright 2022 schukai GmbH
+ * SPDX-License-Identifier: AGPL-3.0
+ */
+
+
+
+/**
+ * In this namespace you will find classes and methods for handling connections.
+ *
+ * @namespace Monster.Net
+ * @memberOf Monster
+ * @author schukai GmbH
+ */
+const ns = {};

package/source/net/webconnect/message.mjs

@@ -14,6 +14,12 @@ const dataSymbol = Symbol("@@data");
 
 /**
  * This class represents a WebSocket message.
+ *
+ * @license AGPLv3
+ * @since 3.4.0
+ * @copyright schukai GmbH
+ * @memberOf Monster.Net.WebSocket
+ * @summary The Message class encapsulates a WebSocket message.
  */
 class Message extends Base {
 

package/source/net/webconnect/namespace.mjs

@@ -0,0 +1,15 @@
+/**
+ * Copyright 2022 schukai GmbH
+ * SPDX-License-Identifier: AGPL-3.0
+ */
+
+
+
+/**
+ * In this namespace you will find classes and methods for handling data.
+ *
+ * @namespace Monster.Net.WebConnect
+ * @memberOf Monster.Net
+ * @author schukai GmbH
+ */
+const ns = {};

package/source/net/webconnect.mjs

@@ -158,18 +158,18 @@ function connectServer(resolve, reject) {
 /**
  * The RestAPI is a class that enables a REST API server.
  *
- * @externalExample ../../../example/data/storage/restapi.mjs
+ * @externalExample ../../example/net/webconnect.mjs
  * @license AGPLv3
  * @since 3.1.0
  * @copyright schukai GmbH
- * @memberOf Monster.Data.Datasource
+ * @memberOf Monster.Net
  * @summary The LocalStorage class encapsulates the access to data objects.
  */
 class WebConnect extends BaseWithOptions {
 
     /**
      *
-     * @param {Object} [options] options contains definitions for the datasource.
+     * @param {Object} [options] options contains definitions for the webconnect.
      */
     constructor(options) {
 

package/source/types/version.mjs

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

package/test/cases/data/datasource/server/restapi.mjs

@@ -7,7 +7,7 @@ import {validateObject} from "../../../../../../application/source/types/validat
 
 describe('RestAPI', function () {
 
-    let fetchReference; 
+    let fetchReference;
     let returnStatus;
 
     afterEach(() => {
@@ -28,9 +28,6 @@ describe('RestAPI', function () {
                                 a: "test"
                             }));
                         });
-                        
-                        
-                        
                     },
                     status: returnStatus
                 });
@@ -55,19 +52,23 @@ describe('RestAPI', function () {
         });
 
         it('write should ', function (done) {
-            const ds = new RestAPI({url: 'https://monsterjs.org/assets/world.json'}, 
-                {
-                    url: 'https://monsterjs.org/assets/world.json',
-                    acceptedStatus: [99]
-                })
+            const ds = new RestAPI({
+                    read: {
+                        url: 'https://monsterjs.org/assets/world.json'
+                    },
+                    write: {
+                        url: 'https://monsterjs.org/assets/world.json',
+                        acceptedStatus: [99]
+                    }
+                }
+            )
             ds.write().then(data => {
                 done("should not be here");
             }).catch(e => done());
         });
+    });
 
 
-    })
-
     describe('rw with errors', function () {
 
         it('read should throw exception', function (done) {

package/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.4.0')
+        monsterVersion = new Version('3.4.2')
 
         let m = getMonsterVersion();
 

package/test/web/test.html

@@ -14,8 +14,8 @@
 </head>
 <body>
 <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
-  <h1 style='margin-bottom: 0.1em;'>Monster 3.3.0</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update So 8. Jan 17:05:05 CET 2023</div>
+  <h1 style='margin-bottom: 0.1em;'>Monster 3.4.0</h1>
+  <div id="lastupdate" style='font-size:0.7em'>last update So 8. Jan 17:17:24 CET 2023</div>
 </div>
 <div id="mocks"></div>
 <div id="mocha"></div>