Merge pull request #272 from golters/dev

possible ping fix and event winning spam fix

.vscode/settings.json

@@ -2,6 +2,6 @@
   "editor.tabSize": 2,
   "editor.defaultFormatter": "dbaeumer.vscode-eslint",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
+    "source.fixAll.eslint": "explicit"
   },
 }

client/src/components/Toolbar.tsx

@@ -897,7 +897,7 @@ function drawInbox(){
     const messageBox = document.createElement('span')
     messageBox.classList.add("message-box")
     const message = document.createElement('span')
-    //message.classList.add("chat-message")
+    message.classList.add("chat-message")
     const date = document.createElement('span')
     date.classList.add("date")
     date.appendChild(document.createTextNode(timestamp))

client/src/index.tsx

@@ -40,7 +40,8 @@ const startMessages: string[] = [
   "Mudgolt stands for Multi User Dungeon... The other four letters represent a secret blend of herbs and spices for legal reasons I am unable to share.",
   "Mudgolt was invented in 1972 in an attempt to communicate with multi dimensional beings. But it turned out to be the ultimate tool for humans to communicate too!",
   "This version of Mudgolt was discovered on a floppy disk in a yard sale in 1986. It was later uploaded to the internet in the 2020s.",
-  "Somebody loves you."
+  "Somebody loves you.",
+  "This is the real metaverse"
 ]
 
 const init = async () => {

client/src/network/index.tsx

@@ -16,6 +16,7 @@ import {
   TP_EVENT,
   LOG_EVENT,
   UFO_EVENT,
+  PONG_EVENT,
 } from "../../../events"
 import {
   store, 
@@ -60,7 +61,7 @@ export const networkTask = () => new Promise<void>((resolve) => {
   reconnectAttempts++
 
   client.addEventListener("open", () => {
-    //pushToLog("Connected to server")
+    pushToLog("Connected to server")
 
     reconnectAttempts = 0
   })
@@ -133,17 +134,28 @@ setInterval(() => {
   }
 }, 15 * 10)
 
-let ping = setInterval(() => {
-  if(localStorage.getItem("focus") === "open"){
+setTimeout(() => {
+  console.log("new ping")
   sendEvent(PING_EVENT, client)  
   sendEvent(PAY_EVENT, store.player?.id)
-  }else{
-    if(Math.random()*10000 < 1){
-    sendEvent(UFO_EVENT, store.player?.id)
-    }
-  }
 }, 15 * 1000)
 
+//make settimeout then ping server, server return event to start a new timeout
+networkEmitter.on(PONG_EVENT, () => {
+  console.log("pong")
+  setTimeout(() => {
+    console.log("ping")
+    sendEvent(PING_EVENT, client)  
+    if(localStorage.getItem("focus") === "open"){
+    sendEvent(PAY_EVENT, store.player?.id)
+    }else{
+      if(Math.random()*10000 < 5){ 
+      sendEvent(UFO_EVENT, store.player?.id)
+      }
+    }
+  }, 15 * 1000)
+})
+
 window.addEventListener("focus", (event) => { 
   localStorage.setItem("focus","open")
 })

events.ts

@@ -10,6 +10,7 @@ export const MAKE_ROOM_EVENT = "MAKE_ROOM"
 export const GO_EVENT = "GO"
 export const USERNAME_CHANGE_EVENT = "USERNAME_CHANGE"
 export const PING_EVENT = "PING"
+export const PONG_EVENT = "PONG"
 export const CHAT_HISTORY_EVENT = "CHAT_HISTORY"
 export const LOOK_EVENT = "LOOK"
 export const DRAW_EVENT = "DRAW"

server/network/events/ping.ts

@@ -4,6 +4,7 @@ import {
 import {
   PING_EVENT, 
   ERROR_EVENT,
+  PONG_EVENT,
 } from "../../../events"
 import {
   online,
@@ -20,6 +21,7 @@ const handler: NetworkEventHandler = (socket, player) => {
     //sendEvent<string>(socket, ERROR_EVENT, "a bug has occured, you are no longer online")
   }
   sendEvent<null>(socket, PING_EVENT, null)
+  sendEvent<string>(socket, PONG_EVENT, "pong " + player)
 }
 
 networkEmitter.on(PING_EVENT, handler)

server/services/event.ts

@@ -302,6 +302,7 @@ export const getUpcomingEvents = async (time: number): Promise<Event[]> => {
 
 //spamming offline/afk users with backloged event ending messages
 export const clearOldEvents = async (time: number): Promise<void> => {
+  console.log()
   const oldEvents = await db.all<Event[]>(/*sql*/`
     SELECT * FROM events 
     WHERE "end" < $1 
@@ -716,7 +717,7 @@ export const createRandomEvent = async (time: number): Promise<void> => {
     targetDate.setMinutes(0)
     targetDate.setSeconds(0)
     const start = targetDate.getTime() - new Date().getTime()
-    const length = 4.32e+7
+    const length = 15 * 4.32e+7
     const type = Math.random() * 3
     createEvent(events[Math.floor(type)],time + start, time + start + length)
   }
@@ -941,6 +942,18 @@ export const pollResults = async (Event: Event): Promise<string> => {
 }
 
 export const electionWinner = async (event: number): Promise<void> => {
+  const eventcheck = await db.get<Event>(/*sql*/`
+    SELECT * FROM events WHERE id = $1;
+  `, [event])
+
+  if(!eventcheck){
+    return
+  }
+
+  await db.run(/*sql*/`
+  DELETE FROM events 
+  WHERE "id" = $1; 
+`, [event])	
 
   const votes = await db.all<EventTag[]>(/*sql*/`
   SELECT * FROM eventTags