this is podracing

client/src/actions.ts

@@ -1,3 +1,6 @@
+import { route } from 'preact-router';
+import http from './http';
+
 const actions = store => ({
     setUser: function setUser(state, user) {
         return { user };
@@ -7,7 +10,7 @@ const actions = store => ({
         return { offers };
     },
 
-    logout: async function logout(store, e) {
+    logout: async function logout() {
         await http.postLogout();
         route('/login');
         return { user: null };

client/src/components/header.tsx

@@ -51,4 +51,5 @@ const Header = ({ user, logout }) => {
     );
 }
 
+// @ts-ignore unistore types
 export default connect(['user'], actions)(Header);

client/src/store.tsx

@@ -1,8 +1,5 @@
-import { route } from 'preact-router';
 import unistore from 'unistore'
 
-import http from './http';
-
 export default function createStore() {
     return unistore({
         bundles: [],

client/src/ws.ts

@@ -1,117 +1,113 @@
-// const SOCKET_URL = (window.location.host.includes('localhost') || window.location.host === '' || window.location.host.includes('192.168.0'))
-//   ? `ws://${window.location.hostname}:40080`
-//   : `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;
-
 const SOCKET_URL = `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;
 
 export default function createSocket(store) {
-  let ws;
+    let ws;
 
-  // -------------
-  //   Outgoing
-  // -------------
-  function send(msg) {
-    if (msg[0] !== 'Ping') console.log('outgoing msg', msg);
-    if (ws.readyState !== 1) return false;
-    try {
-      ws.send(JSON.stringify(msg));
-    } catch (e) {
-      console.warn(e);
-    }
-  }
-
-  // let ping;
-  function sendPing() {
-    // ping = Date.now();
-    send(['Ping', {}]);
-
-    // setTimeout(sendPing, 50);
-  }
-
-  function sendSourcesAvailable() {
-    send(['SourcesAvailable', {}]);
-  }
-
-  let pongTimeout;
-  function onPong() {
-    pongTimeout = setTimeout(sendPing, 1000);
-  }
-
-  // -------------
-  //   Incoming
-  // -------------
-  function onSourcesAvailable(clouds) {
-    // store.dispatch(http.LIBRARY_RECEIVE_POINTCLOUDS, clouds);
-  }
-
-  // -------------
-  //   Setup
-  // -------------
-  // when the server sends a reply it will have one of these message types
-  // this object wraps the reply types to a function
-  const handlers = {
-    SourcesAvailable: onSourcesAvailable,
-
-    Pong: onPong,
-    Error: errHandler,
-  };
-
-  function errHandler(error) {
-    // store.dispatch(http.LIBRARY_EVENT, { level: 'error', log: error });
-    console.error(error);
-  }
-
-  function onMessage(event) {
-    const res = event.data;
-    const [msgType, params] = JSON.parse(res);
-    if (msgType !== 'Pong') {
-      console.log(msgType, params);
+    // -------------
+    //   Outgoing
+    // -------------
+    function send(msg) {
+        if (msg[0] !== 'Ping') console.log('outgoing msg', msg);
+        if (ws.readyState !== 1) return false;
+        try {
+            ws.send(JSON.stringify(msg));
+        } catch (e) {
+            console.warn(e);
+        }
     }
 
-    // check for error and split into response type and data
-    if (!handlers[msgType]) return console.error(`${msgType} handler missing`);
-    return handlers[msgType](params);
-  }
+    // let ping;
+    function sendPing() {
+        // ping = Date.now();
+        send(['Ping', {}]);
 
-  // Connection opened
-  function onOpen() {
-    sendPing();
-  }
-
-  function onError(event) {
-    console.error('WebSocket error', event);
-  }
-
-  function onClose(event) {
-    console.error('WebSocket closed', event);
-    return setTimeout(connect, 2000);
-  }
-
-  function connect() {
-    if (ws) {
-      clearTimeout(pongTimeout);
-      ws.removeEventListener('open', onOpen);
-      ws.removeEventListener('message', onMessage);
-      ws.removeEventListener('error', onError);
-      ws.removeEventListener('close', onClose);
-      ws = null;
+        // setTimeout(sendPing, 50);
     }
 
-    console.log('connecting to websocket', SOCKET_URL);
-    ws = new WebSocket(SOCKET_URL);
+    function sendSourcesAvailable() {
+        send(['SourcesAvailable', {}]);
+    }
 
-    // Listen for messages
-    ws.addEventListener('open', onOpen);
-    ws.addEventListener('message', onMessage);
-    ws.addEventListener('error', onError);
-    ws.addEventListener('close', onClose);
+    let pongTimeout;
+    function onPong() {
+        pongTimeout = setTimeout(sendPing, 1000);
+    }
 
-    return ws;
-  }
+    // -------------
+    //   Incoming
+    // -------------
+    function onSourcesAvailable(clouds) {
+        // store.dispatch(http.LIBRARY_RECEIVE_POINTCLOUDS, clouds);
+    }
 
-  return {
-    connect,
+    // -------------
+    //   Setup
+    // -------------
+    // when the server sends a reply it will have one of these message types
+    // this object wraps the reply types to a function
+    const handlers = {
+        SourcesAvailable: onSourcesAvailable,
 
-    sendSourcesAvailable,
-  };
+        Pong: onPong,
+        Error: errHandler,
+    };
+
+    function errHandler(error) {
+        // store.dispatch(http.LIBRARY_EVENT, { level: 'error', log: error });
+        console.error(error);
+    }
+
+    function onMessage(event) {
+        const res = event.data;
+        const [msgType, params] = JSON.parse(res);
+        if (msgType !== 'Pong') {
+            console.log(msgType, params);
+        }
+
+        // check for error and split into response type and data
+        if (!handlers[msgType]) return console.error(`${msgType} handler missing`);
+        return handlers[msgType](params);
+    }
+
+    // Connection opened
+    function onOpen() {
+        sendPing();
+    }
+
+    function onError(event) {
+        console.error('WebSocket error', event);
+    }
+
+    function onClose(event) {
+        console.error('WebSocket closed', event);
+        return setTimeout(connect, 2000);
+    }
+
+    function connect() {
+        if (ws) {
+            clearTimeout(pongTimeout);
+            ws.removeEventListener('open', onOpen);
+            ws.removeEventListener('message', onMessage);
+            ws.removeEventListener('error', onError);
+            ws.removeEventListener('close', onClose);
+            ws = null;
+        }
+
+        console.log('connecting to websocket', SOCKET_URL);
+        ws = new WebSocket(SOCKET_URL);
+
+        // Listen for messages
+        ws.addEventListener('open', onOpen);
+        ws.addEventListener('message', onMessage);
+        ws.addEventListener('error', onError);
+        ws.addEventListener('close', onClose);
+
+        return ws;
+    }
+
+    return {
+        connect,
+
+        sendSourcesAvailable,
+    };
 }