diff --git a/.gitignore b/.gitignore index 5be670d4..b5c56ad8 100644 --- a/.gitignore +++ b/.gitignore @@ -273,3 +273,5 @@ __pycache__/ /Server/Server.db-shm /Server/Server.db-wal /Server/wwwroot/Downloads/Remotely_Desktop +Server/wwwroot/Downloads/Win-x64/Remotely_Desktop.exe +Server/wwwroot/Downloads/Win-x86/Remotely_Desktop.exe diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj index efc3e6cc..53b5bee8 100644 --- a/Desktop.Linux/Desktop.Linux.csproj +++ b/Desktop.Linux/Desktop.Linux.csproj @@ -6,8 +6,6 @@ Remotely_Desktop Remotely.Desktop.Linux AnyCPU;x64;x86 - true - linux-x64 diff --git a/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml new file mode 100644 index 00000000..d1c51966 --- /dev/null +++ b/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml @@ -0,0 +1,17 @@ + + + + + FileSystem + Release + Any CPU + netcoreapp3.1 + ..\Server\wwwroot\Downloads + linux-x64 + false + True + False + + \ No newline at end of file diff --git a/Desktop.Win/App.config b/Desktop.Win/App.config deleted file mode 100644 index 83b577e1..00000000 --- a/Desktop.Win/App.config +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Desktop.Win/AssemblyInfo.cs b/Desktop.Win/AssemblyInfo.cs new file mode 100644 index 00000000..8b5504ec --- /dev/null +++ b/Desktop.Win/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Desktop.Win/Controls/HostNamePrompt.xaml b/Desktop.Win/Controls/HostNamePrompt.xaml index 8e2f3947..9e9f2de8 100644 --- a/Desktop.Win/Controls/HostNamePrompt.xaml +++ b/Desktop.Win/Controls/HostNamePrompt.xaml @@ -1,12 +1,13 @@  + Title="Remotely Host Name" Height="150" Width="350" WindowStartupLocation="CenterOwner" Icon="/Remotely_Icon.png"> diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 456555c8..f79af2f7 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -1,336 +1,26 @@ - - - - + + - Debug - AnyCPU - {486A238C-387B-49C5-A361-B86ACDB2572A} WinExe + netcoreapp3.1 + true Remotely.Desktop.Win Remotely_Desktop - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - false - - publish\ - true - Disk - false - Background - 7 - Days - false - false - false - https://lucency.co/Contact - https://lucency.co/Contact - Remotely Desktop - Translucency Software - Remotely - 0 - 1.0.0.0 - false - true - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - favicon.ico - - - TRACE;DEBUG - x64 - true - bin\x64\Debug\ - - - TRACE - x64 - true - true - bin\x64\Release\ - - - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - false - - - 0A723650D9A0A3D7D0E4A15299984A95177F9DBD - + - - ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll - - - ..\packages\MessagePack.1.8.80\lib\net47\MessagePack.dll - - - ..\packages\Microsoft.AspNetCore.Connections.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll - - - ..\packages\Microsoft.AspNetCore.Http.Connections.Client.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Client.dll - - - ..\packages\Microsoft.AspNetCore.Http.Connections.Common.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Common.dll - - - ..\packages\Microsoft.AspNetCore.Http.Features.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Client.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Client.Core.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.Core.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Common.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Common.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Protocols.Json.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Protocols.Json.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Extensions.Configuration.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Configuration.Binder.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.3.1.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Logging.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Options.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - - ..\packages\Microsoft.Extensions.Primitives.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - ..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll - - - ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll - True - True - - - ..\packages\System.Text.Encodings.Web.4.7.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.4.7.0\lib\net461\System.Text.Json.dll - - - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - 4.0 - - - - + + + - - MSBuild:Compile - Designer - - - HostNamePrompt.xaml - - - - - - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - + + + - - - {b04a1728-2e87-491e-bc7f-f575a1754def} - ScreenCast.Core - - - {2dcea1f5-9b64-4edb-9cd0-4d6675d96709} - ScreenCast.Win - - - {3b1b36ae-7a60-4974-a868-1e24894d4149} - Shared - - - - - False - Microsoft .NET Framework 4.8 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + \ No newline at end of file diff --git a/Desktop.Win/FodyWeavers.xml b/Desktop.Win/FodyWeavers.xml deleted file mode 100644 index a5dcf04f..00000000 --- a/Desktop.Win/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Desktop.Win/FodyWeavers.xsd b/Desktop.Win/FodyWeavers.xsd deleted file mode 100644 index 44a53744..00000000 --- a/Desktop.Win/FodyWeavers.xsd +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/Desktop.Win/MainWindow.xaml b/Desktop.Win/MainWindow.xaml index 7b362512..bc907007 100644 --- a/Desktop.Win/MainWindow.xaml +++ b/Desktop.Win/MainWindow.xaml @@ -1,12 +1,16 @@ - + Title="Remotely" Height="250" Width="350" + WindowStyle="None" + ResizeMode="NoResize" + MouseLeftButtonDown="Window_MouseLeftButtonDown" + Loaded="Window_Loaded" Icon="Remotely_Icon.png" > @@ -31,7 +35,7 @@ Remotely - + + +
+ + + + +
+ + + +
@* Users *@
- +
@@ -63,30 +87,6 @@ -
-
- - @* Device Groups *@ -
- - - - -
- -
- -
- - - - -
-
-
-
@* Invitations *@
@@ -94,7 +94,7 @@
-
User Name
+
diff --git a/Server/Pages/Agents.cshtml b/Server/Pages/Agents.cshtml index 2ad5bc35..1683dd94 100644 --- a/Server/Pages/Agents.cshtml +++ b/Server/Pages/Agents.cshtml @@ -10,21 +10,21 @@ Instant desktop sharing. No account required.
-
Windows (64/32-Bit)
+
Windows (64-Bit)

Download:
- Windows EXE + Windows EXE

- @*
+
Windows (32-Bit)

Download:
- Windows Installer + Windows EXE

-
*@ +
Linux 64-Bit

diff --git a/Server/Pages/_DataGrid.cshtml b/Server/Pages/_DataGrid.cshtml index a2383280..f9eb7d13 100644 --- a/Server/Pages/_DataGrid.cshtml +++ b/Server/Pages/_DataGrid.cshtml @@ -7,6 +7,7 @@

diff --git a/Server/Server.csproj b/Server/Server.csproj index f660d2a4..74211ff1 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -29,6 +29,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/Server/wwwroot/scripts/BrowserSockets.js b/Server/wwwroot/scripts/BrowserSockets.js index 8cd67bff..2eff0849 100644 --- a/Server/wwwroot/scripts/BrowserSockets.js +++ b/Server/wwwroot/scripts/BrowserSockets.js @@ -3,6 +3,7 @@ import * as DataGrid from "./DataGrid.js"; import { CreateCommandHarness, AddCommandResultsHarness, AddPSCoreResultsHarness, UpdateResultsCount } from "./ResultsParser.js"; import { Store } from "./Store.js"; import { Main } from "./Main.js"; +import { AddConsoleOutput, AddConsoleHTML } from "./Console.js"; export var Connection; export var ServiceID; export var Connected; @@ -17,7 +18,7 @@ export function Connect() { Connection.start().catch(err => { console.error(err.toString()); Connected = false; - UI.AddConsoleOutput("Your connection was lost. Refresh the page or enter a command to reconnect."); + AddConsoleOutput("Your connection was lost. Refresh the page or enter a command to reconnect."); }).then(() => { Connected = true; }); @@ -25,7 +26,7 @@ export function Connect() { Connected = false; if (!Store.IsDisconnectExpected) { UI.ShowModal("Connection Failure", "Your connection was lost. Click Reconnect to start a new session.", ``); - UI.AddConsoleOutput("Connection lost."); + AddConsoleOutput("Connection lost."); } }); } @@ -37,7 +38,7 @@ function applyMessageHandlers(hubConnection) { Main.UserSettings.CommandModeShortcuts.WinPS = options.CommandModeShortcutWinPS; Main.UserSettings.CommandModeShortcuts.Bash = options.CommandModeShortcutBash; Main.UserSettings.CommandModeShortcuts.CMD = options.CommandModeShortcutCMD; - UI.AddConsoleOutput("Console connected."); + AddConsoleOutput("Console connected."); DataGrid.RefreshGrid(); }); hubConnection.on("LockedOut", (args) => { @@ -65,14 +66,14 @@ function applyMessageHandlers(hubConnection) { }); hubConnection.on("DisplayMessage", (consoleMessage, popupMessage) => { if (consoleMessage) { - UI.AddConsoleOutput(consoleMessage); + AddConsoleOutput(consoleMessage); } if (popupMessage) { UI.PopupMessage(popupMessage); } }); hubConnection.on("DisplayConsoleHTML", (message) => { - UI.AddConsoleHTML(message); + AddConsoleHTML(message); }); hubConnection.on("TransferCompleted", (transferID) => { var completedWrapper = document.getElementById(transferID + "-completed"); @@ -128,7 +129,7 @@ function applyMessageHandlers(hubConnection) { xhr.send(); }); hubConnection.on("CommandContextCreated", (context) => { - UI.AddConsoleHTML(CreateCommandHarness(context).outerHTML); + AddConsoleHTML(CreateCommandHarness(context).outerHTML); }); hubConnection.on("ServiceID", (serviceID) => { ServiceID = serviceID; diff --git a/Server/wwwroot/scripts/BrowserSockets.js.map b/Server/wwwroot/scripts/BrowserSockets.js.map index 31c41e82..721a300c 100644 --- a/Server/wwwroot/scripts/BrowserSockets.js.map +++ b/Server/wwwroot/scripts/BrowserSockets.js.map @@ -1 +1 @@ -{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAK1C,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACjI,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGhE,MAAM,CAAC,IAAI,UAAe,CAAC;AAC3B,MAAM,CAAC,IAAI,SAAiB,CAAC;AAC7B,MAAM,CAAC,IAAI,SAAkB,CAAC;AAE9B,MAAM,UAAU,OAAO;IACnB,IAAI,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE;SAC1C,OAAO,CAAC,aAAa,CAAC;SACtB,eAAe,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;SACvE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;SAC9C,KAAK,EAAE,CAAC;IAEb,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEjC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,SAAS,GAAG,KAAK,CAAC;QAClB,gBAAgB,CAAC,8EAA8E,CAAC,CAAC;IACrG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACT,SAAS,GAAG,IAAI,CAAC;IACrB,CAAC,CAAC,CAAA;IACF,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACxC,SAAS,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;YAC7B,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAC7B,mEAAmE,EACnE,gGAAgG,CAAC,CAAC;YACtG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;SACxC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAAA,CAAC;AAEF,SAAS,oBAAoB,CAAC,aAAa;IACvC,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAoB,EAAE,EAAE;QACrD,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;QAClF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC;QAChF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,QAAQ,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAa,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,MAAc,EAAE,EAAE;QACrD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,MAA2B,EAAE,EAAE;QAC7D,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,MAA4B,EAAE,EAAE;QAC/D,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACjC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,cAAsB,EAAE,YAAoB,EAAE,EAAE;QAChF,IAAI,cAAc,EAAE;YAChB,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACpC;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACjC;IACL,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,OAAe,EAAE,EAAE;QACvD,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,UAAkB,EAAE,EAAE;QACzD,IAAI,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC;QAC1E,IAAI,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACjD,gBAAgB,CAAC,SAAS,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,CAAC,CAAC,CAAA;IACF,aAAa,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC5E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACtD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC3E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,6BAA6B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACvF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QACzE,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC1E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,OAAuB,EAAE,EAAE;QAClE,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,SAAiB,EAAE,EAAE;QAChD,SAAS,GAAG,SAAS,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,wBAAwB,EAAE,CAAC,cAAsB,EAAE,EAAE;QAClE,MAAM,CAAC,IAAI,CAAC,2BAA2B,cAAc,cAAc,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACP,CAAC"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/BrowserSockets.ts b/Server/wwwroot/scripts/BrowserSockets.ts index d3adcf1f..ec7e4123 100644 --- a/Server/wwwroot/scripts/BrowserSockets.ts +++ b/Server/wwwroot/scripts/BrowserSockets.ts @@ -7,8 +7,8 @@ import { CommandContext } from "./Models/CommandContext.js"; import { CreateCommandHarness, AddCommandResultsHarness, AddPSCoreResultsHarness, UpdateResultsCount } from "./ResultsParser.js"; import { Store } from "./Store.js"; import { UserOptions } from "./Models/UserOptions.js"; -import { UserSettings } from "./UserSettings.js"; import { Main } from "./Main.js"; +import { AddConsoleOutput, AddConsoleHTML } from "./Console.js"; export var Connection: any; @@ -28,7 +28,7 @@ export function Connect() { Connection.start().catch(err => { console.error(err.toString()); Connected = false; - UI.AddConsoleOutput("Your connection was lost. Refresh the page or enter a command to reconnect."); + AddConsoleOutput("Your connection was lost. Refresh the page or enter a command to reconnect."); }).then(() => { Connected = true; }) @@ -38,7 +38,7 @@ export function Connect() { UI.ShowModal("Connection Failure", "Your connection was lost. Click Reconnect to start a new session.", ``); - UI.AddConsoleOutput("Connection lost."); + AddConsoleOutput("Connection lost."); } }); }; @@ -50,7 +50,7 @@ function applyMessageHandlers(hubConnection) { Main.UserSettings.CommandModeShortcuts.WinPS = options.CommandModeShortcutWinPS; Main.UserSettings.CommandModeShortcuts.Bash = options.CommandModeShortcutBash; Main.UserSettings.CommandModeShortcuts.CMD = options.CommandModeShortcutCMD; - UI.AddConsoleOutput("Console connected."); + AddConsoleOutput("Console connected."); DataGrid.RefreshGrid(); }); hubConnection.on("LockedOut", (args) => { @@ -81,14 +81,14 @@ function applyMessageHandlers(hubConnection) { }); hubConnection.on("DisplayMessage", (consoleMessage: string, popupMessage: string) => { if (consoleMessage) { - UI.AddConsoleOutput(consoleMessage); + AddConsoleOutput(consoleMessage); } if (popupMessage) { UI.PopupMessage(popupMessage); } }); hubConnection.on("DisplayConsoleHTML", (message: string) => { - UI.AddConsoleHTML(message); + AddConsoleHTML(message); }); hubConnection.on("TransferCompleted", (transferID: string) => { @@ -145,7 +145,7 @@ function applyMessageHandlers(hubConnection) { xhr.send(); }); hubConnection.on("CommandContextCreated", (context: CommandContext) => { - UI.AddConsoleHTML(CreateCommandHarness(context).outerHTML); + AddConsoleHTML(CreateCommandHarness(context).outerHTML); }); hubConnection.on("ServiceID", (serviceID: string) => { ServiceID = serviceID; diff --git a/Server/wwwroot/scripts/CommandCompletion.js b/Server/wwwroot/scripts/CommandCompletion.js index 258566d3..dc1151bc 100644 --- a/Server/wwwroot/scripts/CommandCompletion.js +++ b/Server/wwwroot/scripts/CommandCompletion.js @@ -6,7 +6,6 @@ import { CMDCommands } from "./Commands/CMDCommands.js"; import { PSCoreCommands } from "./Commands/PSCoreCommands.js"; import { WinPSCommands } from "./Commands/WinPSCommands.js"; import { BashCommands } from "./Commands/BashCommands.js"; -var commandCompletionDisplayTimeout; export function DisplayCommandCompletions(commands, relevantText) { Store.CommandCompletionTimeout = window.setTimeout(() => { commands.forEach(x => { diff --git a/Server/wwwroot/scripts/CommandCompletion.js.map b/Server/wwwroot/scripts/CommandCompletion.js.map index 9a4327c8..f0aa14d9 100644 --- a/Server/wwwroot/scripts/CommandCompletion.js.map +++ b/Server/wwwroot/scripts/CommandCompletion.js.map @@ -1 +1 @@ -{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/CommandCompletion.ts b/Server/wwwroot/scripts/CommandCompletion.ts index 6b800073..edd9f7ab 100644 --- a/Server/wwwroot/scripts/CommandCompletion.ts +++ b/Server/wwwroot/scripts/CommandCompletion.ts @@ -10,8 +10,6 @@ import { PSCoreCommands } from "./Commands/PSCoreCommands.js"; import { WinPSCommands } from "./Commands/WinPSCommands.js"; import { BashCommands } from "./Commands/BashCommands.js"; -var commandCompletionDisplayTimeout; - export function DisplayCommandCompletions(commands: Array, relevantText: string) { Store.CommandCompletionTimeout = window.setTimeout(() => { commands.forEach(x => { diff --git a/Server/wwwroot/scripts/CommandProcessor.js b/Server/wwwroot/scripts/CommandProcessor.js index 3281d561..dd1cd4fa 100644 --- a/Server/wwwroot/scripts/CommandProcessor.js +++ b/Server/wwwroot/scripts/CommandProcessor.js @@ -6,8 +6,9 @@ import * as UI from "./UI.js"; import { Store } from "./Store.js"; import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions, GetCommandCompletions } from "./CommandCompletion.js"; import { Connection } from "./BrowserSockets.js"; +import { AutoSizeTextArea, AddConsoleOutput } from "./Console.js"; export function EvaluateCurrentCommandText() { - UI.AutoSizeTextArea(); + AutoSizeTextArea(); window.clearTimeout(Store.CommandCompletionTimeout); UI.CommandCompletionDiv.classList.add("hidden"); UI.CommandInfoDiv.classList.add("hidden"); @@ -98,7 +99,7 @@ export function ProcessCommand() { matchingCommand.Execute(parameters); } else { - UI.AddConsoleOutput("Unknown command."); + AddConsoleOutput("Unknown command."); } break; case "PSCore": @@ -109,15 +110,15 @@ export function ProcessCommand() { var windowsDevices = allDevices.filter(x => x.Platform.toLowerCase() == "windows"); var linuxDevices = allDevices.filter(x => x.Platform.toLowerCase() == "linux"); if (commandMode == "CMD" && linuxDevices.length > 0) { - UI.AddConsoleOutput("Linux devices will be excluded from CMD command."); + AddConsoleOutput("Linux devices will be excluded from CMD command."); allDevices = windowsDevices; } if (commandMode == "Bash" && windowsDevices.length > 0) { - UI.AddConsoleOutput("Windows devices will be excluded from Bash command."); + AddConsoleOutput("Windows devices will be excluded from Bash command."); allDevices = linuxDevices; } if (allDevices.length == 0) { - UI.AddConsoleOutput("At least one device must be selected to send commands."); + AddConsoleOutput("At least one device must be selected to send commands."); return; } var deviceIDs = allDevices.map(value => value.ID); diff --git a/Server/wwwroot/scripts/CommandProcessor.js.map b/Server/wwwroot/scripts/CommandProcessor.js.map index 27532504..22cb93a1 100644 --- a/Server/wwwroot/scripts/CommandProcessor.js.map +++ b/Server/wwwroot/scripts/CommandProcessor.js.map @@ -1 +1 @@ -{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/CommandProcessor.ts b/Server/wwwroot/scripts/CommandProcessor.ts index 46ac5997..12546bf1 100644 --- a/Server/wwwroot/scripts/CommandProcessor.ts +++ b/Server/wwwroot/scripts/CommandProcessor.ts @@ -6,9 +6,10 @@ import * as UI from "./UI.js"; import { Store } from "./Store.js"; import { DisplayCommandShortcuts, DisplayCommandCompletions, DisplayParameterCompletions, GetCommandCompletions } from "./CommandCompletion.js"; import { Connection } from "./BrowserSockets.js"; +import { AutoSizeTextArea, AddConsoleOutput } from "./Console.js"; export function EvaluateCurrentCommandText() { - UI.AutoSizeTextArea(); + AutoSizeTextArea(); window.clearTimeout(Store.CommandCompletionTimeout); UI.CommandCompletionDiv.classList.add("hidden"); @@ -106,7 +107,7 @@ export function ProcessCommand() { matchingCommand.Execute(parameters); } else { - UI.AddConsoleOutput("Unknown command."); + AddConsoleOutput("Unknown command."); } break; case "PSCore": @@ -118,16 +119,16 @@ export function ProcessCommand() { var linuxDevices = allDevices.filter(x => x.Platform.toLowerCase() == "linux"); if (commandMode == "CMD" && linuxDevices.length > 0) { - UI.AddConsoleOutput("Linux devices will be excluded from CMD command."); + AddConsoleOutput("Linux devices will be excluded from CMD command."); allDevices = windowsDevices; } if (commandMode == "Bash" && windowsDevices.length > 0) { - UI.AddConsoleOutput("Windows devices will be excluded from Bash command."); + AddConsoleOutput("Windows devices will be excluded from Bash command."); allDevices = linuxDevices; } if (allDevices.length == 0) { - UI.AddConsoleOutput("At least one device must be selected to send commands."); + AddConsoleOutput("At least one device must be selected to send commands."); return; } var deviceIDs = allDevices.map(value => value.ID); diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js b/Server/wwwroot/scripts/Commands/WebCommands.js index 705f02e6..c58b40e2 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js +++ b/Server/wwwroot/scripts/Commands/WebCommands.js @@ -4,7 +4,7 @@ import * as UI from "../UI.js"; import * as BrowserSockets from "../BrowserSockets.js"; import { Main } from "../Main.js"; import * as DataGrid from "../DataGrid.js"; -import { AddConsoleOutput } from "../UI.js"; +import { AddConsoleHTML, AddConsoleOutput, AddTransferHarness } from "../Console.js"; import { GetSelectedDevices } from "../DataGrid.js"; var commands = [ new ConsoleCommand("DeployScript", [ @@ -56,14 +56,14 @@ var commands = [ }); output += deviceList.join(""); output += "
Invited User
"; - UI.AddConsoleOutput(output); + AddConsoleOutput(output); }), new ConsoleCommand("Clear", [], "Clears the output window of text.", "clear", "", (parameters, paramDictionary) => { UI.ConsoleOutputDiv.innerHTML = ""; }), new ConsoleCommand("Connect", [], "Connect or reconnect to the server.", "connect", "", (parameters, paramDictionary) => { BrowserSockets.Connect(); }), new ConsoleCommand("Echo", [ new Parameter("message", "The text to display in the console.", "String") ], "Writes a message to the console window.", "echo -message This will appear in the console.", "", (parameters, paramDictionary) => { - UI.AddConsoleOutput(paramDictionary["message"]); + AddConsoleOutput(paramDictionary["message"]); }), new ConsoleCommand("ExpandResults", [], "Expands the results of the last scripting command.", "expandresults", "", (parameters, paramDictionary) => { $(UI.ConsoleOutputDiv).find(".command-harness").last().find(".collapse")['collapse']('show'); @@ -88,23 +88,23 @@ var commands = [ return command.Name.toLowerCase() == (suppliedCommand.Value || "").toLowerCase(); }); if (result.length == 0) { - UI.AddConsoleOutput("No matching commands found."); + AddConsoleOutput("No matching commands found."); } else if (result.length == 1) { - UI.AddConsoleHTML("
" + result[0].FullHelp); + AddConsoleHTML("
" + result[0].FullHelp); } else { var outputText = "Multiple commands found:

"; for (var i = 0; i < result.length; i++) { outputText += result[i].Name + "
"; } - UI.AddConsoleHTML(outputText); + AddConsoleHTML(outputText); } }), new ConsoleCommand("List", [], "Displays a list of the currently-selected devices.", "list", "", () => { var selectedDevices = Main.DataGrid.GetSelectedDevices(); if (selectedDevices.length == 0) { - UI.AddConsoleOutput("No devices are selected."); + AddConsoleOutput("No devices are selected."); return; } var output = `
Selected Devices:
@@ -131,12 +131,12 @@ var commands = [ }); output += deviceList.join(""); output += ""; - UI.AddConsoleOutput(output); + AddConsoleOutput(output); }), new ConsoleCommand("Remove", [], "Removes the selected devices from the database. (Note: This does not attempt to uninstall the client. Use Uninstall.)", "remove", "", (parameters) => { var devices = DataGrid.GetSelectedDevices(); if (devices.length == 0) { - UI.AddConsoleOutput("No devices are selected."); + AddConsoleOutput("No devices are selected."); } else { BrowserSockets.Connection.invoke("RemoveDevices", devices.map(x => x.ID)); @@ -164,6 +164,7 @@ var commands = [
  • IsOnline (true or false)
  • DeviceName (text)
    • +
  • Alias (text)
  • CurrentUser (text)
  • LastOnline (date or date+time
  • Is64Bit (true or false)
    • @@ -179,19 +180,19 @@ var commands = [ Main.DataGrid.DataSource.forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["none"] != "undefined") { Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => { x.classList.remove("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["online"] != "undefined") { Main.DataGrid.DataSource.filter(x => x.IsOnline).forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["filter"] != "undefined") { try { @@ -211,7 +212,7 @@ var commands = [ case "*": case "!=": case "!*": - UI.AddConsoleOutput("Only < and > operators can be used with dates."); + AddConsoleOutput("Only < and > operators can be used with dates."); return; case ">": lambda += `Date.parse(x[Object.keys(x).find(y=>y.toLowerCase().indexOf("${key}") > -1)]) > ${parsedDate} && `; @@ -226,16 +227,16 @@ var commands = [ else { switch (operator) { case "=": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase() === "${value}".toString().toLowerCase() && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase() === "${value}".toString().toLowerCase() && `; break; case "*": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase().search("${value}".toString().toLowerCase()) > -1 && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase().search("${value}".toString().toLowerCase()) > -1 && `; break; case "!=": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase() !== "${value}".toString().toLowerCase() && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase() !== "${value}".toString().toLowerCase() && `; break; case "!*": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase().search("${value}".toString().toLowerCase()) === -1 && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase().search("${value}".toString().toLowerCase()) === -1 && `; break; case ">": lambda += `parseFloat(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)]) > parseFloat("${value}") && `; @@ -250,7 +251,7 @@ var commands = [ }); } catch (ex) { - UI.AddConsoleOutput("Unable to parse filter. Please check your syntax."); + AddConsoleOutput("Unable to parse filter. Please check your syntax."); return; } lambda = lambda.slice(0, lambda.lastIndexOf(" &&")); @@ -259,25 +260,32 @@ var commands = [ x.classList.remove("row-selected"); }); } - var selectedDevices = Main.DataGrid.DataSource.filter(x => eval(lambda)); + var selectedDevices = Main.DataGrid.DataSource.filter(x => { + try { + return eval(lambda); + } + catch (_a) { + return false; + } + }); selectedDevices.forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } Main.DataGrid.UpdateDeviceCounts(); }), - new ConsoleCommand("RemoteControl", [], "Connect to a computer with Remotely Remote Control.", "list", "", () => { + new ConsoleCommand("RemoteControl", [], "Connect to a computer with Remotely Remote Control.", "remotecontrol", "", () => { var selectedDevices = Main.DataGrid.GetSelectedDevices(); if (selectedDevices.length == 0) { - UI.AddConsoleOutput("You must select a device first."); + AddConsoleOutput("You must select a device first."); return; } if (selectedDevices.length > 1) { - UI.AddConsoleOutput("You can only initiate remote control on one device at a time."); + AddConsoleOutput("You can only initiate remote control on one device at a time."); return; } - UI.AddConsoleOutput("Launching remote control on client device..."); + AddConsoleOutput("Launching remote control on client device..."); BrowserSockets.Connection.invoke("RemoteControl", selectedDevices[0].ID); }), new ConsoleCommand("Uninstall", [], "Uninstalls the Remotely client from the selected devices. Warning: This can't be undone from the web portal. You would need to redeploy the client.", "uninstall", "", (parameters, parameterDict) => { @@ -309,7 +317,7 @@ var commands = [ return; } var transferID = Main.Utilities.CreateGUID(); - UI.AddTransferHarness(transferID, selectedDevices.length); + AddTransferHarness(transferID, selectedDevices.length); var fileInput = document.createElement("input"); fileInput.type = "file"; fileInput.hidden = true; @@ -326,7 +334,7 @@ var commands = [ ]; function uploadFiles(fileList) { return new Promise((resolve, reject) => { - UI.AddConsoleOutput("File upload started..."); + AddConsoleOutput("File upload started..."); var strPath = "/API/FileSharing/"; var fd = new FormData(); for (var i = 0; i < fileList.length; i++) { @@ -336,20 +344,20 @@ function uploadFiles(fileList) { xhr.open('POST', strPath, true); xhr.addEventListener("load", function () { if (xhr.status === 200) { - UI.AddConsoleOutput("File upload completed."); + AddConsoleOutput("File upload completed."); resolve(JSON.parse(xhr.responseText)); } else { - UI.AddConsoleOutput("File upload failed."); + AddConsoleOutput("File upload failed."); reject(); } }); xhr.addEventListener("error", () => { - UI.AddConsoleOutput("File upload failed."); + AddConsoleOutput("File upload failed."); reject(); }); xhr.addEventListener("progress", function (e) { - UI.AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); + AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); }); xhr.send(fd); }); diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js.map b/Server/wwwroot/scripts/Commands/WebCommands.js.map index 89382b93..a1ed4660 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js.map +++ b/Server/wwwroot/scripts/Commands/WebCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAkB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,IAAI,QAAQ,GAA0B;IAElC,IAAI,cAAc,CACd,cAAc,EACd;QACI,IAAI,SAAS,CAAC,QAAQ,EAAE,2DAA2D,EAAE,QAAQ,CAAC;QAC9F,IAAI,SAAS,CAAC,OAAO,EAAE,8DAA8D,EAAE,QAAQ,CAAC;QAChG,IAAI,SAAS,CAAC,KAAK,EAAE,uDAAuD,EAAE,QAAQ,CAAC;QACvF,IAAI,SAAS,CAAC,MAAM,EAAE,gDAAgD,EAAE,QAAQ,CAAC;KACpF,EACD,iGAAiG,EACjG,sBAAsB,EACtB,EAAE,EACF,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE;QAC1B,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YACxB,gBAAgB,CAAC,iEAAiE,CAAC,CAAC;YACpF,OAAO;SACV;QACD,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;YAC7C,OAAO;SACV;QACD,IAAI,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChD,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;QACxB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACrC,SAAS,CAAC,QAAQ,GAAG,GAAG,EAAE;YACtB,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC/G,SAAS,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACP,CAAC,CAAA;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CACJ;IACD,IAAI,cAAc,CACd,YAAY,EACZ,EACC,EACD,qCAAqC,EACrC,YAAY,EACZ,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;QAC5B,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;YAC7C,OAAO;SACV;QAAA,CAAC;QACF,IAAI,MAAM,GAAG;;;;0CAIiB,CAAC;QAE/B,IAAI,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACrC,OAAO;8BACO,CAAC,CAAC,UAAU;;8BAEZ,CAAC,CAAC,YAAY;;8BAEd,CAAA;QAClB,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,IAAI,UAAU,CAAC;QACrB,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CACJ;IACD,IAAI,cAAc,CACd,OAAO,EACP,EACC,EACD,mCAAmC,EACnC,OAAO,EACP,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,CAC3E;IACD,IAAI,cAAc,CACd,SAAS,EACT,EACC,EACD,qCAAqC,EACrC,SAAS,EACT,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CACjE;IACD,IAAI,cAAc,CACd,MAAM,EACN;QACI,IAAI,SAAS,CAAC,SAAS,EAAE,qCAAqC,EAAE,QAAQ,CAAC;KAC5E,EACD,yCAAyC,EACzC,gDAAgD,EAChD,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;QAC5B,EAAE,CAAC,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;IACpD,CAAC,CACJ;IACD,IAAI,cAAc,CACd,eAAe,EACf,EAEC,EACD,oDAAoD,EACpD,eAAe,EACf,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;QAC5B,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IACjG,CAAC,CACJ;IACD,IAAI,cAAc,CACd,iBAAiB,EACjB,EAEC,EACD,kCAAkC,EAClC,iBAAiB,EACjB,EAAE,EACF,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;QAC5B,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC,CACJ;IACD,IAAI,cAAc,CACd,MAAM,EACN;QACI,IAAI,SAAS,CAAC,SAAS,EAAE,qCAAqC,EAAE,QAAQ,CAAC;KAC5E,EACD,4CAA4C,EAC5C,sBAAsB,EACtB,EAAE,EACF,CAAC,UAAU,EAAE,EAAE;QACX,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YACxB,IAAI,MAAM,GAAG,0CAA0C,CAAC;YACxD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACpB,MAAM,IAAI,QAAQ,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,OAAO,QAAQ,CAAC;YAC5D,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,QAAQ,CAAC;YACnB,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO;SACV;QACD,IAAI,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,IAAI,EAA0B,CAAC;QAC5G,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACnC,OAAO,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACrF,CAAC,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACpB,EAAE,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAC;SACtD;aACI,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACzB,EAAE,CAAC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SAClD;aACI;YACD,IAAI,UAAU,GAAG,mCAAmC,CAAC;YACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACpC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC;aACzC;YACD,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;SACjC;IACL,CAAC,CACJ;IACD,IAAI,cAAc,CACd,MAAM,EACN,EAAE,EACF,oDAAoD,EACpD,MAAM,EACN,EAAE,EACF,GAAG,EAAE;QACD,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAEzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,EAAE,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;YAChD,OAAO;SACV;QACD,IAAI,MAAM,GAAG;;;;0CAIiB,CAAC;QAE/B,IAAI,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACrC,OAAO;8BACO,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;iBACf,OAAO,CAAC,MAAM,EAAE,0CAA0C,CAAC;iBAC3D,OAAO,CAAC,OAAO,EAAE,mCAAmC,CAAC;8BACxD,CAAC,CAAC,UAAU;8BACZ,CAAC,CAAC,WAAW;8BACb,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,cAAc,EAAE;8BACvC,CAAC,CAAC,QAAQ;8BACV,CAAC,CAAC,aAAa;8BACf,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,GAAG,GAAG,CAAC;8BAC/B,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE;8BAC/B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC;8BAC9B,CAAC,CAAC,WAAW,CAAC,cAAc,EAAE;8BAC9B,CAAC,CAAC,IAAI;8BACN,CAAA;QAClB,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,IAAI,UAAU,CAAC;QACrB,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CACJ;IACD,IAAI,cAAc,CACd,QAAQ,EACR,EAEC,EACD,yHAAyH,EACzH,QAAQ,EACR,EAAE,EACF,CAAC,UAAU,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAC5C,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;YACrB,EAAE,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;SACnD;aACI;YACD,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAC3E;IACL,CAAC,CACJ;IACD,IAAI,cAAc,CACd,QAAQ,EACR;QACI,IAAI,SAAS,CAAC,KAAK,EAAE,6CAA6C,EAAE,QAAQ,CAAC;QAC7E,IAAI,SAAS,CAAC,MAAM,EAAE,4CAA4C,EAAE,QAAQ,CAAC;QAC7E,IAAI,SAAS,CAAC,QAAQ,EAAE,8DAA8D,EAAE,QAAQ,CAAC;QACjG,IAAI,SAAS,CAAC,QAAQ,EAAE,yGAAyG,EAAE,QAAQ,CAAC;QAC5I,IAAI,SAAS,CAAC,QAAQ,EAAE,2FAA2F,EAAE,QAAQ,CAAC;KACjI,EACD,6CAA6C,EAC7C,8DAA8D,EAC9D;;;;;;;;;;;;;;;;;;;;;;;;;;sBA0Bc,EACd,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;QAE5B,IAAI,OAAO,eAAe,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE;YAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACjC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAChE,CAAC,CAAC,CAAA;YACF,EAAE,CAAC,gBAAgB,CAAC,GAAG,kBAAkB,EAAE,CAAC,MAAM,oBAAoB,CAAC,CAAC;SAC3E;QACD,IAAI,OAAO,eAAe,CAAC,MAAM,CAAC,IAAI,WAAW,EAAE;YAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC7D,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,gBAAgB,CAAC,GAAG,kBAAkB,EAAE,CAAC,MAAM,oBAAoB,CAAC,CAAC;SAC3E;QACD,IAAI,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE;YACjD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACzD,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,gBAAgB,CAAC,GAAG,kBAAkB,EAAE,CAAC,MAAM,oBAAoB,CAAC,CAAC;SAC3E;QACD,IAAI,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE;YACjD,IAAI;gBACA,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,IAAI,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC7C,IAAI,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;gBAClD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACrB,IAAI,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBACpD,IAAI,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;oBACvF,IAAI,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBAC9D,IAAI,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBAC5E,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBAE1D,IAAI,GAAG,IAAI,YAAY,EAAE;wBACrB,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACnC,QAAQ,QAAQ,EAAE;4BACd,KAAK,GAAG,CAAC;4BACT,KAAK,GAAG,CAAC;4BACT,KAAK,IAAI,CAAC;4BACV,KAAK,IAAI;gCACL,EAAE,CAAC,gBAAgB,CAAC,gDAAgD,CAAC,CAAC;gCACtE,OAAO;4BACX,KAAK,GAAG;gCACJ,MAAM,IAAI,gEAAgE,GAAG,gBAAgB,UAAU,MAAM,CAAC;gCAC9G,MAAM;4BACV,KAAK,GAAG;gCACJ,MAAM,IAAI,gEAAgE,GAAG,gBAAgB,UAAU,MAAM,CAAC;gCAC9G,MAAM;4BACV;gCACI,MAAM,sCAAsC,CAAC;yBACpD;qBACJ;yBACI;wBACD,QAAQ,QAAQ,EAAE;4BACd,KAAK,GAAG;gCACJ,MAAM,IAAI,gEAAgE,GAAG,2CAA2C,KAAK,gCAAgC,CAAC;gCAC9J,MAAM;4BACV,KAAK,GAAG;gCACJ,MAAM,IAAI,gEAAgE,GAAG,8CAA8C,KAAK,sCAAsC,CAAC;gCACvK,MAAM;4BACV,KAAK,IAAI;gCACL,MAAM,IAAI,gEAAgE,GAAG,2CAA2C,KAAK,gCAAgC,CAAC;gCAC9J,MAAM;4BACV,KAAK,IAAI;gCACL,MAAM,IAAI,gEAAgE,GAAG,8CAA8C,KAAK,wCAAwC,CAAC;gCACzK,MAAM;4BACV,KAAK,GAAG;gCACJ,MAAM,IAAI,2EAA2E,GAAG,4BAA4B,KAAK,QAAQ,CAAC;gCAClI,MAAM;4BACV,KAAK,GAAG;gCACJ,MAAM,IAAI,2EAA2E,GAAG,4BAA4B,KAAK,QAAQ,CAAC;gCAClI,MAAM;4BACV;gCACI,MAAM,sCAAsC,CAAC;yBACpD;qBACJ;gBAEL,CAAC,CAAC,CAAA;aACL;YACD,OAAO,EAAE,EAAE;gBACP,EAAE,CAAC,gBAAgB,CAAC,oDAAoD,CAAC,CAAC;gBAC1E,OAAO;aACV;YACD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACpD,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE;gBACrC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;oBAC7D,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;aACN;YACD,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACzE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACxB,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,gBAAgB,CAAC,GAAG,kBAAkB,EAAE,CAAC,MAAM,oBAAoB,CAAC,CAAC;SAC3E;QAED,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACvC,CAAC,CACJ;IACD,IAAI,cAAc,CACd,eAAe,EACf,EAAE,EACF,qDAAqD,EACrD,MAAM,EACN,EAAE,EACF,GAAG,EAAE;QACD,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,EAAE,CAAC,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;YACvD,OAAO;SACV;QACD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,EAAE,CAAC,gBAAgB,CAAC,+DAA+D,CAAC,CAAC;YACrF,OAAO;SACV;QACD,EAAE,CAAC,gBAAgB,CAAC,8CAA8C,CAAC,CAAC;QACpE,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7E,CAAC,CACJ;IACD,IAAI,cAAc,CAAC,WAAW,EAC1B,EAAE,EACF,uJAAuJ,EACvJ,WAAW,EACX,EAAE,EACF,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE;QAC1B,IAAI,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACpD,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC,CACJ;IACD,IAAI,cAAc,CACd,SAAS,EACT;QACI,IAAI,SAAS,CAAC,MAAM,EAAE,+DAA+D,EAAE,QAAQ,CAAC;QAChG,IAAI,SAAS,CAAC,QAAQ,EAAE,uCAAuC,EAAE,QAAQ,CAAC;KAC7E,EACD,kFAAkF,EAClF,yDAAyD,EACzD,EAAE,EACF,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE;QAC1B,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;YAC7C,OAAO;SACV;QACD,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACxB,IAAI,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE;gBAC/C,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;gBACzD,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;aAC5E;YACD,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;YACzE,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;IACP,CAAC,CACJ;IACD,IAAI,cAAc,CACd,eAAe,EACf,EACC,EACD,2CAA2C,EAC3C,eAAe,EACf,EAAE,EACF,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE;QAC1B,IAAI,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;YAC7C,OAAO;SACV;QACD,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAC7C,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChD,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;QACxB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;QACxB,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACrC,SAAS,CAAC,QAAQ,GAAG,GAAG,EAAE;YACtB,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrG,SAAS,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACP,CAAC,CAAA;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CACJ;CACJ,CAAC;AAEF,SAAS,WAAW,CAAC,QAAkB;IACnC,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,EAAE,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;QAE9C,IAAI,OAAO,GAAG,mBAAmB,CAAC;QAClC,IAAI,EAAE,GAAG,IAAI,QAAQ,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,EAAE,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5C;QACD,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAChC,GAAG,CAAC,gBAAgB,CAAC,MAAM,EAAE;YACzB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;gBACpB,EAAE,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;aACzC;iBACI;gBACD,EAAE,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;gBAC3C,MAAM,EAAE,CAAC;aACZ;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAC/B,EAAE,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;YAC3C,MAAM,EAAE,CAAC;QACb,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC;YACxC,EAAE,CAAC,gBAAgB,CAAC,wBAAwB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACxH,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC,CAAC,CAAA;AAEN,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC"} \ No newline at end of file +{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Commands/WebCommands.ts b/Server/wwwroot/scripts/Commands/WebCommands.ts index 29b0b109..7a69f146 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.ts +++ b/Server/wwwroot/scripts/Commands/WebCommands.ts @@ -1,12 +1,11 @@ import { ConsoleCommand } from "../Models/ConsoleCommand.js" import { Parameter } from "../Models/Parameter.js"; -import { Device } from "../Models/Device.js"; import * as UI from "../UI.js"; import * as BrowserSockets from "../BrowserSockets.js"; import { CommandLineParameter } from "../Models/CommandLineParameter.js"; import { Main } from "../Main.js"; import * as DataGrid from "../DataGrid.js"; -import { AddConsoleHTML, AddConsoleOutput } from "../UI.js"; +import { AddConsoleHTML, AddConsoleOutput, AddTransferHarness } from "../Console.js"; import { GetSelectedDevices } from "../DataGrid.js"; @@ -75,7 +74,7 @@ var commands: Array = [ }); output += deviceList.join(""); output += ""; - UI.AddConsoleOutput(output); + AddConsoleOutput(output); } ), new ConsoleCommand( @@ -105,7 +104,7 @@ var commands: Array = [ "echo -message This will appear in the console.", "", (parameters, paramDictionary) => { - UI.AddConsoleOutput(paramDictionary["message"]); + AddConsoleOutput(paramDictionary["message"]); } ), new ConsoleCommand( @@ -155,17 +154,17 @@ var commands: Array = [ return command.Name.toLowerCase() == (suppliedCommand.Value || "").toLowerCase(); }); if (result.length == 0) { - UI.AddConsoleOutput("No matching commands found."); + AddConsoleOutput("No matching commands found."); } else if (result.length == 1) { - UI.AddConsoleHTML("
    " + result[0].FullHelp); + AddConsoleHTML("
    " + result[0].FullHelp); } else { var outputText = "Multiple commands found:

    "; for (var i = 0; i < result.length; i++) { outputText += result[i].Name + "
    "; } - UI.AddConsoleHTML(outputText); + AddConsoleHTML(outputText); } } ), @@ -179,7 +178,7 @@ var commands: Array = [ var selectedDevices = Main.DataGrid.GetSelectedDevices(); if (selectedDevices.length == 0) { - UI.AddConsoleOutput("No devices are selected."); + AddConsoleOutput("No devices are selected."); return; } var output = `
    Selected Devices:
    @@ -207,7 +206,7 @@ var commands: Array = [ }); output += deviceList.join(""); output += ""; - UI.AddConsoleOutput(output); + AddConsoleOutput(output); } ), new ConsoleCommand( @@ -221,7 +220,7 @@ var commands: Array = [ (parameters) => { var devices = DataGrid.GetSelectedDevices(); if (devices.length == 0) { - UI.AddConsoleOutput("No devices are selected."); + AddConsoleOutput("No devices are selected."); } else { BrowserSockets.Connection.invoke("RemoveDevices", devices.map(x=>x.ID)); @@ -255,6 +254,7 @@ var commands: Array = [
    • IsOnline (true or false)
    • DeviceName (text)
      • +
    • Alias (text)
    • CurrentUser (text)
    • LastOnline (date or date+time
    • Is64Bit (true or false)
      • @@ -272,19 +272,19 @@ var commands: Array = [ Main.DataGrid.DataSource.forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }) - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["none"] != "undefined") { Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => { x.classList.remove("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["online"] != "undefined") { Main.DataGrid.DataSource.filter(x => x.IsOnline).forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } if (typeof paramDictionary["filter"] != "undefined") { try { @@ -305,7 +305,7 @@ var commands: Array = [ case "*": case "!=": case "!*": - UI.AddConsoleOutput("Only < and > operators can be used with dates."); + AddConsoleOutput("Only < and > operators can be used with dates."); return; case ">": lambda += `Date.parse(x[Object.keys(x).find(y=>y.toLowerCase().indexOf("${key}") > -1)]) > ${parsedDate} && `; @@ -320,16 +320,16 @@ var commands: Array = [ else { switch (operator) { case "=": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase() === "${value}".toString().toLowerCase() && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase() === "${value}".toString().toLowerCase() && `; break; case "*": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase().search("${value}".toString().toLowerCase()) > -1 && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase().search("${value}".toString().toLowerCase()) > -1 && `; break; case "!=": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase() !== "${value}".toString().toLowerCase() && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase() !== "${value}".toString().toLowerCase() && `; break; case "!*": - lambda += `x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)].toString().toLowerCase().search("${value}".toString().toLowerCase()) === -1 && `; + lambda += `(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)] || "").toString().toLowerCase().search("${value}".toString().toLowerCase()) === -1 && `; break; case ">": lambda += `parseFloat(x[Object.keys(x).find(y=>y.toString().toLowerCase().indexOf("${key}") > -1)]) > parseFloat("${value}") && `; @@ -345,7 +345,7 @@ var commands: Array = [ }) } catch (ex) { - UI.AddConsoleOutput("Unable to parse filter. Please check your syntax."); + AddConsoleOutput("Unable to parse filter. Please check your syntax."); return; } lambda = lambda.slice(0, lambda.lastIndexOf(" &&")); @@ -354,11 +354,18 @@ var commands: Array = [ x.classList.remove("row-selected"); }); } - var selectedDevices = Main.DataGrid.DataSource.filter(x => eval(lambda)); + var selectedDevices = Main.DataGrid.DataSource.filter(x => { + try { + return eval(lambda); + } + catch { + return false; + } + }); selectedDevices.forEach(x => { document.getElementById(x.ID).classList.add("row-selected"); }); - UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); + AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`); } Main.DataGrid.UpdateDeviceCounts(); @@ -368,19 +375,19 @@ var commands: Array = [ "RemoteControl", [], "Connect to a computer with Remotely Remote Control.", - "list", + "remotecontrol", "", () => { var selectedDevices = Main.DataGrid.GetSelectedDevices(); if (selectedDevices.length == 0) { - UI.AddConsoleOutput("You must select a device first."); + AddConsoleOutput("You must select a device first."); return; } if (selectedDevices.length > 1) { - UI.AddConsoleOutput("You can only initiate remote control on one device at a time."); + AddConsoleOutput("You can only initiate remote control on one device at a time."); return; } - UI.AddConsoleOutput("Launching remote control on client device..."); + AddConsoleOutput("Launching remote control on client device..."); BrowserSockets.Connection.invoke("RemoteControl", selectedDevices[0].ID); } ), @@ -433,7 +440,7 @@ var commands: Array = [ return; } var transferID = Main.Utilities.CreateGUID(); - UI.AddTransferHarness(transferID, selectedDevices.length); + AddTransferHarness(transferID, selectedDevices.length); var fileInput = document.createElement("input"); fileInput.type = "file"; fileInput.hidden = true; @@ -452,7 +459,7 @@ var commands: Array = [ function uploadFiles(fileList: FileList): Promise { return new Promise((resolve, reject) => { - UI.AddConsoleOutput("File upload started..."); + AddConsoleOutput("File upload started..."); var strPath = "/API/FileSharing/"; var fd = new FormData(); @@ -463,20 +470,20 @@ function uploadFiles(fileList: FileList): Promise { xhr.open('POST', strPath, true); xhr.addEventListener("load", function () { if (xhr.status === 200) { - UI.AddConsoleOutput("File upload completed."); + AddConsoleOutput("File upload completed."); resolve(JSON.parse(xhr.responseText)); } else { - UI.AddConsoleOutput("File upload failed."); + AddConsoleOutput("File upload failed."); reject(); } }); xhr.addEventListener("error", () => { - UI.AddConsoleOutput("File upload failed."); + AddConsoleOutput("File upload failed."); reject(); }); xhr.addEventListener("progress", function (e) { - UI.AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); + AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); }); xhr.send(fd); }) diff --git a/Server/wwwroot/scripts/Console.js b/Server/wwwroot/scripts/Console.js new file mode 100644 index 00000000..96907d34 --- /dev/null +++ b/Server/wwwroot/scripts/Console.js @@ -0,0 +1,42 @@ +import { UserSettings } from "./UserSettings.js"; +import { ConsoleOutputDiv, ConsoleFrame, ConsoleTab, ConsoleAlert, ConsoleTextArea } from "./UI.js"; +export function AddConsoleOutput(strOutputMessage) { + var outputBlock = document.createElement("div"); + outputBlock.classList.add("console-block"); + var prompt = document.createElement("div"); + prompt.classList.add("console-prompt"); + prompt.innerHTML = UserSettings.PromptString; + var output = document.createElement("div"); + output.classList.add("console-output"); + output.innerHTML = strOutputMessage; + outputBlock.appendChild(prompt); + outputBlock.appendChild(output); + ConsoleOutputDiv.appendChild(outputBlock); + ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; + if (!ConsoleTab.classList.contains("active")) { + ConsoleAlert.hidden = false; + } +} +export function AddConsoleHTML(html) { + var contentWrapper = document.createElement("div"); + contentWrapper.innerHTML = html; + ConsoleOutputDiv.appendChild(contentWrapper); + ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; +} +export function AddTransferHarness(transferID, totalDevices) { + var transferHarness = document.createElement("div"); + transferHarness.id = transferID; + transferHarness.classList.add("command-harness"); + transferHarness.innerHTML = ` +
      + File Transfer Status | + Total Devices: ${totalDevices} | + Completed: 0 +
      `; + AddConsoleHTML(transferHarness.outerHTML); +} +export function AutoSizeTextArea() { + ConsoleTextArea.style.height = "1px"; + ConsoleTextArea.style.height = Math.max(12, ConsoleTextArea.scrollHeight) + "px"; +} +//# sourceMappingURL=Console.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/Console.js.map b/Server/wwwroot/scripts/Console.js.map new file mode 100644 index 00000000..787f2ac3 --- /dev/null +++ b/Server/wwwroot/scripts/Console.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Console.js","sourceRoot":"","sources":["Console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEpG,MAAM,UAAU,gBAAgB,CAAC,gBAAwB;IACrD,IAAI,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE3C,IAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACvC,MAAM,CAAC,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC;IAE7C,IAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACvC,MAAM,CAAC,SAAS,GAAG,gBAAgB,CAAC;IAEpC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEhC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAE1C,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC;IAEnD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAC1C,YAAY,CAAC,MAAM,GAAG,KAAK,CAAC;KAC/B;AACL,CAAC;AACD,MAAM,UAAU,cAAc,CAAC,IAAY;IACvC,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACnD,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAE7C,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC;AACvD,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,UAAkB,EAAE,YAAoB;IACvE,IAAI,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpD,eAAe,CAAC,EAAE,GAAG,UAAU,CAAC;IAChC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjD,eAAe,CAAC,SAAS,GAAG;;;6BAGH,YAAY;mCACN,UAAU;eAC9B,CAAC;IACZ,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC;AACD,MAAM,UAAU,gBAAgB;IAC5B,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;IACrC,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;AACrF,CAAC"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Console.ts b/Server/wwwroot/scripts/Console.ts new file mode 100644 index 00000000..c7a5d54c --- /dev/null +++ b/Server/wwwroot/scripts/Console.ts @@ -0,0 +1,49 @@ +import { UserSettings } from "./UserSettings.js"; +import { ConsoleOutputDiv, ConsoleFrame, ConsoleTab, ConsoleAlert, ConsoleTextArea } from "./UI.js"; + +export function AddConsoleOutput(strOutputMessage: string) { + var outputBlock = document.createElement("div"); + outputBlock.classList.add("console-block"); + + var prompt = document.createElement("div"); + prompt.classList.add("console-prompt"); + prompt.innerHTML = UserSettings.PromptString; + + var output = document.createElement("div"); + output.classList.add("console-output"); + output.innerHTML = strOutputMessage; + + outputBlock.appendChild(prompt); + outputBlock.appendChild(output); + + ConsoleOutputDiv.appendChild(outputBlock); + + ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; + + if (!ConsoleTab.classList.contains("active")) { + ConsoleAlert.hidden = false; + } +} +export function AddConsoleHTML(html: string) { + var contentWrapper = document.createElement("div"); + contentWrapper.innerHTML = html; + ConsoleOutputDiv.appendChild(contentWrapper); + + ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; +} +export function AddTransferHarness(transferID: string, totalDevices: number) { + var transferHarness = document.createElement("div"); + transferHarness.id = transferID; + transferHarness.classList.add("command-harness"); + transferHarness.innerHTML = ` +
      + File Transfer Status | + Total Devices: ${totalDevices} | + Completed: 0 +
      `; + AddConsoleHTML(transferHarness.outerHTML); +} +export function AutoSizeTextArea() { + ConsoleTextArea.style.height = "1px"; + ConsoleTextArea.style.height = Math.max(12, ConsoleTextArea.scrollHeight) + "px"; +} \ No newline at end of file diff --git a/Server/wwwroot/scripts/DataGrid.js b/Server/wwwroot/scripts/DataGrid.js index f22566aa..3ec5e2e8 100644 --- a/Server/wwwroot/scripts/DataGrid.js +++ b/Server/wwwroot/scripts/DataGrid.js @@ -1,7 +1,13 @@ import * as UI from "./UI.js"; import { Main } from "./Main.js"; import { DeviceGrid } from "./UI.js"; +import { AddConsoleOutput } from "./Console.js"; export const DataSource = new Array(); +export const FilterOptions = new class { + constructor() { + this.ShowAllGroups = true; + } +}; export function AddOrUpdateDevices(devices) { devices.forEach(x => { AddOrUpdateDevice(x); @@ -55,31 +61,17 @@ export function AddOrUpdateDevice(device) { }; UpdateDeviceCounts(); } -export function ApplyGroupFilter(groupID) { +export function ApplyFilter() { for (var i = 0; i < DataSource.length; i++) { var row = document.getElementById(DataSource[i].ID); - if (!groupID || DataSource[i].DeviceGroupID == groupID) { - row.classList.remove("hidden"); - } - else { - row.classList.add("hidden"); - } - } -} -export function ApplySearchFilter(filterString) { - for (var i = 0; i < DataSource.length; i++) { - for (var key in DataSource[i]) { - var value = DataSource[i][key]; - if (!value) { + if (FilterOptions.ShowAllGroups || + (DataSource[i].DeviceGroupID || "") == (FilterOptions.GroupFilter || "")) { + if (!FilterOptions.SearchFilter || deviceMatchesFilter(DataSource[i])) { + row.classList.remove("hidden"); continue; } - var row = document.getElementById(DataSource[i].ID); - if (value.toString().toLowerCase().includes(filterString)) { - row.classList.remove("hidden"); - break; - } - row.classList.add("hidden"); } + row.classList.add("hidden"); } } export function ClearAllData() { @@ -108,7 +100,7 @@ export function RefreshGrid() { if (xhr.status == 200) { var devices = JSON.parse(xhr.responseText); if (devices.length == 0) { - UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices. You can get the install script from the Client Downloads page."); + AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices. You can get the install script from the Client Downloads page."); } else { } @@ -144,7 +136,19 @@ export function UpdateDeviceCounts() { UI.TotalDevicesCount.innerText = DataSource.length.toString(); if (DataSource.some(x => x.IsOnline == false && document.getElementById(x.ID).classList.contains("row-selected"))) { - UI.AddConsoleOutput(`Your selection contains offline computers. Your commands will only be sent to those that are online.`); + AddConsoleOutput(`Your selection contains offline computers. Your commands will only be sent to those that are online.`); } } +function deviceMatchesFilter(device) { + for (var key in device) { + var value = device[key]; + if (!value) { + continue; + } + if (value.toString().toLowerCase().includes(FilterOptions.SearchFilter.toLowerCase())) { + return true; + } + } + return false; +} //# sourceMappingURL=DataGrid.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/DataGrid.js.map b/Server/wwwroot/scripts/DataGrid.js.map index b86d7ada..247b2c09 100644 --- a/Server/wwwroot/scripts/DataGrid.js.map +++ b/Server/wwwroot/scripts/DataGrid.js.map @@ -1 +1 @@ -{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/DataGrid.ts b/Server/wwwroot/scripts/DataGrid.ts index d7c0e693..5ffa7557 100644 --- a/Server/wwwroot/scripts/DataGrid.ts +++ b/Server/wwwroot/scripts/DataGrid.ts @@ -2,11 +2,16 @@ import { Device } from "./Models/Device.js"; import { Main } from "./Main.js"; import { DeviceGrid } from "./UI.js"; -import * as BrowserSockets from "./BrowserSockets.js"; -import { CreateGUID } from "./Utilities.js"; +import { AddConsoleOutput } from "./Console.js"; export const DataSource: Array = new Array(); +export const FilterOptions = new class { + GroupFilter: string; + SearchFilter: string; + ShowAllGroups: boolean = true; +}; + export function AddOrUpdateDevices(devices: Array) { devices.forEach(x => { @@ -65,34 +70,20 @@ export function AddOrUpdateDevice(device: Device) { }; UpdateDeviceCounts(); } -export function ApplyGroupFilter(groupID: string) { +export function ApplyFilter() { for (var i = 0; i < DataSource.length; i++) { var row = document.getElementById(DataSource[i].ID); - if (!groupID || DataSource[i].DeviceGroupID == groupID) { - row.classList.remove("hidden"); - } - else { - row.classList.add("hidden"); - } - } -} -export function ApplySearchFilter(filterString: string) { - for (var i = 0; i < DataSource.length; i++) { - for (var key in DataSource[i]) { - var value = DataSource[i][key]; - if (!value) { + if (FilterOptions.ShowAllGroups || + (DataSource[i].DeviceGroupID || "") == (FilterOptions.GroupFilter || "")) { + if (!FilterOptions.SearchFilter || deviceMatchesFilter(DataSource[i])) { + row.classList.remove("hidden"); continue; } - - var row = document.getElementById(DataSource[i].ID); - if (value.toString().toLowerCase().includes(filterString)) { - row.classList.remove("hidden"); - break; - } - row.classList.add("hidden"); } + row.classList.add("hidden"); } } + export function ClearAllData() { DataSource.splice(0, DataSource.length); UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => { @@ -118,7 +109,7 @@ export function RefreshGrid() { if (xhr.status == 200) { var devices = JSON.parse(xhr.responseText); if (devices.length == 0) { - UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices. You can get the install script from the Client Downloads page."); + AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices. You can get the install script from the Client Downloads page."); } else { @@ -159,6 +150,19 @@ export function UpdateDeviceCounts() { x.IsOnline == false && document.getElementById(x.ID).classList.contains("row-selected")) ) { - UI.AddConsoleOutput(`Your selection contains offline computers. Your commands will only be sent to those that are online.`); + AddConsoleOutput(`Your selection contains offline computers. Your commands will only be sent to those that are online.`); } } + +function deviceMatchesFilter(device: Device) { + for (var key in device) { + var value = device[key]; + if (!value) { + continue; + } + if (value.toString().toLowerCase().includes(FilterOptions.SearchFilter.toLowerCase())) { + return true; + } + } + return false; +} \ No newline at end of file diff --git a/Server/wwwroot/scripts/InputEventHandlers.js b/Server/wwwroot/scripts/InputEventHandlers.js index fb0062b6..6b6e0bc1 100644 --- a/Server/wwwroot/scripts/InputEventHandlers.js +++ b/Server/wwwroot/scripts/InputEventHandlers.js @@ -5,6 +5,7 @@ import { Store } from "./Store.js"; import * as DataGrid from "./DataGrid.js"; import * as BrowserSockets from "./BrowserSockets.js"; import { WebCommands } from "./Commands/WebCommands.js"; +import { AddConsoleOutput } from "./Console.js"; export function ApplyInputEventHandlers() { keyDownOnWindow(); keyDownOnInputTextArea(); @@ -71,9 +72,9 @@ function keyDownOnInputTextArea() { } UI.CommandCompletionDiv.classList.add("hidden"); UI.CommandInfoDiv.classList.add("hidden"); - UI.AddConsoleOutput(`${UI.ConsoleTextArea.value}`); + AddConsoleOutput(`${UI.ConsoleTextArea.value}`); if (!BrowserSockets.Connected) { - UI.AddConsoleOutput("Not connected. Reconnecting..."); + AddConsoleOutput("Not connected. Reconnecting..."); BrowserSockets.Connect(); return; } @@ -144,9 +145,10 @@ function inputOnCommandTextArea() { }); } function inputOnFilterTextBox() { - document.querySelector("#gridFilter").addEventListener("input", (e) => { + UI.GridFilter.addEventListener("input", (e) => { var currentText = e.currentTarget.value.toLowerCase(); - DataGrid.ApplySearchFilter(currentText); + DataGrid.FilterOptions.SearchFilter = currentText; + DataGrid.ApplyFilter(); }); } function consoleTabSelected() { @@ -175,7 +177,14 @@ function clickStartRemoteControlButton() { } function deviceGroupSelectChanged() { UI.DeviceGroupSelect.addEventListener("change", (ev) => { - DataGrid.ApplyGroupFilter(UI.DeviceGroupSelect.value); + DataGrid.FilterOptions.GroupFilter = UI.DeviceGroupSelect.value; + if (UI.DeviceGroupSelect.selectedIndex == 0) { + DataGrid.FilterOptions.ShowAllGroups = true; + } + else { + DataGrid.FilterOptions.ShowAllGroups = false; + } + DataGrid.ApplyFilter(); }); } //# sourceMappingURL=InputEventHandlers.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/InputEventHandlers.js.map b/Server/wwwroot/scripts/InputEventHandlers.js.map index bfa234c4..9b74bda3 100644 --- a/Server/wwwroot/scripts/InputEventHandlers.js.map +++ b/Server/wwwroot/scripts/InputEventHandlers.js.map @@ -1 +1 @@ -{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,MAAM,UAAU,uBAAuB;IACnC,eAAe,EAAE,CAAC;IAClB,sBAAsB,EAAE,CAAC;IACzB,sBAAsB,EAAE,CAAC;IACzB,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,CAAC;IACxB,6BAA6B,EAAE,CAAC;IAChC,kBAAkB,EAAE,CAAC;IACrB,wBAAwB,EAAE,CAAC;IAE3B,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;QACnC,+BAA+B,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uBAAuB,CAAC,CAAgB;IAC7C,IAAI,CAAC,CAAC,OAAO,EAAE;QACX,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;YACpC,EAAE,CAAC,iBAAiB,CAAC,SAAS,IAAI,EAAE,CAAC;SACxC;aACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;YACvC,EAAE,CAAC,iBAAiB,CAAC,SAAS,IAAI,EAAE,CAAC;SACxC;KACJ;SACI;QACD,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACvD,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;gBACpC,IAAI,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/E,KAAK,CAAC,yBAAyB,IAAI,CAAC,CAAC;oBACrC,6BAA6B,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC9D,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnG;aACJ;iBACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;gBACvC,IAAI,KAAK,CAAC,yBAAyB,GAAG,CAAC,EAAE;oBACrC,KAAK,CAAC,yBAAyB,IAAI,CAAC,CAAC;oBACrC,6BAA6B,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC9D,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnG;aACJ;SACJ;aACI;YACD,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;gBACpC,IAAI,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjE,KAAK,CAAC,oBAAoB,IAAI,CAAC,CAAC;oBAChC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;iBAClF;aACJ;iBACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;gBACvC,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,EAAE;oBAChC,KAAK,CAAC,oBAAoB,IAAI,CAAC,CAAC;oBAChC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;iBAClF;aACJ;SACJ;KACJ;AACL,CAAC;AAED,SAAS,sBAAsB;IAC3B,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAgB;QACrE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;YACb,QAAQ,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE;gBACzB,KAAK,OAAO;oBACR,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,IAAI,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE;wBAC7C,OAAO;qBACV;oBACD,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC1C,EAAE,CAAC,gBAAgB,CAAC,4BAA4B,EAAE,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC,CAAC;oBACnF,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;wBAC3B,EAAE,CAAC,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;wBACvD,cAAc,CAAC,OAAO,EAAE,CAAC;wBACzB,OAAO;qBACV;oBACD,gBAAgB,CAAC,cAAc,EAAE,CAAC;oBAClC,MAAM;gBACV,KAAK,SAAS,CAAC;gBACf,KAAK,WAAW;oBACZ,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,uBAAuB,CAAC,CAAC,CAAC,CAAC;oBAC3B,MAAM;gBACV,KAAK,QAAQ;oBACT,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACvD,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;qBAC7C;yBACI;wBACD,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;qBACjC;oBACD,MAAM;gBACV,KAAK,KAAK;oBACN,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACvD,CAAC,CAAC,cAAc,EAAE,CAAC;wBAClB,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,KAAK,EAAE,CAAC;qBAC/E;oBACD,MAAM;gBACV,KAAK,WAAW;oBACZ,IAAI,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBAC/F,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;qBAC7C;oBACD,MAAM;gBACV,KAAK,GAAG;oBACJ,IAAI,CAAC,CAAC,OAAO,EAAE;wBACX,EAAE,CAAC,gBAAgB,CAAC,SAAS,GAAG,EAAE,CAAC;qBACtC;oBACD,MAAM;gBACV;oBACI,MAAM;aACb;SACJ;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,eAAe;IACpB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,EAAE,EAAE;QACpD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,eAAe,CAAC;YACvD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,QAAQ;YACxD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO;YACvD,CAAC,CAAC,CAAC,MAAM;YACT,CAAC,CAAC,CAAC,OAAO,EAAE;YACZ,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;SAC9B;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,sBAAsB;IAC3B,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAgB,EAAE,EAAE;QAC9D,IAAI,WAAW,GAAG,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;QAC5D,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,iBAAiB,CAAC,KAAK,GAAG,WAAW,CAAC;YACzC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACnD;aACI;YACD,gBAAgB,CAAC,0BAA0B,EAAE,CAAC;SACjD;QACD,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC;IAC7D,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,oBAAoB;IACzB,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;QAClE,IAAI,WAAW,GAAI,CAAC,CAAC,aAAkC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC5E,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAA;AACN,CAAC;AACD,SAAS,kBAAkB;IACvB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,qBAAqB;IAC1B,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;QAC7E,QAAQ,CAAC,eAAe,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,6BAA6B;IAClC,QAAQ,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;QACrF,IAAI,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACpD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,EAAE,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;SACtD;aACI,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,EAAE,CAAC,YAAY,CAAC,6CAA6C,CAAC,CAAC;SAClE;aACI;YACD,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChE;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,wBAAwB;IAC7B,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;QACnD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACP,CAAC"} \ No newline at end of file +{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/InputEventHandlers.ts b/Server/wwwroot/scripts/InputEventHandlers.ts index 45d1d7bd..a3977a09 100644 --- a/Server/wwwroot/scripts/InputEventHandlers.ts +++ b/Server/wwwroot/scripts/InputEventHandlers.ts @@ -5,6 +5,7 @@ import { Store } from "./Store.js"; import * as DataGrid from "./DataGrid.js"; import * as BrowserSockets from "./BrowserSockets.js"; import { WebCommands } from "./Commands/WebCommands.js"; +import { AddConsoleOutput } from "./Console.js"; export function ApplyInputEventHandlers() { @@ -76,9 +77,9 @@ function keyDownOnInputTextArea() { } UI.CommandCompletionDiv.classList.add("hidden"); UI.CommandInfoDiv.classList.add("hidden"); - UI.AddConsoleOutput(`${UI.ConsoleTextArea.value}`); + AddConsoleOutput(`${UI.ConsoleTextArea.value}`); if (!BrowserSockets.Connected) { - UI.AddConsoleOutput("Not connected. Reconnecting..."); + AddConsoleOutput("Not connected. Reconnecting..."); BrowserSockets.Connect(); return; } @@ -151,9 +152,10 @@ function inputOnCommandTextArea() { }); } function inputOnFilterTextBox() { - document.querySelector("#gridFilter").addEventListener("input", (e) => { + UI.GridFilter.addEventListener("input", (e) => { var currentText = (e.currentTarget as HTMLInputElement).value.toLowerCase(); - DataGrid.ApplySearchFilter(currentText); + DataGrid.FilterOptions.SearchFilter = currentText; + DataGrid.ApplyFilter(); }) } function consoleTabSelected() { @@ -184,6 +186,13 @@ function clickStartRemoteControlButton() { function deviceGroupSelectChanged() { UI.DeviceGroupSelect.addEventListener("change", (ev) => { - DataGrid.ApplyGroupFilter(UI.DeviceGroupSelect.value); + DataGrid.FilterOptions.GroupFilter = UI.DeviceGroupSelect.value; + if (UI.DeviceGroupSelect.selectedIndex == 0) { + DataGrid.FilterOptions.ShowAllGroups = true; + } + else { + DataGrid.FilterOptions.ShowAllGroups = false; + } + DataGrid.ApplyFilter(); }); } \ No newline at end of file diff --git a/Server/wwwroot/scripts/Main.js b/Server/wwwroot/scripts/Main.js index 6aa72b11..cc390207 100644 --- a/Server/wwwroot/scripts/Main.js +++ b/Server/wwwroot/scripts/Main.js @@ -6,10 +6,12 @@ import { CMDCommands } from "./Commands/CMDCommands.js"; import { PSCoreCommands } from "./Commands/PSCoreCommands.js"; import * as Utilities from "./Utilities.js"; import * as DataGrid from "./DataGrid.js"; +import { Store } from "./Store.js"; import { UserSettings } from "./UserSettings.js"; import { WinPSCommands } from "./Commands/WinPSCommands.js"; import { ApplyInputEventHandlers } from "./InputEventHandlers.js"; import { Sound } from "./Sound.js"; +import * as Console from "./Console.js"; var remotely = { Commands: { "Web": WebCommands, @@ -18,13 +20,14 @@ var remotely = { "CMD": CMDCommands }, CommandProcessor: CommandProcessor, + Console: Console, DataGrid: DataGrid, UI: UI, Utilities: Utilities, Sockets: BrowserSockets, - Storage: Storage, UserSettings: UserSettings, Sound: Sound, + Store: Store, Init() { UI.ConsoleTextArea.focus(); ApplyInputEventHandlers(); diff --git a/Server/wwwroot/scripts/Main.js.map b/Server/wwwroot/scripts/Main.js.map index 6c3af6b8..5dedfdad 100644 --- a/Server/wwwroot/scripts/Main.js.map +++ b/Server/wwwroot/scripts/Main.js.map @@ -1 +1 @@ -{"version":3,"file":"Main.js","sourceRoot":"","sources":["Main.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,IAAI,QAAQ,GAAG;IACX,QAAQ,EAAE;QACN,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,cAAc;QACxB,KAAK,EAAE,WAAW;KACrB;IACD,gBAAgB,EAAE,gBAAgB;IAClC,QAAQ,EAAE,QAAQ;IAClB,EAAE,EAAE,EAAE;IACN,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,OAAO;IAChB,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,KAAK;IACZ,IAAI;QACA,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC3B,uBAAuB,EAAE,CAAC;QAC1B,cAAc,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAC;AAC7B,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC"} \ No newline at end of file +{"version":3,"file":"Main.js","sourceRoot":"","sources":["Main.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,IAAI,QAAQ,GAAG;IACX,QAAQ,EAAE;QACN,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,cAAc;QACxB,KAAK,EAAE,WAAW;KACrB;IACD,gBAAgB,EAAE,gBAAgB;IAClC,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,EAAE,EAAE,EAAE;IACN,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,cAAc;IACvB,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,KAAK;IACZ,IAAI;QACA,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC3B,uBAAuB,EAAE,CAAC;QAC1B,cAAc,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAC;AAC7B,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Main.ts b/Server/wwwroot/scripts/Main.ts index 50751bd3..4129e631 100644 --- a/Server/wwwroot/scripts/Main.ts +++ b/Server/wwwroot/scripts/Main.ts @@ -4,7 +4,6 @@ import * as CommandProcessor from "./CommandProcessor.js"; import { WebCommands } from "./Commands/WebCommands.js"; import { CMDCommands } from "./Commands/CMDCommands.js"; import { PSCoreCommands } from "./Commands/PSCoreCommands.js"; -import { ConsoleCommand } from "./Models/ConsoleCommand.js"; import * as Utilities from "./Utilities.js"; import * as DataGrid from "./DataGrid.js"; import { Store } from "./Store.js"; @@ -12,6 +11,7 @@ import { UserSettings } from "./UserSettings.js"; import { WinPSCommands } from "./Commands/WinPSCommands.js"; import { ApplyInputEventHandlers } from "./InputEventHandlers.js"; import { Sound } from "./Sound.js"; +import * as Console from "./Console.js"; var remotely = { Commands: { @@ -21,13 +21,14 @@ var remotely = { "CMD": CMDCommands }, CommandProcessor: CommandProcessor, + Console: Console, DataGrid: DataGrid, UI: UI, Utilities: Utilities, Sockets: BrowserSockets, - Storage: Storage, UserSettings: UserSettings, Sound: Sound, + Store: Store, Init() { UI.ConsoleTextArea.focus(); ApplyInputEventHandlers(); diff --git a/Server/wwwroot/scripts/UI.js b/Server/wwwroot/scripts/UI.js index 4b0804e6..07ec0e4a 100644 --- a/Server/wwwroot/scripts/UI.js +++ b/Server/wwwroot/scripts/UI.js @@ -1,4 +1,3 @@ -import { UserSettings } from "./UserSettings.js"; import * as Utilities from "./Utilities.js"; export var CommandCompletionDiv = document.querySelector("#commandCompletionDiv"); export var CommandInfoDiv = document.querySelector("#commandInfoDiv"); @@ -16,45 +15,7 @@ export var ConsoleFrame = document.getElementById("consoleFrame"); export var ConsoleTab = document.getElementById("consoleTab"); export var ConsoleAlert = document.getElementById("consoleAlert"); export var DeviceGroupSelect = document.getElementById("deviceGroupSelect"); -export function AddConsoleOutput(strOutputMessage) { - var outputBlock = document.createElement("div"); - outputBlock.classList.add("console-block"); - var prompt = document.createElement("div"); - prompt.classList.add("console-prompt"); - prompt.innerHTML = UserSettings.PromptString; - var output = document.createElement("div"); - output.classList.add("console-output"); - output.innerHTML = strOutputMessage; - outputBlock.appendChild(prompt); - outputBlock.appendChild(output); - ConsoleOutputDiv.appendChild(outputBlock); - ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; - if (!ConsoleTab.classList.contains("active")) { - ConsoleAlert.hidden = false; - } -} -export function AddConsoleHTML(html) { - var contentWrapper = document.createElement("div"); - contentWrapper.innerHTML = html; - ConsoleOutputDiv.appendChild(contentWrapper); - ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; -} -export function AddTransferHarness(transferID, totalDevices) { - var transferHarness = document.createElement("div"); - transferHarness.id = transferID; - transferHarness.classList.add("command-harness"); - transferHarness.innerHTML = ` -
      - File Transfer Status | - Total Devices: ${totalDevices} | - Completed: 0 -
      `; - AddConsoleHTML(transferHarness.outerHTML); -} -export function AutoSizeTextArea() { - ConsoleTextArea.style.height = "1px"; - ConsoleTextArea.style.height = Math.max(12, ConsoleTextArea.scrollHeight) + "px"; -} +export var GridFilter = document.getElementById("gridFilter"); export function PopupMessage(message) { var messageDiv = document.createElement("div"); messageDiv.classList.add("float-message"); diff --git a/Server/wwwroot/scripts/UI.js.map b/Server/wwwroot/scripts/UI.js.map index 4d8955cf..9621c61b 100644 --- a/Server/wwwroot/scripts/UI.js.map +++ b/Server/wwwroot/scripts/UI.js.map @@ -1 +1 @@ -{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/UI.ts b/Server/wwwroot/scripts/UI.ts index 209b6a2c..598c4b90 100644 --- a/Server/wwwroot/scripts/UI.ts +++ b/Server/wwwroot/scripts/UI.ts @@ -1,6 +1,4 @@ -import { UserSettings} from "./UserSettings.js"; -import * as Utilities from "./Utilities.js"; -import { GetSelectedDevices } from "./DataGrid.js"; +import * as Utilities from "./Utilities.js"; export var CommandCompletionDiv = document.querySelector("#commandCompletionDiv") as HTMLDivElement; @@ -19,54 +17,9 @@ export var ConsoleFrame = document.getElementById("consoleFrame") as HTMLDivElem export var ConsoleTab = document.getElementById("consoleTab") as HTMLAnchorElement; export var ConsoleAlert = document.getElementById("consoleAlert") as HTMLAnchorElement; export var DeviceGroupSelect = document.getElementById("deviceGroupSelect") as HTMLSelectElement; +export var GridFilter = document.getElementById("gridFilter") as HTMLInputElement; -export function AddConsoleOutput(strOutputMessage:string) { - var outputBlock = document.createElement("div"); - outputBlock.classList.add("console-block"); - - var prompt = document.createElement("div"); - prompt.classList.add("console-prompt"); - prompt.innerHTML = UserSettings.PromptString; - - var output = document.createElement("div"); - output.classList.add("console-output"); - output.innerHTML = strOutputMessage; - - outputBlock.appendChild(prompt); - outputBlock.appendChild(output); - - ConsoleOutputDiv.appendChild(outputBlock); - - ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; - - if (!ConsoleTab.classList.contains("active")) { - ConsoleAlert.hidden = false; - } -} -export function AddConsoleHTML(html: string) { - var contentWrapper = document.createElement("div"); - contentWrapper.innerHTML = html; - ConsoleOutputDiv.appendChild(contentWrapper); - - ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight; -} -export function AddTransferHarness(transferID: string, totalDevices:number) { - var transferHarness = document.createElement("div"); - transferHarness.id = transferID; - transferHarness.classList.add("command-harness"); - transferHarness.innerHTML = ` -
      - File Transfer Status | - Total Devices: ${totalDevices} | - Completed: 0 -
      `; - AddConsoleHTML(transferHarness.outerHTML); -} -export function AutoSizeTextArea() { - ConsoleTextArea.style.height = "1px"; - ConsoleTextArea.style.height = Math.max(12, ConsoleTextArea.scrollHeight) + "px"; -} export function PopupMessage(message: string) { var messageDiv = document.createElement("div"); messageDiv.classList.add("float-message"); @@ -113,7 +66,6 @@ export function ShowModal(title: string, modalBodyHtml: string, buttonsHTML: str $("#" + modalID).modal("show"); return wrapperDiv; }; - export function ValidateInput(inputElement: HTMLInputElement) { if (!inputElement.checkValidity()) { $(inputElement)["tooltip"]({ diff --git a/Server/wwwroot/scripts/UserSettings.js b/Server/wwwroot/scripts/UserSettings.js index 254637c7..242ded51 100644 --- a/Server/wwwroot/scripts/UserSettings.js +++ b/Server/wwwroot/scripts/UserSettings.js @@ -1,13 +1,11 @@ -export const UserSettings = new class { - constructor() { - this.PromptString = "~>"; - this.CommandModeShortcuts = { - "Web": "/web", - "PSCore": "/pscore", - "WinPS": "/winps", - "CMD": "/cmd", - "Bash": "/bash" - }; +export const UserSettings = { + PromptString: "~>", + CommandModeShortcuts: { + "Web": "/web", + "PSCore": "/pscore", + "WinPS": "/winps", + "CMD": "/cmd", + "Bash": "/bash" } }; //# sourceMappingURL=UserSettings.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/UserSettings.js.map b/Server/wwwroot/scripts/UserSettings.js.map index e8341609..7a445ab8 100644 --- a/Server/wwwroot/scripts/UserSettings.js.map +++ b/Server/wwwroot/scripts/UserSettings.js.map @@ -1 +1 @@ -{"version":3,"file":"UserSettings.js","sourceRoot":"","sources":["UserSettings.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI;IAAA;QAC5B,iBAAY,GAAG,IAAI,CAAC;QAEpB,yBAAoB,GAAG;YACnB,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,OAAO;SAClB,CAAA;IACL,CAAC;CAAA,CAAA"} \ No newline at end of file +{"version":3,"file":"UserSettings.js","sourceRoot":"","sources":["UserSettings.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,YAAY,EAAE,IAAI;IAElB,oBAAoB,EAAE;QAClB,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,OAAO;KAClB;CACJ,CAAA"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/UserSettings.ts b/Server/wwwroot/scripts/UserSettings.ts index 64847e5e..8fdadb21 100644 --- a/Server/wwwroot/scripts/UserSettings.ts +++ b/Server/wwwroot/scripts/UserSettings.ts @@ -1,7 +1,7 @@ -export const UserSettings = new class { - PromptString = "~>"; +export const UserSettings = { + PromptString: "~>", - CommandModeShortcuts = { + CommandModeShortcuts: { "Web": "/web", "PSCore": "/pscore", "WinPS": "/winps", diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index ca6041c8..9f9d10c2 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -114,9 +114,9 @@ if ((Test-Path -Path "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish") # Publish Core clients. -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish" "$Root\Agent" New-Item -Path "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish\ScreenCast\" -ItemType Directory -Force New-Item -Path "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish\ScreenCast\" -ItemType Directory -Force @@ -124,35 +124,33 @@ New-Item -Path "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish\ScreenCa # Publish Linux ScreenCaster -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish\ScreenCast\" "$Root\ScreenCast.Linux\" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=linux-x64 "$Root\ScreenCast.Linux\" # Publish Linux GUI App -$PublishDir = "$Root\Desktop.Linux\bin\Release\netcoreapp3.1\linux-x64\publish\" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$PublishDir" "$Root\Desktop.Linux\" -Move-Item -Path "$PublishDir\Remotely_Desktop" -Destination "$Root\Server\wwwroot\Downloads\Remotely_Desktop" -Force +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=linux-x64 "$Root\Desktop.Linux\" -# Build .NET Framework ScreenCaster (32-bit) -&"$MSBuildPath" "$Root\ScreenCast.Win" /t:Build /p:Configuration=Release /p:Platform=x86 +# Publish Windows ScreenCaster (32-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x86 "$Root\ScreenCast.Win" -# Copy 32-bit .NET Framework ScreenCaster to Agent output folder. -Get-ChildItem -Path "$Root\ScreenCast.Win\bin\x86\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp3.1\win10-x86\publish\ScreenCast\" -Force +# Publish Windows ScreenCaster (64-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x64 "$Root\ScreenCast.Win" -# Build .NET Framework ScreenCaster (64-bit) -&"$MSBuildPath" "$Root\ScreenCast.Win" /t:Build /p:Configuration=Release /p:Platform=x64 +# Publish Windows GUI App (64-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x64 "$Root\Desktop.Win" -# Copy 64-bit .NET Framework ScreenCaster to Agent output folder. -Get-ChildItem -Path "$Root\ScreenCast.Win\bin\x64\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp3.1\win10-x64\publish\ScreenCast\" -Force - - -# Build Windows GUI App - -&"$MSBuildPath" "$Root\Desktop.Win" /t:Build /p:Configuration=Release /p:Platform=AnyCPU -Move-Item -Path "$Root\Desktop.Win\bin\Release\Remotely_Desktop.exe" -Destination "$Root\Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force if ($SignAssemblies) { - &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Remotely_Desktop.exe" + &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Win-x64\Remotely_Desktop.exe" } +# Publish Windows GUI App (32-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x86 "$Root\Desktop.Win" + +if ($SignAssemblies) { + &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Win-x86\Remotely_Desktop.exe" +} + + # Compress Core clients. $PublishDir = "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish"