omegga 1.2.9 → 1.3.0

package/dist/omegga/matchers/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/omegga/matchers/init.ts"],"names":[],"mappings":";;;;;AAAA,0DAA8B;AAG9B,MAAM,IAAI,GAAyB,OAAO,CAAC,EAAE;IAC3C,OAAO;QACL,2BAA2B;QAC3B,OAAO,CAAC,KAAK,EAAE,QAAQ;YACrB,kCAAkC;YAClC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEtB,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;YAE5C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC;gBAAE,OAAO;YAE1C,sCAAsC;YACtC,IAAI,IAAI,CAAC,KAAK,CAAC,kDAAkD,CAAC,EAAE,CAAC;gBACnE,gBAAM,CAAC,IAAI,CACT,YAAY,CAAC,MAAM,EACnB,0EAA0E,CAC3E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,QAAQ,KAAI,CAAC;KACd,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"init.js","sources":["../../../src/omegga/matchers/init.ts"],"sourcesContent":["import Logger from '@/logger';\nimport { MatchGenerator } from './types';\n\nconst init: MatchGenerator<void> = _omegga => {\n  return {\n    // listen for auth messages\n    pattern(_line, logMatch) {\n      // line is not generic console log\n      if (!logMatch) return;\n\n      const { generator, data } = logMatch.groups;\n\n      if (!generator.match(/^LogInit$/)) return;\n\n      // check if log is the kill server log\n      if (data.match(/we are not the first instance of this executable/)) {\n        Logger.warn(\n          'W> WARNING'.yellow,\n          'You are running multiple brickadia instances, this better be intentional',\n        );\n      }\n    },\n\n    callback() {},\n  };\n};\n\nexport default init;\n"],"names":["Logger"],"mappings":";;;AAGA,MAAM,OAA6B,CAAA,YAAW;AAC5C,SAAO;AAAA;AAAA,IAEL,QAAQ,OAAO,UAAU;AAEvB,UAAI,CAAC,SAAU;AAEf,YAAM,EAAE,WAAW,KAAA,IAAS,SAAS;AAErC,UAAI,CAAC,UAAU,MAAM,WAAW,EAAG;AAGnC,UAAI,KAAK,MAAM,kDAAkD,GAAG;AAClEA,eAAAA,QAAO;AAAA,UACL,aAAa;AAAA,UACb;AAAA,QAAA;AAAA,MAEJ;AAAA,IACF;AAAA,IAEA,WAAW;AAAA,IAAC;AAAA,EAAA;AAEhB;;"}

package/dist/omegga/matchers/interact.js

@@ -1,69 +1,63 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = __importDefault(require("../../logger"));
-const brick_1 = require("../../util/brick");
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const logger = require("../../logger.js");
+const displayName = require("../../util/brick/displayName.js");
 const interactRegExp = /^Player "(?<name>[^"]+)" \((?<id>[^,]+), (?<pawn>[^,]+), (?<controller>[^)]+)\) interacted with brick "(?<brick>[^\"]+)" at (?<x>-?\d+) (?<y>-?\d+) (?<z>-?\d+), message: "(?<message>.*)".$/;
 const customEventRegExp = /^event:(?<name>[^:]+)(:(?<args>.*))?$/;
-const interact = omegga => {
-    return {
-        // listen for auth messages
-        pattern(_line, logMatch) {
-            var _a, _b;
-            // line is not generic console log
-            if (!logMatch)
-                return;
-            const { generator, data } = logMatch.groups;
-            if (generator !== 'LogBrickadia')
-                return;
-            const match = data.match(interactRegExp);
-            // check if log is the kill server log
-            if (match) {
-                let blob = null, error = false, json = false;
-                if ((_a = match.groups.message) === null || _a === void 0 ? void 0 : _a.startsWith('json:')) {
-                    json = true;
-                    try {
-                        blob = JSON.parse(match.groups.message.slice(5));
-                    }
-                    catch (err) {
-                        logger_1.default.verbose('Error parsing interact event json', data, err);
-                        error = true;
-                    }
-                }
-                const convertedBrick = (_b = (0, brick_1.convertDisplayName)(match.groups.brick)) !== null && _b !== void 0 ? _b : [];
-                return {
-                    player: {
-                        id: match.groups.id,
-                        name: match.groups.name,
-                        controller: match.groups.controller,
-                        pawn: match.groups.pawn,
-                    },
-                    brick_name: match.groups.brick,
-                    brick_asset: convertedBrick[0],
-                    brick_size: convertedBrick[1],
-                    position: [
-                        Number(match.groups.x),
-                        Number(match.groups.y),
-                        Number(match.groups.z),
-                    ],
-                    message: match.groups.message,
-                    json,
-                    error,
-                    data: blob,
-                };
-            }
-        },
-        callback(interaction) {
-            var _a, _b;
-            const match = interaction.message.match(customEventRegExp);
-            if (match) {
-                omegga.emit(`event:${match.groups.name}`, interaction.player, ...((_b = (_a = match.groups.args) === null || _a === void 0 ? void 0 : _a.replace(/\\,/g, '{ESCAPED_COMMA}').split(',').filter(v => typeof v !== 'undefined').map(v => v.replace(/\{ESCAPED_COMMA\}/g, ','))) !== null && _b !== void 0 ? _b : []));
-            }
-            omegga.emit('interact', interaction);
-        },
-    };
+const interact = (omegga) => {
+  return {
+    // listen for auth messages
+    pattern(_line, logMatch) {
+      if (!logMatch) return;
+      const { generator, data } = logMatch.groups;
+      if (generator !== "LogBrickadia") return;
+      const match = data.match(interactRegExp);
+      if (match) {
+        let blob = null, error = false, json = false;
+        if (match.groups.message?.startsWith("json:")) {
+          json = true;
+          try {
+            blob = JSON.parse(match.groups.message.slice(5));
+          } catch (err) {
+            logger.default.verbose("Error parsing interact event json", data, err);
+            error = true;
+          }
+        }
+        const convertedBrick = displayName.convertDisplayName(match.groups.brick) ?? [];
+        return {
+          player: {
+            id: match.groups.id,
+            name: match.groups.name,
+            controller: match.groups.controller,
+            pawn: match.groups.pawn
+          },
+          brick_name: match.groups.brick,
+          brick_asset: convertedBrick[0],
+          brick_size: convertedBrick[1],
+          position: [
+            Number(match.groups.x),
+            Number(match.groups.y),
+            Number(match.groups.z)
+          ],
+          message: match.groups.message,
+          json,
+          error,
+          data: blob
+        };
+      }
+    },
+    callback(interaction) {
+      const match = interaction.message.match(customEventRegExp);
+      if (match) {
+        omegga.emit(
+          `event:${match.groups.name}`,
+          interaction.player,
+          ...match.groups.args?.replace(/\\,/g, "{ESCAPED_COMMA}").split(",").filter((v) => typeof v !== "undefined").map((v) => v.replace(/\{ESCAPED_COMMA\}/g, ",")) ?? []
+        );
+      }
+      omegga.emit("interact", interaction);
+    }
+  };
 };
 exports.default = interact;
-//# sourceMappingURL=interact.js.map
+//# sourceMappingURL=interact.js.map

package/dist/omegga/matchers/interact.js.map

@@ -1 +1 @@
-{"version":3,"file":"interact.js","sourceRoot":"","sources":["../../../src/omegga/matchers/interact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interact.js","sources":["../../../src/omegga/matchers/interact.ts"],"sourcesContent":["import { MatchGenerator } from './types';\nimport { BrickInteraction } from '@/plugin';\nimport Logger from '@/logger';\nimport { convertDisplayName } from '@util/brick';\n\nconst interactRegExp =\n  /^Player \"(?<name>[^\"]+)\" \\((?<id>[^,]+), (?<pawn>[^,]+), (?<controller>[^)]+)\\) interacted with brick \"(?<brick>[^\\\"]+)\" at (?<x>-?\\d+) (?<y>-?\\d+) (?<z>-?\\d+), message: \"(?<message>.*)\".$/;\n\nconst customEventRegExp = /^event:(?<name>[^:]+)(:(?<args>.*))?$/;\n\nconst interact: MatchGenerator<BrickInteraction> = omegga => {\n  return {\n    // listen for auth messages\n    pattern(_line, logMatch) {\n      // line is not generic console log\n      if (!logMatch) return;\n\n      const { generator, data } = logMatch.groups;\n\n      if (generator !== 'LogBrickadia') return;\n\n      const match = data.match(interactRegExp);\n\n      // check if log is the kill server log\n      if (match) {\n        let blob: any = null,\n          error = false,\n          json = false;\n        if (match.groups.message?.startsWith('json:')) {\n          json = true;\n          try {\n            blob = JSON.parse(match.groups.message.slice(5));\n          } catch (err) {\n            Logger.verbose('Error parsing interact event json', data, err);\n            error = true;\n          }\n        }\n\n        const convertedBrick = convertDisplayName(match.groups.brick) ?? [];\n\n        return {\n          player: {\n            id: match.groups.id,\n            name: match.groups.name,\n            controller: match.groups.controller,\n            pawn: match.groups.pawn,\n          },\n          brick_name: match.groups.brick,\n          brick_asset: convertedBrick[0],\n          brick_size: convertedBrick[1],\n          position: [\n            Number(match.groups.x),\n            Number(match.groups.y),\n            Number(match.groups.z),\n          ],\n          message: match.groups.message,\n          json,\n          error,\n          data: blob,\n        };\n      }\n    },\n\n    callback(interaction) {\n      const match = interaction.message.match(customEventRegExp);\n      if (match) {\n        omegga.emit(\n          `event:${match.groups.name}`,\n          interaction.player,\n          ...(match.groups.args\n            ?.replace(/\\\\,/g, '{ESCAPED_COMMA}')\n            .split(',')\n            .filter(v => typeof v !== 'undefined')\n            .map(v => v.replace(/\\{ESCAPED_COMMA\\}/g, ',')) ?? []),\n        );\n      }\n\n      omegga.emit('interact', interaction);\n    },\n  };\n};\n\nexport default interact;\n"],"names":["Logger","convertDisplayName"],"mappings":";;;;AAKA,MAAM,iBACJ;AAEF,MAAM,oBAAoB;AAE1B,MAAM,WAA6C,CAAA,WAAU;AAC3D,SAAO;AAAA;AAAA,IAEL,QAAQ,OAAO,UAAU;AAEvB,UAAI,CAAC,SAAU;AAEf,YAAM,EAAE,WAAW,KAAA,IAAS,SAAS;AAErC,UAAI,cAAc,eAAgB;AAElC,YAAM,QAAQ,KAAK,MAAM,cAAc;AAGvC,UAAI,OAAO;AACT,YAAI,OAAY,MACd,QAAQ,OACR,OAAO;AACT,YAAI,MAAM,OAAO,SAAS,WAAW,OAAO,GAAG;AAC7C,iBAAO;AACP,cAAI;AACF,mBAAO,KAAK,MAAM,MAAM,OAAO,QAAQ,MAAM,CAAC,CAAC;AAAA,UACjD,SAAS,KAAK;AACZA,mBAAAA,QAAO,QAAQ,qCAAqC,MAAM,GAAG;AAC7D,oBAAQ;AAAA,UACV;AAAA,QACF;AAEA,cAAM,iBAAiBC,YAAAA,mBAAmB,MAAM,OAAO,KAAK,KAAK,CAAA;AAEjE,eAAO;AAAA,UACL,QAAQ;AAAA,YACN,IAAI,MAAM,OAAO;AAAA,YACjB,MAAM,MAAM,OAAO;AAAA,YACnB,YAAY,MAAM,OAAO;AAAA,YACzB,MAAM,MAAM,OAAO;AAAA,UAAA;AAAA,UAErB,YAAY,MAAM,OAAO;AAAA,UACzB,aAAa,eAAe,CAAC;AAAA,UAC7B,YAAY,eAAe,CAAC;AAAA,UAC5B,UAAU;AAAA,YACR,OAAO,MAAM,OAAO,CAAC;AAAA,YACrB,OAAO,MAAM,OAAO,CAAC;AAAA,YACrB,OAAO,MAAM,OAAO,CAAC;AAAA,UAAA;AAAA,UAEvB,SAAS,MAAM,OAAO;AAAA,UACtB;AAAA,UACA;AAAA,UACA,MAAM;AAAA,QAAA;AAAA,MAEV;AAAA,IACF;AAAA,IAEA,SAAS,aAAa;AACpB,YAAM,QAAQ,YAAY,QAAQ,MAAM,iBAAiB;AACzD,UAAI,OAAO;AACT,eAAO;AAAA,UACL,SAAS,MAAM,OAAO,IAAI;AAAA,UAC1B,YAAY;AAAA,UACZ,GAAI,MAAM,OAAO,MACb,QAAQ,QAAQ,iBAAiB,EAClC,MAAM,GAAG,EACT,OAAO,OAAK,OAAO,MAAM,WAAW,EACpC,IAAI,CAAA,MAAK,EAAE,QAAQ,sBAAsB,GAAG,CAAC,KAAK,CAAA;AAAA,QAAC;AAAA,MAE1D;AAEA,aAAO,KAAK,YAAY,WAAW;AAAA,IACrC;AAAA,EAAA;AAEJ;;"}

package/dist/omegga/matchers/join.js

@@ -1,98 +1,77 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const player_1 = __importDefault(require("../player"));
-const join = omegga => {
-    // username + id and a log counter to keep track of actual join messages
-    const userJoinInfo = [];
-    // username + id to get player state and controller
-    const joiningPlayers = [];
-    // patterns to match PlayerState and PlayerController objects in GetAll commands
-    const stateRegExp = /BP_PlayerState_C .+?PersistentLevel\.(?<state>BP_PlayerState_C_\d+)\.UserName = (?<name>.+)$/;
-    const controllerRegExp = /BP_PlayerState_C .+?PersistentLevel\.(?<state>BP_PlayerState_C_\d+)\.Owner = .*?BP_PlayerController_C'.+?:PersistentLevel.(?<controller>BP_PlayerController_C_\d+)'/;
-    return {
-        // listen for join events and wait for PlayerController info
-        pattern(line, logMatch) {
-            if (logMatch) {
-                const { generator, counter, data } = logMatch.groups;
-                let joinData = userJoinInfo.find(l => l.counter === counter);
-                // LogServerList includes the new user information
-                if (generator === 'LogServerList') {
-                    // create joindata if it doesn't exist
-                    if (!joinData) {
-                        joinData = { counter };
-                        userJoinInfo.push(joinData);
-                    }
-                    // match on username or user id
-                    const match = data.match(/^(?<field>UserName|UserId|DisplayName): (?<value>.+)$/);
-                    // put that value in the join data
-                    if (match) {
-                        joinData[match.groups.field] = match.groups.value;
-                    }
-                    // LogNet lets us know the player successfully joined
-                }
-                else if (generator == 'LogNet') {
-                    // find which player joined
-                    const match = data.match(/^Join succeeded: (.+)$/);
-                    // make sure this joindata corresponds to this player
-                    // TODO: [BRICKADIA] display name used here instead of username...
-                    if (match && joinData.DisplayName === match[1]) {
-                        // remove that player from our buffer
-                        userJoinInfo.splice(userJoinInfo.indexOf(joinData), 1);
-                        // found joined player, now we need to find the BRPlayerState
-                        joiningPlayers.push({
-                            displayName: joinData.DisplayName,
-                            name: joinData.UserName,
-                            id: joinData.UserId,
-                        });
-                        // get the state of all players so we can determine which is this player
-                        // TODO: maybe also use the ReplicatedJoinTime, which matches the time for these logs
-                        omegga.writeln('GetAll BRPlayerState UserName');
-                    }
-                }
-                // only match state and controllers if we have joining players
-            }
-            else if (joiningPlayers.length) {
-                const stateMatch = line.match(stateRegExp);
-                const controllerMatch = line.match(controllerRegExp);
-                // this line matches our PlayerName -> PlayerState pattern
-                if (stateMatch) {
-                    const { name, state } = stateMatch.groups;
-                    // find the joining player that has a matching name
-                    const player = joiningPlayers.find(p => p.name === name);
-                    // check if another player is already using this state or if there's any joining player with this name
-                    if (!player || omegga.players.some(p => p.state === state))
-                        return;
-                    // this player owns this state, find the controller now
-                    player.state = state;
-                    omegga.writeln(`GetAll BRPlayerState Owner Name=${state}`);
-                    // this line matches our PlayerState -> PlayerController pattern
-                }
-                else if (controllerMatch) {
-                    const { controller, state } = controllerMatch.groups;
-                    // find the joining player that has a matching state
-                    const player = joiningPlayers.find(p => p.state === state);
-                    // no player found
-                    if (!player)
-                        return;
-                    // assign the controller and state, remove the player from the joining players
-                    player.controller = controller;
-                    player.state = state;
-                    joiningPlayers.splice(joiningPlayers.indexOf(player), 1);
-                    // return the newly joined player
-                    return new player_1.default(omegga, player.name, player.displayName, player.id, player.controller, player.state);
-                }
-            }
-        },
-        // when there's a match, emit a join event and add the player to the player list
-        callback(player) {
-            omegga.emit('join', player);
-            omegga.players.push(player);
-            omegga.emit('plugin:players:raw', omegga.players.map(p => p.raw()));
-        },
-    };
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const player = require("../player.js");
+const join = (omegga) => {
+  const userJoinInfo = [];
+  const joiningPlayers = [];
+  const stateRegExp = /BP_PlayerState_C .+?PersistentLevel\.(?<state>BP_PlayerState_C_\d+)\.UserName = (?<name>.+)$/;
+  const controllerRegExp = /BP_PlayerState_C .+?PersistentLevel\.(?<state>BP_PlayerState_C_\d+)\.Owner = .*?BP_PlayerController_C'.+?:PersistentLevel.(?<controller>BP_PlayerController_C_\d+)'/;
+  return {
+    // listen for join events and wait for PlayerController info
+    pattern(line, logMatch) {
+      if (logMatch) {
+        const { generator, counter, data } = logMatch.groups;
+        let joinData = userJoinInfo.find((l) => l.counter === counter);
+        if (generator === "LogServerList") {
+          if (!joinData) {
+            joinData = { counter };
+            userJoinInfo.push(joinData);
+          }
+          const match = data.match(
+            /^(?<field>UserName|UserId|DisplayName): (?<value>.+)$/
+          );
+          if (match) {
+            joinData[match.groups.field] = match.groups.value;
+          }
+        } else if (generator == "LogNet") {
+          const match = data.match(/^Join succeeded: (.+)$/);
+          if (match && joinData.DisplayName === match[1]) {
+            userJoinInfo.splice(userJoinInfo.indexOf(joinData), 1);
+            joiningPlayers.push({
+              displayName: joinData.DisplayName,
+              name: joinData.UserName,
+              id: joinData.UserId
+            });
+            omegga.writeln("GetAll BRPlayerState UserName");
+          }
+        }
+      } else if (joiningPlayers.length) {
+        const stateMatch = line.match(stateRegExp);
+        const controllerMatch = line.match(controllerRegExp);
+        if (stateMatch) {
+          const { name, state } = stateMatch.groups;
+          const player2 = joiningPlayers.find((p) => p.name === name);
+          if (!player2 || omegga.players.some((p) => p.state === state)) return;
+          player2.state = state;
+          omegga.writeln(`GetAll BRPlayerState Owner Name=${state}`);
+        } else if (controllerMatch) {
+          const { controller, state } = controllerMatch.groups;
+          const player$1 = joiningPlayers.find((p) => p.state === state);
+          if (!player$1) return;
+          player$1.controller = controller;
+          player$1.state = state;
+          joiningPlayers.splice(joiningPlayers.indexOf(player$1), 1);
+          return new player.default(
+            omegga,
+            player$1.name,
+            player$1.displayName,
+            player$1.id,
+            player$1.controller,
+            player$1.state
+          );
+        }
+      }
+    },
+    // when there's a match, emit a join event and add the player to the player list
+    callback(player2) {
+      omegga.emit("join", player2);
+      omegga.players.push(player2);
+      omegga.emit(
+        "plugin:players:raw",
+        omegga.players.map((p) => p.raw())
+      );
+    }
+  };
 };
 exports.default = join;
-//# sourceMappingURL=join.js.map
+//# sourceMappingURL=join.js.map

package/dist/omegga/matchers/join.js.map

@@ -1 +1 @@
-{"version":3,"file":"join.js","sourceRoot":"","sources":["../../../src/omegga/matchers/join.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"join.js","sources":["../../../src/omegga/matchers/join.ts"],"sourcesContent":["import Player from '@omegga/player';\nimport { MatchGenerator } from './types';\n\nconst join: MatchGenerator<Player> = omegga => {\n  // username + id and a log counter to keep track of actual join messages\n  const userJoinInfo: {\n    counter: string;\n    UserName?: string;\n    UserId?: string;\n    DisplayName?: string;\n  }[] = [];\n\n  // username + id to get player state and controller\n  const joiningPlayers: {\n    displayName: string;\n    name: string;\n    id: string;\n    state?: string;\n    controller?: string;\n  }[] = [];\n\n  // patterns to match PlayerState and PlayerController objects in GetAll commands\n  const stateRegExp =\n    /BP_PlayerState_C .+?PersistentLevel\\.(?<state>BP_PlayerState_C_\\d+)\\.UserName = (?<name>.+)$/;\n  const controllerRegExp =\n    /BP_PlayerState_C .+?PersistentLevel\\.(?<state>BP_PlayerState_C_\\d+)\\.Owner = .*?BP_PlayerController_C'.+?:PersistentLevel.(?<controller>BP_PlayerController_C_\\d+)'/;\n\n  return {\n    // listen for join events and wait for PlayerController info\n    pattern(line, logMatch) {\n      if (logMatch) {\n        const { generator, counter, data } = logMatch.groups;\n        let joinData = userJoinInfo.find(l => l.counter === counter);\n\n        // LogServerList includes the new user information\n        if (generator === 'LogServerList') {\n          // create joindata if it doesn't exist\n          if (!joinData) {\n            joinData = { counter };\n            userJoinInfo.push(joinData);\n          }\n\n          // match on username or user id\n          const match = data.match(\n            /^(?<field>UserName|UserId|DisplayName): (?<value>.+)$/,\n          );\n\n          // put that value in the join data\n          if (match) {\n            joinData[\n              match.groups.field as 'UserName' | 'UserId' | 'DisplayName'\n            ] = match.groups.value;\n          }\n\n          // LogNet lets us know the player successfully joined\n        } else if (generator == 'LogNet') {\n          // find which player joined\n          const match = data.match(/^Join succeeded: (.+)$/);\n\n          // make sure this joindata corresponds to this player\n          // TODO: [BRICKADIA] display name used here instead of username...\n          if (match && joinData.DisplayName === match[1]) {\n            // remove that player from our buffer\n            userJoinInfo.splice(userJoinInfo.indexOf(joinData), 1);\n\n            // found joined player, now we need to find the BRPlayerState\n            joiningPlayers.push({\n              displayName: joinData.DisplayName,\n              name: joinData.UserName,\n              id: joinData.UserId,\n            });\n\n            // get the state of all players so we can determine which is this player\n            // TODO: maybe also use the ReplicatedJoinTime, which matches the time for these logs\n            omegga.writeln('GetAll BRPlayerState UserName');\n          }\n        }\n\n        // only match state and controllers if we have joining players\n      } else if (joiningPlayers.length) {\n        const stateMatch = line.match(stateRegExp);\n        const controllerMatch = line.match(controllerRegExp);\n\n        // this line matches our PlayerName -> PlayerState pattern\n        if (stateMatch) {\n          const { name, state } = stateMatch.groups;\n\n          // find the joining player that has a matching name\n          const player = joiningPlayers.find(p => p.name === name);\n\n          // check if another player is already using this state or if there's any joining player with this name\n          if (!player || omegga.players.some(p => p.state === state)) return;\n\n          // this player owns this state, find the controller now\n          player.state = state;\n          omegga.writeln(`GetAll BRPlayerState Owner Name=${state}`);\n\n          // this line matches our PlayerState -> PlayerController pattern\n        } else if (controllerMatch) {\n          const { controller, state } = controllerMatch.groups;\n\n          // find the joining player that has a matching state\n          const player = joiningPlayers.find(p => p.state === state);\n\n          // no player found\n          if (!player) return;\n\n          // assign the controller and state, remove the player from the joining players\n          player.controller = controller;\n          player.state = state;\n          joiningPlayers.splice(joiningPlayers.indexOf(player), 1);\n\n          // return the newly joined player\n          return new Player(\n            omegga,\n            player.name,\n            player.displayName,\n            player.id,\n            player.controller,\n            player.state,\n          );\n        }\n      }\n    },\n    // when there's a match, emit a join event and add the player to the player list\n    callback(player) {\n      omegga.emit('join', player);\n      omegga.players.push(player);\n      omegga.emit(\n        'plugin:players:raw',\n        omegga.players.map(p => p.raw()),\n      );\n    },\n  };\n};\n\nexport default join;\n"],"names":["player","Player"],"mappings":";;;AAGA,MAAM,OAA+B,CAAA,WAAU;AAE7C,QAAM,eAKA,CAAA;AAGN,QAAM,iBAMA,CAAA;AAGN,QAAM,cACJ;AACF,QAAM,mBACJ;AAEF,SAAO;AAAA;AAAA,IAEL,QAAQ,MAAM,UAAU;AACtB,UAAI,UAAU;AACZ,cAAM,EAAE,WAAW,SAAS,KAAA,IAAS,SAAS;AAC9C,YAAI,WAAW,aAAa,KAAK,CAAA,MAAK,EAAE,YAAY,OAAO;AAG3D,YAAI,cAAc,iBAAiB;AAEjC,cAAI,CAAC,UAAU;AACb,uBAAW,EAAE,QAAA;AACb,yBAAa,KAAK,QAAQ;AAAA,UAC5B;AAGA,gBAAM,QAAQ,KAAK;AAAA,YACjB;AAAA,UAAA;AAIF,cAAI,OAAO;AACT,qBACE,MAAM,OAAO,KACf,IAAI,MAAM,OAAO;AAAA,UACnB;AAAA,QAGF,WAAW,aAAa,UAAU;AAEhC,gBAAM,QAAQ,KAAK,MAAM,wBAAwB;AAIjD,cAAI,SAAS,SAAS,gBAAgB,MAAM,CAAC,GAAG;AAE9C,yBAAa,OAAO,aAAa,QAAQ,QAAQ,GAAG,CAAC;AAGrD,2BAAe,KAAK;AAAA,cAClB,aAAa,SAAS;AAAA,cACtB,MAAM,SAAS;AAAA,cACf,IAAI,SAAS;AAAA,YAAA,CACd;AAID,mBAAO,QAAQ,+BAA+B;AAAA,UAChD;AAAA,QACF;AAAA,MAGF,WAAW,eAAe,QAAQ;AAChC,cAAM,aAAa,KAAK,MAAM,WAAW;AACzC,cAAM,kBAAkB,KAAK,MAAM,gBAAgB;AAGnD,YAAI,YAAY;AACd,gBAAM,EAAE,MAAM,MAAA,IAAU,WAAW;AAGnC,gBAAMA,UAAS,eAAe,KAAK,CAAA,MAAK,EAAE,SAAS,IAAI;AAGvD,cAAI,CAACA,WAAU,OAAO,QAAQ,KAAK,CAAA,MAAK,EAAE,UAAU,KAAK,EAAG;AAG5D,UAAAA,QAAO,QAAQ;AACf,iBAAO,QAAQ,mCAAmC,KAAK,EAAE;AAAA,QAG3D,WAAW,iBAAiB;AAC1B,gBAAM,EAAE,YAAY,MAAA,IAAU,gBAAgB;AAG9C,gBAAMA,WAAS,eAAe,KAAK,CAAA,MAAK,EAAE,UAAU,KAAK;AAGzD,cAAI,CAACA,SAAQ;AAGbA,mBAAO,aAAa;AACpBA,mBAAO,QAAQ;AACf,yBAAe,OAAO,eAAe,QAAQA,QAAM,GAAG,CAAC;AAGvD,iBAAO,IAAIC,OAAAA;AAAAA,YACT;AAAA,YACAD,SAAO;AAAA,YACPA,SAAO;AAAA,YACPA,SAAO;AAAA,YACPA,SAAO;AAAA,YACPA,SAAO;AAAA,UAAA;AAAA,QAEX;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,SAASA,SAAQ;AACf,aAAO,KAAK,QAAQA,OAAM;AAC1B,aAAO,QAAQ,KAAKA,OAAM;AAC1B,aAAO;AAAA,QACL;AAAA,QACA,OAAO,QAAQ,IAAI,CAAA,MAAK,EAAE,KAAK;AAAA,MAAA;AAAA,IAEnC;AAAA,EAAA;AAEJ;;"}

package/dist/omegga/matchers/leave.js

@@ -1,59 +1,46 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = __importDefault(require("../../logger"));
-const leave = omegga => {
-    // pattern to get PlayerController from a leave message
-    const ownerRegExp = /Owner: (BP_PlayerController_C_\d+)/;
-    return {
-        // listen for leave events and wait for PlayerController info
-        pattern(_line, logMatch) {
-            // line is not generic console log
-            if (!logMatch)
-                return;
-            const { generator, data } = logMatch.groups;
-            // check if log is a disconnect log
-            if (generator !== 'LogNet' || !data.startsWith('UChannel::Close:'))
-                return;
-            // get the PlayerController from the leave message if there is one (there should be)
-            const match = data.match(ownerRegExp);
-            if (!match)
-                return null;
-            // helper func for finding player with this controller
-            const getLeavingPlayer = () => omegga.players.find(p => p.controller === match[1]);
-            let found = getLeavingPlayer();
-            // attempt to find the player over the course of 2 seconds
-            // this is because a player can join before all their data is collected
-            return new Promise((resolve, reject) => {
-                let tries = 50;
-                function attempt() {
-                    found = getLeavingPlayer();
-                    if (found)
-                        return resolve(found);
-                    if (tries-- < 0)
-                        return reject('ghost player ' + match[1]);
-                    setTimeout(attempt, 50);
-                }
-                attempt();
-            });
-        },
-        // when there's a match, remove the player from the player list, emit a leave event
-        async callback(res) {
-            if (!(res instanceof Promise))
-                return;
-            try {
-                const player = await res;
-                omegga.players.splice(omegga.players.indexOf(player), 1);
-                omegga.emit('leave', player);
-                omegga.emit('plugin:players:raw', omegga.players.map(p => p.raw()));
-            }
-            catch (e) {
-                logger_1.default.error('error getting player leave', e);
-            }
-        },
-    };
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const logger = require("../../logger.js");
+const leave = (omegga) => {
+  const ownerRegExp = /Owner: (BP_PlayerController_C_\d+)/;
+  return {
+    // listen for leave events and wait for PlayerController info
+    pattern(_line, logMatch) {
+      if (!logMatch) return;
+      const { generator, data } = logMatch.groups;
+      if (generator !== "LogNet" || !data.startsWith("UChannel::Close:"))
+        return;
+      const match = data.match(ownerRegExp);
+      if (!match) return null;
+      const getLeavingPlayer = () => omegga.players.find((p) => p.controller === match[1]);
+      let found = getLeavingPlayer();
+      return new Promise((resolve, reject) => {
+        let tries = 50;
+        function attempt() {
+          found = getLeavingPlayer();
+          if (found) return resolve(found);
+          if (tries-- < 0) return reject("ghost player " + match[1]);
+          setTimeout(attempt, 50);
+        }
+        attempt();
+      });
+    },
+    // when there's a match, remove the player from the player list, emit a leave event
+    async callback(res) {
+      if (!(res instanceof Promise)) return;
+      try {
+        const player = await res;
+        omegga.players.splice(omegga.players.indexOf(player), 1);
+        omegga.emit("leave", player);
+        omegga.emit(
+          "plugin:players:raw",
+          omegga.players.map((p) => p.raw())
+        );
+      } catch (e) {
+        logger.default.error("error getting player leave", e);
+      }
+    }
+  };
 };
 exports.default = leave;
-//# sourceMappingURL=leave.js.map
+//# sourceMappingURL=leave.js.map

package/dist/omegga/matchers/leave.js.map

@@ -1 +1 @@
-{"version":3,"file":"leave.js","sourceRoot":"","sources":["../../../src/omegga/matchers/leave.ts"],"names":[],"mappings":";;;;;AAEA,0DAA8B;AAE9B,MAAM,KAAK,GAA0C,MAAM,CAAC,EAAE;IAC5D,uDAAuD;IACvD,MAAM,WAAW,GAAG,oCAAoC,CAAC;IAEzD,OAAO;QACL,6DAA6D;QAC7D,OAAO,CAAC,KAAK,EAAE,QAAQ;YACrB,kCAAkC;YAClC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEtB,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC5C,mCAAmC;YACnC,IAAI,SAAS,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;gBAChE,OAAO;YAET,oFAAoF;YACpF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACtC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YAExB,sDAAsD;YACtD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtD,IAAI,KAAK,GAAG,gBAAgB,EAAE,CAAC;YAE/B,0DAA0D;YAC1D,uEAAuE;YACvE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,SAAS,OAAO;oBACd,KAAK,GAAG,gBAAgB,EAAE,CAAC;oBAE3B,IAAI,KAAK;wBAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;oBACjC,IAAI,KAAK,EAAE,GAAG,CAAC;wBAAE,OAAO,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE3D,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC;QACD,mFAAmF;QACnF,KAAK,CAAC,QAAQ,CAAC,GAAG;YAChB,IAAI,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC;gBAAE,OAAO;YAEtC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC;gBACzB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC7B,MAAM,CAAC,IAAI,CACT,oBAAoB,EACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CACjC,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,gBAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,CAAC,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"leave.js","sources":["../../../src/omegga/matchers/leave.ts"],"sourcesContent":["import { MatchGenerator } from './types';\nimport { OmeggaPlayer } from '@/plugin';\nimport Logger from '@/logger';\n\nconst leave: MatchGenerator<Promise<OmeggaPlayer>> = omegga => {\n  // pattern to get PlayerController from a leave message\n  const ownerRegExp = /Owner: (BP_PlayerController_C_\\d+)/;\n\n  return {\n    // listen for leave events and wait for PlayerController info\n    pattern(_line, logMatch) {\n      // line is not generic console log\n      if (!logMatch) return;\n\n      const { generator, data } = logMatch.groups;\n      // check if log is a disconnect log\n      if (generator !== 'LogNet' || !data.startsWith('UChannel::Close:'))\n        return;\n\n      // get the PlayerController from the leave message if there is one (there should be)\n      const match = data.match(ownerRegExp);\n      if (!match) return null;\n\n      // helper func for finding player with this controller\n      const getLeavingPlayer = () =>\n        omegga.players.find(p => p.controller === match[1]);\n\n      let found = getLeavingPlayer();\n\n      // attempt to find the player over the course of 2 seconds\n      // this is because a player can join before all their data is collected\n      return new Promise((resolve, reject) => {\n        let tries = 50;\n        function attempt() {\n          found = getLeavingPlayer();\n\n          if (found) return resolve(found);\n          if (tries-- < 0) return reject('ghost player ' + match[1]);\n\n          setTimeout(attempt, 50);\n        }\n        attempt();\n      });\n    },\n    // when there's a match, remove the player from the player list, emit a leave event\n    async callback(res) {\n      if (!(res instanceof Promise)) return;\n\n      try {\n        const player = await res;\n        omegga.players.splice(omegga.players.indexOf(player), 1);\n        omegga.emit('leave', player);\n        omegga.emit(\n          'plugin:players:raw',\n          omegga.players.map(p => p.raw()),\n        );\n      } catch (e) {\n        Logger.error('error getting player leave', e);\n      }\n    },\n  };\n};\n\nexport default leave;\n"],"names":["Logger"],"mappings":";;;AAIA,MAAM,QAA+C,CAAA,WAAU;AAE7D,QAAM,cAAc;AAEpB,SAAO;AAAA;AAAA,IAEL,QAAQ,OAAO,UAAU;AAEvB,UAAI,CAAC,SAAU;AAEf,YAAM,EAAE,WAAW,KAAA,IAAS,SAAS;AAErC,UAAI,cAAc,YAAY,CAAC,KAAK,WAAW,kBAAkB;AAC/D;AAGF,YAAM,QAAQ,KAAK,MAAM,WAAW;AACpC,UAAI,CAAC,MAAO,QAAO;AAGnB,YAAM,mBAAmB,MACvB,OAAO,QAAQ,KAAK,OAAK,EAAE,eAAe,MAAM,CAAC,CAAC;AAEpD,UAAI,QAAQ,iBAAA;AAIZ,aAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,YAAI,QAAQ;AACZ,iBAAS,UAAU;AACjB,kBAAQ,iBAAA;AAER,cAAI,MAAO,QAAO,QAAQ,KAAK;AAC/B,cAAI,UAAU,EAAG,QAAO,OAAO,kBAAkB,MAAM,CAAC,CAAC;AAEzD,qBAAW,SAAS,EAAE;AAAA,QACxB;AACA,gBAAA;AAAA,MACF,CAAC;AAAA,IACH;AAAA;AAAA,IAEA,MAAM,SAAS,KAAK;AAClB,UAAI,EAAE,eAAe,SAAU;AAE/B,UAAI;AACF,cAAM,SAAS,MAAM;AACrB,eAAO,QAAQ,OAAO,OAAO,QAAQ,QAAQ,MAAM,GAAG,CAAC;AACvD,eAAO,KAAK,SAAS,MAAM;AAC3B,eAAO;AAAA,UACL;AAAA,UACA,OAAO,QAAQ,IAAI,CAAA,MAAK,EAAE,KAAK;AAAA,QAAA;AAAA,MAEnC,SAAS,GAAG;AACVA,uBAAO,MAAM,8BAA8B,CAAC;AAAA,MAC9C;AAAA,IACF;AAAA,EAAA;AAEJ;;"}

package/dist/omegga/matchers/mapChange.js

@@ -1,38 +1,29 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const map_1 = require("../../util/map");
-const mapChange = omegga => {
-    // LogLoad: Took 0.396473 seconds to LoadMap(/Game/Maps/Plate/Plate)
-    const mapChangeRegExp = /^Took .+ seconds to LoadMap\((?<map>.+)\)$/;
-    return {
-        // listen for commands messages
-        pattern(_line, logMatch) {
-            // line is not generic console log
-            if (!logMatch)
-                return;
-            const { generator, data } = logMatch.groups;
-            // check if log is a world log
-            if (generator !== 'LogLoad')
-                return;
-            // match the log to the map change finish pattern
-            const matchChange = data.match(mapChangeRegExp);
-            if (matchChange && matchChange.groups && matchChange.groups.map) {
-                return (0, map_1.brn2n)(matchChange.groups.map);
-            }
-            return null;
-        },
-        // when there's a match, emit the comand event
-        callback(map) {
-            // if the only argument is an empty string, ignore it
-            if (map) {
-                // dont emit on startup or when there is no current map
-                if (omegga.started && omegga.currentMap)
-                    omegga.emit('mapchange', { map });
-                // set omegga's current map
-                omegga.currentMap = map;
-            }
-        },
-    };
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const map = require("../../util/map.js");
+const mapChange = (omegga) => {
+  const mapChangeRegExp = /^Took .+ seconds to LoadMap\((?<map>.+)\)$/;
+  return {
+    // listen for commands messages
+    pattern(_line, logMatch) {
+      if (!logMatch) return;
+      const { generator, data } = logMatch.groups;
+      if (generator !== "LogLoad") return;
+      const matchChange = data.match(mapChangeRegExp);
+      if (matchChange && matchChange.groups && matchChange.groups.map) {
+        return map.brn2n(matchChange.groups.map);
+      }
+      return null;
+    },
+    // when there's a match, emit the comand event
+    callback(map2) {
+      if (map2) {
+        if (omegga.started && omegga.currentMap)
+          omegga.emit("mapchange", { map: map2 });
+        omegga.currentMap = map2;
+      }
+    }
+  };
 };
 exports.default = mapChange;
-//# sourceMappingURL=mapChange.js.map
+//# sourceMappingURL=mapChange.js.map

package/dist/omegga/matchers/mapChange.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapChange.js","sourceRoot":"","sources":["../../../src/omegga/matchers/mapChange.ts"],"names":[],"mappings":";;AAAA,wCAAkC;AAGlC,MAAM,SAAS,GAA2B,MAAM,CAAC,EAAE;IACjD,oEAAoE;IACpE,MAAM,eAAe,GAAG,4CAA4C,CAAC;IAErE,OAAO;QACL,+BAA+B;QAC/B,OAAO,CAAC,KAAK,EAAE,QAAQ;YACrB,kCAAkC;YAClC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEtB,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC5C,8BAA8B;YAC9B,IAAI,SAAS,KAAK,SAAS;gBAAE,OAAO;YAEpC,iDAAiD;YACjD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAChD,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBAChE,OAAO,IAAA,WAAK,EAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QACD,8CAA8C;QAC9C,QAAQ,CAAC,GAAG;YACV,qDAAqD;YACrD,IAAI,GAAG,EAAE,CAAC;gBACR,uDAAuD;gBACvD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU;oBACrC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBAEpC,2BAA2B;gBAC3B,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC;YAC1B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"mapChange.js","sources":["../../../src/omegga/matchers/mapChange.ts"],"sourcesContent":["import { brn2n } from '@util/map';\nimport { MatchGenerator } from './types';\n\nconst mapChange: MatchGenerator<string> = omegga => {\n  // LogLoad: Took 0.396473 seconds to LoadMap(/Game/Maps/Plate/Plate)\n  const mapChangeRegExp = /^Took .+ seconds to LoadMap\\((?<map>.+)\\)$/;\n\n  return {\n    // listen for commands messages\n    pattern(_line, logMatch) {\n      // line is not generic console log\n      if (!logMatch) return;\n\n      const { generator, data } = logMatch.groups;\n      // check if log is a world log\n      if (generator !== 'LogLoad') return;\n\n      // match the log to the map change finish pattern\n      const matchChange = data.match(mapChangeRegExp);\n      if (matchChange && matchChange.groups && matchChange.groups.map) {\n        return brn2n(matchChange.groups.map);\n      }\n\n      return null;\n    },\n    // when there's a match, emit the comand event\n    callback(map) {\n      // if the only argument is an empty string, ignore it\n      if (map) {\n        // dont emit on startup or when there is no current map\n        if (omegga.started && omegga.currentMap)\n          omegga.emit('mapchange', { map });\n\n        // set omegga's current map\n        omegga.currentMap = map;\n      }\n    },\n  };\n};\n\nexport default mapChange;\n"],"names":["brn2n","map"],"mappings":";;;AAGA,MAAM,YAAoC,CAAA,WAAU;AAElD,QAAM,kBAAkB;AAExB,SAAO;AAAA;AAAA,IAEL,QAAQ,OAAO,UAAU;AAEvB,UAAI,CAAC,SAAU;AAEf,YAAM,EAAE,WAAW,KAAA,IAAS,SAAS;AAErC,UAAI,cAAc,UAAW;AAG7B,YAAM,cAAc,KAAK,MAAM,eAAe;AAC9C,UAAI,eAAe,YAAY,UAAU,YAAY,OAAO,KAAK;AAC/D,eAAOA,UAAM,YAAY,OAAO,GAAG;AAAA,MACrC;AAEA,aAAO;AAAA,IACT;AAAA;AAAA,IAEA,SAASC,MAAK;AAEZ,UAAIA,MAAK;AAEP,YAAI,OAAO,WAAW,OAAO;AAC3B,iBAAO,KAAK,aAAa,EAAE,KAAAA,KAAA,CAAK;AAGlC,eAAO,aAAaA;AAAA,MACtB;AAAA,IACF;AAAA,EAAA;AAEJ;;"}