tweaks

Author: Sadzurami

handlers.js

@@ -8,8 +8,6 @@ const TeamFortress2 = require('./index.js');
 const Language = require('./language.js');
 const Schema = require('./protobufs/generated/_load.js');
 
-const g_ItemSchemaRetrievalSemaphore = new Semaphore();
-
 const handlers = TeamFortress2.prototype._handlers;
 
 // ClientWelcome, ServerWelcome, ClientGoodbye, and ServerGoodbye
@@ -48,6 +46,10 @@ handlers[Language.ServerGoodbye] = function(body) {
 };
 
 // Item schema
+let g_ItemSchema = null;
+let g_ItemSchemaVersion = null;
+let g_ItemSchemaRetrievalSemaphore = new Semaphore();
+
 handlers[Language.UpdateItemSchema] = async function(body) {
 	let release = await g_ItemSchemaRetrievalSemaphore.waitAsync();
 
@@ -59,7 +61,7 @@ handlers[Language.UpdateItemSchema] = async function(body) {
 
 		this.emit('itemSchema', schemaVersion, schemaUrl);
 
-		if (schemaVersion !== this.itemSchemaVersion) {
+		if (schemaVersion !== g_ItemSchemaVersion) {
 			let client = new HttpClient();
 
 			let result = await client.request({
@@ -71,10 +73,13 @@ handlers[Language.UpdateItemSchema] = async function(body) {
 				throw new Error(`HTTP error ${result.statusCode}`);
 			}
 
-			this.itemSchema = VDF.parse(result.textBody).items_game;
-			this.itemSchemaVersion = schemaVersion;
+			g_ItemSchema = VDF.parse(result.textBody).items_game;
+			g_ItemSchemaVersion = schemaVersion;
 		}
 
+		this.itemSchema = g_ItemSchema;
+		this.itemSchemaVersion = g_ItemSchemaVersion;
+
 		this.emit('itemSchemaLoaded');
 	} catch (err) {
 		this.emit('debug', `Unable to download items_game.txt: ${err.message}`);

index.js

@@ -7,8 +7,6 @@ const VDF = require('kvparser');
 const Language = require('./language.js');
 const Schema = require('./protobufs/generated/_load.js');
 
-const g_ItemSchemaCache = new Map();
-
 const STEAM_APPID = 440;
 
 module.exports = TeamFortress2;
@@ -29,24 +27,6 @@ function TeamFortress2(steam) {
 	this.haveGCSession = false;
 	this._isInTF2 = false;
 
-	Object.defineProperty(this, 'itemSchema', {
-		get: function() {
-			return g_ItemSchemaCache.get('itemSchema');
-		},
-		set: function(value) {
-			g_ItemSchemaCache.set('itemSchema', value);
-		}
-	});
-
-	Object.defineProperty(this, 'itemSchemaVersion', {
-		get: function() {
-			return g_ItemSchemaCache.get('itemSchemaVersion');
-		},
-		set: function(value) {
-			g_ItemSchemaCache.set('itemSchemaVersion', value);
-		}
-	});
-
 	this._steam.on('receivedFromGC', (appid, msgType, payload) => {
 		if (appid != STEAM_APPID) {
 			return; // we don't care