Improved many things

Author: ManeraKai

src-tauri/docker_frontends/redis.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   redis:
-    image: docker.io/_/redis
+    image: redis
     restart: unless-stopped
     ports:
       - '6379:6379'

src-tauri/frontends.json

@@ -7,6 +7,9 @@
         "args": [
             "-p",
             "10041"
+        ],
+        "env": [
+            "LIBREDDIT_DEFAULT_USE_HLS=on"
         ]
     },
     "rimgo": {

src-tauri/tauri.conf.json

@@ -81,6 +81,11 @@
             "name": "chmod",
             "cmd": "chmod",
             "args": true
+          },
+          {
+            "name": "tar",
+            "cmd": "tar",
+            "args": true
           }
         ]
       },

src/index.js

@@ -17,7 +17,10 @@ let frontends_running = {};
     else if (platform == "win32") {
         await binary_frontends.run_caddy('windows')
     }
-    docker_frontends.run_frontend('redis')
+    if (isDockerInstalled == 'running'){
+        await docker_frontends.download_frontend('redis')
+        await docker_frontends.run_frontend('redis')
+    }
     for (const key in config) {
         if (
             !(platform == "linux" && config[key].command_linux)

src/services/binary_frontends.js

@@ -39,11 +39,7 @@ async function run_caddy(platform) {
 }
 
 async function run_frontend(name, command, args, env) {
-    if (platform == 'linux') {
-        const cmd = new shell.Command('chmod', ['u+x', command], { cwd: await path.appDataDir(), env: formatEnv(env) })
-        await cmd.spawn();
-    }
-    const cmd = new shell.Command(command, args, { cwd: await path.appDataDir(), env: formatEnv(env) })
+    const cmd = new shell.Command(command, args, { cwd: await path.join(await path.appDataDir(), name), env: formatEnv(env) })
     cmd.on('error', error => {
         console.error(`command error: "${error}"`)
         return 'downloaded'
@@ -54,24 +50,34 @@ async function run_frontend(name, command, args, env) {
 }
 
 async function download_frontend(name) {
-    const response = await http.fetch(`https://github.com/libredirect/frontends_binaries/raw/main/${name}/${name}_${platform}_x86_64`, {
-        method: 'GET',
-        timeout: 30,
-        responseType: http.ResponseType.Binary
-    });
-    await fs.writeBinaryFile(`${name}_${platform}_x86_64`, new Uint8Array(response.data), { dir: fs.BaseDirectory.AppData });
+    let filename
+    if (platform == 'linux') {
+        filename = `${name}_linux_x86_64.tar.gz`
+    } else if (platform == 'windows') {
+        filename = `${name}_windows_x86_64.zip`
+    }
+    const response = await http.fetch(
+        `https://github.com/libredirect/frontends_binaries/raw/main/binaries/${filename}`,
+        { method: 'GET', responseType: http.ResponseType.Binary }
+    );
+    await fs.writeBinaryFile(filename, new Uint8Array(response.data), { dir: fs.BaseDirectory.AppData });
+    if (platform == 'linux') {
+        const extract_cmd = new shell.Command('tar', ['-xzf', filename], { cwd: await path.appDataDir() })
+        await extract_cmd.spawn();
+        extract_cmd.on('close', async () => await fs.removeFile(filename, { dir: fs.BaseDirectory.AppData }));
+    }
     return 'downloaded'
 }
 
 async function check_downloaded(name) {
-    if (await fs.exists(`${name}_${platform}_x86_64`, { dir: fs.BaseDirectory.AppData })) {
+    if (await fs.exists(`${name}`, { dir: fs.BaseDirectory.AppData })) {
         return 'downloaded'
     } else {
         return 'not_downloaded'
     }
 }
 async function remove_frontend(name) {
-    await fs.removeFile(`${name}_${platform}_x86_64`, { dir: fs.BaseDirectory.AppData })
+    await fs.removeDir(name, { dir: fs.BaseDirectory.AppData, recursive: true })
     return 'not_downloaded'
 }