Replace _jobs and _jobsGC with TTLCache from StdLib

components/02-connection.js

@@ -44,8 +44,6 @@ class SteamUserConnection extends SteamUserEnums {
 		clearInterval(this._heartbeatInterval);
 
 		this._incomingMessageQueue = []; // clear the incoming message queue. If we're disconnecting, we don't care about anything else in the queue.
-		this._jobCleanupTimers.forEach(timer => clearTimeout(timer));
-		this._jobCleanupTimers = [];
 
 		this._clearChangelistUpdateTimer();
 	}

components/03-messages.js

@@ -441,10 +441,7 @@ class SteamUserMessages extends SteamUserConnection {
 		let jobIdSource = null;
 		if (callback) {
 			jobIdSource = ++this._currentJobID;
-			this._jobs[jobIdSource] = callback;
-
-			// Clean up old job callbacks after 2 minutes
-			this._jobCleanupTimers.push(setTimeout(() => delete this._jobs[jobIdSource], 1000 * 60 * 2));
+			this._jobs.add(jobIdSource.toString(), callback);
 		}
 
 		let emsgName = EMsg[emsg] || emsg;
@@ -604,7 +601,7 @@ class SteamUserMessages extends SteamUserConnection {
 			this.emit('debug', debugPrefix + 'Got unknown target_job_name ' + header.proto.target_job_name + ' for msg ' + msgName);
 		}
 
-		if (!this._handlerManager.hasHandler(handlerName) && !this._jobs[header.targetJobID]) {
+		if (!this._handlerManager.hasHandler(handlerName) && this._jobs.get(header.targetJobID.toString()) === null) {
 			this.emit(VERBOSE_EMSG_LIST.includes(header.msg) ? 'debug-verbose' : 'debug', debugPrefix + 'Unhandled message: ' + msgName);
 			return;
 		}
@@ -638,9 +635,10 @@ class SteamUserMessages extends SteamUserConnection {
 			};
 		}
 
-		if (this._jobs[header.targetJobID]) {
+		let jobCallback = this._jobs.get(header.targetJobID.toString());
+		if (jobCallback) {
 			// this is a response to something, so invoke the appropriate callback
-			this._jobs[header.targetJobID].call(this, body, header, cb);
+			jobCallback.call(this, body, header, cb);
 		} else {
 			this._handlerManager.emit(this, handlerName, body, header, cb);
 		}

components/09-logon.js

@@ -596,7 +596,6 @@ class SteamUserLogon extends SteamUserMachineAuth {
 		delete this.cellID;
 		this.contentServersReady = false;
 
-		this._jobCleanupTimers.forEach(timer => clearTimeout(timer));
 		this._initProperties();
 
 		this._clearChangelistUpdateTimer();

components/gamecoordinator.js

@@ -23,10 +23,7 @@ class SteamUserGameCoordinator extends SteamUserFriends {
 		let sourceJobId = JOBID_NONE;
 		if (typeof callback === 'function') {
 			sourceJobId = ++this._currentGCJobID;
-			this._jobsGC[sourceJobId] = callback;
-
-			// Clean up job callbacks after 2 minutes
-			this._jobCleanupTimers.push(setTimeout(() => delete this._jobsGC[sourceJobId], 1000 * 60 * 2));
+			this._jobsGC.add(sourceJobId.toString(), callback);
 		}
 
 		this.emit('debug', `Sending ${appid} GC message ${msgType}`);
@@ -80,8 +77,9 @@ SteamUserBase.prototype._handlerManager.add(EMsg.ClientFromGC, function(body) {
 
 	this.emit('debug', `Received ${body.appid} GC message ${msgType}`);
 
-	if (targetJobID && this._jobsGC[targetJobID]) {
-		this._jobsGC[targetJobID].call(this, body.appid, msgType, payload);
+	let jobCallback = this._jobsGC.get(targetJobID.toString());
+	if (targetJobID && jobCallback) {
+		jobCallback.call(this, body.appid, msgType, payload);
 	} else {
 		this.emit('receivedFromGC', body.appid, msgType, payload);
 		this.emit('recievedFromGC', body.appid, msgType, payload); // make typos work because why not

index.js

@@ -125,9 +125,8 @@ class SteamUser extends SteamUserTwoFactor {
 		this._sessionID = 0;
 		this._currentJobID = 0;
 		this._currentGCJobID = 0;
-		this._jobs = {};
-		this._jobsGC = {};
-		this._jobCleanupTimers = [];
+		this._jobs = new StdLib.DataStructures.TTLCache(1000 * 60 * 2); // job callbacks are cleaned up after 2 minutes
+		this._jobsGC = new StdLib.DataStructures.TTLCache(1000 * 60 * 2);
 		this._richPresenceLocalization = {};
 		this._incomingMessageQueue = [];
 		this._useMessageQueue = false; // we only use the message queue while we're processing a multi message

package.json

@@ -23,7 +23,7 @@
 	},
 	"dependencies": {
 		"@bbob/parser": "^2.2.0",
-		"@doctormckay/stdlib": "^2.7.1",
+		"@doctormckay/stdlib": "^2.8.1",
 		"@doctormckay/steam-crypto": "^1.2.0",
 		"adm-zip": "^0.5.10",
 		"binarykvparser": "^2.2.0",