From 126d39f4a59a4532faf4b36acef75bb7d1a888ff Mon Sep 17 00:00:00 2001 From: rafael-aero Date: Mon, 12 Jul 2021 19:50:39 +0200 Subject: [PATCH 1/2] wip --- ElectronNET.API/App.cs | 320 +++++----- ElectronNET.API/AutoUpdater.cs | 160 +++-- ElectronNET.API/BridgeConnector.cs | 115 +++- ElectronNET.API/BrowserView.cs | 14 +- ElectronNET.API/BrowserWindow.cs | 565 +++++++++--------- ElectronNET.API/Clipboard.cs | 75 ++- ElectronNET.API/CommandLine.cs | 18 +- ElectronNET.API/Cookies.cs | 39 +- ElectronNET.API/Dialog.cs | 39 +- ElectronNET.API/Dock.cs | 50 +- ElectronNET.API/ElectronNET.API.csproj | 6 +- ElectronNET.API/Entities/JumpListSettings.cs | 3 - ElectronNET.API/Entities/MessageBoxResult.cs | 6 + .../Entities/SecondInstanceResponse.cs | 9 + ElectronNET.API/Events.cs | 35 +- ElectronNET.API/GlobalShortcut.cs | 20 +- ElectronNET.API/HostHook.cs | 55 +- ElectronNET.API/IpcMain.cs | 47 +- ElectronNET.API/Menu.cs | 21 +- ElectronNET.API/MenuResponse.cs | 8 + ElectronNET.API/NativeTheme.cs | 34 +- ElectronNET.API/Notification.cs | 38 +- ElectronNET.API/PowerMonitor.cs | 42 +- ElectronNET.API/Screen.cs | 56 +- ElectronNET.API/Session.cs | 117 ++-- ElectronNET.API/Shell.cs | 40 +- ElectronNET.API/Tray.cs | 62 +- ElectronNET.API/WebContents.cs | 58 +- ElectronNET.API/WindowManager.cs | 28 +- ElectronNET.CLI/ElectronNET.CLI.csproj | 1 + ElectronNET.Host/api/app.js | 2 +- ElectronNET.Host/api/dialog.js | 4 +- ElectronNET.Host/api/menu.js | 2 +- ElectronNET.Host/api/webContents.js | 2 +- ElectronNET.WebApp/ElectronNET.WebApp.csproj | 3 +- ElectronNET.WebApp/Program.cs | 2 + ElectronNET.WebApp/electron.manifest.json | 2 +- 37 files changed, 1045 insertions(+), 1053 deletions(-) create mode 100644 ElectronNET.API/Entities/SecondInstanceResponse.cs create mode 100644 ElectronNET.API/MenuResponse.cs diff --git a/ElectronNET.API/App.cs b/ElectronNET.API/App.cs index 6baab53c..a4ed8905 100644 --- a/ElectronNET.API/App.cs +++ b/ElectronNET.API/App.cs @@ -30,7 +30,7 @@ public event Action WindowAllClosed { if (_windowAllClosed == null) { - BridgeConnector.Socket.On("app-window-all-closed" + GetHashCode(), () => + BridgeConnector.On("app-window-all-closed" + GetHashCode(), () => { if (!Electron.WindowManager.IsQuitOnWindowAllClosed || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { @@ -38,7 +38,7 @@ public event Action WindowAllClosed } }); - BridgeConnector.Socket.Emit("register-app-window-all-closed-event", GetHashCode()); + BridgeConnector.Emit("register-app-window-all-closed-event", GetHashCode()); } _windowAllClosed += value; } @@ -47,7 +47,7 @@ public event Action WindowAllClosed _windowAllClosed -= value; if(_windowAllClosed == null) - BridgeConnector.Socket.Off("app-window-all-closed" + GetHashCode()); + BridgeConnector.Off("app-window-all-closed" + GetHashCode()); } } @@ -67,7 +67,7 @@ public event Func BeforeQuit { if (_beforeQuit == null) { - BridgeConnector.Socket.On("app-before-quit" + GetHashCode(), async () => + BridgeConnector.On("app-before-quit" + GetHashCode(), async () => { await _beforeQuit(new QuitEventArgs()); @@ -110,7 +110,7 @@ public event Func BeforeQuit } }); - BridgeConnector.Socket.Emit("register-app-before-quit-event", GetHashCode()); + BridgeConnector.Emit("register-app-before-quit-event", GetHashCode()); } _beforeQuit += value; } @@ -119,7 +119,7 @@ public event Func BeforeQuit _beforeQuit -= value; if (_beforeQuit == null) - BridgeConnector.Socket.Off("app-before-quit" + GetHashCode()); + BridgeConnector.Off("app-before-quit" + GetHashCode()); } } @@ -139,7 +139,7 @@ public event Func WillQuit { if (_willQuit == null) { - BridgeConnector.Socket.On("app-will-quit" + GetHashCode(), async () => + BridgeConnector.On("app-will-quit" + GetHashCode(), async () => { await _willQuit(new QuitEventArgs()); @@ -161,7 +161,7 @@ public event Func WillQuit } }); - BridgeConnector.Socket.Emit("register-app-will-quit-event", GetHashCode()); + BridgeConnector.Emit("register-app-will-quit-event", GetHashCode()); } _willQuit += value; } @@ -170,7 +170,7 @@ public event Func WillQuit _willQuit -= value; if (_willQuit == null) - BridgeConnector.Socket.Off("app-will-quit" + GetHashCode()); + BridgeConnector.Off("app-will-quit" + GetHashCode()); } } @@ -187,7 +187,7 @@ public event Func Quitting { if (_quitting == null) { - BridgeConnector.Socket.On("app-will-quit" + GetHashCode() + "quitting", async () => + BridgeConnector.On("app-will-quit" + GetHashCode() + "quitting", async () => { if(_willQuit == null) { @@ -196,7 +196,7 @@ public event Func Quitting } }); - BridgeConnector.Socket.Emit("register-app-will-quit-event", GetHashCode() + "quitting"); + BridgeConnector.Emit("register-app-will-quit-event", GetHashCode() + "quitting"); } _quitting += value; } @@ -205,7 +205,7 @@ public event Func Quitting _quitting -= value; if (_quitting == null) - BridgeConnector.Socket.Off("app-will-quit" + GetHashCode() + "quitting"); + BridgeConnector.Off("app-will-quit" + GetHashCode() + "quitting"); } } @@ -220,12 +220,12 @@ public event Action BrowserWindowBlur { if (_browserWindowBlur == null) { - BridgeConnector.Socket.On("app-browser-window-blur" + GetHashCode(), () => + BridgeConnector.On("app-browser-window-blur" + GetHashCode(), () => { _browserWindowBlur(); }); - BridgeConnector.Socket.Emit("register-app-browser-window-blur-event", GetHashCode()); + BridgeConnector.Emit("register-app-browser-window-blur-event", GetHashCode()); } _browserWindowBlur += value; } @@ -234,7 +234,7 @@ public event Action BrowserWindowBlur _browserWindowBlur -= value; if (_browserWindowBlur == null) - BridgeConnector.Socket.Off("app-browser-window-blur" + GetHashCode()); + BridgeConnector.Off("app-browser-window-blur" + GetHashCode()); } } @@ -249,12 +249,12 @@ public event Action BrowserWindowFocus { if (_browserWindowFocus == null) { - BridgeConnector.Socket.On("app-browser-window-focus" + GetHashCode(), () => + BridgeConnector.On("app-browser-window-focus" + GetHashCode(), () => { _browserWindowFocus(); }); - BridgeConnector.Socket.Emit("register-app-browser-window-focus-event", GetHashCode()); + BridgeConnector.Emit("register-app-browser-window-focus-event", GetHashCode()); } _browserWindowFocus += value; } @@ -263,7 +263,7 @@ public event Action BrowserWindowFocus _browserWindowFocus -= value; if (_browserWindowFocus == null) - BridgeConnector.Socket.Off("app-browser-window-focus" + GetHashCode()); + BridgeConnector.Off("app-browser-window-focus" + GetHashCode()); } } @@ -278,12 +278,12 @@ public event Action BrowserWindowCreated { if (_browserWindowCreated == null) { - BridgeConnector.Socket.On("app-browser-window-created" + GetHashCode(), () => + BridgeConnector.On("app-browser-window-created" + GetHashCode(), () => { _browserWindowCreated(); }); - BridgeConnector.Socket.Emit("register-app-browser-window-created-event", GetHashCode()); + BridgeConnector.Emit("register-app-browser-window-created-event", GetHashCode()); } _browserWindowCreated += value; } @@ -292,7 +292,7 @@ public event Action BrowserWindowCreated _browserWindowCreated -= value; if (_browserWindowCreated == null) - BridgeConnector.Socket.Off("app-browser-window-created" + GetHashCode()); + BridgeConnector.Off("app-browser-window-created" + GetHashCode()); } } @@ -307,12 +307,12 @@ public event Action WebContentsCreated { if (_webContentsCreated == null) { - BridgeConnector.Socket.On("app-web-contents-created" + GetHashCode(), () => + BridgeConnector.On("app-web-contents-created" + GetHashCode(), () => { _webContentsCreated(); }); - BridgeConnector.Socket.Emit("register-app-web-contents-created-event", GetHashCode()); + BridgeConnector.Emit("register-app-web-contents-created-event", GetHashCode()); } _webContentsCreated += value; } @@ -321,7 +321,7 @@ public event Action WebContentsCreated _webContentsCreated -= value; if (_webContentsCreated == null) - BridgeConnector.Socket.Off("app-web-contents-created" + GetHashCode()); + BridgeConnector.Off("app-web-contents-created" + GetHashCode()); } } @@ -338,12 +338,12 @@ public event Action AccessibilitySupportChanged { if (_accessibilitySupportChanged == null) { - BridgeConnector.Socket.On("app-accessibility-support-changed" + GetHashCode(), (state) => + BridgeConnector.On("app-accessibility-support-changed" + GetHashCode(), (state) => { _accessibilitySupportChanged((bool)state); }); - BridgeConnector.Socket.Emit("register-app-accessibility-support-changed-event", GetHashCode()); + BridgeConnector.Emit("register-app-accessibility-support-changed-event", GetHashCode()); } _accessibilitySupportChanged += value; } @@ -352,7 +352,7 @@ public event Action AccessibilitySupportChanged _accessibilitySupportChanged -= value; if (_accessibilitySupportChanged == null) - BridgeConnector.Socket.Off("app-accessibility-support-changed" + GetHashCode()); + BridgeConnector.Off("app-accessibility-support-changed" + GetHashCode()); } } @@ -412,12 +412,12 @@ public event Action OpenFile { if (_openFile == null) { - BridgeConnector.Socket.On("app-open-file" + GetHashCode(), (file) => + BridgeConnector.On("app-open-file" + GetHashCode(), (file) => { - _openFile(file.ToString()); + _openFile(file); }); - BridgeConnector.Socket.Emit("register-app-open-file-event", GetHashCode()); + BridgeConnector.Emit("register-app-open-file-event", GetHashCode()); } _openFile += value; } @@ -426,7 +426,7 @@ public event Action OpenFile _openFile -= value; if (_openFile == null) - BridgeConnector.Socket.Off("app-open-file" + GetHashCode()); + BridgeConnector.Off("app-open-file" + GetHashCode()); } } @@ -443,12 +443,12 @@ public event Action OpenUrl { if (_openUrl == null) { - BridgeConnector.Socket.On("app-open-url" + GetHashCode(), (url) => + BridgeConnector.On("app-open-url" + GetHashCode(), (url) => { - _openUrl(url.ToString()); + _openUrl(url); }); - BridgeConnector.Socket.Emit("register-app-open-url-event", GetHashCode()); + BridgeConnector.Emit("register-app-open-url-event", GetHashCode()); } _openUrl += value; } @@ -457,7 +457,7 @@ public event Action OpenUrl _openUrl -= value; if (_openUrl == null) - BridgeConnector.Socket.Off("app-open-url" + GetHashCode()); + BridgeConnector.Off("app-open-url" + GetHashCode()); } } @@ -475,7 +475,7 @@ public string Name { set { - BridgeConnector.Socket.Emit("appSetName", value); + BridgeConnector.Emit("appSetName", value); } } @@ -491,13 +491,13 @@ public Task GetNameAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("appGetNameCompleted", (result) => + BridgeConnector.On("appGetNameCompleted", (result) => { - BridgeConnector.Socket.Off("appGetNameCompleted"); - taskCompletionSource.SetResult((string)result); + BridgeConnector.Off("appGetNameCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appGetName"); + BridgeConnector.Emit("appGetName"); return taskCompletionSource.Task; } @@ -551,7 +551,7 @@ public static void ManuallySetIsReady() /// public void Quit() { - BridgeConnector.Socket.Emit("appQuit"); + BridgeConnector.Emit("appQuit"); } /// @@ -561,7 +561,7 @@ public void Quit() /// Exits immediately with exitCode. exitCode defaults to 0. public void Exit(int exitCode = 0) { - BridgeConnector.Socket.Emit("appExit", exitCode); + BridgeConnector.Emit("appExit", exitCode); } /// @@ -576,7 +576,7 @@ public void Exit(int exitCode = 0) /// public void Relaunch() { - BridgeConnector.Socket.Emit("appRelaunch"); + BridgeConnector.Emit("appRelaunch"); } /// @@ -594,7 +594,7 @@ public void Relaunch() /// Options for the relaunch. public void Relaunch(RelaunchOptions relaunchOptions) { - BridgeConnector.Socket.Emit("appRelaunch", JObject.FromObject(relaunchOptions, _jsonSerializer)); + BridgeConnector.Emit("appRelaunch", JObject.FromObject(relaunchOptions, _jsonSerializer)); } /// @@ -603,7 +603,7 @@ public void Relaunch(RelaunchOptions relaunchOptions) /// public void Focus() { - BridgeConnector.Socket.Emit("appFocus"); + BridgeConnector.Emit("appFocus"); } /// @@ -614,7 +614,7 @@ public void Focus() /// public void Focus(FocusOptions focusOptions) { - BridgeConnector.Socket.Emit("appFocus", JObject.FromObject(focusOptions, _jsonSerializer)); + BridgeConnector.Emit("appFocus", JObject.FromObject(focusOptions, _jsonSerializer)); } /// @@ -622,7 +622,7 @@ public void Focus(FocusOptions focusOptions) /// public void Hide() { - BridgeConnector.Socket.Emit("appHide"); + BridgeConnector.Emit("appHide"); } /// @@ -630,7 +630,7 @@ public void Hide() /// public void Show() { - BridgeConnector.Socket.Emit("appShow"); + BridgeConnector.Emit("appShow"); } /// @@ -643,13 +643,13 @@ public async Task GetAppPathAsync(CancellationToken cancellationToken = var taskCompletionSource = new TaskCompletionSource(); using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetAppPathCompleted", (path) => + BridgeConnector.On("appGetAppPathCompleted", (path) => { - BridgeConnector.Socket.Off("appGetAppPathCompleted"); - taskCompletionSource.SetResult(path.ToString()); + BridgeConnector.Off("appGetAppPathCompleted"); + taskCompletionSource.SetResult(path); }); - BridgeConnector.Socket.Emit("appGetAppPath"); + BridgeConnector.Emit("appGetAppPath"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -666,7 +666,7 @@ public async Task GetAppPathAsync(CancellationToken cancellationToken = /// A custom path for your logs. Must be absolute. public void SetAppLogsPath(string path) { - BridgeConnector.Socket.Emit("appSetAppLogsPath", path); + BridgeConnector.Emit("appSetAppLogsPath", path); } /// @@ -684,14 +684,14 @@ public async Task GetPathAsync(PathName pathName, CancellationToken canc var taskCompletionSource = new TaskCompletionSource(); using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetPathCompleted", (path) => + BridgeConnector.On("appGetPathCompleted", (path) => { - BridgeConnector.Socket.Off("appGetPathCompleted"); + BridgeConnector.Off("appGetPathCompleted"); - taskCompletionSource.SetResult(path.ToString()); + taskCompletionSource.SetResult(path); }); - BridgeConnector.Socket.Emit("appGetPath", pathName.GetDescription()); + BridgeConnector.Emit("appGetPath", pathName.GetDescription()); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -712,7 +712,7 @@ public async Task GetPathAsync(PathName pathName, CancellationToken canc /// public void SetPath(PathName name, string path) { - BridgeConnector.Socket.Emit("appSetPath", name.GetDescription(), path); + BridgeConnector.Emit("appSetPath", name.GetDescription(), path); } /// @@ -727,13 +727,13 @@ public async Task GetVersionAsync(CancellationToken cancellationToken = var taskCompletionSource = new TaskCompletionSource(); using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetVersionCompleted", (version) => + BridgeConnector.On("appGetVersionCompleted", (version) => { - BridgeConnector.Socket.Off("appGetVersionCompleted"); - taskCompletionSource.SetResult(version.ToString()); + BridgeConnector.Off("appGetVersionCompleted"); + taskCompletionSource.SetResult(version); }); - BridgeConnector.Socket.Emit("appGetVersion"); + BridgeConnector.Emit("appGetVersion"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -755,13 +755,13 @@ public async Task GetLocaleAsync(CancellationToken cancellationToken = d var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetLocaleCompleted", (local) => + BridgeConnector.On("appGetLocaleCompleted", (local) => { - BridgeConnector.Socket.Off("appGetLocaleCompleted"); - taskCompletionSource.SetResult(local.ToString()); + BridgeConnector.Off("appGetLocaleCompleted"); + taskCompletionSource.SetResult(local); }); - BridgeConnector.Socket.Emit("appGetLocale"); + BridgeConnector.Emit("appGetLocale"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -775,7 +775,7 @@ public async Task GetLocaleAsync(CancellationToken cancellationToken = d /// Path to add. public void AddRecentDocument(string path) { - BridgeConnector.Socket.Emit("appAddRecentDocument", path); + BridgeConnector.Emit("appAddRecentDocument", path); } /// @@ -783,7 +783,7 @@ public void AddRecentDocument(string path) /// public void ClearRecentDocuments() { - BridgeConnector.Socket.Emit("appClearRecentDocuments"); + BridgeConnector.Emit("appClearRecentDocuments"); } /// @@ -881,13 +881,13 @@ public async Task SetAsDefaultProtocolClientAsync(string protocol, string var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appSetAsDefaultProtocolClientCompleted", (success) => + BridgeConnector.On("appSetAsDefaultProtocolClientCompleted", (success) => { - BridgeConnector.Socket.Off("appSetAsDefaultProtocolClientCompleted"); - taskCompletionSource.SetResult((bool) success); + BridgeConnector.Off("appSetAsDefaultProtocolClientCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Emit("appSetAsDefaultProtocolClient", protocol, path, args); + BridgeConnector.Emit("appSetAsDefaultProtocolClient", protocol, path, args); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -935,13 +935,13 @@ public async Task RemoveAsDefaultProtocolClientAsync(string protocol, stri var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appRemoveAsDefaultProtocolClientCompleted", (success) => + BridgeConnector.On("appRemoveAsDefaultProtocolClientCompleted", (success) => { - BridgeConnector.Socket.Off("appRemoveAsDefaultProtocolClientCompleted"); - taskCompletionSource.SetResult((bool) success); + BridgeConnector.Off("appRemoveAsDefaultProtocolClientCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Emit("appRemoveAsDefaultProtocolClient", protocol, path, args); + BridgeConnector.Emit("appRemoveAsDefaultProtocolClient", protocol, path, args); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1007,13 +1007,13 @@ public async Task IsDefaultProtocolClientAsync(string protocol, string pat var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appIsDefaultProtocolClientCompleted", (success) => + BridgeConnector.On("appIsDefaultProtocolClientCompleted", (success) => { - BridgeConnector.Socket.Off("appIsDefaultProtocolClientCompleted"); - taskCompletionSource.SetResult((bool) success); + BridgeConnector.Off("appIsDefaultProtocolClientCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Emit("appIsDefaultProtocolClient", protocol, path, args); + BridgeConnector.Emit("appIsDefaultProtocolClient", protocol, path, args); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1035,13 +1035,13 @@ public async Task SetUserTasksAsync(UserTask[] userTasks, CancellationToke var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appSetUserTasksCompleted", (success) => + BridgeConnector.On("appSetUserTasksCompleted", (success) => { - BridgeConnector.Socket.Off("appSetUserTasksCompleted"); - taskCompletionSource.SetResult((bool) success); + BridgeConnector.Off("appSetUserTasksCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Emit("appSetUserTasks", JArray.FromObject(userTasks, _jsonSerializer)); + BridgeConnector.Emit("appSetUserTasks", JArray.FromObject(userTasks, _jsonSerializer)); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1060,13 +1060,13 @@ public async Task GetJumpListSettingsAsync(CancellationToken c var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetJumpListSettingsCompleted", (jumpListSettings) => + BridgeConnector.On("appGetJumpListSettingsCompleted", (jumpListSettings) => { - BridgeConnector.Socket.Off("appGetJumpListSettingsCompleted"); - taskCompletionSource.SetResult(JObject.Parse(jumpListSettings.ToString()).ToObject()); + BridgeConnector.Off("appGetJumpListSettingsCompleted"); + taskCompletionSource.SetResult(jumpListSettings); }); - BridgeConnector.Socket.Emit("appGetJumpListSettings"); + BridgeConnector.Emit("appGetJumpListSettings"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1091,7 +1091,7 @@ public async Task GetJumpListSettingsAsync(CancellationToken c /// Array of objects. public void SetJumpList(JumpListCategory[] categories) { - BridgeConnector.Socket.Emit("appSetJumpList", JArray.FromObject(categories, _jsonSerializer)); + BridgeConnector.Emit("appSetJumpList", JArray.FromObject(categories, _jsonSerializer)); } /// @@ -1122,23 +1122,19 @@ public async Task RequestSingleInstanceLockAsync(Action var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appRequestSingleInstanceLockCompleted", (success) => + BridgeConnector.On("appRequestSingleInstanceLockCompleted", (success) => { - BridgeConnector.Socket.Off("appRequestSingleInstanceLockCompleted"); - taskCompletionSource.SetResult((bool)success); + BridgeConnector.Off("appRequestSingleInstanceLockCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Off("secondInstance"); - BridgeConnector.Socket.On("secondInstance", (result) => + BridgeConnector.Off("secondInstance"); + BridgeConnector.On("secondInstance", (result) => { - JArray results = (JArray)result; - string[] args = results.First.ToObject(); - string workingDirectory = results.Last.ToObject(); - - newInstanceOpened(args, workingDirectory); + newInstanceOpened(result.args, result.workingDirectory); }); - BridgeConnector.Socket.Emit("appRequestSingleInstanceLock"); + BridgeConnector.Emit("appRequestSingleInstanceLock"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1151,7 +1147,7 @@ public async Task RequestSingleInstanceLockAsync(Action /// public void ReleaseSingleInstanceLock() { - BridgeConnector.Socket.Emit("appReleaseSingleInstanceLock"); + BridgeConnector.Emit("appReleaseSingleInstanceLock"); } /// @@ -1167,16 +1163,15 @@ public async Task HasSingleInstanceLockAsync(CancellationToken cancellatio var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appHasSingleInstanceLockCompleted", (hasLock) => + BridgeConnector.On("appHasSingleInstanceLockCompleted", (hasLock) => { - BridgeConnector.Socket.Off("appHasSingleInstanceLockCompleted"); - taskCompletionSource.SetResult((bool) hasLock); + BridgeConnector.Off("appHasSingleInstanceLockCompleted"); + taskCompletionSource.SetResult(hasLock); }); - BridgeConnector.Socket.Emit("appHasSingleInstanceLock"); + BridgeConnector.Emit("appHasSingleInstanceLock"); - return await taskCompletionSource.Task - .ConfigureAwait(false); + return await taskCompletionSource.Task.ConfigureAwait(false); } } @@ -1206,7 +1201,7 @@ public void SetUserActivity(string type, object userInfo) /// public void SetUserActivity(string type, object userInfo, string webpageUrl) { - BridgeConnector.Socket.Emit("appSetUserActivity", type, userInfo, webpageUrl); + BridgeConnector.Emit("appSetUserActivity", type, userInfo, webpageUrl); } /// @@ -1220,16 +1215,15 @@ public async Task GetCurrentActivityTypeAsync(CancellationToken cancella var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetCurrentActivityTypeCompleted", (activityType) => + BridgeConnector.On("appGetCurrentActivityTypeCompleted", (activityType) => { - BridgeConnector.Socket.Off("appGetCurrentActivityTypeCompleted"); - taskCompletionSource.SetResult(activityType.ToString()); + BridgeConnector.Off("appGetCurrentActivityTypeCompleted"); + taskCompletionSource.SetResult(activityType); }); - BridgeConnector.Socket.Emit("appGetCurrentActivityType"); + BridgeConnector.Emit("appGetCurrentActivityType"); - return await taskCompletionSource.Task - .ConfigureAwait(false); + return await taskCompletionSource.Task.ConfigureAwait(false); } } @@ -1238,7 +1232,7 @@ public async Task GetCurrentActivityTypeAsync(CancellationToken cancella /// public void InvalidateCurrentActivity() { - BridgeConnector.Socket.Emit("appInvalidateCurrentActivity"); + BridgeConnector.Emit("appInvalidateCurrentActivity"); } /// @@ -1246,7 +1240,7 @@ public void InvalidateCurrentActivity() /// public void ResignCurrentActivity() { - BridgeConnector.Socket.Emit("appResignCurrentActivity"); + BridgeConnector.Emit("appResignCurrentActivity"); } /// @@ -1255,7 +1249,7 @@ public void ResignCurrentActivity() /// Model Id. public void SetAppUserModelId(string id) { - BridgeConnector.Socket.Emit("appSetAppUserModelId", id); + BridgeConnector.Emit("appSetAppUserModelId", id); } /// TODO: Check new parameter which is a function [App.ImportCertificate] @@ -1274,13 +1268,13 @@ public async Task ImportCertificateAsync(ImportCertificateOptions options, var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appImportCertificateCompleted", (result) => + BridgeConnector.On("appImportCertificateCompleted", (result) => { - BridgeConnector.Socket.Off("appImportCertificateCompleted"); - taskCompletionSource.SetResult((int) result); + BridgeConnector.Off("appImportCertificateCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appImportCertificate", JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("appImportCertificate", JObject.FromObject(options, _jsonSerializer)); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1302,15 +1296,13 @@ public async Task GetAppMetricsAsync(CancellationToken cancella var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetAppMetricsCompleted", (result) => + BridgeConnector.On("appGetAppMetricsCompleted", (result) => { - BridgeConnector.Socket.Off("appGetAppMetricsCompleted"); - var processMetrics = ((JArray)result).ToObject(); - - taskCompletionSource.SetResult(processMetrics); + BridgeConnector.Off("appGetAppMetricsCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appGetAppMetrics"); + BridgeConnector.Emit("appGetAppMetrics"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1330,15 +1322,13 @@ public async Task GetGpuFeatureStatusAsync(CancellationToken c var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetGpuFeatureStatusCompleted", (result) => + BridgeConnector.On("appGetGpuFeatureStatusCompleted", (result) => { - BridgeConnector.Socket.Off("appGetGpuFeatureStatusCompleted"); - var gpuFeatureStatus = ((JObject)result).ToObject(); - - taskCompletionSource.SetResult(gpuFeatureStatus); + BridgeConnector.Off("appGetGpuFeatureStatusCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appGetGpuFeatureStatus"); + BridgeConnector.Emit("appGetGpuFeatureStatus"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1362,13 +1352,13 @@ public async Task SetBadgeCountAsync(int count, CancellationToken cancella var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appSetBadgeCountCompleted", (success) => + BridgeConnector.On("appSetBadgeCountCompleted", (success) => { - BridgeConnector.Socket.Off("appSetBadgeCountCompleted"); - taskCompletionSource.SetResult((bool) success); + BridgeConnector.Off("appSetBadgeCountCompleted"); + taskCompletionSource.SetResult(success); }); - BridgeConnector.Socket.Emit("appSetBadgeCount", count); + BridgeConnector.Emit("appSetBadgeCount", count); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1386,13 +1376,13 @@ public async Task GetBadgeCountAsync(CancellationToken cancellationToken = var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetBadgeCountCompleted", (count) => + BridgeConnector.On("appGetBadgeCountCompleted", (count) => { - BridgeConnector.Socket.Off("appGetBadgeCountCompleted"); - taskCompletionSource.SetResult((int)count); + BridgeConnector.Off("appGetBadgeCountCompleted"); + taskCompletionSource.SetResult(count); }); - BridgeConnector.Socket.Emit("appGetBadgeCount"); + BridgeConnector.Emit("appGetBadgeCount"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1415,13 +1405,13 @@ public async Task IsUnityRunningAsync(CancellationToken cancellationToken var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appIsUnityRunningCompleted", (isUnityRunning) => + BridgeConnector.On("appIsUnityRunningCompleted", (isUnityRunning) => { - BridgeConnector.Socket.Off("appIsUnityRunningCompleted"); - taskCompletionSource.SetResult((bool)isUnityRunning); + BridgeConnector.Off("appIsUnityRunningCompleted"); + taskCompletionSource.SetResult(isUnityRunning); }); - BridgeConnector.Socket.Emit("appIsUnityRunning"); + BridgeConnector.Emit("appIsUnityRunning"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1450,22 +1440,19 @@ public async Task GetLoginItemSettingsAsync(LoginItemSettings var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appGetLoginItemSettingsCompleted", (loginItemSettings) => + BridgeConnector.On("appGetLoginItemSettingsCompleted", (result) => { - BridgeConnector.Socket.Off("appGetLoginItemSettingsCompleted"); - - var result = ((JObject) loginItemSettings).ToObject(); - + BridgeConnector.Off("appGetLoginItemSettingsCompleted"); taskCompletionSource.SetResult(result); }); if (options == null) { - BridgeConnector.Socket.Emit("appGetLoginItemSettings"); + BridgeConnector.Emit("appGetLoginItemSettings"); } else { - BridgeConnector.Socket.Emit("appGetLoginItemSettings", JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("appGetLoginItemSettings", JObject.FromObject(options, _jsonSerializer)); } return await taskCompletionSource.Task @@ -1481,7 +1468,7 @@ public async Task GetLoginItemSettingsAsync(LoginItemSettings /// public void SetLoginItemSettings(LoginSettings loginSettings) { - BridgeConnector.Socket.Emit("appSetLoginItemSettings", JObject.FromObject(loginSettings, _jsonSerializer)); + BridgeConnector.Emit("appSetLoginItemSettings", JObject.FromObject(loginSettings, _jsonSerializer)); } /// @@ -1497,13 +1484,13 @@ public async Task IsAccessibilitySupportEnabledAsync(CancellationToken can var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appIsAccessibilitySupportEnabledCompleted", (isAccessibilitySupportEnabled) => + BridgeConnector.On("appIsAccessibilitySupportEnabledCompleted", (isAccessibilitySupportEnabled) => { - BridgeConnector.Socket.Off("appIsAccessibilitySupportEnabledCompleted"); - taskCompletionSource.SetResult((bool)isAccessibilitySupportEnabled); + BridgeConnector.Off("appIsAccessibilitySupportEnabledCompleted"); + taskCompletionSource.SetResult(isAccessibilitySupportEnabled); }); - BridgeConnector.Socket.Emit("appIsAccessibilitySupportEnabled"); + BridgeConnector.Emit("appIsAccessibilitySupportEnabled"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -1522,7 +1509,7 @@ public async Task IsAccessibilitySupportEnabledAsync(CancellationToken can /// Enable or disable accessibility tree rendering. public void SetAccessibilitySupportEnabled(bool enabled) { - BridgeConnector.Socket.Emit("appSetAboutPanelOptions", enabled); + BridgeConnector.Emit("appSetAboutPanelOptions", enabled); } /// @@ -1531,7 +1518,7 @@ public void SetAccessibilitySupportEnabled(bool enabled) /// public void ShowAboutPanel() { - BridgeConnector.Socket.Emit("appShowAboutPanel"); + BridgeConnector.Emit("appShowAboutPanel"); } /// @@ -1547,7 +1534,7 @@ public void ShowAboutPanel() /// About panel options. public void SetAboutPanelOptions(AboutPanelOptions options) { - BridgeConnector.Socket.Emit("appSetAboutPanelOptions", JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("appSetAboutPanelOptions", JObject.FromObject(options, _jsonSerializer)); } /// @@ -1562,7 +1549,7 @@ public string UserAgentFallback { set { - BridgeConnector.Socket.Emit("appSetUserAgentFallback", value); + BridgeConnector.Emit("appSetUserAgentFallback", value); } } @@ -1578,13 +1565,13 @@ public Task GetUserAgentFallbackAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("appGetUserAgentFallbackCompleted", (result) => + BridgeConnector.On("appGetUserAgentFallbackCompleted", (result) => { - BridgeConnector.Socket.Off("appGetUserAgentFallbackCompleted"); - taskCompletionSource.SetResult((string)result); + BridgeConnector.Off("appGetUserAgentFallbackCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appGetUserAgentFallback"); + BridgeConnector.Emit("appGetUserAgentFallback"); return taskCompletionSource.Task; } @@ -1609,8 +1596,7 @@ public void On(string eventName, Action fn) /// /// The event name /// The handler - public void On(string eventName, Action fn) - => Events.Instance.On(ModuleName, eventName, fn); + public void On(string eventName, Action fn) => Events.Instance.On(ModuleName, eventName, fn); /// /// Subscribe to an unmapped event on the module once. /// diff --git a/ElectronNET.API/AutoUpdater.cs b/ElectronNET.API/AutoUpdater.cs index 2d8f6569..ae1c3373 100644 --- a/ElectronNET.API/AutoUpdater.cs +++ b/ElectronNET.API/AutoUpdater.cs @@ -20,13 +20,13 @@ public Task IsAutoDownloadEnabledAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-autoDownload-get-reply", (result) => + BridgeConnector.On("autoUpdater-autoDownload-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-autoDownload-get-reply"); + BridgeConnector.Off("autoUpdater-autoDownload-get-reply"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("autoUpdater-autoDownload-get"); + BridgeConnector.Emit("autoUpdater-autoDownload-get"); return taskCompletionSource.Task; } @@ -40,13 +40,13 @@ public Task IsAutoInstallOnAppQuitEnabledAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-autoInstallOnAppQuit-get-reply", (result) => + BridgeConnector.On("autoUpdater-autoInstallOnAppQuit-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-autoInstallOnAppQuit-get-reply"); + BridgeConnector.Off("autoUpdater-autoInstallOnAppQuit-get-reply"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("autoUpdater-autoInstallOnAppQuit-get"); + BridgeConnector.Emit("autoUpdater-autoInstallOnAppQuit-get"); return taskCompletionSource.Task; } @@ -61,13 +61,13 @@ public Task IsAllowPrereleaseEnabledAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-allowPrerelease-get-reply", (result) => + BridgeConnector.On("autoUpdater-allowPrerelease-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-allowPrerelease-get-reply"); + BridgeConnector.Off("autoUpdater-allowPrerelease-get-reply"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("autoUpdater-allowPrerelease-get"); + BridgeConnector.Emit("autoUpdater-allowPrerelease-get"); return taskCompletionSource.Task; } @@ -80,13 +80,13 @@ public Task IsFullChangeLogEnabledAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-fullChangelog-get-reply", (result) => + BridgeConnector.On("autoUpdater-fullChangelog-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-fullChangelog-get-reply"); + BridgeConnector.Off("autoUpdater-fullChangelog-get-reply"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("autoUpdater-fullChangelog-get"); + BridgeConnector.Emit("autoUpdater-fullChangelog-get"); return taskCompletionSource.Task; } @@ -95,13 +95,13 @@ public Task IsAllowDowngradeEnabledAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-allowDowngrade-get-reply", (result) => + BridgeConnector.On("autoUpdater-allowDowngrade-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-allowDowngrade-get-reply"); + BridgeConnector.Off("autoUpdater-allowDowngrade-get-reply"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("autoUpdater-allowDowngrade-get"); + BridgeConnector.Emit("autoUpdater-allowDowngrade-get"); return taskCompletionSource.Task; } @@ -113,7 +113,7 @@ public bool AutoDownload { set { - BridgeConnector.Socket.Emit("autoUpdater-autoDownload-set", value); + BridgeConnector.Emit("autoUpdater-autoDownload-set", value); } } @@ -126,7 +126,7 @@ public bool AutoInstallOnAppQuit { set { - BridgeConnector.Socket.Emit("autoUpdater-autoInstallOnAppQuit-set", value); + BridgeConnector.Emit("autoUpdater-autoInstallOnAppQuit-set", value); } } @@ -140,7 +140,7 @@ public bool AllowPrerelease { set { - BridgeConnector.Socket.Emit("autoUpdater-allowPrerelease-set", value); + BridgeConnector.Emit("autoUpdater-allowPrerelease-set", value); } } @@ -152,7 +152,7 @@ public bool FullChangelog { set { - BridgeConnector.Socket.Emit("autoUpdater-fullChangelog-set", value); + BridgeConnector.Emit("autoUpdater-fullChangelog-set", value); } } @@ -165,7 +165,7 @@ public bool AllowDowngrade { set { - BridgeConnector.Socket.Emit("autoUpdater-allowDowngrade-set", value); + BridgeConnector.Emit("autoUpdater-allowDowngrade-set", value); } } @@ -176,13 +176,13 @@ public Task GetUpdateConfigPathAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-updateConfigPath-get-reply", (result) => + BridgeConnector.On("autoUpdater-updateConfigPath-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-updateConfigPath-get-reply"); + BridgeConnector.Off("autoUpdater-updateConfigPath-get-reply"); taskCompletionSource.SetResult(result.ToString()); }); - BridgeConnector.Socket.Emit("autoUpdater-updateConfigPath-get"); + BridgeConnector.Emit("autoUpdater-updateConfigPath-get"); return taskCompletionSource.Task; } @@ -194,13 +194,12 @@ public Task GetCurrentVersionAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-currentVersion-get-reply", (result) => + BridgeConnector.On("autoUpdater-currentVersion-get-reply", (version) => { - BridgeConnector.Socket.Off("autoUpdater-currentVersion-get-reply"); - SemVer version = ((JObject)result).ToObject(); + BridgeConnector.Off("autoUpdater-currentVersion-get-reply"); taskCompletionSource.SetResult(version); }); - BridgeConnector.Socket.Emit("autoUpdater-currentVersion-get"); + BridgeConnector.Emit("autoUpdater-currentVersion-get"); return taskCompletionSource.Task; } @@ -213,12 +212,12 @@ public Task GetChannelAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("autoUpdater-channel-get-reply", (result) => + BridgeConnector.On("autoUpdater-channel-get-reply", (result) => { - BridgeConnector.Socket.Off("autoUpdater-channel-get-reply"); + BridgeConnector.Off("autoUpdater-channel-get-reply"); taskCompletionSource.SetResult(result.ToString()); }); - BridgeConnector.Socket.Emit("autoUpdater-channel-get"); + BridgeConnector.Emit("autoUpdater-channel-get"); return taskCompletionSource.Task; } @@ -231,13 +230,12 @@ public Task GetChannelAsync() public Task> GetRequestHeadersAsync() { var taskCompletionSource = new TaskCompletionSource>(); - BridgeConnector.Socket.On("autoUpdater-requestHeaders-get-reply", (headers) => + BridgeConnector.On>("autoUpdater-requestHeaders-get-reply", (headers) => { - BridgeConnector.Socket.Off("autoUpdater-requestHeaders-get-reply"); - Dictionary result = ((JObject)headers).ToObject>(); - taskCompletionSource.SetResult(result); + BridgeConnector.Off("autoUpdater-requestHeaders-get-reply"); + taskCompletionSource.SetResult(headers); }); - BridgeConnector.Socket.Emit("autoUpdater-requestHeaders-get"); + BridgeConnector.Emit("autoUpdater-requestHeaders-get"); return taskCompletionSource.Task; } @@ -248,7 +246,7 @@ public Dictionary RequestHeaders { set { - BridgeConnector.Socket.Emit("autoUpdater-requestHeaders-set", JObject.FromObject(value, _jsonSerializer)); + BridgeConnector.Emit("autoUpdater-requestHeaders-set", JObject.FromObject(value, _jsonSerializer)); } } @@ -261,12 +259,12 @@ public event Action OnError { if (_error == null) { - BridgeConnector.Socket.On("autoUpdater-error" + GetHashCode(), (message) => + BridgeConnector.On("autoUpdater-error" + GetHashCode(), (message) => { _error(message.ToString()); }); - BridgeConnector.Socket.Emit("register-autoUpdater-error-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-error-event", GetHashCode()); } _error += value; } @@ -275,7 +273,7 @@ public event Action OnError _error -= value; if (_error == null) - BridgeConnector.Socket.Off("autoUpdater-error" + GetHashCode()); + BridgeConnector.Off("autoUpdater-error" + GetHashCode()); } } @@ -290,12 +288,12 @@ public event Action OnCheckingForUpdate { if (_checkingForUpdate == null) { - BridgeConnector.Socket.On("autoUpdater-checking-for-update" + GetHashCode(), () => + BridgeConnector.On("autoUpdater-checking-for-update" + GetHashCode(), () => { _checkingForUpdate(); }); - BridgeConnector.Socket.Emit("register-autoUpdater-checking-for-update-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-checking-for-update-event", GetHashCode()); } _checkingForUpdate += value; } @@ -304,7 +302,7 @@ public event Action OnCheckingForUpdate _checkingForUpdate -= value; if (_checkingForUpdate == null) - BridgeConnector.Socket.Off("autoUpdater-checking-for-update" + GetHashCode()); + BridgeConnector.Off("autoUpdater-checking-for-update" + GetHashCode()); } } @@ -320,12 +318,12 @@ public event Action OnUpdateAvailable { if (_updateAvailable == null) { - BridgeConnector.Socket.On("autoUpdater-update-available" + GetHashCode(), (updateInfo) => + BridgeConnector.On("autoUpdater-update-available" + GetHashCode(), (updateInfo) => { - _updateAvailable(JObject.Parse(updateInfo.ToString()).ToObject()); + _updateAvailable(updateInfo); }); - BridgeConnector.Socket.Emit("register-autoUpdater-update-available-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-update-available-event", GetHashCode()); } _updateAvailable += value; } @@ -334,7 +332,7 @@ public event Action OnUpdateAvailable _updateAvailable -= value; if (_updateAvailable == null) - BridgeConnector.Socket.Off("autoUpdater-update-available" + GetHashCode()); + BridgeConnector.Off("autoUpdater-update-available" + GetHashCode()); } } @@ -349,12 +347,12 @@ public event Action OnUpdateNotAvailable { if (_updateNotAvailable == null) { - BridgeConnector.Socket.On("autoUpdater-update-not-available" + GetHashCode(), (updateInfo) => + BridgeConnector.On("autoUpdater-update-not-available" + GetHashCode(), (updateInfo) => { - _updateNotAvailable(JObject.Parse(updateInfo.ToString()).ToObject()); + _updateNotAvailable(updateInfo); }); - BridgeConnector.Socket.Emit("register-autoUpdater-update-not-available-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-update-not-available-event", GetHashCode()); } _updateNotAvailable += value; } @@ -363,7 +361,7 @@ public event Action OnUpdateNotAvailable _updateNotAvailable -= value; if (_updateNotAvailable == null) - BridgeConnector.Socket.Off("autoUpdater-update-not-available" + GetHashCode()); + BridgeConnector.Off("autoUpdater-update-not-available" + GetHashCode()); } } @@ -378,12 +376,12 @@ public event Action OnDownloadProgress { if (_downloadProgress == null) { - BridgeConnector.Socket.On("autoUpdater-download-progress" + GetHashCode(), (progressInfo) => + BridgeConnector.On("autoUpdater-download-progress" + GetHashCode(), (progressInfo) => { - _downloadProgress(JObject.Parse(progressInfo.ToString()).ToObject()); + _downloadProgress(progressInfo); }); - BridgeConnector.Socket.Emit("register-autoUpdater-download-progress-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-download-progress-event", GetHashCode()); } _downloadProgress += value; } @@ -392,7 +390,7 @@ public event Action OnDownloadProgress _downloadProgress -= value; if (_downloadProgress == null) - BridgeConnector.Socket.Off("autoUpdater-download-progress" + GetHashCode()); + BridgeConnector.Off("autoUpdater-download-progress" + GetHashCode()); } } @@ -407,12 +405,12 @@ public event Action OnUpdateDownloaded { if (_updateDownloaded == null) { - BridgeConnector.Socket.On("autoUpdater-update-downloaded" + GetHashCode(), (updateInfo) => + BridgeConnector.On("autoUpdater-update-downloaded" + GetHashCode(), (updateInfo) => { - _updateDownloaded(JObject.Parse(updateInfo.ToString()).ToObject()); + _updateDownloaded(updateInfo); }); - BridgeConnector.Socket.Emit("register-autoUpdater-update-downloaded-event", GetHashCode()); + BridgeConnector.Emit("register-autoUpdater-update-downloaded-event", GetHashCode()); } _updateDownloaded += value; } @@ -421,7 +419,7 @@ public event Action OnUpdateDownloaded _updateDownloaded -= value; if (_updateDownloaded == null) - BridgeConnector.Socket.Off("autoUpdater-update-downloaded" + GetHashCode()); + BridgeConnector.Off("autoUpdater-update-downloaded" + GetHashCode()); } } @@ -460,30 +458,30 @@ public Task CheckForUpdatesAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("autoUpdaterCheckForUpdatesComplete" + guid, (updateCheckResult) => + BridgeConnector.On("autoUpdaterCheckForUpdatesComplete" + guid, (updateCheckResult) => { try { - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesComplete" + guid); - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesError" + guid); - taskCompletionSource.SetResult(JObject.Parse(updateCheckResult.ToString()).ToObject()); + BridgeConnector.Off("autoUpdaterCheckForUpdatesComplete" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesError" + guid); + taskCompletionSource.SetResult(updateCheckResult); } catch (Exception ex) { taskCompletionSource.SetException(ex); } }); - BridgeConnector.Socket.On("autoUpdaterCheckForUpdatesError" + guid, (error) => + BridgeConnector.On("autoUpdaterCheckForUpdatesError" + guid, (error) => { - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesComplete" + guid); - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesError" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesComplete" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesError" + guid); string message = "An error occurred in CheckForUpdatesAsync"; if (error != null && !string.IsNullOrEmpty(error.ToString())) message = JsonConvert.SerializeObject(error); taskCompletionSource.SetException(new Exception(message)); }); - BridgeConnector.Socket.Emit("autoUpdaterCheckForUpdates", guid); + BridgeConnector.Emit("autoUpdaterCheckForUpdates", guid); return taskCompletionSource.Task; } @@ -499,33 +497,33 @@ public Task CheckForUpdatesAndNotifyAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid, (updateCheckResult) => + BridgeConnector.On("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid, (updateCheckResult) => { try { - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid); - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesAndNotifyError" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesAndNotifyError" + guid); if (updateCheckResult == null) taskCompletionSource.SetResult(null); else - taskCompletionSource.SetResult(JObject.Parse(updateCheckResult.ToString()).ToObject()); + taskCompletionSource.SetResult(updateCheckResult); } catch (Exception ex) { taskCompletionSource.SetException(ex); } }); - BridgeConnector.Socket.On("autoUpdaterCheckForUpdatesAndNotifyError" + guid, (error) => + BridgeConnector.On("autoUpdaterCheckForUpdatesAndNotifyError" + guid, (error) => { - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid); - BridgeConnector.Socket.Off("autoUpdaterCheckForUpdatesAndNotifyError" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid); + BridgeConnector.Off("autoUpdaterCheckForUpdatesAndNotifyError" + guid); string message = "An error occurred in autoUpdaterCheckForUpdatesAndNotify"; if (error != null) message = JsonConvert.SerializeObject(error); taskCompletionSource.SetException(new Exception(message)); }); - BridgeConnector.Socket.Emit("autoUpdaterCheckForUpdatesAndNotify", guid); + BridgeConnector.Emit("autoUpdaterCheckForUpdatesAndNotify", guid); return taskCompletionSource.Task; } @@ -541,7 +539,7 @@ public Task CheckForUpdatesAndNotifyAsync() /// Run the app after finish even on silent install. Not applicable for macOS. Ignored if `isSilent` is set to `false`. public void QuitAndInstall(bool isSilent = false, bool isForceRunAfter = false) { - BridgeConnector.Socket.Emit("autoUpdaterQuitAndInstall", isSilent, isForceRunAfter); + BridgeConnector.Emit("autoUpdaterQuitAndInstall", isSilent, isForceRunAfter); } /// @@ -553,13 +551,13 @@ public Task DownloadUpdateAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("autoUpdaterDownloadUpdateComplete" + guid, (downloadedPath) => + BridgeConnector.On("autoUpdaterDownloadUpdateComplete" + guid, (downloadedPath) => { - BridgeConnector.Socket.Off("autoUpdaterDownloadUpdateComplete" + guid); + BridgeConnector.Off("autoUpdaterDownloadUpdateComplete" + guid); taskCompletionSource.SetResult(downloadedPath.ToString()); }); - BridgeConnector.Socket.Emit("autoUpdaterDownloadUpdate", guid); + BridgeConnector.Emit("autoUpdaterDownloadUpdate", guid); return taskCompletionSource.Task; } @@ -573,13 +571,13 @@ public Task GetFeedURLAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("autoUpdaterGetFeedURLComplete" + guid, (downloadedPath) => + BridgeConnector.On("autoUpdaterGetFeedURLComplete" + guid, (downloadedPath) => { - BridgeConnector.Socket.Off("autoUpdaterGetFeedURLComplete" + guid); + BridgeConnector.Off("autoUpdaterGetFeedURLComplete" + guid); taskCompletionSource.SetResult(downloadedPath.ToString()); }); - BridgeConnector.Socket.Emit("autoUpdaterGetFeedURL", guid); + BridgeConnector.Emit("autoUpdaterGetFeedURL", guid); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/BridgeConnector.cs b/ElectronNET.API/BridgeConnector.cs index 08a84745..fa910fe0 100644 --- a/ElectronNET.API/BridgeConnector.cs +++ b/ElectronNET.API/BridgeConnector.cs @@ -1,39 +1,65 @@ -using Quobject.SocketIoClientDotNet.Client; -using System; +using System; +using SocketIOClient; +using SocketIOClient.Newtonsoft.Json; namespace ElectronNET.API { internal static class BridgeConnector { - private static Socket _socket; + private static SocketIO _socket; private static object _syncRoot = new object(); - public static Socket Socket + + public static void Emit(string eventString, params object[] args) => Socket.EmitAsync(eventString, args); + public static void Off(string eventString) => Socket.Off(eventString); + public static void On(string eventString, Action fn) => Socket.On(eventString, _ => fn()); + public static void On(string eventString, Action fn) => Socket.On(eventString, (o) => + { + fn(o.GetValue(0)); + }); + + public static void Once(string eventString, Action fn) => Socket.On(eventString, (o) => + { + Socket.Off(eventString); + fn(o.GetValue(0)); + }); + + + private static SocketIO Socket { get { - if(_socket == null && HybridSupport.IsElectronActive) + if (_socket is null) { - lock (_syncRoot) + if (HybridSupport.IsElectronActive) { - if (_socket == null && HybridSupport.IsElectronActive) + + lock (_syncRoot) { - _socket = IO.Socket("http://localhost:" + BridgeSettings.SocketPort); - _socket.On(Socket.EVENT_CONNECT, () => + if (_socket is null && HybridSupport.IsElectronActive) { - Console.WriteLine("BridgeConnector connected!"); - }); + var socket = new SocketIO($"http://localhost:{BridgeSettings.SocketPort}", new SocketIOOptions() + { + EIO = 3 + }); + + socket.JsonSerializer = new NewtonsoftJsonSerializer(socket.Options.EIO); + + + socket.OnConnected += (_, __) => + { + Console.WriteLine("BridgeConnector connected!"); + }; + + socket.ConnectAsync().Wait(); + + _socket = socket; + } } } - } - else if(_socket == null && !HybridSupport.IsElectronActive) - { - lock (_syncRoot) + else { - if (_socket == null && !HybridSupport.IsElectronActive) - { - _socket = IO.Socket(new Uri("http://localhost"), new IO.Options { AutoConnect = false }); - } + throw new Exception("Missing Socket Port"); } } @@ -41,4 +67,55 @@ public static Socket Socket } } } + + public interface IListener : System.IComparable + { + int GetId(); + void Call(params object[] args); + } + + public class ListenerImpl : IListener + { + private static int id_counter = 0; + private int Id; + private readonly Action fn1; + private readonly Action fn; + + public ListenerImpl(Action fn) + { + + this.fn = fn; + this.Id = id_counter++; + } + + public ListenerImpl(Action fn) + { + + this.fn1 = fn; + this.Id = id_counter++; + } + + public void Call(params object[] args) + { + if (fn != null) + { + var arg = args.Length > 0 ? args[0] : null; + fn(arg); + } + else + { + fn1(); + } + } + + public int CompareTo(IListener other) + { + return this.GetId().CompareTo(other.GetId()); + } + + public int GetId() + { + return Id; + } + } } diff --git a/ElectronNET.API/BrowserView.cs b/ElectronNET.API/BrowserView.cs index 868c09fa..82b6daf2 100644 --- a/ElectronNET.API/BrowserView.cs +++ b/ElectronNET.API/BrowserView.cs @@ -35,20 +35,20 @@ public Task GetBoundsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserView-getBounds-reply", (result) => + BridgeConnector.On("browserView-getBounds-reply", (result) => { - BridgeConnector.Socket.Off("browserView-getBounds-reply"); - taskCompletionSource.SetResult((Rectangle)result); + BridgeConnector.Off("browserView-getBounds-reply"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("browserView-getBounds", Id); + BridgeConnector.Emit("browserView-getBounds", Id); return taskCompletionSource.Task; } public void SetBounds(Rectangle value) { - BridgeConnector.Socket.Emit("browserView-setBounds", Id, JObject.FromObject(value, _jsonSerializer)); + BridgeConnector.Emit("browserView-setBounds", Id, JObject.FromObject(value, _jsonSerializer)); } /// @@ -69,7 +69,7 @@ internal BrowserView(int id) /// public void SetAutoResize(AutoResizeOptions options) { - BridgeConnector.Socket.Emit("browserView-setAutoResize", Id, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("browserView-setAutoResize", Id, JObject.FromObject(options, _jsonSerializer)); } /// @@ -80,7 +80,7 @@ public void SetAutoResize(AutoResizeOptions options) /// Color in #aarrggbb or #argb form. The alpha channel is optional. public void SetBackgroundColor(string color) { - BridgeConnector.Socket.Emit("browserView-setBackgroundColor", Id, color); + BridgeConnector.Emit("browserView-setBackgroundColor", Id, color); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/BrowserWindow.cs b/ElectronNET.API/BrowserWindow.cs index 2c4590ac..b08081c5 100644 --- a/ElectronNET.API/BrowserWindow.cs +++ b/ElectronNET.API/BrowserWindow.cs @@ -34,12 +34,12 @@ public event Action OnReadyToShow { if (_readyToShow == null) { - BridgeConnector.Socket.On("browserWindow-ready-to-show" + Id, () => + BridgeConnector.On("browserWindow-ready-to-show" + Id, () => { _readyToShow(); }); - BridgeConnector.Socket.Emit("register-browserWindow-ready-to-show", Id); + BridgeConnector.Emit("register-browserWindow-ready-to-show", Id); } _readyToShow += value; } @@ -48,7 +48,7 @@ public event Action OnReadyToShow _readyToShow -= value; if (_readyToShow == null) - BridgeConnector.Socket.Off("browserWindow-ready-to-show" + Id); + BridgeConnector.Off("browserWindow-ready-to-show" + Id); } } @@ -63,12 +63,12 @@ public event Action OnPageTitleUpdated { if (_pageTitleUpdated == null) { - BridgeConnector.Socket.On("browserWindow-page-title-updated" + Id, (title) => + BridgeConnector.On("browserWindow-page-title-updated" + Id, (title) => { - _pageTitleUpdated(title.ToString()); + _pageTitleUpdated(title); }); - BridgeConnector.Socket.Emit("register-browserWindow-page-title-updated", Id); + BridgeConnector.Emit("register-browserWindow-page-title-updated", Id); } _pageTitleUpdated += value; } @@ -77,7 +77,7 @@ public event Action OnPageTitleUpdated _pageTitleUpdated -= value; if (_pageTitleUpdated == null) - BridgeConnector.Socket.Off("browserWindow-page-title-updated" + Id); + BridgeConnector.Off("browserWindow-page-title-updated" + Id); } } @@ -92,12 +92,12 @@ public event Action OnClose { if (_close == null) { - BridgeConnector.Socket.On("browserWindow-close" + Id, () => + BridgeConnector.On("browserWindow-close" + Id, () => { _close(); }); - BridgeConnector.Socket.Emit("register-browserWindow-close", Id); + BridgeConnector.Emit("register-browserWindow-close", Id); } _close += value; } @@ -106,7 +106,7 @@ public event Action OnClose _close -= value; if (_close == null) - BridgeConnector.Socket.Off("browserWindow-close" + Id); + BridgeConnector.Off("browserWindow-close" + Id); } } @@ -123,12 +123,12 @@ public event Action OnClosed { if (_closed == null) { - BridgeConnector.Socket.On("browserWindow-closed" + Id, () => + BridgeConnector.On("browserWindow-closed" + Id, () => { _closed(); }); - BridgeConnector.Socket.Emit("register-browserWindow-closed", Id); + BridgeConnector.Emit("register-browserWindow-closed", Id); } _closed += value; } @@ -137,7 +137,7 @@ public event Action OnClosed _closed -= value; if (_closed == null) - BridgeConnector.Socket.Off("browserWindow-closed" + Id); + BridgeConnector.Off("browserWindow-closed" + Id); } } @@ -152,12 +152,12 @@ public event Action OnSessionEnd { if (_sessionEnd == null) { - BridgeConnector.Socket.On("browserWindow-session-end" + Id, () => + BridgeConnector.On("browserWindow-session-end" + Id, () => { _sessionEnd(); }); - BridgeConnector.Socket.Emit("register-browserWindow-session-end", Id); + BridgeConnector.Emit("register-browserWindow-session-end", Id); } _sessionEnd += value; } @@ -166,7 +166,7 @@ public event Action OnSessionEnd _sessionEnd -= value; if (_sessionEnd == null) - BridgeConnector.Socket.Off("browserWindow-session-end" + Id); + BridgeConnector.Off("browserWindow-session-end" + Id); } } @@ -181,12 +181,12 @@ public event Action OnUnresponsive { if (_unresponsive == null) { - BridgeConnector.Socket.On("browserWindow-unresponsive" + Id, () => + BridgeConnector.On("browserWindow-unresponsive" + Id, () => { _unresponsive(); }); - BridgeConnector.Socket.Emit("register-browserWindow-unresponsive", Id); + BridgeConnector.Emit("register-browserWindow-unresponsive", Id); } _unresponsive += value; } @@ -195,7 +195,7 @@ public event Action OnUnresponsive _unresponsive -= value; if (_unresponsive == null) - BridgeConnector.Socket.Off("browserWindow-unresponsive" + Id); + BridgeConnector.Off("browserWindow-unresponsive" + Id); } } @@ -210,12 +210,12 @@ public event Action OnResponsive { if (_responsive == null) { - BridgeConnector.Socket.On("browserWindow-responsive" + Id, () => + BridgeConnector.On("browserWindow-responsive" + Id, () => { _responsive(); }); - BridgeConnector.Socket.Emit("register-browserWindow-responsive", Id); + BridgeConnector.Emit("register-browserWindow-responsive", Id); } _responsive += value; } @@ -224,7 +224,7 @@ public event Action OnResponsive _responsive -= value; if (_responsive == null) - BridgeConnector.Socket.Off("browserWindow-responsive" + Id); + BridgeConnector.Off("browserWindow-responsive" + Id); } } @@ -239,12 +239,12 @@ public event Action OnBlur { if (_blur == null) { - BridgeConnector.Socket.On("browserWindow-blur" + Id, () => + BridgeConnector.On("browserWindow-blur" + Id, () => { _blur(); }); - BridgeConnector.Socket.Emit("register-browserWindow-blur", Id); + BridgeConnector.Emit("register-browserWindow-blur", Id); } _blur += value; } @@ -253,7 +253,7 @@ public event Action OnBlur _blur -= value; if (_blur == null) - BridgeConnector.Socket.Off("browserWindow-blur" + Id); + BridgeConnector.Off("browserWindow-blur" + Id); } } @@ -268,12 +268,12 @@ public event Action OnFocus { if (_focus == null) { - BridgeConnector.Socket.On("browserWindow-focus" + Id, () => + BridgeConnector.On("browserWindow-focus" + Id, () => { _focus(); }); - BridgeConnector.Socket.Emit("register-browserWindow-focus", Id); + BridgeConnector.Emit("register-browserWindow-focus", Id); } _focus += value; } @@ -282,7 +282,7 @@ public event Action OnFocus _focus -= value; if (_focus == null) - BridgeConnector.Socket.Off("browserWindow-focus" + Id); + BridgeConnector.Off("browserWindow-focus" + Id); } } @@ -297,12 +297,12 @@ public event Action OnShow { if (_show == null) { - BridgeConnector.Socket.On("browserWindow-show" + Id, () => + BridgeConnector.On("browserWindow-show" + Id, () => { _show(); }); - BridgeConnector.Socket.Emit("register-browserWindow-show", Id); + BridgeConnector.Emit("register-browserWindow-show", Id); } _show += value; } @@ -311,7 +311,7 @@ public event Action OnShow _show -= value; if (_show == null) - BridgeConnector.Socket.Off("browserWindow-show" + Id); + BridgeConnector.Off("browserWindow-show" + Id); } } @@ -326,12 +326,12 @@ public event Action OnHide { if (_hide == null) { - BridgeConnector.Socket.On("browserWindow-hide" + Id, () => + BridgeConnector.On("browserWindow-hide" + Id, () => { _hide(); }); - BridgeConnector.Socket.Emit("register-browserWindow-hide", Id); + BridgeConnector.Emit("register-browserWindow-hide", Id); } _hide += value; } @@ -340,7 +340,7 @@ public event Action OnHide _hide -= value; if (_hide == null) - BridgeConnector.Socket.Off("browserWindow-hide" + Id); + BridgeConnector.Off("browserWindow-hide" + Id); } } @@ -355,12 +355,12 @@ public event Action OnMaximize { if (_maximize == null) { - BridgeConnector.Socket.On("browserWindow-maximize" + Id, () => + BridgeConnector.On("browserWindow-maximize" + Id, () => { _maximize(); }); - BridgeConnector.Socket.Emit("register-browserWindow-maximize", Id); + BridgeConnector.Emit("register-browserWindow-maximize", Id); } _maximize += value; } @@ -369,7 +369,7 @@ public event Action OnMaximize _maximize -= value; if (_maximize == null) - BridgeConnector.Socket.Off("browserWindow-maximize" + Id); + BridgeConnector.Off("browserWindow-maximize" + Id); } } @@ -384,12 +384,12 @@ public event Action OnUnmaximize { if (_unmaximize == null) { - BridgeConnector.Socket.On("browserWindow-unmaximize" + Id, () => + BridgeConnector.On("browserWindow-unmaximize" + Id, () => { _unmaximize(); }); - BridgeConnector.Socket.Emit("register-browserWindow-unmaximize", Id); + BridgeConnector.Emit("register-browserWindow-unmaximize", Id); } _unmaximize += value; } @@ -398,7 +398,7 @@ public event Action OnUnmaximize _unmaximize -= value; if (_unmaximize == null) - BridgeConnector.Socket.Off("browserWindow-unmaximize" + Id); + BridgeConnector.Off("browserWindow-unmaximize" + Id); } } @@ -413,12 +413,12 @@ public event Action OnMinimize { if (_minimize == null) { - BridgeConnector.Socket.On("browserWindow-minimize" + Id, () => + BridgeConnector.On("browserWindow-minimize" + Id, () => { _minimize(); }); - BridgeConnector.Socket.Emit("register-browserWindow-minimize", Id); + BridgeConnector.Emit("register-browserWindow-minimize", Id); } _minimize += value; } @@ -427,7 +427,7 @@ public event Action OnMinimize _minimize -= value; if (_minimize == null) - BridgeConnector.Socket.Off("browserWindow-minimize" + Id); + BridgeConnector.Off("browserWindow-minimize" + Id); } } @@ -442,12 +442,12 @@ public event Action OnRestore { if (_restore == null) { - BridgeConnector.Socket.On("browserWindow-restore" + Id, () => + BridgeConnector.On("browserWindow-restore" + Id, () => { _restore(); }); - BridgeConnector.Socket.Emit("register-browserWindow-restore", Id); + BridgeConnector.Emit("register-browserWindow-restore", Id); } _restore += value; } @@ -456,7 +456,7 @@ public event Action OnRestore _restore -= value; if (_restore == null) - BridgeConnector.Socket.Off("browserWindow-restore" + Id); + BridgeConnector.Off("browserWindow-restore" + Id); } } @@ -471,12 +471,12 @@ public event Action OnResize { if (_resize == null) { - BridgeConnector.Socket.On("browserWindow-resize" + Id, () => + BridgeConnector.On("browserWindow-resize" + Id, () => { _resize(); }); - BridgeConnector.Socket.Emit("register-browserWindow-resize", Id); + BridgeConnector.Emit("register-browserWindow-resize", Id); } _resize += value; } @@ -485,7 +485,7 @@ public event Action OnResize _resize -= value; if (_resize == null) - BridgeConnector.Socket.Off("browserWindow-resize" + Id); + BridgeConnector.Off("browserWindow-resize" + Id); } } @@ -502,12 +502,12 @@ public event Action OnMove { if (_move == null) { - BridgeConnector.Socket.On("browserWindow-move" + Id, () => + BridgeConnector.On("browserWindow-move" + Id, () => { _move(); }); - BridgeConnector.Socket.Emit("register-browserWindow-move", Id); + BridgeConnector.Emit("register-browserWindow-move", Id); } _move += value; } @@ -516,7 +516,7 @@ public event Action OnMove _move -= value; if (_move == null) - BridgeConnector.Socket.Off("browserWindow-move" + Id); + BridgeConnector.Off("browserWindow-move" + Id); } } @@ -531,12 +531,12 @@ public event Action OnMoved { if (_moved == null) { - BridgeConnector.Socket.On("browserWindow-moved" + Id, () => + BridgeConnector.On("browserWindow-moved" + Id, () => { _moved(); }); - BridgeConnector.Socket.Emit("register-browserWindow-moved", Id); + BridgeConnector.Emit("register-browserWindow-moved", Id); } _moved += value; } @@ -545,7 +545,7 @@ public event Action OnMoved _moved -= value; if (_moved == null) - BridgeConnector.Socket.Off("browserWindow-moved" + Id); + BridgeConnector.Off("browserWindow-moved" + Id); } } @@ -560,12 +560,12 @@ public event Action OnEnterFullScreen { if (_enterFullScreen == null) { - BridgeConnector.Socket.On("browserWindow-enter-full-screen" + Id, () => + BridgeConnector.On("browserWindow-enter-full-screen" + Id, () => { _enterFullScreen(); }); - BridgeConnector.Socket.Emit("register-browserWindow-enter-full-screen", Id); + BridgeConnector.Emit("register-browserWindow-enter-full-screen", Id); } _enterFullScreen += value; } @@ -574,7 +574,7 @@ public event Action OnEnterFullScreen _enterFullScreen -= value; if (_enterFullScreen == null) - BridgeConnector.Socket.Off("browserWindow-enter-full-screen" + Id); + BridgeConnector.Off("browserWindow-enter-full-screen" + Id); } } @@ -589,12 +589,12 @@ public event Action OnLeaveFullScreen { if (_leaveFullScreen == null) { - BridgeConnector.Socket.On("browserWindow-leave-full-screen" + Id, () => + BridgeConnector.On("browserWindow-leave-full-screen" + Id, () => { _leaveFullScreen(); }); - BridgeConnector.Socket.Emit("register-browserWindow-leave-full-screen", Id); + BridgeConnector.Emit("register-browserWindow-leave-full-screen", Id); } _leaveFullScreen += value; } @@ -603,7 +603,7 @@ public event Action OnLeaveFullScreen _leaveFullScreen -= value; if (_leaveFullScreen == null) - BridgeConnector.Socket.Off("browserWindow-leave-full-screen" + Id); + BridgeConnector.Off("browserWindow-leave-full-screen" + Id); } } @@ -618,12 +618,12 @@ public event Action OnEnterHtmlFullScreen { if (_enterHtmlFullScreen == null) { - BridgeConnector.Socket.On("browserWindow-enter-html-full-screen" + Id, () => + BridgeConnector.On("browserWindow-enter-html-full-screen" + Id, () => { _enterHtmlFullScreen(); }); - BridgeConnector.Socket.Emit("register-browserWindow-enter-html-full-screen", Id); + BridgeConnector.Emit("register-browserWindow-enter-html-full-screen", Id); } _enterHtmlFullScreen += value; } @@ -632,7 +632,7 @@ public event Action OnEnterHtmlFullScreen _enterHtmlFullScreen -= value; if (_enterHtmlFullScreen == null) - BridgeConnector.Socket.Off("browserWindow-enter-html-full-screen" + Id); + BridgeConnector.Off("browserWindow-enter-html-full-screen" + Id); } } @@ -647,12 +647,12 @@ public event Action OnLeaveHtmlFullScreen { if (_leaveHtmlFullScreen == null) { - BridgeConnector.Socket.On("browserWindow-leave-html-full-screen" + Id, () => + BridgeConnector.On("browserWindow-leave-html-full-screen" + Id, () => { _leaveHtmlFullScreen(); }); - BridgeConnector.Socket.Emit("register-browserWindow-leave-html-full-screen", Id); + BridgeConnector.Emit("register-browserWindow-leave-html-full-screen", Id); } _leaveHtmlFullScreen += value; } @@ -661,7 +661,7 @@ public event Action OnLeaveHtmlFullScreen _leaveHtmlFullScreen -= value; if (_leaveHtmlFullScreen == null) - BridgeConnector.Socket.Off("browserWindow-leave-html-full-screen" + Id); + BridgeConnector.Off("browserWindow-leave-html-full-screen" + Id); } } @@ -682,12 +682,12 @@ public event Action OnAppCommand { if (_appCommand == null) { - BridgeConnector.Socket.On("browserWindow-app-command" + Id, (command) => + BridgeConnector.On("browserWindow-app-command" + Id, (command) => { - _appCommand(command.ToString()); + _appCommand(command); }); - BridgeConnector.Socket.Emit("register-browserWindow-app-command", Id); + BridgeConnector.Emit("register-browserWindow-app-command", Id); } _appCommand += value; } @@ -696,7 +696,7 @@ public event Action OnAppCommand _appCommand -= value; if (_appCommand == null) - BridgeConnector.Socket.Off("browserWindow-app-command" + Id); + BridgeConnector.Off("browserWindow-app-command" + Id); } } @@ -711,12 +711,12 @@ public event Action OnScrollTouchBegin { if (_scrollTouchBegin == null) { - BridgeConnector.Socket.On("browserWindow-scroll-touch-begin" + Id, () => + BridgeConnector.On("browserWindow-scroll-touch-begin" + Id, () => { _scrollTouchBegin(); }); - BridgeConnector.Socket.Emit("register-browserWindow-scroll-touch-begin", Id); + BridgeConnector.Emit("register-browserWindow-scroll-touch-begin", Id); } _scrollTouchBegin += value; } @@ -725,7 +725,7 @@ public event Action OnScrollTouchBegin _scrollTouchBegin -= value; if (_scrollTouchBegin == null) - BridgeConnector.Socket.Off("browserWindow-scroll-touch-begin" + Id); + BridgeConnector.Off("browserWindow-scroll-touch-begin" + Id); } } @@ -740,12 +740,12 @@ public event Action OnScrollTouchEnd { if (_scrollTouchEnd == null) { - BridgeConnector.Socket.On("browserWindow-scroll-touch-end" + Id, () => + BridgeConnector.On("browserWindow-scroll-touch-end" + Id, () => { _scrollTouchEnd(); }); - BridgeConnector.Socket.Emit("register-browserWindow-scroll-touch-end", Id); + BridgeConnector.Emit("register-browserWindow-scroll-touch-end", Id); } _scrollTouchEnd += value; } @@ -754,7 +754,7 @@ public event Action OnScrollTouchEnd _scrollTouchEnd -= value; if (_scrollTouchEnd == null) - BridgeConnector.Socket.Off("browserWindow-scroll-touch-end" + Id); + BridgeConnector.Off("browserWindow-scroll-touch-end" + Id); } } @@ -769,12 +769,12 @@ public event Action OnScrollTouchEdge { if (_scrollTouchEdge == null) { - BridgeConnector.Socket.On("browserWindow-scroll-touch-edge" + Id, () => + BridgeConnector.On("browserWindow-scroll-touch-edge" + Id, () => { _scrollTouchEdge(); }); - BridgeConnector.Socket.Emit("register-browserWindow-scroll-touch-edge", Id); + BridgeConnector.Emit("register-browserWindow-scroll-touch-edge", Id); } _scrollTouchEdge += value; } @@ -783,7 +783,7 @@ public event Action OnScrollTouchEdge _scrollTouchEdge -= value; if (_scrollTouchEdge == null) - BridgeConnector.Socket.Off("browserWindow-scroll-touch-edge" + Id); + BridgeConnector.Off("browserWindow-scroll-touch-edge" + Id); } } @@ -798,12 +798,12 @@ public event Action OnSwipe { if (_swipe == null) { - BridgeConnector.Socket.On("browserWindow-swipe" + Id, (direction) => + BridgeConnector.On("browserWindow-swipe" + Id, (direction) => { - _swipe(direction.ToString()); + _swipe(direction); }); - BridgeConnector.Socket.Emit("register-browserWindow-swipe", Id); + BridgeConnector.Emit("register-browserWindow-swipe", Id); } _swipe += value; } @@ -812,7 +812,7 @@ public event Action OnSwipe _swipe -= value; if (_swipe == null) - BridgeConnector.Socket.Off("browserWindow-swipe" + Id); + BridgeConnector.Off("browserWindow-swipe" + Id); } } @@ -827,12 +827,12 @@ public event Action OnSheetBegin { if (_sheetBegin == null) { - BridgeConnector.Socket.On("browserWindow-sheet-begin" + Id, () => + BridgeConnector.On("browserWindow-sheet-begin" + Id, () => { _sheetBegin(); }); - BridgeConnector.Socket.Emit("register-browserWindow-sheet-begin", Id); + BridgeConnector.Emit("register-browserWindow-sheet-begin", Id); } _sheetBegin += value; } @@ -841,7 +841,7 @@ public event Action OnSheetBegin _sheetBegin -= value; if (_sheetBegin == null) - BridgeConnector.Socket.Off("browserWindow-sheet-begin" + Id); + BridgeConnector.Off("browserWindow-sheet-begin" + Id); } } @@ -856,12 +856,12 @@ public event Action OnSheetEnd { if (_sheetEnd == null) { - BridgeConnector.Socket.On("browserWindow-sheet-end" + Id, () => + BridgeConnector.On("browserWindow-sheet-end" + Id, () => { _sheetEnd(); }); - BridgeConnector.Socket.Emit("register-browserWindow-sheet-end", Id); + BridgeConnector.Emit("register-browserWindow-sheet-end", Id); } _sheetEnd += value; } @@ -870,7 +870,7 @@ public event Action OnSheetEnd _sheetEnd -= value; if (_sheetEnd == null) - BridgeConnector.Socket.Off("browserWindow-sheet-end" + Id); + BridgeConnector.Off("browserWindow-sheet-end" + Id); } } @@ -885,12 +885,12 @@ public event Action OnNewWindowForTab { if (_newWindowForTab == null) { - BridgeConnector.Socket.On("browserWindow-new-window-for-tab" + Id, () => + BridgeConnector.On("browserWindow-new-window-for-tab" + Id, () => { _newWindowForTab(); }); - BridgeConnector.Socket.Emit("register-browserWindow-new-window-for-tab", Id); + BridgeConnector.Emit("register-browserWindow-new-window-for-tab", Id); } _newWindowForTab += value; } @@ -899,7 +899,7 @@ public event Action OnNewWindowForTab _newWindowForTab -= value; if (_newWindowForTab == null) - BridgeConnector.Socket.Off("browserWindow-new-window-for-tab" + Id); + BridgeConnector.Off("browserWindow-new-window-for-tab" + Id); } } @@ -917,7 +917,7 @@ internal BrowserWindow(int id) { /// public void Destroy() { - BridgeConnector.Socket.Emit("browserWindowDestroy", Id); + BridgeConnector.Emit("browserWindowDestroy", Id); } /// @@ -926,7 +926,7 @@ public void Destroy() /// public void Close() { - BridgeConnector.Socket.Emit("browserWindowClose", Id); + BridgeConnector.Emit("browserWindowClose", Id); } /// @@ -934,7 +934,7 @@ public void Close() /// public void Focus() { - BridgeConnector.Socket.Emit("browserWindowFocus", Id); + BridgeConnector.Emit("browserWindowFocus", Id); } /// @@ -942,7 +942,7 @@ public void Focus() /// public void Blur() { - BridgeConnector.Socket.Emit("browserWindowBlur", Id); + BridgeConnector.Emit("browserWindowBlur", Id); } /// @@ -953,13 +953,13 @@ public Task IsFocusedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isFocused-completed", (isFocused) => { - BridgeConnector.Socket.Off("browserWindow-isFocused-completed"); + BridgeConnector.On("browserWindow-isFocused-completed", (isFocused) => { + BridgeConnector.Off("browserWindow-isFocused-completed"); taskCompletionSource.SetResult((bool)isFocused); }); - BridgeConnector.Socket.Emit("browserWindowIsFocused", Id); + BridgeConnector.Emit("browserWindowIsFocused", Id); return taskCompletionSource.Task; } @@ -972,13 +972,13 @@ public Task IsDestroyedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isDestroyed-completed", (isDestroyed) => { - BridgeConnector.Socket.Off("browserWindow-isDestroyed-completed"); + BridgeConnector.On("browserWindow-isDestroyed-completed", (isDestroyed) => { + BridgeConnector.Off("browserWindow-isDestroyed-completed"); taskCompletionSource.SetResult((bool)isDestroyed); }); - BridgeConnector.Socket.Emit("browserWindowIsDestroyed", Id); + BridgeConnector.Emit("browserWindowIsDestroyed", Id); return taskCompletionSource.Task; } @@ -988,7 +988,7 @@ public Task IsDestroyedAsync() /// public void Show() { - BridgeConnector.Socket.Emit("browserWindowShow", Id); + BridgeConnector.Emit("browserWindowShow", Id); } /// @@ -996,7 +996,7 @@ public void Show() /// public void ShowInactive() { - BridgeConnector.Socket.Emit("browserWindowShowInactive", Id); + BridgeConnector.Emit("browserWindowShowInactive", Id); } /// @@ -1004,7 +1004,7 @@ public void ShowInactive() /// public void Hide() { - BridgeConnector.Socket.Emit("browserWindowHide", Id); + BridgeConnector.Emit("browserWindowHide", Id); } /// @@ -1015,13 +1015,13 @@ public Task IsVisibleAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isVisible-completed", (isVisible) => { - BridgeConnector.Socket.Off("browserWindow-isVisible-completed"); + BridgeConnector.On("browserWindow-isVisible-completed", (isVisible) => { + BridgeConnector.Off("browserWindow-isVisible-completed"); taskCompletionSource.SetResult((bool)isVisible); }); - BridgeConnector.Socket.Emit("browserWindowIsVisible", Id); + BridgeConnector.Emit("browserWindowIsVisible", Id); return taskCompletionSource.Task; } @@ -1034,13 +1034,13 @@ public Task IsModalAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isModal-completed", (isModal) => { - BridgeConnector.Socket.Off("browserWindow-isModal-completed"); + BridgeConnector.On("browserWindow-isModal-completed", (isModal) => { + BridgeConnector.Off("browserWindow-isModal-completed"); taskCompletionSource.SetResult((bool)isModal); }); - BridgeConnector.Socket.Emit("browserWindowIsModal", Id); + BridgeConnector.Emit("browserWindowIsModal", Id); return taskCompletionSource.Task; } @@ -1050,7 +1050,7 @@ public Task IsModalAsync() /// public void Maximize() { - BridgeConnector.Socket.Emit("browserWindowMaximize", Id); + BridgeConnector.Emit("browserWindowMaximize", Id); } /// @@ -1058,7 +1058,7 @@ public void Maximize() /// public void Unmaximize() { - BridgeConnector.Socket.Emit("browserWindowUnmaximize", Id); + BridgeConnector.Emit("browserWindowUnmaximize", Id); } /// @@ -1069,13 +1069,13 @@ public Task IsMaximizedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMaximized-completed", (isMaximized) => { - BridgeConnector.Socket.Off("browserWindow-isMaximized-completed"); + BridgeConnector.On("browserWindow-isMaximized-completed", (isMaximized) => { + BridgeConnector.Off("browserWindow-isMaximized-completed"); taskCompletionSource.SetResult((bool)isMaximized); }); - BridgeConnector.Socket.Emit("browserWindowIsMaximized", Id); + BridgeConnector.Emit("browserWindowIsMaximized", Id); return taskCompletionSource.Task; } @@ -1085,7 +1085,7 @@ public Task IsMaximizedAsync() /// public void Minimize() { - BridgeConnector.Socket.Emit("browserWindowMinimize", Id); + BridgeConnector.Emit("browserWindowMinimize", Id); } /// @@ -1093,7 +1093,7 @@ public void Minimize() /// public void Restore() { - BridgeConnector.Socket.Emit("browserWindowRestore", Id); + BridgeConnector.Emit("browserWindowRestore", Id); } /// @@ -1104,13 +1104,13 @@ public Task IsMinimizedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMinimized-completed", (isMinimized) => { - BridgeConnector.Socket.Off("browserWindow-isMinimized-completed"); + BridgeConnector.On("browserWindow-isMinimized-completed", (isMinimized) => { + BridgeConnector.Off("browserWindow-isMinimized-completed"); taskCompletionSource.SetResult((bool)isMinimized); }); - BridgeConnector.Socket.Emit("browserWindowIsMinimized", Id); + BridgeConnector.Emit("browserWindowIsMinimized", Id); return taskCompletionSource.Task; } @@ -1120,7 +1120,7 @@ public Task IsMinimizedAsync() /// public void SetFullScreen(bool flag) { - BridgeConnector.Socket.Emit("browserWindowSetFullScreen", Id, flag); + BridgeConnector.Emit("browserWindowSetFullScreen", Id, flag); } /// @@ -1131,13 +1131,13 @@ public Task IsFullScreenAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isFullScreen-completed", (isFullScreen) => { - BridgeConnector.Socket.Off("browserWindow-isFullScreen-completed"); + BridgeConnector.On("browserWindow-isFullScreen-completed", (isFullScreen) => { + BridgeConnector.Off("browserWindow-isFullScreen-completed"); taskCompletionSource.SetResult((bool)isFullScreen); }); - BridgeConnector.Socket.Emit("browserWindowIsFullScreen", Id); + BridgeConnector.Emit("browserWindowIsFullScreen", Id); return taskCompletionSource.Task; } @@ -1158,7 +1158,7 @@ public Task IsFullScreenAsync() /// The extra size not to be included while maintaining the aspect ratio. public void SetAspectRatio(int aspectRatio, Size extraSize) { - BridgeConnector.Socket.Emit("browserWindowSetAspectRatio", Id, aspectRatio, JObject.FromObject(extraSize, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetAspectRatio", Id, aspectRatio, JObject.FromObject(extraSize, _jsonSerializer)); } /// @@ -1169,7 +1169,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) /// file to open. public void PreviewFile(string path) { - BridgeConnector.Socket.Emit("browserWindowPreviewFile", Id, path); + BridgeConnector.Emit("browserWindowPreviewFile", Id, path); } /// @@ -1182,7 +1182,7 @@ public void PreviewFile(string path) /// purely visual and does not affect the content type of the file. Defaults to path. public void PreviewFile(string path, string displayname) { - BridgeConnector.Socket.Emit("browserWindowPreviewFile", Id, path, displayname); + BridgeConnector.Emit("browserWindowPreviewFile", Id, path, displayname); } /// @@ -1190,7 +1190,7 @@ public void PreviewFile(string path, string displayname) /// public void CloseFilePreview() { - BridgeConnector.Socket.Emit("browserWindowCloseFilePreview", Id); + BridgeConnector.Emit("browserWindowCloseFilePreview", Id); } /// @@ -1199,7 +1199,7 @@ public void CloseFilePreview() /// public void SetBounds(Rectangle bounds) { - BridgeConnector.Socket.Emit("browserWindowSetBounds", Id, JObject.FromObject(bounds, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetBounds", Id, JObject.FromObject(bounds, _jsonSerializer)); } /// @@ -1209,7 +1209,7 @@ public void SetBounds(Rectangle bounds) /// public void SetBounds(Rectangle bounds, bool animate) { - BridgeConnector.Socket.Emit("browserWindowSetBounds", Id, JObject.FromObject(bounds, _jsonSerializer), animate); + BridgeConnector.Emit("browserWindowSetBounds", Id, JObject.FromObject(bounds, _jsonSerializer), animate); } /// @@ -1220,13 +1220,13 @@ public Task GetBoundsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getBounds-completed", (getBounds) => { - BridgeConnector.Socket.Off("browserWindow-getBounds-completed"); + BridgeConnector.On("browserWindow-getBounds-completed", (getBounds) => { + BridgeConnector.Off("browserWindow-getBounds-completed"); - taskCompletionSource.SetResult(((JObject)getBounds).ToObject()); + taskCompletionSource.SetResult(getBounds); }); - BridgeConnector.Socket.Emit("browserWindowGetBounds", Id); + BridgeConnector.Emit("browserWindowGetBounds", Id); return taskCompletionSource.Task; } @@ -1237,7 +1237,7 @@ public Task GetBoundsAsync() /// public void SetContentBounds(Rectangle bounds) { - BridgeConnector.Socket.Emit("browserWindowSetContentBounds", Id, JObject.FromObject(bounds, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetContentBounds", Id, JObject.FromObject(bounds, _jsonSerializer)); } /// @@ -1247,7 +1247,7 @@ public void SetContentBounds(Rectangle bounds) /// public void SetContentBounds(Rectangle bounds, bool animate) { - BridgeConnector.Socket.Emit("browserWindowSetContentBounds", Id, JObject.FromObject(bounds, _jsonSerializer), animate); + BridgeConnector.Emit("browserWindowSetContentBounds", Id, JObject.FromObject(bounds, _jsonSerializer), animate); } /// @@ -1258,13 +1258,13 @@ public Task GetContentBoundsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getContentBounds-completed", (getContentBounds) => { - BridgeConnector.Socket.Off("browserWindow-getContentBounds-completed"); + BridgeConnector.On("browserWindow-getContentBounds-completed", (getContentBounds) => { + BridgeConnector.Off("browserWindow-getContentBounds-completed"); - taskCompletionSource.SetResult(((JObject)getContentBounds).ToObject()); + taskCompletionSource.SetResult(getContentBounds); }); - BridgeConnector.Socket.Emit("browserWindowGetContentBounds", Id); + BridgeConnector.Emit("browserWindowGetContentBounds", Id); return taskCompletionSource.Task; } @@ -1276,7 +1276,7 @@ public Task GetContentBoundsAsync() /// public void SetSize(int width, int height) { - BridgeConnector.Socket.Emit("browserWindowSetSize", Id, width, height); + BridgeConnector.Emit("browserWindowSetSize", Id, width, height); } /// @@ -1287,7 +1287,7 @@ public void SetSize(int width, int height) /// public void SetSize(int width, int height, bool animate) { - BridgeConnector.Socket.Emit("browserWindowSetSize", Id, width, height, animate); + BridgeConnector.Emit("browserWindowSetSize", Id, width, height, animate); } /// @@ -1298,13 +1298,13 @@ public Task GetSizeAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getSize-completed", (size) => { - BridgeConnector.Socket.Off("browserWindow-getSize-completed"); + BridgeConnector.On("browserWindow-getSize-completed", (size) => { + BridgeConnector.Off("browserWindow-getSize-completed"); - taskCompletionSource.SetResult(((JArray)size).ToObject()); + taskCompletionSource.SetResult(size); }); - BridgeConnector.Socket.Emit("browserWindowGetSize", Id); + BridgeConnector.Emit("browserWindowGetSize", Id); return taskCompletionSource.Task; } @@ -1316,7 +1316,7 @@ public Task GetSizeAsync() /// public void SetContentSize(int width, int height) { - BridgeConnector.Socket.Emit("browserWindowSetContentSize", Id, width, height); + BridgeConnector.Emit("browserWindowSetContentSize", Id, width, height); } /// @@ -1327,7 +1327,7 @@ public void SetContentSize(int width, int height) /// public void SetContentSize(int width, int height, bool animate) { - BridgeConnector.Socket.Emit("browserWindowSetContentSize", Id, width, height, animate); + BridgeConnector.Emit("browserWindowSetContentSize", Id, width, height, animate); } /// @@ -1338,13 +1338,13 @@ public Task GetContentSizeAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getContentSize-completed", (size) => { - BridgeConnector.Socket.Off("browserWindow-getContentSize-completed"); + BridgeConnector.On("browserWindow-getContentSize-completed", (size) => { + BridgeConnector.Off("browserWindow-getContentSize-completed"); - taskCompletionSource.SetResult(((JArray)size).ToObject()); + taskCompletionSource.SetResult(size); }); - BridgeConnector.Socket.Emit("browserWindowGetContentSize", Id); + BridgeConnector.Emit("browserWindowGetContentSize", Id); return taskCompletionSource.Task; } @@ -1356,7 +1356,7 @@ public Task GetContentSizeAsync() /// public void SetMinimumSize(int width, int height) { - BridgeConnector.Socket.Emit("browserWindowSetMinimumSize", Id, width, height); + BridgeConnector.Emit("browserWindowSetMinimumSize", Id, width, height); } /// @@ -1367,13 +1367,13 @@ public Task GetMinimumSizeAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getMinimumSize-completed", (size) => { - BridgeConnector.Socket.Off("browserWindow-getMinimumSize-completed"); + BridgeConnector.On("browserWindow-getMinimumSize-completed", (size) => { + BridgeConnector.Off("browserWindow-getMinimumSize-completed"); - taskCompletionSource.SetResult(((JArray)size).ToObject()); + taskCompletionSource.SetResult(size); }); - BridgeConnector.Socket.Emit("browserWindowGetMinimumSize", Id); + BridgeConnector.Emit("browserWindowGetMinimumSize", Id); return taskCompletionSource.Task; } @@ -1385,7 +1385,7 @@ public Task GetMinimumSizeAsync() /// public void SetMaximumSize(int width, int height) { - BridgeConnector.Socket.Emit("browserWindowSetMaximumSize", Id, width, height); + BridgeConnector.Emit("browserWindowSetMaximumSize", Id, width, height); } /// @@ -1396,13 +1396,13 @@ public Task GetMaximumSizeAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getMaximumSize-completed", (size) => { - BridgeConnector.Socket.Off("browserWindow-getMaximumSize-completed"); + BridgeConnector.On("browserWindow-getMaximumSize-completed", (size) => { + BridgeConnector.Off("browserWindow-getMaximumSize-completed"); - taskCompletionSource.SetResult(((JArray)size).ToObject()); + taskCompletionSource.SetResult(size); }); - BridgeConnector.Socket.Emit("browserWindowGetMaximumSize", Id); + BridgeConnector.Emit("browserWindowGetMaximumSize", Id); return taskCompletionSource.Task; } @@ -1413,7 +1413,7 @@ public Task GetMaximumSizeAsync() /// public void SetResizable(bool resizable) { - BridgeConnector.Socket.Emit("browserWindowSetResizable", Id, resizable); + BridgeConnector.Emit("browserWindowSetResizable", Id, resizable); } /// @@ -1424,13 +1424,13 @@ public Task IsResizableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isResizable-completed", (resizable) => { - BridgeConnector.Socket.Off("browserWindow-isResizable-completed"); + BridgeConnector.On("browserWindow-isResizable-completed", (resizable) => { + BridgeConnector.Off("browserWindow-isResizable-completed"); taskCompletionSource.SetResult((bool)resizable); }); - BridgeConnector.Socket.Emit("browserWindowIsResizable", Id); + BridgeConnector.Emit("browserWindowIsResizable", Id); return taskCompletionSource.Task; } @@ -1441,7 +1441,7 @@ public Task IsResizableAsync() /// public void SetMovable(bool movable) { - BridgeConnector.Socket.Emit("browserWindowSetMovable", Id, movable); + BridgeConnector.Emit("browserWindowSetMovable", Id, movable); } /// @@ -1454,13 +1454,13 @@ public Task IsMovableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMovable-completed", (movable) => { - BridgeConnector.Socket.Off("browserWindow-isMovable-completed"); + BridgeConnector.On("browserWindow-isMovable-completed", (movable) => { + BridgeConnector.Off("browserWindow-isMovable-completed"); taskCompletionSource.SetResult((bool)movable); }); - BridgeConnector.Socket.Emit("browserWindowIsMovable", Id); + BridgeConnector.Emit("browserWindowIsMovable", Id); return taskCompletionSource.Task; } @@ -1471,7 +1471,7 @@ public Task IsMovableAsync() /// public void SetMinimizable(bool minimizable) { - BridgeConnector.Socket.Emit("browserWindowSetMinimizable", Id, minimizable); + BridgeConnector.Emit("browserWindowSetMinimizable", Id, minimizable); } /// @@ -1484,13 +1484,13 @@ public Task IsMinimizableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMinimizable-completed", (minimizable) => { - BridgeConnector.Socket.Off("browserWindow-isMinimizable-completed"); + BridgeConnector.On("browserWindow-isMinimizable-completed", (minimizable) => { + BridgeConnector.Off("browserWindow-isMinimizable-completed"); taskCompletionSource.SetResult((bool)minimizable); }); - BridgeConnector.Socket.Emit("browserWindowIsMinimizable", Id); + BridgeConnector.Emit("browserWindowIsMinimizable", Id); return taskCompletionSource.Task; } @@ -1501,7 +1501,7 @@ public Task IsMinimizableAsync() /// public void SetMaximizable(bool maximizable) { - BridgeConnector.Socket.Emit("browserWindowSetMaximizable", Id, maximizable); + BridgeConnector.Emit("browserWindowSetMaximizable", Id, maximizable); } /// @@ -1514,13 +1514,13 @@ public Task IsMaximizableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMaximizable-completed", (maximizable) => { - BridgeConnector.Socket.Off("browserWindow-isMaximizable-completed"); + BridgeConnector.On("browserWindow-isMaximizable-completed", (maximizable) => { + BridgeConnector.Off("browserWindow-isMaximizable-completed"); taskCompletionSource.SetResult((bool)maximizable); }); - BridgeConnector.Socket.Emit("browserWindowIsMaximizable", Id); + BridgeConnector.Emit("browserWindowIsMaximizable", Id); return taskCompletionSource.Task; } @@ -1531,7 +1531,7 @@ public Task IsMaximizableAsync() /// public void SetFullScreenable(bool fullscreenable) { - BridgeConnector.Socket.Emit("browserWindowSetFullScreenable", Id, fullscreenable); + BridgeConnector.Emit("browserWindowSetFullScreenable", Id, fullscreenable); } /// @@ -1542,13 +1542,13 @@ public Task IsFullScreenableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isFullScreenable-completed", (fullscreenable) => { - BridgeConnector.Socket.Off("browserWindow-isFullScreenable-completed"); + BridgeConnector.On("browserWindow-isFullScreenable-completed", (fullscreenable) => { + BridgeConnector.Off("browserWindow-isFullScreenable-completed"); taskCompletionSource.SetResult((bool)fullscreenable); }); - BridgeConnector.Socket.Emit("browserWindowIsFullScreenable", Id); + BridgeConnector.Emit("browserWindowIsFullScreenable", Id); return taskCompletionSource.Task; } @@ -1559,7 +1559,7 @@ public Task IsFullScreenableAsync() /// public void SetClosable(bool closable) { - BridgeConnector.Socket.Emit("browserWindowSetClosable", Id, closable); + BridgeConnector.Emit("browserWindowSetClosable", Id, closable); } /// @@ -1572,13 +1572,13 @@ public Task IsClosableAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isClosable-completed", (closable) => { - BridgeConnector.Socket.Off("browserWindow-isClosable-completed"); + BridgeConnector.On("browserWindow-isClosable-completed", (closable) => { + BridgeConnector.Off("browserWindow-isClosable-completed"); taskCompletionSource.SetResult((bool)closable); }); - BridgeConnector.Socket.Emit("browserWindowIsClosable", Id); + BridgeConnector.Emit("browserWindowIsClosable", Id); return taskCompletionSource.Task; } @@ -1591,7 +1591,7 @@ public Task IsClosableAsync() /// public void SetAlwaysOnTop(bool flag) { - BridgeConnector.Socket.Emit("browserWindowSetAlwaysOnTop", Id, flag); + BridgeConnector.Emit("browserWindowSetAlwaysOnTop", Id, flag); } /// @@ -1605,7 +1605,7 @@ public void SetAlwaysOnTop(bool flag) /// See the macOS docs public void SetAlwaysOnTop(bool flag, OnTopLevel level) { - BridgeConnector.Socket.Emit("browserWindowSetAlwaysOnTop", Id, flag, level.GetDescription()); + BridgeConnector.Emit("browserWindowSetAlwaysOnTop", Id, flag, level.GetDescription()); } /// @@ -1621,7 +1621,7 @@ public void SetAlwaysOnTop(bool flag, OnTopLevel level) /// The default is 0. Note that Apple discourages setting levels higher than 1 above screen-saver. public void SetAlwaysOnTop(bool flag, OnTopLevel level, int relativeLevel) { - BridgeConnector.Socket.Emit("browserWindowSetAlwaysOnTop", Id, flag, level.GetDescription(), relativeLevel); + BridgeConnector.Emit("browserWindowSetAlwaysOnTop", Id, flag, level.GetDescription(), relativeLevel); } /// @@ -1632,13 +1632,13 @@ public Task IsAlwaysOnTopAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isAlwaysOnTop-completed", (isAlwaysOnTop) => { - BridgeConnector.Socket.Off("browserWindow-isAlwaysOnTop-completed"); + BridgeConnector.On("browserWindow-isAlwaysOnTop-completed", (isAlwaysOnTop) => { + BridgeConnector.Off("browserWindow-isAlwaysOnTop-completed"); taskCompletionSource.SetResult((bool)isAlwaysOnTop); }); - BridgeConnector.Socket.Emit("browserWindowIsAlwaysOnTop", Id); + BridgeConnector.Emit("browserWindowIsAlwaysOnTop", Id); return taskCompletionSource.Task; } @@ -1648,7 +1648,7 @@ public Task IsAlwaysOnTopAsync() /// public void Center() { - BridgeConnector.Socket.Emit("browserWindowCenter", Id); + BridgeConnector.Emit("browserWindowCenter", Id); } /// @@ -1665,7 +1665,7 @@ public void SetPosition(int x, int y) x = x - 7; } - BridgeConnector.Socket.Emit("browserWindowSetPosition", Id, x, y); + BridgeConnector.Emit("browserWindowSetPosition", Id, x, y); } /// @@ -1683,7 +1683,7 @@ public void SetPosition(int x, int y, bool animate) x = x - 7; } - BridgeConnector.Socket.Emit("browserWindowSetPosition", Id, x, y, animate); + BridgeConnector.Emit("browserWindowSetPosition", Id, x, y, animate); } private bool isWindows10() @@ -1699,13 +1699,13 @@ public Task GetPositionAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getPosition-completed", (position) => { - BridgeConnector.Socket.Off("browserWindow-getPosition-completed"); + BridgeConnector.On("browserWindow-getPosition-completed", (position) => { + BridgeConnector.Off("browserWindow-getPosition-completed"); - taskCompletionSource.SetResult(((JArray)position).ToObject()); + taskCompletionSource.SetResult(position); }); - BridgeConnector.Socket.Emit("browserWindowGetPosition", Id); + BridgeConnector.Emit("browserWindowGetPosition", Id); return taskCompletionSource.Task; } @@ -1716,7 +1716,7 @@ public Task GetPositionAsync() /// public void SetTitle(string title) { - BridgeConnector.Socket.Emit("browserWindowSetTitle", Id, title); + BridgeConnector.Emit("browserWindowSetTitle", Id, title); } /// @@ -1729,13 +1729,13 @@ public Task GetTitleAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getTitle-completed", (title) => { - BridgeConnector.Socket.Off("browserWindow-getTitle-completed"); + BridgeConnector.On("browserWindow-getTitle-completed", (title) => { + BridgeConnector.Off("browserWindow-getTitle-completed"); - taskCompletionSource.SetResult(title.ToString()); + taskCompletionSource.SetResult(title); }); - BridgeConnector.Socket.Emit("browserWindowGetTitle", Id); + BridgeConnector.Emit("browserWindowGetTitle", Id); return taskCompletionSource.Task; } @@ -1748,7 +1748,7 @@ public Task GetTitleAsync() /// public void SetSheetOffset(float offsetY) { - BridgeConnector.Socket.Emit("browserWindowSetSheetOffset", Id, offsetY); + BridgeConnector.Emit("browserWindowSetSheetOffset", Id, offsetY); } /// @@ -1760,7 +1760,7 @@ public void SetSheetOffset(float offsetY) /// public void SetSheetOffset(float offsetY, float offsetX) { - BridgeConnector.Socket.Emit("browserWindowSetSheetOffset", Id, offsetY, offsetX); + BridgeConnector.Emit("browserWindowSetSheetOffset", Id, offsetY, offsetX); } /// @@ -1769,7 +1769,7 @@ public void SetSheetOffset(float offsetY, float offsetX) /// public void FlashFrame(bool flag) { - BridgeConnector.Socket.Emit("browserWindowFlashFrame", Id, flag); + BridgeConnector.Emit("browserWindowFlashFrame", Id, flag); } /// @@ -1778,7 +1778,7 @@ public void FlashFrame(bool flag) /// public void SetSkipTaskbar(bool skip) { - BridgeConnector.Socket.Emit("browserWindowSetSkipTaskbar", Id, skip); + BridgeConnector.Emit("browserWindowSetSkipTaskbar", Id, skip); } /// @@ -1787,7 +1787,7 @@ public void SetSkipTaskbar(bool skip) /// public void SetKiosk(bool flag) { - BridgeConnector.Socket.Emit("browserWindowSetKiosk", Id, flag); + BridgeConnector.Emit("browserWindowSetKiosk", Id, flag); } /// @@ -1798,13 +1798,13 @@ public Task IsKioskAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isKiosk-completed", (isKiosk) => { - BridgeConnector.Socket.Off("browserWindow-isKiosk-completed"); + BridgeConnector.On("browserWindow-isKiosk-completed", (isKiosk) => { + BridgeConnector.Off("browserWindow-isKiosk-completed"); taskCompletionSource.SetResult((bool)isKiosk); }); - BridgeConnector.Socket.Emit("browserWindowIsKiosk", Id); + BridgeConnector.Emit("browserWindowIsKiosk", Id); return taskCompletionSource.Task; } @@ -1817,13 +1817,13 @@ public Task GetNativeWindowHandle() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getNativeWindowHandle-completed", (nativeWindowHandle) => + BridgeConnector.On("browserWindow-getNativeWindowHandle-completed", (nativeWindowHandle) => { - BridgeConnector.Socket.Off("browserWindow-getNativeWindowHandle-completed"); - taskCompletionSource.SetResult(nativeWindowHandle.ToString()); + BridgeConnector.Off("browserWindow-getNativeWindowHandle-completed"); + taskCompletionSource.SetResult(nativeWindowHandle); }); - BridgeConnector.Socket.Emit("browserWindowGetNativeWindowHandle", Id); + BridgeConnector.Emit("browserWindowGetNativeWindowHandle", Id); return taskCompletionSource.Task; } @@ -1835,7 +1835,7 @@ public Task GetNativeWindowHandle() /// public void SetRepresentedFilename(string filename) { - BridgeConnector.Socket.Emit("browserWindowSetRepresentedFilename", Id, filename); + BridgeConnector.Emit("browserWindowSetRepresentedFilename", Id, filename); } /// @@ -1846,13 +1846,13 @@ public Task GetRepresentedFilenameAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getRepresentedFilename-completed", (pathname) => { - BridgeConnector.Socket.Off("browserWindow-getRepresentedFilename-completed"); + BridgeConnector.On("browserWindow-getRepresentedFilename-completed", (pathname) => { + BridgeConnector.Off("browserWindow-getRepresentedFilename-completed"); - taskCompletionSource.SetResult(pathname.ToString()); + taskCompletionSource.SetResult(pathname); }); - BridgeConnector.Socket.Emit("browserWindowGetRepresentedFilename", Id); + BridgeConnector.Emit("browserWindowGetRepresentedFilename", Id); return taskCompletionSource.Task; } @@ -1864,7 +1864,7 @@ public Task GetRepresentedFilenameAsync() /// public void SetDocumentEdited(bool edited) { - BridgeConnector.Socket.Emit("browserWindowSetDocumentEdited", Id, edited); + BridgeConnector.Emit("browserWindowSetDocumentEdited", Id, edited); } /// @@ -1875,13 +1875,13 @@ public Task IsDocumentEditedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isDocumentEdited-completed", (edited) => { - BridgeConnector.Socket.Off("browserWindow-isDocumentEdited-completed"); + BridgeConnector.On("browserWindow-isDocumentEdited-completed", (edited) => { + BridgeConnector.Off("browserWindow-isDocumentEdited-completed"); taskCompletionSource.SetResult((bool)edited); }); - BridgeConnector.Socket.Emit("browserWindowIsDocumentEdited", Id); + BridgeConnector.Emit("browserWindowIsDocumentEdited", Id); return taskCompletionSource.Task; } @@ -1891,7 +1891,7 @@ public Task IsDocumentEditedAsync() /// public void FocusOnWebView() { - BridgeConnector.Socket.Emit("browserWindowFocusOnWebView", Id); + BridgeConnector.Emit("browserWindowFocusOnWebView", Id); } /// @@ -1899,7 +1899,7 @@ public void FocusOnWebView() /// public void BlurWebView() { - BridgeConnector.Socket.Emit("browserWindowBlurWebView", Id); + BridgeConnector.Emit("browserWindowBlurWebView", Id); } /// @@ -1909,7 +1909,7 @@ public void BlurWebView() /// public void LoadURL(string url) { - BridgeConnector.Socket.Emit("browserWindowLoadURL", Id, url); + BridgeConnector.Emit("browserWindowLoadURL", Id, url); } /// @@ -1920,7 +1920,7 @@ public void LoadURL(string url) /// public void LoadURL(string url, LoadURLOptions options) { - BridgeConnector.Socket.Emit("browserWindowLoadURL", Id, url, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("browserWindowLoadURL", Id, url, JObject.FromObject(options, _jsonSerializer)); } /// @@ -1928,7 +1928,7 @@ public void LoadURL(string url, LoadURLOptions options) /// public void Reload() { - BridgeConnector.Socket.Emit("browserWindowReload", Id); + BridgeConnector.Emit("browserWindowReload", Id); } /// @@ -1948,12 +1948,12 @@ public void Reload() public void SetMenu(MenuItem[] menuItems) { menuItems.AddMenuItemsId(); - BridgeConnector.Socket.Emit("browserWindowSetMenu", Id, JArray.FromObject(menuItems, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetMenu", Id, JArray.FromObject(menuItems, _jsonSerializer)); _items.AddRange(menuItems); - BridgeConnector.Socket.Off("windowMenuItemClicked"); - BridgeConnector.Socket.On("windowMenuItemClicked", (id) => { - MenuItem menuItem = _items.GetMenuItem(id.ToString()); + BridgeConnector.Off("windowMenuItemClicked"); + BridgeConnector.On("windowMenuItemClicked", (id) => { + MenuItem menuItem = _items.GetMenuItem(id); menuItem?.Click(); }); } @@ -1963,7 +1963,7 @@ public void SetMenu(MenuItem[] menuItems) /// public void RemoveMenu() { - BridgeConnector.Socket.Emit("browserWindowRemoveMenu", Id); + BridgeConnector.Emit("browserWindowRemoveMenu", Id); } /// @@ -1979,7 +1979,7 @@ public void RemoveMenu() /// public void SetProgressBar(double progress) { - BridgeConnector.Socket.Emit("browserWindowSetProgressBar", Id, progress); + BridgeConnector.Emit("browserWindowSetProgressBar", Id, progress); } /// @@ -1996,7 +1996,7 @@ public void SetProgressBar(double progress) /// public void SetProgressBar(double progress, ProgressBarOptions progressBarOptions) { - BridgeConnector.Socket.Emit("browserWindowSetProgressBar", Id, progress, JObject.FromObject(progressBarOptions, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetProgressBar", Id, progress, JObject.FromObject(progressBarOptions, _jsonSerializer)); } /// @@ -2005,7 +2005,7 @@ public void SetProgressBar(double progress, ProgressBarOptions progressBarOption /// public void SetHasShadow(bool hasShadow) { - BridgeConnector.Socket.Emit("browserWindowSetHasShadow", Id, hasShadow); + BridgeConnector.Emit("browserWindowSetHasShadow", Id, hasShadow); } /// @@ -2018,13 +2018,13 @@ public Task HasShadowAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-hasShadow-completed", (hasShadow) => { - BridgeConnector.Socket.Off("browserWindow-hasShadow-completed"); + BridgeConnector.On("browserWindow-hasShadow-completed", (hasShadow) => { + BridgeConnector.Off("browserWindow-hasShadow-completed"); taskCompletionSource.SetResult((bool)hasShadow); }); - BridgeConnector.Socket.Emit("browserWindowHasShadow", Id); + BridgeConnector.Emit("browserWindowHasShadow", Id); return taskCompletionSource.Task; } @@ -2054,20 +2054,20 @@ public Task SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindowSetThumbarButtons-completed", (success) => { - BridgeConnector.Socket.Off("browserWindowSetThumbarButtons-completed"); + BridgeConnector.On("browserWindowSetThumbarButtons-completed", (success) => { + BridgeConnector.Off("browserWindowSetThumbarButtons-completed"); taskCompletionSource.SetResult((bool)success); }); thumbarButtons.AddThumbarButtonsId(); - BridgeConnector.Socket.Emit("browserWindowSetThumbarButtons", Id, JArray.FromObject(thumbarButtons, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetThumbarButtons", Id, JArray.FromObject(thumbarButtons, _jsonSerializer)); _thumbarButtons.Clear(); _thumbarButtons.AddRange(thumbarButtons); - BridgeConnector.Socket.Off("thumbarButtonClicked"); - BridgeConnector.Socket.On("thumbarButtonClicked", (id) => { - ThumbarButton thumbarButton = _thumbarButtons.GetThumbarButton(id.ToString()); + BridgeConnector.Off("thumbarButtonClicked"); + BridgeConnector.On("thumbarButtonClicked", (id) => { + ThumbarButton thumbarButton = _thumbarButtons.GetThumbarButton(id); thumbarButton?.Click(); }); @@ -2082,7 +2082,7 @@ public Task SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons) /// public void SetThumbnailClip(Rectangle rectangle) { - BridgeConnector.Socket.Emit("browserWindowSetThumbnailClip", Id, rectangle); + BridgeConnector.Emit("browserWindowSetThumbnailClip", Id, rectangle); } /// @@ -2091,7 +2091,7 @@ public void SetThumbnailClip(Rectangle rectangle) /// public void SetThumbnailToolTip(string tooltip) { - BridgeConnector.Socket.Emit("browserWindowSetThumbnailToolTip", Id, tooltip); + BridgeConnector.Emit("browserWindowSetThumbnailToolTip", Id, tooltip); } /// @@ -2103,7 +2103,7 @@ public void SetThumbnailToolTip(string tooltip) /// public void SetAppDetails(AppDetailsOptions options) { - BridgeConnector.Socket.Emit("browserWindowSetAppDetails", Id, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetAppDetails", Id, JObject.FromObject(options, _jsonSerializer)); } /// @@ -2111,7 +2111,7 @@ public void SetAppDetails(AppDetailsOptions options) /// public void ShowDefinitionForSelection() { - BridgeConnector.Socket.Emit("browserWindowShowDefinitionForSelection", Id); + BridgeConnector.Emit("browserWindowShowDefinitionForSelection", Id); } /// @@ -2123,7 +2123,7 @@ public void ShowDefinitionForSelection() /// public void SetAutoHideMenuBar(bool hide) { - BridgeConnector.Socket.Emit("browserWindowSetAutoHideMenuBar", Id, hide); + BridgeConnector.Emit("browserWindowSetAutoHideMenuBar", Id, hide); } /// @@ -2134,13 +2134,13 @@ public Task IsMenuBarAutoHideAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMenuBarAutoHide-completed", (isMenuBarAutoHide) => { - BridgeConnector.Socket.Off("browserWindow-isMenuBarAutoHide-completed"); + BridgeConnector.On("browserWindow-isMenuBarAutoHide-completed", (isMenuBarAutoHide) => { + BridgeConnector.Off("browserWindow-isMenuBarAutoHide-completed"); taskCompletionSource.SetResult((bool)isMenuBarAutoHide); }); - BridgeConnector.Socket.Emit("browserWindowIsMenuBarAutoHide", Id); + BridgeConnector.Emit("browserWindowIsMenuBarAutoHide", Id); return taskCompletionSource.Task; } @@ -2152,7 +2152,7 @@ public Task IsMenuBarAutoHideAsync() /// public void SetMenuBarVisibility(bool visible) { - BridgeConnector.Socket.Emit("browserWindowSetMenuBarVisibility", Id, visible); + BridgeConnector.Emit("browserWindowSetMenuBarVisibility", Id, visible); } /// @@ -2163,13 +2163,13 @@ public Task IsMenuBarVisibleAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isMenuBarVisible-completed", (isMenuBarVisible) => { - BridgeConnector.Socket.Off("browserWindow-isMenuBarVisible-completed"); + BridgeConnector.On("browserWindow-isMenuBarVisible-completed", (isMenuBarVisible) => { + BridgeConnector.Off("browserWindow-isMenuBarVisible-completed"); taskCompletionSource.SetResult((bool)isMenuBarVisible); }); - BridgeConnector.Socket.Emit("browserWindowIsMenuBarVisible", Id); + BridgeConnector.Emit("browserWindowIsMenuBarVisible", Id); return taskCompletionSource.Task; } @@ -2182,7 +2182,7 @@ public Task IsMenuBarVisibleAsync() /// public void SetVisibleOnAllWorkspaces(bool visible) { - BridgeConnector.Socket.Emit("browserWindowSetVisibleOnAllWorkspaces", Id, visible); + BridgeConnector.Emit("browserWindowSetVisibleOnAllWorkspaces", Id, visible); } /// @@ -2195,13 +2195,13 @@ public Task IsVisibleOnAllWorkspacesAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-isVisibleOnAllWorkspaces-completed", (isVisibleOnAllWorkspaces) => { - BridgeConnector.Socket.Off("browserWindow-isVisibleOnAllWorkspaces-completed"); + BridgeConnector.On("browserWindow-isVisibleOnAllWorkspaces-completed", (isVisibleOnAllWorkspaces) => { + BridgeConnector.Off("browserWindow-isVisibleOnAllWorkspaces-completed"); taskCompletionSource.SetResult((bool)isVisibleOnAllWorkspaces); }); - BridgeConnector.Socket.Emit("browserWindowIsVisibleOnAllWorkspaces", Id); + BridgeConnector.Emit("browserWindowIsVisibleOnAllWorkspaces", Id); return taskCompletionSource.Task; } @@ -2215,7 +2215,7 @@ public Task IsVisibleOnAllWorkspacesAsync() /// public void SetIgnoreMouseEvents(bool ignore) { - BridgeConnector.Socket.Emit("browserWindowSetIgnoreMouseEvents", Id, ignore); + BridgeConnector.Emit("browserWindowSetIgnoreMouseEvents", Id, ignore); } /// @@ -2227,7 +2227,7 @@ public void SetIgnoreMouseEvents(bool ignore) /// public void SetContentProtection(bool enable) { - BridgeConnector.Socket.Emit("browserWindowSetContentProtection", Id, enable); + BridgeConnector.Emit("browserWindowSetContentProtection", Id, enable); } /// @@ -2236,7 +2236,7 @@ public void SetContentProtection(bool enable) /// public void SetFocusable(bool focusable) { - BridgeConnector.Socket.Emit("browserWindowSetFocusable", Id, focusable); + BridgeConnector.Emit("browserWindowSetFocusable", Id, focusable); } /// @@ -2246,7 +2246,7 @@ public void SetFocusable(bool focusable) /// public void SetParentWindow(BrowserWindow parent) { - BridgeConnector.Socket.Emit("browserWindowSetParentWindow", Id, JObject.FromObject(parent, _jsonSerializer)); + BridgeConnector.Emit("browserWindowSetParentWindow", Id, JObject.FromObject(parent, _jsonSerializer)); } /// @@ -2257,15 +2257,13 @@ public Task GetParentWindowAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("browserWindow-getParentWindow-completed", (id) => { - BridgeConnector.Socket.Off("browserWindow-getParentWindow-completed"); - var browserWindowId = int.Parse(id.ToString()); - var browserWindow = Electron.WindowManager.BrowserWindows.ToList().Single(x => x.Id == browserWindowId); - + BridgeConnector.On("browserWindow-getParentWindow-completed", (id) => { + BridgeConnector.Off("browserWindow-getParentWindow-completed"); + var browserWindow = Electron.WindowManager.BrowserWindows.ToList().Single(x => x.Id == id); taskCompletionSource.SetResult(browserWindow); }); - BridgeConnector.Socket.Emit("browserWindowGetParentWindow", Id); + BridgeConnector.Emit("browserWindowGetParentWindow", Id); return taskCompletionSource.Task; } @@ -2278,22 +2276,19 @@ public Task> GetChildWindowsAsync() { var taskCompletionSource = new TaskCompletionSource>(); - BridgeConnector.Socket.On("browserWindow-getChildWindows-completed", (ids) => { - BridgeConnector.Socket.Off("browserWindow-getChildWindows-completed"); - var browserWindowIds = ((JArray)ids).ToObject(); + BridgeConnector.On("browserWindow-getChildWindows-completed", (ids) => { + BridgeConnector.Off("browserWindow-getChildWindows-completed"); var browserWindows = new List(); - - browserWindowIds.ToList().ForEach(id => + ids.ToList().ForEach(id => { var browserWindow = Electron.WindowManager.BrowserWindows.ToList().Single(x => x.Id == id); browserWindows.Add(browserWindow); }); - taskCompletionSource.SetResult(browserWindows); }); - BridgeConnector.Socket.Emit("browserWindowGetChildWindows", Id); + BridgeConnector.Emit("browserWindowGetChildWindows", Id); return taskCompletionSource.Task; } @@ -2304,7 +2299,7 @@ public Task> GetChildWindowsAsync() /// public void SetAutoHideCursor(bool autoHide) { - BridgeConnector.Socket.Emit("browserWindowSetAutoHideCursor", Id, autoHide); + BridgeConnector.Emit("browserWindowSetAutoHideCursor", Id, autoHide); } /// @@ -2316,7 +2311,7 @@ public void SetAutoHideCursor(bool autoHide) /// See the macOS documentation for more details. public void SetVibrancy(Vibrancy type) { - BridgeConnector.Socket.Emit("browserWindowSetVibrancy", Id, type.GetDescription()); + BridgeConnector.Emit("browserWindowSetVibrancy", Id, type.GetDescription()); } /// @@ -2332,7 +2327,7 @@ public void SetVibrancy(Vibrancy type) /// public void SetBrowserView(BrowserView browserView) { - BridgeConnector.Socket.Emit("browserWindow-setBrowserView", Id, browserView.Id); + BridgeConnector.Emit("browserWindow-setBrowserView", Id, browserView.Id); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/Clipboard.cs b/ElectronNET.API/Clipboard.cs index e7535378..68d1876d 100644 --- a/ElectronNET.API/Clipboard.cs +++ b/ElectronNET.API/Clipboard.cs @@ -44,14 +44,14 @@ public Task ReadTextAsync(string type = "") { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readText-Completed", (text) => + BridgeConnector.On("clipboard-readText-Completed", (text) => { - BridgeConnector.Socket.Off("clipboard-readText-Completed"); + BridgeConnector.Off("clipboard-readText-Completed"); - taskCompletionSource.SetResult(text.ToString()); + taskCompletionSource.SetResult(text); }); - BridgeConnector.Socket.Emit("clipboard-readText", type); + BridgeConnector.Emit("clipboard-readText", type); return taskCompletionSource.Task; } @@ -63,7 +63,7 @@ public Task ReadTextAsync(string type = "") /// public void WriteText(string text, string type = "") { - BridgeConnector.Socket.Emit("clipboard-writeText", text, type); + BridgeConnector.Emit("clipboard-writeText", text, type); } /// @@ -75,14 +75,14 @@ public Task ReadHTMLAsync(string type = "") { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readHTML-Completed", (text) => + BridgeConnector.On("clipboard-readHTML-Completed", (text) => { - BridgeConnector.Socket.Off("clipboard-readHTML-Completed"); + BridgeConnector.Off("clipboard-readHTML-Completed"); - taskCompletionSource.SetResult(text.ToString()); + taskCompletionSource.SetResult(text); }); - BridgeConnector.Socket.Emit("clipboard-readHTML", type); + BridgeConnector.Emit("clipboard-readHTML", type); return taskCompletionSource.Task; } @@ -94,7 +94,7 @@ public Task ReadHTMLAsync(string type = "") /// public void WriteHTML(string markup, string type = "") { - BridgeConnector.Socket.Emit("clipboard-writeHTML", markup, type); + BridgeConnector.Emit("clipboard-writeHTML", markup, type); } /// @@ -106,14 +106,14 @@ public Task ReadRTFAsync(string type = "") { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readRTF-Completed", (text) => + BridgeConnector.On("clipboard-readRTF-Completed", (text) => { - BridgeConnector.Socket.Off("clipboard-readRTF-Completed"); + BridgeConnector.Off("clipboard-readRTF-Completed"); - taskCompletionSource.SetResult(text.ToString()); + taskCompletionSource.SetResult(text); }); - BridgeConnector.Socket.Emit("clipboard-readRTF", type); + BridgeConnector.Emit("clipboard-readRTF", type); return taskCompletionSource.Task; } @@ -125,7 +125,7 @@ public Task ReadRTFAsync(string type = "") /// public void WriteRTF(string text, string type = "") { - BridgeConnector.Socket.Emit("clipboard-writeHTML", text, type); + BridgeConnector.Emit("clipboard-writeHTML", text, type); } /// @@ -138,14 +138,14 @@ public Task ReadBookmarkAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readBookmark-Completed", (bookmark) => + BridgeConnector.On("clipboard-readBookmark-Completed", (bookmark) => { - BridgeConnector.Socket.Off("clipboard-readBookmark-Completed"); + BridgeConnector.Off("clipboard-readBookmark-Completed"); - taskCompletionSource.SetResult(((JObject)bookmark).ToObject()); + taskCompletionSource.SetResult(bookmark); }); - BridgeConnector.Socket.Emit("clipboard-readBookmark"); + BridgeConnector.Emit("clipboard-readBookmark"); return taskCompletionSource.Task; } @@ -162,7 +162,7 @@ public Task ReadBookmarkAsync() /// public void WriteBookmark(string title, string url, string type = "") { - BridgeConnector.Socket.Emit("clipboard-writeBookmark", title, url, type); + BridgeConnector.Emit("clipboard-writeBookmark", title, url, type); } /// @@ -175,14 +175,14 @@ public Task ReadFindTextAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readFindText-Completed", (text) => + BridgeConnector.On("clipboard-readFindText-Completed", (text) => { - BridgeConnector.Socket.Off("clipboard-readFindText-Completed"); + BridgeConnector.Off("clipboard-readFindText-Completed"); - taskCompletionSource.SetResult(text.ToString()); + taskCompletionSource.SetResult(text); }); - BridgeConnector.Socket.Emit("clipboard-readFindText"); + BridgeConnector.Emit("clipboard-readFindText"); return taskCompletionSource.Task; } @@ -194,7 +194,7 @@ public Task ReadFindTextAsync() /// public void WriteFindText(string text) { - BridgeConnector.Socket.Emit("clipboard-writeFindText", text); + BridgeConnector.Emit("clipboard-writeFindText", text); } /// @@ -203,7 +203,7 @@ public void WriteFindText(string text) /// public void Clear(string type = "") { - BridgeConnector.Socket.Emit("clipboard-clear", type); + BridgeConnector.Emit("clipboard-clear", type); } /// @@ -215,14 +215,14 @@ public Task AvailableFormatsAsync(string type = "") { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-availableFormats-Completed", (formats) => + BridgeConnector.On("clipboard-availableFormats-Completed", (formats) => { - BridgeConnector.Socket.Off("clipboard-availableFormats-Completed"); + BridgeConnector.Off("clipboard-availableFormats-Completed"); - taskCompletionSource.SetResult(((JArray)formats).ToObject()); + taskCompletionSource.SetResult(formats); }); - BridgeConnector.Socket.Emit("clipboard-availableFormats", type); + BridgeConnector.Emit("clipboard-availableFormats", type); return taskCompletionSource.Task; } @@ -234,7 +234,7 @@ public Task AvailableFormatsAsync(string type = "") /// public void Write(Data data, string type = "") { - BridgeConnector.Socket.Emit("clipboard-write", JObject.FromObject(data, _jsonSerializer), type); + BridgeConnector.Emit("clipboard-write", JObject.FromObject(data, _jsonSerializer), type); } /// @@ -246,17 +246,14 @@ public Task ReadImageAsync(string type = "") { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("clipboard-readImage-Completed", (image) => + BridgeConnector.On("clipboard-readImage-Completed", (image) => { - BridgeConnector.Socket.Off("clipboard-readImage-Completed"); + BridgeConnector.Off("clipboard-readImage-Completed"); - var nativeImage = ((JObject)image).ToObject(); - - taskCompletionSource.SetResult(nativeImage); - + taskCompletionSource.SetResult(image); }); - BridgeConnector.Socket.Emit("clipboard-readImage", type); + BridgeConnector.Emit("clipboard-readImage", type); return taskCompletionSource.Task; } @@ -268,7 +265,7 @@ public Task ReadImageAsync(string type = "") /// public void WriteImage(NativeImage image, string type = "") { - BridgeConnector.Socket.Emit("clipboard-writeImage", JsonConvert.SerializeObject(image), type); + BridgeConnector.Emit("clipboard-writeImage", JsonConvert.SerializeObject(image), type); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/CommandLine.cs b/ElectronNET.API/CommandLine.cs index 63466b4b..6b090587 100644 --- a/ElectronNET.API/CommandLine.cs +++ b/ElectronNET.API/CommandLine.cs @@ -43,7 +43,7 @@ internal static CommandLine Instance /// public void AppendSwitch(string the_switch, string value = "") { - BridgeConnector.Socket.Emit("appCommandLineAppendSwitch", the_switch, value); + BridgeConnector.Emit("appCommandLineAppendSwitch", the_switch, value); } /// @@ -57,7 +57,7 @@ public void AppendSwitch(string the_switch, string value = "") /// public void AppendArgument(string value) { - BridgeConnector.Socket.Emit("appCommandLineAppendArgument", value); + BridgeConnector.Emit("appCommandLineAppendArgument", value); } /// @@ -73,13 +73,13 @@ public void AppendArgument(string value) var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appCommandLineHasSwitchCompleted", (result) => + BridgeConnector.On("appCommandLineHasSwitchCompleted", (result) => { - BridgeConnector.Socket.Off("appCommandLineHasSwitchCompleted"); + BridgeConnector.Off("appCommandLineHasSwitchCompleted"); taskCompletionSource.SetResult((bool)result); }); - BridgeConnector.Socket.Emit("appCommandLineHasSwitch", switchName); + BridgeConnector.Emit("appCommandLineHasSwitch", switchName); return await taskCompletionSource.Task.ConfigureAwait(false); } @@ -101,13 +101,13 @@ public void AppendArgument(string value) var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("appCommandLineGetSwitchValueCompleted", (result) => + BridgeConnector.On("appCommandLineGetSwitchValueCompleted", (result) => { - BridgeConnector.Socket.Off("appCommandLineGetSwitchValueCompleted"); - taskCompletionSource.SetResult((string)result); + BridgeConnector.Off("appCommandLineGetSwitchValueCompleted"); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit("appCommandLineGetSwitchValue", switchName); + BridgeConnector.Emit("appCommandLineGetSwitchValue", switchName); return await taskCompletionSource.Task.ConfigureAwait(false); } diff --git a/ElectronNET.API/Cookies.cs b/ElectronNET.API/Cookies.cs index 98be3d42..2d8ca659 100644 --- a/ElectronNET.API/Cookies.cs +++ b/ElectronNET.API/Cookies.cs @@ -34,15 +34,12 @@ public event Action OnChanged { if (_changed == null) { - BridgeConnector.Socket.On("webContents-session-cookies-changed" + Id, (args) => + BridgeConnector.On("webContents-session-cookies-changed" + Id, (args) => { - Cookie cookie = ((JArray)args)[0].ToObject(); - CookieChangedCause cause = ((JArray)args)[1].ToObject(); - bool removed = ((JArray)args)[2].ToObject(); - _changed(cookie, cause, removed); + _changed(args.cookie, args.cause, args.removed); }); - BridgeConnector.Socket.Emit("register-webContents-session-cookies-changed", Id); + BridgeConnector.Emit("register-webContents-session-cookies-changed", Id); } _changed += value; } @@ -51,7 +48,7 @@ public event Action OnChanged _changed -= value; if (_changed == null) - BridgeConnector.Socket.Off("webContents-session-cookies-changed" + Id); + BridgeConnector.Off("webContents-session-cookies-changed" + Id); } } @@ -68,15 +65,13 @@ public Task GetAsync(CookieFilter filter) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-cookies-get-completed" + guid, (cookies) => + BridgeConnector.On("webContents-session-cookies-get-completed" + guid, (cookies) => { - Cookie[] result = ((JArray)cookies).ToObject(); - - BridgeConnector.Socket.Off("webContents-session-cookies-get-completed" + guid); - taskCompletionSource.SetResult(result); + BridgeConnector.Off("webContents-session-cookies-get-completed" + guid); + taskCompletionSource.SetResult(cookies); }); - BridgeConnector.Socket.Emit("webContents-session-cookies-get", Id, JObject.FromObject(filter, _jsonSerializer), guid); + BridgeConnector.Emit("webContents-session-cookies-get", Id, JObject.FromObject(filter, _jsonSerializer), guid); return taskCompletionSource.Task; } @@ -91,13 +86,13 @@ public Task SetAsync(CookieDetails details) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-cookies-set-completed" + guid, () => + BridgeConnector.On("webContents-session-cookies-set-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-cookies-set-completed" + guid); + BridgeConnector.Off("webContents-session-cookies-set-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-cookies-set", Id, JObject.FromObject(details, _jsonSerializer), guid); + BridgeConnector.Emit("webContents-session-cookies-set", Id, JObject.FromObject(details, _jsonSerializer), guid); return taskCompletionSource.Task; } @@ -113,13 +108,13 @@ public Task RemoveAsync(string url, string name) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-cookies-remove-completed" + guid, () => + BridgeConnector.On("webContents-session-cookies-remove-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-cookies-remove-completed" + guid); + BridgeConnector.Off("webContents-session-cookies-remove-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-cookies-remove", Id, url, name, guid); + BridgeConnector.Emit("webContents-session-cookies-remove", Id, url, name, guid); return taskCompletionSource.Task; } @@ -133,13 +128,13 @@ public Task FlushStoreAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-cookies-flushStore-completed" + guid, () => + BridgeConnector.On("webContents-session-cookies-flushStore-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-cookies-flushStore-completed" + guid); + BridgeConnector.Off("webContents-session-cookies-flushStore-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-cookies-flushStore", Id, guid); + BridgeConnector.Emit("webContents-session-cookies-flushStore", Id, guid); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/Dialog.cs b/ElectronNET.API/Dialog.cs index 7b626b4e..9df9e4aa 100644 --- a/ElectronNET.API/Dialog.cs +++ b/ElectronNET.API/Dialog.cs @@ -51,13 +51,12 @@ public Task ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialo var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("showOpenDialogComplete" + guid, (filePaths) => + BridgeConnector.On("showOpenDialogComplete" + guid, (filePaths) => { - BridgeConnector.Socket.Off("showOpenDialogComplete" + guid); + BridgeConnector.Off("showOpenDialogComplete" + guid); - var result = ((JArray)filePaths).ToObject(); var list = new List(); - foreach (var item in result) + foreach (var item in filePaths) { list.Add(HttpUtility.UrlDecode(item)); } @@ -65,7 +64,7 @@ public Task ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialo }); - BridgeConnector.Socket.Emit("showOpenDialog", + BridgeConnector.Emit("showOpenDialog", JObject.FromObject(browserWindow, _jsonSerializer), JObject.FromObject(options, _jsonSerializer), guid); @@ -83,14 +82,14 @@ public Task ShowSaveDialogAsync(BrowserWindow browserWindow, SaveDialogO var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("showSaveDialogComplete" + guid, (filename) => + BridgeConnector.On("showSaveDialogComplete" + guid, (filename) => { - BridgeConnector.Socket.Off("showSaveDialogComplete" + guid); + BridgeConnector.Off("showSaveDialogComplete" + guid); - taskCompletionSource.SetResult(filename.ToString()); + taskCompletionSource.SetResult(filename); }); - BridgeConnector.Socket.Emit("showSaveDialog", + BridgeConnector.Emit("showSaveDialog", JObject.FromObject(browserWindow, _jsonSerializer), JObject.FromObject(options, _jsonSerializer), guid); @@ -152,26 +151,24 @@ public Task ShowMessageBoxAsync(BrowserWindow browserWindow, M var taskCompletionSource = new TaskCompletionSource(); var guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("showMessageBoxComplete" + guid, (args) => + BridgeConnector.On("showMessageBoxComplete" + guid, (args) => { - BridgeConnector.Socket.Off("showMessageBoxComplete" + guid); - - var result = ((JArray)args); + BridgeConnector.Off("showMessageBoxComplete" + guid); taskCompletionSource.SetResult(new MessageBoxResult { - Response = (int)result.First, - CheckboxChecked = (bool)result.Last + Response = args.response, + CheckboxChecked = args.@checked }); }); if (browserWindow == null) { - BridgeConnector.Socket.Emit("showMessageBox", JObject.FromObject(messageBoxOptions, _jsonSerializer), guid); + BridgeConnector.Emit("showMessageBox", JObject.FromObject(messageBoxOptions, _jsonSerializer), guid); } else { - BridgeConnector.Socket.Emit("showMessageBox", + BridgeConnector.Emit("showMessageBox", JObject.FromObject(browserWindow, _jsonSerializer), JObject.FromObject(messageBoxOptions, _jsonSerializer), guid); @@ -192,7 +189,7 @@ public Task ShowMessageBoxAsync(BrowserWindow browserWindow, M /// The text content to display in the error box. public void ShowErrorBox(string title, string content) { - BridgeConnector.Socket.Emit("showErrorBox", title, content); + BridgeConnector.Emit("showErrorBox", title, content); } /// @@ -220,13 +217,13 @@ public Task ShowCertificateTrustDialogAsync(BrowserWindow browserWindow, Certifi var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("showCertificateTrustDialogComplete" + guid, () => + BridgeConnector.On("showCertificateTrustDialogComplete" + guid, () => { - BridgeConnector.Socket.Off("showCertificateTrustDialogComplete" + guid); + BridgeConnector.Off("showCertificateTrustDialogComplete" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("showCertificateTrustDialog", + BridgeConnector.Emit("showCertificateTrustDialog", JObject.FromObject(browserWindow, _jsonSerializer), JObject.FromObject(options, _jsonSerializer), guid); diff --git a/ElectronNET.API/Dock.cs b/ElectronNET.API/Dock.cs index 03276842..3602527a 100644 --- a/ElectronNET.API/Dock.cs +++ b/ElectronNET.API/Dock.cs @@ -57,13 +57,13 @@ public async Task BounceAsync(DockBounceType type, CancellationToken cancel var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("dock-bounce-completed", (id) => + BridgeConnector.On("dock-bounce-completed", (id) => { - BridgeConnector.Socket.Off("dock-bounce-completed"); - taskCompletionSource.SetResult((int) id); + BridgeConnector.Off("dock-bounce-completed"); + taskCompletionSource.SetResult(id); }); - BridgeConnector.Socket.Emit("dock-bounce", type.GetDescription()); + BridgeConnector.Emit("dock-bounce", type.GetDescription()); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -76,7 +76,7 @@ public async Task BounceAsync(DockBounceType type, CancellationToken cancel /// Id of the request. public void CancelBounce(int id) { - BridgeConnector.Socket.Emit("dock-cancelBounce", id); + BridgeConnector.Emit("dock-cancelBounce", id); } /// @@ -85,7 +85,7 @@ public void CancelBounce(int id) /// public void DownloadFinished(string filePath) { - BridgeConnector.Socket.Emit("dock-downloadFinished", filePath); + BridgeConnector.Emit("dock-downloadFinished", filePath); } /// @@ -94,7 +94,7 @@ public void DownloadFinished(string filePath) /// public void SetBadge(string text) { - BridgeConnector.Socket.Emit("dock-setBadge", text); + BridgeConnector.Emit("dock-setBadge", text); } /// @@ -109,13 +109,13 @@ public async Task GetBadgeAsync(CancellationToken cancellationToken = de var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("dock-getBadge-completed", (text) => + BridgeConnector.On("dock-getBadge-completed", (text) => { - BridgeConnector.Socket.Off("dock-getBadge-completed"); - taskCompletionSource.SetResult((string) text); + BridgeConnector.Off("dock-getBadge-completed"); + taskCompletionSource.SetResult(text); }); - BridgeConnector.Socket.Emit("dock-getBadge"); + BridgeConnector.Emit("dock-getBadge"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -127,7 +127,7 @@ public async Task GetBadgeAsync(CancellationToken cancellationToken = de /// public void Hide() { - BridgeConnector.Socket.Emit("dock-hide"); + BridgeConnector.Emit("dock-hide"); } /// @@ -135,7 +135,7 @@ public void Hide() /// public void Show() { - BridgeConnector.Socket.Emit("dock-show"); + BridgeConnector.Emit("dock-show"); } /// @@ -151,13 +151,13 @@ public async Task IsVisibleAsync(CancellationToken cancellationToken = def var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("dock-isVisible-completed", (isVisible) => + BridgeConnector.On("dock-isVisible-completed", (isVisible) => { - BridgeConnector.Socket.Off("dock-isVisible-completed"); + BridgeConnector.Off("dock-isVisible-completed"); taskCompletionSource.SetResult((bool) isVisible); }); - BridgeConnector.Socket.Emit("dock-isVisible"); + BridgeConnector.Emit("dock-isVisible"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -179,12 +179,12 @@ public async Task IsVisibleAsync(CancellationToken cancellationToken = def public void SetMenu(MenuItem[] menuItems) { menuItems.AddMenuItemsId(); - BridgeConnector.Socket.Emit("dock-setMenu", JArray.FromObject(menuItems, _jsonSerializer)); + BridgeConnector.Emit("dock-setMenu", JArray.FromObject(menuItems, _jsonSerializer)); _items.AddRange(menuItems); - BridgeConnector.Socket.Off("dockMenuItemClicked"); - BridgeConnector.Socket.On("dockMenuItemClicked", (id) => { - MenuItem menuItem = _items.GetMenuItem(id.ToString()); + BridgeConnector.Off("dockMenuItemClicked"); + BridgeConnector.On("dockMenuItemClicked", (id) => { + MenuItem menuItem = _items.GetMenuItem(id); menuItem?.Click(); }); @@ -201,13 +201,13 @@ public async Task GetMenu(CancellationToken cancellationToken = default) var taskCompletionSource = new TaskCompletionSource(); using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled())) { - BridgeConnector.Socket.On("dock-getMenu-completed", (menu) => + BridgeConnector.On("dock-getMenu-completed", (menu) => { - BridgeConnector.Socket.Off("dock-getMenu-completed"); - taskCompletionSource.SetResult(((JObject)menu).ToObject()); + BridgeConnector.Off("dock-getMenu-completed"); + taskCompletionSource.SetResult(menu); }); - BridgeConnector.Socket.Emit("dock-getMenu"); + BridgeConnector.Emit("dock-getMenu"); return await taskCompletionSource.Task .ConfigureAwait(false); @@ -220,7 +220,7 @@ public async Task GetMenu(CancellationToken cancellationToken = default) /// public void SetIcon(string image) { - BridgeConnector.Socket.Emit("dock-setIcon", image); + BridgeConnector.Emit("dock-setIcon", image); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/ElectronNET.API.csproj b/ElectronNET.API/ElectronNET.API.csproj index d6beb0bb..37160d17 100644 --- a/ElectronNET.API/ElectronNET.API.csproj +++ b/ElectronNET.API/ElectronNET.API.csproj @@ -40,8 +40,10 @@ This package contains the API to access the "native" electron API. all runtime; build; native; contentfiles; analyzers - - + + + + diff --git a/ElectronNET.API/Entities/JumpListSettings.cs b/ElectronNET.API/Entities/JumpListSettings.cs index 82184ed1..150d0b78 100644 --- a/ElectronNET.API/Entities/JumpListSettings.cs +++ b/ElectronNET.API/Entities/JumpListSettings.cs @@ -1,8 +1,5 @@ namespace ElectronNET.API.Entities { - /// - /// - /// public class JumpListSettings { /// diff --git a/ElectronNET.API/Entities/MessageBoxResult.cs b/ElectronNET.API/Entities/MessageBoxResult.cs index 835c292c..8910dff1 100644 --- a/ElectronNET.API/Entities/MessageBoxResult.cs +++ b/ElectronNET.API/Entities/MessageBoxResult.cs @@ -1,5 +1,11 @@ namespace ElectronNET.API.Entities { + internal class MessageBoxResponse + { + public int response { get; set; } + public bool @checked { get; set; } + } + /// /// /// diff --git a/ElectronNET.API/Entities/SecondInstanceResponse.cs b/ElectronNET.API/Entities/SecondInstanceResponse.cs new file mode 100644 index 00000000..de3e2eca --- /dev/null +++ b/ElectronNET.API/Entities/SecondInstanceResponse.cs @@ -0,0 +1,9 @@ +namespace ElectronNET.API.Entities +{ + public class SecondInstanceResponse + { + public string[] args { get; set; } + + public string workingDirectory { get;set;} + } +} \ No newline at end of file diff --git a/ElectronNET.API/Events.cs b/ElectronNET.API/Events.cs index bbbee340..6c01cdc2 100644 --- a/ElectronNET.API/Events.cs +++ b/ElectronNET.API/Events.cs @@ -1,6 +1,5 @@ using System; using System.Globalization; -using Quobject.EngineIoClientDotNet.ComponentEmitter; namespace ElectronNET.API { @@ -42,17 +41,8 @@ public static Events Instance /// The name of the module, e.g. app, dock, etc... /// The name of the event /// The event handler - public void On(string moduleName, string eventName, Action fn) - => On(moduleName, eventName, new ListenerImpl(fn)); + public void On(string moduleName, string eventName, Action fn) => On(moduleName, eventName, _ => fn()); - /// - /// Subscribe to an unmapped electron event. - /// - /// The name of the module, e.g. app, dock, etc... - /// The name of the event - /// The event handler - public void On(string moduleName, string eventName, Action fn) - => On(moduleName, eventName, new ListenerImpl(fn)); /// /// Subscribe to an unmapped electron event. @@ -60,13 +50,13 @@ public void On(string moduleName, string eventName, Action fn) /// The name of the module, e.g. app, dock, etc... /// The name of the event /// The event handler - private void On(string moduleName, string eventName, IListener fn) + public void On(string moduleName, string eventName, Action fn) { var listener = $"{moduleName}{_ti.ToTitleCase(eventName)}Completed"; var subscriber = $"register-{moduleName}-on-event"; - BridgeConnector.Socket.On(listener, fn); - BridgeConnector.Socket.Emit(subscriber, eventName, listener); + BridgeConnector.On(listener, fn); + BridgeConnector.Emit(subscriber, eventName, listener); } /// @@ -75,8 +65,7 @@ private void On(string moduleName, string eventName, IListener fn) /// The name of the module, e.g. app, dock, etc... /// The name of the event /// The event handler - public void Once(string moduleName, string eventName, Action fn) - => Once(moduleName, eventName, new ListenerImpl(fn)); + public void Once(string moduleName, string eventName, Action fn) => Once(moduleName, eventName, _ => fn()); /// /// Subscribe to an unmapped electron event. @@ -85,21 +74,11 @@ public void Once(string moduleName, string eventName, Action fn) /// The name of the event /// The event handler public void Once(string moduleName, string eventName, Action fn) - => Once(moduleName, eventName, new ListenerImpl(fn)); - - /// - /// Subscribe to an unmapped electron event. - /// - /// The name of the module, e.g. app, dock, etc... - /// The name of the event - /// The event handler - private void Once(string moduleName, string eventName, IListener fn) { var listener = $"{moduleName}{_ti.ToTitleCase(eventName)}Completed"; var subscriber = $"register-{moduleName}-once-event"; - BridgeConnector.Socket.Once(listener, fn); - BridgeConnector.Socket.Emit(subscriber, eventName, listener); + BridgeConnector.Once(listener, fn); + BridgeConnector.Emit(subscriber, eventName, listener); } - } } diff --git a/ElectronNET.API/GlobalShortcut.cs b/ElectronNET.API/GlobalShortcut.cs index d2867ecd..2109e297 100644 --- a/ElectronNET.API/GlobalShortcut.cs +++ b/ElectronNET.API/GlobalShortcut.cs @@ -49,16 +49,16 @@ public void Register(string accelerator, Action function) { _shortcuts.Add(accelerator, function); - BridgeConnector.Socket.Off("globalShortcut-pressed"); - BridgeConnector.Socket.On("globalShortcut-pressed", (shortcut) => + BridgeConnector.Off("globalShortcut-pressed"); + BridgeConnector.On("globalShortcut-pressed", (shortcut) => { - if (_shortcuts.ContainsKey(shortcut.ToString())) + if (_shortcuts.ContainsKey(shortcut)) { _shortcuts[shortcut.ToString()](); } }); - BridgeConnector.Socket.Emit("globalShortcut-register", accelerator); + BridgeConnector.Emit("globalShortcut-register", accelerator); } } @@ -72,14 +72,14 @@ public Task IsRegisteredAsync(string accelerator) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("globalShortcut-isRegisteredCompleted", (isRegistered) => + BridgeConnector.On("globalShortcut-isRegisteredCompleted", (isRegistered) => { - BridgeConnector.Socket.Off("globalShortcut-isRegisteredCompleted"); + BridgeConnector.Off("globalShortcut-isRegisteredCompleted"); - taskCompletionSource.SetResult((bool)isRegistered); + taskCompletionSource.SetResult(isRegistered); }); - BridgeConnector.Socket.Emit("globalShortcut-isRegistered", accelerator); + BridgeConnector.Emit("globalShortcut-isRegistered", accelerator); return taskCompletionSource.Task; } @@ -90,7 +90,7 @@ public Task IsRegisteredAsync(string accelerator) public void Unregister(string accelerator) { _shortcuts.Remove(accelerator); - BridgeConnector.Socket.Emit("globalShortcut-unregister", accelerator); + BridgeConnector.Emit("globalShortcut-unregister", accelerator); } /// @@ -99,7 +99,7 @@ public void Unregister(string accelerator) public void UnregisterAll() { _shortcuts.Clear(); - BridgeConnector.Socket.Emit("globalShortcut-unregisterAll"); + BridgeConnector.Emit("globalShortcut-unregisterAll"); } } } \ No newline at end of file diff --git a/ElectronNET.API/HostHook.cs b/ElectronNET.API/HostHook.cs index 37606250..8b982589 100644 --- a/ElectronNET.API/HostHook.cs +++ b/ElectronNET.API/HostHook.cs @@ -47,13 +47,13 @@ internal static HostHook Instance /// Optional parameters. public void Call(string socketEventName, params dynamic[] arguments) { - BridgeConnector.Socket.On(socketEventName + "Error" + oneCallguid, (result) => + BridgeConnector.On(socketEventName + "Error" + oneCallguid, (result) => { - BridgeConnector.Socket.Off(socketEventName + "Error" + oneCallguid); - Electron.Dialog.ShowErrorBox("Host Hook Exception", result.ToString()); + BridgeConnector.Off(socketEventName + "Error" + oneCallguid); + Electron.Dialog.ShowErrorBox("Host Hook Exception", result); }); - BridgeConnector.Socket.Emit(socketEventName, arguments, oneCallguid); + BridgeConnector.Emit(socketEventName, arguments, oneCallguid); } /// @@ -68,52 +68,21 @@ public Task CallAsync(string socketEventName, params dynamic[] arguments) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On(socketEventName + "Error" + guid, (result) => + BridgeConnector.On(socketEventName + "Error" + guid, (result) => { - BridgeConnector.Socket.Off(socketEventName + "Error" + guid); - Electron.Dialog.ShowErrorBox("Host Hook Exception", result.ToString()); + BridgeConnector.Off(socketEventName + "Error" + guid); + Electron.Dialog.ShowErrorBox("Host Hook Exception", result); taskCompletionSource.SetException(new Exception($"Host Hook Exception {result}")); }); - BridgeConnector.Socket.On(socketEventName + "Complete" + guid, (result) => + BridgeConnector.On(socketEventName + "Complete" + guid, (result) => { - BridgeConnector.Socket.Off(socketEventName + "Error" + guid); - BridgeConnector.Socket.Off(socketEventName + "Complete" + guid); - T data = default; - - try - { - if (result.GetType().IsValueType || result is string) - { - data = (T)result; - } - else - { - var token = JToken.Parse(result.ToString()); - if (token is JArray) - { - data = token.ToObject(); - } - else if (token is JObject) - { - data = token.ToObject(); - } - else - { - data = (T)result; - } - } - } - catch (Exception exception) - { - taskCompletionSource.SetException(exception); - //throw new InvalidCastException("Return value does not match with the generic type.", exception); - } - - taskCompletionSource.SetResult(data); + BridgeConnector.Off(socketEventName + "Error" + guid); + BridgeConnector.Off(socketEventName + "Complete" + guid); + taskCompletionSource.SetResult(result); }); - BridgeConnector.Socket.Emit(socketEventName, arguments, guid); + BridgeConnector.Emit(socketEventName, arguments, guid); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/IpcMain.cs b/ElectronNET.API/IpcMain.cs index 3e950c12..15080785 100644 --- a/ElectronNET.API/IpcMain.cs +++ b/ElectronNET.API/IpcMain.cs @@ -45,11 +45,11 @@ internal static IpcMain Instance /// Callback Method. public void On(string channel, Action listener) { - BridgeConnector.Socket.Emit("registerIpcMainChannel", channel); - BridgeConnector.Socket.Off(channel); - BridgeConnector.Socket.On(channel, (args) => + BridgeConnector.Emit("registerIpcMainChannel", channel); + BridgeConnector.Off(channel); + BridgeConnector.On(channel, (args) => { - List objectArray = FormatArguments(args); + var objectArray = FormatArguments(args); if(objectArray.Count == 1) { @@ -62,20 +62,9 @@ public void On(string channel, Action listener) }); } - private List FormatArguments(object args) + private List FormatArguments(object[] objectArray) { - List objectArray = ((JArray)args).ToObject().ToList(); - - for (int index = 0; index < objectArray.Count; index++) - { - var item = objectArray[index]; - if (item == null) - { - objectArray.Remove(item); - } - } - - return objectArray; + return objectArray.Where(o => o is object).ToList(); } /// @@ -89,9 +78,9 @@ private List FormatArguments(object args) /// public void OnSync(string channel, Func listener) { - BridgeConnector.Socket.Emit("registerSyncIpcMainChannel", channel); - BridgeConnector.Socket.On(channel, (args) => { - List objectArray = FormatArguments(args); + BridgeConnector.Emit("registerSyncIpcMainChannel", channel); + BridgeConnector.On(channel, (args) => { + var objectArray = FormatArguments(args); object parameter; if (objectArray.Count == 1) { @@ -103,7 +92,7 @@ public void OnSync(string channel, Func listener) } var result = listener(parameter); - BridgeConnector.Socket.Emit(channel + "Sync", result); + BridgeConnector.Emit(channel + "Sync", result); }); } @@ -115,10 +104,10 @@ public void OnSync(string channel, Func listener) /// Callback Method. public void Once(string channel, Action listener) { - BridgeConnector.Socket.Emit("registerOnceIpcMainChannel", channel); - BridgeConnector.Socket.On(channel, (args) => + BridgeConnector.Emit("registerOnceIpcMainChannel", channel); + BridgeConnector.On(channel, (args) => { - List objectArray = FormatArguments(args); + var objectArray = FormatArguments(args); if (objectArray.Count == 1) { @@ -137,7 +126,7 @@ public void Once(string channel, Action listener) /// Channelname. public void RemoveAllListeners(string channel) { - BridgeConnector.Socket.Emit("removeAllListenersIpcMainChannel", channel); + BridgeConnector.Emit("removeAllListenersIpcMainChannel", channel); } /// @@ -171,11 +160,11 @@ public void Send(BrowserWindow browserWindow, string channel, params object[] da if(jobjects.Count > 0 || jarrays.Count > 0) { - BridgeConnector.Socket.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray()); + BridgeConnector.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray()); } else { - BridgeConnector.Socket.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, data); + BridgeConnector.Emit("sendToIpcRenderer", JObject.FromObject(browserWindow, _jsonSerializer), channel, data); } } @@ -210,11 +199,11 @@ public void Send(BrowserView browserView, string channel, params object[] data) if(jobjects.Count > 0 || jarrays.Count > 0) { - BridgeConnector.Socket.Emit("sendToIpcRendererBrowserView", browserView.Id, channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray()); + BridgeConnector.Emit("sendToIpcRendererBrowserView", browserView.Id, channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray()); } else { - BridgeConnector.Socket.Emit("sendToIpcRendererBrowserView", browserView.Id, channel, data); + BridgeConnector.Emit("sendToIpcRendererBrowserView", browserView.Id, channel, data); } } diff --git a/ElectronNET.API/Menu.cs b/ElectronNET.API/Menu.cs index 8397a10d..aa98613a 100644 --- a/ElectronNET.API/Menu.cs +++ b/ElectronNET.API/Menu.cs @@ -58,12 +58,12 @@ public void SetApplicationMenu(MenuItem[] menuItems) menuItems.AddMenuItemsId(); menuItems.AddSubmenuTypes(); - BridgeConnector.Socket.Emit("menu-setApplicationMenu", JArray.FromObject(menuItems, _jsonSerializer)); + BridgeConnector.Emit("menu-setApplicationMenu", JArray.FromObject(menuItems, _jsonSerializer)); _menuItems.AddRange(menuItems); - BridgeConnector.Socket.Off("menuItemClicked"); - BridgeConnector.Socket.On("menuItemClicked", (id) => { - MenuItem menuItem = _menuItems.GetMenuItem(id.ToString()); + BridgeConnector.Off("menuItemClicked"); + BridgeConnector.On("menuItemClicked", (id) => { + MenuItem menuItem = _menuItems.GetMenuItem(id); menuItem.Click?.Invoke(); }); } @@ -87,7 +87,7 @@ public void SetContextMenu(BrowserWindow browserWindow, MenuItem[] menuItems) menuItems.AddMenuItemsId(); menuItems.AddSubmenuTypes(); - BridgeConnector.Socket.Emit("menu-setContextMenu", browserWindow.Id, JArray.FromObject(menuItems, _jsonSerializer)); + BridgeConnector.Emit("menu-setContextMenu", browserWindow.Id, JArray.FromObject(menuItems, _jsonSerializer)); if (!_contextMenuItems.ContainsKey(browserWindow.Id)) { @@ -96,13 +96,10 @@ public void SetContextMenu(BrowserWindow browserWindow, MenuItem[] menuItems) ContextMenuItems = new ReadOnlyDictionary>(x); } - BridgeConnector.Socket.Off("contextMenuItemClicked"); - BridgeConnector.Socket.On("contextMenuItemClicked", (results) => + BridgeConnector.Off("contextMenuItemClicked"); + BridgeConnector.On("contextMenuItemClicked", (results) => { - var id = ((JArray)results).First.ToString(); - var browserWindowId = (int)((JArray)results).Last; - - MenuItem menuItem = _contextMenuItems[browserWindowId].GetMenuItem(id); + MenuItem menuItem = _contextMenuItems[results.windowId].GetMenuItem(results.id); menuItem.Click?.Invoke(); }); } @@ -113,7 +110,7 @@ public void SetContextMenu(BrowserWindow browserWindow, MenuItem[] menuItems) /// The browser window. public void ContextMenuPopup(BrowserWindow browserWindow) { - BridgeConnector.Socket.Emit("menu-contextMenuPopup", browserWindow.Id); + BridgeConnector.Emit("menu-contextMenuPopup", browserWindow.Id); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/MenuResponse.cs b/ElectronNET.API/MenuResponse.cs new file mode 100644 index 00000000..876a3634 --- /dev/null +++ b/ElectronNET.API/MenuResponse.cs @@ -0,0 +1,8 @@ +namespace ElectronNET.API +{ + internal class MenuResponse + { + public string id { get; set; } + public int windowId { get; set; } + } +} \ No newline at end of file diff --git a/ElectronNET.API/NativeTheme.cs b/ElectronNET.API/NativeTheme.cs index 037a97a6..9305e8f9 100644 --- a/ElectronNET.API/NativeTheme.cs +++ b/ElectronNET.API/NativeTheme.cs @@ -94,7 +94,7 @@ public void SetThemeSource(ThemeSourceMode themeSourceMode) { var themeSource = themeSourceMode.GetDescription(); - BridgeConnector.Socket.Emit("nativeTheme-themeSource", themeSource); + BridgeConnector.Emit("nativeTheme-themeSource", themeSource); } /// @@ -105,16 +105,16 @@ public Task GetThemeSourceAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("nativeTheme-themeSource-getCompleted", (themeSource) => + BridgeConnector.On("nativeTheme-themeSource-getCompleted", (themeSource) => { - BridgeConnector.Socket.Off("nativeTheme-themeSource-getCompleted"); + BridgeConnector.Off("nativeTheme-themeSource-getCompleted"); - var themeSourceValue = (ThemeSourceMode)Enum.Parse(typeof(ThemeSourceMode), (string)themeSource, true); + var themeSourceValue = Enum.Parse(themeSource, true); taskCompletionSource.SetResult(themeSourceValue); }); - BridgeConnector.Socket.Emit("nativeTheme-themeSource-get"); + BridgeConnector.Emit("nativeTheme-themeSource-get"); return taskCompletionSource.Task; } @@ -128,13 +128,13 @@ public Task ShouldUseDarkColorsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("nativeTheme-shouldUseDarkColors-completed", (shouldUseDarkColors) => { - BridgeConnector.Socket.Off("nativeTheme-shouldUseDarkColors-completed"); + BridgeConnector.On("nativeTheme-shouldUseDarkColors-completed", (shouldUseDarkColors) => { + BridgeConnector.Off("nativeTheme-shouldUseDarkColors-completed"); taskCompletionSource.SetResult((bool)shouldUseDarkColors); }); - BridgeConnector.Socket.Emit("nativeTheme-shouldUseDarkColors"); + BridgeConnector.Emit("nativeTheme-shouldUseDarkColors"); return taskCompletionSource.Task; } @@ -147,13 +147,13 @@ public Task ShouldUseHighContrastColorsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("nativeTheme-shouldUseHighContrastColors-completed", (shouldUseHighContrastColors) => { - BridgeConnector.Socket.Off("nativeTheme-shouldUseHighContrastColors-completed"); + BridgeConnector.On("nativeTheme-shouldUseHighContrastColors-completed", (shouldUseHighContrastColors) => { + BridgeConnector.Off("nativeTheme-shouldUseHighContrastColors-completed"); taskCompletionSource.SetResult((bool)shouldUseHighContrastColors); }); - BridgeConnector.Socket.Emit("nativeTheme-shouldUseHighContrastColors"); + BridgeConnector.Emit("nativeTheme-shouldUseHighContrastColors"); return taskCompletionSource.Task; } @@ -166,13 +166,13 @@ public Task ShouldUseInvertedColorSchemeAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("nativeTheme-shouldUseInvertedColorScheme-completed", (shouldUseInvertedColorScheme) => { - BridgeConnector.Socket.Off("nativeTheme-shouldUseInvertedColorScheme-completed"); + BridgeConnector.On("nativeTheme-shouldUseInvertedColorScheme-completed", (shouldUseInvertedColorScheme) => { + BridgeConnector.Off("nativeTheme-shouldUseInvertedColorScheme-completed"); taskCompletionSource.SetResult((bool)shouldUseInvertedColorScheme); }); - BridgeConnector.Socket.Emit("nativeTheme-shouldUseInvertedColorScheme"); + BridgeConnector.Emit("nativeTheme-shouldUseInvertedColorScheme"); return taskCompletionSource.Task; } @@ -187,12 +187,12 @@ public event Action Updated { if (_updated == null) { - BridgeConnector.Socket.On("nativeTheme-updated" + GetHashCode(), () => + BridgeConnector.On("nativeTheme-updated" + GetHashCode(), () => { _updated(); }); - BridgeConnector.Socket.Emit("register-nativeTheme-updated-event", GetHashCode()); + BridgeConnector.Emit("register-nativeTheme-updated-event", GetHashCode()); } _updated += value; } @@ -202,7 +202,7 @@ public event Action Updated if (_updated == null) { - BridgeConnector.Socket.Off("nativeTheme-updated" + GetHashCode()); + BridgeConnector.Off("nativeTheme-updated" + GetHashCode()); } } } diff --git a/ElectronNET.API/Notification.cs b/ElectronNET.API/Notification.cs index 68ac4e14..fcde73b0 100644 --- a/ElectronNET.API/Notification.cs +++ b/ElectronNET.API/Notification.cs @@ -48,7 +48,7 @@ public void Show(NotificationOptions notificationOptions) { GenerateIDsForDefinedActions(notificationOptions); - BridgeConnector.Socket.Emit("createNotification", JObject.FromObject(notificationOptions, _jsonSerializer)); + BridgeConnector.Emit("createNotification", JObject.FromObject(notificationOptions, _jsonSerializer)); } private static void GenerateIDsForDefinedActions(NotificationOptions notificationOptions) @@ -60,9 +60,9 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio notificationOptions.ShowID = Guid.NewGuid().ToString(); isActionDefined = true; - BridgeConnector.Socket.Off("NotificationEventShow"); - BridgeConnector.Socket.On("NotificationEventShow", (id) => { - _notificationOptions.Single(x => x.ShowID == id.ToString()).OnShow(); + BridgeConnector.Off("NotificationEventShow"); + BridgeConnector.On("NotificationEventShow", (id) => { + _notificationOptions.Single(x => x.ShowID == id).OnShow(); }); } @@ -71,9 +71,9 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio notificationOptions.ClickID = Guid.NewGuid().ToString(); isActionDefined = true; - BridgeConnector.Socket.Off("NotificationEventClick"); - BridgeConnector.Socket.On("NotificationEventClick", (id) => { - _notificationOptions.Single(x => x.ClickID == id.ToString()).OnClick(); + BridgeConnector.Off("NotificationEventClick"); + BridgeConnector.On("NotificationEventClick", (id) => { + _notificationOptions.Single(x => x.ClickID == id).OnClick(); }); } @@ -82,8 +82,8 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio notificationOptions.CloseID = Guid.NewGuid().ToString(); isActionDefined = true; - BridgeConnector.Socket.Off("NotificationEventClose"); - BridgeConnector.Socket.On("NotificationEventClose", (id) => { + BridgeConnector.Off("NotificationEventClose"); + BridgeConnector.On("NotificationEventClose", (id) => { _notificationOptions.Single(x => x.CloseID == id.ToString()).OnClose(); }); } @@ -93,10 +93,9 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio notificationOptions.ReplyID = Guid.NewGuid().ToString(); isActionDefined = true; - BridgeConnector.Socket.Off("NotificationEventReply"); - BridgeConnector.Socket.On("NotificationEventReply", (args) => { - var arguments = ((JArray)args).ToObject(); - _notificationOptions.Single(x => x.ReplyID == arguments[0].ToString()).OnReply(arguments[1].ToString()); + BridgeConnector.Off("NotificationEventReply"); + BridgeConnector.On("NotificationEventReply", (args) => { + _notificationOptions.Single(x => x.ReplyID == args[0].ToString()).OnReply(args[1].ToString()); }); } @@ -105,10 +104,9 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio notificationOptions.ActionID = Guid.NewGuid().ToString(); isActionDefined = true; - BridgeConnector.Socket.Off("NotificationEventAction"); - BridgeConnector.Socket.On("NotificationEventAction", (args) => { - var arguments = ((JArray)args).ToObject(); - _notificationOptions.Single(x => x.ReplyID == arguments[0].ToString()).OnAction(arguments[1].ToString()); + BridgeConnector.Off("NotificationEventAction"); + BridgeConnector.On("NotificationEventAction", (args) => { + _notificationOptions.Single(x => x.ReplyID == args[0].ToString()).OnAction(args[1].ToString()); }); } @@ -126,13 +124,13 @@ public Task IsSupportedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("notificationIsSupportedComplete", (isSupported) => + BridgeConnector.On("notificationIsSupportedComplete", (isSupported) => { - BridgeConnector.Socket.Off("notificationIsSupportedComplete"); + BridgeConnector.Off("notificationIsSupportedComplete"); taskCompletionSource.SetResult((bool)isSupported); }); - BridgeConnector.Socket.Emit("notificationIsSupported"); + BridgeConnector.Emit("notificationIsSupported"); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/PowerMonitor.cs b/ElectronNET.API/PowerMonitor.cs index 03e68748..8a7ab809 100644 --- a/ElectronNET.API/PowerMonitor.cs +++ b/ElectronNET.API/PowerMonitor.cs @@ -17,12 +17,12 @@ public event Action OnLockScreen { if (_lockScreen == null) { - BridgeConnector.Socket.On("pm-lock-screen" , () => + BridgeConnector.On("pm-lock-screen" , () => { _lockScreen(); }); - BridgeConnector.Socket.Emit("register-pm-lock-screen"); + BridgeConnector.Emit("register-pm-lock-screen"); } _lockScreen += value; } @@ -31,7 +31,7 @@ public event Action OnLockScreen _lockScreen -= value; if (_lockScreen == null) - BridgeConnector.Socket.Off("pm-lock-screen"); + BridgeConnector.Off("pm-lock-screen"); } } @@ -46,12 +46,12 @@ public event Action OnUnLockScreen { if (_unlockScreen == null) { - BridgeConnector.Socket.On("pm-unlock-screen", () => + BridgeConnector.On("pm-unlock-screen", () => { _unlockScreen(); }); - BridgeConnector.Socket.Emit("register-pm-unlock-screen"); + BridgeConnector.Emit("register-pm-unlock-screen"); } _unlockScreen += value; } @@ -60,7 +60,7 @@ public event Action OnUnLockScreen _unlockScreen -= value; if (_unlockScreen == null) - BridgeConnector.Socket.Off("pm-unlock-screen"); + BridgeConnector.Off("pm-unlock-screen"); } } @@ -75,12 +75,12 @@ public event Action OnSuspend { if (_suspend == null) { - BridgeConnector.Socket.On("pm-suspend", () => + BridgeConnector.On("pm-suspend", () => { _suspend(); }); - BridgeConnector.Socket.Emit("register-pm-suspend"); + BridgeConnector.Emit("register-pm-suspend"); } _suspend += value; } @@ -89,7 +89,7 @@ public event Action OnSuspend _suspend -= value; if (_suspend == null) - BridgeConnector.Socket.Off("pm-suspend"); + BridgeConnector.Off("pm-suspend"); } } @@ -104,12 +104,12 @@ public event Action OnResume { if (_resume == null) { - BridgeConnector.Socket.On("pm-resume", () => + BridgeConnector.On("pm-resume", () => { _resume(); }); - BridgeConnector.Socket.Emit("register-pm-resume"); + BridgeConnector.Emit("register-pm-resume"); } _resume += value; } @@ -118,7 +118,7 @@ public event Action OnResume _resume -= value; if (_resume == null) - BridgeConnector.Socket.Off("pm-resume"); + BridgeConnector.Off("pm-resume"); } } @@ -133,12 +133,12 @@ public event Action OnAC { if (_onAC == null) { - BridgeConnector.Socket.On("pm-on-ac", () => + BridgeConnector.On("pm-on-ac", () => { _onAC(); }); - BridgeConnector.Socket.Emit("register-pm-on-ac"); + BridgeConnector.Emit("register-pm-on-ac"); } _onAC += value; } @@ -147,7 +147,7 @@ public event Action OnAC _onAC -= value; if (_onAC == null) - BridgeConnector.Socket.Off("pm-on-ac"); + BridgeConnector.Off("pm-on-ac"); } } @@ -162,12 +162,12 @@ public event Action OnBattery { if (_onBattery == null) { - BridgeConnector.Socket.On("pm-on-battery", () => + BridgeConnector.On("pm-on-battery", () => { _onBattery(); }); - BridgeConnector.Socket.Emit("register-pm-on-battery"); + BridgeConnector.Emit("register-pm-on-battery"); } _onBattery += value; } @@ -176,7 +176,7 @@ public event Action OnBattery _onBattery -= value; if (_onBattery == null) - BridgeConnector.Socket.Off("pm-on-battery"); + BridgeConnector.Off("pm-on-battery"); } } @@ -195,12 +195,12 @@ public event Action OnShutdown { if (_shutdown == null) { - BridgeConnector.Socket.On("pm-shutdown", () => + BridgeConnector.On("pm-shutdown", () => { _shutdown(); }); - BridgeConnector.Socket.Emit("register-pm-shutdown"); + BridgeConnector.Emit("register-pm-shutdown"); } _shutdown += value; } @@ -209,7 +209,7 @@ public event Action OnShutdown _shutdown -= value; if (_shutdown == null) - BridgeConnector.Socket.Off("pm-on-shutdown"); + BridgeConnector.Off("pm-on-shutdown"); } } diff --git a/ElectronNET.API/Screen.cs b/ElectronNET.API/Screen.cs index 31cecb5f..6c9382ff 100644 --- a/ElectronNET.API/Screen.cs +++ b/ElectronNET.API/Screen.cs @@ -21,12 +21,12 @@ public event Action OnDisplayAdded { if (_onDisplayAdded == null) { - BridgeConnector.Socket.On("screen-display-added-event" + GetHashCode(), (display) => + BridgeConnector.On("screen-display-added-event" + GetHashCode(), (display) => { - _onDisplayAdded(((JObject)display).ToObject()); + _onDisplayAdded(display); }); - BridgeConnector.Socket.Emit("register-screen-display-added", GetHashCode()); + BridgeConnector.Emit("register-screen-display-added", GetHashCode()); } _onDisplayAdded += value; } @@ -35,7 +35,7 @@ public event Action OnDisplayAdded _onDisplayAdded -= value; if (_onDisplayAdded == null) - BridgeConnector.Socket.Off("screen-display-added-event" + GetHashCode()); + BridgeConnector.Off("screen-display-added-event" + GetHashCode()); } } @@ -50,12 +50,12 @@ public event Action OnDisplayRemoved { if (_onDisplayRemoved == null) { - BridgeConnector.Socket.On("screen-display-removed-event" + GetHashCode(), (display) => + BridgeConnector.On("screen-display-removed-event" + GetHashCode(), (display) => { _onDisplayRemoved(((JObject)display).ToObject()); }); - BridgeConnector.Socket.Emit("register-screen-display-removed", GetHashCode()); + BridgeConnector.Emit("register-screen-display-removed", GetHashCode()); } _onDisplayRemoved += value; } @@ -64,7 +64,7 @@ public event Action OnDisplayRemoved _onDisplayRemoved -= value; if (_onDisplayRemoved == null) - BridgeConnector.Socket.Off("screen-display-removed-event" + GetHashCode()); + BridgeConnector.Off("screen-display-removed-event" + GetHashCode()); } } @@ -81,7 +81,7 @@ public event Action OnDisplayMetricsChanged { if (_onDisplayMetricsChanged == null) { - BridgeConnector.Socket.On("screen-display-metrics-changed-event" + GetHashCode(), (args) => + BridgeConnector.On("screen-display-metrics-changed-event" + GetHashCode(), (args) => { var display = ((JArray)args).First.ToObject(); var metrics = ((JArray)args).Last.ToObject(); @@ -89,7 +89,7 @@ public event Action OnDisplayMetricsChanged _onDisplayMetricsChanged(display, metrics); }); - BridgeConnector.Socket.Emit("register-screen-display-metrics-changed", GetHashCode()); + BridgeConnector.Emit("register-screen-display-metrics-changed", GetHashCode()); } _onDisplayMetricsChanged += value; } @@ -98,7 +98,7 @@ public event Action OnDisplayMetricsChanged _onDisplayMetricsChanged -= value; if (_onDisplayMetricsChanged == null) - BridgeConnector.Socket.Off("screen-display-metrics-changed-event" + GetHashCode()); + BridgeConnector.Off("screen-display-metrics-changed-event" + GetHashCode()); } } @@ -136,14 +136,14 @@ public Task GetCursorScreenPointAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getCursorScreenPointCompleted", (point) => + BridgeConnector.On("screen-getCursorScreenPointCompleted", (point) => { - BridgeConnector.Socket.Off("screen-getCursorScreenPointCompleted"); + BridgeConnector.Off("screen-getCursorScreenPointCompleted"); taskCompletionSource.SetResult(((JObject)point).ToObject()); }); - BridgeConnector.Socket.Emit("screen-getCursorScreenPoint"); + BridgeConnector.Emit("screen-getCursorScreenPoint"); return taskCompletionSource.Task; } @@ -156,14 +156,14 @@ public Task GetMenuBarHeightAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getMenuBarHeightCompleted", (height) => + BridgeConnector.On("screen-getMenuBarHeightCompleted", (height) => { - BridgeConnector.Socket.Off("screen-getMenuBarHeightCompleted"); + BridgeConnector.Off("screen-getMenuBarHeightCompleted"); taskCompletionSource.SetResult(int.Parse(height.ToString())); }); - BridgeConnector.Socket.Emit("screen-getMenuBarHeight"); + BridgeConnector.Emit("screen-getMenuBarHeight"); return taskCompletionSource.Task; } @@ -176,14 +176,14 @@ public Task GetPrimaryDisplayAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getPrimaryDisplayCompleted", (display) => + BridgeConnector.On("screen-getPrimaryDisplayCompleted", (display) => { - BridgeConnector.Socket.Off("screen-getPrimaryDisplayCompleted"); + BridgeConnector.Off("screen-getPrimaryDisplayCompleted"); taskCompletionSource.SetResult(((JObject)display).ToObject()); }); - BridgeConnector.Socket.Emit("screen-getPrimaryDisplay"); + BridgeConnector.Emit("screen-getPrimaryDisplay"); return taskCompletionSource.Task; } @@ -196,14 +196,14 @@ public Task GetAllDisplaysAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getAllDisplaysCompleted", (displays) => + BridgeConnector.On("screen-getAllDisplaysCompleted", (displays) => { - BridgeConnector.Socket.Off("screen-getAllDisplaysCompleted"); + BridgeConnector.Off("screen-getAllDisplaysCompleted"); taskCompletionSource.SetResult(((JArray)displays).ToObject()); }); - BridgeConnector.Socket.Emit("screen-getAllDisplays"); + BridgeConnector.Emit("screen-getAllDisplays"); return taskCompletionSource.Task; } @@ -216,14 +216,14 @@ public Task GetDisplayNearestPointAsync(Point point) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getDisplayNearestPointCompleted", (display) => + BridgeConnector.On("screen-getDisplayNearestPointCompleted", (display) => { - BridgeConnector.Socket.Off("screen-getDisplayNearestPointCompleted"); + BridgeConnector.Off("screen-getDisplayNearestPointCompleted"); taskCompletionSource.SetResult(((JObject)display).ToObject()); }); - BridgeConnector.Socket.Emit("screen-getDisplayNearestPoint", JObject.FromObject(point, _jsonSerializer)); + BridgeConnector.Emit("screen-getDisplayNearestPoint", JObject.FromObject(point, _jsonSerializer)); return taskCompletionSource.Task; } @@ -237,14 +237,14 @@ public Task GetDisplayMatchingAsync(Rectangle rectangle) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("screen-getDisplayMatching", (display) => + BridgeConnector.On("screen-getDisplayMatching", (display) => { - BridgeConnector.Socket.Off("screen-getDisplayMatching"); + BridgeConnector.Off("screen-getDisplayMatching"); taskCompletionSource.SetResult(((JObject)display).ToObject()); }); - BridgeConnector.Socket.Emit("screen-getDisplayMatching", JObject.FromObject(rectangle, _jsonSerializer)); + BridgeConnector.Emit("screen-getDisplayMatching", JObject.FromObject(rectangle, _jsonSerializer)); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/Session.cs b/ElectronNET.API/Session.cs index a4cb6bb6..097874ae 100644 --- a/ElectronNET.API/Session.cs +++ b/ElectronNET.API/Session.cs @@ -37,7 +37,7 @@ internal Session(int id) /// A comma-separated list of servers for which integrated authentication is enabled. public void AllowNTLMCredentialsForDomains(string domains) { - BridgeConnector.Socket.Emit("webContents-session-allowNTLMCredentialsForDomains", Id, domains); + BridgeConnector.Emit("webContents-session-allowNTLMCredentialsForDomains", Id, domains); } /// @@ -50,13 +50,13 @@ public Task ClearAuthCacheAsync(RemovePassword options) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearAuthCache-completed" + guid, () => + BridgeConnector.On("webContents-session-clearAuthCache-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearAuthCache-completed" + guid); + BridgeConnector.Off("webContents-session-clearAuthCache-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, JObject.FromObject(options, _jsonSerializer), guid); + BridgeConnector.Emit("webContents-session-clearAuthCache", Id, JObject.FromObject(options, _jsonSerializer), guid); return taskCompletionSource.Task; } @@ -69,13 +69,13 @@ public Task ClearAuthCacheAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearAuthCache-completed" + guid, () => + BridgeConnector.On("webContents-session-clearAuthCache-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearAuthCache-completed" + guid); + BridgeConnector.Off("webContents-session-clearAuthCache-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, guid); + BridgeConnector.Emit("webContents-session-clearAuthCache", Id, guid); return taskCompletionSource.Task; } @@ -89,13 +89,13 @@ public Task ClearCacheAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearCache-completed" + guid, () => + BridgeConnector.On("webContents-session-clearCache-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearCache-completed" + guid); + BridgeConnector.Off("webContents-session-clearCache-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearCache", Id, guid); + BridgeConnector.Emit("webContents-session-clearCache", Id, guid); return taskCompletionSource.Task; } @@ -109,13 +109,13 @@ public Task ClearHostResolverCacheAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearHostResolverCache-completed" + guid, () => + BridgeConnector.On("webContents-session-clearHostResolverCache-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearHostResolverCache-completed" + guid); + BridgeConnector.Off("webContents-session-clearHostResolverCache-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearHostResolverCache", Id, guid); + BridgeConnector.Emit("webContents-session-clearHostResolverCache", Id, guid); return taskCompletionSource.Task; } @@ -129,13 +129,13 @@ public Task ClearStorageDataAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearStorageData-completed" + guid, () => + BridgeConnector.On("webContents-session-clearStorageData-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearStorageData-completed" + guid); + BridgeConnector.Off("webContents-session-clearStorageData-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearStorageData", Id, guid); + BridgeConnector.Emit("webContents-session-clearStorageData", Id, guid); return taskCompletionSource.Task; } @@ -150,13 +150,13 @@ public Task ClearStorageDataAsync(ClearStorageDataOptions options) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-clearStorageData-options-completed" + guid, () => + BridgeConnector.On("webContents-session-clearStorageData-options-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-clearStorageData-options-completed" + guid); + BridgeConnector.Off("webContents-session-clearStorageData-options-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-clearStorageData-options", Id, JObject.FromObject(options, _jsonSerializer), guid); + BridgeConnector.Emit("webContents-session-clearStorageData-options", Id, JObject.FromObject(options, _jsonSerializer), guid); return taskCompletionSource.Task; } @@ -171,7 +171,7 @@ public Task ClearStorageDataAsync(ClearStorageDataOptions options) /// public void CreateInterruptedDownload(CreateInterruptedDownloadOptions options) { - BridgeConnector.Socket.Emit("webContents-session-createInterruptedDownload", Id, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("webContents-session-createInterruptedDownload", Id, JObject.FromObject(options, _jsonSerializer)); } /// @@ -180,7 +180,7 @@ public void CreateInterruptedDownload(CreateInterruptedDownloadOptions options) /// public void DisableNetworkEmulation() { - BridgeConnector.Socket.Emit("webContents-session-disableNetworkEmulation", Id); + BridgeConnector.Emit("webContents-session-disableNetworkEmulation", Id); } /// @@ -189,7 +189,7 @@ public void DisableNetworkEmulation() /// public void EnableNetworkEmulation(EnableNetworkEmulationOptions options) { - BridgeConnector.Socket.Emit("webContents-session-enableNetworkEmulation", Id, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("webContents-session-enableNetworkEmulation", Id, JObject.FromObject(options, _jsonSerializer)); } /// @@ -197,7 +197,7 @@ public void EnableNetworkEmulation(EnableNetworkEmulationOptions options) /// public void FlushStorageData() { - BridgeConnector.Socket.Emit("webContents-session-flushStorageData", Id); + BridgeConnector.Emit("webContents-session-flushStorageData", Id); } /// @@ -210,15 +210,13 @@ public Task GetBlobDataAsync(string identifier) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-getBlobData-completed" + guid, (buffer) => + BridgeConnector.On("webContents-session-getBlobData-completed" + guid, (buffer) => { - var result = ((JArray)buffer).ToObject(); - - BridgeConnector.Socket.Off("webContents-session-getBlobData-completed" + guid); - taskCompletionSource.SetResult(result); + BridgeConnector.Off("webContents-session-getBlobData-completed" + guid); + taskCompletionSource.SetResult(buffer); }); - BridgeConnector.Socket.Emit("webContents-session-getBlobData", Id, identifier, guid); + BridgeConnector.Emit("webContents-session-getBlobData", Id, identifier, guid); return taskCompletionSource.Task; } @@ -232,13 +230,13 @@ public Task GetCacheSizeAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-getCacheSize-completed" + guid, (size) => + BridgeConnector.On("webContents-session-getCacheSize-completed" + guid, (size) => { - BridgeConnector.Socket.Off("webContents-session-getCacheSize-completed" + guid); + BridgeConnector.Off("webContents-session-getCacheSize-completed" + guid); taskCompletionSource.SetResult((int)size); }); - BridgeConnector.Socket.Emit("webContents-session-getCacheSize", Id, guid); + BridgeConnector.Emit("webContents-session-getCacheSize", Id, guid); return taskCompletionSource.Task; } @@ -252,14 +250,13 @@ public Task GetPreloadsAsync() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-getPreloads-completed" + guid, (preloads) => + BridgeConnector.On("webContents-session-getPreloads-completed" + guid, (preloads) => { - var result = ((JArray)preloads).ToObject(); - BridgeConnector.Socket.Off("webContents-session-getPreloads-completed" + guid); - taskCompletionSource.SetResult(result); + BridgeConnector.Off("webContents-session-getPreloads-completed" + guid); + taskCompletionSource.SetResult(preloads); }); - BridgeConnector.Socket.Emit("webContents-session-getPreloads", Id, guid); + BridgeConnector.Emit("webContents-session-getPreloads", Id, guid); return taskCompletionSource.Task; } @@ -273,13 +270,13 @@ public Task GetUserAgent() var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-getUserAgent-completed" + guid, (userAgent) => + BridgeConnector.On("webContents-session-getUserAgent-completed" + guid, (userAgent) => { - BridgeConnector.Socket.Off("webContents-session-getUserAgent-completed" + guid); + BridgeConnector.Off("webContents-session-getUserAgent-completed" + guid); taskCompletionSource.SetResult(userAgent.ToString()); }); - BridgeConnector.Socket.Emit("webContents-session-getUserAgent", Id, guid); + BridgeConnector.Emit("webContents-session-getUserAgent", Id, guid); return taskCompletionSource.Task; } @@ -295,13 +292,13 @@ public Task ResolveProxyAsync(string url) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-resolveProxy-completed" + guid, (proxy) => + BridgeConnector.On("webContents-session-resolveProxy-completed" + guid, (proxy) => { - BridgeConnector.Socket.Off("webContents-session-resolveProxy-completed" + guid); + BridgeConnector.Off("webContents-session-resolveProxy-completed" + guid); taskCompletionSource.SetResult(proxy.ToString()); }); - BridgeConnector.Socket.Emit("webContents-session-resolveProxy", Id, url, guid); + BridgeConnector.Emit("webContents-session-resolveProxy", Id, url, guid); return taskCompletionSource.Task; } @@ -313,7 +310,7 @@ public Task ResolveProxyAsync(string url) /// public void SetDownloadPath(string path) { - BridgeConnector.Socket.Emit("webContents-session-setDownloadPath", Id, path); + BridgeConnector.Emit("webContents-session-setDownloadPath", Id, path); } /// @@ -323,7 +320,7 @@ public void SetDownloadPath(string path) /// public void SetPreloads(string[] preloads) { - BridgeConnector.Socket.Emit("webContents-session-setPreloads", Id, preloads); + BridgeConnector.Emit("webContents-session-setPreloads", Id, preloads); } /// @@ -337,13 +334,13 @@ public Task SetProxyAsync(ProxyConfig config) var taskCompletionSource = new TaskCompletionSource(); string guid = Guid.NewGuid().ToString(); - BridgeConnector.Socket.On("webContents-session-setProxy-completed" + guid, () => + BridgeConnector.On("webContents-session-setProxy-completed" + guid, () => { - BridgeConnector.Socket.Off("webContents-session-setProxy-completed" + guid); + BridgeConnector.Off("webContents-session-setProxy-completed" + guid); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.Emit("webContents-session-setProxy", Id, JObject.FromObject(config, _jsonSerializer), guid); + BridgeConnector.Emit("webContents-session-setProxy", Id, JObject.FromObject(config, _jsonSerializer), guid); return taskCompletionSource.Task; } @@ -356,7 +353,7 @@ public Task SetProxyAsync(ProxyConfig config) /// public void SetUserAgent(string userAgent) { - BridgeConnector.Socket.Emit("webContents-session-setUserAgent", Id, userAgent); + BridgeConnector.Emit("webContents-session-setUserAgent", Id, userAgent); } /// @@ -372,7 +369,7 @@ public void SetUserAgent(string userAgent) /// example "en-US,fr,de,ko,zh-CN,ja". public void SetUserAgent(string userAgent, string acceptLanguages) { - BridgeConnector.Socket.Emit("webContents-session-setUserAgent", Id, userAgent, acceptLanguages); + BridgeConnector.Emit("webContents-session-setUserAgent", Id, userAgent, acceptLanguages); } /// @@ -384,15 +381,13 @@ public Task GetAllExtensionsAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-session-getAllExtensions-completed", (extensionslist) => + BridgeConnector.On("webContents-session-getAllExtensions-completed", (extensionslist) => { - BridgeConnector.Socket.Off("webContents-session-getAllExtensions-completed"); - var chromeExtensionInfos = ((JArray)extensionslist).ToObject(); - - taskCompletionSource.SetResult(chromeExtensionInfos); + BridgeConnector.Off("webContents-session-getAllExtensions-completed"); + taskCompletionSource.SetResult(extensionslist); }); - BridgeConnector.Socket.Emit("webContents-session-getAllExtensions", Id); + BridgeConnector.Emit("webContents-session-getAllExtensions", Id); return taskCompletionSource.Task; } @@ -404,7 +399,7 @@ public Task GetAllExtensionsAsync() /// Name of the Chrome extension to remove public void RemoveExtension(string name) { - BridgeConnector.Socket.Emit("webContents-session-removeExtension", Id, name); + BridgeConnector.Emit("webContents-session-removeExtension", Id, name); } /// @@ -438,14 +433,14 @@ public Task LoadExtensionAsync(string path, bool allowFileAccess = fa { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-session-loadExtension-completed", (extension) => + BridgeConnector.On("webContents-session-loadExtension-completed", (extension) => { - BridgeConnector.Socket.Off("webContents-session-loadExtension-completed"); + BridgeConnector.Off("webContents-session-loadExtension-completed"); - taskCompletionSource.SetResult(((JObject)extension).ToObject()); + taskCompletionSource.SetResult(extension); }); - BridgeConnector.Socket.Emit("webContents-session-loadExtension", Id, path, allowFileAccess); + BridgeConnector.Emit("webContents-session-loadExtension", Id, path, allowFileAccess); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/Shell.cs b/ElectronNET.API/Shell.cs index 71f458e4..432fad62 100644 --- a/ElectronNET.API/Shell.cs +++ b/ElectronNET.API/Shell.cs @@ -44,12 +44,12 @@ public Task ShowItemInFolderAsync(string fullPath) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-showItemInFolderCompleted", () => + BridgeConnector.On("shell-showItemInFolderCompleted", () => { - BridgeConnector.Socket.Off("shell-showItemInFolderCompleted"); + BridgeConnector.Off("shell-showItemInFolderCompleted"); }); - BridgeConnector.Socket.Emit("shell-showItemInFolder", fullPath); + BridgeConnector.Emit("shell-showItemInFolder", fullPath); return taskCompletionSource.Task; } @@ -63,14 +63,14 @@ public Task OpenPathAsync(string path) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-openPathCompleted", (errorMessage) => + BridgeConnector.On("shell-openPathCompleted", (errorMessage) => { - BridgeConnector.Socket.Off("shell-openPathCompleted"); + BridgeConnector.Off("shell-openPathCompleted"); taskCompletionSource.SetResult((string) errorMessage); }); - BridgeConnector.Socket.Emit("shell-openPath", path); + BridgeConnector.Emit("shell-openPath", path); return taskCompletionSource.Task; } @@ -97,20 +97,20 @@ public Task OpenExternalAsync(string url, OpenExternalOptions options) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-openExternalCompleted", (error) => + BridgeConnector.On("shell-openExternalCompleted", (error) => { - BridgeConnector.Socket.Off("shell-openExternalCompleted"); + BridgeConnector.Off("shell-openExternalCompleted"); taskCompletionSource.SetResult((string) error); }); if (options == null) { - BridgeConnector.Socket.Emit("shell-openExternal", url); + BridgeConnector.Emit("shell-openExternal", url); } else { - BridgeConnector.Socket.Emit("shell-openExternal", url, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("shell-openExternal", url, JObject.FromObject(options, _jsonSerializer)); } return taskCompletionSource.Task; @@ -125,14 +125,14 @@ public Task TrashItemAsync(string fullPath) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-trashItem-completed", (success) => + BridgeConnector.On("shell-trashItem-completed", (success) => { - BridgeConnector.Socket.Off("shell-trashItem-completed"); + BridgeConnector.Off("shell-trashItem-completed"); taskCompletionSource.SetResult((bool) success); }); - BridgeConnector.Socket.Emit("shell-trashItem", fullPath); + BridgeConnector.Emit("shell-trashItem", fullPath); return taskCompletionSource.Task; } @@ -142,7 +142,7 @@ public Task TrashItemAsync(string fullPath) /// public void Beep() { - BridgeConnector.Socket.Emit("shell-beep"); + BridgeConnector.Emit("shell-beep"); } /// @@ -156,14 +156,14 @@ public Task WriteShortcutLinkAsync(string shortcutPath, ShortcutLinkOperat { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-writeShortcutLinkCompleted", (success) => + BridgeConnector.On("shell-writeShortcutLinkCompleted", (success) => { - BridgeConnector.Socket.Off("shell-writeShortcutLinkCompleted"); + BridgeConnector.Off("shell-writeShortcutLinkCompleted"); taskCompletionSource.SetResult((bool) success); }); - BridgeConnector.Socket.Emit("shell-writeShortcutLink", shortcutPath, operation.GetDescription(), JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("shell-writeShortcutLink", shortcutPath, operation.GetDescription(), JObject.FromObject(options, _jsonSerializer)); return taskCompletionSource.Task; } @@ -178,9 +178,9 @@ public Task ReadShortcutLinkAsync(string shortcutPath) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("shell-readShortcutLinkCompleted", (shortcutDetails) => + BridgeConnector.On("shell-readShortcutLinkCompleted", (shortcutDetails) => { - BridgeConnector.Socket.Off("shell-readShortcutLinkCompleted"); + BridgeConnector.Off("shell-readShortcutLinkCompleted"); var shortcutObject = shortcutDetails as JObject; var details = shortcutObject?.ToObject(); @@ -188,7 +188,7 @@ public Task ReadShortcutLinkAsync(string shortcutPath) taskCompletionSource.SetResult(details); }); - BridgeConnector.Socket.Emit("shell-readShortcutLink", shortcutPath); + BridgeConnector.Emit("shell-readShortcutLink", shortcutPath); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/Tray.cs b/ElectronNET.API/Tray.cs index a5aac8a1..bf44cc94 100644 --- a/ElectronNET.API/Tray.cs +++ b/ElectronNET.API/Tray.cs @@ -23,7 +23,7 @@ public event Action OnClick { if (_click == null) { - BridgeConnector.Socket.On("tray-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-click-event" + GetHashCode(), (result) => { var args = ((JArray)result).ToObject(); var trayClickEventArgs = ((JObject)args[0]).ToObject(); @@ -31,7 +31,7 @@ public event Action OnClick _click(trayClickEventArgs, bounds); }); - BridgeConnector.Socket.Emit("register-tray-click", GetHashCode()); + BridgeConnector.Emit("register-tray-click", GetHashCode()); } _click += value; } @@ -40,7 +40,7 @@ public event Action OnClick _click -= value; if (_click == null) - BridgeConnector.Socket.Off("tray-click-event" + GetHashCode()); + BridgeConnector.Off("tray-click-event" + GetHashCode()); } } @@ -55,7 +55,7 @@ public event Action OnRightClick { if (_rightClick == null) { - BridgeConnector.Socket.On("tray-right-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-right-click-event" + GetHashCode(), (result) => { var args = ((JArray)result).ToObject(); var trayClickEventArgs = ((JObject)args[0]).ToObject(); @@ -63,7 +63,7 @@ public event Action OnRightClick _rightClick(trayClickEventArgs, bounds); }); - BridgeConnector.Socket.Emit("register-tray-right-click", GetHashCode()); + BridgeConnector.Emit("register-tray-right-click", GetHashCode()); } _rightClick += value; } @@ -72,7 +72,7 @@ public event Action OnRightClick _rightClick -= value; if (_rightClick == null) - BridgeConnector.Socket.Off("tray-right-click-event" + GetHashCode()); + BridgeConnector.Off("tray-right-click-event" + GetHashCode()); } } @@ -87,7 +87,7 @@ public event Action OnDoubleClick { if (_doubleClick == null) { - BridgeConnector.Socket.On("tray-double-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-double-click-event" + GetHashCode(), (result) => { var args = ((JArray)result).ToObject(); var trayClickEventArgs = ((JObject)args[0]).ToObject(); @@ -95,7 +95,7 @@ public event Action OnDoubleClick _doubleClick(trayClickEventArgs, bounds); }); - BridgeConnector.Socket.Emit("register-tray-double-click", GetHashCode()); + BridgeConnector.Emit("register-tray-double-click", GetHashCode()); } _doubleClick += value; } @@ -104,7 +104,7 @@ public event Action OnDoubleClick _doubleClick -= value; if (_doubleClick == null) - BridgeConnector.Socket.Off("tray-double-click-event" + GetHashCode()); + BridgeConnector.Off("tray-double-click-event" + GetHashCode()); } } @@ -119,12 +119,12 @@ public event Action OnBalloonShow { if (_balloonShow == null) { - BridgeConnector.Socket.On("tray-balloon-show-event" + GetHashCode(), () => + BridgeConnector.On("tray-balloon-show-event" + GetHashCode(), () => { _balloonShow(); }); - BridgeConnector.Socket.Emit("register-tray-balloon-show", GetHashCode()); + BridgeConnector.Emit("register-tray-balloon-show", GetHashCode()); } _balloonShow += value; } @@ -133,7 +133,7 @@ public event Action OnBalloonShow _balloonShow -= value; if (_balloonShow == null) - BridgeConnector.Socket.Off("tray-balloon-show-event" + GetHashCode()); + BridgeConnector.Off("tray-balloon-show-event" + GetHashCode()); } } @@ -148,12 +148,12 @@ public event Action OnBalloonClick { if (_balloonClick == null) { - BridgeConnector.Socket.On("tray-balloon-click-event" + GetHashCode(), () => + BridgeConnector.On("tray-balloon-click-event" + GetHashCode(), () => { _balloonClick(); }); - BridgeConnector.Socket.Emit("register-tray-balloon-click", GetHashCode()); + BridgeConnector.Emit("register-tray-balloon-click", GetHashCode()); } _balloonClick += value; } @@ -162,7 +162,7 @@ public event Action OnBalloonClick _balloonClick -= value; if (_balloonClick == null) - BridgeConnector.Socket.Off("tray-balloon-click-event" + GetHashCode()); + BridgeConnector.Off("tray-balloon-click-event" + GetHashCode()); } } @@ -178,12 +178,12 @@ public event Action OnBalloonClosed { if (_balloonClosed == null) { - BridgeConnector.Socket.On("tray-balloon-closed-event" + GetHashCode(), () => + BridgeConnector.On("tray-balloon-closed-event" + GetHashCode(), () => { _balloonClosed(); }); - BridgeConnector.Socket.Emit("register-tray-balloon-closed", GetHashCode()); + BridgeConnector.Emit("register-tray-balloon-closed", GetHashCode()); } _balloonClosed += value; } @@ -192,7 +192,7 @@ public event Action OnBalloonClosed _balloonClosed -= value; if (_balloonClosed == null) - BridgeConnector.Socket.Off("tray-balloon-closed-event" + GetHashCode()); + BridgeConnector.Off("tray-balloon-closed-event" + GetHashCode()); } } @@ -251,12 +251,12 @@ public void Show(string image, MenuItem menuItem) public void Show(string image, MenuItem[] menuItems) { menuItems.AddMenuItemsId(); - BridgeConnector.Socket.Emit("create-tray", image, JArray.FromObject(menuItems, _jsonSerializer)); + BridgeConnector.Emit("create-tray", image, JArray.FromObject(menuItems, _jsonSerializer)); _items.Clear(); _items.AddRange(menuItems); - BridgeConnector.Socket.Off("trayMenuItemClicked"); - BridgeConnector.Socket.On("trayMenuItemClicked", (id) => + BridgeConnector.Off("trayMenuItemClicked"); + BridgeConnector.On("trayMenuItemClicked", (id) => { MenuItem menuItem = _items.GetMenuItem(id.ToString()); menuItem?.Click(); @@ -269,7 +269,7 @@ public void Show(string image, MenuItem[] menuItems) /// The image. public void Show(string image) { - BridgeConnector.Socket.Emit("create-tray", image); + BridgeConnector.Emit("create-tray", image); } /// @@ -277,7 +277,7 @@ public void Show(string image) /// public void Destroy() { - BridgeConnector.Socket.Emit("tray-destroy"); + BridgeConnector.Emit("tray-destroy"); _items.Clear(); } @@ -287,7 +287,7 @@ public void Destroy() /// public void SetImage(string image) { - BridgeConnector.Socket.Emit("tray-setImage", image); + BridgeConnector.Emit("tray-setImage", image); } /// @@ -296,7 +296,7 @@ public void SetImage(string image) /// public void SetPressedImage(string image) { - BridgeConnector.Socket.Emit("tray-setPressedImage", image); + BridgeConnector.Emit("tray-setPressedImage", image); } /// @@ -305,7 +305,7 @@ public void SetPressedImage(string image) /// public void SetToolTip(string toolTip) { - BridgeConnector.Socket.Emit("tray-setToolTip", toolTip); + BridgeConnector.Emit("tray-setToolTip", toolTip); } /// @@ -314,7 +314,7 @@ public void SetToolTip(string toolTip) /// public void SetTitle(string title) { - BridgeConnector.Socket.Emit("tray-setTitle", title); + BridgeConnector.Emit("tray-setTitle", title); } /// @@ -323,7 +323,7 @@ public void SetTitle(string title) /// public void DisplayBalloon(DisplayBalloonOptions options) { - BridgeConnector.Socket.Emit("tray-displayBalloon", JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("tray-displayBalloon", JObject.FromObject(options, _jsonSerializer)); } /// @@ -334,14 +334,14 @@ public Task IsDestroyedAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("tray-isDestroyedCompleted", (isDestroyed) => + BridgeConnector.On("tray-isDestroyedCompleted", (isDestroyed) => { - BridgeConnector.Socket.Off("tray-isDestroyedCompleted"); + BridgeConnector.Off("tray-isDestroyedCompleted"); taskCompletionSource.SetResult((bool)isDestroyed); }); - BridgeConnector.Socket.Emit("tray-isDestroyed"); + BridgeConnector.Emit("tray-isDestroyed"); return taskCompletionSource.Task; } diff --git a/ElectronNET.API/WebContents.cs b/ElectronNET.API/WebContents.cs index 66800d5f..943fe8db 100644 --- a/ElectronNET.API/WebContents.cs +++ b/ElectronNET.API/WebContents.cs @@ -34,12 +34,12 @@ public event Action OnCrashed { if (_crashed == null) { - BridgeConnector.Socket.On("webContents-crashed" + Id, (killed) => + BridgeConnector.On("webContents-crashed" + Id, (killed) => { _crashed((bool)killed); }); - BridgeConnector.Socket.Emit("register-webContents-crashed", Id); + BridgeConnector.Emit("register-webContents-crashed", Id); } _crashed += value; } @@ -48,7 +48,7 @@ public event Action OnCrashed _crashed -= value; if (_crashed == null) - BridgeConnector.Socket.Off("webContents-crashed" + Id); + BridgeConnector.Off("webContents-crashed" + Id); } } @@ -64,12 +64,12 @@ public event Action OnDidFinishLoad { if (_didFinishLoad == null) { - BridgeConnector.Socket.On("webContents-didFinishLoad" + Id, () => + BridgeConnector.On("webContents-didFinishLoad" + Id, () => { _didFinishLoad(); }); - BridgeConnector.Socket.Emit("register-webContents-didFinishLoad", Id); + BridgeConnector.Emit("register-webContents-didFinishLoad", Id); } _didFinishLoad += value; } @@ -78,7 +78,7 @@ public event Action OnDidFinishLoad _didFinishLoad -= value; if (_didFinishLoad == null) - BridgeConnector.Socket.Off("webContents-didFinishLoad" + Id); + BridgeConnector.Off("webContents-didFinishLoad" + Id); } } @@ -95,7 +95,7 @@ internal WebContents(int id) /// public void OpenDevTools() { - BridgeConnector.Socket.Emit("webContentsOpenDevTools", Id); + BridgeConnector.Emit("webContentsOpenDevTools", Id); } /// @@ -104,7 +104,7 @@ public void OpenDevTools() /// public void OpenDevTools(OpenDevToolsOptions openDevToolsOptions) { - BridgeConnector.Socket.Emit("webContentsOpenDevTools", Id, JObject.FromObject(openDevToolsOptions, _jsonSerializer)); + BridgeConnector.Emit("webContentsOpenDevTools", Id, JObject.FromObject(openDevToolsOptions, _jsonSerializer)); } /// @@ -115,14 +115,14 @@ public Task GetPrintersAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-getPrinters-completed", (printers) => + BridgeConnector.On("webContents-getPrinters-completed", (printers) => { - BridgeConnector.Socket.Off("webContents-getPrinters-completed"); + BridgeConnector.Off("webContents-getPrinters-completed"); taskCompletionSource.SetResult(((Newtonsoft.Json.Linq.JArray)printers).ToObject()); }); - BridgeConnector.Socket.Emit("webContents-getPrinters", Id); + BridgeConnector.Emit("webContents-getPrinters", Id); return taskCompletionSource.Task; } @@ -136,19 +136,19 @@ public Task PrintAsync(PrintOptions options = null) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-print-completed", (success) => + BridgeConnector.On("webContents-print-completed", (success) => { - BridgeConnector.Socket.Off("webContents-print-completed"); + BridgeConnector.Off("webContents-print-completed"); taskCompletionSource.SetResult((bool)success); }); if(options == null) { - BridgeConnector.Socket.Emit("webContents-print", Id, ""); + BridgeConnector.Emit("webContents-print", Id, ""); } else { - BridgeConnector.Socket.Emit("webContents-print", Id, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("webContents-print", Id, JObject.FromObject(options, _jsonSerializer)); } return taskCompletionSource.Task; @@ -167,19 +167,19 @@ public Task PrintToPDFAsync(string path, PrintToPDFOptions options = null) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-printToPDF-completed", (success) => + BridgeConnector.On("webContents-printToPDF-completed", (success) => { - BridgeConnector.Socket.Off("webContents-printToPDF-completed"); + BridgeConnector.Off("webContents-printToPDF-completed"); taskCompletionSource.SetResult((bool)success); }); if(options == null) { - BridgeConnector.Socket.Emit("webContents-printToPDF", Id, "", path); + BridgeConnector.Emit("webContents-printToPDF", Id, "", path); } else { - BridgeConnector.Socket.Emit("webContents-printToPDF", Id, JObject.FromObject(options, _jsonSerializer), path); + BridgeConnector.Emit("webContents-printToPDF", Id, JObject.FromObject(options, _jsonSerializer), path); } return taskCompletionSource.Task; @@ -195,13 +195,13 @@ public Task GetUrl() var taskCompletionSource = new TaskCompletionSource(); var eventString = "webContents-getUrl" + Id; - BridgeConnector.Socket.On(eventString, (url) => + BridgeConnector.On(eventString, (url) => { - BridgeConnector.Socket.Off(eventString); + BridgeConnector.Off(eventString); taskCompletionSource.SetResult((string)url); }); - BridgeConnector.Socket.Emit("webContents-getUrl", Id); + BridgeConnector.Emit("webContents-getUrl", Id); return taskCompletionSource.Task; } @@ -240,20 +240,20 @@ public Task LoadURLAsync(string url, LoadURLOptions options) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("webContents-loadURL-complete" + Id, () => + BridgeConnector.On("webContents-loadURL-complete" + Id, () => { - BridgeConnector.Socket.Off("webContents-loadURL-complete" + Id); - BridgeConnector.Socket.Off("webContents-loadURL-error" + Id); + BridgeConnector.Off("webContents-loadURL-complete" + Id); + BridgeConnector.Off("webContents-loadURL-error" + Id); taskCompletionSource.SetResult(null); }); - BridgeConnector.Socket.On("webContents-loadURL-error" + Id, (error) => + BridgeConnector.On("webContents-loadURL-error" + Id, (error) => { - BridgeConnector.Socket.Off("webContents-loadURL-error" + Id); + BridgeConnector.Off("webContents-loadURL-error" + Id); taskCompletionSource.SetException(new InvalidOperationException(error.ToString())); }); - BridgeConnector.Socket.Emit("webContents-loadURL", Id, url, JObject.FromObject(options, _jsonSerializer)); + BridgeConnector.Emit("webContents-loadURL", Id, url, JObject.FromObject(options, _jsonSerializer)); return taskCompletionSource.Task; } @@ -267,7 +267,7 @@ public Task LoadURLAsync(string url, LoadURLOptions options) /// Absolute path to the CSS file location public void InsertCSS(bool isBrowserWindow, string path) { - BridgeConnector.Socket.Emit("webContents-insertCSS", Id, isBrowserWindow, path); + BridgeConnector.Emit("webContents-insertCSS", Id, isBrowserWindow, path); } private JsonSerializer _jsonSerializer = new JsonSerializer() diff --git a/ElectronNET.API/WindowManager.cs b/ElectronNET.API/WindowManager.cs index 4ac85dab..b1564971 100644 --- a/ElectronNET.API/WindowManager.cs +++ b/ElectronNET.API/WindowManager.cs @@ -50,7 +50,7 @@ public bool IsQuitOnWindowAllClosed get { return _isQuitOnWindowAllClosed; } set { - BridgeConnector.Socket.Emit("quit-app-window-all-closed-event", value); + BridgeConnector.Emit("quit-app-window-all-closed-event", value); _isQuitOnWindowAllClosed = value; } } @@ -94,22 +94,19 @@ public Task CreateWindowAsync(BrowserWindowOptions options, strin { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("BrowserWindowCreated", (id) => + BridgeConnector.On("BrowserWindowCreated", (id) => { - BridgeConnector.Socket.Off("BrowserWindowCreated"); + BridgeConnector.Off("BrowserWindowCreated"); - string windowId = id.ToString(); - BrowserWindow browserWindow = new BrowserWindow(int.Parse(windowId)); + BrowserWindow browserWindow = new BrowserWindow(id); _browserWindows.Add(browserWindow); taskCompletionSource.SetResult(browserWindow); }); - BridgeConnector.Socket.Off("BrowserWindowClosed"); - BridgeConnector.Socket.On("BrowserWindowClosed", (ids) => + BridgeConnector.Off("BrowserWindowClosed"); + BridgeConnector.On("BrowserWindowClosed", (browserWindowIds) => { - var browserWindowIds = ((JArray)ids).ToObject(); - for (int index = 0; index < _browserWindows.Count; index++) { if (!browserWindowIds.Contains(_browserWindows[index].Id)) @@ -137,7 +134,7 @@ public Task CreateWindowAsync(BrowserWindowOptions options, strin options.X = 0; options.Y = 0; - BridgeConnector.Socket.Emit("createBrowserWindow", JObject.FromObject(options, _jsonSerializer), loadUrl); + BridgeConnector.Emit("createBrowserWindow", JObject.FromObject(options, _jsonSerializer), loadUrl); } else { @@ -153,7 +150,7 @@ public Task CreateWindowAsync(BrowserWindowOptions options, strin ContractResolver = new CamelCasePropertyNamesContractResolver(), NullValueHandling = NullValueHandling.Ignore }; - BridgeConnector.Socket.Emit("createBrowserWindow", JObject.FromObject(options, ownjsonSerializer), loadUrl); + BridgeConnector.Emit("createBrowserWindow", JObject.FromObject(options, ownjsonSerializer), loadUrl); } return taskCompletionSource.Task; @@ -186,12 +183,11 @@ public Task CreateBrowserViewAsync(BrowserViewConstructorOptions op { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.Socket.On("BrowserViewCreated", (id) => + BridgeConnector.On("BrowserViewCreated", (id) => { - BridgeConnector.Socket.Off("BrowserViewCreated"); + BridgeConnector.Off("BrowserViewCreated"); - string browserViewId = id.ToString(); - BrowserView browserView = new BrowserView(int.Parse(browserViewId)); + BrowserView browserView = new BrowserView(id); _browserViews.Add(browserView); @@ -203,7 +199,7 @@ public Task CreateBrowserViewAsync(BrowserViewConstructorOptions op ContractResolver = new CamelCasePropertyNamesContractResolver(), NullValueHandling = NullValueHandling.Ignore }; - BridgeConnector.Socket.Emit("createBrowserView", JObject.FromObject(options, ownjsonSerializer)); + BridgeConnector.Emit("createBrowserView", JObject.FromObject(options, ownjsonSerializer)); return taskCompletionSource.Task; } diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj index 7c33bf34..1569a433 100644 --- a/ElectronNET.CLI/ElectronNET.CLI.csproj +++ b/ElectronNET.CLI/ElectronNET.CLI.csproj @@ -81,6 +81,7 @@ all runtime; build; native; contentfiles; analyzers + diff --git a/ElectronNET.Host/api/app.js b/ElectronNET.Host/api/app.js index 783b204a..d7e504de 100644 --- a/ElectronNET.Host/api/app.js +++ b/ElectronNET.Host/api/app.js @@ -151,7 +151,7 @@ module.exports = (socket, app) => { const success = app.requestSingleInstanceLock(); electronSocket.emit('appRequestSingleInstanceLockCompleted', success); app.on('second-instance', (event, args = [], workingDirectory = '') => { - electronSocket.emit('secondInstance', [args, workingDirectory]); + electronSocket.emit('secondInstance', new { args: args, workingDirectory: workingDirectory }]); }); }); socket.on('appHasSingleInstanceLock', () => { diff --git a/ElectronNET.Host/api/dialog.js b/ElectronNET.Host/api/dialog.js index 20f9572f..33c287db 100644 --- a/ElectronNET.Host/api/dialog.js +++ b/ElectronNET.Host/api/dialog.js @@ -7,12 +7,12 @@ module.exports = (socket) => { if ('id' in browserWindow) { const window = electron_1.BrowserWindow.fromId(browserWindow.id); const messageBoxReturnValue = await electron_1.dialog.showMessageBox(window, options); - electronSocket.emit('showMessageBoxComplete' + guid, [messageBoxReturnValue.response, messageBoxReturnValue.checkboxChecked]); + electronSocket.emit('showMessageBoxComplete' + guid, new { response: messageBoxReturnValue.response, checked: messageBoxReturnValue.checkboxChecked }); } else { const id = guid || options; const messageBoxReturnValue = await electron_1.dialog.showMessageBox(browserWindow); - electronSocket.emit('showMessageBoxComplete' + id, [messageBoxReturnValue.response, messageBoxReturnValue.checkboxChecked]); + electronSocket.emit('showMessageBoxComplete' + id, new { response: messageBoxReturnValue.response, checked: messageBoxReturnValue.checkboxChecked }); } }); socket.on('showOpenDialog', async (browserWindow, options, guid) => { diff --git a/ElectronNET.Host/api/menu.js b/ElectronNET.Host/api/menu.js index 2500036f..0125df34 100644 --- a/ElectronNET.Host/api/menu.js +++ b/ElectronNET.Host/api/menu.js @@ -7,7 +7,7 @@ module.exports = (socket) => { socket.on('menu-setContextMenu', (browserWindowId, menuItems) => { const menu = electron_1.Menu.buildFromTemplate(menuItems); addContextMenuItemClickConnector(menu.items, browserWindowId, (id, windowId) => { - electronSocket.emit('contextMenuItemClicked', [id, windowId]); + electronSocket.emit('contextMenuItemClicked', new { id: id, windowId: windowId }); }); const index = contextMenuItems.findIndex(contextMenu => contextMenu.browserWindowId === browserWindowId); const contextMenuItem = { diff --git a/ElectronNET.Host/api/webContents.js b/ElectronNET.Host/api/webContents.js index 71829a81..932c4c35 100644 --- a/ElectronNET.Host/api/webContents.js +++ b/ElectronNET.Host/api/webContents.js @@ -141,7 +141,7 @@ module.exports = (socket) => { const browserWindow = getWindowById(id); browserWindow.webContents.session.cookies.removeAllListeners('changed'); browserWindow.webContents.session.cookies.on('changed', (event, cookie, cause, removed) => { - electronSocket.emit('webContents-session-cookies-changed' + id, [cookie, cause, removed]); + electronSocket.emit('webContents-session-cookies-changed' + id, new { cookie: cookie, cause: cause, removed: removed }); }); }); socket.on('webContents-session-cookies-get', async (id, filter, guid) => { diff --git a/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/ElectronNET.WebApp/ElectronNET.WebApp.csproj index 4b7e2319..e9fe1c20 100644 --- a/ElectronNET.WebApp/ElectronNET.WebApp.csproj +++ b/ElectronNET.WebApp/ElectronNET.WebApp.csproj @@ -1,8 +1,6 @@  net5.0 - OutOfProcess - AspNetCoreModule win-x64 4.2 @@ -17,6 +15,7 @@ + diff --git a/ElectronNET.WebApp/Program.cs b/ElectronNET.WebApp/Program.cs index 6a32e60d..c79b2602 100644 --- a/ElectronNET.WebApp/Program.cs +++ b/ElectronNET.WebApp/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; +using System.Diagnostics; namespace ElectronNET.WebApp { @@ -9,6 +10,7 @@ public class Program { public static void Main(string[] args) { + Debugger.Launch(); CreateWebHostBuilder(args).Build().Run(); } diff --git a/ElectronNET.WebApp/electron.manifest.json b/ElectronNET.WebApp/electron.manifest.json index 3053f9a0..11001eab 100644 --- a/ElectronNET.WebApp/electron.manifest.json +++ b/ElectronNET.WebApp/electron.manifest.json @@ -1,6 +1,6 @@ { "executable": "ElectronNET.WebApp", - "splashscreen": { + "splashscreen2": { "imageFile": "/wwwroot/assets/img/about@2x.png" }, "environment": "Production", From 95d614796e23e2791a1e5c8dd8d8b80f2946eff7 Mon Sep 17 00:00:00 2001 From: theolivenbaum Date: Mon, 12 Jul 2021 21:27:40 +0200 Subject: [PATCH 2/2] works --- ElectronNET.API/App.cs | 2 +- .../Entities/CookieChangedCause.cs | 9 +++++ ElectronNET.API/Entities/Display.cs | 5 +++ .../Entities/TrayClickEventArgs.cs | 1 + .../Entities/TrayClickEventResponse.cs | 8 +++++ ElectronNET.API/Screen.cs | 35 +++++++++---------- ElectronNET.API/Shell.cs | 16 ++++----- ElectronNET.API/Tray.cs | 21 ++++------- ElectronNET.API/WebContents.cs | 14 ++++---- ElectronNET.Host/api/app.js | 2 +- ElectronNET.Host/api/screen.js | 2 +- ElectronNET.Host/api/tray.js | 6 ++-- ElectronNET.WebApp/Program.cs | 2 +- 13 files changed, 65 insertions(+), 58 deletions(-) create mode 100644 ElectronNET.API/Entities/TrayClickEventResponse.cs diff --git a/ElectronNET.API/App.cs b/ElectronNET.API/App.cs index a4ed8905..eabbbfcd 100644 --- a/ElectronNET.API/App.cs +++ b/ElectronNET.API/App.cs @@ -338,7 +338,7 @@ public event Action AccessibilitySupportChanged { if (_accessibilitySupportChanged == null) { - BridgeConnector.On("app-accessibility-support-changed" + GetHashCode(), (state) => + BridgeConnector.On("app-accessibility-support-changed" + GetHashCode(), (state) => { _accessibilitySupportChanged((bool)state); }); diff --git a/ElectronNET.API/Entities/CookieChangedCause.cs b/ElectronNET.API/Entities/CookieChangedCause.cs index d42430da..ee467a3c 100644 --- a/ElectronNET.API/Entities/CookieChangedCause.cs +++ b/ElectronNET.API/Entities/CookieChangedCause.cs @@ -2,6 +2,15 @@ using Newtonsoft.Json.Converters; namespace ElectronNET.API.Entities { + + public class CookieRemovedResponse + { + public Cookie cookie {get;set;} + + public CookieChangedCause cause { get; set; } + public bool removed { get; set; } + } + /// /// The cause of the change /// diff --git a/ElectronNET.API/Entities/Display.cs b/ElectronNET.API/Entities/Display.cs index cdf9ac87..4d44f32e 100644 --- a/ElectronNET.API/Entities/Display.cs +++ b/ElectronNET.API/Entities/Display.cs @@ -1,5 +1,10 @@ namespace ElectronNET.API.Entities { + public class DisplayChanged + { + public Display display { get; set; } + public string[] metrics { get; set; } + } /// /// /// diff --git a/ElectronNET.API/Entities/TrayClickEventArgs.cs b/ElectronNET.API/Entities/TrayClickEventArgs.cs index 516e192a..ca3a4449 100644 --- a/ElectronNET.API/Entities/TrayClickEventArgs.cs +++ b/ElectronNET.API/Entities/TrayClickEventArgs.cs @@ -1,5 +1,6 @@ namespace ElectronNET.API { + /// /// /// diff --git a/ElectronNET.API/Entities/TrayClickEventResponse.cs b/ElectronNET.API/Entities/TrayClickEventResponse.cs new file mode 100644 index 00000000..e0a51703 --- /dev/null +++ b/ElectronNET.API/Entities/TrayClickEventResponse.cs @@ -0,0 +1,8 @@ +namespace ElectronNET.API.Entities +{ + public class TrayClickEventResponse + { + public TrayClickEventArgs eventArgs { get; set; } + public Rectangle bounds { get; set; } + } +} \ No newline at end of file diff --git a/ElectronNET.API/Screen.cs b/ElectronNET.API/Screen.cs index 6c9382ff..dbcb8bac 100644 --- a/ElectronNET.API/Screen.cs +++ b/ElectronNET.API/Screen.cs @@ -50,9 +50,9 @@ public event Action OnDisplayRemoved { if (_onDisplayRemoved == null) { - BridgeConnector.On("screen-display-removed-event" + GetHashCode(), (display) => + BridgeConnector.On("screen-display-removed-event" + GetHashCode(), (display) => { - _onDisplayRemoved(((JObject)display).ToObject()); + _onDisplayRemoved(display); }); BridgeConnector.Emit("register-screen-display-removed", GetHashCode()); @@ -81,12 +81,9 @@ public event Action OnDisplayMetricsChanged { if (_onDisplayMetricsChanged == null) { - BridgeConnector.On("screen-display-metrics-changed-event" + GetHashCode(), (args) => + BridgeConnector.On("screen-display-metrics-changed-event" + GetHashCode(), (args) => { - var display = ((JArray)args).First.ToObject(); - var metrics = ((JArray)args).Last.ToObject(); - - _onDisplayMetricsChanged(display, metrics); + _onDisplayMetricsChanged(args.display, args.metrics); }); BridgeConnector.Emit("register-screen-display-metrics-changed", GetHashCode()); @@ -136,11 +133,11 @@ public Task GetCursorScreenPointAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getCursorScreenPointCompleted", (point) => + BridgeConnector.On("screen-getCursorScreenPointCompleted", (point) => { BridgeConnector.Off("screen-getCursorScreenPointCompleted"); - taskCompletionSource.SetResult(((JObject)point).ToObject()); + taskCompletionSource.SetResult(point); }); BridgeConnector.Emit("screen-getCursorScreenPoint"); @@ -156,11 +153,11 @@ public Task GetMenuBarHeightAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getMenuBarHeightCompleted", (height) => + BridgeConnector.On("screen-getMenuBarHeightCompleted", (height) => { BridgeConnector.Off("screen-getMenuBarHeightCompleted"); - taskCompletionSource.SetResult(int.Parse(height.ToString())); + taskCompletionSource.SetResult(height); }); BridgeConnector.Emit("screen-getMenuBarHeight"); @@ -176,11 +173,11 @@ public Task GetPrimaryDisplayAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getPrimaryDisplayCompleted", (display) => + BridgeConnector.On("screen-getPrimaryDisplayCompleted", (display) => { BridgeConnector.Off("screen-getPrimaryDisplayCompleted"); - taskCompletionSource.SetResult(((JObject)display).ToObject()); + taskCompletionSource.SetResult(display); }); BridgeConnector.Emit("screen-getPrimaryDisplay"); @@ -196,11 +193,11 @@ public Task GetAllDisplaysAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getAllDisplaysCompleted", (displays) => + BridgeConnector.On("screen-getAllDisplaysCompleted", (displays) => { BridgeConnector.Off("screen-getAllDisplaysCompleted"); - taskCompletionSource.SetResult(((JArray)displays).ToObject()); + taskCompletionSource.SetResult(displays); }); BridgeConnector.Emit("screen-getAllDisplays"); @@ -216,11 +213,11 @@ public Task GetDisplayNearestPointAsync(Point point) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getDisplayNearestPointCompleted", (display) => + BridgeConnector.On("screen-getDisplayNearestPointCompleted", (display) => { BridgeConnector.Off("screen-getDisplayNearestPointCompleted"); - taskCompletionSource.SetResult(((JObject)display).ToObject()); + taskCompletionSource.SetResult(display); }); BridgeConnector.Emit("screen-getDisplayNearestPoint", JObject.FromObject(point, _jsonSerializer)); @@ -237,11 +234,11 @@ public Task GetDisplayMatchingAsync(Rectangle rectangle) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("screen-getDisplayMatching", (display) => + BridgeConnector.On("screen-getDisplayMatching", (display) => { BridgeConnector.Off("screen-getDisplayMatching"); - taskCompletionSource.SetResult(((JObject)display).ToObject()); + taskCompletionSource.SetResult(display); }); BridgeConnector.Emit("screen-getDisplayMatching", JObject.FromObject(rectangle, _jsonSerializer)); diff --git a/ElectronNET.API/Shell.cs b/ElectronNET.API/Shell.cs index 432fad62..308e7f9f 100644 --- a/ElectronNET.API/Shell.cs +++ b/ElectronNET.API/Shell.cs @@ -63,7 +63,7 @@ public Task OpenPathAsync(string path) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("shell-openPathCompleted", (errorMessage) => + BridgeConnector.On("shell-openPathCompleted", (errorMessage) => { BridgeConnector.Off("shell-openPathCompleted"); @@ -97,7 +97,7 @@ public Task OpenExternalAsync(string url, OpenExternalOptions options) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("shell-openExternalCompleted", (error) => + BridgeConnector.On("shell-openExternalCompleted", (error) => { BridgeConnector.Off("shell-openExternalCompleted"); @@ -125,7 +125,7 @@ public Task TrashItemAsync(string fullPath) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("shell-trashItem-completed", (success) => + BridgeConnector.On("shell-trashItem-completed", (success) => { BridgeConnector.Off("shell-trashItem-completed"); @@ -156,7 +156,7 @@ public Task WriteShortcutLinkAsync(string shortcutPath, ShortcutLinkOperat { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("shell-writeShortcutLinkCompleted", (success) => + BridgeConnector.On("shell-writeShortcutLinkCompleted", (success) => { BridgeConnector.Off("shell-writeShortcutLinkCompleted"); @@ -178,14 +178,10 @@ public Task ReadShortcutLinkAsync(string shortcutPath) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("shell-readShortcutLinkCompleted", (shortcutDetails) => + BridgeConnector.On("shell-readShortcutLinkCompleted", (shortcutDetails) => { BridgeConnector.Off("shell-readShortcutLinkCompleted"); - - var shortcutObject = shortcutDetails as JObject; - var details = shortcutObject?.ToObject(); - - taskCompletionSource.SetResult(details); + taskCompletionSource.SetResult(shortcutDetails); }); BridgeConnector.Emit("shell-readShortcutLink", shortcutPath); diff --git a/ElectronNET.API/Tray.cs b/ElectronNET.API/Tray.cs index bf44cc94..ff484f7f 100644 --- a/ElectronNET.API/Tray.cs +++ b/ElectronNET.API/Tray.cs @@ -23,12 +23,9 @@ public event Action OnClick { if (_click == null) { - BridgeConnector.On("tray-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-click-event" + GetHashCode(), (result) => { - var args = ((JArray)result).ToObject(); - var trayClickEventArgs = ((JObject)args[0]).ToObject(); - var bounds = ((JObject)args[1]).ToObject(); - _click(trayClickEventArgs, bounds); + _click(result.eventArgs, result.bounds); }); BridgeConnector.Emit("register-tray-click", GetHashCode()); @@ -55,12 +52,9 @@ public event Action OnRightClick { if (_rightClick == null) { - BridgeConnector.On("tray-right-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-right-click-event" + GetHashCode(), (result) => { - var args = ((JArray)result).ToObject(); - var trayClickEventArgs = ((JObject)args[0]).ToObject(); - var bounds = ((JObject)args[1]).ToObject(); - _rightClick(trayClickEventArgs, bounds); + _rightClick(result.eventArgs, result.bounds); }); BridgeConnector.Emit("register-tray-right-click", GetHashCode()); @@ -87,12 +81,9 @@ public event Action OnDoubleClick { if (_doubleClick == null) { - BridgeConnector.On("tray-double-click-event" + GetHashCode(), (result) => + BridgeConnector.On("tray-double-click-event" + GetHashCode(), (result) => { - var args = ((JArray)result).ToObject(); - var trayClickEventArgs = ((JObject)args[0]).ToObject(); - var bounds = ((JObject)args[1]).ToObject(); - _doubleClick(trayClickEventArgs, bounds); + _doubleClick(result.eventArgs, result.bounds); }); BridgeConnector.Emit("register-tray-double-click", GetHashCode()); diff --git a/ElectronNET.API/WebContents.cs b/ElectronNET.API/WebContents.cs index 943fe8db..36b7f806 100644 --- a/ElectronNET.API/WebContents.cs +++ b/ElectronNET.API/WebContents.cs @@ -34,7 +34,7 @@ public event Action OnCrashed { if (_crashed == null) { - BridgeConnector.On("webContents-crashed" + Id, (killed) => + BridgeConnector.On("webContents-crashed" + Id, (killed) => { _crashed((bool)killed); }); @@ -115,11 +115,11 @@ public Task GetPrintersAsync() { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("webContents-getPrinters-completed", (printers) => + BridgeConnector.On("webContents-getPrinters-completed", (printers) => { BridgeConnector.Off("webContents-getPrinters-completed"); - taskCompletionSource.SetResult(((Newtonsoft.Json.Linq.JArray)printers).ToObject()); + taskCompletionSource.SetResult(printers); }); BridgeConnector.Emit("webContents-getPrinters", Id); @@ -136,7 +136,7 @@ public Task PrintAsync(PrintOptions options = null) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("webContents-print-completed", (success) => + BridgeConnector.On("webContents-print-completed", (success) => { BridgeConnector.Off("webContents-print-completed"); taskCompletionSource.SetResult((bool)success); @@ -167,7 +167,7 @@ public Task PrintToPDFAsync(string path, PrintToPDFOptions options = null) { var taskCompletionSource = new TaskCompletionSource(); - BridgeConnector.On("webContents-printToPDF-completed", (success) => + BridgeConnector.On("webContents-printToPDF-completed", (success) => { BridgeConnector.Off("webContents-printToPDF-completed"); taskCompletionSource.SetResult((bool)success); @@ -195,7 +195,7 @@ public Task GetUrl() var taskCompletionSource = new TaskCompletionSource(); var eventString = "webContents-getUrl" + Id; - BridgeConnector.On(eventString, (url) => + BridgeConnector.On(eventString, (url) => { BridgeConnector.Off(eventString); taskCompletionSource.SetResult((string)url); @@ -247,7 +247,7 @@ public Task LoadURLAsync(string url, LoadURLOptions options) taskCompletionSource.SetResult(null); }); - BridgeConnector.On("webContents-loadURL-error" + Id, (error) => + BridgeConnector.On("webContents-loadURL-error" + Id, (error) => { BridgeConnector.Off("webContents-loadURL-error" + Id); taskCompletionSource.SetException(new InvalidOperationException(error.ToString())); diff --git a/ElectronNET.Host/api/app.js b/ElectronNET.Host/api/app.js index d7e504de..bff26250 100644 --- a/ElectronNET.Host/api/app.js +++ b/ElectronNET.Host/api/app.js @@ -151,7 +151,7 @@ module.exports = (socket, app) => { const success = app.requestSingleInstanceLock(); electronSocket.emit('appRequestSingleInstanceLockCompleted', success); app.on('second-instance', (event, args = [], workingDirectory = '') => { - electronSocket.emit('secondInstance', new { args: args, workingDirectory: workingDirectory }]); + electronSocket.emit('secondInstance', new { args: args, workingDirectory: workingDirectory }); }); }); socket.on('appHasSingleInstanceLock', () => { diff --git a/ElectronNET.Host/api/screen.js b/ElectronNET.Host/api/screen.js index cfd025a3..52476950 100644 --- a/ElectronNET.Host/api/screen.js +++ b/ElectronNET.Host/api/screen.js @@ -15,7 +15,7 @@ module.exports = (socket) => { }); socket.on('register-screen-display-metrics-changed', (id) => { electron_1.screen.on('display-metrics-changed', (event, display, changedMetrics) => { - electronSocket.emit('screen-display-metrics-changed-event' + id, [display, changedMetrics]); + electronSocket.emit('screen-display-metrics-changed-event' + id, new {display: display, changedMetrics: changedMetrics}); }); }); socket.on('screen-getCursorScreenPoint', () => { diff --git a/ElectronNET.Host/api/tray.js b/ElectronNET.Host/api/tray.js index 98fb740c..a446a738 100644 --- a/ElectronNET.Host/api/tray.js +++ b/ElectronNET.Host/api/tray.js @@ -7,21 +7,21 @@ module.exports = (socket) => { socket.on('register-tray-click', (id) => { if (tray.value) { tray.value.on('click', (event, bounds) => { - electronSocket.emit('tray-click-event' + id, [event.__proto__, bounds]); + electronSocket.emit('tray-click-event' + id, new { eventArgs: event.__proto__, bounds: bounds }); }); } }); socket.on('register-tray-right-click', (id) => { if (tray.value) { tray.value.on('right-click', (event, bounds) => { - electronSocket.emit('tray-right-click-event' + id, [event.__proto__, bounds]); + electronSocket.emit('tray-right-click-event' + id, new { eventArgs: event.__proto__, bounds: bounds }); }); } }); socket.on('register-tray-double-click', (id) => { if (tray.value) { tray.value.on('double-click', (event, bounds) => { - electronSocket.emit('tray-double-click-event' + id, [event.__proto__, bounds]); + electronSocket.emit('tray-double-click-event' + id, new { eventArgs: event.__proto__, bounds: bounds }); }); } }); diff --git a/ElectronNET.WebApp/Program.cs b/ElectronNET.WebApp/Program.cs index c79b2602..54512d2c 100644 --- a/ElectronNET.WebApp/Program.cs +++ b/ElectronNET.WebApp/Program.cs @@ -10,7 +10,7 @@ public class Program { public static void Main(string[] args) { - Debugger.Launch(); + //Debugger.Launch(); CreateWebHostBuilder(args).Build().Run(); }