omegga 1.0.39 → 1.1.0

package/dist/omegga/auth.js

@@ -15,18 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genAuthFiles = exports.writeAuthFiles = void 0;
+exports.writeAuthFiles = writeAuthFiles;
+exports.genAuthFiles = genAuthFiles;
 const logger_1 = __importDefault(require("../logger"));
 const softconfig_1 = __importDefault(require("../softconfig"));
 const file = __importStar(require("../util/file"));
@@ -50,22 +61,33 @@ async function removeTempDir() {
     }
 }
 // read the auth files into a buffer
-function readAuthFiles() {
+function readAuthFiles(savedDir, authDir) {
     const files = {};
-    for (const f of softconfig_1.default.BRICKADIA_AUTH_FILES) {
-        files[f] = fs_1.default.readFileSync(path_1.default.join(softconfig_1.default.TEMP_DIR_NAME, softconfig_1.default.DATA_PATH, 'Saved/Auth', f));
+    const prefix = path_1.default.join(softconfig_1.default.TEMP_DIR_NAME, softconfig_1.default.DATA_PATH, savedDir, authDir);
+    for (const file of softconfig_1.default.BRICKADIA_AUTH_FILES) {
+        const filepath = path_1.default.join(prefix, file);
+        if (!fs_1.default.existsSync(filepath)) {
+            logger_1.default.warn('Auth file', file, 'not found...');
+            continue;
+        }
+        logger_1.default.verbose('Reading auth file', file, 'from', filepath);
+        files[file] = fs_1.default.readFileSync(filepath);
     }
     return files;
 }
 // write auth files object to a server path
 function writeAuthFiles(dstDir, files) {
     for (const f in files) {
+        if (!files[f]) {
+            logger_1.default.warn('Auth file', f, 'is empty, skipping write...');
+            continue;
+        }
+        logger_1.default.verbose('Writing auth file', f, 'to', dstDir);
         fs_1.default.writeFileSync(path_1.default.join(dstDir, f), files[f]);
     }
 }
-exports.writeAuthFiles = writeAuthFiles;
 // from credentials, build brickadia auth tokens
-async function genAuthFiles(email, password, { debug = false, branch }) {
+async function genAuthFiles(email, password, { debug = false, authDir = softconfig_1.default.CONFIG_AUTH_DIR, savedDir = softconfig_1.default.CONFIG_SAVED_DIR, branch, launchArgs, }) {
     logger_1.default.verbose('Generating auth files');
     // remove existing temporary install path
     await removeTempDir();
@@ -81,6 +103,8 @@ async function genAuthFiles(email, password, { debug = false, branch }) {
             name: 'omegga auth init',
             __LOCAL: fs_1.default.existsSync(softconfig_1.default.LOCAL_LAUNCHER),
             branch,
+            authDir,
+            launchArgs,
         },
         credentials: { email, password },
     };
@@ -94,7 +118,7 @@ async function genAuthFiles(email, password, { debug = false, branch }) {
     // create a dummy omegga
     const omegga = new server_1.default(softconfig_1.default.TEMP_DIR_NAME, config, options);
     // create the unlisted server config
-    (0, config_1.write)(softconfig_1.default.TEMP_DIR_NAME, config);
+    (0, config_1.write)(path_1.default.join(softconfig_1.default.TEMP_DIR_NAME, softconfig_1.default.DATA_PATH), config);
     omegga.start();
     const success = await new Promise((resolve, reject) => {
         let resolved = false;
@@ -129,11 +153,10 @@ async function genAuthFiles(email, password, { debug = false, branch }) {
         omegga.once('server:stopped', finish('stopped'));
     });
     // read the auth files on success
-    const files = success ? readAuthFiles() : null;
+    const files = success ? readAuthFiles(savedDir, authDir) : null;
     // remove temp dir
     removeTempDir();
     // return auth files (or null)
     return files;
 }
-exports.genAuthFiles = genAuthFiles;
 //# sourceMappingURL=auth.js.map

package/dist/omegga/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/omegga/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/omegga/auth.ts"],"names":[],"mappings":"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"}

package/dist/omegga/commandInjector.d.ts

@@ -1,6 +1,6 @@
 import type LogWrangler from './logWrangler';
 import { InjectedCommands } from "../plugin";
-export declare type PawnDataField<F, T = string> = {
+export type PawnDataField<F, T = string> = {
     /**
      * The command to execute and listen to.
      */

package/dist/omegga/commandInjector.js

@@ -55,7 +55,7 @@ const COMMANDS = {
                     roles: roles
                         .trim()
                         .split(', ')
-                        .filter(r => r.length > 0),
+                        .filter(r => r.length > 0), // roles are split by ', '
                     address: address.replace('(Owner)', '').trim(),
                     id: id.trim(),
                 };
@@ -124,7 +124,7 @@ const COMMANDS = {
      * get every player's position and alive states
      */
     async getAllPlayerPositions() {
-        const pawnRegExp = /(?<index>\d+)\) BP_PlayerController_C .+?PersistentLevel\.(?<controller>BP_PlayerController_C_\d+)\.Pawn = (?:None|BP_FigureV2_C'.+?:PersistentLevel.(?<pawn>BP_FigureV2_C_\d+)')?$/;
+        const pawnRegExp = /(?<index>\d+)\) BP_PlayerController_C .+?PersistentLevel\.(?<controller>BP_PlayerController_C_\d+)\.Pawn = .*?(?:None|BP_FigureV2_C'.+?:PersistentLevel.(?<pawn>BP_FigureV2_C_\d+)')?$/;
         const posRegExp = /(?<index>\d+)\) CapsuleComponent .+?PersistentLevel\.(?<pawn>BP_FigureV2_C_\d+)\.CollisionCylinder\.RelativeLocation = \(X=(?<x>[\d.-]+),Y=(?<y>[\d.-]+),Z=(?<z>[\d.-]+)\)$/;
         const deadFigureRegExp = /(?<index>\d+)\) BP_FigureV2_C .+?PersistentLevel\.(?<pawn>BP_FigureV2_C_\d+)\.bIsDead = (?<dead>(True|False))$/;
         // wait for the pawn and position watchers to return all the results
@@ -169,7 +169,7 @@ const COMMANDS = {
         const teamNameRegExp = /^(?<index>\d+)\) BP_Team(_\w+)?_C (.+):PersistentLevel.(?<ruleset>BP_Ruleset_C_\d+)\.(?<team>BP_Team(_\w+)?_C_\d+)\.TeamName = (?<name>.*)$/;
         const teamColorRegExp = /^(?<index>\d+)\) BP_Team(_\w+)?_C (.+):PersistentLevel.(?<ruleset>BP_Ruleset_C_\d+)\.(?<team>BP_Team(_\w+)?_C_\d+)\.TeamColor = \(B=(?<b>\d+),G=(?<g>\d+),R=(?<r>\d+),A=(?<a>\d+)\)$/;
         const teamMembersRegExp = /^(?<index>\d+)\) BP_Team(_\w+)?_C (.+):PersistentLevel.(?<ruleset>BP_Ruleset_C_\d+)\.(?<team>BP_Team(_\w+)?_C_\d+)\.MemberStates =$/;
-        const playerStateRegExp = /^\t(?<index>\d+): BP_PlayerState_C'(.+):PersistentLevel\.(?<state>BP_PlayerState_C_\d+)'$/;
+        const playerStateRegExp = /^\t(?<index>\d+): .*?BP_PlayerState_C'(.+):PersistentLevel\.(?<state>BP_PlayerState_C_\d+)'$/;
         try {
             // parse console output to get the minigame info
             const [rulesets, ruleMembers, teamMembers, teamNames, teamColors] = await Promise.all([
@@ -218,7 +218,7 @@ const COMMANDS = {
                     .find(m => m.item.ruleset === r.groups.ruleset)
                     .members // get the members from this ruleset
                     .map(m => this.getPlayer(m.state))
-                    .filter(Boolean),
+                    .filter(Boolean), // get the players
                 // get the teams for this ruleset
                 teams: teamMembers
                     .filter(m => m.item.ruleset === r.groups.ruleset) // only get teams from this ruleset

package/dist/omegga/commandInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandInjector.js","sourceRoot":"","sources":["../../src/omegga/commandInjector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commandInjector.js","sourceRoot":"","sources":["../../src/omegga/commandInjector.ts"],"names":[],"mappings":"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"}

package/dist/omegga/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };

package/dist/omegga/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/omegga/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,mDAAmC;AAEnC,mBAAmB;AACnB,mDAAmC;AAEnC,yDAAyD;AACzD,2DAA2C;AAE3C,gCAAgC;AAChC,+CAA+B;AAE/B,gDAAgD;AAChD,6DAA6C;AAE7C,6DAA6D;AAC7D,qEAAqD;AAErD,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/omegga/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,mDAAmC;AAEnC,mBAAmB;AACnB,mDAAmC;AAEnC,yDAAyD;AACzD,2DAA2C;AAE3C,gCAAgC;AAChC,+CAA+B;AAE/B,gDAAgD;AAChD,6DAA6C;AAE7C,6DAA6D;AAC7D,qEAAqD;AAErD,0CAAwB"}

package/dist/omegga/logWrangler.d.ts

@@ -17,7 +17,7 @@ declare class LogWrangler implements LogWrangling {
         last?: IWatcher<T>['last'];
         exec?: () => void;
     }): Promise<IWatcher<T>['matches']>;
-    watchLogChunk<T = string>(cmd: string, pattern: IWatcher<T>['pattern'], { first, last, afterMatchDelay, timeoutDelay, }: {
+    watchLogChunk<T = string>(cmd: string, pattern: IWatcher<T>['pattern'], { first, last, afterMatchDelay, timeoutDelay, }?: {
         first?: 'index' | ((match: T) => boolean);
         last?: IWatcher<T>['last'];
         afterMatchDelay?: number;

package/dist/omegga/logWrangler.js

@@ -72,17 +72,17 @@ class LogWrangler {
                 last,
                 matches: [],
             };
-            (watcher.resolve = (...args) => {
+            watcher.resolve = (...args) => {
                 clearTimeout(watcher.timeout);
                 resolve(args);
-            }),
-                // remove helper
-                (watcher.remove = () => {
-                    const index = __classPrivateFieldGet(this, _LogWrangler_watchers, "f").indexOf(watcher);
-                    if (index > -1) {
-                        __classPrivateFieldGet(this, _LogWrangler_watchers, "f").splice(index, 1);
-                    }
-                });
+            };
+            // remove helper
+            watcher.remove = () => {
+                const index = __classPrivateFieldGet(this, _LogWrangler_watchers, "f").indexOf(watcher);
+                if (index > -1) {
+                    __classPrivateFieldGet(this, _LogWrangler_watchers, "f").splice(index, 1);
+                }
+            };
             // what the watcher dones when it completes
             watcher.done = () => {
                 // remove the watcher if it exists
@@ -109,7 +109,7 @@ class LogWrangler {
     // first is a function or 'index' for the index capture group that determines if this is match is the first log
     // last is a function that determines if this match is the last log (and can terminate early)
     // aftermatch delay is borrowed from addWatcher
-    watchLogChunk(cmd, pattern, { first, last, afterMatchDelay = 10, timeoutDelay = 100, }) {
+    watchLogChunk(cmd, pattern, { first, last, afterMatchDelay = 10, timeoutDelay = 100, } = {}) {
         // we're focused on the counter part of this, the rest will be passed to the pattern matcher
         const logLineRegExp = /\[(?<date>\d{4}\.\d\d.\d\d-\d\d.\d\d.\d\d:\d{3})\]\[\s*(?<counter>\d+)\](?<rest>.*)$/;
         // keep track of the current log line
@@ -158,8 +158,15 @@ class LogWrangler {
                 return;
             }
             // prematurely terminate the match if another log is found
-            if (counter !== currentCounter)
-                return '[OMEGGA_WATCHER_DONE]';
+            if (counter !== currentCounter) {
+                // long running commands
+                if (Number(counter) - 1 + '' === currentCounter) {
+                    currentCounter = counter;
+                }
+                else {
+                    return '[OMEGGA_WATCHER_DONE]';
+                }
+            }
             // add the match to the bundle
             return match;
         }, {

package/dist/omegga/logWrangler.js.map

@@ -1 +1 @@
-{"version":3,"file":"logWrangler.js","sourceRoot":"","sources":["../../src/omegga/logWrangler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logWrangler.js","sourceRoot":"","sources":["../../src/omegga/logWrangler.ts"],"names":[],"mappings":"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"}

package/dist/omegga/matchers/auth.d.ts

@@ -2,6 +2,7 @@ import { MatchGenerator } from './types';
 declare const auth: MatchGenerator<[
     'host' | 'invalid' | 'valid',
     {
+        displayName: string;
         name: string;
         id: string;
     } | null

package/dist/omegga/matchers/auth.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const auth = omegga => {
     // patterns for leave message and host detection
-    const hostRegExp = /^Logged in as (?<name>.+) \((?<id>[0-9a-fA-F-]{36})\)\.$/;
-    const invalidRegExp = /^(Error: AuthState is Invalid on dedicated server - exiting\.|Changing AuthState from \w+ to Invalid\.)$/;
+    const hostRegExp = /^Logged in as (?<displayName>.+) \((?<username>.+) - (?<id>[0-9a-fA-F-]{36})\)\.$/;
+    const invalidRegExp = /^(Error: AuthState is Invalid on dedicated server - exiting\.|Error: Authentication failed on dedicated server\. Exiting now\.|Changing AuthState from \w+ to Invalid\.)$/;
     const validRegExp = /^Changing AuthState from \w+ to Valid(Online|Offline)\.$/;
     return {
         // listen for auth messages
@@ -13,7 +13,7 @@ const auth = omegga => {
                 return;
             const { generator, data } = logMatch.groups;
             // check if log is an auth log
-            if (generator !== 'LogAuthManager' && generator !== 'LogAuthSubsystem')
+            if (generator !== 'LogBRAuthSubsystem')
                 return;
             // match against the patterns
             const hostMatch = data.match(hostRegExp);
@@ -21,8 +21,8 @@ const auth = omegga => {
             const validMatch = data.match(validRegExp);
             // if the log matches one of the patterns, return the result
             if (hostMatch) {
-                const { name, id } = hostMatch.groups;
-                return ['host', { name, id }];
+                const { displayName, username, id } = hostMatch.groups;
+                return ['host', { displayName, name: username, id }];
             }
             else if (invalidMatch) {
                 return ['invalid', null];

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

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/omegga/matchers/auth.ts"],"names":[],"mappings":";;AAEA,MAAM,IAAI,GAEN,MAAM,CAAC,EAAE;IACX,gDAAgD;IAChD,MAAM,UAAU,GAAG,0DAA0D,CAAC;IAC9E,MAAM,aAAa,GACjB,0GAA0G,CAAC;IAC7G,MAAM,WAAW,GACf,0DAA0D,CAAC;IAE7D,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;YAC5C,8BAA8B;YAC9B,IAAI,SAAS,KAAK,gBAAgB,IAAI,SAAS,KAAK,kBAAkB;gBACpE,OAAO;YAET,6BAA6B;YAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAE3C,4DAA4D;YAC5D,IAAI,SAAS,EAAE;gBACb,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;gBACtC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;aAC/B;iBAAM,IAAI,YAAY,EAAE;gBACvB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC1B;iBAAM,IAAI,UAAU,EAAE;gBACrB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aACxB;QACH,CAAC;QACD,oDAAoD;QACpD,QAAQ,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;YACnB,IAAI,IAAI,IAAI,MAAM,EAAE;gBAClB,sBAAsB;gBACtB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;aAC1C;iBAAM,IAAI,IAAI,KAAK,OAAO,EAAE;gBAC3B,qCAAqC;gBACrC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;aAClD;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE;gBAC7B,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC5B,qDAAqD;aACtD;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/omegga/matchers/auth.ts"],"names":[],"mappings":";;AAEA,MAAM,IAAI,GAKN,MAAM,CAAC,EAAE;IACX,gDAAgD;IAChD,MAAM,UAAU,GACd,mFAAmF,CAAC;IACtF,MAAM,aAAa,GACjB,2KAA2K,CAAC;IAC9K,MAAM,WAAW,GACf,0DAA0D,CAAC;IAE7D,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;YAC5C,8BAA8B;YAC9B,IAAI,SAAS,KAAK,oBAAoB;gBAAE,OAAO;YAE/C,6BAA6B;YAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAE3C,4DAA4D;YAC5D,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;gBACvD,OAAO,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACvD,CAAC;iBAAM,IAAI,YAAY,EAAE,CAAC;gBACxB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC3B,CAAC;iBAAM,IAAI,UAAU,EAAE,CAAC;gBACtB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,oDAAoD;QACpD,QAAQ,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;YACnB,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,sBAAsB;gBACtB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC5B,qCAAqC;gBACrC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YACnD,CAAC;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC5B,qDAAqD;YACvD,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}

package/dist/omegga/matchers/chat.d.ts

@@ -2,6 +2,7 @@ import { MatchGenerator } from './types';
 declare const chat: MatchGenerator<{
     type: string;
     name: string;
+    id?: string;
     kicker?: string;
     reason?: string;
     message?: string;

package/dist/omegga/matchers/chat.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chat = omegga => {
     // pattern to get PlayerController from a leave message
-    const chatRegExp = /^(?<name>.+?): (?<message>.+)$/;
+    const chatRegExp = /^\[SenderId: (?<userId>[^\]]+)\] (?<name>.+?): (?<message>.+)$/;
     const kickRegExp = /^(?<name>.+?) was kicked by (?<kicker>.+?) \((?<reason>.+?)\)$/;
-    const exists = (name) => omegga.players.some(p => p.name === name);
+    const exists = (name, id) => id
+        ? omegga.players.some(p => p.id === id)
+        : omegga.players.some(p => p.displayName === name);
     const sanitizeMsg = (msg) => msg
         .toString()
         .replace(/&gt;/g, '>')
         .replace(/&und;/g, '_')
         .replace(/&lt;/g, '<')
         .replace(/&scl;/g, ';');
-    const sanitizeName = (name) => name.toString().replace(/&und;/g, '_');
+    const sanitizeName = (name) => name.toString().replace(/&und;/g, '_').replace(/&scl;/g, ';');
     return {
         // listen for chat messages
         pattern(_line, logMatch) {
@@ -26,14 +28,14 @@ const chat = omegga => {
             const chatMatch = data.match(chatRegExp);
             const kickMatch = data.match(kickRegExp);
             if (chatMatch) {
-                let { name, message } = chatMatch.groups;
+                let { userId: id, name, message } = chatMatch.groups;
                 name = sanitizeName(name);
                 message = sanitizeMsg(message);
                 // no player has this name. probably a bug
-                if (!exists(name))
+                if (!exists(name, id))
                     return;
                 // return the player with the corresponding controller
-                return { type: 'chat', name, message };
+                return { type: 'chat', id, name, message };
             }
             else if (kickMatch) {
                 let { name, kicker, reason } = kickMatch.groups;
@@ -46,8 +48,12 @@ const chat = omegga => {
             }
         },
         // when there's a match, emit the chat message event
-        callback({ type, name, kicker, message, reason }) {
+        callback({ type, id, name, kicker, message, reason }) {
             if (type === 'chat') {
+                const player = omegga.players.find(p => p.id === id);
+                // Use the player's non-display-name if available
+                if (player)
+                    name = player.name;
                 omegga.emit('chat', name, message);
                 // chat command parsing, emit `chatcmd:test` when `!test` is sent in chat
                 if (message.startsWith('!')) {

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

@@ -1 +1 @@
-{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/omegga/matchers/chat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/omegga/matchers/chat.ts"],"names":[],"mappings":"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"}

package/dist/omegga/matchers/command.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command = omegga => {
     // pattern to get PlayerController from a leave message
-    const commandRegExp = /^Player (?<name>.+?) is trying to call command "\/(?<command>.+?)" with arg string "(?<args>.*?)".$/;
+    const commandRegExp = /^Player \"(?<name>.+?)\" is trying to call command "\/(?<command>.+?)" with arg string "(?<args>.*?)".$/;
     return {
         // listen for commands messages
         pattern(_line, logMatch) {

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

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/omegga/matchers/command.ts"],"names":[],"mappings":";;AAEA,MAAM,OAAO,GAIR,MAAM,CAAC,EAAE;IACZ,uDAAuD;IACvD,MAAM,aAAa,GACjB,qGAAqG,CAAC;IAExG,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,gCAAgC;YAChC,IAAI,SAAS,KAAK,iBAAiB;gBAAE,OAAO;YAE5C,uCAAuC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACxC,IAAI,KAAK,EAAE;gBACT,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC;gBAE7C,0CAA0C;gBAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;oBAAE,OAAO;gBAEvD,oCAAoC;gBACpC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;aACjD;YAED,OAAO;QACT,CAAC;QACD,8CAA8C;QAC9C,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YAC9B,qDAAqD;YACrD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;gBAAE,IAAI,CAAC,GAAG,EAAE,CAAC;YAE1D,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QAC3D,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/omegga/matchers/command.ts"],"names":[],"mappings":";;AAEA,MAAM,OAAO,GAIR,MAAM,CAAC,EAAE;IACZ,uDAAuD;IACvD,MAAM,aAAa,GACjB,yGAAyG,CAAC;IAE5G,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,gCAAgC;YAChC,IAAI,SAAS,KAAK,iBAAiB;gBAAE,OAAO;YAE5C,uCAAuC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACxC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC;gBAE7C,0CAA0C;gBAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;oBAAE,OAAO;gBAEvD,oCAAoC;gBACpC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAClD,CAAC;YAED,OAAO;QACT,CAAC;QACD,8CAA8C;QAC9C,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;YAC9B,qDAAqD;YACrD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;gBAAE,IAAI,CAAC,GAAG,EAAE,CAAC;YAE1D,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QAC3D,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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;gBAClE,gBAAM,CAAC,IAAI,CACT,YAAY,CAAC,MAAM,EACnB,0EAA0E,CAC3E,CAAC;aACH;QACH,CAAC;QAED,QAAQ,KAAI,CAAC;KACd,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
+{"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"}

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","sourceRoot":"","sources":["../../../src/omegga/matchers/interact.ts"],"names":[],"mappings":"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"}

package/dist/omegga/matchers/join.js

@@ -10,8 +10,8 @@ const join = omegga => {
     // 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+)\.PlayerNamePrivate = (?<name>.+)$/;
-    const controllerRegExp = /BP_PlayerState_C .+?PersistentLevel\.(?<state>BP_PlayerState_C_\d+)\.Owner = BP_PlayerController_C'.+?:PersistentLevel.(?<controller>BP_PlayerController_C_\d+)'/;
+    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) {
@@ -26,27 +26,29 @@ const join = omegga => {
                         userJoinInfo.push(joinData);
                     }
                     // match on username or user id
-                    const match = data.match(/^(?<field>UserName|UserId): (?<value>.+)$/);
+                    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;
+                    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
-                    if (match && joinData.UserName === match[1]) {
+                    // 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 (including the one that is joining)
-                        omegga.writeln('GetAll BRPlayerState PlayerNamePrivate');
+                        // get the state of the joining player
+                        omegga.writeln(`GetAll BRPlayerState UserName UserName=${joinData.UserName}`);
                     }
                 }
                 // only match state and controllers if we have joining players
@@ -79,7 +81,7 @@ const join = omegga => {
                     player.state = state;
                     joiningPlayers.splice(joiningPlayers.indexOf(player), 1);
                     // return the newly joined player
-                    return new player_1.default(omegga, player.name, player.id, player.controller, player.state);
+                    return new player_1.default(omegga, player.name, player.displayName, player.id, player.controller, player.state);
                 }
             }
         },