Merge branch 'master' into switch-to-new-socket-lib

Author: theolivenbaum

ElectronNET.API/App.cs

@@ -556,7 +556,7 @@ public static void ManuallySetIsReady()
         /// </summary>
         public void Quit()
         {
-            BridgeConnector.Emit("appQuit");
+            BridgeConnector.EmitSync("appQuit");
         }
 
         /// <summary>
@@ -566,7 +566,7 @@ public void Quit()
         /// <param name="exitCode">Exits immediately with exitCode. exitCode defaults to 0.</param>
         public void Exit(int exitCode = 0)
         {
-            BridgeConnector.Emit("appExit", exitCode);
+            BridgeConnector.EmitSync("appExit", exitCode);
         }
 
         /// <summary>
@@ -581,7 +581,7 @@ public void Exit(int exitCode = 0)
         /// </summary>
         public void Relaunch()
         {
-            BridgeConnector.Emit("appRelaunch");
+            BridgeConnector.EmitSync("appRelaunch");
         }
 
         /// <summary>
@@ -599,7 +599,7 @@ public void Relaunch()
         /// <param name="relaunchOptions">Options for the relaunch.</param>
         public void Relaunch(RelaunchOptions relaunchOptions)
         {
-            BridgeConnector.Emit("appRelaunch", JObject.FromObject(relaunchOptions, _jsonSerializer));
+            BridgeConnector.EmitSync("appRelaunch", JObject.FromObject(relaunchOptions, _jsonSerializer));
         }
 
         /// <summary>
@@ -698,8 +698,7 @@ public async Task<string> GetPathAsync(PathName pathName, CancellationToken canc
 
                 BridgeConnector.Emit("appGetPath", pathName.GetDescription());
 
-                return await taskCompletionSource.Task
-                    .ConfigureAwait(false);
+                return await taskCompletionSource.Task.ConfigureAwait(false);
             }  
         }
 

ElectronNET.API/AutoUpdater.cs

@@ -539,7 +539,7 @@ public Task<UpdateCheckResult> CheckForUpdatesAndNotifyAsync()
         /// <param name="isForceRunAfter">Run the app after finish even on silent install. Not applicable for macOS. Ignored if `isSilent` is set to `false`.</param>
         public void QuitAndInstall(bool isSilent = false, bool isForceRunAfter = false)
         {
-            BridgeConnector.Emit("autoUpdaterQuitAndInstall", isSilent, isForceRunAfter);
+            BridgeConnector.EmitSync("autoUpdaterQuitAndInstall", isSilent, isForceRunAfter);
         }
 
         /// <summary>

ElectronNET.API/BridgeConnector.cs

@@ -89,7 +89,6 @@ public static void Emit(string eventString, params object[] args)
 
             Task.Run(async () =>
             {
-                await Task.Yield();
                 if (App.SocketDebug)
                 {
                     Console.WriteLine($"Sending event {eventString}");
@@ -104,6 +103,26 @@ public static void Emit(string eventString, params object[] args)
             });
         }
 
+        /// <summary>
+        /// This method is only used on places where we need to be sure the event was sent on the socket, such as Quit, Exit, Relaunch and QuitAndInstall methods
+        /// </summary>
+        /// <param name="eventString"></param>
+        /// <param name="args"></param>
+        internal static void EmitSync(string eventString, params object[] args)
+        {
+            if (App.SocketDebug)
+            {
+                Console.WriteLine($"Sending event {eventString}");
+            }
+
+            Socket.EmitAsync(eventString, args).Wait();
+
+            if (App.SocketDebug)
+            {
+                Console.WriteLine($"Sent event {eventString}");
+            }
+        }
+
         public static void Off(string eventString)
         {
             Socket.Off(eventString);

ElectronNET.Host/main.js

@@ -118,7 +118,7 @@ function startSplashScreen() {
     let imageFile = path.join(currentBinPath, manifestJsonFile.splashscreen.imageFile);
     imageSize(imageFile, (error, dimensions) => {
         if (error) {
-            console.log(`load splashscreen error:`);
+            console.log('load splashscreen error:');
             console.error(error);
 
             throw new Error(error.message);
@@ -136,13 +136,29 @@ function startSplashScreen() {
             alwaysOnTop: true,
             show: true
         });
+
+        if (manifestJsonFile.hasOwnProperty('splashscreen')) {
+            if (manifestJsonFile.splashscreen.hasOwnProperty('timeout')) {
+                var timeout = manifestJsonFile.splashscreen.timeout;
+                window.setTimeout((t) => {
+                    if (splashScreen != null ) {
+                        splashScreen.destroy();
+                        splashScreen = null;
+                    }
+                }, timeout);
+            }
+        }
+
+
         splashScreen.setIgnoreMouseEvents(true);
 
         app.once('browser-window-created', () => {
             splashScreen.destroy();
+            splashScreen = null;
         });
 
         const loadSplashscreenUrl = path.join(__dirname, 'splashscreen', 'index.html') + '?imgPath=' + imageFile;
+
         splashScreen.loadURL('file://' + loadSplashscreenUrl);
 
         splashScreen.once('closed', () => {