@necrolab/dashboard 0.4.216 → 0.4.218

package/.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+    "recommendations": ["Vue.volar"]
 }

package/backend/api.js

@@ -1,7 +1,6 @@
 const enableWs = require("express-ws");
 const express = require("express");
 const cors = require("cors");
-const uuid = require("uuid").v4;
 const cookieParser = require("cookie-parser");
 const { encode } = require("@msgpack/msgpack");
 const fs = require("node:fs");
@@ -119,7 +118,7 @@ app.ws("/api/updates", async function (ws, req) {
     }
 
     try {
-        const id = uuid();
+        const id = utils.uuid();
 
         logger.Info(`New websocket connected: ${id}`);
         // Add client to array
@@ -161,7 +160,7 @@ app.ws("/api/updates", async function (ws, req) {
             for (let c = 0; c < Bot.ConsoleBuffer.length; c++) {
                 pushWSUpdate({
                     type: "console",
-                    log: Bot.ConsoleBuffer[c]
+                    ...Bot.ConsoleBuffer[c]
                 });
             }
         }
@@ -292,25 +291,6 @@ app.get("/api/tasks", async (req, res) => {
     return res.send(await endpoints.getTasks());
 });
 
-// Start all
-app.post("/api/tasks/start-all", async (req, res) => {
-    const r = await endpoints.startAllTasks();
-    if (r.error) return res.send(r);
-    else closeTab(res);
-});
-
-// Stop all
-app.post("/api/tasks/stop-all", async (req, res) => {
-    const r = await endpoints.stopAllTasks();
-    if (r.error) return res.send(r);
-    else closeTab(res);
-});
-
-app.post("/api/tasks/delete-all", async (req, res) => {
-    await endpoints.deleteAllTasks();
-    closeTab(res);
-});
-
 app.get("/api/tasks/load-presale", async (req, res) => {
     await endpoints.deleteAllTasks();
     closeTab(res);
@@ -401,14 +381,14 @@ app.get("/api/quickconfig", async (req, res) => {
     return res.json({
         keys: {
             Captcha: {
-                CapMonster: "fe9f920acc58e0296b84d07f46822a",
-                CapSolver: "CAP-E9A981297E6D56CC32896AF38C3A0",
-                Invizible: "35c3aea4-5d01-4fde-b2-d69568f637d2",
-                TwoCaptcha: "8cf8f62b11f7382132f6fdc624c2"
+                CapMonster: "example",
+                CapSolver: "example",
+                Invizible: "example",
+                TwoCaptcha: "example"
             },
             SMS: {
-                Quackr: "pFFzLab8SXgR5lP1WP4SK1AW2",
-                SMSActivate: "305d36dbd47702AeA5f4ce2df0c76"
+                Quackr: "example",
+                SMSActivate: "example"
             }
         }
     });
@@ -442,7 +422,7 @@ app.get("/api/userconfig/proxylists", async (req, res) => {
 });
 
 app.get("/api/userconfig/balances", async (req, res) => {
-    return res.send({ capsolver: "$10", hyper: "$40" });
+    return res.send({ CapSolver: 100, TwoCaptcha: 40 });
 });
 
 module.exports = {

package/backend/auth.js

@@ -1,7 +1,7 @@
-const uuid = require("uuid").v4;
+const crypto = require("node:crypto");
 
 const generateAuthToken = () => {
-    return uuid().replace(/-/g, "");
+    return crypto.randomUUID();
 };
 
 // This is not secure, at all.

package/backend/endpoints.js

@@ -53,53 +53,12 @@ const getTasks = async () => {
     return getStrippedTasks();
 };
 
-const startAllTasks = async () => {
-    var taskIds = Object.keys(Bot.Tasks);
-    for (let c = 0; c < taskIds.length; c++) {
-        var taskId = taskIds[c] + "";
-        if (!Bot.Tasks[taskId] || Bot.Tasks[taskId].active) continue;
-        if (Bot.Tasks[taskId].status == "Stopped")
-            Bot.Tasks[taskId] = new TicketMaster({
-                taskId: Bot.Tasks[taskId].taskId,
-                ...Bot.Tasks[taskId].settings
-            });
-        Bot.Tasks[taskId].start();
-    }
-    pushWSUpdate({
-        event: "start-all"
-    });
-    return {};
-};
-const stopAllTasks = async () => {
-    var taskIds = Object.keys(Bot.Tasks);
-    for (let c = 0; c < taskIds.length; c++) {
-        var taskId = taskIds[c] + "";
-        if (!Bot.Tasks[taskId] || !Bot.Tasks[taskId].active) continue;
-        Bot.Tasks[taskId].stop();
-    }
-    pushWSUpdate({
-        event: "stop-all"
-    });
-    return {};
-};
-const deleteAllTasks = async () => {
-    Bot.Tasks = {};
-    var taskIds = Object.keys(Bot.Tasks);
-    for (let c = 0; c < taskIds.length; c++) {
-        var taskId = taskIds[c] + "";
-        if (!Bot.Tasks[taskId]) continue;
-        Bot.Tasks[c].destroy();
-    }
-    pushWSUpdate({
-        event: "delete-all"
-    });
-    return {};
-};
 const tasksLoadPresale = async (data) => {
     var { eventId, ticketQty } = data;
     await createPresaleModeTasks(eventId, ticketQty);
     return {};
 };
+
 const startTask = async (data) => {
     const taskId = data.id;
 
@@ -121,6 +80,7 @@ const startTask = async (data) => {
     Bot.Tasks[taskId].start();
     return {};
 };
+
 const stopTask = async (data) => {
     const taskId = data.id;
 
@@ -136,6 +96,7 @@ const stopTask = async (data) => {
     Bot.Tasks[taskId].stop();
     return {};
 };
+
 const deleteTask = async (data) => {
     const taskId = data.id;
     if (!Bot.Tasks[taskId])
@@ -286,13 +247,6 @@ const createAccounts = async () => {};
 const saveAccount = async (account) => {
     const user = account.user;
     user.tags = [user.name];
-    // TODO: handle in database
-    if (account._id) {
-        // database.models.profile.findOneAndUpdate()
-    } else {
-        // database.models.profile.create()
-    }
-
     Bot[account.module].Accounts.push(account);
     pushWSUpdate({ event: "add-account", account: account });
     return {};
@@ -315,12 +269,6 @@ const saveProfile = async (profile) => {
     newTags = [...newTags, ...profile.tags];
     profile.tags = newTags;
 
-    // TODO: handle in database
-    if (profile._id) {
-        // database.models.profile.findOneAndUpdate()
-    } else {
-        // database.models.profile.create()
-    }
     Bot.Profiles.push(profile);
     pushWSUpdate({ event: "add-profile", profile: profile });
     return {};
@@ -341,14 +289,8 @@ async function handleWebsocketMessage(msg) {
             return await tasksOpen(data);
         case "tasks/delete":
             return await deleteTask(data);
-        case "tasks/":
+        case "tasks/get":
             return await getTasks();
-        case "tasks/start-all":
-            return await startAllTasks();
-        case "tasks/stop-all":
-            return await stopAllTasks();
-        case "tasks/delete-all":
-            return await deleteAllTasks();
         case "tasks/load-presale":
             return await tasksLoadPresale(data);
         case "tasks/start":
@@ -389,9 +331,6 @@ module.exports = {
     tasksOpen,
     deleteTask,
     getTasks,
-    startAllTasks,
-    stopAllTasks,
-    deleteAllTasks,
     tasksLoadPresale,
     startTask,
     stopTask,

package/backend/mock-src/classes/logger.js

@@ -38,6 +38,7 @@ class Logger {
         this.user = null;
         this.global = false;
         this.siteId = null;
+        this.taskId = null;
     }
 
     logToWorker(...args) {
@@ -48,7 +49,8 @@ class Logger {
                 metadata: {
                     global: this.global || !this.user,
                     user: this.user,
-                    siteId: this.siteId
+                    siteId: this.siteId,
+                    taskId: this.taskId
                 }
             });
         }

package/backend/mock-src/classes/utils.js

@@ -1,4 +1,5 @@
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const crypto = require("node:crypto");
 
 module.exports = {
     pickAccount: () => {
@@ -16,13 +17,15 @@ module.exports = {
         return atob(i);
     },
     massEditPresaleCode: async (eventId, presaleCode) => {
-        for (const [key, value] of Object.entries(Bot.Tasks)) {
+        for (const [, value] of Object.entries(Bot.Tasks)) {
             if (value.eventId === eventId) {
                 value.presaleCode = presaleCode;
             }
         }
     },
-
+    uuid: () => {
+        return crypto.randomUUID();
+    },
     chunk: (arr, len) => {
         let chunks = [],
             i = 0,

package/backend/mock-src/ticketmaster.js

@@ -1,92 +1,92 @@
+const { createLogger } = require("./classes/logger");
+
 module.exports = class TicketMaster {
-  constructor(taskData) {
-    this.logger = {
-      Error: console.log,
-      Info: console.log,
-    };
-    this.taskId = taskData.taskId || 'T-' + ++Bot.CurrentTaskId;
-    this.data = taskData;
-    this.data.taskId = this.taskId;
+    constructor(taskData) {
+        this.taskId = taskData.taskId || "T-" + ++Bot.CurrentTaskId;
+        this.logger = createLogger(this.taskId);
+        this.data = taskData;
+        this.data.taskId = this.taskId;
+        this.logger.taskId = this.taskId;
+        this.logger.user = "admin";
+        this.logger.siteId = taskData.siteId;
 
-    this.data.account = this.data.account || 'test@email.com';
-    this.data.email = this.data.email || 'test@email.com'
-    this.data.password = this.data.password || 'p@ssword'
-    this.data.proxy = this.data.proxy || '127.0.0.1';
-    this.data.tickets = this.data.tickets || '-';
-    this.data.status = this.data.status || 'Created';
-    this.data.active = false;
-    this.data.statusColor = 'green';
-    this.data.expirationTime = Date.now();
+        this.data.account = this.data.account || "test@email.com";
+        this.data.email = this.data.email || "test@email.com";
+        this.data.password = this.data.password || "p@ssword";
+        this.data.proxy = this.data.proxy || "127.0.0.1";
+        this.data.tickets = this.data.tickets || "-";
+        this.data.status = this.data.status || "Created";
+        this.data.active = false;
+        this.data.statusColor = "green";
+        this.data.expirationTime = Date.now();
 
-    this.data.eventVenue = "Pagenstedt stadium"
-    this.data.eventDate = Date.now();
-    this.data.eventLocalDate = Date.now();
-    this.data.eventName = "Dr. Pagenstedt"
-    this.data.reservedTicketsList = "ticket1 | ticket2 | ticket3\n$100"
+        this.data.eventVenue = "Test Venue";
+        this.data.eventDate = Date.now();
+        this.data.eventLocalDate = Date.now();
+        this.data.eventName = "Test Event";
+        this.data.reservedTicketsList = "ticket1 | ticket2 | ticket3\n$100";
 
-    refreshTaskOnFrontEnd(taskData);
-  }
+        refreshTaskOnFrontEnd(taskData);
+    }
 
-  stripDown() {
-    return this.data;
-  }
+    stripDown() {
+        return this.data;
+    }
 
-  setError(e) {
-    this.error = e;
-    this.status = e;
-    this.data.active = false;
-  }
+    setError(e) {
+        this.error = e;
+        this.status = e;
+        this.data.active = false;
+    }
 
-  start() {
-    this.logger.Info('Starting task');
-    this.data.active = true;
-    refreshTaskOnFrontEnd(this.data);
-  }
+    start() {
+        this.logger.Info("Starting task");
+        this.data.active = true;
+        refreshTaskOnFrontEnd(this.data);
+    }
 
-  stop(deleted = false) {
-    this.logger.Error(deleted ? 'Deleting task' : 'Stopping task');
-    this.data.active = false;
-    this.data.statusColor = 'red';
-    this.logger.ENABLED = false;
-    if (!deleted) {
-      this.setError('Stopped');
-      refreshTaskOnFrontEnd(this.data);
+    stop(deleted = false) {
+        this.logger.Error(deleted ? "Deleting task" : "Stopping task");
+        this.data.active = false;
+        this.data.statusColor = "red";
+        this.logger.ENABLED = false;
+        if (!deleted) {
+            this.setError("Stopped");
+            refreshTaskOnFrontEnd(this.data);
+        }
     }
-  }
 
-  destroy() {
-    this.hidden = true;
-    this.stop(true);
-    delete Bot.Tasks[this.taskId];
-    refreshTaskOnFrontEnd({
-      taskId: this.taskId,
-      removed: true
-    });
-  }
+    destroy() {
+        this.hidden = true;
+        this.stop(true);
+        delete Bot.Tasks[this.taskId];
+        refreshTaskOnFrontEnd({
+            taskId: this.taskId,
+            removed: true
+        });
+    }
 
-  get status() {
-    return this.statusString || '';
-  }
+    get status() {
+        return this.statusString || "";
+    }
 
-  set status(value) {
-    if (!this.active && !['Idle', 'Stopped'].includes(value)) return;
-    var oldValue = this.statusString + '';
-    this.statusString = value;
-    if (
-      !this.hidden &&
-      global.refreshTaskOnFrontEnd &&
-      this.statusString != oldValue
-    )
-      try {
-        refreshTaskOnFrontEnd(this.stripDown(), value, this.statusString);
-      } catch {}
-  }
+    set status(value) {
+        if (!this.active && !["Idle", "Stopped"].includes(value)) return;
+        var oldValue = this.statusString + "";
+        this.statusString = value;
+        if (!this.hidden && global.refreshTaskOnFrontEnd && this.statusString != oldValue)
+            try {
+                refreshTaskOnFrontEnd(this.stripDown(), value, this.statusString);
+            } catch {
+                /* empty */
+            }
+    }
 
-  scrapeVenue() {
-    this.logger.Info('Scraping venue map');
-  }
+    scrapeVenue() {
+        this.logger.Info("Scraping venue map");
+    }
 
-  scrapeSeats() {
-    this.logger.Info('Scraping seats');
-  }
-};
+    scrapeSeats() {
+        this.logger.Info("Scraping seats");
+    }
+};

package/config/configs.json

@@ -1,6 +1,6 @@
 [
     {
-        "name": "Peet's config",
+        "name": "Test config",
         "config": {
             "eventId": "01005D5C92031D57",
             "presaleCode": "SanFResaleCode",

package/config/filter.json

@@ -1,4 +1,3 @@
 {
-    "123": "1234567",
-    "peet": "is cool2"
-}
+    "123": "1234567"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@necrolab/dashboard",
-    "version": "0.4.216",
+    "version": "0.4.218",
     "scripts": {
         "build": "npx workbox-cli generateSW workbox-config.js && vite build",
         "dev": "vite",
@@ -14,7 +14,7 @@
     "dependencies": {
         "@faker-js/faker": "^7.6.0",
         "@msgpack/msgpack": "^3.0.0-beta2",
-        "@necrolab/tm-renderer": "^0.1.2",
+        "@necrolab/tm-renderer": "^0.1.3",
         "@vitejs/plugin-vue": "^5.0.3",
         "@vueuse/core": "^10.7.2",
         "autoprefixer": "^10.4.17",
@@ -30,7 +30,6 @@
         "sass": "^1.70.0",
         "simple-code-editor": "github:wwhtrbbtt/simple-code-editor",
         "tailwindcss": "^3.4.1",
-        "uuid": "^9.0.1",
         "vite": "^5.0.12",
         "vue": "^3.4.21",
         "vue-router": "^4.2.5",

package/postinstall.js

@@ -1,22 +1,20 @@
-const fs = require('fs');
-const { execSync } = require('node:child_process');
-const path = require('node:path');
+const fs = require("node:fs");
+const { execSync } = require("node:child_process");
+const path = require("node:path");
 
 console.log(__dirname);
 
-var vitePath = path.resolve(path.join(__dirname, '/../../vite/bin/vite.js'));
+var vitePath = path.resolve(path.join(__dirname, "/../../vite/bin/vite.js"));
 console.log(vitePath);
 execSync(`node "${vitePath}" build`, {
-  cwd: __dirname,
-  stdio: 'inherit',
+    cwd: __dirname,
+    stdio: "inherit"
 });
 
-var oldPath = path.resolve('./dist/');
-var distPath = path.resolve(path.join(__dirname, '../../../dashboard/dist/'));
-try {
-  fs.rmSync(distPath, {
-    recursive: true,
-  });
-} catch {}
+var oldPath = path.resolve("./dist/");
+var distPath = path.resolve(path.join(__dirname, "../../../dashboard/dist/"));
+fs.rmSync(distPath, {
+    recursive: true
+});
 
 fs.renameSync(oldPath, distPath);

package/src/components/Editors/Profile/ProfileView.vue

@@ -34,15 +34,15 @@
                 <h4 class="hidden ipadlg:flex">Actions</h4>
             </div>
         </Header>
-        <div v-if="toRender.length > 0">
+        <div v-if="toRender.length != 0">
             <RecycleScroller
                 :items="toRender"
                 :item-size="64"
                 key-field="index"
                 class="scroller max-h-big vue-recycle-scroller ready direction-vertical flex flex-col divide-y-2 divide-border overflow-y-auto hidden-scrollbars overflow-x-hidden stop-pan"
             >
-                <template #default="props" :key="i[props.item.idex]">
-                    <div class="task">
+                <template #default="props">
+                    <div class="task" :key="i[props.item.index]">
                         <Profile
                             @click="i[props.item.index]++"
                             :class="[props.item.index % 2 == 1 ? 'bg-dark-500' : 'bg-dark-550']"

package/src/components/Tasks/CheckStock.vue

@@ -4,23 +4,42 @@
         <!-- Event ID -->
         <div class="input-wrapper mt-7 mb-4">
             <label class="label-override mb-2">Event ID <StadiumIcon /></label>
-            <div class="input-default">
-                <input placeholder="102PDA9125510GYU" v-model="eventId" />
-                <span class="text-red-400 my-auto mr-2 mt-3">* </span>
+            <div class="input-default flex items-center">
+                <input
+                    :placeholder="!isEU(ui.currentCountry.siteId) ? '102PDA9125510GYU' : '529171'"
+                    v-model="eventId"
+                    class="flex-grow"
+                />
+                <span class="text-red-400 text-lg absolute right-3 top-1/2 transform -translate-y-1/2">*</span>
+                <!-- Changed from ml-2 to ml-1 -->
             </div>
         </div>
         <!-- Ticker Quantity -->
-        <div class="input-wrapper mb-8">
+        <div class="input-wrapper mb-4">
             <label class="label-override mb-2">Presale code <AwardIcon /></label>
             <div class="input-default">
                 <input placeholder="Presale code" v-model="presaleCode" />
             </div>
         </div>
+        <!-- DID -->
+        <div class="input-wrapper mb-4" v-if="!isEU(ui.currentCountry.siteId)">
+            <label class="label-override mb-2">DID <AwardIcon /></label>
+            <div class="input-default">
+                <input placeholder="psl" v-model="eventDid" />
+            </div>
+        </div>
+        <!-- CL ORIGIN -->
+        <div class="input-wrapper mb-8" v-if="isEU(ui.currentCountry.siteId)">
+            <label class="label-override mb-2">CL Origin / SubChannel ID <AwardIcon /></label>
+            <div class="input-default">
+                <input placeholder="ORIGIN2" v-model="clOrigin" />
+            </div>
+        </div>
         <button
             class="button-default hover:opacity-70 active:opacity-50 bg-dark-400 w-48 text-xs flex items-center justify-center gap-x-2 ml-auto"
             @click="done()"
         >
-            Checks Stock <BoxIcon />
+            Check Stock <BoxIcon />
         </button>
     </Modal>
 </template>
@@ -36,12 +55,16 @@ import Modal from "@/components/ui/Modal.vue";
 import { StadiumIcon, BoxIcon, AwardIcon } from "@/components/icons";
 import { useUIStore } from "@/stores/ui";
 import { ref } from "vue";
+import { isEU } from "@/stores/utils";
 
 const ui = useUIStore();
 const eventId = ref("");
 const presaleCode = ref("");
+const eventDid = ref("");
+const clOrigin = ref("");
+
 function done() {
     ui.toggleModal("");
-    ui.checkStock(eventId.value, presaleCode.value);
+    ui.checkStock(eventId.value, presaleCode.value, eventDid.value, clOrigin.value);
 }
 </script>

package/src/components/Tasks/Controls/DesktopControls.vue

@@ -17,7 +17,7 @@
                 Expand
                 <ExpandIcon class="ml-2" />
             </button>
-            <button @click="$emit('decrease')" class="bg-dark-400 smooth-hover flex-grow xl:flex-initial">
+            <button @click="$emit('fold')" class="bg-dark-400 smooth-hover flex-grow xl:flex-initial">
                 Fold
                 <ShrinkIcon class="ml-2" />
             </button>
@@ -34,6 +34,7 @@
                 class="bg-dark-400 smooth-hover flex-grow xl:flex-initial w-36"
                 @click="ui.toggleModal('mass-edit-presale-code')"
                 :disabled="ui.disabledButtons['mass-edit']"
+                v-if="ui.currentModule == 'TM'"
             >
                 Mass Edit
                 <EditIcon class="ml-2" />

package/src/components/Tasks/Controls/MobileControls.vue

@@ -21,7 +21,7 @@
                 Expand
                 <ExpandIcon />
             </button>
-            <button class="rounded-md flex-1 bg-dark-400 xl:flex-auto" @click="$emit('decrease')">
+            <button class="rounded-md flex-1 bg-dark-400 xl:flex-auto" @click="$emit('fold')">
                 Fold
                 <ShrinkIcon />
             </button>

package/src/components/Tasks/CreateTaskTM.vue

@@ -266,7 +266,7 @@
                 </div>
                 <div class="switch-wrapper flex flex-col">
                     <h4>
-                        Autologin
+                        Login Later
                         <GroupIcon class="scale-90" />
                     </h4>
                     <Switch class="mx-auto" v-model="task.loginAfterCart" />

package/src/components/Tasks/MassEdit.vue

@@ -5,7 +5,10 @@
         <div class="input-wrapper mt-7 mb-4">
             <label class="label-override mb-2">Event ID <StadiumIcon /></label>
             <div class="input-default">
-                <input placeholder="102PDA9125510GYU" v-model="eventId" />
+                <input
+                    :placeholder="!isEU(ui.currentCountry.siteId) ? '102PDA9125510GYU' : '529171'"
+                    v-model="eventId"
+                />
                 <span class="text-red-400 my-auto mr-2 mt-3">* </span>
             </div>
         </div>
@@ -37,6 +40,7 @@ import Modal from "@/components/ui/Modal.vue";
 import { StadiumIcon, BagIcon, EditIcon } from "@/components/icons";
 import { useUIStore } from "@/stores/ui";
 import { ref } from "vue";
+import { isEU } from "@/stores/utils";
 
 const ui = useUIStore();
 const code = ref("");