Merge pull request #31 from JimWails/master

Fix flea market message lost

src/CoopConfig.ts

@@ -5,13 +5,17 @@ export class CoopConfig {
     public webSocketPort: number;
     public natHelperPort: number;
     public useUPNP: boolean;
+    public useMessageWSUrlOverride: boolean;
+    public messageWSUrlOverride: string;
 
     public static Instance: CoopConfig;
 
     constructor() {
         this.webSocketPort = 6970;
         this.natHelperPort = 6971;
         this.useUPNP = true;
+        this.useMessageWSUrlOverride = false;
+        this.messageWSUrlOverride = '127.0.0.1:6969';
 
         const configFilePath = path.join(__dirname, "..", "config");
         if(!fs.existsSync(configFilePath))

src/Overrides/HttpServerHelperOverride.ts

@@ -0,0 +1,42 @@
+import { DependencyContainer } from "tsyringe";
+import { CoopConfig } from "./../CoopConfig";
+import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper";
+
+export class HttpServerHelperOverride {
+    container: DependencyContainer;
+
+    httpServerHelper: HttpServerHelper;
+
+    constructor
+    (
+        container: DependencyContainer
+    )
+    {
+        this.container = container;
+        this.httpServerHelper = container.resolve<HttpServerHelper>("HttpServerHelper");
+    }
+
+    public getWebsocketUrl(): string {
+        const originalUrl = this.httpServerHelper.buildUrl();
+        console.log(`Original Message WS Url is ${originalUrl}`);
+        if (CoopConfig.Instance.useMessageWSUrlOverride) {
+            console.log(`Override Message WS Url to ${CoopConfig.Instance.messageWSUrlOverride}`);
+            return `ws://${CoopConfig.Instance.messageWSUrlOverride}`;
+        } else {
+            return `ws://${originalUrl}`;
+        }
+    }
+
+    public override(): void 
+    {
+        this.container.afterResolution("HttpServerHelper", (_t, result: HttpServerHelper) => 
+        {
+            // We want to replace the original method logic with something different
+            result.getWebsocketUrl = () => 
+            {
+                return this.getWebsocketUrl();
+            }
+            // The modifier Always makes sure this replacement method is ALWAYS replaced
+        }, {frequency: "Always"});
+    }
+}

src/StayInTarkovMod.ts

@@ -33,6 +33,7 @@ import { friendlyAI } from "./FriendlyAI";
 import { BundleLoaderOverride } from "./Overrides/BundleLoaderOverride";
 import { LauncherControllerOverride } from "./Overrides/LauncherControllerOverride";
 import { GameControllerOverride } from "./Overrides/GameControllerOverride";
+import { HttpServerHelperOverride } from "./Overrides/HttpServerHelperOverride";
 // -------------------------------------------------------------------------
 
 // Controllers -------------------------------------------------------------
@@ -151,6 +152,10 @@ export class StayInTarkovMod implements IPreAkiLoadMod, IPostDBLoadMod
         const launcherControllerOverride = new LauncherControllerOverride(container, gameControllerOverride);
         launcherControllerOverride.override();
 
+        // ----------------------- Http Server Helper overrides ------------------------------------------------
+        const httpServerHelperOverride = new HttpServerHelperOverride(container);
+        httpServerHelperOverride.override();
+
         // Connect to this module
         staticRouterModService.registerStaticRouter(
             "ConnectionRouter",