Revert "AFK players now show up as SSD on examine (+ soft ping port) (#…

…9705)" (#10056)

This reverts commit 444214b.

beestation.dme

@@ -429,7 +429,6 @@
 #include "code\controllers\subsystem\parallax.dm"
 #include "code\controllers\subsystem\pathfinder.dm"
 #include "code\controllers\subsystem\persistence.dm"
-#include "code\controllers\subsystem\ping.dm"
 #include "code\controllers\subsystem\preferences.dm"
 #include "code\controllers\subsystem\profiler.dm"
 #include "code\controllers\subsystem\radiation.dm"

code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm

@@ -63,5 +63,3 @@
 ///Called after a client connects to a mob and all UI elements have been setup
 #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"
 #define COMSIG_MOB_MOUSE_SCROLL_ON "comsig_mob_mouse_scroll_on"	//! from base of /mob/MouseWheelOn(): (atom/A, delta_x, delta_y, params)
-#define COMSIG_MOB_CLIENT_AFK "comsig_mob_client_afk"			//! from base of /client/on_afk(): ()
-#define COMSIG_MOB_CLIENT_UNAFK "comsig_mob_client_unafk"			//! from base of /client/on_unafk(): ()

code/__DEFINES/subsystems.dm

@@ -157,7 +157,6 @@
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
 
-#define FIRE_PRIORITY_PING			10
 #define FIRE_PRIORITY_STAT			10
 #define FIRE_PRIORITY_AMBIENCE		10
 #define FIRE_PRIORITY_IDLE_NPC		10

code/game/data_huds.dm

@@ -200,12 +200,12 @@
 			if(tod)
 				var/tdelta = round(world.time - timeofdeath)
 				if(tdelta < (DEFIB_TIME_LIMIT * 10))
-					if((!client && key) || client?.is_afk())
+					if(!client && key)
 						holder.icon_state = "huddefib-ssd"
 						return
 					holder.icon_state = "huddefib"
 					return
-			if((!client && key) || client?.is_afk())
+			if(!client && key)
 				holder.icon_state = "huddead-ssd"
 				return
 			holder.icon_state = "huddead"

code/modules/client/client_defines.dm

@@ -125,6 +125,3 @@
 
 	/// Whether or not this client has standard hotkeys enabled
 	var/hotkeys = TRUE
-
-	/// Whether the AFK inactivity period has been passed or not.
-	var/inactive = FALSE

code/modules/client/client_procs.dm

@@ -582,7 +582,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	GLOB.clients -= src
 	GLOB.mentors -= src
 	SSambience.remove_ambience_client(src)
-	SSping.currentrun -= src
 	Master.UpdateTickRate()
 	return ..()
 
@@ -983,20 +982,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		return inactivity
 	return FALSE
 
-/client/proc/afk_start()
-	if(inactive)
-		return
-	inactive = TRUE
-	if(!QDELETED(mob))
-		SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_AFK)
-
-/client/proc/afk_end()
-	if(!inactive)
-		return
-	inactive = FALSE
-	if(!QDELETED(mob))
-		SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_UNAFK)
-
 /// Send resources to the client.
 /// Sends both game resources and browser assets.
 /client/proc/send_resources()

code/modules/mob/living/carbon/carbon.dm

@@ -6,7 +6,8 @@
 	create_reagents(1000)
 	update_body_parts() //to update the carbon's new bodyparts appearance
 	GLOB.carbon_list += src
-	RegisterSignal(src, list(COMSIG_MOB_LOGOUT, COMSIG_MOB_LOGIN, COMSIG_MOB_CLIENT_AFK, COMSIG_MOB_CLIENT_UNAFK), PROC_REF(med_hud_set_status))
+	RegisterSignal(src, COMSIG_MOB_LOGOUT, PROC_REF(med_hud_set_status))
+	RegisterSignal(src, COMSIG_MOB_LOGIN, PROC_REF(med_hud_set_status))
 
 /mob/living/carbon/Destroy()
 	//This must be done first, so the mob ghosts correctly before DNA etc is nulled

code/modules/mob/living/carbon/human/examine.dm

@@ -310,7 +310,7 @@
 				msg += "<span class='deadsay'>[t_He] do[t_es]n't appear to be [t_him]self.</span>\n"
 			if(!key)
 				msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.</span>\n"
-			else if(!client || client.is_afk())
+			else if(!client)
 				msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
 
 	//handcuffed?

code/modules/tgui/tgui.dm

@@ -342,7 +342,7 @@
 			if(initialized)
 				send_full_update()
 			initialized = TRUE
-		if("ping/reply")
+		if("pingReply")
 			initialized = TRUE
 		if("suspend")
 			close(can_be_suspended = TRUE)

code/modules/tgui/tgui_window.dm

@@ -356,10 +356,7 @@
 	// If not locked, handle these message types
 	switch(type)
 		if("ping")
-			if(client)
-				client.afk_end()
-				addtimer(CALLBACK(src, TYPE_PROC_REF(/client, afk_start)), CONFIG_GET(number/inactivity_period) + 5, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_DELETE_ME)
-			send_message("ping/reply", payload)
+			send_message("pingReply", payload)
 		if("suspend")
 			close(can_be_suspended = TRUE)
 		if("close")

tgui/packages/tgui-panel/game/constants.js

@@ -4,4 +4,4 @@
  * @license MIT
  */
 
-export const CONNECTION_LOST_AFTER = 20000;
+export const CONNECTION_LOST_AFTER = 15000;

tgui/packages/tgui-panel/game/middleware.js

@@ -4,7 +4,7 @@
  * @license MIT
  */
 
-import { pingSoft, pingSuccess } from '../ping/actions';
+import { pingSuccess } from '../ping/actions';
 import { connectionLost, connectionRestored, roundRestarted } from './actions';
 import { selectGame } from './selectors';
 import { CONNECTION_LOST_AFTER } from './constants';
@@ -19,7 +19,6 @@ const withTimestamp = (action) => ({
 
 export const gameMiddleware = (store) => {
   let lastPingedAt;
-
   setInterval(() => {
     const state = store.getState();
     if (!state) {
@@ -34,19 +33,15 @@ export const gameMiddleware = (store) => {
       store.dispatch(withTimestamp(connectionRestored()));
     }
   }, 1000);
-
   return (next) => (action) => {
-    const { type } = action;
-
-    if (type === pingSuccess.type || type === pingSoft.type) {
-      lastPingedAt = Date.now();
+    const { type, payload, meta } = action;
+    if (type === pingSuccess.type) {
+      lastPingedAt = meta.now;
       return next(action);
     }
-
     if (type === roundRestarted.type) {
       return next(withTimestamp(action));
     }
-
     return next(action);
   };
 };

tgui/packages/tgui-panel/ping/actions.js

@@ -6,20 +6,17 @@
 
 import { createAction } from 'common/redux';
 
-export const pingReply = createAction('ping/reply');
-
-/**
- * Soft ping from the server.
- * It's intended to send periodic server-side metadata about the client,
- * e.g. its AFK status.
- */
-export const pingSoft = createAction('ping/soft');
-
-export const pingSuccess = createAction('ping/success', (ping) => ({
-  payload: {
-    lastId: ping.id,
-    roundtrip: (Date.now() - ping.sentAt) * 0.5,
-  },
-}));
+export const pingSuccess = createAction('ping/success', (ping) => {
+  const now = Date.now();
+  const roundtrip = (now - ping.sentAt) * 0.5;
+  return {
+    payload: {
+      lastId: ping.id,
+      roundtrip,
+    },
+    meta: { now },
+  };
+});
 
 export const pingFail = createAction('ping/fail');
+export const pingReply = createAction('ping/reply');

tgui/packages/tgui-panel/ping/constants.js

@@ -4,6 +4,7 @@
  * @license MIT
  */
 
+export const PING_INTERVAL = 2500;
 export const PING_TIMEOUT = 2000;
 export const PING_MAX_FAILS = 3;
 export const PING_QUEUE_SIZE = 8;

tgui/packages/tgui-panel/ping/middleware.js

@@ -4,14 +4,13 @@
  * @license MIT
  */
 
-import { pingFail, pingReply, pingSoft, pingSuccess } from './actions';
-import { PING_QUEUE_SIZE, PING_TIMEOUT } from './constants';
+import { pingFail, pingSuccess } from './actions';
+import { PING_INTERVAL, PING_QUEUE_SIZE, PING_TIMEOUT } from './constants';
 
 export const pingMiddleware = (store) => {
   let initialized = false;
   let index = 0;
   const pings = [];
-
   const sendPing = () => {
     for (let i = 0; i < PING_QUEUE_SIZE; i++) {
       const ping = pings[i];
@@ -25,26 +24,14 @@ export const pingMiddleware = (store) => {
     Byond.sendMessage('ping', { index });
     index = (index + 1) % PING_QUEUE_SIZE;
   };
-
   return (next) => (action) => {
     const { type, payload } = action;
-
     if (!initialized) {
       initialized = true;
+      setInterval(sendPing, PING_INTERVAL);
       sendPing();
     }
-
-    if (type === pingSoft.type) {
-      const { afk } = payload;
-      // On each soft ping where client is not flagged as afk,
-      // initiate a new ping.
-      if (!afk) {
-        sendPing();
-      }
-      return next(action);
-    }
-
-    if (type === pingReply.type) {
+    if (type === 'pingReply') {
       const { index } = payload;
       const ping = pings[index];
       // Received a timed out ping
@@ -54,7 +41,6 @@ export const pingMiddleware = (store) => {
       pings[index] = null;
       return next(pingSuccess(ping));
     }
-
     return next(action);
   };
 };

tgui/packages/tgui-panel/ping/reducer.js

@@ -10,7 +10,6 @@ import { PING_MAX_FAILS, PING_ROUNDTRIP_BEST, PING_ROUNDTRIP_WORST } from './con
 
 export const pingReducer = (state = {}, action) => {
   const { type, payload } = action;
-
   if (type === pingSuccess.type) {
     const { roundtrip } = payload;
     const prevRoundtrip = state.roundtripAvg || roundtrip;
@@ -23,7 +22,6 @@ export const pingReducer = (state = {}, action) => {
       networkQuality,
     };
   }
-
   if (type === pingFail.type) {
     const { failCount = 0 } = state;
     const networkQuality = clamp01(state.networkQuality - failCount / PING_MAX_FAILS);
@@ -38,6 +36,5 @@ export const pingReducer = (state = {}, action) => {
     }
     return nextState;
   }
-
   return state;
 };

tgui/packages/tgui/backend.ts

@@ -133,7 +133,7 @@ export const backendMiddleware = (store) => {
     }
 
     if (type === 'ping') {
-      Byond.sendMessage('ping/reply');
+      Byond.sendMessage('pingReply');
       return;
     }