uh

3 files changed, 9 insertions, 3 deletions

diff --git a/lib/sd.js b/lib/sd.js
index 46daf22..b2c7622 100644
--- a/lib/sd.js
+++ b/lib/sd.js
@@ -12,10 +12,12 @@ export default class SoktDeer {
     /** @type {any[]} */
     messages = [];
     constructor(wsUri = "wss://sokt.meltland.dev") {
+        console.log('uh 21')
         this.ws = new WebSocket(wsUri);
         this.ws.onmessage = (rdata) => {
             const data = JSON.parse(rdata.data.toString());
-            console.info("SD", "INCOMING", data)
+            console.info("SD", "INCOMING", data);
+            if (data.listener != null) return this.wsEvents.emit(`listener-${data.listener}`)
             if ('command' in data) return this.wsEvents.emit(data.command, data);
             if ('error' in data
                 && Object.keys(data).filter(k => !['error', 'code'].includes(k)).length > 0)
@@ -35,6 +37,7 @@ export default class SoktDeer {
     }
 
     login(username, password) {
+        console.log('cred login')
         return new Promise((resolve, reject) => {
             this.ws.send(JSON.stringify({
                 command: "login_pswd",
@@ -55,6 +58,7 @@ export default class SoktDeer {
 
     //TODO - implement this
     loginToken(token, username) {
+        console.log('token login')
         return new Promise((resolve, reject) => {
             this.ws.send(JSON.stringify({
                 command: "login_token",
diff --git a/main.js b/main.js
index c300c41..79ed95a 100644
--- a/main.js
+++ b/main.js
@@ -22,6 +22,7 @@ window.stores.onChange = function (store, cb) {
 }
 const sd = window.sd = window.stores.sdlib
 function onclose() {
+    console.log('uh', new Error('uuuuh'))
     window.sd = window.stores.sdlib = new SoktDeer()
     document.getElementById('topbar').classList.add('hidden')
     pages.goToPage('login');
diff --git a/pages/login/page.js b/pages/login/page.js
index 61156c5..9d4f79c 100644
--- a/pages/login/page.js
+++ b/pages/login/page.js
@@ -4,8 +4,9 @@ async function fetchJSON(url, opts) {
 }
 
 export function onload() {
-    if (localStorage.getItem('token')) {
-        window.stores.sdlib.wsEvents.on('greet', () => {
+    if (localStorage.hasOwnProperty('token') && typeof localStorage.getItem('token') == 'string') {
+        window.stores.sdlib.wsEvents.once('greet', () => {
+            document.getElementById('topbar').classList.remove('hidden')
             window.stores.sdlib.loginToken(localStorage.getItem('token'), localStorage.getItem('username'));
             pages.goToPage('main')
         })