implemented esbuild and cleaned up stuff

cobalt should now load even faster

.gitignore

@@ -1,3 +1,9 @@
+# npm
 node_modules
 package-lock.json
+
+# secrets
 .env
+
+# esbuild
+min

README.md

@@ -20,7 +20,7 @@ cobalt doesn't remux any videos, so you get videos of max quality available (unl
 - [ ] Instagram support
 - [ ] Quality switching for bilibili and Twitter
 - [ ] Language picker in settings
-- [ ] Use esmbuild to minify frontend css and js
+- [ ] Make cobalt fully PWA compatible (add a service worker)
 - [ ] Make switch buttons in settings selectable with keyboard
 - [ ] Remake page rendering module to be more versatile
 - [ ] Matching could be redone, I'll see what I can do

package.json

@@ -1,7 +1,7 @@
 {
     "name": "cobalt",
     "description": "probably the friendliest social media downloader yet",
-    "version": "2.2.6",
+    "version": "2.2.7",
     "author": "wukko",
     "exports": "./src/cobalt.js",
     "type": "module",
@@ -24,6 +24,7 @@
     "dependencies": {
         "cors": "^2.8.5",
         "dotenv": "^16.0.1",
+        "esbuild": "^0.14.51",
         "express": "^4.17.1",
         "express-rate-limit": "^6.3.0",
         "ffmpeg-static": "^5.0.0",

src/cobalt.js

@@ -13,6 +13,7 @@ import { apiJSON, languageCode } from "./modules/sub/utils.js";
 import { Bright, Cyan } from "./modules/sub/consoleText.js";
 import stream from "./modules/stream/stream.js";
 import loc from "./localization/manager.js";
+import { buildFront } from "./modules/build.js";
 
 const commitHash = shortCommit();
 const app = express();
@@ -39,9 +40,11 @@ if (fs.existsSync('./.env')) {
         }
     })
 
+    await buildFront();
     app.use('/api/', apiLimiter);
     app.use('/api/stream', apiLimiterStream);
-    app.use('/', express.static('./src/static'));
+    app.use('/', express.static('./min'));
+    app.use('/', express.static('./src/front'));
 
     app.use((req, res, next) => {
         try {

src/front/fonts/notosansmono.css

@@ -0,0 +1 @@
+@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_DdVXQQ.woff2') format('woff2');unicode-range:U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_ndVXQQ.woff2') format('woff2');unicode-range:U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_HdVXQQ.woff2') format('woff2');unicode-range:U+1F00-1FFF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_7dVXQQ.woff2') format('woff2');unicode-range:U+0370-03FF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_LdVXQQ.woff2') format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_PdVXQQ.woff2') format('woff2');unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('files/notosansmono_3dVQ.woff2') format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD}

src/front/manifest.webmanifest

@@ -0,0 +1 @@
+{"name":"cobalt","short_name":"cobalt","start_url":"/","icons":[{"src":"/icons/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/icons/android-chrome-512x512.png","sizes":"512x512","type":"image/png"},{"src":"/icons/generic.png","sizes":"512x512","type":"image/png","purpose":"any"},{"src":"/icons/maskable/x48.png","sizes":"48x48","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x72.png","sizes":"72x72","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x96.png","sizes":"96x96","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x128.png","sizes":"128x128","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x192.png","sizes":"192x192","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x384.png","sizes":"384x384","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"},{"src":"/icons/maskable/x1280.png","sizes":"1280x1280","type":"image/png","purpose":"maskable"}],"theme_color":"#000000","background_color":"#000000","display":"standalone"}

src/modules/build.js

@@ -0,0 +1,14 @@
+import * as esbuild from "esbuild";
+
+export async function buildFront() {
+    try {
+        await esbuild.build({
+            entryPoints: ['src/front/cobalt.js', 'src/front/cobalt.css'],
+            outdir: `min/`,
+            minify: true,
+            loader: {".js": "js", ".css": "css"}
+        })
+    } catch (e) {
+        return;
+    }
+}

src/modules/pageRender.js

@@ -46,9 +46,9 @@ export default function(obj) {
         <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
         <link rel="apple-touch-icon" sizes="180x180" href="icons/apple-touch-icon.png" />
 
-        <link rel="manifest" href="cobalt.webmanifest" />
+        <link rel="manifest" href="manifest.webmanifest" />
         <link rel="stylesheet" href="cobalt.css" />
-        <link rel="stylesheet" href="fonts/notosansmono/notosansmono.css" />
+        <link rel="stylesheet" href="fonts/notosansmono.css" />
 
         <noscript><div style="margin: 2rem;">${loc(obj.lang, 'NoScriptMessage')}</div></noscript>
     </head>

src/static/cobalt.webmanifest

@@ -1,64 +0,0 @@
-{
-    "name": "cobalt",
-    "short_name": "cobalt",
-    "start_url": "/",
-    "icons": [
-        {
-            "src": "/icons/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        }, {
-            "src": "/icons/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }, {
-            "src": "/icons/generic.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "any"
-        }, {
-            "src": "/icons/maskable/x48.png",
-            "sizes": "48x48",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x72.png",
-            "sizes": "72x72",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x96.png",
-            "sizes": "96x96",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x128.png",
-            "sizes": "128x128",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x384.png",
-            "sizes": "384x384",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }, {
-            "src": "/icons/maskable/x1280.png",
-            "sizes": "1280x1280",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ],
-    "theme_color": "#000000",
-    "background_color": "#000000",
-    "display": "standalone"
-}

src/static/fonts/notosansmono/notosansmono.css

@@ -1 +0,0 @@
-@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_DdVXQQ.woff2') format('woff2');unicode-range:U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_ndVXQQ.woff2') format('woff2');unicode-range:U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_HdVXQQ.woff2') format('woff2');unicode-range:U+1F00-1FFF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_7dVXQQ.woff2') format('woff2');unicode-range:U+0370-03FF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_LdVXQQ.woff2') format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_PdVXQQ.woff2') format('woff2');unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF}@font-face{font-family:'Noto Sans Mono';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url('notosansmono_3dVQ.woff2') format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD}