chuijs 4.0.2 → 4.0.3

package/framework/components/chui_webview/styles.css

@@ -1,7 +1,7 @@
 chui_webview {
     position: relative;
     width: -webkit-fill-available;
-    height: 100%
+    height: 100%;
 }
 
 chui_load {
@@ -25,4 +25,4 @@ webview {
 
 webview.hide {
     visibility: hidden;
-}
+}

package/framework/components/chui_webview/webview.js

@@ -1,6 +1,6 @@
-const { Animation } = require('../../modules/chui_animations/animations')
-const { Spinner } = require('../chui_spinner/spinner')
-const {Log} = require("../../../framework/modules/chui_logger/chui_logger");
+const { Animation } = require("../../modules/chui_animations/animations");
+const { Spinner } = require("../chui_spinner/spinner");
+const { Log } = require("../../../framework/modules/chui_logger/chui_logger");
 
 /**
  * Встроенный браузер на `<webview>`.
@@ -25,7 +25,7 @@ class WebView {
         userAgent: undefined,
         webPreferences: "allowRunningInsecureContent, javascript=yes",
         partition: undefined,
-        preload: undefined
+        preload: undefined,
     };
     /** Безопасный набор для недоверенного контента: без Node, с webSecurity и без попапов */
     static SECURE = {
@@ -33,43 +33,52 @@ class WebView {
         webSecurity: true,
         allowPopups: false,
         plugins: false,
-        webPreferences: "javascript=yes"
+        webPreferences: "javascript=yes",
     };
-    #id = require("randomstring").generate()
-    #main_block = document.createElement('chui_webview')
-    #WebView = document.createElement('webview')
-    #chui_load = document.createElement('chui_load')
+    #id = require("randomstring").generate();
+    #main_block = document.createElement("chui_webview");
+    #WebView = document.createElement("webview");
+    #chui_load = document.createElement("chui_load");
     constructor(url = String(), dev = false, options = {}) {
-        require('../../modules/chui_functions').setStyles(__dirname + '/styles.css', 'chUiJS_WebView');
-        const settings = {...WebView.DEFAULTS};
+        require("../../modules/chui_functions").setStyles(__dirname + "/styles.css", "chUiJS_WebView");
+        const settings = { ...WebView.DEFAULTS };
         // undefined в объекте опций означает «как по умолчанию», а не «перезаписать пустым»
         for (const [key, value] of Object.entries(options)) {
             if (value !== undefined) settings[key] = value;
         }
-        this.#WebView.setAttribute('id', this.#id)
-        this.#WebView.setAttribute('src', url)
-        if (settings.nodeIntegration === true) this.#WebView.setAttribute('nodeintegration', 'true');
-        if (settings.plugins === true) this.#WebView.setAttribute('plugins', 'true')
-        this.#WebView.setAttribute('useragent', settings.userAgent === undefined ? getFirefoxUserAgent() : String(settings.userAgent))
+        this.#WebView.setAttribute("id", this.#id);
+        this.#WebView.setAttribute("src", url);
+        if (settings.nodeIntegration === true) this.#WebView.setAttribute("nodeintegration", "true");
+        if (settings.plugins === true) this.#WebView.setAttribute("plugins", "true");
+        this.#WebView.setAttribute(
+            "useragent",
+            settings.userAgent === undefined ? getFirefoxUserAgent() : String(settings.userAgent)
+        );
         // Атрибут отрицательный: ставим его только когда webSecurity выключен явно
-        if (settings.webSecurity === false) this.#WebView.setAttribute('disablewebsecurity', 'true')
-        if (settings.allowPopups === true) this.#WebView.setAttribute('allowpopups', 'true')
-        if (settings.webPreferences !== undefined) this.#WebView.setAttribute("webpreferences", settings.nodeIntegration === true ? withNodeIntegration(String(settings.webPreferences)) : String(settings.webPreferences));
+        if (settings.webSecurity === false) this.#WebView.setAttribute("disablewebsecurity", "true");
+        if (settings.allowPopups === true) this.#WebView.setAttribute("allowpopups", "true");
+        if (settings.webPreferences !== undefined)
+            this.#WebView.setAttribute(
+                "webpreferences",
+                settings.nodeIntegration === true
+                    ? withNodeIntegration(String(settings.webPreferences))
+                    : String(settings.webPreferences)
+            );
         if (settings.partition !== undefined) this.#WebView.setAttribute("partition", String(settings.partition));
         if (settings.preload !== undefined) this.#WebView.setAttribute("preload", String(settings.preload));
         let spinner = new Spinner(Spinner.SIZE.BIG);
         this.#chui_load.appendChild(spinner.set());
-        this.#main_block.appendChild(this.#WebView)
+        this.#main_block.appendChild(this.#WebView);
         const loadStart = () => {
-            this.#main_block.appendChild(this.#chui_load)
-        }
+            this.#main_block.appendChild(this.#chui_load);
+        };
         const loadStop = () => {
             new Animation(this.#WebView).fadeIn();
-            this.#main_block.removeChild(this.#chui_load)
+            this.#main_block.removeChild(this.#chui_load);
             if (dev) this.#WebView.openDevTools();
-        }
-        this.#WebView.addEventListener('did-start-loading', loadStart)
-        this.#WebView.addEventListener('did-stop-loading', loadStop)
+        };
+        this.#WebView.addEventListener("did-start-loading", loadStart);
+        this.#WebView.addEventListener("did-stop-loading", loadStop);
     }
     setPartition(partition = String()) {
         this.#WebView.partition = partition;
@@ -78,51 +87,51 @@ class WebView {
         this.#WebView.preload = "file://" + path;
     }
     addStartLoadEvent(listener = () => {}) {
-        this.#WebView.addEventListener('did-start-loading', listener)
+        this.#WebView.addEventListener("did-start-loading", listener);
     }
     addStopLoadEvent(listener = () => {}) {
-        this.#WebView.addEventListener('did-stop-loading', listener)
+        this.#WebView.addEventListener("did-stop-loading", listener);
     }
     addFinishLoadEvent(listener = () => {}) {
-        this.#WebView.addEventListener('did-finish-load', listener)
+        this.#WebView.addEventListener("did-finish-load", listener);
     }
     async executeJavaScript(code = String()) {
         try {
             await this.#WebView.executeJavaScript(code);
         } catch (err) {
-            Log.error(err)
+            Log.error(err);
         }
     }
     insertCustomRes(options = { cssPath: String(), jsPath: String() }) {
-        this.#WebView.addEventListener('did-frame-finish-load', async () => {
-            const fs = require('fs');
+        this.#WebView.addEventListener("did-frame-finish-load", async () => {
+            const fs = require("fs");
             if (options.cssPath !== undefined) {
-                let data = fs.readFileSync(options.cssPath, 'utf8');
-                this.#WebView.insertCSS(String(data)).catch(r => Log.error(r));
+                let data = fs.readFileSync(options.cssPath, "utf8");
+                this.#WebView.insertCSS(String(data)).catch((r) => Log.error(r));
             }
             if (options.jsPath !== undefined) {
                 try {
-                    const data = fs.readFileSync(options.jsPath, 'utf8');
+                    const data = fs.readFileSync(options.jsPath, "utf8");
                     await this.#WebView.executeJavaScript(data);
                 } catch (err) {
                     Log.error(err);
                 }
             }
-        })
+        });
     }
     async send(channel = String(), ...args) {
         // Аргументы передаются как есть: `webview.send(channel, ...args)`. Раньше они
         // уезжали одним массивом, и слушатель в гостевой странице видел один аргумент
-        await this.#WebView.send(channel, ...args)
+        await this.#WebView.send(channel, ...args);
     }
     setUrl(url = String()) {
-        this.#WebView.setAttribute('src', url)
+        this.#WebView.setAttribute("src", url);
     }
     getWebContentsId() {
-        return this.#WebView.getWebContentsId()
+        return this.#WebView.getWebContentsId();
     }
     set() {
-        return this.#main_block
+        return this.#main_block;
     }
 }
 
@@ -141,19 +150,22 @@ const withNodeIntegration = (preferences = String()) => {
 
 const getFirefoxUserAgent = () => {
     const rootUAs = {
-      mac: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0',
-      windows: 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0',
-      linux: 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0',
+        mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0",
+        windows: "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0",
+        linux: "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:FXVERSION.0) Gecko/20100101 Firefox/FXVERSION.0",
     };
     let rootUA;
-    if (process.platform === 'win32') {
-      rootUA = rootUAs.windows;
-    } else if (process.platform === 'darwin') {
-      rootUA = rootUAs.mac;
+    if (process.platform === "win32") {
+        rootUA = rootUAs.windows;
+    } else if (process.platform === "darwin") {
+        rootUA = rootUAs.mac;
     } else {
-      rootUA = rootUAs.linux;
+        rootUA = rootUAs.linux;
     }
-    return rootUA.replace(/FXVERSION/g, 91 + Math.floor((Date.now() - 1628553600000) / (4.1 * 7 * 24 * 60 * 60 * 1000)));
+    return rootUA.replace(
+        /FXVERSION/g,
+        91 + Math.floor((Date.now() - 1628553600000) / (4.1 * 7 * 24 * 60 * 60 * 1000))
+    );
 };
 
-exports.WebView = WebView
+exports.WebView = WebView;

package/framework/components/telegram_bot/chui_telegram_bot.js

@@ -1,10 +1,10 @@
 class TelegramBot {
     #main_api = undefined;
     constructor(token = String()) {
-        this.#main_api = `https://api.telegram.org/bot${token}`
+        this.#main_api = `https://api.telegram.org/bot${token}`;
     }
     setToken(token = String()) {
-        this.#main_api = `https://api.telegram.org/bot${token}`
+        this.#main_api = `https://api.telegram.org/bot${token}`;
     }
     // GET
     async getMe() {
@@ -15,142 +15,142 @@ class TelegramBot {
     }
     async getChat(chat_id = String()) {
         return await this.#sendRequestParams("GET", `getChat`, {
-            "chat_id": chat_id
+            chat_id: chat_id,
         });
     }
     async getChatAdministrators(chat_id = String()) {
         return await this.#sendRequestParams("GET", `getChatAdministrators`, {
-            "chat_id": chat_id
+            chat_id: chat_id,
         });
     }
     async getChatMemberCount(chat_id = String()) {
         return await this.#sendRequestParams("GET", `getChatMemberCount`, {
-            "chat_id": chat_id
+            chat_id: chat_id,
         });
     }
     async getChatMember(chat_id = String(), user_id = Number()) {
         return await this.#sendRequestParams("GET", `getChatMember`, {
-            "chat_id": chat_id,
-            "user_id": user_id
+            chat_id: chat_id,
+            user_id: user_id,
         });
     }
     async getUserProfilePhotos(user_id = Number()) {
         return await this.#sendRequestParams("GET", `getUserProfilePhotos`, {
-            "user_id": user_id
+            user_id: user_id,
         });
     }
     async getFile(file_id = String()) {
         return await this.#sendRequestParams("GET", `getFile`, {
-            "file_id": file_id
+            file_id: file_id,
         });
     }
     // SET
     async setChatTitle(chat_id = String(), title = String()) {
         return await this.#sendRequestFormData("POST", "setChatTitle", {
-            "chat_id": chat_id,
-            "title": title
-        })
+            chat_id: chat_id,
+            title: title,
+        });
     }
     async setChatDescription(chat_id = String(), description = String()) {
         return await this.#sendRequestFormData("POST", "setChatDescription", {
-            "chat_id": chat_id,
-            "description": description
-        })
+            chat_id: chat_id,
+            description: description,
+        });
     }
     async setChatPhoto(chat_id = String(), path = String()) {
         return await this.#sendRequestFormData("POST", "setChatPhoto", {
-            "chat_id": chat_id,
-            "photo": path
-        })
+            chat_id: chat_id,
+            photo: path,
+        });
     }
     async deleteChatPhoto(chat_id = String()) {
         return await this.#sendRequestFormData("POST", "deleteChatPhoto", {
-            "chat_id": chat_id
-        })
+            chat_id: chat_id,
+        });
     }
     // FUNC
     async forwardMessage(chat_id = String(), from_chat_id = String(), message_id = Number()) {
         return await this.#sendRequestFormData("POST", "forwardMessage", {
-            "chat_id": chat_id,
-            "from_chat_id": from_chat_id,
-            "message_id": message_id
+            chat_id: chat_id,
+            from_chat_id: from_chat_id,
+            message_id: message_id,
         });
     }
     async copyMessage(chat_id = String(), from_chat_id = String(), message_id = Number()) {
         return await this.#sendRequestFormData("POST", "copyMessage", {
-            "chat_id": chat_id,
-            "from_chat_id": from_chat_id,
-            "message_id": message_id
+            chat_id: chat_id,
+            from_chat_id: from_chat_id,
+            message_id: message_id,
         });
     }
     async pinChatMessage(chat_id = String(), message_id = Number()) {
         return await this.#sendRequestFormData("POST", "pinChatMessage", {
-            "chat_id": chat_id,
-            "message_id": message_id
+            chat_id: chat_id,
+            message_id: message_id,
         });
     }
     async unpinChatMessage(chat_id = String(), message_id = Number()) {
         return await this.#sendRequestFormData("POST", "unpinChatMessage", {
-            "chat_id": chat_id,
-            "message_id": message_id
+            chat_id: chat_id,
+            message_id: message_id,
         });
     }
     async unpinAllChatMessages(chat_id = String()) {
         return await this.#sendRequestFormData("POST", "unpinAllChatMessages", {
-            "chat_id": chat_id
+            chat_id: chat_id,
         });
     }
     // SEND FUNC
     async sendMessage(chat_id = String(), message = String()) {
         return await this.#sendRequestFormData("POST", "sendMessage", {
-            "chat_id": chat_id,
-            "text": message,
-            "parse_mode": "markdown"
+            chat_id: chat_id,
+            text: message,
+            parse_mode: "markdown",
         });
     }
     async sendDocument(chat_id = String(), path = String()) {
         return await this.#sendRequestFormData("POST", "sendDocument", {
-            "chat_id": chat_id,
-            "document": path
-        })
+            chat_id: chat_id,
+            document: path,
+        });
     }
     async sendPhoto(chat_id = String(), path = String()) {
         return await this.#sendRequestFormData("POST", "sendPhoto", {
-            "chat_id": chat_id,
-            "photo": path
-        })
+            chat_id: chat_id,
+            photo: path,
+        });
     }
     async sendAudio(chat_id = String(), path = String()) {
         return await this.#sendRequestFormData("POST", "sendAudio", {
-            "chat_id": chat_id,
-            "audio": path
-        })
+            chat_id: chat_id,
+            audio: path,
+        });
     }
     async sendVideo(chat_id = String(), path = String()) {
         return await this.#sendRequestFormData("POST", "sendVideo", {
-            "chat_id": chat_id,
-            "video": path
-        })
+            chat_id: chat_id,
+            video: path,
+        });
     }
     async sendContact(chat_id = String(), phone_number = String(), first_name = String()) {
         return await this.#sendRequestFormData("POST", "sendContact", {
-            "chat_id": chat_id,
-            "phone_number": phone_number,
-            "first_name": first_name
-        })
+            chat_id: chat_id,
+            phone_number: phone_number,
+            first_name: first_name,
+        });
     }
     async sendPoll(chat_id = String(), question = String(), options = [], is_anonymous = Boolean()) {
         return await this.#sendRequestFormData("POST", "sendPoll", {
-            "chat_id": chat_id,
-            "question": question,
-            "options": JSON.stringify(options),
-            "is_anonymous": is_anonymous
-        })
+            chat_id: chat_id,
+            question: question,
+            options: JSON.stringify(options),
+            is_anonymous: is_anonymous,
+        });
     }
     async sendDice(chat_id = String()) {
         return await this.#sendRequestFormData("POST", "sendDice", {
-            "chat_id": chat_id
-        })
+            chat_id: chat_id,
+        });
     }
     // PRIVATE FUNC
     #sendRequestFormData(method, func, data = {}) {
@@ -159,12 +159,12 @@ class TelegramBot {
             request.open(method, `${this.#main_api}/${func}`);
             if (data !== undefined) {
                 let formData = new FormData();
-                for (let key of Object.keys(data)) formData.append(key, data[key])
-                request.send(formData)
+                for (let key of Object.keys(data)) formData.append(key, data[key]);
+                request.send(formData);
             } else request.send();
             request.addEventListener("load", () => resolve(JSON.parse(request.responseText)));
             request.addEventListener("error", () => reject(JSON.parse(request.responseText)));
-        })
+        });
     }
     #sendRequestParams(method, func, params = {}) {
         return new Promise((resolve, reject) => {
@@ -174,11 +174,18 @@ class TelegramBot {
             request.send();
             request.addEventListener("load", () => resolve(JSON.parse(request.responseText)));
             request.addEventListener("error", () => reject(JSON.parse(request.responseText)));
-        })
+        });
     }
-    #formatParams(params){
-        return "?" + Object.keys(params).map((key) => { return key + "=" + encodeURIComponent(params[key]) }).join("&")
+    #formatParams(params) {
+        return (
+            "?" +
+            Object.keys(params)
+                .map((key) => {
+                    return key + "=" + encodeURIComponent(params[key]);
+                })
+                .join("&")
+        );
     }
 }
 
-exports.TelegramBot = TelegramBot
+exports.TelegramBot = TelegramBot;