fix some bugs & chmod

package.json

@@ -1,9 +1,5 @@
 {
   "name": "@ragestudio/relic-core",
-  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
   "repository": "https://github.com/srgooglo/rs_bundler",
   "author": "SrGooglo <srgooglo@ragestudio.net>",
   "license": "MIT",

packages/core/package.json

@@ -1,43 +1,45 @@
 {
-  "name": "@ragestudio/relic-core",
-  "version": "0.17.4",
-  "license": "MIT",
-  "author": "RageStudio",
-  "description": "RageStudio Relic, yet another package manager.",
-  "main": "./dist/index.js",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "scripts": {
-    "build": "hermes build",
-    "build:swc": "npx swc ./src --out-dir ./dist --strip-leading-paths"
-  },
-  "dependencies": {
-    "@foxify/events": "^2.1.0",
-    "adm-zip": "^0.5.12",
-    "axios": "^1.6.8",
-    "checksum": "^1.0.0",
-    "cli-color": "^2.0.4",
-    "cli-progress": "^3.12.0",
-    "deep-object-diff": "^1.1.9",
-    "extends-classes": "^1.0.5",
-    "googleapis": "^134.0.0",
-    "human-format": "^1.2.0",
-    "merge-stream": "^2.0.0",
-    "module-alias": "^2.2.3",
-    "node-7z": "^3.0.0",
-    "open": "8.4.2",
-    "request": "^2.88.2",
-    "rimraf": "^5.0.5",
-    "signal-exit": "^4.1.0",
-    "unzipper": "^0.10.14",
-    "upath": "^2.0.1",
-    "uuid": "^9.0.1",
-    "winston": "^3.13.0"
-  },
-  "devDependencies": {
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.11"
-  }
+	"name": "@ragestudio/relic-core",
+	"version": "0.20.3",
+	"license": "MIT",
+	"author": "RageStudio",
+	"description": "RageStudio Relic, yet another package manager.",
+	"main": "./dist/index.js",
+	"files": [
+		"dist",
+		"src"
+	],
+	"scripts": {
+		"build": "hermes build",
+		"build:swc": "npx swc ./src --out-dir ./dist --strip-leading-paths"
+	},
+	"dependencies": {
+		"@foxify/events": "^2.1.0",
+		"adm-zip": "^0.5.12",
+		"aria2": "^4.1.2",
+		"axios": "^1.6.8",
+		"checksum": "^1.0.0",
+		"cli-color": "^2.0.4",
+		"cli-progress": "^3.12.0",
+		"deep-object-diff": "^1.1.9",
+		"extends-classes": "^1.0.5",
+		"googleapis": "^134.0.0",
+		"human-format": "^1.2.0",
+		"merge-stream": "^2.0.0",
+		"module-alias": "^2.2.3",
+		"node-7z": "^3.0.0",
+		"open": "8.4.2",
+		"request": "^2.88.2",
+		"rimraf": "^5.0.5",
+		"signal-exit": "^4.1.0",
+		"unzipper": "^0.10.14",
+		"upath": "^2.0.1",
+		"uuid": "^9.0.1",
+		"webtorrent": "^2.4.1",
+		"winston": "^3.13.0"
+	},
+	"devDependencies": {
+		"@swc/cli": "^0.3.12",
+		"@swc/core": "^1.4.11"
+	}
 }

packages/core/src/classes/ManifestAuthDB.js

@@ -33,4 +33,12 @@ export default class ManifestAuthService {
 
         return await db.data[pkg_id]
     }
+
+    static delete = async (pkg_id) => {
+        const db = await this.withDB()
+
+        return await db.update((data) => {
+            delete data[pkg_id]
+        })
+    }
 }

packages/core/src/classes/Settings.js

@@ -0,0 +1,57 @@
+import fs from "node:fs"
+import path from "node:path"
+import Vars from "../vars"
+
+const settingsPath = path.resolve(Vars.runtime_path, "settings.json")
+
+export default class Settings {
+    static filePath = settingsPath
+
+    static async initialize() {
+        if (!fs.existsSync(settingsPath)) {
+            await fs.promises.writeFile(settingsPath, "{}")
+        }
+    }
+
+    static async read() {
+        return JSON.parse(await fs.promises.readFile(settingsPath, "utf8"))
+    }
+
+    static async write(data) {
+        await fs.promises.writeFile(settingsPath, JSON.stringify(data, null, 2))
+    }
+
+    static async get(key) {
+        const data = await this.read()
+
+        if (key) {
+            return data[key]
+        }
+
+        return data
+    }
+
+    static async has(key) {
+        const data = await this.read()
+
+        return key in data
+    }
+
+    static async set(key, value) {
+        const data = await this.read()
+
+        data[key] = value
+
+        await this.write(data)
+    }
+
+    static async delete(key) {
+        const data = await this.read()
+
+        delete data[key]
+
+        await this.write(data)
+
+        return data
+    }
+}

packages/core/src/generic_steps/http.js

@@ -6,7 +6,7 @@ import downloadHttpFile from "../helpers/downloadHttpFile"
 import parseStringVars from "../utils/parseStringVars"
 import extractFile from "../utils/extractFile"
 
-export default async (pkg, step, logger) => {
+export default async (pkg, step, logger, abortController) => {
     if (!step.path) {
         step.path = `./${path.basename(step.url)}`
     }
@@ -28,13 +28,18 @@ export default async (pkg, step, logger) => {
 
     fs.mkdirSync(path.resolve(_path, ".."), { recursive: true })
 
-    await downloadHttpFile(step.url, _path, (progress) => {
-        global._relic_eventBus.emit(`pkg:update:state`, {
-            id: pkg.id,
-            use_id_only: true,
-            status_text: `Downloaded ${progress.transferredString} / ${progress.totalString} | ${progress.speedString}/s`,
-        })
-    })
+    await downloadHttpFile(
+        step.url,
+        _path,
+        (progress) => {
+            global._relic_eventBus.emit(`pkg:update:state`, {
+                id: pkg.id,
+                use_id_only: true,
+                status_text: `Downloaded ${progress.transferredString} / ${progress.totalString} | ${progress.speedString}/s`,
+            })
+        },
+        abortController
+    )
 
     logger.info(`Downloaded finished.`)
 

packages/core/src/generic_steps/index.js

@@ -4,22 +4,25 @@ import ISM_GIT_CLONE from "./git_clone"
 import ISM_GIT_PULL from "./git_pull"
 import ISM_GIT_RESET from "./git_reset"
 import ISM_HTTP from "./http"
+import ISM_TORRENT from "./torrent"
 
 const InstallationStepsMethods = {
     git_clone: ISM_GIT_CLONE,
     git_pull: ISM_GIT_PULL,
     git_reset: ISM_GIT_RESET,
     http_file: ISM_HTTP,
+    torrent: ISM_TORRENT,
 }
 
 const StepsOrders = [
     "git_clones",
     "git_pull",
     "git_reset",
+    "torrent",
     "http_file",
 ]
 
-export default async function processGenericSteps(pkg, steps, logger = Logger) {
+export default async function processGenericSteps(pkg, steps, logger = Logger, abortController) {
     logger.info(`Processing generic steps...`)
 
     if (!Array.isArray(steps)) {
@@ -37,11 +40,15 @@ export default async function processGenericSteps(pkg, steps, logger = Logger) {
     for await (let step of steps) {
         step.type = step.type.toLowerCase()
 
+        if (abortController?.signal?.aborted) {
+            return false
+        }
+
         if (!InstallationStepsMethods[step.type]) {
             throw new Error(`Unknown step: ${step.type}`)
         }
 
-        await InstallationStepsMethods[step.type](pkg, step, logger)
+        await InstallationStepsMethods[step.type](pkg, step, logger, abortController)
     }
 
     return pkg

packages/core/src/generic_steps/torrent.js

@@ -0,0 +1,48 @@
+import path from "node:path"
+import fs from "node:fs"
+
+import parseStringVars from "../utils/parseStringVars"
+import downloadTorrent from "../helpers/downloadTorrent"
+
+export default async (pkg, step, logger, abortController) => {
+    if (!step.magnet) {
+        throw new Error(`Magnet is required for torrent step`)
+    }
+
+    if (typeof step.path === "undefined") {
+        step.path = `.`
+    }
+
+    step.path = await parseStringVars(step.path, pkg)
+
+    let _path = path.resolve(pkg.install_path, step.path)
+
+    global._relic_eventBus.emit(`pkg:update:state`, {
+        id: pkg.id,
+        status_text: `Preparing torrent...`,
+    })
+
+    logger.info(`Preparing torrent with magnet => [${step.magnet}]`)
+
+    if (step.tmp) {
+        _path = path.resolve(os.tmpdir(), String(new Date().getTime()))
+    }
+
+    const parentDir = path.resolve(_path, "..")
+
+    if (!fs.existsSync(parentDir)) {
+        fs.mkdirSync(parentDir, { recursive: true })
+    }
+
+    await downloadTorrent(step.magnet, _path, {
+        onProgress: (progress) => {
+            global._relic_eventBus.emit(`pkg:update:state`, {
+                id: pkg.id,
+                use_id_only: true,
+                status_text: `Downloaded ${progress.transferredString} / ${progress.totalString} | ${progress.speedString}/s`,
+            })
+        },
+        taskId: pkg.id
+    })
+
+}

packages/core/src/handlers/cancelInstall.js

@@ -0,0 +1,44 @@
+import Logger from "../logger"
+
+import DB from "../db"
+
+import UninstallHandler from "./uninstall"
+
+const BaseLog = Logger.child({ service: "CANCEL_INSTALL" })
+
+export default async function reinstall(pkg_id) {
+    try {
+        const pkg = await DB.getPackages(pkg_id)
+
+        if (!pkg) {
+            BaseLog.info(`Package not found [${pkg_id}]`)
+            return null
+        }
+
+        global._relic_eventBus.emit(`pkg:install:cancel`, pkg_id)
+        global._relic_eventBus.emit(`pkg:install:cancel:${pkg_id}`, pkg_id)
+        global._relic_eventBus.emit(`task:cancel:${pkg_id}`, pkg_id)
+
+        const task = globalThis.relic_core.tasks.find((task) => task.id === pkg_id)
+
+        if (task) {
+            BaseLog.warn(`Task not found [${pkg_id}]`)
+            await task.abortController.abort()
+        }
+
+        await UninstallHandler(pkg_id)
+
+        return pkg
+    } catch (error) {
+        global._relic_eventBus.emit(`pkg:error`, {
+            event: "cancel_install",
+            id: pkg_id,
+            error
+        })
+
+        BaseLog.error(`Failed to cancel installation package [${pkg_id}]`, error)
+        BaseLog.error(error.stack)
+
+        return null
+    }
+}

packages/core/src/handlers/deauthorize.js

@@ -0,0 +1,28 @@
+import ManifestAuthDB from "../classes/ManifestAuthDB"
+import DB from "../db"
+
+import Logger from "../logger"
+
+const Log = Logger.child({ service: "AUTH" })
+
+export default async (pkg_id) => {
+    if (!pkg_id) {
+        Log.error("pkg_id is required")
+        return false
+    }
+
+    const pkg = await DB.getPackages(pkg_id)
+
+    if (!pkg) {
+        Log.error("Package not found")
+        return false
+    }
+
+    Log.info(`Deleting auth for [${pkg_id}]`)
+
+    await ManifestAuthDB.delete(pkg_id)
+
+    global._relic_eventBus.emit("pkg:deauthorized", pkg)
+
+    return true
+}

packages/core/src/handlers/execute.js

@@ -43,6 +43,8 @@ export default async function execute(pkg_id, { useRemote = false, force = false
             return false
         }
 
+        BaseLog.info(`Executing manifest > [${manifestPath}]`)
+
         global._relic_eventBus.emit(`pkg:update:state`, {
             id: pkg.id,
             last_status: "loading",

packages/core/src/handlers/install.js

@@ -10,8 +10,9 @@ import Apply from "../handlers/apply"
 
 const BaseLog = Logger.child({ service: "INSTALLER" })
 
-export default async function install(manifest) {
+export default async function install(manifest, options = {}) {
     let id = null
+    let abortController = new AbortController()
 
     try {
         BaseLog.info(`Invoking new installation...`)
@@ -23,10 +24,20 @@ export default async function install(manifest) {
 
         id = manifest.constructor.id
 
+        globalThis.relic_core.tasks.push({
+            type: "install",
+            id: id,
+            abortController: abortController,
+        })
+
         const Log = BaseLog.child({ service: `INSTALLER|${id}` })
 
         Log.info(`Creating install path [${manifest.install_path}]`)
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (fs.existsSync(manifest.install_path)) {
             Log.info(`Package already exists, removing...`)
             await fs.rmSync(manifest.install_path, { recursive: true })
@@ -36,12 +47,20 @@ export default async function install(manifest) {
 
         Log.info(`Initializing manifest...`)
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (typeof manifest.initialize === "function") {
             await manifest.initialize()
         }
 
         Log.info(`Appending to db...`)
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         let pkg = DB.defaultPackageState({
             ...manifest.constructor,
             id: id,
@@ -60,6 +79,10 @@ export default async function install(manifest) {
 
         global._relic_eventBus.emit("pkg:new", pkg)
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (manifest.configuration) {
             Log.info(`Applying default config to package...`)
 
@@ -70,6 +93,10 @@ export default async function install(manifest) {
             }, {})
         }
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (typeof manifest.beforeInstall === "function") {
             Log.info(`Executing beforeInstall hook...`)
 
@@ -81,7 +108,11 @@ export default async function install(manifest) {
             await manifest.beforeInstall(pkg)
         }
 
-        if (Array.isArray(manifest.installSteps)) {
+        if (abortController.signal.aborted) {
+            return false
+        }
+
+        if (Array.isArray(manifest.installSteps) && !options.noInstallSteps) {
             Log.info(`Executing generic install steps...`)
 
             global._relic_eventBus.emit(`pkg:update:state`, {
@@ -89,7 +120,11 @@ export default async function install(manifest) {
                 status_text: `Performing generic install steps...`,
             })
 
-            await GenericSteps(pkg, manifest.installSteps, Log)
+            await GenericSteps(pkg, manifest.installSteps, Log, abortController)
+        }
+
+        if (abortController.signal.aborted) {
+            return false
         }
 
         if (typeof manifest.afterInstall === "function") {
@@ -112,6 +147,10 @@ export default async function install(manifest) {
 
         const finalPath = `${manifest.install_path}/.rmanifest`
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (fs.existsSync(finalPath)) {
             await fs.promises.unlink(finalPath)
         }
@@ -129,6 +168,10 @@ export default async function install(manifest) {
 
         await DB.writePackage(pkg)
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         if (manifest.patches) {
             const defaultPatches = manifest.patches.filter((patch) => patch.default)
 
@@ -148,8 +191,14 @@ export default async function install(manifest) {
 
         pkg.last_status = "installed"
 
+        if (abortController.signal.aborted) {
+            return false
+        }
+
         await DB.writePackage(pkg)
 
+        globalThis.relic_core.tasks.filter((task) => task.id !== id)
+
         global._relic_eventBus.emit(`pkg:update:state`, {
             ...pkg,
             id: pkg.id,
@@ -175,6 +224,8 @@ export default async function install(manifest) {
             status_text: `Installation failed`,
         })
 
+        globalThis.relic_core.tasks.filter((task) => task.id !== id)
+
         BaseLog.error(`Error during installation of package [${id}] >`, error)
         BaseLog.error(error.stack)
 

packages/core/src/handlers/reinstall.js

@@ -0,0 +1,35 @@
+import Logger from "../logger"
+
+import DB from "../db"
+
+import UninstallHandler from "./uninstall"
+import InstallHandler from "./install"
+
+const BaseLog = Logger.child({ service: "REINSTALL" })
+
+export default async function reinstall(pkg_id) {
+    try {
+        const pkg = await DB.getPackages(pkg_id)
+
+        if (!pkg) {
+            BaseLog.info(`Package not found [${pkg_id}]`)
+            return null
+        }
+
+        await UninstallHandler(pkg_id)
+        await InstallHandler(pkg.remote_manifest)
+
+        return pkg
+    } catch (error) {
+        global._relic_eventBus.emit(`pkg:error`, {
+            event: "reinstall",
+            id: pkg_id,
+            error
+        })
+
+        BaseLog.error(`Failed to reinstall package [${pkg_id}]`, error)
+        BaseLog.error(error.stack)
+
+        return null
+    }
+}

packages/core/src/helpers/downloadHttpFile.js

@@ -9,7 +9,7 @@ function convertSize(size) {
     })}B`
 }
 
-export default async (url, destination, progressCallback) => {
+export default async (url, destination, progressCallback, abortController) => {
     const progressBar = new cliProgress.SingleBar({
         format: "[{bar}] {percentage}% | {total_formatted} | {speed}/s | {eta_formatted}",
         barCompleteChar: "\u2588",
@@ -19,6 +19,7 @@ export default async (url, destination, progressCallback) => {
 
     const { data: remoteStream, headers } = await axios.get(url, {
         responseType: "stream",
+        signal: abortController?.signal,
     })
 
     const localStream = fs.createWriteStream(destination)

packages/core/src/helpers/downloadTorrent.js

@@ -0,0 +1,140 @@
+import humanFormat from "human-format"
+import aria2 from "aria2"
+
+function convertSize(size) {
+    return `${humanFormat(size, {
+        decimals: 2,
+    })}B`
+}
+
+export default async function downloadTorrent(
+    magnet,
+    destination,
+    {
+        onStart,
+        onProgress,
+        onDone,
+        onError,
+        taskId,
+    } = {}
+) {
+    let progressInterval = null
+    let tickProgress = {
+        total: 0,
+        transferred: 0,
+        speed: 0,
+
+        totalString: "0B",
+        transferredString: "0B",
+        speedString: "0B/s",
+    }
+
+    const client = new aria2({
+        host: "localhost",
+        port: 6800,
+        secure: false,
+        secret: "",
+        path: "/jsonrpc"
+    })
+
+    await client.open()
+
+    let downloadId = await client.call(
+        "addUri",
+        [magnet],
+        {
+            dir: destination,
+        },
+    )
+
+    async function stopDownload() {
+        await client.call("remove", downloadId)
+        clearInterval(progressInterval)
+    }
+
+    await new Promise(async (resolve, reject) => {
+        if (typeof onStart === "function") {
+            onStart()
+        }
+
+        if (taskId) {
+            global._relic_eventBus.once(`task:cancel:${taskId}`, stopDownload)
+        }
+
+        progressInterval = setInterval(async () => {
+            const data = await client.call("tellStatus", downloadId)
+
+            console.log(data)
+
+            if (data.status === "complete") {
+                if (Array.isArray(data.followedBy) && data.followedBy[0]) {
+                    // replace downloadId
+                    downloadId = data.followedBy[0]
+                }
+            }
+
+            tickProgress.total = parseInt(data.totalLength)
+            tickProgress.speed = parseInt(data.downloadSpeed)
+            tickProgress.transferred = parseInt(data.completedLength)
+            tickProgress.connections = data.connections
+
+            tickProgress.transferredString = convertSize(tickProgress.transferred)
+            tickProgress.totalString = convertSize(tickProgress.total)
+            tickProgress.speedString = convertSize(tickProgress.speed)
+
+            if (typeof onProgress === "function") {
+                onProgress(tickProgress)
+            }
+        }, 1000)
+
+        client.on("onDownloadStart", async ([{ gid }]) => {
+            const data = await client.call("tellStatus", gid)
+
+            console.log(data)
+
+            if (typeof data.following !== "undefined") {
+                if (data.following === downloadId) {
+                    downloadId = data.gid
+                }
+            }
+        })
+
+        client.on("onBtDownloadComplete", ([{ gid }]) => {
+            if (gid !== downloadId) {
+                return false
+            }
+
+            if (typeof onDone === "function") {
+                onDone()
+            }
+
+            stopDownload()
+
+            return resolve({
+                downloadId,
+            })
+        })
+
+        client.on("onDownloadError", ([{ gid }]) => {
+            if (gid !== downloadId) {
+                return false
+            }
+
+            stopDownload()
+
+            if (typeof onError === "function") {
+                onError()
+            }
+
+            return reject()
+        })
+    })
+
+    await client.call("remove", downloadId)
+
+    if (taskId) {
+        global._relic_eventBus.off(`task:cancel:${taskId}`, stopDownload)
+    }
+
+    return downloadId
+}

packages/core/src/helpers/setup.js

@@ -69,7 +69,7 @@ export default async () => {
                 await fs.promises.mkdir(path.resolve(Vars.binaries_path, prerequisite.id), { recursive: true })
 
                 if (typeof prerequisite.url === "function") {
-                    prerequisite.url = await prerequisite.url(resolveOs(), os.arch())
+                    prerequisite.url = await prerequisite.url(os.platform(), os.arch())
                     Log.info(`Resolved url: ${prerequisite.url}`)
                 }
 

packages/core/src/index.js

@@ -4,67 +4,113 @@ import { onExit } from "signal-exit"
 import open from "open"
 
 import SetupHelper from "./helpers/setup"
+import { execa } from "./libraries/execa"
 import Logger from "./logger"
 
+import Settings from "./classes/Settings"
 import Vars from "./vars"
 import DB from "./db"
 
 import PackageInstall from "./handlers/install"
 import PackageExecute from "./handlers/execute"
 import PackageUninstall from "./handlers/uninstall"
+import PackageReinstall from "./handlers/reinstall"
+import PackageCancelInstall from "./handlers/cancelInstall"
 import PackageUpdate from "./handlers/update"
 import PackageApply from "./handlers/apply"
 import PackageList from "./handlers/list"
 import PackageRead from "./handlers/read"
 import PackageAuthorize from "./handlers/authorize"
+import PackageDeauthorize from "./handlers/deauthorize"
 import PackageCheckUpdate from "./handlers/checkUpdate"
 import PackageLastOperationRetry from "./handlers/lastOperationRetry"
 
 export default class RelicCore {
-    constructor(params) {
-        this.params = params
-    }
+	constructor(params) {
+		this.params = params
+	}
 
-    eventBus = global._relic_eventBus = new EventEmitter()
+	eventBus = (global._relic_eventBus = new EventEmitter())
 
-    logger = Logger
+	logger = Logger
 
-    db = DB
+	db = DB
 
-    async initialize() {
-        await DB.initialize()
+	async initialize() {
+		globalThis.relic_core = {
+			tasks: [],
+			vars: Vars,
+		}
 
-        onExit(this.onExit)
-    }
+		console.log(`Checking runtime_path >`, Vars.runtime_path)
 
-    onExit = () => {
-        if (fs.existsSync(Vars.cache_path)) {
-            fs.rmSync(Vars.cache_path, { recursive: true, force: true })
-        }
-    }
+		if (!fs.existsSync(Vars.runtime_path)) {
+			fs.mkdirSync(Vars.runtime_path, { recursive: true })
+		}
 
-    async setup() {
-        return await SetupHelper()
-    }
+		await DB.initialize()
 
-    package = {
-        install: PackageInstall,
-        execute: PackageExecute,
-        uninstall: PackageUninstall,
-        update: PackageUpdate,
-        apply: PackageApply,
-        list: PackageList,
-        read: PackageRead,
-        authorize: PackageAuthorize,
-        checkUpdate: PackageCheckUpdate,
-        lastOperationRetry: PackageLastOperationRetry,
-    }
+		await Settings.initialize()
 
-    openPath(pkg_id) {
-        if (!pkg_id) {
-            return open(Vars.runtime_path)
-        }
+		if (!(await Settings.get("packages_path"))) {
+			await Settings.set("packages_path", Vars.packages_path)
+		}
 
-        return open(Vars.packages_path + "/" + pkg_id)
-    }
+		this.aria2c_instance = execa(
+			Vars.aria2_bin,
+			[
+				"--enable-rpc",
+				"--rpc-listen-all=true",
+				"--rpc-allow-origin-all",
+				"--file-allocation=none",
+			],
+			{
+				stdout: "inherit",
+				stderr: "inherit",
+			},
+		)
+
+		onExit(this.onExit)
+	}
+
+	onExit = () => {
+		if (fs.existsSync(Vars.cache_path)) {
+			fs.rmSync(Vars.cache_path, { recursive: true, force: true })
+		}
+
+		if (this.aria2c_instance) {
+			this.aria2c_instance.kill("SIGINT")
+		}
+	}
+
+	async setup() {
+		return await SetupHelper()
+	}
+
+	package = {
+		install: PackageInstall,
+		execute: PackageExecute,
+		uninstall: PackageUninstall,
+		reinstall: PackageReinstall,
+		cancelInstall: PackageCancelInstall,
+		update: PackageUpdate,
+		apply: PackageApply,
+		list: PackageList,
+		read: PackageRead,
+		authorize: PackageAuthorize,
+		deauthorize: PackageDeauthorize,
+		checkUpdate: PackageCheckUpdate,
+		lastOperationRetry: PackageLastOperationRetry,
+	}
+
+	async openPath(pkg_id) {
+		if (!pkg_id) {
+			return open(Vars.runtime_path)
+		}
+
+		const packagesPath =
+			(await Settings.get("packages_path")) ?? Vars.packages_path
+
+		return open(packagesPath + "/" + pkg_id)
+	}
 }

packages/core/src/manifest/libs/auth/index.js

@@ -1,6 +1,7 @@
 import open from "open"
 import axios from "axios"
 import ManifestAuthDB from "../../../classes/ManifestAuthDB"
+import UnauthorizeMethod from "../../../handlers/deauthorize"
 
 export default class Auth {
     constructor(ctx) {
@@ -16,17 +17,23 @@ export default class Auth {
             }
 
             const result = await axios({
-                method: "POST",
+                method: "GET",
                 url: this.manifest.authService.getter,
                 headers: {
                     "Content-Type": "application/json",
-                },
-                data: {
-                    auth_data: storagedData,
+                    "Authorization": `Bearer ${storagedData}`
                 }
             }).catch((err) => {
                 global._relic_eventBus.emit("auth:getter:error", err)
 
+                try {
+                    UnauthorizeMethod(this.manifest.id).then(() => {
+                        this.request()
+                    })
+                } catch (error) {
+                    console.error(error)
+                }
+
                 return err
             })
 

packages/core/src/manifest/libs/extract/index.js

@@ -0,0 +1,34 @@
+import extractFile from "../../../utils/extractFile"
+import { execa } from "../../../libraries/execa"
+import Vars from "../../../vars"
+
+export default class Extract {
+    async extractFull(file, dest, { password } = {}) {
+        const args = [
+            "x",
+            "-y",
+        ]
+
+        if (password) {
+            args.push(`-p"${password}"`)
+        }
+
+        args.push(`-o"${dest}"`)
+
+        args.push(`"${file}"`)
+
+        const cmd = `${Vars.sevenzip_bin} ${args.join(" ")}`
+
+        console.log(cmd)
+
+        await execa(cmd, {
+            shell: true,
+            stdout: "inherit",
+            stderr: "inherit",
+        })
+    }
+
+    async autoExtract(file, dest) {
+        return await extractFile(file, dest)
+    }
+}

packages/core/src/manifest/libs/fs/index.js

@@ -16,7 +16,7 @@ export default class SecureFileSystem {
     readFileSync(destination, options) {
         this.checkOutsideJail(destination)
 
-        return fs.readFileSync(finalPath, options)
+        return fs.readFileSync(destination, options)
     }
 
     copyFileSync(from, to) {
@@ -29,11 +29,43 @@ export default class SecureFileSystem {
     writeFileSync(destination, data, options) {
         this.checkOutsideJail(destination)
 
-        return fs.writeFileSync(finalPath, data, options)
+        return fs.writeFileSync(destination, data, options)
     }
 
     // don't need to check finalPath
     existsSync(...args) {
         return fs.existsSync(...args)
     }
+
+    async rename(from, to) {
+        this.checkOutsideJail(from)
+        this.checkOutsideJail(to)
+
+        return await fs.promises.rename(from, to)
+    }
+
+    async writeFile(path, data, options) {
+        this.checkOutsideJail(path)
+        return await fs.promises.writeFile(path, data, options)
+    }
+
+    async readDir(path) {
+        this.checkOutsideJail(path)
+        return await fs.promises.readdir(path)
+    }
+
+    async rm(path, options) {
+        this.checkOutsideJail(path)
+        return await fs.promises.rm(path, options)
+    }
+
+    async mkdir(path, options) {
+        this.checkOutsideJail(path)
+        return await fs.promises.mkdir(path, options)
+    }
+
+    async stat(path) {
+        this.checkOutsideJail(path)
+        return await fs.promises.stat(path)
+    }
 }

packages/core/src/manifest/libs/index.js

@@ -2,6 +2,7 @@ import Open from "./open"
 import Path from "./path"
 import Fs from "./fs"
 import Auth from "./auth"
+import Extract from "./extract"
 
 // Third party libraries
 import Mcl from "./mcl"
@@ -11,5 +12,6 @@ export default {
     path: Path,
     open: Open,
     auth: Auth,
-    mcl: Mcl
+    extract: Extract,
+    mcl: Mcl,
 }

packages/core/src/manifest/libs/mcl/authenticator.js

@@ -1,5 +1,5 @@
-const request = require('request')
-const { v3 } = require('uuid')
+import request from "request"
+import {v3} from "uuid"
 
 let uuid
 let api_url = 'https://authserver.mojang.com'

packages/core/src/manifest/libs/mcl/handler.js

@@ -1,9 +1,9 @@
-const fs = require('fs')
-const path = require('path')
-const request = require('request')
-const checksum = require('checksum')
-const Zip = require('adm-zip')
-const child = require('child_process')
+import fs from "node:fs"
+import path from "node:path"
+import child from "node:child_process"
+import request from "request"
+import checksum from "checksum"
+import Zip from "adm-zip"
 let counter = 0
 
 export default class Handler {

packages/core/src/manifest/libs/open/index.js

@@ -6,8 +6,7 @@ const Log = Logger.child({ service: "OPEN-LIB" })
 
 export default {
     spawn: async (...args) => {
-        Log.info("Open spawned with args >")
-        console.log(...args)
+        Log.info("Spawning with args >", args)
 
         return await open(...args)
     },

packages/core/src/manifest/vm.js

@@ -3,16 +3,32 @@ import Logger from "../logger"
 import os from "node:os"
 import vm from "node:vm"
 import path from "node:path"
+
+import DB from "../db"
 import ManifestConfigManager from "../classes/ManifestConfig"
 
 import resolveOs from "../utils/resolveOs"
 import FetchLibraries from "./libraries"
 
+import Settings from "../classes/Settings"
+
 import Vars from "../vars"
 
 async function BuildManifest(baseClass, context, { soft = false } = {}) {
-    // inject install_path
-    context.install_path = path.resolve(Vars.packages_path, baseClass.id)
+    // try to find install_path on db
+    const pkg = await DB.getPackages(baseClass.id)
+
+    if (pkg) {
+        if (pkg.install_path) {
+            context.install_path = pkg.install_path
+        }
+    } else {
+        const packagesPath = await Settings.get("packages_path") ?? Vars.packages_path
+
+        // inject install_path
+        context.install_path = path.resolve(packagesPath, baseClass.id)
+    }
+
     baseClass.install_path = context.install_path
 
     if (soft === true) {

packages/core/src/prerequisites.js

@@ -9,9 +9,11 @@ export default [
     {
         id: "7z-bin",
         finalBin: Vars.sevenzip_bin,
-        url: resolveRemoteBinPath(`${baseURL}/7zip-bin`, process.platform === "win32" ? "7za.exe" : "7za"),
-        destination: Vars.sevenzip_bin,
+        url: resolveRemoteBinPath(`${baseURL}/7z-full`, "7z.zip"),
+        destination: path.resolve(Vars.binaries_path, "7z.zip"),
+        extract: path.resolve(Vars.binaries_path, "7z-bin"),
         rewriteExecutionPermission: true,
+        deleteBeforeExtract: true,
     },
     {
         id: "git-bin",
@@ -24,14 +26,13 @@ export default [
         deleteBeforeExtract: true,
     },
     {
-        id: "rclone-bin",
-        finalBin: Vars.rclone_bin,
-        url: resolveRemoteBinPath(`${baseURL}/rclone`, "rclone-bin.zip"),
-        destination: path.resolve(Vars.binaries_path, "rclone-bin.zip"),
-        extract: path.resolve(Vars.binaries_path, "rclone-bin"),
-        requireOs: ["win32"],
-        rewriteExecutionPermission: true,
-        deleteBeforeExtract: true,
+        id: "aria2",
+        finalBin: Vars.aria2_bin,
+        url: async (os, arch) => {
+            return `https://storage.ragestudio.net/rstudio/binaries/aria2/${os}/${arch}/${os === "win32" ? "aria2c.exe" : "aria2c"}`
+        },
+        destination: Vars.aria2_bin,
+        rewriteExecutionPermission: Vars.aria2_bin,
     },
     {
         id: "java22_jre_bin",
@@ -43,7 +44,7 @@ export default [
                 params: {
                     arch: arch,
                     java_version: "22",
-                    os: os,
+                    os: os === "win32" ? "windows" : os,
                     archive_type: "zip",
                     javafx_bundled: "false",
                     java_package_type: "jre",
@@ -77,7 +78,7 @@ export default [
                 params: {
                     arch: arch,
                     java_version: "17",
-                    os: os,
+                    os: os === "win32" ? "windows" : os,
                     archive_type: "zip",
                     javafx_bundled: "false",
                     java_package_type: "jre",

packages/core/src/utils/resolveRemoteBinPath.js

@@ -2,10 +2,10 @@ export default (pre, post) => {
     let url = null
 
     if (process.platform === "darwin") {
-        url = `${pre}/mac/${process.arch}/${post}`
+        url = `${pre}/darwin/${process.arch}/${post}`
     }
     else if (process.platform === "win32") {
-        url = `${pre}/win/${process.arch}/${post}`
+        url = `${pre}/win32/${process.arch}/${post}`
     }
     else {
         url = `${pre}/linux/${process.arch}/${post}`

packages/core/src/utils/resolveUserDataPath.js

@@ -0,0 +1,9 @@
+import path from "node:path"
+import upath from "upath"
+
+export default () => {
+    return upath.normalizeSafe(path.resolve(
+        process.env.APPDATA ||
+        (process.platform == "darwin" ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"),
+    ))
+}

packages/core/src/vars.js

@@ -1,36 +1,67 @@
 import path from "node:path"
 import upath from "upath"
+import resolveUserDataPath from "./utils/resolveUserDataPath"
 
-const isWin = process.platform.includes("win")
+const isWin = process.platform.includes("win32")
 const isMac = process.platform.includes("darwin")
 
 const runtimeName = "rs-relic"
 
-const userdata_path = upath.normalizeSafe(path.resolve(
-    process.env.APPDATA ||
-    (process.platform == "darwin" ? process.env.HOME + "/Library/Preferences" : process.env.HOME + "/.local/share"),
-))
+const userdata_path = resolveUserDataPath()
 const runtime_path = upath.normalizeSafe(path.join(userdata_path, runtimeName))
 const cache_path = upath.normalizeSafe(path.join(runtime_path, "cache"))
 const packages_path = upath.normalizeSafe(path.join(runtime_path, "packages"))
-const binaries_path = upath.normalizeSafe(path.resolve(runtime_path, "binaries"))
+const binaries_path = upath.normalizeSafe(
+	path.resolve(runtime_path, "binaries"),
+)
 const db_path = upath.normalizeSafe(path.resolve(runtime_path, "db.json"))
 
 const binaries = {
-    sevenzip_bin: upath.normalizeSafe(path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7za")),
-    git_bin: upath.normalizeSafe(path.resolve(binaries_path, "git-bin", "bin", isWin ? "git.exe" : "git")),
-    rclone_bin: upath.normalizeSafe(path.resolve(binaries_path, "rclone-bin", isWin ? "rclone.exe" : "rclone")),
-    java22_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java22_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
-    java17_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java17_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
+	sevenzip_bin: upath.normalizeSafe(
+		path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7z"),
+	),
+	git_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"git-bin",
+			"bin",
+			isWin ? "git.exe" : "git",
+		),
+	),
+	aria2_bin: upath.normalizeSafe(
+		path.resolve(binaries_path, "aria2", isWin ? "aria2c.exe" : "aria2c"),
+	),
+	java22_jre_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"java22_jre_bin",
+			isMac
+				? "Contents/Home/bin/java"
+				: isWin
+					? "bin/java.exe"
+					: "bin/java",
+		),
+	),
+	java17_jre_bin: upath.normalizeSafe(
+		path.resolve(
+			binaries_path,
+			"java17_jre_bin",
+			isMac
+				? "Contents/Home/bin/java"
+				: isWin
+					? "bin/java.exe"
+					: "bin/java",
+		),
+	),
 }
 
 export default {
-    runtimeName,
-    db_path,
-    userdata_path,
-    runtime_path,
-    cache_path,
-    packages_path,
-    binaries_path,
-    ...binaries,
+	runtimeName,
+	db_path,
+	userdata_path,
+	runtime_path,
+	cache_path,
+	packages_path,
+	binaries_path,
+	...binaries,
 }

packages/gui/electron-builder.yml

@@ -26,10 +26,10 @@ dmg:
 linux:
   target:
     - AppImage
-    - snap
     - deb
-  maintainer: electronjs.org
+  maintainer: ragestudio.net
   category: Utility
+  icon: resources/icon.png
 appImage:
   artifactName: ${productName}-${version}.${ext}
 npmRebuild: false

packages/gui/package.json

@@ -1,55 +1,56 @@
 {
-  "name": "@ragestudio/relic-gui",
-  "version": "0.17.4",
-  "description": "RageStudio Relic, yet another package manager.",
-  "main": "./out/main/index.js",
-  "author": "RageStudio",
-  "license": "MIT",
-  "scripts": {
-    "start": "electron-vite preview",
-    "dev": "npm run build:core && electron-vite dev",
-    "build": "npm run build:core && electron-vite build",
-    "postinstall": "electron-builder install-app-deps",
-    "pack:win": "electron-builder --win --config",
-    "pack:mac": "electron-builder --mac --config",
-    "pack:linux": "electron-builder --linux --config",
-    "build:win": "npm run build && npm run pack:win",
-    "build:mac": "npm run build && npm run pack:mac",
-    "build:linux": "npm run build && npm run pack:linux",
-    "build:core": "cd ../core && npm run build:swc"
-  },
-  "dependencies": {
-    "@electron-toolkit/preload": "^2.0.0",
-    "@electron-toolkit/utils": "^2.0.0",
-    "@getstation/electron-google-oauth2": "^14.0.0",
-    "@imjs/electron-differential-updater": "^5.1.7",
-    "@loadable/component": "^5.16.3",
-    "@ragestudio/relic-core": "^0.17.0",
-    "antd": "^5.13.2",
-    "classnames": "^2.3.2",
-    "electron-differential-updater": "^4.3.2",
-    "electron-is-dev": "^2.0.0",
-    "electron-store": "^8.1.0",
-    "electron-updater": "^6.1.1",
-    "got": "11.8.3",
-    "human-format": "^1.2.0",
-    "protocol-registry": "^1.4.1",
-    "less": "^4.2.0",
-    "lodash": "^4.17.21",
-    "react-icons": "^4.11.0",
-    "react-motion": "0.5.2",
-    "react-router-dom": "6.6.2",
-    "react-spinners": "^0.13.8",
-    "react-spring": "^9.7.3"
-  },
-  "devDependencies": {
-    "@ragestudio/hermes": "^0.1.1",
-    "@vitejs/plugin-react": "^4.0.4",
-    "electron": "25.6.0",
-    "electron-builder": "24.6.3",
-    "electron-vite": "^2.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "vite": "^4.4.9"
-  }
+	"name": "relic-gui",
+	"version": "0.20.3",
+	"description": "RageStudio Relic, yet another package manager.",
+	"homepage": "https://relic.ragestudio.net",
+	"main": "./out/main/index.js",
+	"author": "RageStudio",
+	"license": "MIT",
+	"scripts": {
+		"start": "electron-vite preview",
+		"dev": "npm run build:core && electron-vite dev",
+		"build": "npm run build:core && electron-vite build",
+		"postinstall": "electron-builder install-app-deps",
+		"pack:win": "electron-builder --win --config",
+		"pack:mac": "electron-builder --mac --config",
+		"pack:linux": "electron-builder --linux --config",
+		"build:win": "npm run build && npm run pack:win",
+		"build:mac": "npm run build && npm run pack:mac",
+		"build:linux": "npm run build && npm run pack:linux",
+		"build:core": "cd ../core && npm run build:swc"
+	},
+	"dependencies": {
+		"@electron-toolkit/preload": "^2.0.0",
+		"@electron-toolkit/utils": "^2.0.0",
+		"@getstation/electron-google-oauth2": "^14.0.0",
+		"@imjs/electron-differential-updater": "^5.1.7",
+		"@loadable/component": "^5.16.3",
+		"@ragestudio/relic-core": "^0.20.3",
+		"antd": "^5.13.2",
+		"classnames": "^2.3.2",
+		"electron-differential-updater": "^4.3.2",
+		"electron-is-dev": "^2.0.0",
+		"electron-store": "^8.1.0",
+		"electron-updater": "^6.1.1",
+		"got": "11.8.3",
+		"human-format": "^1.2.0",
+		"protocol-registry": "^1.4.1",
+		"less": "^4.2.0",
+		"lodash": "^4.17.21",
+		"react-icons": "^4.11.0",
+		"react-motion": "0.5.2",
+		"react-router-dom": "6.6.2",
+		"react-spinners": "^0.13.8",
+		"react-spring": "^9.7.3"
+	},
+	"devDependencies": {
+		"@ragestudio/hermes": "^0.1.1",
+		"@vitejs/plugin-react": "^4.0.4",
+		"electron": "25.6.0",
+		"electron-builder": "24.6.3",
+		"electron-vite": "^2.1.0",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
+		"vite": "^4.4.9"
+	}
 }

packages/gui/src/main/classes/CoreAdapter.js

@@ -1,5 +1,6 @@
 import sendToRender from "../utils/sendToRender"
-import { ipcMain } from "electron"
+import { ipcMain, dialog } from "electron"
+import path from "node:path"
 
 export default class CoreAdapter {
     constructor(electronApp, RelicCore) {
@@ -44,6 +45,12 @@ export default class CoreAdapter {
         "pkg:uninstall": async (event, pkg_id) => {
             return await this.core.package.uninstall(pkg_id)
         },
+        "pkg:reinstall": async (event, pkg_id) => {
+            return await this.core.package.reinstall(pkg_id)
+        },
+        "pkg:cancel_install": async (event, pkg_id) => {
+            return await this.core.package.cancelInstall(pkg_id)
+        },
         "pkg:execute": async (event, pkg_id, { force = false } = {}) => {
             // check for updates first
             if (!force) {
@@ -65,9 +72,34 @@ export default class CoreAdapter {
         "pkg:cancel_current_operation": async (event, pkg_id) => {
             return await this.core.package.cancelCurrentOperation(pkg_id)
         },
+        "pkg:delete_auth": async (event, pkg_id) => {
+            return await this.core.package.deauthorize(pkg_id)
+        },
         "core:open-path": async (event, pkg_id) => {
             return await this.core.openPath(pkg_id)
         },
+        "core:change-packages-path": async (event) => {
+            const { canceled, filePaths } = await dialog.showOpenDialog(undefined, {
+                properties: ["openDirectory"]
+            })
+
+            if (canceled) {
+                return false
+            }
+
+            const targetPath = path.resolve(filePaths[0], "RelicPackages")
+
+            await global.Settings.set("packages_path", targetPath)
+
+            return targetPath
+        },
+        "core:set-default-packages-path": async (event) => {
+            const { packages_path } = globalThis.relic_core.vars
+
+            await global.Settings.set("packages_path", packages_path)
+
+            return packages_path
+        },
     }
 
     coreEvents = {
@@ -95,10 +127,24 @@ export default class CoreAdapter {
             sendToRender("app:setup", data)
         },
         "auth:getter:error": (err) => {
+            let str = "Failed to authorize"
+
+            if (err.response.data.message) {
+                str = err.response.data.message
+            }
+
+            if (err.response.data.error) {
+                str = err.response.data.error
+            }
+
+            if (str.message) {
+                str = str.message
+            }
+
             sendToRender(`new:notification`, {
                 type: "error",
                 message: "Failed to authorize",
-                description: err.response.data.message ?? err.response.data.error ?? err.message,
+                description: str,
                 duration: 10
             })
         },
@@ -109,6 +155,13 @@ export default class CoreAdapter {
                 description: `${pkg.name} has been authorized! You can start the package now.`,
             })
         },
+        "pkg:deauthorized": (pkg) => {
+            sendToRender(`new:notification`, {
+                type: "success",
+                message: "Package deauthorized",
+                description: `${pkg.name} has been deauthorized`,
+            })
+        },
         "pkg:error": (data) => {
             sendToRender(`new:notification`, {
                 type: "error",

packages/gui/src/main/index.js

@@ -1,20 +1,18 @@
-global.SettingsStore = new Store({
-	name: "settings",
-	watch: true,
-})
 import path from "node:path"
 
 import { app, shell, BrowserWindow, ipcMain } from "electron"
 import { electronApp, optimizer, is } from "@electron-toolkit/utils"
 import isDev from "electron-is-dev"
-import Store from "electron-store"
 
 let RelicCore = null
+let Settings = null
 
 if (isDev) {
-	RelicCore = require("../../../core").default
+	RelicCore = require("../../../core/dist").default
+	Settings = global.Settings = require("../../../core/dist/classes/Settings").default
 } else {
 	RelicCore = require("@ragestudio/relic-core").default
+	Settings = global.Settings = require("@ragestudio/relic-core/dist/classes/Settings").default
 }
 
 import CoreAdapter from "./classes/CoreAdapter"
@@ -84,17 +82,17 @@ class ElectronApp {
 				autoUpdater.quitAndInstall()
 			}, 3000)
 		},
-		"settings:get": (event, key) => {
-			return global.SettingsStore.get(key)
+		"settings:get": async (event, key) => {
+			return await Settings.get(key)
 		},
-		"settings:set": (event, key, value) => {
-			return global.SettingsStore.set(key, value)
+		"settings:set": async (event, key, value) => {
+			return await Settings.set(key, value)
 		},
-		"settings:delete": (event, key) => {
-			return global.SettingsStore.delete(key)
+		"settings:delete": async (event, key) => {
+			return await Settings.delete(key)
 		},
-		"settings:has": (event, key) => {
-			return global.SettingsStore.has(key)
+		"settings:has": async (event, key) => {
+			return await Settings.has(key)
 		},
 		"app:open-logs": async (event) => {
 			const loggerWindow = await this.logsViewer.createWindow()