@necrolab/dashboard 0.4.61 → 0.4.208

package/src/stores/connection.js

@@ -2,16 +2,13 @@ import { useUIStore } from "@/stores/ui";
 import WebsocketHeartbeatJs from "websocket-heartbeat-js";
 import { decode } from "@msgpack/msgpack";
 import router from "@/router/index";
-import { sortTaskIds } from "@/stores/utils";
 
 export class ConnectionHandler {
     handleWebsocketMessages(msg) {
         switch (msg.event) {
             case "startup":
-                if (msg.done) {
-                    this.ui.hideSpinner();
-                    this.ui.setBotVersion(msg.version || "-");
-                } else this.ui.startSpinner(msg.message || "Starting Bot");
+                if (msg.done) this.ui.hideSpinner();
+                else this.ui.startSpinner(msg.message || "Starting Bot");
                 break;
 
             case "stop-all":
@@ -35,15 +32,10 @@ export class ConnectionHandler {
                 break;
 
             case "init-tasks":
-                var oldOrder = [...this.ui.taskIdOrder];
                 this.ui.tasks = msg.tasks;
-                var newIds = Object.keys(msg.tasks);
-
-                var existingIds = oldOrder.filter((id) => newIds.includes(id));
-                var missingTaskIds = newIds.filter((id) => !oldOrder.includes(id));
-                missingTaskIds.sort(sortTaskIds);
-
-                this.ui.taskIdOrder = [...existingIds, ...missingTaskIds];
+                for (const value of Object.values(msg.tasks)) {
+                    if (!this.ui.taskIdOrder.includes(value.taskId)) this.ui.taskIdOrder.push(value.taskId);
+                }
                 this.ui.refreshQueueStats();
                 this.ui.hideSpinner();
                 break;
@@ -70,42 +62,19 @@ export class ConnectionHandler {
 
             case "add-task":
                 this.ui.tasks[msg.task.taskId] = msg.task;
-
-                if (!this.ui.taskIdOrder.includes(msg.task.taskId)) {
-                    let pos = this.ui.taskIdOrder.length;
-                    for (let i = 0; i < this.ui.taskIdOrder.length; i++) {
-                        if (sortTaskIds(msg.task.taskId, this.ui.taskIdOrder[i]) < 0) {
-                            pos = i;
-                            break;
-                        }
-                    }
-                    this.ui.taskIdOrder.splice(pos, 0, msg.task.taskId);
-                }
-
+                if (!this.ui.taskIdOrder.includes(msg.task.taskId)) this.ui.taskIdOrder.push(msg.task.taskId);
                 this.ui.toggleSort();
                 this.ui.showSuccess("Created 1 task!");
                 this.ui.refreshQueueStats();
                 break;
 
             case "add-tasks":
-                var batchTaskIds = Object.keys(msg.tasks).sort(sortTaskIds);
-
-                for (const id of batchTaskIds) {
-                    const value = msg.tasks[id];
-                    this.ui.tasks[id] = value;
-
-                    if (!this.ui.taskIdOrder.includes(id)) {
-                        let pos = this.ui.taskIdOrder.length;
-                        for (let i = 0; i < this.ui.taskIdOrder.length; i++) {
-                            if (sortTaskIds(id, this.ui.taskIdOrder[i]) < 0) {
-                                pos = i;
-                                break;
-                            }
-                        }
-                        this.ui.taskIdOrder.splice(pos, 0, id);
-                    }
+                for (const value of Object.values(msg.tasks)) {
+                    if (!this.ui.taskIdOrder.includes(value.taskId)) this.ui.taskIdOrder.push(value.taskId);
+                    this.ui.tasks[value.taskId] = value;
                 }
-                this.ui.showSuccess(`Created ${batchTaskIds.length} tasks!`);
+                this.ui.showSuccess(`Created ${Object.entries(msg.tasks).length} tasks!`);
+                this.ui.toggleSort();
                 this.ui.refreshQueueStats();
                 break;
 
@@ -164,7 +133,7 @@ export class ConnectionHandler {
             }
 
             case "add-account": {
-                const exists = this.ui.accounts.findIndex((p) => p.id === msg.account.id);
+                const exists = this.ui.accounts.findIndex((p) => p._id === msg.account._id);
                 if (exists !== -1) {
                     Object.keys(msg.account).forEach((k) => (this.ui.accounts[exists][k] = msg.account[k]));
                 } else this.ui.accounts.push(msg.account);
@@ -172,7 +141,7 @@ export class ConnectionHandler {
             }
 
             case "add-profile": {
-                const exists = this.ui.profiles.findIndex((p) => p.id === msg.profile.id);
+                const exists = this.ui.profiles.findIndex((p) => p._id === msg.profile._id);
                 if (exists !== -1) {
                     Object.keys(msg.profile).forEach((k) => (this.ui.profiles[exists][k] = msg.profile[k]));
                 } else this.ui.profiles.push(msg.profile);
@@ -180,7 +149,7 @@ export class ConnectionHandler {
             }
 
             case "delete-profile":
-                this.ui.profiles = this.ui.profiles.filter((p) => p.id !== msg.profile.id);
+                this.ui.profiles = this.ui.profiles.filter((p) => p._id !== msg.profile._id);
                 break;
 
             default:
@@ -191,7 +160,7 @@ export class ConnectionHandler {
 
     sendMessage(msg) {
         try {
-            if (msg?.data) msg.data.module = this.ui.currentModule;
+            msg.module = this.ui.currentModule;
             this.socket.send(JSON.stringify(msg));
         } catch {
             this.ui.startSpinner("Reconnecting");
@@ -233,6 +202,7 @@ export class ConnectionHandler {
         // this.socket.addEventListener('message', );
     }
 
+    // tasks/continue: continue task manually
     sendContinueTask(taskId, continueType) {
         this.sendMessage({
             event: "tasks/continue",
@@ -243,6 +213,7 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/continue: continue task manually
     sendTasksChange(taskId) {
         this.sendMessage({
             event: "tasks/change",
@@ -252,6 +223,7 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/open: open browser
     sendTasksOpen(taskId) {
         this.sendMessage({
             event: "tasks/open",
@@ -261,6 +233,7 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/delete: delete task
     sendDeleteTask(taskId) {
         this.sendMessage({
             event: "tasks/delete",
@@ -270,13 +243,39 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/: get all tasks. Not used right now.
     sendGetTasks() {
         this.sendMessage({
-            event: "tasks/get",
+            event: "tasks/",
+            data: {}
+        });
+    }
+
+    // tasks/start-all
+    sendStartAllTasks() {
+        this.sendMessage({
+            event: "tasks/start-all",
+            data: {}
+        });
+    }
+
+    // tasks/stop-all
+    sendStopAllTasks() {
+        this.sendMessage({
+            event: "tasks/stop-all",
+            data: {}
+        });
+    }
+
+    // tasks/delete-all
+    sendDeleteAllTasks() {
+        this.sendMessage({
+            event: "tasks/delete-all",
             data: {}
         });
     }
 
+    // tasks/start
     sendStartTask(taskId) {
         this.sendMessage({
             event: "tasks/start",
@@ -286,6 +285,7 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/stop
     sendStopTask(taskId) {
         this.sendMessage({
             event: "tasks/stop",
@@ -295,6 +295,7 @@ export class ConnectionHandler {
         });
     }
 
+    // tasks/add
     sendAddTask(task) {
         this.sendMessage({
             event: "tasks/add",
@@ -325,6 +326,7 @@ export class ConnectionHandler {
         });
     }
 
+    // mass-edit-presale-code
     sendMassEditPresaleCode(eventId, presaleCode) {
         this.sendMessage({
             event: "mass-edit-presale-code",
@@ -336,6 +338,7 @@ export class ConnectionHandler {
         this.ui.showSuccess("Editing presale codes");
     }
 
+    // scrape-map
     sendScrapeMap(eventId) {
         this.sendMessage({
             event: "scrape-map",
@@ -347,13 +350,12 @@ export class ConnectionHandler {
         this.ui.showSuccess("Scraping map");
     }
 
-    sendCheckStock(eventId, presaleCode, eventDid, clOrigin) {
+    // check-stock
+    sendCheckStock(eventId, presaleCode) {
         this.sendMessage({
             event: "check-stock",
             data: {
                 eventId: eventId,
-                eventDid: eventDid,
-                clOrigin: clOrigin,
                 presaleCode: presaleCode,
                 siteId: this.ui.currentCountry.siteId
             }
@@ -380,7 +382,7 @@ export class ConnectionHandler {
     sendDeleteProfile(id) {
         this.sendMessage({
             event: "profiles/delete",
-            data: { id: id }
+            data: { _id: id }
         });
     }
 

package/src/stores/logger.js

@@ -18,6 +18,7 @@ const LOG_COLORS = {
     yellow: "color: #ffbb33; font-weight: bold", // Yellow
     reset: ""
 };
+
 class Logger {
     constructor() {
         this.ENABLED = true;
@@ -44,20 +45,11 @@ class Logger {
 
         args.unshift(timestamp);
 
-        // Format objects for console output
-        const formattedArgs = args.map((arg) => {
-            if (typeof arg === "object" && arg !== null) {
-                console.log(arg._value ? arg._value : arg);
-                return arg;
-            }
-            return arg;
-        });
-
         // For styled console output in browser
         if (style) {
-            console.log(`%c${formattedArgs.join(" ")}`, style);
+            console.log(`%c${args.join(" ")}`, style);
         } else {
-            console.log(...formattedArgs);
+            console.log(...args);
         }
     }