@schukai/monster 3.4.1 → 3.5.0

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/i18n/providers/embed.mjs

@@ -0,0 +1,5 @@
+import {Embed} from '@schukai/monster/source/i18n/providers/embed.mjs';
+
+// read from scritp tag with id i18n
+const translation = new Embed('i18n');
+

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.1",
+  "version": "3.5.0",
   "description": "Monster is a simple library for creating fast, robust and lightweight websites.",
   "keywords": [
     "framework",

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

@@ -17,7 +17,7 @@ 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

@@ -26,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/data/datasource/server.mjs

@@ -81,7 +81,7 @@ class Server extends Datasource {
 
 
 /**
- *
+ * @private
  * @param self
  * @param obj
  * @returns {*}

package/source/dom/locale.mjs

@@ -6,8 +6,8 @@
  */
 
 import {parseLocale} from "../i18n/locale.mjs";
-
 import {getDocument} from "./util.mjs";
+import {getGlobalObject} from "../types/global.mjs";
 
 export {getLocaleOfDocument}
 
@@ -46,6 +46,40 @@ function getLocaleOfDocument() {
             return new parseLocale(locale)
         }
     }
+    
+    let navigatorLanguage = getNavigatorLanguage();
+    if (navigatorLanguage) {
+        return parseLocale(navigatorLanguage);
+    }
 
     return parseLocale(DEFAULT_LANGUAGE);
 }
+
+/**
+ * @private
+ * @returns {string|undefined|*}
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/language
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/languages
+ */
+const getNavigatorLanguage = () => {
+    const navigator = getGlobalObject('navigator');
+    if (navigator === undefined) {
+        return undefined;
+    }
+
+    if (navigator.hasOwnProperty('language')) {
+        const language = navigator.language;
+        if (typeof language === 'string' && language.length > 0) {
+            return language;
+        }
+        
+    }
+
+    const languages = navigator?.languages;
+    if (Array.isArray(languages) && languages.length>0) {
+        return languages[0];
+    }
+    
+    return undefined;
+
+}

package/source/i18n/providers/embed.mjs

@@ -0,0 +1,125 @@
+/**
+ * Copyright schukai GmbH and contributors 2022. All Rights Reserved.
+ * Node module: @schukai/monster
+ * This file is licensed under the AGPLv3 License.
+ * License text available at https://www.gnu.org/licenses/agpl-3.0.en.html
+ */
+
+import {internalSymbol} from "../../constants.mjs";
+import {extend} from "../../data/extend.mjs";
+import { getGlobalObject} from "../../types/global.mjs";
+import {isString} from "../../types/is.mjs";
+import {validateObject, validateString} from "../../types/validate.mjs";
+import {parseLocale} from "../locale.mjs";
+import {Provider} from "../provider.mjs";
+import {Translations} from "../translations.mjs";
+
+export {Embed}
+
+/**
+ * The Embed provider retrieves a JSON file from the given Script Tag.
+ *
+ * @externalExample ../../../example/i18n/providers/embed.mjs
+ * @license AGPLv3
+ * @since 1.13.0
+ * @copyright schukai GmbH
+ * @memberOf Monster.I18n.Providers
+ * @see {@link https://datatracker.ietf.org/doc/html/rfc3066}
+ * @tutorial i18n-locale-and-formatter
+ */
+class Embed extends Provider {
+
+    /**
+     * ```html
+     * <script id="translations" type="application/json">
+     * {
+     *     "hello": "Hallo"
+     * }
+     * </script>
+     * ```
+     * 
+     * 
+     * ```javascript
+     * new Embed('translations')
+     * ```
+     *
+     * @param {string} id
+     * @param {Object} options
+     */
+    constructor(id, options) {
+        super(options);
+
+        if (options === undefined) {
+            options = {};
+        }
+
+        validateString(id);
+
+        /**
+         * @property {string}
+         */
+        this.textId = id;
+
+        /**
+         * @private
+         * @property {Object} options
+         */
+        this[internalSymbol] = extend({}, super.defaults, this.defaults, validateObject(options));
+
+    }
+
+    /**
+     * Defaults
+     *
+     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API}
+     */
+    get defaults() {
+        return extend({}, super.defaults);
+    }
+
+    /**
+     *
+     * @param {Locale|string} locale
+     * @return {Promise}
+     */
+    getTranslations(locale) {
+
+        if (isString(locale)) {
+            locale = parseLocale(locale);
+        }
+
+        return new Promise((resolve, reject) => {
+
+            let text = getGlobalObject('document').getElementById(this.textId);
+
+            if (text === null) {
+                reject(new Error('Text not found'));
+                return;
+            }
+
+            let translations = null;
+            try {
+                translations = JSON.parse(text.innerHTML);
+            } catch (e) {
+                reject(e);
+                return;
+            }
+
+
+            if (translations === null) {
+                reject(new Error('Translations not found or invalid'));
+                return;
+            }
+            
+            const t = new Translations(locale);
+            t.assignTranslations(translations)
+
+            resolve(t);
+
+        });
+
+    }
+
+
+}
+

package/source/i18n/providers/fetch.mjs

@@ -84,16 +84,17 @@ export {Fetch}
      */
     get defaults() {
 
-        return {
-            fetch: {
-                method: 'GET', // *GET, POST, PUT, DELETE, etc.
-                mode: 'cors', // no-cors, *cors, same-origin
-                cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
-                credentials: 'omit', // include, *same-origin, omit
-                redirect: 'follow', // manual, *follow, error
-                referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
-            }
-        }
+        return extend(
+            {
+                fetch: {
+                    method: 'GET', // *GET, POST, PUT, DELETE, etc.
+                    mode: 'cors', // no-cors, *cors, same-origin
+                    cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+                    credentials: 'omit', // include, *same-origin, omit
+                    redirect: 'follow', // manual, *follow, error
+                    referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
+                }
+            }, super.defaults);
 
     }
 

package/source/i18n/translations.mjs

@@ -142,13 +142,16 @@ class Translations extends Base {
     }
 
     /**
-     * This method can be used to transfer overlays from an object. The keys are transferred and the values are entered as text.
-     *
-     * The values can either be character strings or, in the case of texts with plural forms, objects. The plural forms must be stored as text via a standard key "zero", "one", "two", "few", "many" and "other".
-     *
+     * This method can be used to transfer overlays from an object. The keys are transferred, and the values are entered 
+     * as text.
+     * 
+     * The values can either be character strings or, in the case of texts with plural forms, objects. The plural forms
+     * must be stored as text via a standard key "zero", "one", "two", "few", "many" and "other".
+     * 
      * Additionally, the key default can be specified, which will be used if no other key fits.
-     *
-     * In some languages, like for example in german, there is no own more number at the value 0. In these languages the function applies additionally zero.
+     * 
+     * In some languages, like for example in German, there is no own more number at the value 0. In these languages, 
+     * the function applies additionally zero.
      *
      * ```
      * translations.assignTranslations({

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.1')
+    monsterVersion = new Version('3.5.0')
 
     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/dom/locale.mjs

@@ -2,6 +2,7 @@
 
 import {expect} from "chai"
 
+import {Locale} from "../../../../application/source/i18n/locale.mjs";
 import {getLocaleOfDocument} from "../../../../application/source/dom/locale.mjs";
 import {initJSDOM} from "../../util/jsdom.mjs";
 
@@ -32,10 +33,24 @@ describe('Attributes', function () {
                 node.setAttribute('lang', a);
                 expect(getLocaleOfDocument().toString()).to.be.equal(a);
             })
+            
+            
 
         });
 
 
     });
+    
+    
+    it('return language en', function () {
+        let html = document.getElementsByTagName('html');
+        let node = html.item(0);
+
+        node.removeAttribute('lang');
+        const locale = getLocaleOfDocument();
+        expect(locale).to.be.instanceOf(Locale);
+        expect(locale.localeString).to.be.equal('en-US');
+    })
+    
 
 })

package/test/cases/i18n/providers/embed.mjs

@@ -0,0 +1,72 @@
+import {expect} from "chai"
+
+
+import {Embed} from "../../../../../application/source/i18n/providers/embed.mjs";
+import {Translations} from "../../../../../application/source/i18n/translations.mjs";
+import {getGlobal} from "../../../../../application/source/types/global.mjs";
+import {initJSDOM} from "../../../util/jsdom.mjs";
+
+
+const global = getGlobal();
+
+const html1 = `
+<script id="templocale" type="application/json">
+{
+        "key": "translation"
+}
+</script>
+`;
+
+describe('Translation Provider Embed', function () {
+
+    before(function (done) {
+        initJSDOM().then(() => {
+            done()
+        });
+    });
+
+
+    afterEach(() => {
+        let mocks = document.getElementById('mocks');
+        mocks.innerHTML = "";
+    });
+
+    beforeEach(() => {
+        let mocks = document.getElementById('mocks');
+        mocks.innerHTML = html1;
+
+    })
+
+    describe('get mock data and create translation', function () {
+
+        it('embed', function (done) {
+
+            const e = new Embed('templocale');
+            let p = e.getTranslations('en');
+            expect(p).is.instanceof(Promise);
+
+            p.then(r => {
+
+                try {
+                    expect(r).is.instanceof(Translations);
+ 
+                    let t = r.getText('key')
+                    expect(t).is.equal('translation');
+
+
+                    done();
+                } catch (e) {
+                    done(e);
+                }
+
+
+            }).catch(e => {
+                done(e);
+            })
+
+        });
+
+    });
+
+
+});

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

package/example/data/storage/restapi.mjs

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