use new core class from runtime

packages/app/src/cores/api/api.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 
 import createClient from "comty.js"
 
@@ -8,87 +8,99 @@ import useRequest from "comty.js/hooks/useRequest"
 import { reconnectWebsockets, disconnectWebsockets } from "comty.js"
 
 export default class APICore extends Core {
-    static namespace = "api"
+	static namespace = "api"
 
-    static bgColor = "coral"
+	static bgColor = "coral"
-    static textColor = "black"
+	static textColor = "black"
 
-    client = null
+	client = null
 
-    public = {
+	public = {
-        client: function () {
+		client: function () {
-            return this.client
+			return this.client
-        }.bind(this),
+		}.bind(this),
-        customRequest: request,
+		customRequest: request,
-        listenEvent: this.listenEvent.bind(this),
+		listenEvent: this.listenEvent.bind(this),
-        unlistenEvent: this.unlistenEvent.bind(this),
+		unlistenEvent: this.unlistenEvent.bind(this),
-        measurePing: measurePing,
+		measurePing: measurePing,
-        useRequest: useRequest,
+		useRequest: useRequest,
-        reconnectWebsockets: reconnectWebsockets,
+		reconnectWebsockets: reconnectWebsockets,
-        disconnectWebsockets: disconnectWebsockets,
+		disconnectWebsockets: disconnectWebsockets,
-    }
+	}
 
-    listenEvent(key, handler, instance = "default") {
+	registerSocketListeners = (map) => {
-        if (!this.client.sockets[instance]) {
+		Object.entries(map).forEach(([namespace, listeners]) => {
-            this.console.error(`[API] Websocket instance ${instance} not found`)
+			Object.entries(listeners).forEach(([event, handler]) => {
+				this.listenEvent(event, handler, namespace)
+			})
+		})
+	}
 
-            return false
+	listenEvent(key, handler, instance = "default") {
-        }
+		if (!this.client.sockets[instance]) {
+			this.console.error(`[API] Websocket instance ${instance} not found`)
 
-        return this.client.sockets[instance].on(key, handler)
+			return false
-    }
+		}
 
-    unlistenEvent(key, handler, instance = "default") {
+		return this.client.sockets[instance].on(key, handler)
-        if (!this.client.sockets[instance]) {
+	}
-            this.console.error(`[API] Websocket instance ${instance} not found`)
 
-            return false
+	unlistenEvent(key, handler, instance = "default") {
-        }
+		if (!this.client.sockets[instance]) {
+			this.console.error(`[API] Websocket instance ${instance} not found`)
 
-        return this.client.sockets[instance].off(key, handler)
+			return false
-    }
+		}
 
-    async onInitialize() {
+		return this.client.sockets[instance].off(key, handler)
-        this.client = await createClient({
+	}
-            enableWs: true,
-        })
 
-        this.client.eventBus.on("ws:disconnected", () => {
+	async onInitialize() {
-            app.cores.notifications.new({
+		this.client = await createClient({
-                title: "Failed to connect to server",
+			enableWs: true,
-                description: "The connection to the server was lost. Some features may not work properly.",
+			//origin: "https://indev.comty.app/api"
-            })
+		})
-        })
 
-        this.client.eventBus.on("auth:login_success", () => {
+		this.client.eventBus.on("ws:disconnected", () => {
-            app.eventBus.emit("auth:login_success")
+			app.cores.notifications.new({
-        })
+				title: "Failed to connect to server",
+				description:
+					"The connection to the server was lost. Some features may not work properly.",
+			})
+		})
 
-        this.client.eventBus.on("auth:logout_success", () => {
+		this.client.eventBus.on("auth:login_success", () => {
-            app.eventBus.emit("auth:logout_success")
+			app.eventBus.emit("auth:login_success")
-        })
+		})
 
-        this.client.eventBus.on("session.invalid", (error) => {
+		this.client.eventBus.on("auth:logout_success", () => {
-            app.eventBus.emit("session.invalid", error)
+			app.eventBus.emit("auth:logout_success")
-        })
+		})
 
-        this.client.eventBus.on("auth:disabled_account", () => {
+		this.client.eventBus.on("session.invalid", (error) => {
-            app.eventBus.emit("auth:disabled_account")
+			app.eventBus.emit("session.invalid", error)
-        })
+		})
 
-        // make a basic request to check if the API is available
+		this.client.eventBus.on("auth:disabled_account", () => {
-        await this.client.baseRequest({
+			app.eventBus.emit("auth:disabled_account")
-            method: "head",
+		})
-            url: "/",
-        }).catch((error) => {
-            this.console.error("[API] Ping error", error)
 
-            throw new Error(`
+		// make a basic request to check if the API is available
+		await this.client
+			.baseRequest({
+				method: "head",
+				url: "/",
+			})
+			.catch((error) => {
+				this.console.error("[API] Ping error", error)
+
+				throw new Error(`
                 Could not connect to the API.
                 Please check your connection and try again.
             `)
-        })
+			})
 
-        return this.client
+		return this.client
-    }
+	}
 }

packages/app/src/cores/contextMenu/context_menu.core.js

@@ -1,6 +1,6 @@
 import React from "react"
 
-import { Core, EventBus } from "vessel"
+import { Core, EventBus } from "@ragestudio/vessel"
 
 import ContextMenu from "./components/contextMenu"
 

packages/app/src/cores/ffmpeg/ffmpeg.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import { FFmpeg } from "@ffmpeg/ffmpeg"
 import { fetchFile, toBlobURL } from "@ffmpeg/util"
 import isURL from "@utils/isURL"

packages/app/src/cores/haptics/haptics.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import { Haptics } from "@capacitor/haptics"
 
 const vibrationPatterns = {

packages/app/src/cores/i18n/i18n.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import i18n from "i18next"
 import { initReactI18next } from "react-i18next"
 

packages/app/src/cores/nfc/nfc.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import TapShareDialog from "@components/TapShare/Dialog"
 
 const RecordTypes = {

packages/app/src/cores/notifications/notifications.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 
 import NotificationUI from "./ui"
 import NotificationFeedback from "./feedback"
@@ -10,13 +10,14 @@ export default class NotificationCore extends Core {
         "settings",
     ]
 
-    #newNotifications = []
-
     listenSockets = {
         "notifications": {
             "notification.new": (data) => {
                 this.new(data)
-            }
+            },
+            "notification.broadcast": (data) => {
+                this.new(data)
+            },
         }
     }
 
@@ -25,6 +26,10 @@ export default class NotificationCore extends Core {
         close: this.close,
     }
 
+    async onInitialize() {
+        this.ctx.CORES.api.registerSocketListeners(this.listenSockets)
+    }
+
     async new(notification) {
         NotificationUI.notify(notification)
         NotificationFeedback.feedback(notification)

packages/app/src/cores/settings/settings.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import store from "store"
 import { Observable } from "rxjs"
 

packages/app/src/cores/sfx/sfx.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import { Howl } from "howler"
 import axios from "axios"
 import store from "store"

packages/app/src/cores/shortcuts/shortcuts.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 
 export default class ShortcutsCore extends Core {
     static namespace = "shortcuts"

packages/app/src/cores/style/style.core.jsx

@@ -1,5 +1,5 @@
 import React from "react"
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 
 import { ConfigProvider, theme } from "antd"
 import store from "store"

packages/app/src/cores/sync/sync.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import SyncModel from "comty.js/models/sync"
 
 export default class SyncCore extends Core {

packages/app/src/cores/tasksQueue/tasksQueue.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import { Observable } from "object-observer"
 
 export default class TasksQueue extends Core {

packages/app/src/cores/widgets/widgets.core.js

@@ -1,4 +1,4 @@
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 import store from "store"
 
 export default class WidgetsCore extends Core {

packages/app/src/cores/windows/windows.core.jsx

@@ -1,5 +1,5 @@
 import React from "react"
-import { Core } from "vessel"
+import { Core } from "@ragestudio/vessel"
 
 import { createRoot } from "react-dom/client"