Improve migration to eosIDs

core/id-parser.js

@@ -0,0 +1,61 @@
+const ID_MATCHER = /\s*(?<name>[^\s:]+)\s*:\s*(?<id>[^\s]+)/g;
+
+// COMMON CONSTANTS
+
+/** All possible IDs that a player can have. */
+export const playerIdNames = ["steamID", "eosID"];
+
+// PARSING AND ITERATION
+
+/**
+ * Main function intended for parsing `Online IDs:` body.
+ * @arg {string} idsStr - String with ids. Extra whitespace is allowed,
+ *   Number of {platform: ID} pairs can be arbitrary. String example:
+     " platform1:id1 platform2: id2    platform3  :  id3   "
+     Keys and values are not allowed contain colons or whitespace
+     characters.
+ * @returns {IdsIterator} An iterator that yields {platform: ID} pairs.
+ */
+export const iterateIDs = (idsStr) => {
+  return new IdsIterator(idsStr.matchAll(ID_MATCHER));
+};
+
+class IdsIterator {
+  constructor(matchIterator) {
+    this.inner = matchIterator;
+  }
+
+  [Symbol.iterator]() {
+    return this;
+  }
+
+  next() {
+    const match = this.inner.next();
+    if (match.done) return { value: undefined, done: true };
+    return { value: { key: match.value[1], value: match.value[2] }, done: false };
+  }
+
+  forEach(callbackFn) {
+    for (const { key, value } of this) callbackFn(key, value);
+  }
+}
+
+// FORMATTING
+
+/**
+ * Generates capitalized ID names. Examples:
+ *   steam -> SteamID
+ *   EOSID -> EOSID
+ */
+export const capitalID = (str) => {
+  return str.charAt(0).toUpperCase() + str.slice(1) + 'ID';
+};
+
+/**
+ * Generates lowercase ID names. Examples:
+ *   steam -> steamID
+ *   EOSID -> eosID
+ */
+export const lowerID = (str) => {
+  return str.toLowerCase() + 'ID';
+};

core/log-parser/index.js

@@ -16,12 +16,8 @@ export default class LogParser extends EventEmitter {
 
     this.eventStore = {
       disconnected: {}, // holding area, cleared on map change.
-      players: [], // persistent data, steamid, controller, suffix.
-      playersEOS: [], // proxies from EOSID to persistent data, steamid, controller, suffix.
-      connectionIdToSteamID: new Map(),
+      players: {}, // persistent data, steamid, controller, suffix.
       session: {}, // old eventstore, nonpersistent data
-      clients: {}, // used in the connection chain before we resolve a player.
-      lastConnection: {}, // used to store the last client connection data to then associate a steamid
       joinRequests: []
     };
 
@@ -74,10 +70,10 @@ export default class LogParser extends EventEmitter {
   clearEventStore() {
     Logger.verbose('LogParser', 2, 'Cleaning Eventstore');
     for (const player of Object.values(this.eventStore.players)) {
-      if (this.eventStore.disconnected[player.steamID] === true) {
-        Logger.verbose('LogParser', 2, `Removing ${player.steamID} from eventStore`);
-        delete this.eventStore.players[player.steamID];
-        delete this.eventStore.disconnected[player.steamID];
+      if (this.eventStore.disconnected[player.eosID] === true) {
+        Logger.verbose('LogParser', 2, `Removing ${player.eosID} from eventStore`);
+        delete this.eventStore.players[player.eosID];
+        delete this.eventStore.disconnected[player.eosID];
       }
     }
     this.eventStore.session = {};

core/package.json

@@ -5,6 +5,7 @@
   "exports": {
     "./log-parser": "./log-parser/index.js",
     "./constants": "./constants.js",
+    "./id-parser": "./id-parser.js",
     "./logger": "./logger.js",
     "./rcon": "./rcon.js"
   },

core/rcon.js

@@ -414,15 +414,15 @@ export default class Rcon extends EventEmitter {
     return util.inspect(decodedPacket, { breakLength: Infinity });
   }
 
-  async warn(steamID, message) {
-    await this.execute(`AdminWarn "${steamID}" ${message}`);
+  async warn(anyID, message) {
+    await this.execute(`AdminWarn "${anyID}" ${message}`);
   }
 
-  async kick(steamID, reason) {
-    await this.execute(`AdminKick "${steamID}" ${reason}`);
+  async kick(anyID, reason) {
+    await this.execute(`AdminKick "${anyID}" ${reason}`);
   }
 
-  async forceTeamChange(steamID) {
-    await this.execute(`AdminForceTeamChange "${steamID}"`);
+  async forceTeamChange(anyID) {
+    await this.execute(`AdminForceTeamChange "${anyID}"`);
   }
 }