5.2

- page render caching
- onDemand block caching
- page html minify
- better rate limiting
- minor cobalt.js clean up
- page render platform indication in settings popup

all these changes are aimed to improve performance and responsiveness

!! not final version of 5.2 !!

src/modules/build.js

@@ -1,12 +1,45 @@
 import * as esbuild from "esbuild";
+import * as fs from "fs";
+import { languageList } from "../localization/manager.js";
+import page from "./pageRender/page.js";
 
-export async function buildFront() {
+function cleanHTML(html) {
+    let clean = html.replace(/    /g, '');
+    clean = clean.replace(/\n/g, '');
+    return clean
+}
+export async function buildFront(commitHash, branch) {
     try {
+        // build html
+        if (!fs.existsSync('./build/')){
+            fs.mkdirSync('./build/');
+            fs.mkdirSync('./build/ios/');
+            fs.mkdirSync('./build/pc/');
+            fs.mkdirSync('./build/mob/');
+        }
+        for (let i in languageList) {
+            i = languageList[i];
+            let params = {
+                "hash": commitHash,
+                "lang": i,
+                "useragent": "pc",
+                "branch": branch
+            }
+            fs.writeFileSync(`./build/pc/${i}.html`, cleanHTML(page(params)));
+
+            params["useragent"] = "iphone os";
+            fs.writeFileSync(`./build/ios/${i}.html`, cleanHTML(page(params)));
+
+            params["useragent"] = "android";
+            fs.writeFileSync(`./build/mob/${i}.html`, cleanHTML(page(params)));
+        }
+        // build js & css
         await esbuild.build({
             entryPoints: ['src/front/cobalt.js', 'src/front/cobalt.css'],
             outdir: 'min/',
             minify: true,
-            loader: { '.js': 'js', '.css': 'css' }
+            loader: { '.js': 'js', '.css': 'css', },
+            charset: 'utf8'
         })
     } catch (e) {
         return;

src/modules/emoji.js

@@ -33,8 +33,8 @@ let sizing = {
 }
 export default function(emoji, size, disablePadding) {
     if (!size) size = 22;
-    let padding = size !== 22 ? `margin-right:${sizing[size] ? sizing[size] : "0.4"}rem;` : ``;
+    let padding = size !== 22 ? `margin-right:${sizing[size] ? sizing[size] : "0.4"}rem;` : false;
     if (disablePadding) padding = 'margin-right:0!important;';
     if (!names[emoji]) emoji = "❓";
-    return `<img class="emoji" draggable=false height="${size}" width="${size}" style="${padding}" alt="${emoji}" src="emoji/${names[emoji]}.svg">`
+    return `<img class="emoji" draggable=false height="${size}" width="${size}" ${padding ? `style="${padding}"` : ''}alt="${emoji}" src="emoji/${names[emoji]}.svg">`
 }

src/modules/pageRender/findRendered.js

@@ -0,0 +1,11 @@
+import { languageList } from "../../localization/manager.js";
+
+export default function(lang, userAgent) {
+    let language = languageList.includes(lang) ? lang : "en";
+
+    let ua = userAgent.toLowerCase();
+    let platform = (ua.match("android") || ua.match("iphone os")) ? "mob" : "pc";
+    if (platform === "mob" && ua.match("iphone os")) platform = "ios";
+
+    return `/build/${platform}/${language}.html`;
+}

src/modules/pageRender/onDemand.js

@@ -1,6 +1,9 @@
 import changelogManager from "../changelog/changelogManager.js"
 
+let cache = {}
+
 export function changelogHistory() { // blockId 0
+    if (cache['0']) return cache['0'];
     let history = changelogManager("history");
     let render = ``;
     
@@ -9,5 +12,6 @@ export function changelogHistory() { // blockId 0
         let separator = (i !== 0 && i !== historyLen) ? '<div class="separator"></div>' : ''
         render += `${separator}${history[i]["banner"] ? `<div class="changelog-banner"><img class="changelog-img" src="${history[i]["banner"]}" onerror="this.style.display='none'"></img></div>` : ''}<div id="popup-desc" class="changelog-subtitle">${history[i]["title"]}</div><div id="popup-desc" class="desc-padding">${history[i]["content"]}</div>`
     }
+    cache['0'] = render;
     return render;
 }

src/modules/pageRender/page.js

@@ -33,6 +33,10 @@ export default function(obj) {
     let ua = obj.useragent.toLowerCase();
     let isIOS = ua.match("iphone os");
     let isMobile = ua.match("android") || ua.match("iphone os");
+
+    let platform = isMobile ? "m" : "p";
+    if (isMobile && isIOS) platform = "i";
+
     audioFormats[0]["text"] = t('SettingsAudioFormatBest');
 
     try {
@@ -186,7 +190,7 @@ export default function(obj) {
             closeAria: t('AccessibilityClosePopup'),
             header: {
                 aboveTitle: {
-                    text: `v.${version}-${obj.hash} (${obj.branch})`,
+                    text: `v.${version}-${obj.hash}${platform} (${obj.branch})`,
                     url: `${repo}/commit/${obj.hash}`
                 },
                 title: `${emoji("⚙️", 30)} ${t('TitlePopupSettings')}`

src/modules/sub/utils.js

@@ -108,7 +108,7 @@ export function checkJSONPost(obj) {
     }
     try {
         let objKeys = Object.keys(obj);
-        if (!(objKeys.length <= 8 && obj.url)) return false;
+        if (!(objKeys.length <= 9 && obj.url)) return false;
         let defKeys = Object.keys(def);
 
         for (let i in objKeys) {