Merge pull request #1 from ElectronNET/master

Updating fork

Author: gustavo-lara-molina

Changelog.md

@@ -1,6 +1,10 @@
 # Not released
 
+# 8.31.3
 
+ElectronNET.API:
+
+* New Feature: PowerMonitor API Support (thanks [gustavo-lara-molina](https://github.com/gustavo-lara-molina)) [\#399](https://github.com/ElectronNET/Electron.NET/pull/399)
 
 # Released
 

ElectronNET.API/Electron.cs

@@ -73,5 +73,15 @@ public static class Electron
         /// <c>electronize add HostHook</c>
         /// </summary>
         public static HostHook HostHook { get { return HostHook.Instance; } }
+
+        /// <summary>
+        /// Allows you to execute native Lock and Unlock process.       
+        /// </summary>
+        public static PowerMonitor PowerMonitor { get { return PowerMonitor.Instance; } }
+
+        /// <summary>
+        /// Read and respond to changes in Chromium's native color theme.
+        /// </summary>
+        public static NativeTheme NativeTheme { get { return NativeTheme.Instance; } }
     }
 }

ElectronNET.API/NativeTheme.cs

@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+
+namespace ElectronNET.API
+{
+    /// <summary>
+    /// Read and respond to changes in Chromium's native color theme.
+    /// </summary>
+    public sealed class NativeTheme
+    {
+        private static NativeTheme _nativeTheme;
+        private static object _syncRoot = new object();
+
+        internal NativeTheme() { }
+
+        internal static NativeTheme Instance
+        {
+            get
+            {
+                if (_nativeTheme == null)
+                {
+                    lock (_syncRoot)
+                    {
+                        if (_nativeTheme == null)
+                        {
+                            _nativeTheme = new NativeTheme();
+                        }
+                    }
+                }
+
+                return _nativeTheme;
+            }
+        }
+
+        /// <summary>
+        /// A `Boolean` for if the OS / Chromium currently has a dark mode enabled or is
+        /// being instructed to show a dark-style UI.If you want to modify this value you
+        /// should use `themeSource` below.
+        /// </summary>
+        /// <returns></returns>
+        public Task<bool> ShouldUseDarkColorsAsync()
+        {
+            var taskCompletionSource = new TaskCompletionSource<bool>();
+
+            BridgeConnector.Socket.On("nativeTheme-shouldUseDarkColors-completed", (shouldUseDarkColors) => {
+                BridgeConnector.Socket.Off("nativeTheme-shouldUseDarkColors-completed");
+
+                taskCompletionSource.SetResult((bool)shouldUseDarkColors);
+            });
+
+            BridgeConnector.Socket.Emit("nativeTheme-shouldUseDarkColors");
+
+            return taskCompletionSource.Task;
+        }
+    }
+}

ElectronNET.API/PowerMonitor.cs

@@ -0,0 +1,91 @@
+using System;
+
+namespace ElectronNET.API
+{
+    /// <summary>
+    /// Monitor power state changes..
+    /// </summary>
+    public sealed class PowerMonitor
+    {
+        /// <summary>
+        /// Emitted when the system is about to lock the screen. 
+        /// </summary>
+        public event Action OnLockScreen
+        {
+            add
+            {
+                if (_lockScreen == null)
+                {
+                    BridgeConnector.Socket.On("pm-lock-screen" , () =>
+                    {
+                        _lockScreen();
+                    });
+
+                    BridgeConnector.Socket.Emit("register-pm-lock-screen");
+                }
+                _lockScreen += value;
+            }
+            remove
+            {
+                _lockScreen -= value;
+
+                if (_lockScreen == null)
+                    BridgeConnector.Socket.Off("pm-lock-screen");
+            }
+        }
+
+        private event Action _lockScreen;
+
+        /// <summary>
+        /// Emitted when the system is about to unlock the screen. 
+        /// </summary>
+        public event Action OnUnLockScreen
+        {
+            add
+            {
+                if (_unlockScreen == null)
+                {
+                    BridgeConnector.Socket.On("pm-unlock-screen", () =>
+                    {
+                        _unlockScreen();
+                    });
+
+                    BridgeConnector.Socket.Emit("register-pm-unlock-screen");
+                }
+                _unlockScreen += value;
+            }
+            remove
+            {
+                _unlockScreen -= value;
+
+                if (_unlockScreen == null)
+                    BridgeConnector.Socket.Off("pm-unlock-screen");
+            }
+        }
+
+        private event Action _unlockScreen;
+        private static PowerMonitor _powerMonitor;
+        private static object _syncRoot = new object();
+
+        internal PowerMonitor() { }
+
+        internal static PowerMonitor Instance
+        {
+            get
+            {
+                if (_powerMonitor == null)
+                {
+                    lock (_syncRoot)
+                    {
+                        if (_powerMonitor == null)
+                        {
+                            _powerMonitor = new PowerMonitor();
+                        }
+                    }
+                }
+
+                return _powerMonitor;
+            }
+        }
+    }
+}

ElectronNET.CLI/Commands/Actions/DeployEmbeddedElectronFiles.cs

@@ -30,6 +30,8 @@ public static void Do(string tempPath)
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "clipboard.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "autoUpdater.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "browserView.js", "api.");
+            EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "powerMonitor.js", "api.");
+            EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "nativeTheme.js", "api.");
 
             string splashscreenFolder = Path.Combine(tempPath, "splashscreen");
             if (Directory.Exists(splashscreenFolder) == false)

ElectronNET.CLI/ElectronNET.CLI.csproj

@@ -71,6 +71,8 @@
     <EmbeddedResource Include="..\ElectronNET.Host\api\clipboard.js" Link="ElectronHost\api\clipboard.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\autoUpdater.js" Link="ElectronHost\api\autoUpdater.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\browserView.js" Link="ElectronHost\api\browserView.js" />
+    <EmbeddedResource Include="..\ElectronNET.Host\api\powerMonitor.js" Link="ElectronHost\api\powerMonitor.js" />
+    <EmbeddedResource Include="..\ElectronNET.Host\api\nativeTheme.js" Link="ElectronHost\api\nativeTheme.js" />
   </ItemGroup>
 
   <ItemGroup>

ElectronNET.Host/api/clipboard.js

@@ -62,20 +62,22 @@ export = (socket: SocketIO.Socket) => {
     });
 
     socket.on('clipboard-readImage', (type) => {
-        var image = clipboard.readImage(type);
+        const image = clipboard.readImage(type);
         electronSocket.emit('clipboard-readImage-Completed', { 1: image.toPNG().toString('base64') });
     });
 
     socket.on('clipboard-writeImage', (data, type) => {
-        var data = JSON.parse(data);
-        const ni = nativeImage.createEmpty();
-        for (var i in data) {
-            var scaleFactor = i;
-            var bytes = data[i];
-            var buff = Buffer.from(bytes, 'base64');
-            ni.addRepresentation({ scaleFactor: +scaleFactor, buffer: buff });
+        const dataContent = JSON.parse(data);
+        const image = nativeImage.createEmpty();
+
+        // tslint:disable-next-line: forin
+        for (const key in dataContent) {
+            const scaleFactor = key;
+            const bytes = data[key];
+            const buffer = Buffer.from(bytes, 'base64');
+            image.addRepresentation({ scaleFactor: +scaleFactor, buffer: buffer });
         }
-        
-        clipboard.writeImage(ni, type);
+
+        clipboard.writeImage(image, type);
     });
 };

ElectronNET.Host/api/clipboard.js.map

@@ -0,0 +1,12 @@
+import { nativeTheme } from 'electron';
+let electronSocket;
+
+export = (socket: SocketIO.Socket) => {
+    electronSocket = socket;
+
+    socket.on('nativeTheme-shouldUseDarkColors', () => {
+        const shouldUseDarkColors = nativeTheme.shouldUseDarkColors;
+
+        electronSocket.emit('nativeTheme-shouldUseDarkColors-completed', shouldUseDarkColors);
+    });
+};

ElectronNET.Host/api/clipboard.ts

@@ -0,0 +1,16 @@
+import { powerMonitor } from 'electron';
+let electronSocket;
+
+export = (socket: SocketIO.Socket) => {
+    electronSocket = socket;
+    socket.on('register-pm-lock-screen', () => {
+        powerMonitor.on('lock-screen', () => {
+            electronSocket.emit('pm-lock-screen');
+        });
+    });
+    socket.on('register-pm-unlock-screen', () => {
+        powerMonitor.on('unlock-screen', () => {
+            electronSocket.emit('pm-unlock-screen');
+        });
+    });
+};

ElectronNET.Host/api/nativeTheme.js

@@ -8,8 +8,9 @@ let io, server, browserWindows, ipc, apiProcess, loadURL;
 let appApi, menu, dialogApi, notification, tray, webContents;
 let globalShortcut, shellApi, screen, clipboard, autoUpdater;
 let commandLine, browserView;
+let powerMonitor;
 let splashScreen, hostHook;
-let mainWindowId;
+let mainWindowId, nativeTheme;
 
 let manifestJsonFileName = 'electron.manifest.json';
 let watchable = false;
@@ -152,6 +153,8 @@ function startSocketApiBridge(port) {
             delete require.cache[require.resolve('./api/screen')];
             delete require.cache[require.resolve('./api/clipboard')];
             delete require.cache[require.resolve('./api/browserView')];
+            delete require.cache[require.resolve('./api/powerMonitor')];
+            delete require.cache[require.resolve('./api/nativeTheme')];
         });
 
         global['electronsocket'] = socket;
@@ -173,8 +176,8 @@ function startSocketApiBridge(port) {
         screen = require('./api/screen')(socket);
         clipboard = require('./api/clipboard')(socket);
         browserView = require('./api/browserView')(socket);
-
-
+        powerMonitor = require('./api/powerMonitor')(socket);
+        nativeTheme = require('./api/nativeTheme')(socket);
 
         try {
             const hostHookScriptFilePath = path.join(__dirname, 'ElectronHostHook', 'index.js');

ElectronNET.Host/api/nativeTheme.js.map

@@ -1,11 +1,26 @@
 using Microsoft.AspNetCore.Mvc;
+using ElectronNET.API;
+using System;
 
 namespace ElectronNET.WebApp.Controllers
 {
     public class HomeController : Controller
     {
         public IActionResult Index()
         {
+            if (HybridSupport.IsElectronActive)
+            {
+                Electron.PowerMonitor.OnLockScreen += () =>
+                {
+                    Console.WriteLine("Screen Locked detected from C#");
+                };
+
+                Electron.PowerMonitor.OnUnLockScreen += () =>
+                {
+                    Console.WriteLine("Screen unlocked detected from C# ");
+                };
+            }
+            
             return View();
         }
     }