@schukai/monster 3.3.0 → 3.4.0

package/test/cases/data/datasource/{restapi.mjs → server/restapi.mjs}

@@ -1,8 +1,8 @@
 "use strict";
 
 import {expect} from "chai"
-import {RestAPI} from "../../../../../application/source/data/datasource/restapi.mjs";
-import {validateObject} from "../../../../../application/source/types/validate.mjs";
+import {RestAPI} from "../../../../../../application/source/data/datasource/server/restapi.mjs";
+import {validateObject} from "../../../../../../application/source/types/validate.mjs";
 
 
 describe('RestAPI', function () {
@@ -18,16 +18,19 @@ describe('RestAPI', function () {
 
         returnStatus = 200;
         fetchReference = globalThis['fetch'];
-        globalThis['fetch'] = function (url, options) {
-
-            if (!url) throw new Error('missing url')
+        globalThis['fetch'] = function (options) {
 
             return new Promise((resolve, reject) => {
                 resolve({
                     text: function () {
-                        return JSON.stringify({
-                            a: "test"
-                        })
+                        return new Promise((resolve, reject) => {
+                            resolve(JSON.stringify({
+                                a: "test"
+                            }));
+                        });
+                        
+                        
+                        
                     },
                     status: returnStatus
                 });
@@ -52,11 +55,14 @@ 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'})
+            const ds = new RestAPI({url: 'https://monsterjs.org/assets/world.json'}, 
+                {
+                    url: 'https://monsterjs.org/assets/world.json',
+                    acceptedStatus: [99]
+                })
             ds.write().then(data => {
-                validateObject(data);
-                done();
-            }).catch(e => done(e));
+                done("should not be here");
+            }).catch(e => done());
         });
 
 
@@ -86,4 +92,4 @@ describe('RestAPI', function () {
     })
 
 
-})
+})

package/test/cases/data/datasource/{websocket.mjs → server/websocket.mjs}

@@ -1,6 +1,6 @@
 import {expect} from "chai"
-import {WebSocketDatasource} from "../../../../../application/source/data/datasource/websocket.mjs";
-import {initWebSocket} from "../../../util/websocket.mjs";
+import {WebConnect} from "../../../../../../application/source/data/datasource/server/webconnect.mjs";
+import {initWebSocket} from "../../../../util/websocket.mjs";
 
 const testUrl = "wss://ws.postman-echo.com/raw"
 
@@ -33,7 +33,9 @@ describe('Websocket', function () {
                     if (sym2.toString() === 'Symbol(connection)') {
                         const socket = connection[sym2]?.socket;
                         if (socket) {
-                            socket.terminate()
+                            if (typeof socket?.terminate === 'function') {
+                                socket?.['terminate']()
+                            }
                         }
                     }
                 }
@@ -45,10 +47,10 @@ describe('Websocket', function () {
 
     it('should get clone', function () {
 
-        ds = new WebSocketDatasource(testUrl)
+        ds = new WebConnect(testUrl)
         const clone = ds.getClone()
 
-        expect(clone).to.be.an.instanceof(WebSocketDatasource)
+        expect(clone).to.be.an.instanceof(WebConnect)
 
 
     })
@@ -58,7 +60,7 @@ describe('Websocket', function () {
         let writeCallbackCalled = false
         let readCallbackCalled = false
 
-        ds = new WebSocketDatasource({
+        ds = new WebConnect({
             url: testUrl,
             write: {
                 mapping: {
@@ -132,7 +134,7 @@ describe('Websocket', function () {
     })
 
     it('should connect', function (done) {
-        ds = new WebSocketDatasource({
+        ds = new WebConnect({
             url: testUrl,
             reconnect: {
                 enabled: false
@@ -148,7 +150,7 @@ describe('Websocket', function () {
     })
 
     it('should send message', function (done) {
-        ds = new WebSocketDatasource({
+        ds = new WebConnect({
             url: testUrl,
             reconnect: {
                 enabled: false

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

@@ -0,0 +1,53 @@
+import {expect} from "chai"
+import {Server} from "../../../../../application/source/data/datasource/server.mjs";
+
+
+describe('Server', function () {
+
+    it('should transform data', function () {
+
+        let writeCallbackCalled = false
+        let readCallbackCalled = false
+
+        const server = new Server({
+            write: {
+                mapping: {
+                    transformer: "call:onWrite",
+                    callbacks: {
+                        onWrite: (data) => {
+                            writeCallbackCalled = true
+                            return data
+                        }
+                    }
+                },
+                sheathing: {
+                    object: {
+                        demo: 1,
+                        data: {
+                            xyz: undefined
+                        }
+                    },
+                    path: "data.xyz",
+                },
+            },
+            read: {
+                mapping: {
+                    transformer: "call:onRead",
+                    callbacks: {
+                        onRead: (data) => {
+                            readCallbackCalled = true
+                            return data
+                        }
+                    }
+                },
+                path: 'data.xyz',
+            }
+        })
+
+        expect(server.transformServerPayload({demo: 1, data: {xyz: 2}})).to.deep.equal({demo: 1, data: {xyz: 2}})
+        expect(server.prepareServerPayload({demo: 1, data: {xyz: 2}})).to.deep.equal({demo: 1, data: {xyz: 2}})
+
+
+    })
+
+});

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.3.0')
+        monsterVersion = new Version('3.4.0')
 
         let m = getMonsterVersion();
 

package/test/cases/net/webconnect.mjs

@@ -26,7 +26,7 @@ describe('Websocket', function () {
         // without this, the node test will hang 
         for (const sym of Object.getOwnPropertySymbols(ds)) {
             if (sym.toString() === 'Symbol(connection)') {
-                if (ds[sym]?.socket?.['terminate']) {
+                if (typeof ds[sym]?.socket?.terminate === 'function') {
                     ds[sym]?.socket?.['terminate']()
                 }
             }

package/test/web/import.js

@@ -30,10 +30,13 @@ import "../cases/i18n/locale.mjs";
 import "../cases/i18n/formatter.mjs";
 import "../cases/i18n/providers/fetch.mjs";
 import "../cases/i18n/provider.mjs";
+import "../cases/net/webconnect/message.mjs";
+import "../cases/net/webconnect.mjs";
 import "../cases/types/mediatype.mjs";
 import "../cases/types/typeof.mjs";
 import "../cases/types/observerlist.mjs";
 import "../cases/types/randomid.mjs";
+import "../cases/types/observablequeue.mjs";
 import "../cases/types/uuid.mjs";
 import "../cases/types/observer.mjs";
 import "../cases/types/tokenlist.mjs";
@@ -75,8 +78,9 @@ import "../cases/data/buildtree.mjs";
 import "../cases/data/transformer.mjs";
 import "../cases/data/pathfinder.mjs";
 import "../cases/data/diff.mjs";
-import "../cases/data/datasource/restapi.mjs";
+import "../cases/data/datasource/server.mjs";
 import "../cases/data/datasource/storage/sessionstorage.mjs";
 import "../cases/data/datasource/storage/localstorage.mjs";
-import "../cases/data/datasource/webservice.mjs";
+import "../cases/data/datasource/server/restapi.mjs";
+import "../cases/data/datasource/server/websocket.mjs";
 import "../cases/math/random.mjs";

package/test/web/test.html

@@ -5,7 +5,7 @@
     <title>Mocha Monster</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="mocha.css"/>
-   <script id="polyfill" src="https://polyfill.io/v3/polyfill.min.js?features=Array.from,Array.isArray,Array.prototype.entries,Array.prototype.fill,Array.prototype.filter,Array.prototype.forEach,Array.prototype.indexOf,Array.prototype.keys,Array.prototype.lastIndexOf,Array.prototype.map,Array.prototype.reduce,Array.prototype.sort,ArrayBuffer,atob,CustomEvent,DataView,document,Document,DocumentFragment,Element,Event,fetch,globalThis,HTMLDocument,HTMLTemplateElement,Intl,JSON,Map,Math.log2,Number.isInteger,Object.assign,Object.defineProperty,Object.entries,Object.freeze,Object.getOwnPropertyDescriptor,Object.getOwnPropertyNames,Object.getPrototypeOf,Object.keys,Promise,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,Set,String.prototype.endsWith,String.prototype.matchAll,String.prototype.padStart,String.prototype.startsWith,String.prototype.trim,Symbol,Symbol.for,Symbol.hasInstance,Symbol.iterator,Uint16Array,Uint8Array,URL,WeakMap,WeakSet"
+   <script id="polyfill" src="https://polyfill.io/v3/polyfill.min.js?features=Array.from,Array.isArray,Array.prototype.entries,Array.prototype.fill,Array.prototype.filter,Array.prototype.forEach,Array.prototype.indexOf,Array.prototype.keys,Array.prototype.lastIndexOf,Array.prototype.map,Array.prototype.reduce,Array.prototype.sort,ArrayBuffer,atob,Blob,CustomEvent,DataView,document,Document,DocumentFragment,Element,Event,fetch,globalThis,HTMLDocument,HTMLTemplateElement,Intl,JSON,Map,Math.log2,Number.isInteger,Object.assign,Object.defineProperty,Object.entries,Object.freeze,Object.getOwnPropertyDescriptor,Object.getOwnPropertyNames,Object.getPrototypeOf,Object.keys,Promise,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,Set,String.prototype.endsWith,String.prototype.matchAll,String.prototype.padStart,String.prototype.startsWith,String.prototype.trim,Symbol,Symbol.for,Symbol.hasInstance,Symbol.iterator,Uint16Array,Uint8Array,URL,WeakMap,WeakSet"
             src="https://polyfill.io/v3/polyfill.min.js?features=Array.from,Array.isArray,Array.prototype.entries,Array.prototype.fill,Array.prototype.forEach,Array.prototype.indexOf,Array.prototype.keys,Array.prototype.lastIndexOf,Array.prototype.map,Array.prototype.reduce,Array.prototype.sort,ArrayBuffer,atob,DataView,document,DocumentFragment,Element,Event,globalThis,HTMLDocument,HTMLTemplateElement,JSON,Map,Math.log2,Number.isInteger,Object.assign,Object.defineProperty,Object.entries,Object.getOwnPropertyDescriptor,Object.getPrototypeOf,Object.keys,Promise,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,Set,String.prototype.endsWith,String.prototype.matchAll,String.prototype.padStart,String.prototype.startsWith,String.prototype.trim,Symbol,Symbol.iterator,WeakMap,WeakSet"
             crossorigin="anonymous"
             referrerpolicy="no-referrer"></script>
@@ -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.0.0</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update Fr 6. Jan 12:54:47 CET 2023</div>
+  <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>
 </div>
 <div id="mocks"></div>
 <div id="mocha"></div>