diff --git a/README.md b/README.md index fbeceff..9dc64a7 100644 --- a/README.md +++ b/README.md @@ -141,27 +141,25 @@ This is our current roadmap goals. You can find older ones [here](ROADMAP.md) * Ability to get current installed patch * Ability to get latest available patch * Ability to download and install it -* Add project binaries bundling - * AppImage *(seems to be impossible)* - * One-time small installation script because then launcher will have auto updates +* Add project binaries bundling + * AppImage #### Launcher functions -* Make `Launcher` class to manage launcher-related features +* Make `Launcher` class to manage launcher-related features * Downloading progress - * Launcher state functionality + * Launcher state functionality * Game launch available * Game update (installation) required * Voice data update (installation) required - * Patch unavailable - * Test patch available + * Patch unavailable + * Test patch available * Make Svelte components * Checkbox * Selectbox * SelectionList * SelectableCheckbox * PropertiesEditor -* Rewrite sass code, provide more flexible theming ability * Add `svelte-i18n` * Telemetry checking * Tooltips for some options @@ -174,6 +172,7 @@ This is our current roadmap goals. You can find older ones [here](ROADMAP.md) * Ability to change the temp directory where the launcher should download some files * Launcher auto-updates * Changelog window +* Rewrite sass code, provide more flexible theming ability ### Features diff --git a/bundle-appimage.cjs b/bundle-appimage.cjs index 50c872b..6b37bbd 100644 --- a/bundle-appimage.cjs +++ b/bundle-appimage.cjs @@ -35,7 +35,7 @@ const bundler = new Bundler({ output: path.join(__dirname, 'dist/An Anime Game Launcher.AppImage'), // Application version - version: '2.0.0' + version: '2.0.0-beta-2' }); // Bundle project diff --git a/neutralino.config.json b/neutralino.config.json index ccc984b..8fffe6e 100644 --- a/neutralino.config.json +++ b/neutralino.config.json @@ -1,6 +1,6 @@ { "applicationId": "com.krypt0nn.an-anime-game-launcher", - "version": "2.0.0", + "version": "2.0.0-beta-2", "defaultMode": "window", "port": 0, "documentRoot": "/bundle/", diff --git a/package.json b/package.json index 86d3669..009cc42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "an-anime-game-launcher", - "version": "2.0.0", + "version": "2.0.0-beta-2", "license": "GPL-3.0", "type": "module", "scripts": { diff --git a/src/ts/core/Domain.ts b/src/ts/core/Domain.ts index 6956f2c..359372e 100644 --- a/src/ts/core/Domain.ts +++ b/src/ts/core/Domain.ts @@ -24,16 +24,16 @@ export default class Domain const regex = /PING (.*) \(([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\) from ([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}) : [\d]+\([\d]+\) bytes of data/gm.exec(output); - if (regex !== null) + if (regex !== null || output.includes('Name or service not known')) { process.outputInterval = null; process.runningInterval = null; const info: DomainInfo = { - uri: regex[1], - remoteIp: regex[2], - localIp: regex[3], - available: regex[2] !== regex[3] + uri: regex ? regex[1] : uri, + remoteIp: regex ? regex[2] : undefined, + localIp: regex ? regex[3] : undefined, + available: regex ? regex[2] !== regex[3] : false }; debugThread.log({ message: info }); diff --git a/src/ts/launcher/State.ts b/src/ts/launcher/State.ts index 30584a4..811c2c8 100644 --- a/src/ts/launcher/State.ts +++ b/src/ts/launcher/State.ts @@ -26,14 +26,15 @@ export default class State protected events = { 'runner-installation-required': import('./states/InstallWine'), 'dxvk-installation-required': import('./states/InstallDXVK'), - 'game-launch-available': import('./states/Launch'), 'game-installation-available': import('./states/Install'), 'game-update-available': import('./states/Install'), 'game-voice-update-required': import('./states/InstallVoice'), 'test-patch-available': import('./states/ApplyPatch'), - 'patch-available': import('./states/ApplyPatch') + 'patch-available': import('./states/ApplyPatch'), + + 'game-launch-available': import('./states/Launch') }; public constructor(launcher: Launcher) diff --git a/src/ts/types/Domain.d.ts b/src/ts/types/Domain.d.ts index a23c45d..a9ef794 100644 --- a/src/ts/types/Domain.d.ts +++ b/src/ts/types/Domain.d.ts @@ -1,7 +1,7 @@ type DomainInfo = { uri: string; - remoteIp: string; - localIp: string; + remoteIp?: string; + localIp?: string; available: boolean; };