Support globals and client lib injection

neutralinojs · Oct 30, 2024 · 17fe35e · 17fe35e
1 parent 300c407
commit 17fe35e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -21,6 +21,10 @@ interface Window {
     NL_PATH: string;
     /** Returns true if extensions are enabled */
     NL_EXTENABLED: boolean;
+    /** Returns true if the client library is injected */
+    NL_GINJECTED: boolean;
+    /** Returns true if globals are injected */
+    NL_CINJECTED: boolean;
     /** Operating system name: Linux, Windows, Darwin, FreeBSD, or Uknown */
     NL_OS: OperatingSystem;
     /** CPU architecture: x64, arm, itanium, ia32, or unknown */

diff --git a/src/types/api/window.ts b/src/types/api/window.ts
@@ -11,6 +11,8 @@ export interface WindowOptions extends WindowSizeOptions, WindowPosOptions {
     useSavedState?: boolean;
     exitProcessOnClose?: boolean;
     extendUserAgentWith?: string;
+    injectGlobals?: boolean;
+    injectClientLibrary?: boolean;
     processArgs?: string;
   }
 
@@ -27,4 +29,4 @@ export interface WindowOptions extends WindowSizeOptions, WindowPosOptions {
   export interface WindowPosOptions {
     x: number;
     y: number;
-  }
+  }
diff --git a/src/ws/websocket.ts b/src/ws/websocket.ts
@@ -10,7 +10,9 @@ const extensionMessageQueue = {}
 export function init() {
     initAuth();
     const connectToken: string = getAuthToken().split('.')[1];
-    ws = new WebSocket(`ws://${window.location.hostname}:${window.NL_PORT}?connectToken=${connectToken}`);
+    const hostname: string = (window.NL_GINJECTED || window.NL_CINJECTED) ? 
+                            'localhost' : window.location.hostname;
+    ws = new WebSocket(`ws://${hostname}:${window.NL_PORT}?connectToken=${connectToken}`);
     registerLibraryEvents();
     registerSocketEvents();
 }