From 25e357059d30b5096a79183590899ab317965e42 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 00:00:44 -0500 Subject: [PATCH 01/79] Multiple Updates (draft) This is the beginning of my overhaul of the config.getamp.sh site. Nothing crazy so far, but more is being added as I figure out the code: -Placeholder is set to DefaultValue -Suffix added -URI adjusted to new port config and to use `:` instead of `/` -SteamAppID corrected to Client App ID instead of Server --- default.html | 627 +++++++++++++++++++++++++++++++-------------------- generator.js | 8 +- 2 files changed, 392 insertions(+), 243 deletions(-) diff --git a/default.html b/default.html index 5802a28..05d59de 100644 --- a/default.html +++ b/default.html @@ -8,15 +8,15 @@ + integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous"> + integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60=" crossorigin="anonymous"> + integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" + crossorigin="anonymous"> @@ -29,8 +29,8 @@
  • @@ -40,7 +40,7 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> @@ -50,11 +50,10 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> - + Networking @@ -63,7 +62,7 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> @@ -74,10 +73,9 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> - + Configuration and Settings @@ -86,7 +84,7 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> @@ -96,7 +94,7 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> Server Events @@ -105,7 +103,7 @@
  • + fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"> Validate and Review @@ -116,29 +114,29 @@
    -
    +

    AMP Configuration Generator

    - Version 1.0
    ©2021 CubeCoders Limited     + Version 1.0
    ©2021 CubeCoders Limited
    + +  Share +
    @@ -147,8 +145,9 @@

    AMP Configuration Generator

    + +  Clear +
    @@ -159,33 +158,38 @@

    Basic Information

    -
    This is what will show up within AMP as the name of the + data-bind="value: Meta_DisplayName, valueUpdate: 'input'"> +
    + This is what will show up within AMP as the name of the application.
    -
    Optional: useful for describing different variants/configurations + data-bind="value: Meta_Description"> +
    + Optional: useful for describing different variants/configurations of - the same application.
    + the same application. +
    + data-bind="value: Meta_Author" placeholder="Joe Bloggs">
    Who are you? Take some credit for your work!
    -
    A link to where you can learn more about the application, such as - a store listing.
    + data-bind="value: Meta_URL" placeholder="https://example.com/someapp"> +
    + A link to where you can learn more about the application, such as + a store listing. +
    @@ -193,20 +197,24 @@

    Basic Information

    @@ -217,58 +225,66 @@

    Management and Console

    @@ -276,25 +292,31 @@

    Management and Console

    -
    This is in addition to the applications management type if it - accepts management over methods other than Standard IO
    +
    + This is in addition to the applications management type if it + accepts management over methods other than Standard IO +
    @@ -332,19 +354,23 @@

    Management and Console

    -->

    Networking

    -
    AMP will automatically generate firewall rules to allow the application - ports through
    +
    + AMP will automatically generate firewall rules to allow the application + ports through +
    - - - + + + - + @@ -368,14 +396,18 @@

    Networking

    - + @@ -397,48 +431,58 @@

    Update Sources

    @@ -447,18 +491,22 @@

    Update Sources

    -
    This must be a direct URL that is not behind any access - gates.
    + placeholder="https://example.com/download.zip"> +
    + This must be a direct URL that is not behind any access + gates. +
    + data-bind="checked: _UpdateSourceUnzip"> Unzip once downloaded - The downloaded file is a .zip that needs to be + + The downloaded file is a .zip that needs to be decompressed. Does not support other archive types (such as .tar.gz) at this - time. + time. +
    @@ -466,24 +514,27 @@

    Update Sources

    -
    The App ID for the dedicated server application. You can find - this via SteamDB.
    + data-bind="value: _SteamServerAppID, valueUpdate: 'input'" placeholder="232250"> +
    + The App ID for the dedicated server application. You can find + this via SteamDB. +
    -
    The App ID for the game itself. You can find this via SteamDB.
    + data-bind="value: _SteamClientAppID, valueUpdate: 'input'" placeholder="440"> +
    + The App ID for the game itself. You can find this via SteamDB. +
    + data-bind="value: _UpdateSourceGitRepo, valueUpdate: 'input'" + placeholder="Author/RepoName">
    Must be a publicly accessible GitHub repository.
    @@ -491,8 +542,8 @@

    Update Sources

    + data-bind="value: _DisplayImageSource, valueUpdate: 'input'" + placeholder="https://example.com/image.png">
    PNG or JPEG format, 460x215px.
    @@ -503,12 +554,13 @@

    Configuration and Settings

    Port NumberUsage TypePort NumberUsage Type
    + + + data-bind="click: __RemovePort"> + Delete Port +
    - You may add up to 3 ports. The RCON port does + + You may add up to 3 ports. The RCON port does not count towards this limit.
    Maximum of 1 Steam Query and 1 RCON - Port.     + Port. +
    + + - +
    - - - - - - + + + + + + + @@ -517,12 +569,17 @@

    Configuration and Settings

    + @@ -534,10 +591,12 @@

    Configuration and Settings

    - + @@ -549,22 +608,23 @@
    Application and Parameters
    + data-bind="value: _WinExecutableName, valueUpdate: 'input'" + placeholder="Application.exe">
    + data-bind="value: _LinuxExecutableName, valueUpdate: 'input'" + placeholder="Application.x86_64">
    -
    Don't include any arguments that come from the Configuration and - Settings section above. + data-bind="value: App_CommandLineArgs, valueUpdate: 'input'"> +
    + Don't include any arguments that come from the Configuration and + Settings section above.
    @@ -572,17 +632,21 @@
    Application and Parameters
    -
    The format to be used to add settings specified above to the + data-bind="value: App_CommandLineParameterFormat"> +
    + The format to be used to add settings specified above to the command line in place of {{$FormattedArgs}}. {0} is the field name and {1} the - value.
    + value. +
    -
    The character(s) used to separate different arguments in the - command line flags generated by settings. By default this is a single space.
    + data-bind="value: App_CommandLineParameterDelimiter"> +
    + The character(s) used to separate different arguments in the + command line flags generated by settings. By default this is a single space. +
    @@ -590,21 +654,25 @@
    Application and Parameters
    @@ -614,29 +682,35 @@
    Application and Parameters
    @@ -647,8 +721,10 @@
    Shutdown
    @@ -665,70 +743,87 @@
    Shutdown
    + data-bind="value: App_ExitString">

    Server Events

    -

    These are regular expressions that when matched notifies AMP about in-application events such +

    + These are regular expressions that when matched notifies AMP about in-application events such as a successful startup, or users connecting/disconnecting. AMP will match these based on output from either the servers standard output (if enabled) or whichever RCON/remote access - protocol is in use.

    -

    All expressions must match the entire subject string - so they must always start with a ^ and + protocol is in use. +

    +

    + All expressions must match the entire subject string - so they must always start with a ^ and end with a $. AMP uses named capture groups to pick out different components of an - expression.

    -

    Regex101 is an excellent resource to help you put together - and validate expressions. AMP uses the 'Javascript' regex flavour.

    + expression. +

    +

    + Regex101 is an excellent resource to help you put together + and validate expressions. AMP uses the 'Javascript' regex flavour. +

    + data-bind="value: Console_ThrowawayMessageRegex">
    + data-bind="value: Console_AppReadyRegex">
    + data-bind="value: Console_UserJoinRegex">
    + data-bind="value: Console_UserLeaveRegex">
    + data-bind="value: Console_UserChatRegex">

    Validate and Review

    -
    This is generated assuming the default values and default port + data-bind="value: __SampleCommandLineFlags"> +
    + This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP.
    @@ -740,26 +835,30 @@

    Validate and Review

    -   - You have not yet validated your configuration. You will not be able to download your configuration until you have done this.

    +   + You have not yet validated your configuration. You will not be able to download your configuration until you have done this. +

    -   - Validation Failed - You must address the following failures before you may continue.

    +   + Validation Failed - You must address the following failures before you may continue. +

    -   - Validation Passed with Warnings - You should consider addressing the following warnings.

    +   + Validation Passed with Warnings - You should consider addressing the following warnings. +

    -   - Validation Passed - Great stuff! You may now download the completed configuration below.

    +   + Validation Passed - Great stuff! You may now download the completed configuration below. +

    Validation Issues:
    @@ -799,21 +898,24 @@

    Validate and Review

    - -  Download Configuration + +  Download Configuration + + +  Download Settings Manifest +

    -   - Make sure to keep a backup of your configuration by using the 'Export' option at the top of the page! You will need this to make further changes even after downloading the configuration and manifest.

    +   + Make sure to keep a backup of your configuration by using the 'Export' option at the top of the page! You will need this to make further changes even after downloading the configuration and manifest. +

    Using the generated configuration
    @@ -873,53 +975,71 @@
    -
    -
    -
    -
    -
    -
    + data-bind="visible: InputType() == 'checkbox' && IncludeInCommandLine()">
    -
    -
    -
    +
    + +
    + data-bind="visible: !__vm.__IsEditingSetting(), click: __vm.__DoAddSetting"> + Add New + Setting + + data-bind="click: __vm.__CloseSetting"> + Close +
    @@ -1008,12 +1155,12 @@
    +
    diff --git a/generator.js b/generator.js index 4796a7d..b5513eb 100644 --- a/generator.js +++ b/generator.js @@ -87,7 +87,7 @@ class generatorViewModel { this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); this.__QueryPortName = ko.observable(""); - this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}/{GenericModule.App.${self.__QueryPortName()}}` : ""); + this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); this.__BuildPortMappings = ko.computed(() => { var data = {}; @@ -311,7 +311,7 @@ class generatorViewModel { if (self._UpdateSourceType() == "4") //SteamCMD { - lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamServerAppID()}\"}`); + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); } var portMappings = self.__BuildPortMappings(); @@ -482,7 +482,7 @@ class appSettingViewModel { var self = this; this.__vm = vm; this.DisplayName = ko.observable(""); - this.Category = ko.observable(""); + this.Category = ko.observable("Server Settings"); this.Description = ko.observable(""); this.Keywords = ko.observable(""); this.FieldName = ko.observable(""); @@ -491,6 +491,8 @@ class appSettingViewModel { this.ParamFieldName = ko.computed(() => self.FieldName()); this.IncludeInCommandLine = ko.observable(true); this.DefaultValue = ko.observable(""); + this.Placeholder = this.DefaultValue + this.Suffix = ko.observable(""); this._CheckedValue = ko.observable("true"); this._UncheckedValue = ko.observable("false"); this.EnumValues = ko.computed(() => { From 95c7fe365db25c83aa3e6491cc8b01e1f2af006c Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 02:35:38 -0500 Subject: [PATCH 02/79] Add Port Settings --- default.html | 41 +++++++++++++++++++++++++++++++---------- generator.js | 36 ++++++++++++++++++++++++++---------- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/default.html b/default.html index 05d59de..52890d0 100644 --- a/default.html +++ b/default.html @@ -362,6 +362,7 @@

    Networking

    + @@ -372,13 +373,20 @@

    Networking

    data-bind="value: Port"> + + @@ -908,6 +922,13 @@

    Validate and Review

     Download Settings Manifest +

    diff --git a/generator.js b/generator.js index b5513eb..2e6dd04 100644 --- a/generator.js +++ b/generator.js @@ -54,7 +54,8 @@ class generatorViewModel { this._PortMappings = ko.observableArray(); //of portMappingViewModel this.__NewPort = ko.observable("7777"); - this.__NewPortType = ko.observable("0"); + this.__NewName = ko.observable("Application Port"); + this.__NewProtocol = ko.observable("Both"); this._UpdateSourceType = ko.observable("4"); this._UpdateSourceURL = ko.observable(""); @@ -76,6 +77,8 @@ class generatorViewModel { this.__SanitizedName = ko.computed(() => self.Meta_DisplayName().replace(/\s+/g, "-").replace(/[^a-z\d-_]/ig, "").toLowerCase()); this.Meta_OS = ko.computed(() => (self._SupportsWindows() ? 1 : 0) | (self._SupportsLinux() ? 2 : 0)); this.Meta_ConfigManifest = ko.computed(() => self.__SanitizedName() + "config.json"); + this.Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); + this.Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); @@ -85,7 +88,7 @@ class generatorViewModel { this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - + this.App_Ports = ko.computed(() => "@IncludeJson[" + self.Meta_PortsManifest() + "]"); this.__QueryPortName = ko.observable(""); this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); @@ -97,7 +100,7 @@ class generatorViewModel { for (var i = 0; i < allPorts.length; i++) { var portEntry = allPorts[i]; - if (portEntry.PortType() == "2") //RCON + if (portEntry.Name() == "Remote Admin Port") //RCON { data["RemoteAdminPort"] = portEntry.Port(); } @@ -107,7 +110,7 @@ class generatorViewModel { var portName = "ApplicationPort" + appPortNum; data[portName] = portEntry.Port(); appPortNum++; - if (portEntry.PortType() == "1") //QueryPort + if (portEntry.Name() == "Steam Query Port") //QueryPort { self.__QueryPortName(portName); } @@ -164,6 +167,10 @@ class generatorViewModel { "key": "Endpoint URI Format", "value": self.Meta_EndpointURIFormat(), "longValue": true + }, + { + "key": "Ports", + "value": self.App_Ports() } ]; @@ -190,7 +197,7 @@ class generatorViewModel { }; this.__AddPort = function(){ - self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewPortType(), self)); + self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewProtocol(), self)); }; this.__RemoveSetting = function(toRemove){ @@ -239,8 +246,8 @@ class generatorViewModel { self._PortMappings.push.apply(self._PortMappings, mappedPorts); self._AppSettings.removeAll(); - var mappedPorts = ko.quickmap.to(appSettingViewModel, settings, false, {__vm: self}); - self._AppSettings.push.apply(self._AppSettings, mappedPorts); + var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, {__vm: self}); + self._AppSettings.push.apply(self._AppSettings, mappedSettings); }; this.__IsExporting = ko.observable(false); @@ -331,6 +338,13 @@ class generatorViewModel { downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_ConfigManifest()); }; + this.__DownloadPortsManifest = function(){ + if (this.__ValidationResult() < 2) { return; } + + var asJS = ko.toJS(self._PortMappings()); + downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_PortsManifest()); + }; + this.__Invalidate = function(newValue){ self.__ValidationResult(0); }; @@ -397,7 +411,7 @@ class generatorViewModel { warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); } - if (self._PortMappings().filter(p => p.PortType() == "2").length == 0) + if (self._PortMappings().filter(p => p.Name() == "RCON Port").length == 0) { warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); } @@ -468,11 +482,13 @@ class validationResult { } class portMappingViewModel { - constructor(port, portType, vm) { + constructor(port, name, protocol, vm) { var self = this; this.__vm = vm; + this.Protocol = ko.observable(protocol); this.Port = ko.observable(port); - this.PortType = ko.observable(portType); + this.Name = ko.observable(name); + this.Ref = ko.computed(() => self.Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "")); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From 3d200d180f4cb9db2621e07c7be550f9fa5768f1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 04:32:51 -0500 Subject: [PATCH 03/79] Proton and Wine support (not complete) --- default.html | 87 ++++++++++++++-------- generator.js | 200 ++++++++++++++++++++++++++++----------------------- 2 files changed, 167 insertions(+), 120 deletions(-) diff --git a/default.html b/default.html index 52890d0..1b0a4de 100644 --- a/default.html +++ b/default.html @@ -219,6 +219,31 @@

    Basic Information

    +
    + +
    + + +
    +

    Management and Console

    @@ -322,37 +347,37 @@

    Management and Console

    + +
    Generally these are not needed for modern applications
    +
    + + + +
    + -->

    Networking

    AMP will automatically generate firewall rules to allow the application diff --git a/generator.js b/generator.js index 2e6dd04..34a9cad 100644 --- a/generator.js +++ b/generator.js @@ -1,15 +1,12 @@ -function omitNonPublicMembers(key, value) -{ +function omitNonPublicMembers(key, value) { return (key.indexOf("_") === 0) ? undefined : value; } -function omitPrivateMembers(key, value) -{ +function omitPrivateMembers(key, value) { return (key.indexOf("__") === 0) ? undefined : value; } -function downloadString(data, filename) -{ +function downloadString(data, filename) { var element = document.createElement('a'); element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data)); element.setAttribute('download', filename); @@ -28,16 +25,21 @@ class generatorViewModel { this.Meta_Description = ko.observable(""); this.Meta_Author = ko.observable(""); this.Meta_URL = ko.observable(""); + this.Meta_SpecificDockerImage = ""; this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); + this._RequiresWine = ko.observable(false); + this._RequiresProton = ko.observable(false); this.App_AdminMethod = ko.observable("STDIO"); this.App_HasReadableConsole = ko.observable(true); this.App_HasWritableConsole = ko.observable(true); this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); - this.App_CommandLineArgs = ko.observable("+ip {{$ApplicationIPBinding}} +port {{$ApplicationPort1}} +queryport {{$ApplicationPort2}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") + this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$ApplicationPort1}} +queryport {{$ApplicationPort2}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") + this.App_LinuxCommandLineArgs = ""; + this.App_WindowsCommandLineArgs = ""; this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); this.App_CommandLineParameterDelimiter = ko.observable(" "); @@ -81,13 +83,28 @@ class generatorViewModel { this.Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); + if (this._RequiresWine() == true) { + this.Meta_SpecificDockerImage = ko.computed(() => "cubecoders/ampbase:wine"); + } else { + this.Meta_SpecificDockerImage = ko.computed(() => ""); + } this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); this.App_BaseDirectory = ko.computed(() => self._UpdateSourceType() == "4" ? `./${self.__SanitizedName()}/${self._SteamServerAppID()}/` : `./${self.__SanitizedName()}/`); this.App_WorkingDir = ko.computed(() => self._UpdateSourceType() == "4" ? self._SteamServerAppID() : ""); this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_WindowsCommandLineArgs = ko.computed(() => ""); + if (self._RequiresProton() == true) { + this.App_ExecutableLinux = "/usr/bin/xvfb-run"; + this.App_LinuxCommandLineArgs = "-a \"{{$FullRootDir}}1580130/proton\" run \"./${self._WinExecutableName()}\""; + } else if (self._RequiresWine() == true) { + this.App_ExecutableLinux = "/usr/bin/xvfb-run"; + this.App_LinuxCommandLineArgs = "-a wine \"./${self._WinExecutableName()}\""; + } else { + this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_LinuxCommandLineArgs = ko.computed(() => ""); + } this.App_Ports = ko.computed(() => "@IncludeJson[" + self.Meta_PortsManifest() + "]"); this.__QueryPortName = ko.observable(""); this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); @@ -97,15 +114,13 @@ class generatorViewModel { var allPorts = self._PortMappings(); var appPortNum = 1; self.__QueryPortName(""); - for (var i = 0; i < allPorts.length; i++) - { + for (var i = 0; i < allPorts.length; i++) { var portEntry = allPorts[i]; if (portEntry.Name() == "Remote Admin Port") //RCON { data["RemoteAdminPort"] = portEntry.Port(); } - else - { + else { if (appPortNum > 3) { continue; } var portName = "ApplicationPort" + appPortNum; data[portName] = portEntry.Port(); @@ -119,11 +134,11 @@ class generatorViewModel { return data; }); - this.__SampleFormattedArgs = ko.computed(function(){ + this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); }); - this.__SampleCommandLineFlags = ko.computed(function(){ + this.__SampleCommandLineFlags = ko.computed(function () { var replacements = ko.toJS(self.__BuildPortMappings()); replacements["ApplicationIPBinding"] = "0.0.0.0"; replacements["FormattedArgs"] = self.__SampleFormattedArgs(); @@ -171,17 +186,32 @@ class generatorViewModel { { "key": "Ports", "value": self.App_Ports() + }, + { + "key": "Windows CLI Args", + "value": self.App_WindowsCommandLineArgs(), + "longValue": true + }, + { + "key": "Linux CLI Args", + "value": self.App_LinuxCommandLineArgs(), + "longValue": true +// }, +// { +// "key": "Docker Image", +// "value": self.Meta_SpecificDockerImage(), +// "longValue": true } ]; - if (self._SupportsWindows()){ + if (self._SupportsWindows()) { data.push({ "key": "Windows Executable", "value": self.App_ExecutableWin() }); } - if (self._SupportsLinux()){ + if (self._SupportsLinux()) { data.push({ "key": "Linux Executable", "value": self.App_ExecutableLinux() @@ -192,46 +222,46 @@ class generatorViewModel { }); //Action methods (add/remove/update) - this.__RemovePort = function(toRemove){ + this.__RemovePort = function (toRemove) { self._PortMappings.remove(toRemove); }; - this.__AddPort = function(){ + this.__AddPort = function () { self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewProtocol(), self)); }; - this.__RemoveSetting = function(toRemove){ + this.__RemoveSetting = function (toRemove) { self._AppSettings.remove(toRemove); }; - this.__EditSetting = function(toEdit){ + this.__EditSetting = function (toEdit) { self.__IsEditingSetting(true); self.__AddEditSetting(toEdit); $("#addEditSettingModal").modal('show'); }; - this.__AddSetting = function(){ + this.__AddSetting = function () { self.__IsEditingSetting(false); self.__AddEditSetting(new appSettingViewModel(self)); $("#addEditSettingModal").modal('show'); }; - this.__DoAddSetting = function (){ + this.__DoAddSetting = function () { self._AppSettings.push(self.__AddEditSetting()); $("#addEditSettingModal").modal('hide'); }; - this.__CloseSetting = function() { + this.__CloseSetting = function () { $("#addEditSettingModal").modal('hide'); }; - this.__Serialize = function() { + this.__Serialize = function () { var asJS = ko.toJS(self); var result = JSON.stringify(asJS, omitPrivateMembers); return result; }; - this.__Deserialize = function(inputData) { + this.__Deserialize = function (inputData) { var asJS = JSON.parse(inputData); var ports = asJS._PortMappings; var settings = asJS._AppSettings; @@ -240,19 +270,19 @@ class generatorViewModel { delete asJS._AppSettings; ko.quickmap.map(self, asJS); - + self._PortMappings.removeAll(); - var mappedPorts = ko.quickmap.to(portMappingViewModel, ports, false, {__vm: self}); + var mappedPorts = ko.quickmap.to(portMappingViewModel, ports, false, { __vm: self }); self._PortMappings.push.apply(self._PortMappings, mappedPorts); self._AppSettings.removeAll(); - var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, {__vm: self}); + var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, { __vm: self }); self._AppSettings.push.apply(self._AppSettings, mappedSettings); }; this.__IsExporting = ko.observable(false); - this.__Export = function() { + this.__Export = function () { self.__IsExporting(true); $("#importexporttextarea").val(self.__Serialize()); $("#importexporttextarea").attr("readonly", true); @@ -260,56 +290,58 @@ class generatorViewModel { autoSave(); }; - this.__CopyExportToClipboard = function(data, element) { + this.__CopyExportToClipboard = function (data, element) { navigator.clipboard.writeText($("#importexporttextarea").val()); setTimeout(() => $(element.target).tooltip('hide'), 2000); }; - this.__CloseImportExport = function() { + this.__CloseImportExport = function () { $("#importExportDialog").modal("hide"); }; - this.__Import = function() { + this.__Import = function () { self.__IsExporting(false); $("#importexporttextarea").val(""); $("#importexporttextarea").prop("readonly", false); $("#importExportDialog").modal("show"); }; - this.__DoImport = function() { + this.__DoImport = function () { self.__Deserialize($("#importexporttextarea").val()); $("#importExportDialog").modal("hide"); autoSave(); }; - this.__Share = function(data, element) { + this.__Share = function (data, element) { var data = encodeURIComponent(self.__Serialize()); var url = `${document.location.protocol}//${document.location.hostname}${document.location.pathname}#cdata=${data}`; navigator.clipboard.writeText(url); setTimeout(() => $(element.target).tooltip('hide'), 2000); }; - this.__Clear = function(){ + this.__Clear = function () { localStorage.configgenautosave = ""; document.location.reload(); } - this.__DownloadConfig = function(){ + this.__DownloadConfig = function () { if (this.__ValidationResult() < 2) { return; } var lines = []; - for (const key of Object.keys(self).filter(k => !k.startsWith("_"))) - { + for (const key of Object.keys(self).filter(k => !k.startsWith("_"))) { lines.push(`${key.replace("_", ".")}=${self[key]()}`); } - switch (self._UpdateSourceType()) - { + switch (self._UpdateSourceType()) { case "1": //URL lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); break; case "4": //Steam - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); + if (_RequiresProton == true) { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); + } else { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); + } break; case "16": //Github lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); @@ -318,12 +350,15 @@ class generatorViewModel { if (self._UpdateSourceType() == "4") //SteamCMD { - lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); + if (self._RequiresProton() == true) { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); + } else { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); + } } var portMappings = self.__BuildPortMappings(); - for (const key of Object.keys(portMappings)) - { + for (const key of Object.keys(portMappings)) { lines.push(`App.${key}=${portMappings[key]}`); } @@ -331,28 +366,26 @@ class generatorViewModel { downloadString(output, self.Meta_ConfigRoot()); }; - this.__DownloadSettingsManifest = function(){ + this.__DownloadSettingsManifest = function () { if (this.__ValidationResult() < 2) { return; } var asJS = ko.toJS(self._AppSettings()); downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_ConfigManifest()); }; - this.__DownloadPortsManifest = function(){ + this.__DownloadPortsManifest = function () { if (this.__ValidationResult() < 2) { return; } var asJS = ko.toJS(self._PortMappings()); downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_PortsManifest()); }; - this.__Invalidate = function(newValue){ + this.__Invalidate = function (newValue) { self.__ValidationResult(0); }; - for (const k of Object.keys(self)) - { - if (ko.isObservable(self[k])) - { + for (const k of Object.keys(self)) { + if (ko.isObservable(self[k])) { self[k].subscribe(self.__Invalidate); } } @@ -361,7 +394,7 @@ class generatorViewModel { this.__ValidationResults = ko.observableArray(); - this.__ValidateConfig = function(){ + this.__ValidateConfig = function () { autoSave(); self.__ValidationResults.removeAll(); @@ -370,70 +403,62 @@ class generatorViewModel { var info = (issue, recommendation, impact) => self.__ValidationResults.push(new validationResult("Info", issue, recommendation, impact)); //Validation Begins - if (self.Meta_DisplayName() == ""){ + if (self.Meta_DisplayName() == "") { failure("Missing application name", "Specify an application name under 'Basic Configuration'"); } - if (!self._SupportsWindows() && !self._SupportsLinux()) - { + if (!self._SupportsWindows() && !self._SupportsLinux()) { failure("No platforms have been specified as supported.", "Specify at least one supported platform under 'Basic Information'"); } - if (self._SupportsWindows()) - { + if (self._SupportsWindows()) { if (self._WinExecutableName() == "") { failure("Windows is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } else if (!self._WinExecutableName().toLowerCase().endsWith(".exe")) { failure("You can only start executables (.exe) files on Windows from AMP. Do not attempt to use batch files or other file types.", "Change your Windows Executable under Startup and Shutdown to be a .exe file."); } } - if (self._SupportsLinux()) - { + if (self._SupportsLinux()) { if (self._LinuxExecutableName() == "") { failure("Linux is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } else if (self._LinuxExecutableName().toLowerCase().endsWith(".sh")) { failure("You can only start executables files from AMP. Do not attempt to use shell scripts or other file types.", "Change your Linux Executable under Startup and Shutdown to be an actual executable rather than a script."); } } - switch (self.App_AdminMethod()) - { - case "PinballWizard": + switch (self.App_AdminMethod()) { + case "PinballWizard": case "AMP_GSIO": break; case "STDIO": - if (!self.App_HasReadableConsole() && !self.App_HasWritableConsole()) - { + if (!self.App_HasReadableConsole() && !self.App_HasWritableConsole()) { failure("Standard IO was selected as the management type, but the console was set as neither readable nor writable - so AMP won't be able to do anything useful.", "Either enable Reading or Writing for the console (if the application supports it) - or change the management mode to 'None'"); } break; default: - if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")){ + if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); } - if (!self.App_CommandLineArgs().contains(this.__QueryPortName())){ + if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); } - if (self._PortMappings().filter(p => p.Name() == "RCON Port").length == 0) - { + if (self._PortMappings().filter(p => p.Name() == "RCON Port").length == 0) { warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); } break; } - switch (self._UpdateSourceType()) - { + switch (self._UpdateSourceType()) { case "1": //Fetch from URL if (self._UpdateSourceURL() == "") { failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); } - else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) - { + else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); } break; case "4": //SteamCMD - if (self._SteamServerAppID() == "") { + if (self._SteamServerAppID() == "") { failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); } - if (self._SteamClientAppID() == "") { + if (self._SteamClientAppID() == "") { warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); } break; @@ -443,22 +468,22 @@ class generatorViewModel { if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } + if ((self._RequiresWine() == true && self._SupportsLinux() == false) || (self._RequiresProton() == true && self._SupportsLinux() == false)) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } + if (self._RequiresWine() == true && self._RequiresProton() == true) { failure("Only one Linux compatibility layer can be chosen.", "Remove one of the selections."); } + //Validation Summary var failures = self.__ValidationResults().filter(r => r.grade == "Failure").length; var warnings = self.__ValidationResults().filter(r => r.grade == "Warning").length; - if (failures > 0) - { + if (failures > 0) { self.__ValidationResult(1); } - else if (warnings > 0) - { + else if (warnings > 0) { self.__ValidationResult(2); } - else - { + else { self.__ValidationResult(3); } }; @@ -472,8 +497,7 @@ class validationResult { this.recommendation = recommendation; this.impact = impact || ""; this.gradeClass = ""; - switch (grade) - { + switch (grade) { case "Failure": this.gradeClass = "table-danger"; break; case "Warning": this.gradeClass = "table-warning"; break; case "Info": this.gradeClass = "table-info"; break; @@ -529,13 +553,13 @@ function autoSave() { localStorage.configgenautosave = vm.__Serialize(); } -function autoLoad(){ - if (localStorage.configgenautosave != ""){ +function autoLoad() { + if (localStorage.configgenautosave != "") { vm.__Deserialize(localStorage.configgenautosave); } } -document.addEventListener('DOMContentLoaded',() => { +document.addEventListener('DOMContentLoaded', () => { ko.applyBindings(vm); setInterval(autoSave, 30000); $('body').scrollspy({ target: '#navbar', offset: 90 }); @@ -546,14 +570,12 @@ document.addEventListener('DOMContentLoaded',() => { placement: 'bottom' }); //Check if there is anything after the # and if it starts cdata=, then import it if it does. - if (document.location.hash.indexOf("#cdata=") == 0) - { + if (document.location.hash.indexOf("#cdata=") == 0) { var data = decodeURIComponent(document.location.hash.substr(7)); vm.__Deserialize(data); document.location.hash = ""; } - else - { + else { autoLoad(); } }); From 38bf2a8f3a37c23059d7f91c6b281ec723f00cd6 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 12:52:11 -0500 Subject: [PATCH 04/79] Fixed HTML errors & warninig, Proton works, Wine... does not --- default.html | 50 +++++++++++++++++-------------- generator.js | 85 ++++++++++++++++++++++++++++------------------------ 2 files changed, 73 insertions(+), 62 deletions(-) diff --git a/default.html b/default.html index 1b0a4de..6a564d0 100644 --- a/default.html +++ b/default.html @@ -224,7 +224,7 @@

    Basic Information

    -
    Display NameDescriptionField NameDefault ValueCommand LineDisplay NameDescriptionField NameDefault ValueSuffixCommand Line
    + data-bind="click: __EditSetting"> + Edit + + data-bind="click: __RemoveSetting"> + Delete +
    + data-bind="click: __AddSetting"> + Add Setting +
    Port Number Usage TypeProtocol
    - + + + + + - + + + + +
    +
    - - - - + + + + + + @@ -408,7 +410,7 @@

    Networking

     @@ -452,7 +454,7 @@

    Networking

     @@ -591,15 +593,17 @@

    Update Sources

    Configuration and Settings

    -
    Port NumberUsage TypeProtocol
    Port NumberUsage TypeProtocol
    +
    - - - - - - - + + + + + + + + + @@ -904,28 +908,28 @@

    Validate and Review

    Display NameDescriptionField NameDefault ValueSuffixCommand Line
    Display NameDescriptionField NameDefault ValueSuffixCommand Line
    - + + - - - diff --git a/generator.js b/generator.js index 34a9cad..dd70b93 100644 --- a/generator.js +++ b/generator.js @@ -28,7 +28,7 @@ class generatorViewModel { this.Meta_SpecificDockerImage = ""; this._SupportsWindows = ko.observable(true); - this._SupportsLinux = ko.observable(true); + this._SupportsLinux = ko.observable(true); this._RequiresWine = ko.observable(false); this._RequiresProton = ko.observable(false); @@ -70,6 +70,8 @@ class generatorViewModel { this._WinExecutableName = ko.observable(""); this._LinuxExecutableName = ko.observable(""); + this.App_ExecutableLinux = ko.observable(""); + this.App_ExecutableWin = ko.observable(""); this._AppSettings = ko.observableArray(); //of appSettingViewModel this.__AddEditSetting = ko.observable(null); //of appSettingViewModel @@ -79,33 +81,49 @@ class generatorViewModel { this.__SanitizedName = ko.computed(() => self.Meta_DisplayName().replace(/\s+/g, "-").replace(/[^a-z\d-_]/ig, "").toLowerCase()); this.Meta_OS = ko.computed(() => (self._SupportsWindows() ? 1 : 0) | (self._SupportsLinux() ? 2 : 0)); this.Meta_ConfigManifest = ko.computed(() => self.__SanitizedName() + "config.json"); - this.Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); - this.Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); + this._Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); + this._Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); - if (this._RequiresWine() == true) { - this.Meta_SpecificDockerImage = ko.computed(() => "cubecoders/ampbase:wine"); - } else { - this.Meta_SpecificDockerImage = ko.computed(() => ""); - } + this.Meta_SpecificDockerImage = ko.computed(() => ``); this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); this.App_BaseDirectory = ko.computed(() => self._UpdateSourceType() == "4" ? `./${self.__SanitizedName()}/${self._SteamServerAppID()}/` : `./${self.__SanitizedName()}/`); this.App_WorkingDir = ko.computed(() => self._UpdateSourceType() == "4" ? self._SteamServerAppID() : ""); this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); - this.App_WindowsCommandLineArgs = ko.computed(() => ""); - if (self._RequiresProton() == true) { - this.App_ExecutableLinux = "/usr/bin/xvfb-run"; - this.App_LinuxCommandLineArgs = "-a \"{{$FullRootDir}}1580130/proton\" run \"./${self._WinExecutableName()}\""; - } else if (self._RequiresWine() == true) { - this.App_ExecutableLinux = "/usr/bin/xvfb-run"; - this.App_LinuxCommandLineArgs = "-a wine \"./${self._WinExecutableName()}\""; - } else { - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - this.App_LinuxCommandLineArgs = ko.computed(() => ""); + this.App_WindowsCommandLineArgs = ko.computed(() => ``); + this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_LinuxCommandLineArgs = ko.computed(() => ``); + + this._RequiresProtonProcessing = function (proton) { + if (proton) { + this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); + this.Meta_SpecificDockerImage = ko.computed(() => ``); + } else { + this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_LinuxCommandLineArgs = ko.computed(() => ``); + this.Meta_SpecificDockerImage = ko.computed(() => ``); + } + } + + this._RequiresWineProcessing = function (wine) { + if (wine) { + this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => `-a wine \"./` + self._WinExecutableName() + `\"`); + this.Meta_SpecificDockerImage = ko.computed(() => `cubecoders/ampbase:wine`); + } else { + this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_LinuxCommandLineArgs = ko.computed(() => ``); + this.Meta_SpecificDockerImage = ko.computed(() => ``); + } } - this.App_Ports = ko.computed(() => "@IncludeJson[" + self.Meta_PortsManifest() + "]"); + + this._RequiresProton.subscribe(this._RequiresProtonProcessing, this); + this._RequiresWine.subscribe(this._RequiresWineProcessing, this); + + this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.__QueryPortName = ko.observable(""); this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); @@ -184,23 +202,13 @@ class generatorViewModel { "longValue": true }, { - "key": "Ports", - "value": self.App_Ports() - }, - { - "key": "Windows CLI Args", - "value": self.App_WindowsCommandLineArgs(), + "key": "Docker Image", + "value": self.Meta_SpecificDockerImage(), "longValue": true }, { - "key": "Linux CLI Args", - "value": self.App_LinuxCommandLineArgs(), - "longValue": true -// }, -// { -// "key": "Docker Image", -// "value": self.Meta_SpecificDockerImage(), -// "longValue": true + "key": "Proton", + "value": self._RequiresProton() } ]; @@ -337,7 +345,7 @@ class generatorViewModel { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); break; case "4": //Steam - if (_RequiresProton == true) { + if (self._RequiresProton()) { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); } else { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); @@ -350,7 +358,7 @@ class generatorViewModel { if (self._UpdateSourceType() == "4") //SteamCMD { - if (self._RequiresProton() == true) { + if (self._RequiresProton()) { lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); } else { lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); @@ -377,7 +385,7 @@ class generatorViewModel { if (this.__ValidationResult() < 2) { return; } var asJS = ko.toJS(self._PortMappings()); - downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_PortsManifest()); + downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self._Meta_PortsManifest()); }; this.__Invalidate = function (newValue) { @@ -468,8 +476,8 @@ class generatorViewModel { if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } - if ((self._RequiresWine() == true && self._SupportsLinux() == false) || (self._RequiresProton() == true && self._SupportsLinux() == false)) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } - if (self._RequiresWine() == true && self._RequiresProton() == true) { failure("Only one Linux compatibility layer can be chosen.", "Remove one of the selections."); } + if ((self._RequiresWine() && !self._SupportsLinux()) || (self._RequiresProton() && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } + if (self._RequiresWine() && self._RequiresProton()) { failure("Only one Linux compatibility layer can be chosen.", "Remove one of the selections."); } //Validation Summary @@ -489,7 +497,6 @@ class generatorViewModel { }; } } - class validationResult { constructor(grade, issue, recommendation, impact) { this.grade = grade; From e46aba4debb26464ff3359a5a8e409cbc18952a2 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 13:33:08 -0500 Subject: [PATCH 05/79] Switch compatibility to radio buttons --- default.html | 31 ++++++++++++++++++++---------- generator.js | 53 +++++++++++++++++++++------------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/default.html b/default.html index 6a564d0..43ea8c4 100644 --- a/default.html +++ b/default.html @@ -220,29 +220,40 @@

    Basic Information

    - -
    -

    Management and Console

    diff --git a/generator.js b/generator.js index dd70b93..cf84e5c 100644 --- a/generator.js +++ b/generator.js @@ -28,9 +28,8 @@ class generatorViewModel { this.Meta_SpecificDockerImage = ""; this._SupportsWindows = ko.observable(true); - this._SupportsLinux = ko.observable(true); - this._RequiresWine = ko.observable(false); - this._RequiresProton = ko.observable(false); + this._SupportsLinux = ko.observable(true); + this._compatibility = ko.observable("None"); this.App_AdminMethod = ko.observable("STDIO"); this.App_HasReadableConsole = ko.observable(true); @@ -85,7 +84,7 @@ class generatorViewModel { this._Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); - this.Meta_SpecificDockerImage = ko.computed(() => ``); +// this.Meta_SpecificDockerImage = ko.computed(() => ``); this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); this.App_BaseDirectory = ko.computed(() => self._UpdateSourceType() == "4" ? `./${self.__SanitizedName()}/${self._SteamServerAppID()}/` : `./${self.__SanitizedName()}/`); @@ -93,36 +92,28 @@ class generatorViewModel { this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_WindowsCommandLineArgs = ko.computed(() => ``); - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - this.App_LinuxCommandLineArgs = ko.computed(() => ``); + // this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); +// this.App_LinuxCommandLineArgs = ko.computed(() => ``); - this._RequiresProtonProcessing = function (proton) { - if (proton) { - this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); - this.Meta_SpecificDockerImage = ko.computed(() => ``); - } else { + switch (self._compatibility()) { + case "None": this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); this.App_LinuxCommandLineArgs = ko.computed(() => ``); this.Meta_SpecificDockerImage = ko.computed(() => ``); - } - } - - this._RequiresWineProcessing = function (wine) { - if (wine) { + break; + case "Wine": this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); this.App_LinuxCommandLineArgs = ko.computed(() => `-a wine \"./` + self._WinExecutableName() + `\"`); this.Meta_SpecificDockerImage = ko.computed(() => `cubecoders/ampbase:wine`); - } else { - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - this.App_LinuxCommandLineArgs = ko.computed(() => ``); + break; + case "Proton": + this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); this.Meta_SpecificDockerImage = ko.computed(() => ``); - } + break; } - this._RequiresProton.subscribe(this._RequiresProtonProcessing, this); - this._RequiresWine.subscribe(this._RequiresWineProcessing, this); - + this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.__QueryPortName = ko.observable(""); this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); @@ -207,8 +198,8 @@ class generatorViewModel { "longValue": true }, { - "key": "Proton", - "value": self._RequiresProton() + "key": "Compatibility", + "value": self._compatibility() } ]; @@ -345,7 +336,7 @@ class generatorViewModel { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); break; case "4": //Steam - if (self._RequiresProton()) { + if (self._compatibility() == "Proton") { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); } else { lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); @@ -358,7 +349,7 @@ class generatorViewModel { if (self._UpdateSourceType() == "4") //SteamCMD { - if (self._RequiresProton()) { + if (self._compatibility() == "Proton") { lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); } else { lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); @@ -440,7 +431,7 @@ class generatorViewModel { break; default: if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { - warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); + warning("A server management mode is specified that AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); } if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { @@ -476,9 +467,7 @@ class generatorViewModel { if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } - if ((self._RequiresWine() && !self._SupportsLinux()) || (self._RequiresProton() && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } - if (self._RequiresWine() && self._RequiresProton()) { failure("Only one Linux compatibility layer can be chosen.", "Remove one of the selections."); } - + if ((self._compatibility() == "Wine" && !self._SupportsLinux()) || (self._compatibility() == "Proton" && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } //Validation Summary From 1857eb78e5a7e560fb76f0a5798c61e18f5b99a3 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 14:06:04 -0500 Subject: [PATCH 06/79] Begin updates to new port system (Saving progress) --- generator.js | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/generator.js b/generator.js index cf84e5c..1fb9eb4 100644 --- a/generator.js +++ b/generator.js @@ -25,7 +25,7 @@ class generatorViewModel { this.Meta_Description = ko.observable(""); this.Meta_Author = ko.observable(""); this.Meta_URL = ko.observable(""); - this.Meta_SpecificDockerImage = ""; + this.Meta_SpecificDockerImage = ko.observable(""); this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); @@ -37,8 +37,8 @@ class generatorViewModel { this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$ApplicationPort1}} +queryport {{$ApplicationPort2}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") - this.App_LinuxCommandLineArgs = ""; - this.App_WindowsCommandLineArgs = ""; + this.App_LinuxCommandLineArgs = ko.observable(""); + this.App_WindowsCommandLineArgs = ko.observable(""); this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); this.App_CommandLineParameterDelimiter = ko.observable(" "); @@ -84,7 +84,6 @@ class generatorViewModel { this._Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); -// this.Meta_SpecificDockerImage = ko.computed(() => ``); this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); this.App_BaseDirectory = ko.computed(() => self._UpdateSourceType() == "4" ? `./${self.__SanitizedName()}/${self._SteamServerAppID()}/` : `./${self.__SanitizedName()}/`); @@ -92,28 +91,29 @@ class generatorViewModel { this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_WindowsCommandLineArgs = ko.computed(() => ``); - // this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); -// this.App_LinuxCommandLineArgs = ko.computed(() => ``); - - switch (self._compatibility()) { - case "None": - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - this.App_LinuxCommandLineArgs = ko.computed(() => ``); - this.Meta_SpecificDockerImage = ko.computed(() => ``); - break; - case "Wine": - this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => `-a wine \"./` + self._WinExecutableName() + `\"`); - this.Meta_SpecificDockerImage = ko.computed(() => `cubecoders/ampbase:wine`); - break; - case "Proton": - this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); - this.Meta_SpecificDockerImage = ko.computed(() => ``); - break; + + this._compatibilityProcessing = function (compat) { + switch (self._compatibility()) { + case "None": + this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); + this.App_LinuxCommandLineArgs = ko.computed(() => ``); + this.Meta_SpecificDockerImage = ko.computed(() => ``); + break; + case "Wine": + this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => `-a wine \"./` + self._WinExecutableName() + `\"`); + this.Meta_SpecificDockerImage = ko.computed(() => `cubecoders/ampbase:wine`); + break; + case "Proton": + this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); + this.Meta_SpecificDockerImage = ko.computed(() => ``); + break; + } } - + this._compatibility.subscribe(this._compatibilityProcessing, this); + this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.__QueryPortName = ko.observable(""); this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); @@ -129,15 +129,14 @@ class generatorViewModel { { data["RemoteAdminPort"] = portEntry.Port(); } + if (portEntry.Name() == "Steam Query Port") //Query Port + { + data["SteamQueryPort"] = portEntry.Port(); + } else { - if (appPortNum > 3) { continue; } - var portName = "ApplicationPort" + appPortNum; + var portName = "Application Port" + appPortNum; data[portName] = portEntry.Port(); appPortNum++; - if (portEntry.Name() == "Steam Query Port") //QueryPort - { - self.__QueryPortName(portName); - } } } return data; From 0557d2dbc814a147d9b90cd14f3194170a97b9d3 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 11 Jun 2022 18:08:54 -0500 Subject: [PATCH 07/79] Fix my somehow working but wrong code --- generator.js | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/generator.js b/generator.js index 1fb9eb4..59d13c6 100644 --- a/generator.js +++ b/generator.js @@ -91,28 +91,9 @@ class generatorViewModel { this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_WindowsCommandLineArgs = ko.computed(() => ``); - - this._compatibilityProcessing = function (compat) { - switch (self._compatibility()) { - case "None": - this.App_ExecutableLinux = ko.computed(() => self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`); - this.App_LinuxCommandLineArgs = ko.computed(() => ``); - this.Meta_SpecificDockerImage = ko.computed(() => ``); - break; - case "Wine": - this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => `-a wine \"./` + self._WinExecutableName() + `\"`); - this.Meta_SpecificDockerImage = ko.computed(() => `cubecoders/ampbase:wine`); - break; - case "Proton": - this.App_ExecutableLinux = ko.computed(() => `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`); - this.Meta_SpecificDockerImage = ko.computed(() => ``); - break; - } - } - - this._compatibility.subscribe(this._compatibilityProcessing, this); + this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : `/usr/bin/xvfb-run`); + this.App_LinuxCommandLineArgs = ko.computed(() => self._compatibility() == "None" ? (self._compatibility() == "Wine" ? `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"` : `-a wine \"./` + self._WinExecutableName() + `\"`) : ``); + this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.__QueryPortName = ko.observable(""); From 4c55dcecc519cca4b50b745cdfda9c6902421476 Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 13 Jun 2022 10:02:21 -0500 Subject: [PATCH 08/79] Add Placeholder setting values and add setting options --- default.html | 95 ++++++++++++++++++++++++++++++++++------------------ generator.js | 6 ++-- 2 files changed, 67 insertions(+), 34 deletions(-) diff --git a/default.html b/default.html index 43ea8c4..e9a7b2c 100644 --- a/default.html +++ b/default.html @@ -1044,7 +1044,7 @@
    + data-bind="value: DisplayName" placeholder="Server Name">
    + data-bind="value: Category" placeholder="Server Settings">
    @@ -1068,7 +1068,7 @@
    + data-bind="value: Description" placeholder="The name displayed in server browser.">
    + data-bind="value: Keywords" placeholder="server,name">
    @@ -1092,7 +1092,7 @@
    + data-bind="value: FieldName" placeholder="ServerName">
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    -
    -
    -
    -
    - - -
    -
    - - -
    +
    diff --git a/generator.js b/generator.js index 59d13c6..6d8764b 100644 --- a/generator.js +++ b/generator.js @@ -505,10 +505,12 @@ class appSettingViewModel { this.InputType = ko.observable("text") this.IsFlagArgument = ko.observable(false); this.ParamFieldName = ko.computed(() => self.FieldName()); - this.IncludeInCommandLine = ko.observable(true); + this.IncludeInCommandLine = ko.observable(false); this.DefaultValue = ko.observable(""); - this.Placeholder = this.DefaultValue + this.Placeholder = ko.computed(() => self.DefaultValue()); this.Suffix = ko.observable(""); + this.Hidden = ko.observable(false); + this.SkipIfEmpty = ko.observable(false); this._CheckedValue = ko.observable("true"); this._UncheckedValue = ko.observable("false"); this.EnumValues = ko.computed(() => { From 3f2a29ef14590fa9b8dda02d451adb409bf3643c Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 13 Jun 2022 20:26:19 -0500 Subject: [PATCH 09/79] Bump version, further port settings, config settings additions --- default.html | 113 ++++++++++++++++++++++++++------------------------- generator.js | 41 +++++++++---------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/default.html b/default.html index e9a7b2c..110368a 100644 --- a/default.html +++ b/default.html @@ -116,7 +116,7 @@

    AMP Configuration Generator

    - Version 1.0
    ©2021 CubeCoders Limited     + Version 2.0
    ©2021 CubeCoders Limited
    - + Generic Configurations Wiki

    Basic Information

    @@ -358,37 +358,37 @@

    Management and Console

    + +
    Generally these are not needed for modern applications
    +
    + + + +
    +
    -->

    Networking

    AMP will automatically generate firewall rules to allow the application @@ -411,18 +411,18 @@

    Networking

    data-bind="value: Port">
    - + + @@ -411,15 +412,19 @@

    Networking

    data-bind="value: Port"> + + + @@ -423,6 +424,10 @@

    Networking

    + +
    Category - Issue - Recommentation + CategoryIssueRecommentation
    +
    Impact: + Impact:
    No validation issues + No validation issues
    - + + + @@ -455,18 +455,18 @@

    Networking

    data-bind="value: __NewPort">     		- + + + @@ -1153,27 +1153,28 @@
    -
    +
    diff --git a/generator.js b/generator.js index 6d8764b..63c2936 100644 --- a/generator.js +++ b/generator.js @@ -55,8 +55,8 @@ class generatorViewModel { this._PortMappings = ko.observableArray(); //of portMappingViewModel this.__NewPort = ko.observable("7777"); - this.__NewName = ko.observable("Application Port"); - this.__NewProtocol = ko.observable("Both"); + this.__NewPortType = ko.observable("0"); + this.__NewProtocol = ko.observable("0"); this._UpdateSourceType = ko.observable("4"); this._UpdateSourceURL = ko.observable(""); @@ -69,8 +69,6 @@ class generatorViewModel { this._WinExecutableName = ko.observable(""); this._LinuxExecutableName = ko.observable(""); - this.App_ExecutableLinux = ko.observable(""); - this.App_ExecutableWin = ko.observable(""); this._AppSettings = ko.observableArray(); //of appSettingViewModel this.__AddEditSetting = ko.observable(null); //of appSettingViewModel @@ -97,7 +95,7 @@ class generatorViewModel { this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.__QueryPortName = ko.observable(""); - this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.${self.__QueryPortName()}}` : ""); + this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}` : ""); this.__BuildPortMappings = ko.computed(() => { var data = {}; @@ -106,16 +104,13 @@ class generatorViewModel { self.__QueryPortName(""); for (var i = 0; i < allPorts.length; i++) { var portEntry = allPorts[i]; - if (portEntry.Name() == "Remote Admin Port") //RCON + if (portEntry.PortType() == "2") //RCON { data["RemoteAdminPort"] = portEntry.Port(); - } - if (portEntry.Name() == "Steam Query Port") //Query Port - { - data["SteamQueryPort"] = portEntry.Port(); - } - else { - var portName = "Application Port" + appPortNum; + } else if (portEntry.PortType() == "1") { + self.__QueryPortName(portName); + } else { + var portName = "ApplicationPort" + appPortNum; data[portName] = portEntry.Port(); appPortNum++; } @@ -147,9 +142,13 @@ class generatorViewModel { "value": self.Meta_ConfigRoot() }, { - "key": "Manifest Filename", + "key": "Settings Manifest", "value": self.Meta_ConfigManifest() }, + { + "key": "Ports Manifest", + "value": self._Meta_PortsManifest() + }, { "key": "Image Source", "value": self.Meta_DisplayImageSource(), @@ -168,7 +167,7 @@ class generatorViewModel { "value": self.App_WorkingDir() }, { - "key": "Endpoint URI Format", + "key": "Endpoint URI Format", "value": self.Meta_EndpointURIFormat(), "longValue": true }, @@ -206,7 +205,7 @@ class generatorViewModel { }; this.__AddPort = function () { - self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewProtocol(), self)); + self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewPortType(), self.__NewProtocol(), self)); }; this.__RemoveSetting = function (toRemove) { @@ -411,14 +410,14 @@ class generatorViewModel { break; default: if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { - warning("A server management mode is specified that AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); + warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); } if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); } - if (self._PortMappings().filter(p => p.Name() == "RCON Port").length == 0) { + if (self._PortMappings().filter(p => p.PortType() == "2").length == 0) { warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); } break; @@ -482,13 +481,13 @@ class validationResult { } class portMappingViewModel { - constructor(port, name, protocol, vm) { + constructor(port, portType, protocol, vm) { var self = this; this.__vm = vm; this.Protocol = ko.observable(protocol); this.Port = ko.observable(port); - this.Name = ko.observable(name); - this.Ref = ko.computed(() => self.Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "")); + this.PortType = ko.observable(portType); + this.Ref = ko.computed(() => self.PortType().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "")); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From 4ad1a998a65226fa4ee3f8cec5617fa80283aef2 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 09:24:48 -0500 Subject: [PATCH 10/79] Working on ports --- default.html | 19 +++++++++++++------ generator.js | 48 ++++++++++++------------------------------------ 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/default.html b/default.html index 110368a..e5a8311 100644 --- a/default.html +++ b/default.html @@ -398,7 +398,8 @@

    Networking
    Port NumberUsage TypeTypeName Protocol
    - + - + + + +
    This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP. diff --git a/generator.js b/generator.js index 63c2936..65cac6e 100644 --- a/generator.js +++ b/generator.js @@ -55,6 +55,7 @@ class generatorViewModel { this._PortMappings = ko.observableArray(); //of portMappingViewModel this.__NewPort = ko.observable("7777"); + this.__NewName = ko.observable(""); this.__NewPortType = ko.observable("0"); this.__NewProtocol = ko.observable("0"); @@ -94,43 +95,21 @@ class generatorViewModel { this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); - this.__QueryPortName = ko.observable(""); - this.Meta_EndpointURIFormat = ko.computed(() => self.__QueryPortName() != "" ? `steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}` : ""); - - this.__BuildPortMappings = ko.computed(() => { - var data = {}; - var allPorts = self._PortMappings(); - var appPortNum = 1; - self.__QueryPortName(""); - for (var i = 0; i < allPorts.length; i++) { - var portEntry = allPorts[i]; - if (portEntry.PortType() == "2") //RCON - { - data["RemoteAdminPort"] = portEntry.Port(); - } else if (portEntry.PortType() == "1") { - self.__QueryPortName(portName); - } else { - var portName = "ApplicationPort" + appPortNum; - data[portName] = portEntry.Port(); - appPortNum++; - } - } - return data; - }); + this.Meta_EndpointURIFormat = ko.computed(() => `steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); }); - +/* this.__SampleCommandLineFlags = ko.computed(function () { - var replacements = ko.toJS(self.__BuildPortMappings()); + var replacements; replacements["ApplicationIPBinding"] = "0.0.0.0"; replacements["FormattedArgs"] = self.__SampleFormattedArgs(); replacements["MaxUsers"] = "10"; replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; return self.App_CommandLineArgs().template(replacements); }); - +*/ this.__GenData = ko.computed(function () { var data = [ { @@ -205,7 +184,7 @@ class generatorViewModel { }; this.__AddPort = function () { - self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewPortType(), self.__NewProtocol(), self)); + self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewPortType(), self.__NewProtocol(), self)); }; this.__RemoveSetting = function (toRemove) { @@ -335,11 +314,6 @@ class generatorViewModel { } } - var portMappings = self.__BuildPortMappings(); - for (const key of Object.keys(portMappings)) { - lines.push(`App.${key}=${portMappings[key]}`); - } - var output = lines.sort().join("\n"); downloadString(output, self.Meta_ConfigRoot()); }; @@ -481,13 +455,15 @@ class validationResult { } class portMappingViewModel { - constructor(port, portType, protocol, vm) { + constructor(port, portName, portType, protocol, vm) { var self = this; this.__vm = vm; - this.Protocol = ko.observable(protocol); + this._Protocol = ko.observable(protocol); + this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP` )); this.Port = ko.observable(port); - this.PortType = ko.observable(portType); - this.Ref = ko.computed(() => self.PortType().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "")); + this.Name = ko.observable(portName); + this._PortType = ko.observable(portType); + this.Ref = ko.computed(() => self._PortType() == "0" ? self.Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : `RemoteAdminPort`)); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From 39ff13379faf28061c509d38edea9e6fd26db2e1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 12:09:15 -0500 Subject: [PATCH 11/79] Port Description --- default.html | 11 ++++++++++- generator.js | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/default.html b/default.html index e5a8311..20cf50d 100644 --- a/default.html +++ b/default.html @@ -400,6 +400,7 @@

    Networking

    		Port Number Type NameDescription Protocol
    + + + +
    This is what will show up within AMP as the name of the @@ -166,7 +166,7 @@

    Basic Information

    -
    Optional: useful for describing different variants/configurations @@ -179,13 +179,13 @@

    Basic Information

    + data-bind="value: Meta_Author" placeholder="CubeCoders">
    Who are you? Take some credit for your work!
    + data-bind="value: Meta_URL" placeholder="https://store.steampowered.com/app/892970/Valheim/">
    A link to where you can learn more about the application, such as a store listing. @@ -397,7 +397,7 @@

    Networking

    - + @@ -414,7 +414,7 @@

    Networking

    diff --git a/generator.js b/generator.js index ddc9f72..f60b1d6 100644 --- a/generator.js +++ b/generator.js @@ -23,9 +23,15 @@ class generatorViewModel { this.Meta_DisplayName = ko.observable(""); this.Meta_Description = ko.observable(""); + this.Meta_Arch = ko.observable("x86_64"); this.Meta_Author = ko.observable(""); this.Meta_URL = ko.observable(""); + this.Meta_MinAMPVersion = ko.observable(""); this.Meta_SpecificDockerImage = ko.observable(""); + this.Meta_DockerRequired = ko.observable("False"); + this.Meta_ContainerPolicy = ko.observable("Supported"); + this.Meta_Prerequsites = ko.observable("[]"); + this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); @@ -44,14 +50,58 @@ class generatorViewModel { this.App_RapidStartup = ko.observable("false"); this.App_ApplicationReadyMode = ko.observable("Immediate"); - this.App_ExitMethod = ko.observable("String"); + this.App_ExitMethod = ko.observable("OS_CLOSE"); this.App_ExitString = ko.observable("stop"); + this.App_UseLinuxIOREDIR = ko.observable("False"); + this.App_ExitTimeout = ko.observable("30"); + this.App_ExitFile = ko.observable("app_exit.lck"); + this.App_SupportsLiveSettingsChanges = ko.observable("False"); + this.App_LiveSettingChangeCommandFormat = ko.observable("set {0} \"{ 1}\""); + this.App_ApplicationIPBinding = ko.observable("0.0.0.0"); + this.App_AdminPortRef = ko.observable("GamePort1"); + this.App_UniversalSleepApplicationUDPPortRef = ko.observable("GamePort1"); + this.App_PrimaryApplicationPortRef = ko.observable("GamePort1"); + this.App_UniversalSleepSteamQueryPortRef = ko.observable("SteamQueryPort"); + this.App_MaxUsers = ko.observable("8"); + this.App_UseRandomAdminPassword = ko.observable("True"); + this.App_RemoteAdminPassword = ko.observable(""); + this.App_AdminLoginTransform = ko.observable("None"); + this.App_RCONConnectDelaySeconds = ko.observable("30"); + this.App_RCONConnectRetrySeconds = ko.observable("15"); + this.App_TelnetLoginFormat = ko.observable("{0}"); + this.App_SteamUpdateAnonymousLogin = ko.observable("True"); + this.App_SteamForceLoginProm = ko.observable("False"); + this.App_SupportsUniversalSleep = ko.observable("False"); + this.App_WakeupMode = ko.observable("Any"); + this.App_TemplateMatchRegex = ko.observable("{{(\\$?[\\w]+)}}"); + this.App_MonitorChildProcess = ko.observable("False"); + this.App_MonitorChildProcessWaitMs = ko.observable("1000"); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_FilterMatchRegex = ko.observable(""); + this.App_FilterMatchReplacement = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_MonitorChildProcessName = ko.observable(""); this.Console_ThrowawayMessageRegex = ko.observable("^(WARNING|ERROR): Shader.+$"); this.Console_AppReadyRegex = ko.observable("^Server is ready.$"); this.Console_UserJoinRegex = ko.observable("^User (?.+?) \\((?-?\d+)\\) connected from \\[::ffff:(?.+?)\\]$"); this.Console_UserLeaveRegex = ko.observable("^User (?.+?) \\((?-?\d+)\\) disconnected\\. Reason: (.+?)$"); this.Console_UserChatRegex = ko.observable("^(?.+?): (?.+)$"); + this.Console_UpdateAvailableRegex = ko.observable("^\\[\\d\\d:\\d\\d:\\d\\d\\] \\[INFO\\] A new server update is available! v[\\d\\.]+.$"); + this.Console_MetricsRegex = ko.observable(""); + this.Console_SuppressLogAtStart = ko.observable("False"); + this.Console_ActivateLogRegex = ko.observable(""); + this.Console_UserActions = ko.observable("{}"); + this.Console_SleepMode = ko.observable("False"); + this.Console_SleepOnStart = ko.observable("False"); + this.Console_SleepDelayMinutes = ko.observable("5"); + this.Console_DozeDelay = ko.observable("2"); + this.Console_AutoRetryCount = ko.observable("5"); + this.Console_SleepStartThresholdSeconds = ko.observable("25"); this._PortMappings = ko.observableArray(); //of portMappingViewModel this.__NewPort = ko.observable("7777"); @@ -92,7 +142,7 @@ class generatorViewModel { this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_WindowsCommandLineArgs = ko.computed(() => ``); this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : `/usr/bin/xvfb-run`); - this.App_LinuxCommandLineArgs = ko.computed(() => self._compatibility() == "None" ? (self._compatibility() == "Wine" ? `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"` : `-a wine \"./` + self._WinExecutableName() + `\"`) : ``); + this.App_LinuxCommandLineArgs = ko.computed(() => self._compatibility() == "None" ? `` : (self._compatibility() == "Wine" ? `-a wine \"./` + self._WinExecutableName() + `\"` : `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`)); this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); From 66ae9b01f5b16b150df8a0b6f2be6f6c1367896a Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 19:09:07 -0500 Subject: [PATCH 14/79] Does anyone even read these? --- generator.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/generator.js b/generator.js index f60b1d6..6e159ea 100644 --- a/generator.js +++ b/generator.js @@ -146,7 +146,7 @@ class generatorViewModel { this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); - this.Meta_EndpointURIFormat = ko.computed(() => `steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); + this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); @@ -196,11 +196,6 @@ class generatorViewModel { "key": "Working Directory", "value": self.App_WorkingDir() }, - { - "key": "Endpoint URI Format", - "value": self.Meta_EndpointURIFormat(), - "longValue": true - }, { "key": "Docker Image", "value": self.Meta_SpecificDockerImage(), From a5983b10c3814e956a47bc610cf168cba73ce794 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 20:10:14 -0500 Subject: [PATCH 15/79] Add Meta Config Manifest --- default.html | 146 +++++++++++++++++++++++++++++++++++++++------------ generator.js | 68 +++++++++++++++++++----- 2 files changed, 169 insertions(+), 45 deletions(-) diff --git a/default.html b/default.html index 61f882a..3f2efe6 100644 --- a/default.html +++ b/default.html @@ -358,37 +358,37 @@

    Management and Console

    + +
    Generally these are not needed for modern applications
    +
    + + + +
    + -->

    Networking

    AMP will automatically generate firewall rules to allow the application @@ -672,7 +672,80 @@

    Configuration and Settings

    Port NumberNumber Type Name Description + data-bind="value: _Name"> + data-bind="value: _Description">
    - You may add up to 3 ports. The RCON port does + You may add any number of ports. The RCON port does not count towards this limit.
    Maximum of 1 Steam Query and 1 RCON Port.     @@ -584,7 +584,7 @@

    Update Sources

    + data-bind="value: _SteamServerAppID, valueUpdate: 'input'" placeholder="896660">
    The App ID for the dedicated server application. You can find this via SteamDB. @@ -593,7 +593,7 @@

    Update Sources

    + data-bind="value: _SteamClientAppID, valueUpdate: 'input'" placeholder="892970">
    The App ID for the game itself. You can find this via SteamDB.
    diff --git a/generator.js b/generator.js index a9fbcac..ddc9f72 100644 --- a/generator.js +++ b/generator.js @@ -462,10 +462,12 @@ class portMappingViewModel { this._Protocol = ko.observable(protocol); this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP` )); this.Port = ko.observable(port); - this.Name = ko.observable(portName); - this.Description = ko.observable(portDescription); this._PortType = ko.observable(portType); - this.Ref = ko.computed(() => self._PortType() == "0" ? self.Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : `RemoteAdminPort`)); + this._Name = ko.observable(portName); + this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : `Remote Admin Port` )); + this._Description = ko.observable(portDescription); + this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : `Port used for RCON administration`)); + this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : `RemoteAdminPort`)); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From 99e060ba89c7d51a2d9cf073fb1923e18f5f540d Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 18:46:59 -0500 Subject: [PATCH 13/79] Add all default settings --- default.html | 5 ++--- generator.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/default.html b/default.html index 1ed41a4..61f882a 100644 --- a/default.html +++ b/default.html @@ -453,9 +453,8 @@

    Networking

    - You may add any number of ports. The RCON port does - not count towards this limit.
    Maximum of 1 Steam Query and 1 RCON - Port. + You may add any number of ports.
    + Maximum of 1 Steam Query and 1 RCON Port.
    - +
    Configuration Files
    +
    + Select the location of any game server configuration files AMP should manage. Location relative to Base Directory. +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Config FileConfig TypeAutoMap
    + + + + + + + +
    No config files have been added.
    + + + + + + + +

    Startup and Shutdown

    Application and Parameters
    @@ -984,6 +1057,13 @@

    Validate and Review

     Download Ports Manifest +

    @@ -1231,7 +1311,7 @@

    -
    +
    diff --git a/generator.js b/generator.js index 6e159ea..fbff3e0 100644 --- a/generator.js +++ b/generator.js @@ -110,6 +110,11 @@ class generatorViewModel { this.__NewPortType = ko.observable("0"); this.__NewProtocol = ko.observable("0"); + this._ConfigFileMappings = ko.observableArray(); //of configFileMappingViewModel + this.__NewConfigFile = ko.observable(""); + this.__NewAutoMap = ko.observable(true); + this.__NewConfigType = ko.observable(""); + this._UpdateSourceType = ko.observable("4"); this._UpdateSourceURL = ko.observable(""); this._UpdateSourceGitRepo = ko.observable(""); @@ -130,6 +135,7 @@ class generatorViewModel { this.__SanitizedName = ko.computed(() => self.Meta_DisplayName().replace(/\s+/g, "-").replace(/[^a-z\d-_]/ig, "").toLowerCase()); this.Meta_OS = ko.computed(() => (self._SupportsWindows() ? 1 : 0) | (self._SupportsLinux() ? 2 : 0)); this.Meta_ConfigManifest = ko.computed(() => self.__SanitizedName() + "config.json"); + this.Meta_MetaConfigManifest = ko.computed(() => self.__SanitizedName() + "metaconfig.json"); this._Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); this._Meta_UpdatesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); @@ -151,16 +157,16 @@ class generatorViewModel { this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); }); -/* - this.__SampleCommandLineFlags = ko.computed(function () { - var replacements; - replacements["ApplicationIPBinding"] = "0.0.0.0"; - replacements["FormattedArgs"] = self.__SampleFormattedArgs(); - replacements["MaxUsers"] = "10"; - replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; - return self.App_CommandLineArgs().template(replacements); - }); -*/ + /* + this.__SampleCommandLineFlags = ko.computed(function () { + var replacements; + replacements["ApplicationIPBinding"] = "0.0.0.0"; + replacements["FormattedArgs"] = self.__SampleFormattedArgs(); + replacements["MaxUsers"] = "10"; + replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; + return self.App_CommandLineArgs().template(replacements); + }); + */ this.__GenData = ko.computed(function () { var data = [ { @@ -179,6 +185,10 @@ class generatorViewModel { "key": "Ports Manifest", "value": self._Meta_PortsManifest() }, + { + "key": "Config Files Manifest", + "value": self.Meta_MetaConfigManifest() + }, { "key": "Image Source", "value": self.Meta_DisplayImageSource(), @@ -233,6 +243,14 @@ class generatorViewModel { self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewDescription(), self.__NewPortType(), self.__NewProtocol(), self)); }; + this.__RemoveConfigFile = function (toRemove) { + self._ConfigFileMappings.remove(toRemove); + }; + + this.__AddConfigFile = function () { + self._ConfigFileMappings.push(new configFileMappingViewModel(self.__NewConfigFile(), self.__NewAutoMap(), self.__NewConfigType(), self)); + }; + this.__RemoveSetting = function (toRemove) { self._AppSettings.remove(toRemove); }; @@ -267,9 +285,11 @@ class generatorViewModel { this.__Deserialize = function (inputData) { var asJS = JSON.parse(inputData); var ports = asJS._PortMappings; + var configFiles = asJS._ConfigFileMappings; var settings = asJS._AppSettings; delete asJS._PortMappings; + delete asJS._ConfigFileMappings; delete asJS._AppSettings; ko.quickmap.map(self, asJS); @@ -278,6 +298,10 @@ class generatorViewModel { var mappedPorts = ko.quickmap.to(portMappingViewModel, ports, false, { __vm: self }); self._PortMappings.push.apply(self._PortMappings, mappedPorts); + self._ConfigFileMappings.removeAll(); + var mappedConfigFiles = ko.quickmap.to(configFileMappingViewModel, configFiles, false, { __vm: self }); + self._ConfigFileMappings.push.apply(self._ConfigFileMappings, mappedConfigFiles); + self._AppSettings.removeAll(); var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, { __vm: self }); self._AppSettings.push.apply(self._AppSettings, mappedSettings); @@ -378,6 +402,13 @@ class generatorViewModel { downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self._Meta_PortsManifest()); }; + this.__DownloadConfigFilesManifest = function () { + if (this.__ValidationResult() < 2) { return; } + + var asJS = ko.toJS(self._ConfigFileMappings()); + downloadString(JSON.stringify(asJS, omitNonPublicMembers, 4), self.Meta_MetaConfigManifest()); + }; + this.__Invalidate = function (newValue) { self.__ValidationResult(0); }; @@ -505,11 +536,11 @@ class portMappingViewModel { var self = this; this.__vm = vm; this._Protocol = ko.observable(protocol); - this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP` )); + this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP`)); this.Port = ko.observable(port); this._PortType = ko.observable(portType); this._Name = ko.observable(portName); - this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : `Remote Admin Port` )); + this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : `Remote Admin Port`)); this._Description = ko.observable(portDescription); this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : `Port used for RCON administration`)); this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : `RemoteAdminPort`)); @@ -517,6 +548,19 @@ class portMappingViewModel { } } +class configFileMappingViewModel { + constructor(configFile, autoMap, configType, vm) { + var self = this; + this.__vm = vm; + this.ConfigFile = ko.observable(configFile); + this._ConfigType = ko.observable(configType); + this.ConfigType = ko.computed(() => self._ConfigType() == "0" ? `json` : (self._ConfigType() == "1" ? `ini` : (self._ConfigType() == "2" ? `xml` : (self._ConfigType() == "3" ? `kvp` : ``)))); + this._AutoMap = ko.observable(autoMap); + this.AutoMap = ko.computed(() => self._ConfigType() == "4" ? false : self._AutoMap()); + this.__RemoveConfigFile = () => self.__vm.__RemoveConfigFile(self); + } +} + class appSettingViewModel { constructor(vm) { var self = this; From 0b9723f2f1378cfa989f4426ab576758ef2da452 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 20:18:19 -0500 Subject: [PATCH 16/79] Clean up layout --- default.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/default.html b/default.html index 3f2efe6..8ba6325 100644 --- a/default.html +++ b/default.html @@ -255,6 +255,7 @@

    Basic Information

    +

    Management and Console

    @@ -389,6 +390,7 @@

    Management and Console

    --> +

    Networking

    AMP will automatically generate firewall rules to allow the application @@ -494,6 +496,7 @@

    Networking

    +

    Update Sources

    @@ -619,6 +622,7 @@

    Update Sources

    +

    Configuration and Settings

    @@ -746,6 +750,7 @@
    Configuration Files
    +

    Startup and Shutdown

    Application and Parameters
    @@ -890,6 +895,7 @@
    Shutdown
    data-bind="value: App_ExitString">
    +

    Server Events

    These are regular expressions that when matched notifies AMP about in-application events such @@ -961,6 +967,7 @@

    Server Events

    +

    Validate and Review

    From c1eaa0cde7e8484edc96b78fc2d708e50f257557 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 16 Jun 2022 23:51:49 -0500 Subject: [PATCH 17/79] Add Main Game Port --- default.html | 6 +++--- generator.js | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/default.html b/default.html index 8ba6325..0927106 100644 --- a/default.html +++ b/default.html @@ -419,7 +419,7 @@

    Networking

    - + @@ -456,7 +456,7 @@

    Networking

    You may add any number of ports.
    - Maximum of 1 Steam Query and 1 RCON Port. + Maximum of 1 Main Game, Steam Query, and RCON Port.     @@ -470,7 +470,7 @@

    Networking

    - + diff --git a/generator.js b/generator.js index fbff3e0..02c5d42 100644 --- a/generator.js +++ b/generator.js @@ -80,11 +80,6 @@ class generatorViewModel { this.App_FilterMatchRegex = ko.observable(""); this.App_FilterMatchReplacement = ko.observable(""); this.App_MonitorChildProcessName = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); this.Console_ThrowawayMessageRegex = ko.observable("^(WARNING|ERROR): Shader.+$"); this.Console_AppReadyRegex = ko.observable("^Server is ready.$"); @@ -463,7 +458,7 @@ class generatorViewModel { if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); } - +/* if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); } @@ -471,7 +466,7 @@ class generatorViewModel { if (self._PortMappings().filter(p => p.PortType() == "2").length == 0) { warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); } - break; +*/ break; } switch (self._UpdateSourceType()) { @@ -540,10 +535,10 @@ class portMappingViewModel { this.Port = ko.observable(port); this._PortType = ko.observable(portType); this._Name = ko.observable(portName); - this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : `Remote Admin Port`)); + this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : (self._PortType() == "2" ? `Remote Admin Port` : `Game Port 1`))); this._Description = ko.observable(portDescription); - this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : `Port used for RCON administration`)); - this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : `RemoteAdminPort`)); + this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : (self._PortType() == "2" ? `Port used for RCON administration` : `Port used for main game traffic`))); + this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : (self._PortType() == "2" ? `RemoteAdminPort` : `GamePort1`))); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From 496194f9c4e80bb2d2c2055a8569e03860cba44e Mon Sep 17 00:00:00 2001 From: James Manker Date: Fri, 17 Jun 2022 00:50:14 -0500 Subject: [PATCH 18/79] CLI Args --- generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator.js b/generator.js index 02c5d42..ce1b848 100644 --- a/generator.js +++ b/generator.js @@ -42,7 +42,7 @@ class generatorViewModel { this.App_HasWritableConsole = ko.observable(true); this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); - this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$ApplicationPort1}} +queryport {{$ApplicationPort2}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") + this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$GamePort1}} +queryport {{$SteamQueryPort}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") this.App_LinuxCommandLineArgs = ko.observable(""); this.App_WindowsCommandLineArgs = ko.observable(""); this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); From 38a0777489412ed2f107693718b8347d10865fac Mon Sep 17 00:00:00 2001 From: James Manker Date: Fri, 17 Jun 2022 00:51:23 -0500 Subject: [PATCH 19/79] 2 just because --- default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.html b/default.html index 0927106..67ab66c 100644 --- a/default.html +++ b/default.html @@ -116,7 +116,7 @@

    AMP Configuration Generator

    - Version 2.0
    ©2021 CubeCoders Limited     + Version 2.0
    ©2022 CubeCoders Limited
    @@ -597,7 +597,7 @@

    Update Sources

    - The App ID for the game itself. You can find this via SteamDB. + The App ID for the game itself. You can find this via SteamDB.
    @@ -909,7 +909,7 @@

    Server Events

    expression.

    - Regex101 is an excellent resource to help you put together + Regex101 is an excellent resource to help you put together and validate expressions. AMP uses the 'Javascript' regex flavour.

    From 1c9b269c1ea855fccff31a62cb1210a5cabf0bb5 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 18 Jun 2022 01:29:01 -0500 Subject: [PATCH 21/79] Begin implementing multiple update stages --- default.html | 191 ++++++++++++++++++++++++++++++++++++++++++--------- generator.js | 76 +++++++++++++++++--- 2 files changed, 225 insertions(+), 42 deletions(-) diff --git a/default.html b/default.html index e76ce14..cdd4710 100644 --- a/default.html +++ b/default.html @@ -108,6 +108,15 @@ Validate and Review +
    • @@ -359,37 +368,37 @@

    Management and Console

    + +
    Generally these are not needed for modern applications
    +
    + + + +
    + -->

    Networking

    @@ -498,6 +507,51 @@

    Networking



    Update Sources

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Stage NameSource Type
    + + +
    No update sources added.
    + +
    +
    @@ -1071,6 +1125,13 @@

    Validate and Review

     Download Config Files Manifest +

    @@ -1336,6 +1397,74 @@

    + + -->

    Networking

    @@ -540,7 +540,6 @@

    Update Sources

    -
    - Source Types

    - CopyFilePath - Copies a file from on directory to another.
    - CreateSymlink - Linux only, Creates a symlink pointing to the file/directory listed.
    - Executable - Runs an executable/shell script (not bat files!)
    - ExtractArchive - Extracts a zip archive.
    - FetchURL - Downloads from a fixed URL. Used with CopyFilePath to move the file.
    - GithubRelease - Downloads the release version specified (latest if omitted).
    - SetExecutableFlag - Linux only, marks the filename as executable.
    - StartApplication - Starts/stops the game server one time. Uuseful if a game generates directories and config files on first start.
    - SteamCMD - Downloads an application by the Steam App ID.

    +
    Source Type Details
    +
    -
    -
    + data-bind="value: UpdateStageName" placeholder="Config File Download" required> +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + +
    diff --git a/generator.js b/generator.js index b4e7518..9415659 100644 --- a/generator.js +++ b/generator.js @@ -151,21 +151,22 @@ class generatorViewModel { this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); + this.App_UpdateSources = ko.computed(() => `@IncludeJson[` + self._Meta_StagesManifest() + `]`); this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); }); -/* this.__SampleCommandLineFlags = ko.computed(function () { - var replacements = ko.toJS(self.__BuildPortMappings()); - replacements["ApplicationIPBinding"] = "0.0.0.0"; - replacements["FormattedArgs"] = self.__SampleFormattedArgs(); - replacements["MaxUsers"] = "10"; - replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; - return self.App_CommandLineArgs().template(replacements); - }); -*/ + /* this.__SampleCommandLineFlags = ko.computed(function () { + var replacements = ko.toJS(self.__BuildPortMappings()); + replacements["ApplicationIPBinding"] = "0.0.0.0"; + replacements["FormattedArgs"] = self.__SampleFormattedArgs(); + replacements["MaxUsers"] = "10"; + replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; + return self.App_CommandLineArgs().template(replacements); + }); + */ this.__GenData = ko.computed(function () { var data = [ { @@ -389,22 +390,23 @@ class generatorViewModel { lines.push(`${key.replace("_", ".")}=${self[key]()}`); } - switch (self._UpdateSourceType()) { - case "1": //URL - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); - break; - case "4": //Steam - if (self._compatibility() == "Proton") { - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); - } else { - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); - } - break; - case "16": //Github - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); - break; - } - + /* + switch (self._UpdateSourceType()) { + case "1": //URL + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); + break; + case "4": //Steam + if (self._compatibility() == "Proton") { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); + } else { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); + } + break; + case "16": //Github + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); + break; + } + */ if (self._UpdateSourceType() == "4") //SteamCMD { if (self._compatibility() == "Proton") { @@ -636,6 +638,16 @@ class updateStageViewModel { this.__vm = vm; this.UpdateStageName = ko.observable(""); this._UpdateSource = ko.observable("8"); + this._UpdateSourcePlatform = ko.observable("0"); + this._UpdateSourceData = ko.observable(""); + this._UpdateSourceArgs = ko.observable(""); + this._UpdateSourceVersion = ko.observable(""); + this._UpdateSourceTarget = ko.observable(""); + this._UpdateSourceConditionSetting = ko.observable(""); + this._UpdateSourceConditionValue = ko.observable(null); + this._UnzipUpdateSource = ko.observable(true); + this._OverwriteExistingFiles = ko.observable(false); + this.UpdateSourcePlatform = ko.computed(() => self._UpdateSourcePlatform() == "0" ? `All` : (self._UpdateSourcePlatform() == "1" ? `Windows` : `Linux`)); this.UpdateSource = ko.computed(() => self._UpdateSource() == "0" ? `CopyFilePath` : (self._UpdateSource() == "1" ? `CreateSymlink` : (self._UpdateSource() == "2" ? `Executable` : (self._UpdateSource() == "3" ? `ExtractArchive` : (self._UpdateSource() == "4" ? `FetchURL` : (self._UpdateSource() == "5" ? `GithubRelease` : (self._UpdateSource() == "6" ? `SetExecutableFlag` : (self._UpdateSource() == "7" ? `StartApplication` : `SteamCMD`)))))))); this.__RemoveStage = () => self.__vm.__RemoveStage(self); this.__EditStage = () => self.__vm.__EditStage(self); From 6bc18068b7b21f8a33b88d4310b61b69aa4b95eb Mon Sep 17 00:00:00 2001 From: James Manker Date: Wed, 22 Jun 2022 22:38:55 -0500 Subject: [PATCH 23/79] Finish most update settings + Dark Mode --- default.html | 214 ++++++++++++++++++++++++++++++++++++++++++++++----- generator.js | 1 + 2 files changed, 195 insertions(+), 20 deletions(-) diff --git a/default.html b/default.html index f5a13ff..eb08036 100644 --- a/default.html +++ b/default.html @@ -5,10 +5,22 @@ AMP Configuration Generator - + + + + - + --> @@ -18,6 +30,7 @@ integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"> + @@ -1416,7 +1429,7 @@
    Source Type Details
  • FetchURL - Downloads from a fixed URL. Used with CopyFilePath to move the file.
  • GithubRelease - Downloads the release version specified (latest if omitted).
  • SetExecutableFlag - Linux only, marks the filename as executable.
    • -
  • StartApplication - Starts the game server one tim e. Uuseful if a game generates config files on first run.
    • +
  • StartApplication - Starts the game server one time. Useful if a game generates config files on first run.
  • SteamCMD - Downloads an application by the Steam App ID.
    • @@ -1465,79 +1478,240 @@
    Source Type Details
    + data-bind="value: _UpdateSourceConditionSetting" placeholder="GitHubDownload">
    -
    +
    + + +
    +
    +
    +
    + data-bind="value: _UpdateSourceData" placeholder="https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/terrariaserverconfig.txt">
    -
    +
    +
    +
    + data-bind="value: _UpdateSourceArgs" placeholder="./v-rising/1829350/file.txt">
    -
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    -
    +
    +
    +
    + +
    +
    +
    +
    + + data-bind="value: _UpdateSourceTarget" placeholder="./pk/374040/">
    -
    +
    -
    +
    +
    +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Enum KeyEnum Value
    + + + + + +
    No enums have been added.
    + + + + + +
    @@ -1642,7 +1688,7 @@
    Source Type Details
    -
    +
    -
    -
    -
    diff --git a/generator.js b/generator.js index 1359d00..6cbc04c 100644 --- a/generator.js +++ b/generator.js @@ -334,7 +334,7 @@ class generatorViewModel { self._AppSettings.push.apply(self._AppSettings, mappedSettings); self._UpdateStages.removeAll(); - var mappedStages = ko.quickmap.to(updateStageViewModel, settings, false, { __vm: self }); + var mappedStages = ko.quickmap.to(updateStageViewModel, stages, false, { __vm: self }); self._UpdateStages.push.apply(self._UpdateStages, mappedStages); }; @@ -587,6 +587,16 @@ class portMappingViewModel { } } +class enumMappingViewModel { + constructor(enumKey, enumValue, vm) { + var self = this; + this.__vm = vm; + this._enumKey = ko.observable(enumKey); + this._enumValue = ko.observable(enumValue); + this.__RemoveEnum = () => self.__vm.__RemoveEnum(self); + } +} + class configFileMappingViewModel { constructor(configFile, autoMap, configType, vm) { var self = this; @@ -620,15 +630,48 @@ class appSettingViewModel { this.SkipIfEmpty = ko.observable(false); this._CheckedValue = ko.observable("true"); this._UncheckedValue = ko.observable("false"); - this.EnumValues = ko.computed(() => { - if (self.InputType() != "checkbox") { return {}; } +/* this.EnumValues = ko.computed(() => { + if (self.InputType() != "checkbox" && self.InputType() != "enum") { return {}; } var result = {}; - result[self._CheckedValue()] = "True"; - result[self._UncheckedValue()] = "False"; + result[self._CheckedValue()] = enumMappingViewModel._enumKey; + result[self._CheckedValue()] = enumMappingViewModel._enumValue; return result; }); +*/ + var EnumValues = JSON.parse(self._EnumMappings); + for (var i = 0; i < self._EnumMappings.counters.length; i++) { + var counter = self._EnumMappings.counters[i]; + console.log(counter.counter_name); + } + this.EnumValues = ko.observable(EnumValues); this.__RemoveSetting = () => self.__vm.__RemoveSetting(self); this.__EditSetting = () => self.__vm.__EditSetting(self); + + this._EnumMappings = ko.observableArray(); //of enumMappingViewModel + this.__NewEnumKey = ko.observable(""); + this.__NewEnumValue = ko.observable(""); + + this.__RemoveEnum = function (toRemove) { + self._EnumMappings.remove(toRemove); + }; + + this.__AddEnum = function () { + self._EnumMappings.push(new enumMappingViewModel(self.__NewEnumKey(), self.__NewEnumValue(), self)); + }; + + this.__Deserialize = function (inputData) { + var asJS = JSON.parse(inputData); + var enumSettings = asJS._EnumMappings; + + delete asJS._EnumMappings; + + ko.quickmap.map(self, asJS); + + self._EnumMappings.removeAll(); + var mappedEnums = ko.quickmap.to(portMappingViewModel, enumSettings, false, { __vm: self }); + self._EnumMappings.push.apply(self._EnumMappings, mappedEnums); + }; + } } @@ -643,9 +686,9 @@ class updateStageViewModel { this._UpdateSourceArgs = ko.observable(""); this._UpdateSourceVersion = ko.observable(""); this._UpdateSourceTarget = ko.observable(""); - this._UpdateSourceConditionSetting = ko.observable(""); + this._UpdateSourceConditionSetting = ko.observable(null); this._UpdateSourceConditionValue = ko.observable(null); - this._UnzipUpdateSource = ko.observable(true); + this._UnzipUpdateSource = ko.observable(false); this._OverwriteExistingFiles = ko.observable(false); this._DeleteAfterExtract = ko.observable(true); this.UpdateSourcePlatform = ko.computed(() => self._UpdateSourcePlatform() == "0" ? `All` : (self._UpdateSourcePlatform() == "1" ? `Windows` : `Linux`)); From 53d18cf51e47e0b657384d392eb690d1663f3831 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 2 Jul 2022 20:20:39 -0500 Subject: [PATCH 25/79] More enum value changes --- generator.js | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/generator.js b/generator.js index 6cbc04c..89a46af 100644 --- a/generator.js +++ b/generator.js @@ -587,16 +587,6 @@ class portMappingViewModel { } } -class enumMappingViewModel { - constructor(enumKey, enumValue, vm) { - var self = this; - this.__vm = vm; - this._enumKey = ko.observable(enumKey); - this._enumValue = ko.observable(enumValue); - this.__RemoveEnum = () => self.__vm.__RemoveEnum(self); - } -} - class configFileMappingViewModel { constructor(configFile, autoMap, configType, vm) { var self = this; @@ -630,20 +620,26 @@ class appSettingViewModel { this.SkipIfEmpty = ko.observable(false); this._CheckedValue = ko.observable("true"); this._UncheckedValue = ko.observable("false"); -/* this.EnumValues = ko.computed(() => { - if (self.InputType() != "checkbox" && self.InputType() != "enum") { return {}; } - var result = {}; - result[self._CheckedValue()] = enumMappingViewModel._enumKey; - result[self._CheckedValue()] = enumMappingViewModel._enumValue; - return result; + this.EnumValues = ko.computed(() => { + if (self.InputType() == "checkbox") { + var result = {}; + result[self._CheckedValue()] = "True"; + result[self._UncheckedValue()] = "False"; + return result; + } else if (self.InputType() == "enum") { + + } else { + return {}; + } }); -*/ +/* var EnumValues = JSON.parse(self._EnumMappings); for (var i = 0; i < self._EnumMappings.counters.length; i++) { var counter = self._EnumMappings.counters[i]; console.log(counter.counter_name); } this.EnumValues = ko.observable(EnumValues); +*/ this.__RemoveSetting = () => self.__vm.__RemoveSetting(self); this.__EditSetting = () => self.__vm.__EditSetting(self); @@ -668,13 +664,23 @@ class appSettingViewModel { ko.quickmap.map(self, asJS); self._EnumMappings.removeAll(); - var mappedEnums = ko.quickmap.to(portMappingViewModel, enumSettings, false, { __vm: self }); + var mappedEnums = ko.quickmap.to(enumMappingViewModel, enumSettings, false, { __vm: self }); self._EnumMappings.push.apply(self._EnumMappings, mappedEnums); }; } } +class enumMappingViewModel { + constructor(enumKey, enumValue, vm) { + var self = this; + this.__vm = vm; + this._enumKey = ko.observable(enumKey); + this._enumValue = ko.observable(enumValue); + this.__RemoveEnum = () => self.__vm.__RemoveEnum(self); + } +} + class updateStageViewModel { constructor(vm) { var self = this; From dc85ba5ebb5885553a6c57e67aa93f3bb13f9d24 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Sat, 23 Jul 2022 13:37:47 -0500 Subject: [PATCH 26/79] Create index.html --- index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..f69bb09 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +

    Hello!

    From d44773e40ca963f798a10df4c57271e38ee1b488 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Sat, 23 Jul 2022 13:40:00 -0500 Subject: [PATCH 27/79] Delete index.html --- index.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index f69bb09..0000000 --- a/index.html +++ /dev/null @@ -1 +0,0 @@ -

    Hello!

    From 06b5f6254d3d03c6a54c2633d116fbf149724f24 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Thu, 28 Jul 2022 22:47:18 -0500 Subject: [PATCH 28/79] Rename default.html to index.html index.html is required by GitHub Pages --- default.html => index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename default.html => index.html (99%) diff --git a/default.html b/index.html similarity index 99% rename from default.html rename to index.html index f742943..d9ec599 100644 --- a/default.html +++ b/index.html @@ -1830,4 +1830,4 @@
    Modal title
    - \ No newline at end of file + From 232cdff496f98f1ab61755b5c5e7db7dc77076eb Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 3 Oct 2022 19:53:19 -0500 Subject: [PATCH 29/79] Update generator.js --- generator.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/generator.js b/generator.js index 89a46af..9efdb7c 100644 --- a/generator.js +++ b/generator.js @@ -688,15 +688,15 @@ class updateStageViewModel { this.UpdateStageName = ko.observable(""); this._UpdateSource = ko.observable("8"); this._UpdateSourcePlatform = ko.observable("0"); - this._UpdateSourceData = ko.observable(""); - this._UpdateSourceArgs = ko.observable(""); - this._UpdateSourceVersion = ko.observable(""); - this._UpdateSourceTarget = ko.observable(""); - this._UpdateSourceConditionSetting = ko.observable(null); - this._UpdateSourceConditionValue = ko.observable(null); - this._UnzipUpdateSource = ko.observable(false); - this._OverwriteExistingFiles = ko.observable(false); - this._DeleteAfterExtract = ko.observable(true); + this.UpdateSourceData = ko.observable(""); + this.UpdateSourceArgs = ko.observable(""); + this.UpdateSourceVersion = ko.observable(""); + this.UpdateSourceTarget = ko.observable(""); + this.UpdateSourceConditionSetting = ko.observable(null); + this.UpdateSourceConditionValue = ko.observable(null); + this.UnzipUpdateSource = ko.observable(false); + this.OverwriteExistingFiles = ko.observable(false); + this.DeleteAfterExtract = ko.observable(true); this.UpdateSourcePlatform = ko.computed(() => self._UpdateSourcePlatform() == "0" ? `All` : (self._UpdateSourcePlatform() == "1" ? `Windows` : `Linux`)); this.UpdateSource = ko.computed(() => self._UpdateSource() == "0" ? `CopyFilePath` : (self._UpdateSource() == "1" ? `CreateSymlink` : (self._UpdateSource() == "2" ? `Executable` : (self._UpdateSource() == "3" ? `ExtractArchive` : (self._UpdateSource() == "4" ? `FetchURL` : (self._UpdateSource() == "5" ? `GithubRelease` : (self._UpdateSource() == "6" ? `SetExecutableFlag` : (self._UpdateSource() == "7" ? `StartApplication` : `SteamCMD`)))))))); this.__RemoveStage = () => self.__vm.__RemoveStage(self); From 0872a532c64fb1397db7ede6d906a8f8e10275c1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 3 Oct 2022 20:26:19 -0500 Subject: [PATCH 30/79] Update index.html --- index.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/index.html b/index.html index d9ec599..7ed9391 100644 --- a/index.html +++ b/index.html @@ -1528,7 +1528,7 @@
    Source Type Details
     + data-bind="value: UpdateSourceConditionSetting" placeholder="GitHubDownload">
    @@ -1540,7 +1540,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceConditionValue" placeholder="true">
    @@ -1552,7 +1552,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/terrariaserverconfig.txt">
    @@ -1564,7 +1564,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="./v-rising/1829350/file.txt">
    @@ -1576,7 +1576,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="./v-rising/1829350/file.txt">
    @@ -1588,7 +1588,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="-config -force">
    @@ -1600,7 +1600,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="./pk/374040/dedicated_server.zip">
    @@ -1612,7 +1612,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="tModLoader/tModLoader">
    @@ -1624,7 +1624,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceArgs" placeholder="dedicated_server.x86_64">
    @@ -1636,7 +1636,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="./v-rising/1829350/save/config.cfg">
    @@ -1648,7 +1648,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="./v-rising/1829350/save/config.cfg">
    @@ -1660,7 +1660,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="tModLoader.zip">
    @@ -1672,7 +1672,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/terrariaserverconfig.txt">
    @@ -1684,7 +1684,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceData" placeholder="896660">
    @@ -1696,7 +1696,7 @@
    Source Type Details
    + data-bind="value: UpdateSourceVersion" placeholder="{{ReleaseStream}}">
    @@ -1707,7 +1707,7 @@
    Source Type Details
    Where to download relative to the Root Directory. + data-bind="value: UpdateSourceTarget" placeholder="serverfiles">
    @@ -1719,14 +1719,14 @@
    Source Type Details
    + data-bind="value: UpdateSourceTarget" placeholder="./pk/374040/">
    From 2cfcfd4b96a666744c8b4f5206a191037a3e6fcb Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 9 Oct 2022 01:06:53 -0500 Subject: [PATCH 38/79] Match kvp settings up again --- generator.js | 63 +++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/generator.js b/generator.js index c32b7fb..e4353ae 100644 --- a/generator.js +++ b/generator.js @@ -21,21 +21,24 @@ class generatorViewModel { constructor() { var self = this; + this._compatibility = ko.observable("None"); this.Meta_DisplayName = ko.observable(""); this.Meta_Description = ko.observable(""); this.Meta_Arch = ko.observable("x86_64"); this.Meta_Author = ko.observable(""); this.Meta_URL = ko.observable(""); - this.Meta_MinAMPVersion = ko.observable(""); - this.Meta_SpecificDockerImage = ko.observable(""); + this.Meta_MinAMPVersion = ko.observable("2.4.0.6"); + this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.Meta_DockerRequired = ko.observable("False"); this.Meta_ContainerPolicy = ko.observable("Supported"); + this.Meta_ContainerPolicyReason = ko.observable(""); this.Meta_Prerequsites = ko.observable("[]"); + this.Meta_ExtraContainerPackages = ko.observable(""); this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); + this.Meta_NoCommercialUsage = ko.observable("False"); this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); - this._compatibility = ko.observable("None"); this.App_AdminMethod = ko.observable("STDIO"); this.App_HasReadableConsole = ko.observable(true); @@ -43,7 +46,6 @@ class generatorViewModel { this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$GamePort1}} +queryport {{$SteamQueryPort}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") - this.App_LinuxCommandLineArgs = ko.observable(""); this.App_WindowsCommandLineArgs = ko.observable(""); this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); this.App_CommandLineParameterDelimiter = ko.observable(" "); @@ -68,6 +70,8 @@ class generatorViewModel { this.App_AdminLoginTransform = ko.observable("None"); this.App_RCONConnectDelaySeconds = ko.observable("30"); this.App_RCONConnectRetrySeconds = ko.observable("15"); + this.App_RCONHeartbeatCommand = ko.observable("ping"); + this.App_RCONHeartbeatMinutes = ko.observable("0"); this.App_TelnetLoginFormat = ko.observable("{0}"); this.App_SteamUpdateAnonymousLogin = ko.observable("True"); this.App_SteamForceLoginProm = ko.observable("False"); @@ -77,10 +81,11 @@ class generatorViewModel { this.App_MonitorChildProcess = ko.observable("False"); this.App_MonitorChildProcessWaitMs = ko.observable("1000"); this.App_MonitorChildProcessName = ko.observable(""); - this.App_FilterMatchRegex = ko.observable(""); - this.App_FilterMatchReplacement = ko.observable(""); - this.App_MonitorChildProcessName = ko.observable(""); + this.App_Compatibility = ko.observable("None"); + this.App_AppSettings = ko.observableArray(); + this.Console_FilterMatchRegex = ko.observable(""); + this.Console_FilterMatchReplacement = ko.observable(""); this.Console_ThrowawayMessageRegex = ko.observable("(WARNING|ERROR): Shader.+"); this._Console_AppReadyRegex = ko.observable(""); this._Console_UserJoinRegex = ko.observable(""); @@ -149,10 +154,8 @@ class generatorViewModel { this.App_WorkingDir = ko.computed(() => self._UpdateSourceType() == "4" ? self._SteamServerAppID() : ""); this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); - this.App_WindowsCommandLineArgs = ko.computed(() => ``); this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : `/usr/bin/xvfb-run`); this.App_LinuxCommandLineArgs = ko.computed(() => self._compatibility() == "None" ? `` : (self._compatibility() == "Wine" ? `-a wine \"./` + self._WinExecutableName() + `\"` : `-a \"{{$FullRootDir}}1580130/proton\" run \"./` + self._WinExecutableName() + `\"`)); - this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() == "Wine" ? `cubecoders/ampbase:wine` : ``); this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.App_UpdateSources = ko.computed(() => `@IncludeJson[` + self._Meta_StagesManifest() + `]`); @@ -516,26 +519,26 @@ class generatorViewModel { } */ break; } -/* - switch (self._UpdateSourceType()) { - case "1": //Fetch from URL - if (self._UpdateSourceURL() == "") { - failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); - } - else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { - info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); - } - break; - case "4": //SteamCMD - if (self._SteamServerAppID() == "") { - failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); - } - if (self._SteamClientAppID() == "") { - warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); - } - break; - } -*/ + /* + switch (self._UpdateSourceType()) { + case "1": //Fetch from URL + if (self._UpdateSourceURL() == "") { + failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); + } + else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { + info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); + } + break; + case "4": //SteamCMD + if (self._SteamServerAppID() == "") { + failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); + } + if (self._SteamClientAppID() == "") { + warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); + } + break; + } + */ if (self.Console_AppReadyRegex() != "" && !self.Console_AppReadyRegex().match(/\^.+\$/)) { failure("Server ready expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the Server Ready expression under Server Events to match the entire line."); } if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } @@ -651,7 +654,7 @@ class appSettingViewModel { var mappedEnums = ko.quickmap.to(enumMappingViewModel, enumSettings, false, { __vm: self }); self._EnumMappings.push.apply(self._EnumMappings, mappedEnums); }; - + this.EnumValues = ko.computed(() => { if (self.InputType() == "checkbox") { var result = {}; From 785c813d78e84673fca0e3041879cd852df1df5f Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 9 Oct 2022 01:09:39 -0500 Subject: [PATCH 39/79] More --- common.js | 1 - generator.js | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common.js b/common.js index 840d52f..d65ed8c 100644 --- a/common.js +++ b/common.js @@ -48,7 +48,6 @@ function WildcardToRegex(pattern) { var toRegex = function (pattern, starMatchesEmpty) { var reg = "^" + pattern.replace(/([.*+?^${}()|[\]/\\])/g, "\\$1") + "$"; - console.log(reg); reg = reg.replace(/\d+/g, "\\d+"); // replace all numbers with \d+ reg = reg.replace(/\s+/g, "\\s+"); // replace all numbers with \d+ reg = reg.replace(/\\\*\\\{(\w+)\\\}/g, "(?<$1>.+)"); // replace *{} with named capture group diff --git a/generator.js b/generator.js index e4353ae..d265d54 100644 --- a/generator.js +++ b/generator.js @@ -36,6 +36,7 @@ class generatorViewModel { this.Meta_ExtraContainerPackages = ko.observable(""); this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); this.Meta_NoCommercialUsage = ko.observable("False"); + this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); @@ -44,12 +45,10 @@ class generatorViewModel { this.App_HasReadableConsole = ko.observable(true); this.App_HasWritableConsole = ko.observable(true); this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); - this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} +ip {{$ApplicationIPBinding}} +port {{$GamePort1}} +queryport {{$SteamQueryPort}} +rconpassword \"{{$RemoteAdminPassword}}\" +maxusers {{$MaxUsers}} {{$FormattedArgs}}") this.App_WindowsCommandLineArgs = ko.observable(""); this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); this.App_CommandLineParameterDelimiter = ko.observable(" "); - this.App_RapidStartup = ko.observable("false"); this.App_ApplicationReadyMode = ko.observable("Immediate"); this.App_ExitMethod = ko.observable("OS_CLOSE"); @@ -58,7 +57,7 @@ class generatorViewModel { this.App_ExitTimeout = ko.observable("30"); this.App_ExitFile = ko.observable("app_exit.lck"); this.App_SupportsLiveSettingsChanges = ko.observable("False"); - this.App_LiveSettingChangeCommandFormat = ko.observable("set {0} \"{ 1}\""); + this.App_LiveSettingChangeCommandFormat = ko.observable("set {0} \"{1}\""); this.App_ApplicationIPBinding = ko.observable("0.0.0.0"); this.App_AdminPortRef = ko.observable("GamePort1"); this.App_UniversalSleepApplicationUDPPortRef = ko.observable("GamePort1"); @@ -159,7 +158,6 @@ class generatorViewModel { this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); this.App_UpdateSources = ko.computed(() => `@IncludeJson[` + self._Meta_StagesManifest() + `]`); - this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this.__SampleFormattedArgs = ko.computed(function () { return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); From b8ccd45e175ef4da71f0b863da6896b62d1c80a5 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 9 Oct 2022 03:05:28 -0500 Subject: [PATCH 40/79] Logic for Base/Working Directories --- generator.js | 38 ++++++++++++++++++++++++++++++++++++-- index.html | 2 +- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/generator.js b/generator.js index d265d54..f98912c 100644 --- a/generator.js +++ b/generator.js @@ -149,8 +149,42 @@ class generatorViewModel { this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); - this.App_BaseDirectory = ko.computed(() => self._UpdateSourceType() == "4" ? `./${self.__SanitizedName()}/${self._SteamServerAppID()}/` : `./${self.__SanitizedName()}/`); - this.App_WorkingDir = ko.computed(() => self._UpdateSourceType() == "4" ? self._SteamServerAppID() : ""); + + this.App_BaseDirectory = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return self.App_RootDir() + appIDCheck + '/'; + } else { + return self.App_RootDir() + 'serverfiles/'; + } + } else { + return self.App_RootDir() + 'serverfiles/'; + } + }); + + this.App_WorkingDir = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return appIDCheck; + } else { + return 'serverfiles'; + } + } else { + return 'serverfiles'; + } + }); this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : `/usr/bin/xvfb-run`); diff --git a/index.html b/index.html index 8b34969..c49ab1d 100644 --- a/index.html +++ b/index.html @@ -1621,7 +1621,7 @@
    Source Type Details
    -
    +
    -
    --> +
    @@ -331,7 +331,7 @@

    Management and Console

    value="QuakeRCON" data-bind="checked: App_AdminMethod"> Quake RCON - - +

    Networking

    @@ -458,7 +464,7 @@

    Networking

    @@ -508,7 +514,7 @@

    Networking

    @@ -549,7 +555,7 @@

    Update Sources

    - +
    @@ -1023,34 +1025,6 @@

    Validate and Review

     Download Configuration - - - -

    diff --git a/jszip.min.js b/jszip.min.js new file mode 100644 index 0000000..ff4cfd5 --- /dev/null +++ b/jszip.min.js @@ -0,0 +1,13 @@ +/*! + +JSZip v3.10.1 - A JavaScript class for generating and reading zip files + + +(c) 2009-2016 Stuart Knightley +Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown. + +JSZip uses the library pako released under the MIT license : +https://github.com/nodeca/pako/blob/main/LICENSE +*/ + +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r Date: Fri, 14 Oct 2022 16:19:42 -0500 Subject: [PATCH 43/79] Update generator.js --- generator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator.js b/generator.js index e60f2e8..283e0bf 100644 --- a/generator.js +++ b/generator.js @@ -466,7 +466,7 @@ class generatorViewModel { document.location.reload(); } - this._GithubManifest = function () { + this.__GithubManifest = function () { function guid() { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); @@ -522,7 +522,7 @@ class generatorViewModel { zip.file(self._Meta_StagesManifest(), JSON.stringify(asJSUpdateStages, omitNonPublicMembers, 4)); zip.file(self._Meta_PortsManifest(), JSON.stringify(asJSPortMappings, omitNonPublicMembers, 4)); zip.file(self.Meta_MetaConfigManifest(), JSON.stringify(asJSConfigFileMappings, omitNonPublicMembers, 4)); - zip.file("manifest.json", self._GithubManifest()); + zip.file("manifest.json", self.__GithubManifest()); zip.generateAsync({ type: "blob" }) .then(function (content) { saveAs(content, "configs.zip"); From 6091f2640f8dd9c8f693c231e71036354436a56f Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 16 Oct 2022 21:43:37 -0500 Subject: [PATCH 44/79] Update instructions for using the config --- index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index cba1f24..2623916 100644 --- a/index.html +++ b/index.html @@ -170,7 +170,7 @@

    AMP Configuration Generator

    - Generic Configurations Wiki

    +

    You can find detailed instructions and explanations on the Generic Configurations Wiki.

    Basic Information

    @@ -1036,8 +1036,7 @@

    Validate and Review

    Using the generated configuration
    -

    Place the .kvp and .json files in your ADS instance under the /Plugins/ADSModule/GenericTemplates directory along side the other .kvp and .json files.

    -

    Then restart ADS, and your new configuration will appear as an option when you select 'Create Instance'.

    +

    You can find the steps to upload the configuration to GitHub and use them within AMP on the Generic Configurations Wiki.

     

    From dc448cee2b838c3ca22e477e542ab11d1a6c5a7f Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 16 Oct 2022 21:48:54 -0500 Subject: [PATCH 45/79] Missing line separator --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2623916..6a6533e 100644 --- a/index.html +++ b/index.html @@ -1033,7 +1033,7 @@

    Validate and Review

      Make sure to keep a backup of your configuration by using the 'Export' option at the top of the page! You will need this to make further changes even after downloading the configuration and manifest.

    - +
    Using the generated configuration

    You can find the steps to upload the configuration to GitHub and use them within AMP on the Generic Configurations Wiki.

    From 983ceac2966d3b59b3360c9ec3d8dcd894609fd1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 16 Jan 2023 13:25:44 -0600 Subject: [PATCH 46/79] Fix Steam Client ID --- generator.js | 2 +- index.html | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/generator.js b/generator.js index 283e0bf..ab6529c 100644 --- a/generator.js +++ b/generator.js @@ -155,7 +155,7 @@ class generatorViewModel { var appIDCheck = "0"; for (let i = 0; i < self._UpdateStages().length; i++) { if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { - appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + appIDCheck = self._UpdateStages()[i].UpdateSourceArgs(); } } if (appIDCheck != 0) { diff --git a/index.html b/index.html index 6a6533e..82fc123 100644 --- a/index.html +++ b/index.html @@ -1508,6 +1508,18 @@
    Source Type Details
    data-bind="value: UpdateSourceArgs" placeholder="dedicated_server.x86_64">
    +
    +
    + + +
    +
    -
    -
    - - -
    -
    +
    +
    + + +
    +
    -
    @@ -1580,8 +1442,7 @@
    Source Type Details
    The destination file location/name including the Root Directory. - +
    @@ -1592,8 +1453,7 @@
    Source Type Details
    The App ID of the application to download. You can find this via SteamDB. - +
    @@ -1604,8 +1464,7 @@
    Source Type Details
    The branch to download from. Can be hardcoded or the Field Name of an input. Public branch if left blank. - +
    @@ -1631,8 +1490,7 @@
    Source Type Details
    Where to download relative to the Root Directory. - +
    @@ -1643,15 +1501,13 @@
    Source Type Details
    Where to extract the file to relative to Root Directory. - +
    + +
    Generally these are not needed for modern applications
    +
    + + + +
    +

    Networking

    @@ -691,36 +692,36 @@
    Application and Parameters
    - +
    From e3a1289aa250457f29ece4a2d7d7aa958f28eb9f Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 22 Apr 2023 01:51:58 -0500 Subject: [PATCH 61/79] Fix ports --- generator.js | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/generator.js b/generator.js index 81190d7..56ed01b 100644 --- a/generator.js +++ b/generator.js @@ -597,9 +597,9 @@ class ValidationResult { class PortMappingViewModel { constructor(port, portName, portDescription, portType, protocol, vm) { this.__vm = vm; - this._protocol = ko.observable(protocol); - this.protocol = ko.computed(() => { - switch (this._protocol()) { + this._Protocol = ko.observable(protocol); + this.Protocol = ko.computed(() => { + switch (this._Protocol()) { case "1": return "TCP"; case "2": @@ -609,35 +609,39 @@ class PortMappingViewModel { return "Both"; } }); - this.port = ko.observable(port); - this._portType = ko.observable(portType); - this._name = ko.observable(portName); - this.name = ko.computed(() => { - switch (this._portType()) { + this.Port = ko.observable(port); + this._PortType = ko.observable(portType); + this._Name = ko.observable(portName); + this.Name = ko.computed(() => { + switch (this._PortType()) { + case "Main Game Port": + return "Main Game Port"; case "Steam Query Port": return "Steam Query Port"; case "RCON Port": return "Remote Admin Port"; case "Custom Port": default: - return this._name(); + return this._Name(); } }); - this._description = ko.observable(portDescription); - this.description = ko.computed(() => { - switch (this._portType()) { + this._Description = ko.observable(portDescription); + this.Description = ko.computed(() => { + switch (this._PortType()) { case "1": return "Port used for Steam queries and server list"; case "2": return "Port used for RCON administration"; case "0": default: - return this._description(); + return this._Description(); } }); - this.ref = ko.computed(() => { - const cleanName = this._name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, ""); - switch (this._portType()) { + this.Ref = ko.computed(() => { + const cleanName = this._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, ""); + switch (this._PortType()) { + case "Main Game Port": + return "MainGamePort"; case "Steam Query Port": return "SteamQueryPort"; case "RCON Port": @@ -647,7 +651,7 @@ class PortMappingViewModel { return cleanName; } }); - this.__removePort = () => this.__vm.__removePort(this); + this.__RemovePort = () => this.__vm.__RemovePort(this); } } From af7b3a93d449eaea3384f1d5f651513db3525c0b Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 22 Apr 2023 02:20:13 -0500 Subject: [PATCH 62/79] css cleanup --- style.css | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/style.css b/style.css index 215ceb8..9cb9ac2 100644 --- a/style.css +++ b/style.css @@ -9,16 +9,15 @@ } .rightbar { - position:fixed; - margin-right:0px; + position: fixed; + margin-right: 0; } .leftLine { - box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1) + box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1); } -.close -{ +.close { border: 0; background-color: transparent; float: right; @@ -30,14 +29,13 @@ opacity: .5; } -.genTableHeader -{ +.genTableHeader { width: 10.5rem; } a.nav-link.active { background-color: #0a58ca; - color: white; + color: #fff; } .linkButton { @@ -47,12 +45,11 @@ a.nav-link.active { background-color: transparent; } -#importexporttextarea -{ +#importexporttextarea { width: 100%; height: 300px; } -#importexporttextarea[readonly] { + #importexporttextarea[readonly] { background-color: #eee; -} \ No newline at end of file +} From a3fcafd351f2825b90043e205317c619b4915309 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sat, 22 Apr 2023 14:17:29 -0500 Subject: [PATCH 63/79] Fixes --- generator.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/generator.js b/generator.js index 56ed01b..1b0a913 100644 --- a/generator.js +++ b/generator.js @@ -1,3 +1,15 @@ +$(window).on("error", function (evt) { + + console.log("jQuery error event:", evt); + var e = evt.originalEvent; // get the javascript event + console.log("original event:", e); + if (e.message) { + alert(e.message); + } else { + alert("Error: " + e.type + "\nElement:\n\t" + (e.srcElement || e.target)); + } +}); + function omitNonPublicMembers(key, value) { return key.startsWith("_") ? undefined : value; } @@ -659,6 +671,11 @@ class PortMappingViewModel { class ConfigFileMappingViewModel { constructor(configFile, autoMap, configType, vm) { this.__vm = vm; + + if (!configFile) { + throw new Error("Config File Name is required."); + } + this.ConfigFile = ko.observable(configFile); this._ConfigType = ko.observable(configType); this.ConfigType = ko.computed(() => { @@ -749,8 +766,8 @@ class AppSettingViewModel { class EnumMappingViewModel { constructor(enumKey, enumValue, vm) { this.__vm = vm; - this._EnumKey = ko.observable(EnumKey); - this._EnumValue = ko.observable(EnumValue); + this._EnumKey = ko.observable(enumKey); + this._EnumValue = ko.observable(enumValue); this.__RemoveEnum = () => this.__vm.__RemoveEnum(this); } } From c0e04cae471fb1d6b2771e80a3a9f1f561037754 Mon Sep 17 00:00:00 2001 From: James Manker Date: Sun, 23 Apr 2023 00:38:36 -0500 Subject: [PATCH 64/79] Error checking --- generator.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/generator.js b/generator.js index 1b0a913..aa9946c 100644 --- a/generator.js +++ b/generator.js @@ -609,6 +609,17 @@ class ValidationResult { class PortMappingViewModel { constructor(port, portName, portDescription, portType, protocol, vm) { this.__vm = vm; + + if (!port) { + throw new Error("Port Number is required."); + } + if (!portName) { + throw new Error("Port Name is required."); + } + if (!portDescription) { + throw new Error("Port Description is required."); + } + this._Protocol = ko.observable(protocol); this.Protocol = ko.computed(() => { switch (this._Protocol()) { From d72534fe95db8aec98f1cc02d570abafc4c5c4e5 Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 19 Jun 2023 17:21:16 -0500 Subject: [PATCH 65/79] Revert "css cleanup" This reverts commit af7b3a93d449eaea3384f1d5f651513db3525c0b. --- style.css | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/style.css b/style.css index 9cb9ac2..215ceb8 100644 --- a/style.css +++ b/style.css @@ -9,15 +9,16 @@ } .rightbar { - position: fixed; - margin-right: 0; + position:fixed; + margin-right:0px; } .leftLine { - box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1); + box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1) } -.close { +.close +{ border: 0; background-color: transparent; float: right; @@ -29,13 +30,14 @@ opacity: .5; } -.genTableHeader { +.genTableHeader +{ width: 10.5rem; } a.nav-link.active { background-color: #0a58ca; - color: #fff; + color: white; } .linkButton { @@ -45,11 +47,12 @@ a.nav-link.active { background-color: transparent; } -#importexporttextarea { +#importexporttextarea +{ width: 100%; height: 300px; } - #importexporttextarea[readonly] { +#importexporttextarea[readonly] { background-color: #eee; -} +} \ No newline at end of file From 7606551959cb4904935f06c61c9438251f5d8c8d Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 19 Jun 2023 17:21:32 -0500 Subject: [PATCH 66/79] Revert "Fixes" This reverts commit a3fcafd351f2825b90043e205317c619b4915309. --- generator.js | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/generator.js b/generator.js index aa9946c..2aa97e6 100644 --- a/generator.js +++ b/generator.js @@ -1,15 +1,3 @@ -$(window).on("error", function (evt) { - - console.log("jQuery error event:", evt); - var e = evt.originalEvent; // get the javascript event - console.log("original event:", e); - if (e.message) { - alert(e.message); - } else { - alert("Error: " + e.type + "\nElement:\n\t" + (e.srcElement || e.target)); - } -}); - function omitNonPublicMembers(key, value) { return key.startsWith("_") ? undefined : value; } @@ -682,11 +670,6 @@ class PortMappingViewModel { class ConfigFileMappingViewModel { constructor(configFile, autoMap, configType, vm) { this.__vm = vm; - - if (!configFile) { - throw new Error("Config File Name is required."); - } - this.ConfigFile = ko.observable(configFile); this._ConfigType = ko.observable(configType); this.ConfigType = ko.computed(() => { @@ -777,8 +760,8 @@ class AppSettingViewModel { class EnumMappingViewModel { constructor(enumKey, enumValue, vm) { this.__vm = vm; - this._EnumKey = ko.observable(enumKey); - this._EnumValue = ko.observable(enumValue); + this._EnumKey = ko.observable(EnumKey); + this._EnumValue = ko.observable(EnumValue); this.__RemoveEnum = () => this.__vm.__RemoveEnum(this); } } From a0bc53c1f3c7c27ebac3a49d4e9ad681c5e7000b Mon Sep 17 00:00:00 2001 From: James Manker Date: Mon, 19 Jun 2023 17:25:17 -0500 Subject: [PATCH 67/79] RRRRaS --- generator.js | 699 ++++++++++++++++++++++++--------------------------- index.html | 635 ++++++++++++++++++++++++++++------------------ 2 files changed, 716 insertions(+), 618 deletions(-) diff --git a/generator.js b/generator.js index 2aa97e6..e32c8a2 100644 --- a/generator.js +++ b/generator.js @@ -1,14 +1,14 @@ function omitNonPublicMembers(key, value) { - return key.startsWith("_") ? undefined : value; + return (key.indexOf("_") === 0) ? undefined : value; } function omitPrivateMembers(key, value) { - return key.startsWith("__") ? undefined : value; + return (key.indexOf("__") === 0) ? undefined : value; } function downloadString(data, filename) { - const element = document.createElement('a'); - element.setAttribute('href', `data:text/plain;charset=utf-8,${encodeURIComponent(data)}`); + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data)); element.setAttribute('download', filename); element.style.display = 'none'; @@ -17,7 +17,7 @@ function downloadString(data, filename) { document.body.removeChild(element); } -class GeneratorViewModel { +class generatorViewModel { constructor() { var self = this; this.availablePortOptions = ko.observableArray(['Custom Port', 'Main Game Port', 'Steam Query Port', 'RCON Port']); @@ -153,94 +153,70 @@ class GeneratorViewModel { this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); // this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); - function findAppID() { - const updateStages = self._UpdateStages(); - for (let i = 0; i < updateStages.length; i++) { - if (updateStages[i]._UpdateSource() === 8) { - return updateStages[i].UpdateSourceArgs(); + this.Meta_DisplayImageSource = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceArgs(); + } } - } - return "0"; - } - - function findUpdateSourceData() { - const updateStages = self._UpdateStages(); - for (let i = 0; i < updateStages.length; i++) { - if (updateStages[i]._UpdateSource() === 8) { - return updateStages[i].UpdateSourceData(); + if (appIDCheck != 0) { + return 'steam:' + appIDCheck; + } else { + return 'url:' + self._DisplayImageSource(); } + } else { + return 'url:' + self._DisplayImageSource(); } - return "0"; - } - - this.Meta_DisplayImageSource = ko.computed(() => { - const appID = findAppID(); - return appID !== "0" ? `steam:${appID}` : `url:${self._DisplayImageSource()}`; }); this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); - + this.App_BaseDirectory = ko.computed(() => { - const updateSourceData = findUpdateSourceData(); - return updateSourceData !== "0" - ? `${self.App_RootDir()}${updateSourceData}/` - : `${self.App_RootDir()}serverfiles/`; - }); - - this.App_WorkingDir = ko.computed(() => { - const updateSourceData = findUpdateSourceData(); - return updateSourceData !== "0" ? updateSourceData : "serverfiles"; - }); - - function getLinuxCompatArgs(compatibility, winExecutableName) { - switch (compatibility) { - case "None": - return ""; - case "WineXvfb": - return `-a wine "./${winExecutableName}"`; - case "ProtonXvfb": - return `-a "{{\$FullRootDir}}1580130/proton" run "./${winExecutableName}"`; - case "Proton": - return `run "./${winExecutableName}"`; - default: - return `./${winExecutableName}`; + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return self.App_RootDir() + appIDCheck + '/'; + } else { + return self.App_RootDir() + 'serverfiles/'; + } + } else { + return self.App_RootDir() + 'serverfiles/'; } - } - - this.App_ExecutableWin = ko.computed(() => { - const workingDir = self.App_WorkingDir(); - const winExecutableName = self._WinExecutableName(); - return workingDir === "" ? winExecutableName : `${workingDir}\\${winExecutableName}`; }); - - this.App_ExecutableLinux = ko.computed(() => { - const compatibility = self._compatibility(); - const workingDir = self.App_WorkingDir(); - const linuxExecutableName = self._LinuxExecutableName(); - - if (compatibility === "None") { - return workingDir === "" ? linuxExecutableName : `${workingDir}/${linuxExecutableName}`; + + this.App_WorkingDir = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return appIDCheck; + } else { + return 'serverfiles'; + } + } else { + return 'serverfiles'; } - - const suffix = compatibility.substring(compatibility.length - 4); - return suffix === "Xvfb" ? "/usr/bin/xvfb-run" : (compatibility === "Wine" ? "/usr/bin/wine" : "1580130/proton"); - }); - - this._App_LinuxCommandLineArgsCompat = ko.computed(() => { - const compatibility = self._compatibility(); - const winExecutableName = self._WinExecutableName(); - return getLinuxCompatArgs(compatibility, winExecutableName); }); + this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); + this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? '/usr/bin/xvfb-run' : (self._compatibility() == "Wine" ? '/usr/bin/wine' : '1580130/proton'))); + this._App_LinuxCommandLineArgsCompat = ko.computed(() => self._compatibility() == "None" ? '' : (self._compatibility() == "WineXvfb" ? '-a wine \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "ProtonXvfb" ? '-a \"{{$FullRootDir}}1580130/proton\" run \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "Proton" ? 'run \"./' + self._WinExecutableName() + '\"' : '\"./' + self._WinExecutableName() + '\"')))); this._App_LinuxCommandLineArgsInput = ko.observable(""); - this.App_LinuxCommandLineArgs = ko.computed(() => { - const compatArgs = self._App_LinuxCommandLineArgsCompat(); - const inputArgs = self._App_LinuxCommandLineArgsInput(); - return compatArgs !== "" ? `${compatArgs} ${inputArgs}` : inputArgs; - }); + this.App_LinuxCommandLineArgs = ko.computed(() => self._App_LinuxCommandLineArgsCompat() != '' ? self._App_LinuxCommandLineArgsCompat() + ' ' + self._App_LinuxCommandLineArgsInput() : self._App_LinuxCommandLineArgsInput()); - this.App_Ports = ko.computed(() => `@IncludeJson[${self._Meta_PortsManifest()}]`); - this.App_UpdateSources = ko.computed(() => `@IncludeJson[${self._Meta_StagesManifest()}]`); + this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); + this.App_UpdateSources = ko.computed(() => `@IncludeJson[` + self._Meta_StagesManifest() + `]`); /* this.__BuildPortMappings = ko.computed(() => { var data = {}; @@ -267,14 +243,8 @@ class GeneratorViewModel { return data; }); */ - this.__SampleFormattedArgs = ko.computed(() => { - return self._AppSettings() - .filter(s => s.IncludeInCommandLine()) - .map(s => s.IsFlagArgument() - ? s._CheckedValue() - : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue()) - ) - .join(self.App_CommandLineParameterDelimiter()); + this.__SampleFormattedArgs = ko.computed(function () { + return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); }); /* this.__SampleCommandLineFlags = ko.computed(function () { @@ -286,114 +256,156 @@ class GeneratorViewModel { return self.App_CommandLineArgs().template(replacements); }); */ - this.__GenData = ko.computed(() => { + this.__GenData = ko.computed(function () { var data = [ - { "key": "Generated Name", "value": self.__SanitizedName() }, - { "key": "Config Root", "value": self.Meta_ConfigRoot() }, - { "key": "Settings Manifest", "value": self.Meta_ConfigManifest() }, - { "key": "Ports Manifest", "value": self._Meta_PortsManifest() }, - { "key": "Config Files Manifest", "value": self.Meta_MetaConfigManifest() }, - { "key": "Image Source", "value": self.Meta_DisplayImageSource(), "longValue": true }, - { "key": "Root Directory", "value": self.App_RootDir() }, - { "key": "Base Directory", "value": self.App_BaseDirectory() }, - { "key": "Working Directory", "value": self.App_WorkingDir() }, - { "key": "Docker Image", "value": self.Meta_SpecificDockerImage(), "longValue": true }, - { "key": "Compatibility", "value": self._compatibility() } + { + "key": "Generated Name", + "value": self.__SanitizedName(), + }, + { + "key": "Config Root", + "value": self.Meta_ConfigRoot() + }, + { + "key": "Settings Manifest", + "value": self.Meta_ConfigManifest() + }, + { + "key": "Ports Manifest", + "value": self._Meta_PortsManifest() + }, + { + "key": "Config Files Manifest", + "value": self.Meta_MetaConfigManifest() + }, + { + "key": "Image Source", + "value": self.Meta_DisplayImageSource(), + "longValue": true + }, + { + "key": "Root Directory", + "value": self.App_RootDir() + }, + { + "key": "Base Directory", + "value": self.App_BaseDirectory() + }, + { + "key": "Working Directory", + "value": self.App_WorkingDir() + }, + { + "key": "Docker Image", + "value": self.Meta_SpecificDockerImage(), + "longValue": true + }, + { + "key": "Compatibility", + "value": self._compatibility() + } ]; if (self._SupportsWindows()) { - data.push({ "key": "Windows Executable", "value": self.App_ExecutableWin() }); + data.push({ + "key": "Windows Executable", + "value": self.App_ExecutableWin() + }); } if (self._SupportsLinux()) { - data.push({ "key": "Linux Executable", "value": self.App_ExecutableLinux() }); + data.push({ + "key": "Linux Executable", + "value": self.App_ExecutableLinux() + }); } return data; }); //Action methods (add/remove/update) - this.__RemovePort = toRemove => { - if (toRemove._PortType() !== 'Custom Port') { - this.availablePortOptions.push(toRemove._PortType()); - } + this.__RemovePort = function (toRemove) { self._PortMappings.remove(toRemove); }; - this.__AddPort = () => { - self._PortMappings.push(new PortMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewDescription(), self.__NewPortType(), self.__NewProtocol(), self)); - if (self.__NewPortType() !== 'Custom Port') { + this.__AddPort = function () { + self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewDescription(), self.__NewPortType(), self.__NewProtocol(), self)); + if (self.__NewPortType() != 'Custom Port'){ this.availablePortOptions.remove(self.__NewPortType()); } + }; - this.__RemoveConfigFile = toRemove => { + this.__RemoveConfigFile = function (toRemove) { self._ConfigFileMappings.remove(toRemove); }; - this.__AddConfigFile = () => { - self._ConfigFileMappings.push(new ConfigFileMappingViewModel(self.__NewConfigFile(), self.__NewAutoMap(), self.__NewConfigType(), self)); + this.__AddConfigFile = function () { + self._ConfigFileMappings.push(new configFileMappingViewModel(self.__NewConfigFile(), self.__NewAutoMap(), self.__NewConfigType(), self)); }; - this.__RemoveSetting = toRemove => { + this.__RemoveSetting = function (toRemove) { self._AppSettings.remove(toRemove); }; - this.__EditSetting = toEdit => { + this.__EditSetting = function (toEdit) { self.__IsEditingSetting(true); self.__AddEditSetting(toEdit); $("#addEditSettingModal").modal('show'); }; - this.__AddSetting = () => { + this.__AddSetting = function () { self.__IsEditingSetting(false); - self.__AddEditSetting(new AppSettingViewModel(self)); + self.__AddEditSetting(new appSettingViewModel(self)); $("#addEditSettingModal").modal('show'); }; - this.__DoAddSetting = () => { + this.__DoAddSetting = function () { self._AppSettings.push(self.__AddEditSetting()); $("#addEditSettingModal").modal('hide'); }; - this.__CloseSetting = () => { + this.__CloseSetting = function () { $("#addEditSettingModal").modal('hide'); }; - this.__RemoveStage = toRemove => { + this.__RemoveStage = function (toRemove) { self._UpdateStages.remove(toRemove); }; - this.__EditStage = toEdit => { + this.__EditStage = function (toEdit) { self.__IsEditingStage(true); self.__AddEditStage(toEdit); $("#addEditStageModal").modal('show'); }; - this.__AddStage = () => { + this.__AddStage = function () { self.__IsEditingStage(false); - self.__AddEditStage(new UpdateStageViewModel(self)); + self.__AddEditStage(new updateStageViewModel(self)); $("#addEditStageModal").modal('show'); }; - this.__DoAddStage = () => { + this.__DoAddStage = function () { self._UpdateStages.push(self.__AddEditStage()); $("#addEditStageModal").modal('hide'); }; - this.__CloseStage = () => { + this.__CloseStage = function () { $("#addEditStageModal").modal('hide'); }; - this.__Serialize = () => { - const asJS = ko.toJS(self); - const result = JSON.stringify(asJS, omitPrivateMembers); + this.__Serialize = function () { + var asJS = ko.toJS(self); + var result = JSON.stringify(asJS, omitPrivateMembers); return result; }; - this.__Deserialize = inputData => { - const asJS = JSON.parse(inputData); - let { _PortMappings: ports, _ConfigFileMappings: configFiles, _AppSettings: settings, _UpdateStages: stages } = asJS; + this.__Deserialize = function (inputData) { + var asJS = JSON.parse(inputData); + var ports = asJS._PortMappings; + var configFiles = asJS._ConfigFileMappings; + var settings = asJS._AppSettings; + var stages = asJS._UpdateStages; delete asJS._PortMappings; delete asJS._ConfigFileMappings; @@ -403,120 +415,150 @@ class GeneratorViewModel { ko.quickmap.map(self, asJS); self._PortMappings.removeAll(); - const mappedPorts = ko.quickmap.to(PortMappingViewModel, ports, false, { __vm: self }); + var mappedPorts = ko.quickmap.to(portMappingViewModel, ports, false, { __vm: self }); self._PortMappings.push.apply(self._PortMappings, mappedPorts); self._ConfigFileMappings.removeAll(); - const mappedConfigFiles = ko.quickmap.to(ConfigFileMappingViewModel, configFiles, false, { __vm: self }); + var mappedConfigFiles = ko.quickmap.to(configFileMappingViewModel, configFiles, false, { __vm: self }); self._ConfigFileMappings.push.apply(self._ConfigFileMappings, mappedConfigFiles); self._AppSettings.removeAll(); - const mappedSettings = ko.quickmap.to(AppSettingViewModel, settings, false, { __vm: self }); + var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, { __vm: self }); self._AppSettings.push.apply(self._AppSettings, mappedSettings); self._UpdateStages.removeAll(); - const mappedStages = ko.quickmap.to(UpdateStageViewModel, stages, false, { __vm: self }); + var mappedStages = ko.quickmap.to(updateStageViewModel, stages, false, { __vm: self }); self._UpdateStages.push.apply(self._UpdateStages, mappedStages); }; this.__IsExporting = ko.observable(false); - this.__Export = () => { + this.__Export = function () { self.__IsExporting(true); - $("#importexporttextarea").val(self.__Serialize()).attr("readonly", true); + $("#importexporttextarea").val(self.__Serialize()); + $("#importexporttextarea").attr("readonly", true); $("#importExportDialog").modal("show"); autoSave(); }; - this.__CopyExportToClipboard = (data, element) => { + this.__CopyExportToClipboard = function (data, element) { navigator.clipboard.writeText($("#importexporttextarea").val()); setTimeout(() => $(element.target).tooltip('hide'), 2000); }; - this.__CloseImportExport = () => { + this.__CloseImportExport = function () { $("#importExportDialog").modal("hide"); }; - this.__Import = () => { + this.__Import = function () { self.__IsExporting(false); - $("#importexporttextarea").val("").prop("readonly", false); + $("#importexporttextarea").val(""); + $("#importexporttextarea").prop("readonly", false); $("#importExportDialog").modal("show"); }; - this.__DoImport = () => { + this.__DoImport = function () { self.__Deserialize($("#importexporttextarea").val()); $("#importExportDialog").modal("hide"); autoSave(); }; - this.__Share = (data, element) => { + this.__Share = function (data, element) { var data = encodeURIComponent(self.__Serialize()); - const url = `${document.location.protocol}//${document.location.hostname}${document.location.pathname}#cdata=${data}`; + var url = `${document.location.protocol}//${document.location.hostname}${document.location.pathname}#cdata=${data}`; navigator.clipboard.writeText(url); setTimeout(() => $(element.target).tooltip('hide'), 2000); }; - this.__Clear = () => { - localStorage.configGenAutoSave = ""; + this.__Clear = function () { + localStorage.configgenautosave = ""; document.location.reload(); } - this.__GithubManifest = () => { - const guid = () => 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => { - const r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8); - return v.toString(16); - }); - const githubManifest = JSON.stringify({ id: guid(), authors: [self.Meta_Author()], origin: self._Meta_GithubOrigin(), url: self._Meta_GithubURL(), imagefile: "", prefix: self.Meta_Author() }, null, 4); + this.__GithubManifest = function () { + function guid() { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + } + var githubManifest = JSON.stringify({ id: guid(), authors: [self.Meta_Author()], origin: self._Meta_GithubOrigin(), url: self._Meta_GithubURL(), imagefile: "", prefix: self.Meta_Author() }, null, 4); return githubManifest; } - this.__DownloadConfig = () => { + this.__DownloadConfig = function () { if (this.__ValidationResult() < 2) { return; } - const lines = Object.keys(self) - .filter(k => !k.startsWith("_")) - .map(key => `${key.replace("_", ".")}=${self[key]()}`); - - if (self._UpdateSourceType() === "4") { // SteamCMD - const envVars = `App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`; - const protonVars = `, \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`; - lines.push(self._compatibility() === "Proton" || self._compatibility() === "ProtonXvfb" ? envVars + protonVars : envVars); + var lines = []; + for (const key of Object.keys(self).filter(k => !k.startsWith("_"))) { + lines.push(`${key.replace("_", ".")}=${self[key]()}`); } - const output = lines.sort().join("\n"); - const zip = new JSZip(); - const zipFiles = [ - [self.Meta_ConfigRoot(), output], - [self.Meta_ConfigManifest(), JSON.stringify(ko.toJS(self._AppSettings()), omitNonPublicMembers, 4)], - [self._Meta_StagesManifest(), JSON.stringify(ko.toJS(self._UpdateStages()), omitNonPublicMembers, 4)], - [self._Meta_PortsManifest(), JSON.stringify(ko.toJS(self._PortMappings()), omitNonPublicMembers, 4)], - [self.Meta_MetaConfigManifest(), JSON.stringify(ko.toJS(self._ConfigFileMappings()), omitNonPublicMembers, 4)], - ["manifest.json", self.__GithubManifest()] - ]; + /* + switch (self._UpdateSourceType()) { + case "1": //URL + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); + break; + case "4": //Steam + if (self._compatibility() == "Proton") { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); + } else { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); + } + break; + case "16": //Github + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); + break; + } + */ + if (self._UpdateSourceType() == "4") //SteamCMD + { + if (self._compatibility() == "Proton" || self._compatibility() == "ProtonXvfb") { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); + } else { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); + } + } - zipFiles.forEach(([name, content]) => zip.file(name, content)); + var output = lines.sort().join("\n"); + var asJSAppSettings = ko.toJS(self._AppSettings()); + var asJSUpdateStages = ko.toJS(self._UpdateStages()); + var asJSPortMappings = ko.toJS(self._PortMappings()); + var asJSConfigFileMappings = ko.toJS(self._ConfigFileMappings()); + var zip = new JSZip(); + zip.file(self.Meta_ConfigRoot(), output); + zip.file(self.Meta_ConfigManifest(), JSON.stringify(asJSAppSettings, omitNonPublicMembers, 4)); + zip.file(self._Meta_StagesManifest(), JSON.stringify(asJSUpdateStages, omitNonPublicMembers, 4)); + zip.file(self._Meta_PortsManifest(), JSON.stringify(asJSPortMappings, omitNonPublicMembers, 4)); + zip.file(self.Meta_MetaConfigManifest(), JSON.stringify(asJSConfigFileMappings, omitNonPublicMembers, 4)); + zip.file("manifest.json", self.__GithubManifest()); zip.generateAsync({ type: "blob" }) - .then(content => saveAs(content, "configs.zip")); + .then(function (content) { + saveAs(content, "configs.zip"); + }); }; - this.__Invalidate = newValue => { + this.__Invalidate = function (newValue) { self.__ValidationResult(0); }; - Object.keys(self) - .filter(k => ko.isObservable(self[k])) - .forEach(k => self[k].subscribe(self.__Invalidate)); + for (const k of Object.keys(self)) { + if (ko.isObservable(self[k])) { + self[k].subscribe(self.__Invalidate); + } + } this.__ValidationResult = ko.observable(0); + this.__ValidationResults = ko.observableArray(); this.__ValidateConfig = function () { autoSave(); self.__ValidationResults.removeAll(); - var failure = (issue, recommendation) => self.__ValidationResults.push(new ValidationResult("Failure", issue, recommendation)); - var warning = (issue, recommendation, impact) => self.__ValidationResults.push(new ValidationResult("Warning", issue, recommendation, impact)); - var info = (issue, recommendation, impact) => self.__ValidationResults.push(new ValidationResult("Info", issue, recommendation, impact)); + var failure = (issue, recommendation) => self.__ValidationResults.push(new validationResult("Failure", issue, recommendation)); + var warning = (issue, recommendation, impact) => self.__ValidationResults.push(new validationResult("Warning", issue, recommendation, impact)); + var info = (issue, recommendation, impact) => self.__ValidationResults.push(new validationResult("Info", issue, recommendation, impact)); //Validation Begins if (self.Meta_DisplayName() == "") { @@ -550,8 +592,40 @@ class GeneratorViewModel { if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); } - break; +/* + if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { + warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); + } + + if (self._PortMappings().filter(p => p.PortType() == "2").length == 0) { + warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); + } +*/ break; } + /* + switch (self._UpdateSourceType()) { + case "1": //Fetch from URL + if (self._UpdateSourceURL() == "") { + failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); + } + else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { + info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); + } + break; + case "4": //SteamCMD + if (self._SteamServerAppID() == "") { + failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); + } + if (self._SteamClientAppID() == "") { + warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); + } + break; + } + */ + if (self.Console_AppReadyRegex() != "" && !self.Console_AppReadyRegex().match(/\^.+\$/)) { failure("Server ready expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the Server Ready expression under Server Events to match the entire line."); } + if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } + if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } + if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } if ((self._compatibility() == "Wine" && !self._SupportsLinux()) || (self._compatibility() == "Proton" && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } //Validation Summary @@ -571,183 +645,109 @@ class GeneratorViewModel { }; } } - -class ValidationResult { - constructor(grade, issue, recommendation, impact = "") { +class validationResult { + constructor(grade, issue, recommendation, impact) { this.grade = grade; this.issue = issue; this.recommendation = recommendation; - this.impact = impact; + this.impact = impact || ""; this.gradeClass = ""; - switch (grade) { - case "Failure": - this.gradeClass = "table-danger"; - break; - case "Warning": - this.gradeClass = "table-warning"; - break; - case "Info": - this.gradeClass = "table-info"; - break; + case "Failure": this.gradeClass = "table-danger"; break; + case "Warning": this.gradeClass = "table-warning"; break; + case "Info": this.gradeClass = "table-info"; break; } } } -class PortMappingViewModel { +class portMappingViewModel { constructor(port, portName, portDescription, portType, protocol, vm) { + var self = this; this.__vm = vm; - - if (!port) { - throw new Error("Port Number is required."); - } - if (!portName) { - throw new Error("Port Name is required."); - } - if (!portDescription) { - throw new Error("Port Description is required."); - } - this._Protocol = ko.observable(protocol); - this.Protocol = ko.computed(() => { - switch (this._Protocol()) { - case "1": - return "TCP"; - case "2": - return "UDP"; - case "0": - default: - return "Both"; - } - }); + this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP`)); this.Port = ko.observable(port); this._PortType = ko.observable(portType); this._Name = ko.observable(portName); - this.Name = ko.computed(() => { - switch (this._PortType()) { - case "Main Game Port": - return "Main Game Port"; - case "Steam Query Port": - return "Steam Query Port"; - case "RCON Port": - return "Remote Admin Port"; - case "Custom Port": - default: - return this._Name(); - } - }); + this.Name = ko.computed(() => self._PortType() == "0" ? self._Name() : (self._PortType() == "1" ? `Steam Query Port` : (self._PortType() == "2" ? `Remote Admin Port` : `Game Port 1`))); this._Description = ko.observable(portDescription); - this.Description = ko.computed(() => { - switch (this._PortType()) { - case "1": - return "Port used for Steam queries and server list"; - case "2": - return "Port used for RCON administration"; - case "0": - default: - return this._Description(); - } - }); - this.Ref = ko.computed(() => { - const cleanName = this._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, ""); - switch (this._PortType()) { - case "Main Game Port": - return "MainGamePort"; - case "Steam Query Port": - return "SteamQueryPort"; - case "RCON Port": - return "RemoteAdminPort"; - case "0": - default: - return cleanName; - } - }); - this.__RemovePort = () => this.__vm.__RemovePort(this); + this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : (self._PortType() == "2" ? `Port used for RCON administration` : `Port used for main game traffic`))); + this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "1" ? `SteamQueryPort` : (self._PortType() == "2" ? `RemoteAdminPort` : `GamePort1`))); + this.__RemovePort = () => self.__vm.__RemovePort(self); } } - -class ConfigFileMappingViewModel { +class configFileMappingViewModel { constructor(configFile, autoMap, configType, vm) { + var self = this; this.__vm = vm; this.ConfigFile = ko.observable(configFile); this._ConfigType = ko.observable(configType); - this.ConfigType = ko.computed(() => { - switch (this._ConfigType()) { - case "1": - return "ini"; - case "2": - return "xml"; - case "3": - return "kvp"; - case "0": - default: - return "json"; - } - }); + this.ConfigType = ko.computed(() => self._ConfigType() == "0" ? `json` : (self._ConfigType() == "1" ? `ini` : (self._ConfigType() == "2" ? `xml` : (self._ConfigType() == "3" ? `kvp` : ``)))); this._AutoMap = ko.observable(autoMap); - this.AutoMap = ko.computed(() => this._ConfigType() === "4" ? false : this._AutoMap()); - this.__RemoveConfigFile = () => this.__vm.__RemoveConfigFile(this); + this.AutoMap = ko.computed(() => self._ConfigType() == "4" ? false : self._AutoMap()); + this.__RemoveConfigFile = () => self.__vm.__RemoveConfigFile(self); } } -class AppSettingViewModel { +class appSettingViewModel { constructor(vm) { + var self = this; this.__vm = vm; this.DisplayName = ko.observable(""); this.Category = ko.observable("Server Settings"); this.Description = ko.observable(""); - this.Keywords = ko.computed(() => this.DisplayName().toLowerCase().replaceAll(" ", ",")); + this.Keywords = ko.computed(() => self.DisplayName().toLowerCase().replaceAll(" ", ",")); this.FieldName = ko.observable(""); - this.InputType = ko.observable("text"); + this.InputType = ko.observable("text") this.IsFlagArgument = ko.observable(false); - this.ParamFieldName = ko.computed(() => this.FieldName()); + this.ParamFieldName = ko.computed(() => self.FieldName()); this.IncludeInCommandLine = ko.observable(false); this.DefaultValue = ko.observable(""); - this.Placeholder = ko.computed(() => this.DefaultValue()); + this.Placeholder = ko.computed(() => self.DefaultValue()); this.Suffix = ko.observable(""); this.Hidden = ko.observable(false); this.SkipIfEmpty = ko.observable(false); this._CheckedValue = ko.observable("true"); this._UncheckedValue = ko.observable("false"); - this.__RemoveSetting = () => this.__vm.__RemoveSetting(this); - this.__EditSetting = () => this.__vm.__EditSetting(this); + this.__RemoveSetting = () => self.__vm.__RemoveSetting(self); + this.__EditSetting = () => self.__vm.__EditSetting(self); - this._EnumMappings = ko.observableArray(); // of EnumMappingViewModel + this._EnumMappings = ko.observableArray(); //of enumMappingViewModel this.__NewEnumKey = ko.observable(""); this.__NewEnumValue = ko.observable(""); - this.__RemoveEnum = (toRemove) => { - this._EnumMappings.remove(toRemove); + this.__RemoveEnum = function (toRemove) { + self._EnumMappings.remove(toRemove); }; - this.__AddEnum = () => { - this._EnumMappings.push(new EnumMappingViewModel(this.__NewEnumKey(), this.__NewEnumValue(), this)); + this.__AddEnum = function () { + self._EnumMappings.push(new enumMappingViewModel(self.__NewEnumKey(), self.__NewEnumValue(), self)); }; - this.__deserialize = (inputData) => { - const asJS = JSON.parse(inputData); - const enumSettings = asJS._EnumMappings; + this.__Deserialize = function (inputData) { + var asJS = JSON.parse(inputData); + var enumSettings = asJS._EnumMappings; delete asJS._EnumMappings; - ko.quickmap.map(this, asJS); + ko.quickmap.map(self, asJS); - this._EnumMappings.removeAll(); - const MappedEnums = ko.quickmap.to(EnumMappingViewModel, enumSettings, false, { __vm: this }); - this._EnumMappings.push.apply(this._EnumMappings, MappedEnums); + self._EnumMappings.removeAll(); + var mappedEnums = ko.quickmap.to(enumMappingViewModel, enumSettings, false, { __vm: self }); + self._EnumMappings.push.apply(self._EnumMappings, mappedEnums); }; this.EnumValues = ko.computed(() => { - if (this.InputType() === "checkbox") { - const result = {}; - result[this._CheckedValue()] = "True"; - result[this._UncheckedValue()] = "False"; + if (self.InputType() == "checkbox") { + var result = {}; + result[self._CheckedValue()] = "True"; + result[self._UncheckedValue()] = "False"; return result; - } else if (this.InputType() === "enum") { - const result = {}; - for (let i = 0; i < this._EnumMappings().length; i++) { - result[this._EnumMappings()[i]._EnumKey()] = this._EnumMappings()[i]._EnumValue(); + } else if (self.InputType() == "enum") { + var result = {}; + for (let i = 0; i < self._EnumMappings().length; i++) { + result[self._EnumMappings()[i]._enumKey()] = self._EnumMappings()[i]._enumValue(); } return result; } else { @@ -757,54 +757,25 @@ class AppSettingViewModel { } } -class EnumMappingViewModel { +class enumMappingViewModel { constructor(enumKey, enumValue, vm) { + var self = this; this.__vm = vm; - this._EnumKey = ko.observable(EnumKey); - this._EnumValue = ko.observable(EnumValue); - this.__RemoveEnum = () => this.__vm.__RemoveEnum(this); + this._enumKey = ko.observable(enumKey); + this._enumValue = ko.observable(enumValue); + this.__RemoveEnum = () => self.__vm.__RemoveEnum(self); } } - -class UpdateStageViewModel { +class updateStageViewModel { constructor(vm) { + var self = this; this.__vm = vm; this.UpdateStageName = ko.observable(""); this._UpdateSourcePlatform = ko.observable("0"); - this.UpdateSourcePlatform = ko.computed(() => { - switch (this._UpdateSourcePlatform()) { - case "1": - return "Linux"; - case "2": - return "Windows"; - default: - return "All"; - } - }); + this.UpdateSourcePlatform = ko.computed(() => self._UpdateSourcePlatform() == "0" ? `All` : (self._UpdateSourcePlatform() == "1" ? `Linux` : `Windows`)); this._UpdateSource = ko.observable("8"); - this.UpdateSource = ko.computed(() => { - switch (this._UpdateSource()) { - case "0": - return "CopyFilePath"; - case "1": - return "CreateSymlink"; - case "2": - return "Executable"; - case "3": - return "ExtractArchive"; - case "4": - return "FetchURL"; - case "5": - return "GithubRelease"; - case "6": - return "SetExecutableFlag"; - case "7": - return "StartApplication"; - default: - return "SteamCMD"; - } - }); + this.UpdateSource = ko.computed(() => self._UpdateSource() == "0" ? `CopyFilePath` : (self._UpdateSource() == "1" ? `CreateSymlink` : (self._UpdateSource() == "2" ? `Executable` : (self._UpdateSource() == "3" ? `ExtractArchive` : (self._UpdateSource() == "4" ? `FetchURL` : (self._UpdateSource() == "5" ? `GithubRelease` : (self._UpdateSource() == "6" ? `SetExecutableFlag` : (self._UpdateSource() == "7" ? `StartApplication` : `SteamCMD`)))))))); this.UpdateSourceData = ko.observable(""); this.UpdateSourceArgs = ko.observable(""); this.UpdateSourceVersion = ko.observable(""); @@ -812,65 +783,45 @@ class UpdateStageViewModel { this.UnzipUpdateSource = ko.observable(false); this.OverwriteExistingFiles = ko.observable(false); this._ForceDownloadPlatform = ko.observable(null); - this.ForceDownloadPlatform = ko.computed(() => { - switch (this._ForceDownloadPlatform()) { - case "1": - return "Linux"; - case "2": - return "Windows"; - default: - return null; - } - }); + this.ForceDownloadPlatform = ko.computed(() => self._ForceDownloadPlatform() == "0" ? null : (self._ForceDownloadPlatform() == "1" ? `Linux` : `Windows`)); this.UpdateSourceConditionSetting = ko.observable(null); this.UpdateSourceConditionValue = ko.observable(null); this.DeleteAfterExtract = ko.observable(true); this.OneShot = ko.observable(false); - this.__RemoveStage = () => this.__vm.__RemoveStage(this); - this.__EditStage = () => this.__vm.__EditStage(this); + this.__RemoveStage = () => self.__vm.__RemoveStage(self); + this.__EditStage = () => self.__vm.__EditStage(self); } } -const vm = new GeneratorViewModel(); - -const autoSave = () => { - localStorage.setItem('configGenAutoSave', vm.__Serialize()); -}; +var vm = new generatorViewModel(); -const autoLoad = () => { - const configGenAutoSave = localStorage.getItem('configGenAutoSave'); +function autoSave() { + localStorage.configgenautosave = vm.__Serialize(); +} - if (configGenAutoSave !== "") { - vm.__Deserialize(configGenAutoSave); +function autoLoad() { + if (localStorage.configgenautosave != "") { + vm.__Deserialize(localStorage.configgenautosave); } -}; - +} document.addEventListener('DOMContentLoaded', () => { ko.applyBindings(vm); setInterval(autoSave, 30000); $('body').scrollspy({ target: '#navbar', offset: 90 }); - initTooltip(); - processLocationHash(); -}); - -function initTooltip() { $('[data-toggle="tooltip"]').tooltip({ container: 'body', trigger: 'click', placement: 'bottom' }); -} - -function processLocationHash() { - const { hash } = document.location; - - if (hash.startsWith("#cdata=")) { - var data = decodeURIComponent(hash.substring(7)); + //Check if there is anything after the # and if it starts cdata=, then import it if it does. + if (document.location.hash.indexOf("#cdata=") == 0) { + var data = decodeURIComponent(document.location.hash.substring(7)); vm.__Deserialize(data); document.location.hash = ""; - } else { + } + else { autoLoad(); } -} +}); diff --git a/index.html b/index.html index d4363d0..710d044 100644 --- a/index.html +++ b/index.html @@ -1,32 +1,34 @@ + AMP Configuration Generator - - - - - - - - + + - - + + + + + + + + @@ -37,7 +39,9 @@
    - -
    Useful for describing different variants/configurations of the same application.
    + +
    Optional: useful for describing different variants/configurations of the same application.
    @@ -194,17 +205,17 @@

    Basic Information

    Windows - - Runs on Windows 10/Server 2016 or newer. x86/64 Only. - + Runs on Windows 10/Server 2016 or newer. x86/64 Only. @@ -214,7 +225,8 @@

    Basic Information

    - This is in addition to the applications management type if it accepts management over methods other than Standard IO + This is in addition to the applications management type if it + accepts management over methods other than Standard IO
    + +
    Generally these are not needed for modern applications
    +
    + + + +
    +

    Networking

    - AMP will automatically generate firewall rules to allow the application ports through. You may add any number of ports. Maximum of 1 Main Game, Steam Query, and RCON Port. + AMP will automatically generate firewall rules to allow the application + ports through
    @@ -407,14 +439,17 @@

    Networking

    @@ -437,18 +473,29 @@

    Networking

    + + + @@ -500,7 +549,8 @@

    Update Sources

    @@ -528,10 +578,12 @@

    Configuration and Settings

    @@ -547,7 +599,8 @@

    Configuration and Settings

    @@ -571,7 +624,8 @@
    Configuration Files
    @@ -601,7 +657,8 @@
    Configuration Files
    - + - + - + -
    + + You may add any number of ports.
    + Maximum of 1 Main Game, Steam Query, and RCON Port. +     +
    - + - + - + - -
    - - -
    -
    - + - + -
    - + - +

    - Regex101 is an excellent resource to help validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour. + Regex101 is an excellent resource to help + validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour.

    - +
    - +
    - +
    - +


    Validate and Review

    - This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP. + This is generated assuming the default values and default port + numbers, these will change based on user-specified values or assignments made by AMP.
    @@ -998,7 +1086,8 @@
    -
    +
    @@ -1009,19 +1098,23 @@
    Display Name - The name of the setting as it will appear within AMPs configuration page. + The name of the setting as it will appear within AMPs + configuration page. - +
    - +
    @@ -1029,19 +1122,23 @@
    Description - A brief explanation as to what the setting does and what effect it will have. + A brief explanation as to what the setting does and + what effect it will have. - +
    - +
    @@ -1049,16 +1146,19 @@
    Field Name - The name of the command line argument that this setting controls. Used as the arguments key. + The name of the command line argument that this + setting controls. Used as the arguments key. - +
    +
    -
    +
    -
    +
    @@ -1142,8 +1255,8 @@
    - Key (Placed in config file/startup args) - Value (Presented to user) + Enum Key + Enum Value @@ -1157,7 +1270,8 @@
    - @@ -1165,7 +1279,7 @@
    No entries have been added. + No enums have been added. @@ -1191,27 +1305,34 @@
    Checked Value - The value used for this setting if it is checked. + The value used for this setting if it is + checked. - +
    - +
    - -
    @@ -1223,7 +1344,8 @@
    -
    +
    @@ -1265,7 +1387,8 @@
    Source Type Details
    This will show as the notification while updating. - +
    @@ -1289,7 +1412,8 @@
    Source Type Details
    Run this stage based on another setting. Place the variable name here and the value in Condition Value. - +
    @@ -1300,11 +1424,13 @@
    Source Type Details
    The value of the Condition Setting that allows this stage to run. - +
    - +
    @@ -1333,7 +1460,8 @@
    Source Type Details
    Source File to copy including the Root Directory. - +
    @@ -1344,7 +1472,8 @@
    Source Type Details
    The file/directory to create a symlink of including the Root Directory. - +
    @@ -1355,7 +1484,8 @@
    Source Type Details
    The arguments to append to the executable. - +
    @@ -1366,7 +1496,8 @@
    Source Type Details
    The zip file to extract including the Root Directory. - +
    @@ -1377,7 +1508,8 @@
    Source Type Details
    The GitHub repo to download the release from. - +
    @@ -1388,7 +1520,8 @@
    Source Type Details
    The file to mark executable. - +
    @@ -1399,7 +1532,8 @@
    Source Type Details
    The App ID of the Steam game client. You can find this via SteamDB. - +
    @@ -1410,7 +1544,8 @@
    Source Type Details
    The location to place the symlink including the Root Directory. - +
    @@ -1421,7 +1556,8 @@
    Source Type Details
    The location and name of the executable including the Root Directory. - +
    @@ -1432,7 +1568,8 @@
    Source Type Details
    The file to download from the release. - +
    @@ -1443,7 +1580,8 @@
    Source Type Details
    The destination file location/name including the Root Directory. - +
    @@ -1454,7 +1592,8 @@
    Source Type Details
    The App ID of the application to download. You can find this via SteamDB. - +
    @@ -1465,7 +1604,8 @@
    Source Type Details
    The branch to download from. Can be hardcoded or the Field Name of an input. Public branch if left blank. - +
    @@ -1491,7 +1631,8 @@
    Source Type Details
    Where to download relative to the Root Directory. - +
    @@ -1502,13 +1643,15 @@
    Source Type Details
    Where to extract the file to relative to Root Directory. - +
    @@ -225,8 +213,7 @@

    Basic Information

    - +
    - +
    - +
    - +


    Validate and Review

    - This is generated assuming the default values and default port - numbers, these will change based on user-specified values or assignments made by AMP. + This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP.
    @@ -1086,8 +997,7 @@
    -
    +
    @@ -1098,23 +1008,19 @@
    - +
    - +
    @@ -1122,23 +1028,19 @@
    - +
    - +
    @@ -1146,19 +1048,16 @@
    - +
    +
    - +
    -
    +
    -
    +
    @@ -1255,8 +1141,8 @@
    - - + + @@ -1270,8 +1156,7 @@
    @@ -1279,7 +1164,7 @@
    - + @@ -1305,34 +1190,27 @@
    - +
    - +
    - -
    @@ -1344,8 +1222,7 @@
    -
    +
    @@ -1387,8 +1264,7 @@
    Source Type Details
    This will show as the notification while updating. - +
    @@ -1412,8 +1288,7 @@
    Source Type Details
    Run this stage based on another setting. Place the variable name here and the value in Condition Value. - +
    @@ -1424,13 +1299,11 @@
    Source Type Details
    The value of the Condition Setting that allows this stage to run. - +
    - +
    @@ -1460,8 +1332,7 @@
    Source Type Details
    Source File to copy including the Root Directory. - +
    @@ -1472,8 +1343,7 @@
    Source Type Details
    The file/directory to create a symlink of including the Root Directory. - +
    @@ -1484,8 +1354,7 @@
    Source Type Details
    The arguments to append to the executable. - +
    @@ -1496,8 +1365,7 @@
    Source Type Details
    The zip file to extract including the Root Directory. - +
    @@ -1508,8 +1376,7 @@
    Source Type Details
    The GitHub repo to download the release from. - +
    @@ -1520,8 +1387,7 @@
    Source Type Details
    The file to mark executable. - +
    @@ -1532,8 +1398,7 @@
    Source Type Details
    The App ID of the Steam game client. You can find this via SteamDB. - +
    @@ -1544,8 +1409,7 @@
    Source Type Details
    The location to place the symlink including the Root Directory. - +
    @@ -1556,8 +1420,7 @@
    Source Type Details
    The location and name of the executable including the Root Directory. - +
    @@ -1568,8 +1431,7 @@
    Source Type Details
    The file to download from the release. - +
    @@ -1580,8 +1442,7 @@
    Source Type Details
    The destination file location/name including the Root Directory. - +
    @@ -1592,8 +1453,7 @@
    Source Type Details
    The App ID of the application to download. You can find this via SteamDB. - +
    @@ -1604,8 +1464,7 @@
    Source Type Details
    The branch to download from. Can be hardcoded or the Field Name of an input. Public branch if left blank. - +
    @@ -1631,8 +1490,7 @@
    Source Type Details
    Where to download relative to the Root Directory. - +
    @@ -1643,15 +1501,13 @@
    Source Type Details
    Where to extract the file to relative to Root Directory. - +
    Enum KeyEnum ValueKey (Placed in config file/startup args)Value (Presented to user)
    -
    No enums have been added.No entries have been added.
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NumberTypeNameDescriptionProtocol
    - - - - - - - - - -
    No ports have been added.
    - - - - - - - - - - - -
    -

    -

    Update Sources

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Stage NameSource Type
    - - -
    No update sources added.
    - -
    -

    -

    Configuration and Settings

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Display NameField NameDefault ValueCommand Line
    - - -
    No settings have been added.
    - -
    -
    Configuration Files
    -
    - Select the location of any game server configuration files AMP should manage. Location relative to Base Directory. -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Config FileConfig TypeAutoMap
    - - - - - - - -
    No config files have been added.
    - - - - - - - -
    -

    -

    Startup and Shutdown

    -
    Application and Parameters
    -
    -
    - - -
    -
    - - -
    -
    -
    - -
    - Don't include any arguments that come from the Configuration and Settings section above. - -
    - -
    -
    -
    - -
    - Any Windows specific arguments to be used in the command line args in place of {{$PlatformArgs}}. -
    - -
    -
    - -
    - Any Linux specific arguments to be used in the command line args in place of {{$PlatformArgs}}. -
    - -
    -
    -
    -
    - -
    - The format to be used to add settings specified above to the command line in place of {{$FormattedArgs}}. {0} is the field name and {1} the value. -
    - -
    -
    - -
    - The character(s) used to separate different arguments in the command line flags generated by settings. By default this is a single space. -
    - -
    -
    -
    -
    - -
    - Where should AMP place Steam Workshop mods? This is relative to the Base Directory. -
    - -
    -
    - -
    - A URL to an image that AMP can use to represent the application. This is pre-filled for Steam games. -
    - -
    -
    - -
    - -
    - - - -
    -
    -
    Shutdown
    -
    -
    - - -
    -
    - - -
    -
    -

    -

    Server Events (Beta)

    -

    - AMP uses the game server's output from either the console (standard output) or RCON to know how to handle certain events:
    - A successful startup, Users connecting/disconnecting, or Chat messages. -

    -

    - The Config Generator will attempt to create regular expressions based on your input. - Paste a line from the console that uniquely represents the events. - Keep all static pieces of the line and replace sections that vary with the *{misc} variable. - Use as many of these variables in place of corresponding sections of the lines: -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VariableDescription
    *{username}The Username of the player
    *{userid}The User ID of the player (Typically Steam64 ID or Epic ID #)
    *{sessionid}Any unique number to identify a player's Session
    *{message}The chat message
    *{endpoint}The IP of the player
    *{misc}Any section of the line that varies

    -

    - Regex101 is an excellent resource to help validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour. -

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -

    -

    Validate and Review

    -
    - -
    - This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP. -
    -
    -
    -

    - -

    -

    - - - -   - You have not yet validated your configuration. You will not be able to download your configuration until you have done this. -

    -

    - - - -   - Validation Failed - You must address the following failures before you may continue. -

    -

    - - - -   - Validation Passed with Warnings - You should consider addressing the following warnings. -

    -

    - - - -   - Validation Passed - Great stuff! You may now download the completed configuration below. -

    -
    -
    -
    Validation Issues:
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    CategoryIssueRecommentation
    Impact:
    No validation issues
    -
    -
    -
    - -
    -

    - - - -   - Make sure to keep a backup of your configuration by using the 'Export' option at the top of the page! You will need this to make further changes even after downloading the configuration and manifest. -

    -
    -
    -
    Using the generated configuration
    -

    You can find the steps to upload the configuration to GitHub and use them within AMP on the Generic Configurations Wiki.

    -
    -

     

    - -
    - - -
    -
    -

    Generated Data

    - Values that are calculated automatically based on your input. - - - - - - - - - - - - -
    -
    - - - No Generated Value - -     		-
    -     		- - - No Generated Value - -
    -
    -
    -
    -
    - - - - - - - - - - - diff --git a/jszip.min.js b/jszip.min.js deleted file mode 100644 index ff4cfd5..0000000 --- a/jszip.min.js +++ /dev/null @@ -1,13 +0,0 @@ -/*! - -JSZip v3.10.1 - A JavaScript class for generating and reading zip files - - -(c) 2009-2016 Stuart Knightley -Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown. - -JSZip uses the library pako released under the MIT license : -https://github.com/nodeca/pako/blob/main/LICENSE -*/ - -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r tag: use the global `ko` object, attaching a `quickmap` property - factory(ko, ko.quickmap = {}); - } -}(function (ko, exports) { - function mapObject(vm, data) - { - if (data === null || data === undefined) { return; } - - var vmKeys = Object.keys(vm); - for (var key of Object.keys(data)) { - var value = data[key]; - - if (/^\/Date\((\d+)\)\/$/.test(value)) { - value = parseDate(value); - } - - if (typeof vm[key] === "function") { - if (ko.isWritableObservable(vm[key])) - { - vm[key](value); - } - } - else if (typeof vm[key] !== "undefined" || vmKeys.contains(key)) { - vm[key] = value; - } - } - } - - exports.map = mapObject; - - exports.to = function (fn, data, asObservable, perObject) { - if (data === null) { return null; } - if (data === undefined) { throw new Error("Tried to map an undefined object."); } - if (data.constructor === Array) { - var result = asObservable ? ko.observableArray() : []; - for (var el of data) { - var newObj = new fn(); - mapObject(newObj, el); - mapObject(newObj, perObject); - result.push(newObj); - } - return result; - } - else { - var obj = new fn(); - mapObject(obj, data, true); - mapObject(obj, perObject); - return obj; - } - }; -})); \ No newline at end of file diff --git a/style.css b/style.css deleted file mode 100644 index 215ceb8..0000000 --- a/style.css +++ /dev/null @@ -1,58 +0,0 @@ -.sidebar { - position: fixed; - top: 0; - bottom: 0; - left: 0; - z-index: 100; - padding: 48px 0 0; - box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); -} - -.rightbar { - position:fixed; - margin-right:0px; -} - -.leftLine { - box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1) -} - -.close -{ - border: 0; - background-color: transparent; - float: right; - font-size: 1.5rem; - font-weight: 700; - line-height: 1; - color: #000; - text-shadow: 0 1px 0 #fff; - opacity: .5; -} - -.genTableHeader -{ - width: 10.5rem; -} - -a.nav-link.active { - background-color: #0a58ca; - color: white; -} - -.linkButton { - border: none; - color: #0d6efd; - text-decoration: underline; - background-color: transparent; -} - -#importexporttextarea -{ - width: 100%; - height: 300px; -} - -#importexporttextarea[readonly] { - background-color: #eee; -} \ No newline at end of file From 1cbc87e4991ee03ab57317eba514dcb015ebebf2 Mon Sep 17 00:00:00 2001 From: James Manker Date: Wed, 28 Jun 2023 20:55:49 -0500 Subject: [PATCH 70/79] Fixing still --- FileSaver.min.js | 3 + common.js | 61 ++ generator.js | 831 ++++++++++++++++++++++ index.html | 1610 ++++++++++++++++++++++++++++++++++++++++++ jszip.min.js | 13 + knockout.quickmap.js | 65 ++ style.css | 58 ++ 7 files changed, 2641 insertions(+) create mode 100644 FileSaver.min.js create mode 100644 common.js create mode 100644 generator.js create mode 100644 index.html create mode 100644 jszip.min.js create mode 100644 knockout.quickmap.js create mode 100644 style.css diff --git a/FileSaver.min.js b/FileSaver.min.js new file mode 100644 index 0000000..6d493b2 --- /dev/null +++ b/FileSaver.min.js @@ -0,0 +1,3 @@ +(function(a,b){if("function"==typeof define&&define.amd)define([],b);else if("undefined"!=typeof exports)b();else{b(),a.FileSaver={exports:{}}.exports}})(this,function(){"use strict";function b(a,b){return"undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Deprecated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(a,b,c){var d=new XMLHttpRequest;d.open("GET",a),d.responseType="blob",d.onload=function(){g(d.response,b,c)},d.onerror=function(){console.error("could not download file")},d.send()}function d(a){var b=new XMLHttpRequest;b.open("HEAD",a,!1);try{b.send()}catch(a){}return 200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"))}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b)}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof global&&global.global===global?global:void 0,a=/Macintosh/.test(navigator.userAgent)&&/AppleWebKit/.test(navigator.userAgent)&&!/Safari/.test(navigator.userAgent),g=f.saveAs||("object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype&&!a?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href)},4E4),setTimeout(function(){e(j)},0))}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else{var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i)})}}:function(b,d,e,g){if(g=g||open("","_blank"),g&&(g.document.title=g.document.body.innerText="downloading..."),"string"==typeof b)return c(b,d,e);var h="application/octet-stream"===b.type,i=/constructor/i.test(f.HTMLElement)||f.safari,j=/CriOS\/[\d]+/.test(navigator.userAgent);if((j||h&&i||a)&&"undefined"!=typeof FileReader){var k=new FileReader;k.onloadend=function(){var a=k.result;a=j?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),g?g.location.href=a:location=a,g=null},k.readAsDataURL(b)}else{var l=f.URL||f.webkitURL,m=l.createObjectURL(b);g?g.location=m:location.href=m,g=null,setTimeout(function(){l.revokeObjectURL(m)},4E4)}});f.saveAs=g.saveAs=g,"undefined"!=typeof module&&(module.exports=g)}); + +//# sourceMappingURL=FileSaver.min.js.map \ No newline at end of file diff --git a/common.js b/common.js new file mode 100644 index 0000000..d65ed8c --- /dev/null +++ b/common.js @@ -0,0 +1,61 @@ +String.prototype.contains = function (contains) { return this.indexOf(contains) > -1; }; +Array.prototype.contains = function (contains) { return this.indexOf(contains) > -1; }; +String.prototype.isEmptyOrWhitespace = function () { return this.match(/^\s*$/); }; +String.prototype.pad = function (size) { + var s = String(this); + if (typeof (size) !== "number") { size = 2; } + + while (s.length < size) { s = "0" + s; } + return s; +}; +Number.prototype.pad = String.prototype.pad; +if (!String.prototype.format) { + String.prototype.format = function () { + var args = arguments; + return this.replace(/{(\d+)}/g, function (match, number) { + return typeof args[number] != 'undefined' + ? args[number] + : match + ; + }); + }; +} +if (!String.prototype.template) { + String.prototype.template = function (obj) { + return this.replace(/{{\$(.+?)}}/g, function (match, field) { + return typeof obj[field] != 'undefined' + ? obj[field] + : match + ; + }); + }; +} + +function WildcardToRegex(pattern) { + if (pattern == null) { return null; } + + var escapeReplace = function (data, original, replacement) { + var searchRegex = new RegExp("\\\\+\\" + original); + var newRegex = data.replace(searchRegex, function (match) { + var count = match.length - 1; + var halfCount = Math.floor(count / 2); + var newSlashes = Array(halfCount).join("\\"); + var result = newSlashes + ((halfCount % 2 === 0) ? replacement : original); + return result; + }); + return newRegex; + }; + + var toRegex = function (pattern, starMatchesEmpty) { + var reg = "^" + pattern.replace(/([.*+?^${}()|[\]/\\])/g, "\\$1") + "$"; + reg = reg.replace(/\d+/g, "\\d+"); // replace all numbers with \d+ + reg = reg.replace(/\s+/g, "\\s+"); // replace all numbers with \d+ + reg = reg.replace(/\\\*\\\{(\w+)\\\}/g, "(?<$1>.+)"); // replace *{} with named capture group + reg = reg.replace(/\(\?\.\+\)/g, ".*"); // replace *{} with named capture group +// reg = escapeReplace(reg, "?", "(.)"); +// reg = escapeReplace(reg, "*", starMatchesEmpty === true ? "(.*?)" : "(.+?)"); + return reg; + }; + + return toRegex(pattern, false); +} \ No newline at end of file diff --git a/generator.js b/generator.js new file mode 100644 index 0000000..9c7055d --- /dev/null +++ b/generator.js @@ -0,0 +1,831 @@ +function omitNonPublicMembers(key, value) { + return (key.indexOf("_") === 0) ? undefined : value; +} + +function omitPrivateMembers(key, value) { + return (key.indexOf("__") === 0) ? undefined : value; +} + +function downloadString(data, filename) { + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data)); + element.setAttribute('download', filename); + + element.style.display = 'none'; + document.body.appendChild(element); + element.click(); + document.body.removeChild(element); +} + +class generatorViewModel { + constructor() { + var self = this; + this.availablePortOptions = ko.observableArray(['Custom Port', 'Main Game Port', 'Steam Query Port', 'RCON Port']); + + this._compatibility = ko.observable("None"); + this.Meta_DisplayName = ko.observable(""); + this.Meta_Description = ko.observable(""); + this.Meta_Arch = ko.observable("x86_64"); + this.Meta_Author = ko.observable(""); + this._Meta_GithubOrigin = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates.git'); + this._Meta_GithubURL = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates'); + this.Meta_URL = ko.observable(""); + this.Meta_MinAMPVersion = ko.observable("2.4.2.0"); + this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() != "None" ? (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? `cubecoders/ampbase:xvfb` : `cubecoders/ampbase:wine`) : ``); + this.Meta_DockerRequired = ko.observable("False"); + this.Meta_ContainerPolicy = ko.observable("Supported"); + this.Meta_ContainerPolicyReason = ko.observable(""); + this.Meta_Prerequsites = ko.observable("[]"); + this.Meta_ExtraContainerPackages = ko.observable(""); + this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); + this.Meta_NoCommercialUsage = ko.observable("False"); + this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); + + this._SupportsWindows = ko.observable(true); + this._SupportsLinux = ko.observable(true); + + this.App_AdminMethod = ko.observable("STDIO"); + this.App_HasReadableConsole = ko.observable(true); + this.App_HasWritableConsole = ko.observable(true); + this.App_DisplayName = ko.computed(() => this.Meta_DisplayName()); + this.App_CommandLineArgs = ko.observable("{{$PlatformArgs}} {{$FormattedArgs}}") + this.App_WindowsCommandLineArgs = ko.observable(""); + this.App_CommandLineParameterFormat = ko.observable("-{0} \"{1}\""); + this.App_CommandLineParameterDelimiter = ko.observable(" "); + this.App_RapidStartup = ko.observable("false"); + this.App_ApplicationReadyMode = ko.observable("Immediate"); + this.App_ExitMethod = ko.observable("OS_CLOSE"); + this.App_ExitString = ko.observable("stop"); + this.App_UseLinuxIOREDIR = ko.observable("False"); + this.App_ExitTimeout = ko.observable("30"); + this.App_ExitFile = ko.observable("app_exit.lck"); + this.App_SupportsLiveSettingsChanges = ko.observable("False"); + this.App_LiveSettingChangeCommandFormat = ko.observable("set {0} \"{1}\""); + this.App_ApplicationIPBinding = ko.observable("0.0.0.0"); + this.App_AdminPortRef = ko.observable("RemoteAdminPort"); + this.App_UniversalSleepApplicationUDPPortRef = ko.observable("GamePort1"); + this.App_PrimaryApplicationPortRef = ko.observable("GamePort1"); + this.App_UniversalSleepSteamQueryPortRef = ko.observable("SteamQueryPort"); + this.App_MaxUsers = ko.observable("8"); + this.App_UseRandomAdminPassword = ko.observable("True"); + this.App_RemoteAdminPassword = ko.observable(""); + this.App_AdminLoginTransform = ko.observable("None"); + this.App_RCONConnectDelaySeconds = ko.observable("30"); + this.App_RCONConnectRetrySeconds = ko.observable("15"); + this.App_RCONHeartbeatCommand = ko.observable("ping"); + this.App_RCONHeartbeatMinutes = ko.observable("0"); + this.App_TelnetLoginFormat = ko.observable("{0}"); + this.App_SteamUpdateAnonymousLogin = ko.observable("True"); + this.App_SteamForceLoginProm = ko.observable("False"); + this.App_SupportsUniversalSleep = ko.observable("False"); + this.App_WakeupMode = ko.observable("Any"); + this.App_TemplateMatchRegex = ko.observable("{{(\\$?[\\w]+)}}"); + this.App_MonitorChildProcess = ko.observable("False"); + this.App_MonitorChildProcessWaitMs = ko.observable("1000"); + this.App_MonitorChildProcessName = ko.observable(""); + this.App_Compatibility = ko.observable("None"); + this.App_AppSettings = ko.observableArray(); + this._App_SteamWorkshopDownloadLocation = ko.observable(); + this.App_SteamWorkshopDownloadLocation = ko.computed(() => this._App_SteamWorkshopDownloadLocation() != '' ? "{{$FullBaseDir}}" + this._App_SteamWorkshopDownloadLocation() : ''); + + this.Console_FilterMatchRegex = ko.observable(""); + this.Console_FilterMatchReplacement = ko.observable(""); + this.Console_ThrowawayMessageRegex = ko.observable("(WARNING|ERROR): Shader.+"); + this._Console_AppReadyRegex = ko.observable(""); + this._Console_UserJoinRegex = ko.observable(""); + this._Console_UserLeaveRegex = ko.observable(""); + this._Console_UserChatRegex = ko.observable(""); + this.Console_UpdateAvailableRegex = ko.observable("^\\[\\d\\d:\\d\\d:\\d\\d\\] \\[INFO\\] A new server update is available! v[\\d\\.]+.$"); + this.Console_MetricsRegex = ko.observable(""); + this.Console_SuppressLogAtStart = ko.observable("False"); + this.Console_ActivateLogRegex = ko.observable(""); + this.Console_UserActions = ko.observable("{}"); + this.Console_SleepMode = ko.observable("False"); + this.Console_SleepOnStart = ko.observable("False"); + this.Console_SleepDelayMinutes = ko.observable("5"); + this.Console_DozeDelay = ko.observable("2"); + this.Console_AutoRetryCount = ko.observable("5"); + this.Console_SleepStartThresholdSeconds = ko.observable("25"); + + this._PortMappings = ko.observableArray(); //of portMappingViewModel + this.__NewPort = ko.observable("7777"); + this.__NewName = ko.observable(""); + this.__NewDescription = ko.observable(""); + this.__NewPortType = ko.observable("0"); + this.__NewProtocol = ko.observable("0"); + + this._ConfigFileMappings = ko.observableArray(); //of configFileMappingViewModel + this.__NewConfigFile = ko.observable(""); + this.__NewAutoMap = ko.observable(true); + this.__NewConfigType = ko.observable(""); + + this._UpdateSourceType = ko.observable("4"); + this._UpdateSourceURL = ko.observable(""); + this._UpdateSourceGitRepo = ko.observable(""); + this._UpdateSourceUnzip = ko.observable(false); + this._DisplayImageSource = ko.observable(""); + + this._SteamServerAppID = ko.observable(""); + this._SteamClientAppID = ko.observable(""); + + this._WinExecutableName = ko.observable(""); + this._LinuxExecutableName = ko.observable(""); + + this._AppSettings = ko.observableArray(); //of appSettingViewModel + this.__AddEditSetting = ko.observable(null); //of appSettingViewModel + this.__IsEditingSetting = ko.observable(false); + + this._UpdateStages = ko.observableArray(); //of updateStageViewModel + this.__AddEditStage = ko.observable(null); //of updateStageViewModel + this.__IsEditingStage = ko.observable(false); + + //Computed values + this.Console_AppReadyRegex = ko.computed(() => WildcardToRegex(self._Console_AppReadyRegex())); + this.Console_UserJoinRegex = ko.computed(() => WildcardToRegex(self._Console_UserJoinRegex())); + this.Console_UserLeaveRegex = ko.computed(() => WildcardToRegex(self._Console_UserLeaveRegex())); + this.Console_UserChatRegex = ko.computed(() => WildcardToRegex(self._Console_UserChatRegex())); + this.__SanitizedName = ko.computed(() => self.Meta_DisplayName().replace(/\s+/g, "-").replace(/[^a-z\d-_]/ig, "").toLowerCase()); + this.Meta_OS = ko.computed(() => (self._SupportsWindows() ? 1 : 0) | (self._SupportsLinux() ? 2 : 0)); + this.Meta_ConfigManifest = ko.computed(() => self.__SanitizedName() + "config.json"); + this.Meta_MetaConfigManifest = ko.computed(() => self.__SanitizedName() + "metaconfig.json"); + this._Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); + this._Meta_StagesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); + this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); +// this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); + + this.Meta_DisplayImageSource = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceArgs(); + } + } + if (appIDCheck != 0) { + return 'steam:' + appIDCheck; + } else { + return 'url:' + self._DisplayImageSource(); + } + } else { + return 'url:' + self._DisplayImageSource(); + } + }); + + this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); + + this.App_BaseDirectory = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return self.App_RootDir() + appIDCheck + '/'; + } else { + return self.App_RootDir() + 'serverfiles/'; + } + } else { + return self.App_RootDir() + 'serverfiles/'; + } + }); + + this.App_WorkingDir = ko.computed(() => { + if (self._UpdateStages().length != 0) { + var appIDCheck = "0"; + for (let i = 0; i < self._UpdateStages().length; i++) { + if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { + appIDCheck = self._UpdateStages()[i].UpdateSourceData(); + } + } + if (appIDCheck != 0) { + return appIDCheck; + } else { + return 'serverfiles'; + } + } else { + return 'serverfiles'; + } + }); + + this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); + this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? '/usr/bin/xvfb-run' : (self._compatibility() == "Wine" ? '/usr/bin/wine' : '1580130/proton'))); + this._App_LinuxCommandLineArgsCompat = ko.computed(() => self._compatibility() == "None" ? '' : (self._compatibility() == "WineXvfb" ? '-a wine \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "ProtonXvfb" ? '-a \"{{$FullRootDir}}1580130/proton\" run \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "Proton" ? 'run \"./' + self._WinExecutableName() + '\"' : '\"./' + self._WinExecutableName() + '\"')))); + this._App_LinuxCommandLineArgsInput = ko.observable(""); + this.App_LinuxCommandLineArgs = ko.computed(() => self._App_LinuxCommandLineArgsCompat() != '' ? self._App_LinuxCommandLineArgsCompat() + ' ' + self._App_LinuxCommandLineArgsInput() : self._App_LinuxCommandLineArgsInput()); + + this.App_Ports = ko.computed(() => `@IncludeJson[` + self._Meta_PortsManifest() + `]`); + this.App_UpdateSources = ko.computed(() => `@IncludeJson[` + self._Meta_StagesManifest() + `]`); +/* + this.__BuildPortMappings = ko.computed(() => { + var data = {}; + var allPorts = self._PortMappings(); + var appPortNum = 1; + self.__QueryPortName(""); + for (var i = 0; i < allPorts.length; i++) { + var portEntry = allPorts[i]; + if (portEntry.PortType() == "2") //RCON + { + data["RemoteAdminPort"] = portEntry.Port(); + } + else { + if (appPortNum > 3) { continue; } + var portName = "ApplicationPort" + appPortNum; + data[portName] = portEntry.Port(); + appPortNum++; + if (portEntry.PortType() == "1") //QueryPort + { + self.__QueryPortName(portName); + } + } + } + return data; + }); +*/ + this.__SampleFormattedArgs = ko.computed(function () { + return self._AppSettings().filter(s => s.IncludeInCommandLine()).map(s => s.IsFlagArgument() ? s._CheckedValue() : self.App_CommandLineParameterFormat().format(s.ParamFieldName(), s.DefaultValue())).join(self.App_CommandLineParameterDelimiter()); + }); +/* + this.__SampleCommandLineFlags = ko.computed(function () { + var replacements = ko.toJS(self.__BuildPortMappings()); + replacements["ApplicationIPBinding"] = "0.0.0.0"; + replacements["FormattedArgs"] = self.__SampleFormattedArgs(); + replacements["MaxUsers"] = "10"; + replacements["RemoteAdminPassword"] = "r4nd0m-pa55w0rd-g0e5_h3r3"; + return self.App_CommandLineArgs().template(replacements); + }); +*/ + this.__GenData = ko.computed(function () { + var data = [ + { + "key": "Generated Name", + "value": self.__SanitizedName(), + }, + { + "key": "Config Root", + "value": self.Meta_ConfigRoot() + }, + { + "key": "Settings Manifest", + "value": self.Meta_ConfigManifest() + }, + { + "key": "Ports Manifest", + "value": self._Meta_PortsManifest() + }, + { + "key": "Config Files Manifest", + "value": self.Meta_MetaConfigManifest() + }, + { + "key": "Image Source", + "value": self.Meta_DisplayImageSource(), + "longValue": true + }, + { + "key": "Root Directory", + "value": self.App_RootDir() + }, + { + "key": "Base Directory", + "value": self.App_BaseDirectory() + }, + { + "key": "Working Directory", + "value": self.App_WorkingDir() + }, + { + "key": "Docker Image", + "value": self.Meta_SpecificDockerImage(), + "longValue": true + }, + { + "key": "Compatibility", + "value": self._compatibility() + } + ]; + + if (self._SupportsWindows()) { + data.push({ + "key": "Windows Executable", + "value": self.App_ExecutableWin() + }); + } + + if (self._SupportsLinux()) { + data.push({ + "key": "Linux Executable", + "value": self.App_ExecutableLinux() + }); + } + + return data; + }); + + //Action methods (add/remove/update) + this.__RemovePort = function (toRemove) { + if (toRemove._PortType() != 'Custom Port') { + this.availablePortOptions.push(toRemove._PortType()); + } + self._PortMappings.remove(toRemove); + }; + + this.__AddPort = function () { + self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewDescription(), self.__NewPortType(), self.__NewProtocol(), self)); + if (self.__NewPortType() != 'Custom Port'){ + this.availablePortOptions.remove(self.__NewPortType()); + } + }; + + this.__RemoveConfigFile = function (toRemove) { + self._ConfigFileMappings.remove(toRemove); + }; + + this.__AddConfigFile = function () { + self._ConfigFileMappings.push(new configFileMappingViewModel(self.__NewConfigFile(), self.__NewAutoMap(), self.__NewConfigType(), self)); + }; + + this.__RemoveSetting = function (toRemove) { + self._AppSettings.remove(toRemove); + }; + + this.__EditSetting = function (toEdit) { + self.__IsEditingSetting(true); + self.__AddEditSetting(toEdit); + $("#addEditSettingModal").modal('show'); + }; + + this.__AddSetting = function () { + self.__IsEditingSetting(false); + self.__AddEditSetting(new appSettingViewModel(self)); + $("#addEditSettingModal").modal('show'); + }; + + this.__DoAddSetting = function () { + self._AppSettings.push(self.__AddEditSetting()); + $("#addEditSettingModal").modal('hide'); + }; + + this.__CloseSetting = function () { + $("#addEditSettingModal").modal('hide'); + }; + + this.__RemoveStage = function (toRemove) { + self._UpdateStages.remove(toRemove); + }; + + this.__EditStage = function (toEdit) { + self.__IsEditingStage(true); + self.__AddEditStage(toEdit); + $("#addEditStageModal").modal('show'); + }; + + this.__AddStage = function () { + self.__IsEditingStage(false); + self.__AddEditStage(new updateStageViewModel(self)); + $("#addEditStageModal").modal('show'); + }; + + this.__DoAddStage = function () { + self._UpdateStages.push(self.__AddEditStage()); + $("#addEditStageModal").modal('hide'); + }; + + this.__CloseStage = function () { + $("#addEditStageModal").modal('hide'); + }; + + this.__Serialize = function () { + var asJS = ko.toJS(self); + var result = JSON.stringify(asJS, omitPrivateMembers); + return result; + }; + + this.__Deserialize = function (inputData) { + var asJS = JSON.parse(inputData); + var ports = asJS._PortMappings; + var configFiles = asJS._ConfigFileMappings; + var settings = asJS._AppSettings; + var stages = asJS._UpdateStages; + + delete asJS._PortMappings; + delete asJS._ConfigFileMappings; + delete asJS._AppSettings; + delete asJS._UpdateStages; + + ko.quickmap.map(self, asJS); + + self._PortMappings.removeAll(); + var mappedPorts = ko.quickmap.to(portMappingViewModel, ports, false, { __vm: self }); + self._PortMappings.push.apply(self._PortMappings, mappedPorts); + + self._ConfigFileMappings.removeAll(); + var mappedConfigFiles = ko.quickmap.to(configFileMappingViewModel, configFiles, false, { __vm: self }); + self._ConfigFileMappings.push.apply(self._ConfigFileMappings, mappedConfigFiles); + + self._AppSettings.removeAll(); + var mappedSettings = ko.quickmap.to(appSettingViewModel, settings, false, { __vm: self }); + self._AppSettings.push.apply(self._AppSettings, mappedSettings); + + self._UpdateStages.removeAll(); + var mappedStages = ko.quickmap.to(updateStageViewModel, stages, false, { __vm: self }); + self._UpdateStages.push.apply(self._UpdateStages, mappedStages); + }; + + this.__IsExporting = ko.observable(false); + + this.__Export = function () { + self.__IsExporting(true); + $("#importexporttextarea").val(self.__Serialize()); + $("#importexporttextarea").attr("readonly", true); + $("#importExportDialog").modal("show"); + autoSave(); + }; + + this.__CopyExportToClipboard = function (data, element) { + navigator.clipboard.writeText($("#importexporttextarea").val()); + setTimeout(() => $(element.target).tooltip('hide'), 2000); + }; + + this.__CloseImportExport = function () { + $("#importExportDialog").modal("hide"); + }; + + this.__Import = function () { + self.__IsExporting(false); + $("#importexporttextarea").val(""); + $("#importexporttextarea").prop("readonly", false); + $("#importExportDialog").modal("show"); + }; + + this.__DoImport = function () { + self.__Deserialize($("#importexporttextarea").val()); + $("#importExportDialog").modal("hide"); + autoSave(); + }; + + this.__Share = function (data, element) { + var data = encodeURIComponent(self.__Serialize()); + var url = `${document.location.protocol}//${document.location.hostname}${document.location.pathname}#cdata=${data}`; + navigator.clipboard.writeText(url); + setTimeout(() => $(element.target).tooltip('hide'), 2000); + }; + + this.__Clear = function () { + localStorage.configgenautosave = ""; + document.location.reload(); + } + + this.__GithubManifest = function () { + function guid() { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + } + var githubManifest = JSON.stringify({ id: guid(), authors: [self.Meta_Author()], origin: self._Meta_GithubOrigin(), url: self._Meta_GithubURL(), imagefile: "", prefix: self.Meta_Author() }, null, 4); + return githubManifest; + } + + this.__DownloadConfig = function () { + if (this.__ValidationResult() < 2) { return; } + + var lines = []; + for (const key of Object.keys(self).filter(k => !k.startsWith("_"))) { + lines.push(`${key.replace("_", ".")}=${self[key]()}`); + } + + /* + switch (self._UpdateSourceType()) { + case "1": //URL + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); + break; + case "4": //Steam + if (self._compatibility() == "Proton") { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); + } else { + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); + } + break; + case "16": //Github + lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); + break; + } + */ + if (self._UpdateSourceType() == "4") //SteamCMD + { + if (self._compatibility() == "Proton" || self._compatibility() == "ProtonXvfb") { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); + } else { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); + } + } + + var output = lines.sort().join("\n"); + var asJSAppSettings = ko.toJS(self._AppSettings()); + var asJSUpdateStages = ko.toJS(self._UpdateStages()); + var asJSPortMappings = ko.toJS(self._PortMappings()); + var asJSConfigFileMappings = ko.toJS(self._ConfigFileMappings()); + var zip = new JSZip(); + zip.file(self.Meta_ConfigRoot(), output); + zip.file(self.Meta_ConfigManifest(), JSON.stringify(asJSAppSettings, omitNonPublicMembers, 4)); + zip.file(self._Meta_StagesManifest(), JSON.stringify(asJSUpdateStages, omitNonPublicMembers, 4)); + zip.file(self._Meta_PortsManifest(), JSON.stringify(asJSPortMappings, omitNonPublicMembers, 4)); + zip.file(self.Meta_MetaConfigManifest(), JSON.stringify(asJSConfigFileMappings, omitNonPublicMembers, 4)); + zip.file("manifest.json", self.__GithubManifest()); + zip.generateAsync({ type: "blob" }) + .then(function (content) { + saveAs(content, "configs.zip"); + }); + }; + + this.__Invalidate = function (newValue) { + self.__ValidationResult(0); + }; + + for (const k of Object.keys(self)) { + if (ko.isObservable(self[k])) { + self[k].subscribe(self.__Invalidate); + } + } + + this.__ValidationResult = ko.observable(0); + + this.__ValidationResults = ko.observableArray(); + + this.__ValidateConfig = function () { + autoSave(); + self.__ValidationResults.removeAll(); + + var failure = (issue, recommendation) => self.__ValidationResults.push(new validationResult("Failure", issue, recommendation)); + var warning = (issue, recommendation, impact) => self.__ValidationResults.push(new validationResult("Warning", issue, recommendation, impact)); + var info = (issue, recommendation, impact) => self.__ValidationResults.push(new validationResult("Info", issue, recommendation, impact)); + + //Validation Begins + if (self.Meta_DisplayName() == "") { + failure("Missing application name", "Specify an application name under 'Basic Configuration'"); + } + + if (!self._SupportsWindows() && !self._SupportsLinux()) { + failure("No platforms have been specified as supported.", "Specify at least one supported platform under 'Basic Information'"); + } + + if (self._SupportsWindows()) { + if (self._WinExecutableName() == "") { failure("Windows is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } + else if (!self._WinExecutableName().toLowerCase().endsWith(".exe")) { failure("You can only start executables (.exe) files on Windows from AMP. Do not attempt to use batch files or other file types.", "Change your Windows Executable under Startup and Shutdown to be a .exe file."); } + } + + if (self._SupportsLinux()) { + if (self._LinuxExecutableName() == "") { failure("Linux is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } + else if (self._LinuxExecutableName().toLowerCase().endsWith(".sh")) { failure("You can only start executables files from AMP. Do not attempt to use shell scripts or other file types.", "Change your Linux Executable under Startup and Shutdown to be an actual executable rather than a script."); } + } + + switch (self.App_AdminMethod()) { + case "PinballWizard": + case "AMP_GSIO": + break; + case "STDIO": + if (!self.App_HasReadableConsole() && !self.App_HasWritableConsole()) { + failure("Standard IO was selected as the management type, but the console was set as neither readable nor writable - so AMP won't be able to do anything useful.", "Either enable Reading or Writing for the console (if the application supports it) - or change the management mode to 'None'"); + } + break; + default: + if (!self.App_CommandLineArgs().contains("{{$RemoteAdminPassword}}")) { + warning("A server management mode is specified that requires AMP to know the password, but {{$RemoteAdminPassword}} is not found within the command line arguments.", "If the application can have it's RCON password specified via the command line then you should add the {{$RemoteAdminPassword}} template item to your command line arguments", "Without the ability to control the RCON password, AMP will not be able to use the servers RCON to provide a console or run commands."); + } +/* + if (!self.App_CommandLineArgs().contains(this.__QueryPortName())) { + warning("A server management mode that uses the network was specified, but the port being used is not found within the command line arguments.", "If the application can have it's RCON port specified via the command line then you should add the {{$" + this.__QueryPortName() + "}} template item to your command line arguments"); + } + + if (self._PortMappings().filter(p => p.PortType() == "2").length == 0) { + warning("A server management mode that uses the network was specified, but no RCON port has been added.", "Add the port used by this applications RCON under Networking."); + } +*/ break; + } + /* + switch (self._UpdateSourceType()) { + case "1": //Fetch from URL + if (self._UpdateSourceURL() == "") { + failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); + } + else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { + info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); + } + break; + case "4": //SteamCMD + if (self._SteamServerAppID() == "") { + failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); + } + if (self._SteamClientAppID() == "") { + warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); + } + break; + } + */ + /* + if (self.Console_AppReadyRegex() != "" && !self.Console_AppReadyRegex().match(/\^.+\$/)) { failure("Server ready expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the Server Ready expression under Server Events to match the entire line."); } + if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } + if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } + if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } + */ + if ((self._compatibility() == "Wine" && !self._SupportsLinux()) || (self._compatibility() == "Proton" && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } + + //Validation Summary + + var failures = self.__ValidationResults().filter(r => r.grade == "Failure").length; + var warnings = self.__ValidationResults().filter(r => r.grade == "Warning").length; + + if (failures > 0) { + self.__ValidationResult(1); + } + else if (warnings > 0) { + self.__ValidationResult(2); + } + else { + self.__ValidationResult(3); + } + }; + } +} +class validationResult { + constructor(grade, issue, recommendation, impact) { + this.grade = grade; + this.issue = issue; + this.recommendation = recommendation; + this.impact = impact || ""; + this.gradeClass = ""; + switch (grade) { + case "Failure": this.gradeClass = "table-danger"; break; + case "Warning": this.gradeClass = "table-warning"; break; + case "Info": this.gradeClass = "table-info"; break; + } + } +} + +class portMappingViewModel { + constructor(port, portName, portDescription, portType, protocol, vm) { + var self = this; + this.__vm = vm; + this._Protocol = ko.observable(protocol); + this.Protocol = ko.computed(() => self._Protocol() == "0" ? `Both` : (self._Protocol() == "1" ? `TCP` : `UDP`)); + this.Port = ko.observable(port); + this._PortType = ko.observable(portType); + this._Name = ko.observable(portName); + this.Name = ko.computed(() => self._PortType() == "Custom Port" ? self._Name() : (self._PortType() == "Steam Query Port" ? `Steam Query Port` : (self._PortType() == "RCON Port" ? `Remote Admin Port` : `Main Game Port`))); + this._Description = ko.observable(portDescription); + this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : (self._PortType() == "2" ? `Port used for RCON administration` : `Port used for main game traffic`))); + this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "Steam Query Port" ? `SteamQueryPort` : (self._PortType() == "RCON Port" ? `RemoteAdminPort` : `GamePort1`))); + this.__RemovePort = () => self.__vm.__RemovePort(self); + } +} + +class configFileMappingViewModel { + constructor(configFile, autoMap, configType, vm) { + var self = this; + this.__vm = vm; + this.ConfigFile = ko.observable(configFile); + this._ConfigType = ko.observable(configType); + this.ConfigType = ko.computed(() => self._ConfigType() == "0" ? `json` : (self._ConfigType() == "1" ? `ini` : (self._ConfigType() == "2" ? `xml` : (self._ConfigType() == "3" ? `kvp` : ``)))); + this._AutoMap = ko.observable(autoMap); + this.AutoMap = ko.computed(() => self._ConfigType() == "4" ? false : self._AutoMap()); + this.__RemoveConfigFile = () => self.__vm.__RemoveConfigFile(self); + } +} + +class appSettingViewModel { + constructor(vm) { + var self = this; + this.__vm = vm; + this.DisplayName = ko.observable(""); + this.Category = ko.observable("Server Settings"); + this.Description = ko.observable(""); + this.Keywords = ko.computed(() => self.DisplayName().toLowerCase().replaceAll(" ", ",")); + this.FieldName = ko.observable(""); + this.InputType = ko.observable("text") + this.IsFlagArgument = ko.observable(false); + this.ParamFieldName = ko.computed(() => self.FieldName()); + this.IncludeInCommandLine = ko.observable(false); + this.DefaultValue = ko.observable(""); + this.Placeholder = ko.computed(() => self.DefaultValue()); + this.Suffix = ko.observable(""); + this.Hidden = ko.observable(false); + this.SkipIfEmpty = ko.observable(false); + this._CheckedValue = ko.observable("true"); + this._UncheckedValue = ko.observable("false"); + this.__RemoveSetting = () => self.__vm.__RemoveSetting(self); + this.__EditSetting = () => self.__vm.__EditSetting(self); + + this._EnumMappings = ko.observableArray(); //of enumMappingViewModel + this.__NewEnumKey = ko.observable(""); + this.__NewEnumValue = ko.observable(""); + + this.__RemoveEnum = function (toRemove) { + self._EnumMappings.remove(toRemove); + }; + + this.__AddEnum = function () { + self._EnumMappings.push(new enumMappingViewModel(self.__NewEnumKey(), self.__NewEnumValue(), self)); + }; + + this.__Deserialize = function (inputData) { + var asJS = JSON.parse(inputData); + var enumSettings = asJS._EnumMappings; + + delete asJS._EnumMappings; + + ko.quickmap.map(self, asJS); + + self._EnumMappings.removeAll(); + var mappedEnums = ko.quickmap.to(enumMappingViewModel, enumSettings, false, { __vm: self }); + self._EnumMappings.push.apply(self._EnumMappings, mappedEnums); + }; + + this.EnumValues = ko.computed(() => { + if (self.InputType() == "checkbox") { + var result = {}; + result[self._CheckedValue()] = "True"; + result[self._UncheckedValue()] = "False"; + return result; + } else if (self.InputType() == "enum") { + var result = {}; + for (let i = 0; i < self._EnumMappings().length; i++) { + result[self._EnumMappings()[i]._enumKey()] = self._EnumMappings()[i]._enumValue(); + } + return result; + } else { + return {}; + } + }); + } +} + +class enumMappingViewModel { + constructor(enumKey, enumValue, vm) { + var self = this; + this.__vm = vm; + this._enumKey = ko.observable(enumKey); + this._enumValue = ko.observable(enumValue); + this.__RemoveEnum = () => self.__vm.__RemoveEnum(self); + } +} + +class updateStageViewModel { + constructor(vm) { + var self = this; + this.__vm = vm; + this.UpdateStageName = ko.observable(""); + this._UpdateSourcePlatform = ko.observable("0"); + this.UpdateSourcePlatform = ko.computed(() => self._UpdateSourcePlatform() == "0" ? `All` : (self._UpdateSourcePlatform() == "1" ? `Linux` : `Windows`)); + this._UpdateSource = ko.observable("8"); + this.UpdateSource = ko.computed(() => self._UpdateSource() == "0" ? `CopyFilePath` : (self._UpdateSource() == "1" ? `CreateSymlink` : (self._UpdateSource() == "2" ? `Executable` : (self._UpdateSource() == "3" ? `ExtractArchive` : (self._UpdateSource() == "4" ? `FetchURL` : (self._UpdateSource() == "5" ? `GithubRelease` : (self._UpdateSource() == "6" ? `SetExecutableFlag` : (self._UpdateSource() == "7" ? `StartApplication` : `SteamCMD`)))))))); + this.UpdateSourceData = ko.observable(""); + this.UpdateSourceArgs = ko.observable(""); + this.UpdateSourceVersion = ko.observable(""); + this.UpdateSourceTarget = ko.observable(""); + this.UnzipUpdateSource = ko.observable(false); + this.OverwriteExistingFiles = ko.observable(false); + this._ForceDownloadPlatform = ko.observable(null); + this.ForceDownloadPlatform = ko.computed(() => self._ForceDownloadPlatform() == "0" ? null : (self._ForceDownloadPlatform() == "1" ? `Linux` : `Windows`)); + this.UpdateSourceConditionSetting = ko.observable(null); + this.UpdateSourceConditionValue = ko.observable(null); + this.DeleteAfterExtract = ko.observable(true); + this.OneShot = ko.observable(false); + this.__RemoveStage = () => self.__vm.__RemoveStage(self); + this.__EditStage = () => self.__vm.__EditStage(self); + } +} + +var vm = new generatorViewModel(); + +function autoSave() { + localStorage.configgenautosave = vm.__Serialize(); +} + +function autoLoad() { + if (localStorage.configgenautosave != "") { + vm.__Deserialize(localStorage.configgenautosave); + } +} + +document.addEventListener('DOMContentLoaded', () => { + ko.applyBindings(vm); + setInterval(autoSave, 30000); + $('body').scrollspy({ target: '#navbar', offset: 90 }); + + $('[data-toggle="tooltip"]').tooltip({ + container: 'body', + trigger: 'click', + placement: 'bottom' + }); + //Check if there is anything after the # and if it starts cdata=, then import it if it does. + if (document.location.hash.indexOf("#cdata=") == 0) { + var data = decodeURIComponent(document.location.hash.substring(7)); + vm.__Deserialize(data); + document.location.hash = ""; + } + else { + autoLoad(); + } +}); diff --git a/index.html b/index.html new file mode 100644 index 0000000..a70532c --- /dev/null +++ b/index.html @@ -0,0 +1,1610 @@ + + + + + AMP Configuration Generator + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    +

    AMP Configuration Generator

    + Version 2.0 - Updated by IceOfWraith
    ©2023 CubeCoders Limited     +
    +
    + + + +
    +
    +
    + +
    +
    +

    You can find detailed instructions and explanations on the Generic Configurations Wiki.

    +
    +
    +

    Basic Information

    +
    +
    + +
    This is what will show up within AMP as the name of the application.
    + +
    +
    + +
    Useful for describing different variants/configurations of the same application.
    + +
    +
    +
    +
    + +
    Who are you? Take some credit for your work! Please use your GitHub username.
    + +
    +
    + +
    A link to where you can learn more about the application, such as a store listing.
    + +
    +
    +
    + +
    + + +
    +
    +
    + +
    + + + + + +
    +
    +
    +

    +

    Management and Console

    +
    + +
    + + + + + + + + +
    +
    +
    +
    + +
    + This is in addition to the applications management type if it accepts management over methods other than Standard IO +
    +
    + + +
    +
    + +

    +

    Networking

    +
    + AMP will automatically generate firewall rules to allow the application ports through. You may add any number of ports. Maximum of 1 Main Game, Steam Query, and RCON Port. +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NumberTypeNameDescriptionProtocol
    + + + + + + + + + +
    No ports have been added.
    + + + + + + + + + + + +
    +

    +

    Update Sources

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Stage NameSource Type
    + + +
    No update sources added.
    + +
    +

    +

    Configuration and Settings

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Display NameField NameDefault ValueCommand Line
    + + +
    No settings have been added.
    + +
    +
    Configuration Files
    +
    + Select the location of any game server configuration files AMP should manage. Location relative to Base Directory. +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Config FileConfig TypeAutoMap
    + + + + + + + +
    No config files have been added.
    + + + + + + + +
    +

    +

    Startup and Shutdown

    +
    Application and Parameters
    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + Don't include any arguments that come from the Configuration and Settings section above. + +
    + +
    +
    +
    + +
    + Any Windows specific arguments to be used in the command line args in place of {{$PlatformArgs}}. +
    + +
    +
    + +
    + Any Linux specific arguments to be used in the command line args in place of {{$PlatformArgs}}. +
    + +
    +
    +
    +
    + +
    + The format to be used to add settings specified above to the command line in place of {{$FormattedArgs}}. {0} is the field name and {1} the value. +
    + +
    +
    + +
    + The character(s) used to separate different arguments in the command line flags generated by settings. By default this is a single space. +
    + +
    +
    +
    +
    + +
    + Where should AMP place Steam Workshop mods? This is relative to the Base Directory. +
    + +
    +
    + +
    + A URL to an image that AMP can use to represent the application. This is pre-filled for Steam games. +
    + +
    +
    + +
    + +
    + + + +
    +
    +
    Shutdown
    +
    +
    + + +
    +
    + + +
    +
    +

    +

    Server Events (Beta)

    +

    + AMP uses the game server's output from either the console (standard output) or RCON to know how to handle certain events:
    + A successful startup, Users connecting/disconnecting, or Chat messages. +

    +

    + The Config Generator will attempt to create regular expressions based on your input. + Paste a line from the console that uniquely represents the events. + Keep all static pieces of the line and replace sections that vary with the *{misc} variable. + Use as many of these variables in place of corresponding sections of the lines: +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableDescription
    *{username}The Username of the player
    *{userid}The User ID of the player (Typically Steam64 ID or Epic ID #)
    *{sessionid}Any unique number to identify a player's Session
    *{message}The chat message
    *{endpoint}The IP of the player
    *{misc}Any section of the line that varies

    +

    + Regex101 is an excellent resource to help validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour. +

    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +

    +

    Validate and Review

    +
    + +
    + This is generated assuming the default values and default port numbers, these will change based on user-specified values or assignments made by AMP. +
    +
    +
    +

    + +

    +

    + + + +   + You have not yet validated your configuration. You will not be able to download your configuration until you have done this. +

    +

    + + + +   + Validation Failed - You must address the following failures before you may continue. +

    +

    + + + +   + Validation Passed with Warnings - You should consider addressing the following warnings. +

    +

    + + + +   + Validation Passed - Great stuff! You may now download the completed configuration below. +

    +
    +
    +
    Validation Issues:
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CategoryIssueRecommentation
    Impact:
    No validation issues
    +
    +
    +
    + +
    +

    + + + +   + Make sure to keep a backup of your configuration by using the 'Export' option at the top of the page! You will need this to make further changes even after downloading the configuration and manifest. +

    +
    +
    +
    Using the generated configuration
    +

    You can find the steps to upload the configuration to GitHub and use them within AMP on the Generic Configurations Wiki.

    +
    +

     

    +
    +
    +
    + +
    +
    +

    Generated Data

    + Values that are calculated automatically based on your input. + + + + + + + + + + + + +
    +
    + + + No Generated Value + +     		+
    +     		+ + + No Generated Value + +
    +
    +
    +
    +
    + + + + + + + + + + + diff --git a/jszip.min.js b/jszip.min.js new file mode 100644 index 0000000..ff4cfd5 --- /dev/null +++ b/jszip.min.js @@ -0,0 +1,13 @@ +/*! + +JSZip v3.10.1 - A JavaScript class for generating and reading zip files + + +(c) 2009-2016 Stuart Knightley +Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown. + +JSZip uses the library pako released under the MIT license : +https://github.com/nodeca/pako/blob/main/LICENSE +*/ + +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r tag: use the global `ko` object, attaching a `quickmap` property + factory(ko, ko.quickmap = {}); + } +}(function (ko, exports) { + function mapObject(vm, data) + { + if (data === null || data === undefined) { return; } + + var vmKeys = Object.keys(vm); + for (var key of Object.keys(data)) { + var value = data[key]; + + if (/^\/Date\((\d+)\)\/$/.test(value)) { + value = parseDate(value); + } + + if (typeof vm[key] === "function") { + if (ko.isWritableObservable(vm[key])) + { + vm[key](value); + } + } + else if (typeof vm[key] !== "undefined" || vmKeys.contains(key)) { + vm[key] = value; + } + } + } + + exports.map = mapObject; + + exports.to = function (fn, data, asObservable, perObject) { + if (data === null) { return null; } + if (data === undefined) { throw new Error("Tried to map an undefined object."); } + if (data.constructor === Array) { + var result = asObservable ? ko.observableArray() : []; + for (var el of data) { + var newObj = new fn(); + mapObject(newObj, el); + mapObject(newObj, perObject); + result.push(newObj); + } + return result; + } + else { + var obj = new fn(); + mapObject(obj, data, true); + mapObject(obj, perObject); + return obj; + } + }; +})); \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..215ceb8 --- /dev/null +++ b/style.css @@ -0,0 +1,58 @@ +.sidebar { + position: fixed; + top: 0; + bottom: 0; + left: 0; + z-index: 100; + padding: 48px 0 0; + box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); +} + +.rightbar { + position:fixed; + margin-right:0px; +} + +.leftLine { + box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1) +} + +.close +{ + border: 0; + background-color: transparent; + float: right; + font-size: 1.5rem; + font-weight: 700; + line-height: 1; + color: #000; + text-shadow: 0 1px 0 #fff; + opacity: .5; +} + +.genTableHeader +{ + width: 10.5rem; +} + +a.nav-link.active { + background-color: #0a58ca; + color: white; +} + +.linkButton { + border: none; + color: #0d6efd; + text-decoration: underline; + background-color: transparent; +} + +#importexporttextarea +{ + width: 100%; + height: 300px; +} + +#importexporttextarea[readonly] { + background-color: #eee; +} \ No newline at end of file From cd360943af7b52fd37c737a3ab6320f651388de4 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 29 Jun 2023 20:54:38 -0500 Subject: [PATCH 71/79] favicon --- favicon.ico | Bin 0 -> 90022 bytes index.html | 1 + 2 files changed, 1 insertion(+) create mode 100644 favicon.ico diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3d91732b6dba7037c82faf78eadb15175cb5424a GIT binary patch literal 90022 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¬(70$ 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 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index a70532c..e5da9a7 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,7 @@ ); } + From 89615b313d8ef85cfdc0f12f80379d0cc479f8ce Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 29 Jun 2023 23:25:27 -0500 Subject: [PATCH 72/79] Minor changes --- common.js | 2 -- generator.js | 13 ++++++------- index.html | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/common.js b/common.js index d65ed8c..e23aa41 100644 --- a/common.js +++ b/common.js @@ -52,8 +52,6 @@ function WildcardToRegex(pattern) { reg = reg.replace(/\s+/g, "\\s+"); // replace all numbers with \d+ reg = reg.replace(/\\\*\\\{(\w+)\\\}/g, "(?<$1>.+)"); // replace *{} with named capture group reg = reg.replace(/\(\?\.\+\)/g, ".*"); // replace *{} with named capture group -// reg = escapeReplace(reg, "?", "(.)"); -// reg = escapeReplace(reg, "*", starMatchesEmpty === true ? "(.*?)" : "(.+?)"); return reg; }; diff --git a/generator.js b/generator.js index 9c7055d..fee6da6 100644 --- a/generator.js +++ b/generator.js @@ -20,8 +20,7 @@ function downloadString(data, filename) { class generatorViewModel { constructor() { var self = this; - this.availablePortOptions = ko.observableArray(['Custom Port', 'Main Game Port', 'Steam Query Port', 'RCON Port']); - + this._availablePortOptions = ko.observableArray(['Custom Port', 'Main Game Port', 'Steam Query Port', 'RCON Port']); this._compatibility = ko.observable("None"); this.Meta_DisplayName = ko.observable(""); this.Meta_Description = ko.observable(""); @@ -30,7 +29,7 @@ class generatorViewModel { this._Meta_GithubOrigin = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates.git'); this._Meta_GithubURL = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates'); this.Meta_URL = ko.observable(""); - this.Meta_MinAMPVersion = ko.observable("2.4.2.0"); + this.Meta_MinAMPVersion = ko.observable("2.4.5.4"); this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() != "None" ? (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? `cubecoders/ampbase:xvfb` : `cubecoders/ampbase:wine`) : ``); this.Meta_DockerRequired = ko.observable("False"); this.Meta_ContainerPolicy = ko.observable("Supported"); @@ -84,7 +83,7 @@ class generatorViewModel { this.App_MonitorChildProcessWaitMs = ko.observable("1000"); this.App_MonitorChildProcessName = ko.observable(""); this.App_Compatibility = ko.observable("None"); - this.App_AppSettings = ko.observableArray(); +// this.App_AppSettings = ko.observableArray(); this._App_SteamWorkshopDownloadLocation = ko.observable(); this.App_SteamWorkshopDownloadLocation = ko.computed(() => this._App_SteamWorkshopDownloadLocation() != '' ? "{{$FullBaseDir}}" + this._App_SteamWorkshopDownloadLocation() : ''); @@ -326,7 +325,7 @@ class generatorViewModel { //Action methods (add/remove/update) this.__RemovePort = function (toRemove) { if (toRemove._PortType() != 'Custom Port') { - this.availablePortOptions.push(toRemove._PortType()); + this._availablePortOptions.push(toRemove._PortType()); } self._PortMappings.remove(toRemove); }; @@ -334,7 +333,7 @@ class generatorViewModel { this.__AddPort = function () { self._PortMappings.push(new portMappingViewModel(self.__NewPort(), self.__NewName(), self.__NewDescription(), self.__NewPortType(), self.__NewProtocol(), self)); if (self.__NewPortType() != 'Custom Port'){ - this.availablePortOptions.remove(self.__NewPortType()); + this._availablePortOptions.remove(self.__NewPortType()); } }; @@ -676,7 +675,7 @@ class portMappingViewModel { this.Name = ko.computed(() => self._PortType() == "Custom Port" ? self._Name() : (self._PortType() == "Steam Query Port" ? `Steam Query Port` : (self._PortType() == "RCON Port" ? `Remote Admin Port` : `Main Game Port`))); this._Description = ko.observable(portDescription); this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : (self._PortType() == "2" ? `Port used for RCON administration` : `Port used for main game traffic`))); - this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "Steam Query Port" ? `SteamQueryPort` : (self._PortType() == "RCON Port" ? `RemoteAdminPort` : `GamePort1`))); + this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "Steam Query Port" ? `SteamQueryPort` : (self._PortType() == "RCON Port" ? `RemoteAdminPort` : `MainGamePort`))); this.__RemovePort = () => self.__vm.__RemovePort(self); } } diff --git a/index.html b/index.html index e5da9a7..e49de1c 100644 --- a/index.html +++ b/index.html @@ -442,7 +442,7 @@

    Networking

    - + From 80007a116037011c4a6322d11974e7dd9713f4b1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Thu, 29 Jun 2023 23:28:18 -0500 Subject: [PATCH 73/79] Update generator.js --- generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator.js b/generator.js index fee6da6..0315c92 100644 --- a/generator.js +++ b/generator.js @@ -675,7 +675,7 @@ class portMappingViewModel { this.Name = ko.computed(() => self._PortType() == "Custom Port" ? self._Name() : (self._PortType() == "Steam Query Port" ? `Steam Query Port` : (self._PortType() == "RCON Port" ? `Remote Admin Port` : `Main Game Port`))); this._Description = ko.observable(portDescription); this.Description = ko.computed(() => self._Description() == "0" ? self._Description() : (self._PortType() == "1" ? `Port used for Steam queries and server list` : (self._PortType() == "2" ? `Port used for RCON administration` : `Port used for main game traffic`))); - this.Ref = ko.computed(() => self._PortType() == "0" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "Steam Query Port" ? `SteamQueryPort` : (self._PortType() == "RCON Port" ? `RemoteAdminPort` : `MainGamePort`))); + this.Ref = ko.computed(() => self._PortType() == "Custom Port" ? self._Name().replace(/\s+/g, "").replace(/[^a-z\d-_]/ig, "") : (self._PortType() == "Steam Query Port" ? `SteamQueryPort` : (self._PortType() == "RCON Port" ? `RemoteAdminPort` : `MainGamePort`))); this.__RemovePort = () => self.__vm.__RemovePort(self); } } From bbb959368cf3a8d2cfe40b100e7dfb888e94c3f1 Mon Sep 17 00:00:00 2001 From: James Manker Date: Tue, 29 Aug 2023 19:40:56 -0500 Subject: [PATCH 74/79] Fix Update Stages --- generator.js | 23 +++++++++++++++++++++++ index.html | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/generator.js b/generator.js index 0315c92..7c93f8f 100644 --- a/generator.js +++ b/generator.js @@ -529,6 +529,29 @@ class generatorViewModel { var zip = new JSZip(); zip.file(self.Meta_ConfigRoot(), output); zip.file(self.Meta_ConfigManifest(), JSON.stringify(asJSAppSettings, omitNonPublicMembers, 4)); + for (const stage of asJSUpdateStages) { + if (stage.ForceDownloadPlatform == null) { + delete stage.ForceDownloadPlatform; + } + if (stage.UpdateSourceConditionSetting == null) { + delete stage.UpdateSourceConditionSetting; + } + if (stage.UpdateSourceConditionValue == null) { + delete stage.UpdateSourceConditionValue; + } + if (stage.UpdateSourceData == "") { + delete stage.UpdateSourceData; + } + if (stage.UpdateSourceArgs == "") { + delete stage.UpdateSourceArgs; + } + if (stage.UpdateSourceVersion == "") { + delete stage.UpdateSourceVersion; + } + if (stage.UpdateSourceTarget == "") { + delete stage.UpdateSourceTarget; + } + } zip.file(self._Meta_StagesManifest(), JSON.stringify(asJSUpdateStages, omitNonPublicMembers, 4)); zip.file(self._Meta_PortsManifest(), JSON.stringify(asJSPortMappings, omitNonPublicMembers, 4)); zip.file(self.Meta_MetaConfigManifest(), JSON.stringify(asJSConfigFileMappings, omitNonPublicMembers, 4)); diff --git a/index.html b/index.html index e49de1c..0672843 100644 --- a/index.html +++ b/index.html @@ -1082,14 +1082,14 @@
    -
    +
    - +
    From 0d74093079de07f36502697468983f874265cfdf Mon Sep 17 00:00:00 2001 From: James Manker Date: Tue, 29 Aug 2023 20:48:16 -0500 Subject: [PATCH 75/79] Update Author --- generator.js | 3 ++- index.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/generator.js b/generator.js index 7c93f8f..f35c62f 100644 --- a/generator.js +++ b/generator.js @@ -25,7 +25,8 @@ class generatorViewModel { this.Meta_DisplayName = ko.observable(""); this.Meta_Description = ko.observable(""); this.Meta_Arch = ko.observable("x86_64"); - this.Meta_Author = ko.observable(""); + this._Meta_Author = ko.observable(""); + this.Meta_Author = ko.computed(() => self._Meta_Author() + ' - Made with AMP Config Generator'); this._Meta_GithubOrigin = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates.git'); this._Meta_GithubURL = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates'); this.Meta_URL = ko.observable(""); diff --git a/index.html b/index.html index 0672843..ea088af 100644 --- a/index.html +++ b/index.html @@ -179,7 +179,7 @@

    Basic Information

    Who are you? Take some credit for your work! Please use your GitHub username.
    - +
    From b9732d3890460779dee3425f49c915184b46d09e Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Sat, 14 Oct 2023 23:01:11 -0500 Subject: [PATCH 76/79] Update generator.js --- generator.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/generator.js b/generator.js index f35c62f..f3ce30e 100644 --- a/generator.js +++ b/generator.js @@ -30,15 +30,15 @@ class generatorViewModel { this._Meta_GithubOrigin = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates.git'); this._Meta_GithubURL = ko.computed(() => 'https://github.com/' + self.Meta_Author() + '/AMPTemplates'); this.Meta_URL = ko.observable(""); - this.Meta_MinAMPVersion = ko.observable("2.4.5.4"); + this.Meta_MinAMPVersion = ko.observable("2.4.6.6"); this.Meta_SpecificDockerImage = ko.computed(() => self._compatibility() != "None" ? (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? `cubecoders/ampbase:xvfb` : `cubecoders/ampbase:wine`) : ``); this.Meta_DockerRequired = ko.observable("False"); this.Meta_ContainerPolicy = ko.observable("Supported"); this.Meta_ContainerPolicyReason = ko.observable(""); this.Meta_Prerequsites = ko.observable("[]"); - this.Meta_ExtraContainerPackages = ko.observable(""); - this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); - this.Meta_NoCommercialUsage = ko.observable("False"); + //this.Meta_ExtraContainerPackages = ko.observable(""); + //this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); + //this.Meta_NoCommercialUsage = ko.observable("False"); this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); this._SupportsWindows = ko.observable(true); @@ -56,7 +56,7 @@ class generatorViewModel { this.App_ApplicationReadyMode = ko.observable("Immediate"); this.App_ExitMethod = ko.observable("OS_CLOSE"); this.App_ExitString = ko.observable("stop"); - this.App_UseLinuxIOREDIR = ko.observable("False"); + //this.App_UseLinuxIOREDIR = ko.observable("False"); this.App_ExitTimeout = ko.observable("30"); this.App_ExitFile = ko.observable("app_exit.lck"); this.App_SupportsLiveSettingsChanges = ko.observable("False"); @@ -76,7 +76,7 @@ class generatorViewModel { this.App_RCONHeartbeatMinutes = ko.observable("0"); this.App_TelnetLoginFormat = ko.observable("{0}"); this.App_SteamUpdateAnonymousLogin = ko.observable("True"); - this.App_SteamForceLoginProm = ko.observable("False"); + this.App_SteamForceLoginPrompt = ko.observable("False"); this.App_SupportsUniversalSleep = ko.observable("False"); this.App_WakeupMode = ko.observable("Any"); this.App_TemplateMatchRegex = ko.observable("{{(\\$?[\\w]+)}}"); @@ -96,7 +96,7 @@ class generatorViewModel { this._Console_UserLeaveRegex = ko.observable(""); this._Console_UserChatRegex = ko.observable(""); this.Console_UpdateAvailableRegex = ko.observable("^\\[\\d\\d:\\d\\d:\\d\\d\\] \\[INFO\\] A new server update is available! v[\\d\\.]+.$"); - this.Console_MetricsRegex = ko.observable(""); + //this.Console_MetricsRegex = ko.observable(""); this.Console_SuppressLogAtStart = ko.observable("False"); this.Console_ActivateLogRegex = ko.observable(""); this.Console_UserActions = ko.observable("{}"); From 15252541ced3a34b0fce024fc707e84a3e84478a Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Sun, 22 Oct 2023 04:30:53 -0500 Subject: [PATCH 77/79] Fix Issues and Add KO Validate --- generator.js | 129 +++++++++++++-------------------------------------- index.html | 9 ++-- 2 files changed, 36 insertions(+), 102 deletions(-) diff --git a/generator.js b/generator.js index f3ce30e..2af1a6d 100644 --- a/generator.js +++ b/generator.js @@ -17,12 +17,14 @@ function downloadString(data, filename) { document.body.removeChild(element); } +ko.validation.init(); + class generatorViewModel { constructor() { var self = this; this._availablePortOptions = ko.observableArray(['Custom Port', 'Main Game Port', 'Steam Query Port', 'RCON Port']); this._compatibility = ko.observable("None"); - this.Meta_DisplayName = ko.observable(""); + this.Meta_DisplayName = ko.observable("").extend({ required: "Please enter a first name" }); this.Meta_Description = ko.observable(""); this.Meta_Arch = ko.observable("x86_64"); this._Meta_Author = ko.observable(""); @@ -119,14 +121,12 @@ class generatorViewModel { this.__NewAutoMap = ko.observable(true); this.__NewConfigType = ko.observable(""); - this._UpdateSourceType = ko.observable("4"); this._UpdateSourceURL = ko.observable(""); this._UpdateSourceGitRepo = ko.observable(""); this._UpdateSourceUnzip = ko.observable(false); this._DisplayImageSource = ko.observable(""); this._SteamServerAppID = ko.observable(""); - this._SteamClientAppID = ko.observable(""); this._WinExecutableName = ko.observable(""); this._LinuxExecutableName = ko.observable(""); @@ -151,9 +151,9 @@ class generatorViewModel { this._Meta_PortsManifest = ko.computed(() => self.__SanitizedName() + "ports.json"); this._Meta_StagesManifest = ko.computed(() => self.__SanitizedName() + "updates.json"); this.Meta_ConfigRoot = ko.computed(() => self.__SanitizedName() + ".kvp"); -// this.Meta_DisplayImageSource = ko.computed(() => self._UpdateSourceType() == "4" ? "steam:" + self._SteamClientAppID() : "url:" + self._DisplayImageSource()); + this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); - this.Meta_DisplayImageSource = ko.computed(() => { + this._SteamCheck = ko.computed(() => { if (self._UpdateStages().length != 0) { var appIDCheck = "0"; for (let i = 0; i < self._UpdateStages().length; i++) { @@ -161,54 +161,20 @@ class generatorViewModel { appIDCheck = self._UpdateStages()[i].UpdateSourceArgs(); } } - if (appIDCheck != 0) { - return 'steam:' + appIDCheck; - } else { - return 'url:' + self._DisplayImageSource(); - } - } else { - return 'url:' + self._DisplayImageSource(); - } - }); - - this.App_RootDir = ko.computed(() => `./${self.__SanitizedName()}/`); - - this.App_BaseDirectory = ko.computed(() => { - if (self._UpdateStages().length != 0) { - var appIDCheck = "0"; - for (let i = 0; i < self._UpdateStages().length; i++) { - if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { - appIDCheck = self._UpdateStages()[i].UpdateSourceData(); - } - } - if (appIDCheck != 0) { - return self.App_RootDir() + appIDCheck + '/'; - } else { - return self.App_RootDir() + 'serverfiles/'; - } - } else { - return self.App_RootDir() + 'serverfiles/'; - } - }); - - this.App_WorkingDir = ko.computed(() => { - if (self._UpdateStages().length != 0) { - var appIDCheck = "0"; - for (let i = 0; i < self._UpdateStages().length; i++) { - if (self._UpdateStages()[i]._UpdateSource() == 8 && appIDCheck == 0) { - appIDCheck = self._UpdateStages()[i].UpdateSourceData(); - } - } if (appIDCheck != 0) { return appIDCheck; } else { - return 'serverfiles'; + return '0'; } } else { - return 'serverfiles'; + return '0'; } }); + this.Meta_DisplayImageSource = ko.computed(() => self._SteamCheck() == 0 ? 'url:' + self._DisplayImageSource() : 'steam:' + self._SteamCheck()); + this.App_BaseDirectory = ko.computed(() => self._SteamCheck() == 0 ? self.App_RootDir() + 'serverfiles/' : self.App_RootDir() + self._SteamCheck() + '/'); + this.App_WorkingDir = ko.computed(() => self._SteamCheck() == 0 ? 'serverfiles' : self._SteamCheck()); + this._SteamClientAppID = ko.computed(() => self._SteamCheck() != 0 ? self._SteamCheck() : ''); this.App_ExecutableWin = ko.computed(() => self.App_WorkingDir() == "" ? self._WinExecutableName() : `${self.App_WorkingDir()}\\${self._WinExecutableName()}`); this.App_ExecutableLinux = ko.computed(() => self._compatibility() == "None" ? (self.App_WorkingDir() == "" ? self._LinuxExecutableName() : `${self.App_WorkingDir()}/${self._LinuxExecutableName()}`) : (self._compatibility().substring(self._compatibility().length - 4) == "Xvfb" ? '/usr/bin/xvfb-run' : (self._compatibility() == "Wine" ? '/usr/bin/wine' : '1580130/proton'))); this._App_LinuxCommandLineArgsCompat = ko.computed(() => self._compatibility() == "None" ? '' : (self._compatibility() == "WineXvfb" ? '-a wine \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "ProtonXvfb" ? '-a \"{{$FullRootDir}}1580130/proton\" run \"./' + self._WinExecutableName() + '\"' : (self._compatibility() == "Proton" ? 'run \"./' + self._WinExecutableName() + '\"' : '\"./' + self._WinExecutableName() + '\"')))); @@ -260,7 +226,7 @@ class generatorViewModel { var data = [ { "key": "Generated Name", - "value": self.__SanitizedName(), + "value": self.__SanitizedName() }, { "key": "Config Root", @@ -386,7 +352,11 @@ class generatorViewModel { self.__AddEditStage(new updateStageViewModel(self)); $("#addEditStageModal").modal('show'); }; - + this.Errors = ko.validation.group(self); + this.isValid = ko.computed(function () { + return self.Errors().length == 0; + }); + this.__DoAddStage = function () { self._UpdateStages.push(self.__AddEditStage()); $("#addEditStageModal").modal('hide'); @@ -496,33 +466,17 @@ class generatorViewModel { lines.push(`${key.replace("_", ".")}=${self[key]()}`); } - /* - switch (self._UpdateSourceType()) { - case "1": //URL - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"Server Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"FetchURL\", \"UpdateSourceData\": \"${self._UpdateSourceURL()}\", \"UnzipUpdateSource\": ${self._UpdateSourceUnzip()}}]`); - break; - case "4": //Steam - if (self._compatibility() == "Proton") { - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"},{\"UpdateStageName\": \"Proton Compatibility Layer\",\"UpdateSourcePlatform\": \"Linux\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"1580130\"}]`); - } else { - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"SteamCMD Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"SteamCMD\", \"UpdateSourceData\": \"${self._SteamServerAppID()}\"}]`); - } - break; - case "16": //Github - lines.push(`App.UpdateSources=[{\"UpdateStageName\": \"GitHub Release Download\",\"UpdateSourcePlatform\": \"All\", \"UpdateSource\": \"GithubRelease\", \"UpdateSourceData\": \"${self._UpdateSourceGitRepo()}\"}]`); - break; - } - */ - if (self._UpdateSourceType() == "4") //SteamCMD - { - if (self._compatibility() == "Proton" || self._compatibility() == "ProtonXvfb") { - lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); - } else { - lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"./linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\"}`); - } + if ((self._compatibility() == "Proton" || self._compatibility() == "ProtonXvfb") && self._SteamCheck() != 0) { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"STEAM_COMPAT_DATA_PATH\": \"{{$FullRootDir}}1580130\", \"STEAM_COMPAT_CLIENT_INSTALL_PATH\": \"{{$FullRootDir}}1580130\"}`); + } else if ((self._compatibility() == "Proton" || self._compatibility() == "ProtonXvfb") && self._SteamCheck() == 0) { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%\"}`); + } else if ((self._compatibility() == "Wine" || self._compatibility() == "WineXvfb") && self._SteamCheck() != 0) { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%\", \"SteamAppId\": \"${self._SteamClientAppID()}\", \"WINEPREFIX\": \"{{$FullRootDir}}.wine\", \"WINEARCH\": \"win64\", \"WINEDEBUG\": \"-all\"}`); + } else { + lines.push(`App.EnvironmentVariables={\"LD_LIBRARY_PATH\": \"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%\", \"WINEPREFIX\": \"{{$FullRootDir}}.wine\", \"WINEARCH\": \"win64\", \"WINEDEBUG\": \"-all\"}`); } - var output = lines.sort().join("\n"); + var output = lines.join("\n"); var asJSAppSettings = ko.toJS(self._AppSettings()); var asJSUpdateStages = ko.toJS(self._UpdateStages()); var asJSPortMappings = ko.toJS(self._PortMappings()); @@ -579,6 +533,10 @@ class generatorViewModel { this.__ValidateConfig = function () { autoSave(); + if (!self.isValid()) { + self.Errors.showAllMessages(); + return; + } self.__ValidationResults.removeAll(); var failure = (issue, recommendation) => self.__ValidationResults.push(new validationResult("Failure", issue, recommendation)); @@ -627,32 +585,7 @@ class generatorViewModel { } */ break; } - /* - switch (self._UpdateSourceType()) { - case "1": //Fetch from URL - if (self._UpdateSourceURL() == "") { - failure("Update method is Fetch from URL, but no download URL was specified.", "Specify the 'Update source URL' under Update Sources."); - } - else if (self._UpdateSourceURL().toLowerCase().endsWith(".zip") && !self._UpdateSourceUnzip()) { - info("Download URL is a zip file, but 'Unzip once downloaded' is not turned on.", "Turn on 'Unzip once downloaded' under 'Update Sources'", "Without this setting turned on, the archive will not be extracted. If this was intentional, you can ignore this message."); - } - break; - case "4": //SteamCMD - if (self._SteamServerAppID() == "") { - failure("Update method is SteamCMD, but no server App ID is set.", "Specify the 'Server Steam App ID' under Update Sources."); - } - if (self._SteamClientAppID() == "") { - warning("Update method is SteamCMD, but no client App ID is set.", "Specify the 'Server Client App ID' under Update Sources.", "The client app ID is used to source the background image for the resulting instance."); - } - break; - } - */ - /* - if (self.Console_AppReadyRegex() != "" && !self.Console_AppReadyRegex().match(/\^.+\$/)) { failure("Server ready expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the Server Ready expression under Server Events to match the entire line."); } - if (self.Console_UserJoinRegex() != "" && !self.Console_UserJoinRegex().match(/\^.+\$/)) { failure("User connected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User connected expression under Server Events to match the entire line."); } - if (self.Console_UserLeaveRegex() != "" && !self.Console_UserLeaveRegex().match(/\^.+\$/)) { failure("User disconnected expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User disconnected expression under Server Events to match the entire line."); } - if (self.Console_UserChatRegex() != "" && !self.Console_UserChatRegex().match(/\^.+\$/)) { failure("User chat expression does not match the entire line. Regular expressions for AMP must match the entire line, starting with a ^ and ending with a $.", "Update the User chat expression under Server Events to match the entire line."); } - */ + if ((self._compatibility() == "Wine" && !self._SupportsLinux()) || (self._compatibility() == "Proton" && !self._SupportsLinux())) { failure("A Linux compatibility layer was chosen, but Linux support is not checked.", "Please check both."); } //Validation Summary diff --git a/index.html b/index.html index ea088af..b3a2972 100644 --- a/index.html +++ b/index.html @@ -19,6 +19,7 @@ + @@ -627,11 +628,11 @@
    Configuration Files

    Startup and Shutdown

    Application and Parameters
    -
    +
    -
    +
    @@ -662,7 +663,7 @@
    Application and Parameters
    - +
    The format to be used to add settings specified above to the command line in place of {{$FormattedArgs}}. {0} is the field name and {1} the value.
    @@ -1265,7 +1266,7 @@
    Source Type Details
    This will show as the notification while updating.     - +
    From 2283eb14d06dbf45955119e2b84c182617b584d2 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:16:57 -0600 Subject: [PATCH 78/79] Add AppConfigId and filter Errors and isValie --- generator.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/generator.js b/generator.js index 2af1a6d..f50f96c 100644 --- a/generator.js +++ b/generator.js @@ -42,6 +42,12 @@ class generatorViewModel { //this.Meta_ConfigReleaseState = ko.observable("NotSpecified"); //this.Meta_NoCommercialUsage = ko.observable("False"); this.Meta_EndpointURIFormat = ko.observable(`steam://connect/{ip}:{GenericModule.App.Ports.$SteamQueryPort}`); + this.Meta_AppConfigId = function guid() { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + } this._SupportsWindows = ko.observable(true); this._SupportsLinux = ko.observable(true); @@ -352,9 +358,9 @@ class generatorViewModel { self.__AddEditStage(new updateStageViewModel(self)); $("#addEditStageModal").modal('show'); }; - this.Errors = ko.validation.group(self); - this.isValid = ko.computed(function () { - return self.Errors().length == 0; + this.__Errors = ko.validation.group(self); + this.__isValid = ko.computed(function () { + return self.__Errors().length == 0; }); this.__DoAddStage = function () { @@ -533,8 +539,8 @@ class generatorViewModel { this.__ValidateConfig = function () { autoSave(); - if (!self.isValid()) { - self.Errors.showAllMessages(); + if (!self.__isValid()) { + self.__Errors.showAllMessages(); return; } self.__ValidationResults.removeAll(); From 951d9cba4ede8cea68b79fd99ced27d38d152202 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:35:01 -0600 Subject: [PATCH 79/79] Fix compatibility validation on Linux --- generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator.js b/generator.js index f50f96c..8c365ae 100644 --- a/generator.js +++ b/generator.js @@ -564,7 +564,7 @@ class generatorViewModel { } if (self._SupportsLinux()) { - if (self._LinuxExecutableName() == "") { failure("Linux is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } + if (self._LinuxExecutableName() == "" && self._compatibility() == "None") { failure("Linux is listed as a supported platform, but no executable for this platform was specified.", "Specify an executable for this platform under 'Startup and Shutdown'"); } else if (self._LinuxExecutableName().toLowerCase().endsWith(".sh")) { failure("You can only start executables files from AMP. Do not attempt to use shell scripts or other file types.", "Change your Linux Executable under Startup and Shutdown to be an actual executable rather than a script."); } }

    - Regex101 is an excellent resource to help - validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour. + Regex101 is an excellent resource to help validate expressions. AMP uses the 'ECMAScript (Javascript)' regex flavour.