[Feat] Add support for Amazon Games #2831

Gustash · 2023-06-30T21:15:22Z

Amazon Games Support

This PR adds support for Amazon Games.

It uses Nile to interface with your Amazon Games library.

I have tested on Linux, macOS and Windows. All the basic features have been seen as working, as noted in the TODO list below.

EDIT:

Also tested the .flatpak artifact on the Steam Deck, all features are working there too.

TODO:

Use the following Checklist if you have changed something on the Backend or Frontend:

Tested the feature and it's working on a current and clean install.
Tested the main App features and they are still working on a current and clean install. (Login, Install, Play, Uninstall, Move games, etc.)
Created / Updated Tests (If necessary)
Created / Updated documentation (If necessary)

derrod · 2023-07-05T18:59:36Z

Currently this appears to not detect if a user has already logged in manually via the CLI. Otherwise seems to work fine for me (on Windows).

imLinguin · 2023-07-05T19:01:28Z

@derrod this is due to sandboxed config of Nile. Same we do with legendary now

derrod · 2023-07-05T19:13:39Z

@derrod this is due to sandboxed config of Nile. Same we do with legendary now

The config file is migrated still, so Nile was logged in when running from Heroic. But it still showed as logged out and clicking the login button just did nothing. Also noteworthy that even deleting the Nile config didn't work as it would then copy the global one again, thus getting into a bad state again.

imLinguin · 2023-07-05T19:15:01Z

Ah yes. I encountered same issue. Heroic doesn't detect that Nile is logged in already

Gustash · 2023-07-05T20:43:57Z

Currently this appears to not detect if a user has already logged in manually via the CLI. Otherwise seems to work fine for me (on Windows).

This has been resolved now

EDIT:

If you've previously tested this PR the fix won't take effect as it only loads the user into the cache store when copying the global config directory. If you already have a local config directory for Heroic, it won't follow that branch.

This is not an issue for users opening Heroic for the first time with the changes from the latest commit

flavioislima · 2023-07-05T21:03:38Z

That is pretty cool. Thanks for that.
One comment, not related though, is that we need to figure it out a better way of having those store filters since now it is not that practical. We should change it to be a select with the options instead.

I will test as soon as possible on all platforms.

Gustash · 2023-07-05T21:20:02Z

That is pretty cool. Thanks for that.

I'm happy to contribute ☺️

One comment, not related though, is that we need to figure it out a better way of having those store filters since now it is not that practical. We should change it to be a select with the options instead.

Is this something you want me to do on this PR, or would it be more relevant in a separate PR after this?

flavioislima

Testing here.
One thing that can be improved:
if there are only windows games on Prime, then we could hide the OS filter. Right now it disables macOS but keeps the browser button, Browser should actually only show when OTHER is selected.
Clicking on it while the amazon is selected does nothing.

flavioislima · 2023-07-14T11:54:13Z

src/common/types.ts

@@ -96,7 +98,7 @@ export interface ExtraInfo {
 export type GameConfigVersion = 'auto' | 'v0' | 'v0.1'

 export interface GameInfo {
-  runner: 'legendary' | 'gog' | 'sideload'
+  runner: 'legendary' | 'gog' | 'sideload' | 'nile'


We should use Runner here at some point.

flavioislima

Tested here on macOS and works pretty well. Was able to log in, install, uninstall, play, etc.
That's a pretty good job. Ofc it will have bugs but I think it is ready for the next release :)

flavioislima · 2023-07-14T12:29:55Z

@Gustash
Let's do the other stuff I said on another PR.
For now just update the nile binaries and fix the conflicts and then it should be ready to merge 👍🏽

Gustash · 2023-07-15T09:18:39Z

@flavioislima I've fixed the merge conflicts. I'm just waiting on Linguin fixing subprocess reaping in nile for Windows and macOS, as it currently doesn't work for killing games from Heroic.

EDIT:

As mentioned on Discord, this can be merged as is. We'll try to figure out subprocess termination on Windows/macOS in Nile. When that's fixed, a binary update should be all that's needed

Gustash · 2023-07-15T12:05:48Z

Force stopping games is now working properly for Linux and macOS. On Windows it still doesn't work, but I found that gogdl also doesn't force stop the game on Windows. Since Nile shares pretty much a 1-to-1 mechanism for subprocesses as gogdl, this is not an isolated issue and has probably existed on Windows for a while.

I say we get this PR merged and deal with gogdl and nile not stopping games on Windows in a separate PR.

imLinguin

Left small comment, but overall it looks good to me.

Amazing work ⚔️

src/backend/storeManagers/nile/games.ts

Gustash mentioned this pull request Jun 30, 2023

Is it possible to Implement this into Heroic Games Launcher at some point? imLinguin/nile#7

Closed

imLinguin mentioned this pull request Jul 1, 2023

Amazon Games / Twitch support #1289

Closed

imLinguin linked an issue Jul 1, 2023 that may be closed by this pull request

Amazon Games / Twitch support #1289

Closed

This comment was marked as resolved.

Sign in to view

Gustash force-pushed the feat/amazon-games branch from 49054f6 to e5e6e66 Compare July 3, 2023 19:21

Gustash marked this pull request as ready for review July 4, 2023 17:14

Gustash changed the title ~~[DRAFT] feat: Add support for Amazon Games~~ feat: Add support for Amazon Games Jul 4, 2023

imLinguin added the pr:ready-for-review Feature-complete, ready for the grind! :P label Jul 4, 2023

imLinguin requested review from a team, arielj, flavioislima, CommandMC, Nocccer and imLinguin and removed request for a team July 4, 2023 17:24

Gustash force-pushed the feat/amazon-games branch from 76920e6 to 59cc217 Compare July 9, 2023 20:02

flavioislima reviewed Jul 14, 2023

View reviewed changes

flavioislima approved these changes Jul 14, 2023

View reviewed changes

flavioislima changed the title ~~feat: Add support for Amazon Games~~ [Feat] Add support for Amazon Games Jul 14, 2023

Gustash added 3 commits July 15, 2023 10:10

feat: initial skeleton for Amazon Games

6f906f3

feat: added placeholder for amazon save location

2e60a4c

chore: added EN Amazon Games translation

3e797b2

Gustash added 23 commits July 15, 2023 10:11

feat: implemented importing games

a61870a

feat: implemented repairing games

5d54870

feat: saving import game log to file

00d0d24

feat: added store page URLs

7757b06

feat: added Nile Linux binary

90396ca

feat: added Nile Windows binary

7ba0d9e

feat: added Nile macOS binary

b67a315

feat: added nile binaries to asarUnpack

2984a4d

chore: using binaries from nile build artifacts

959d21f

fix: added missing check for Amazon login

5bb45f5

feat: PostInstall implementation for Wine

7931a32

fix: runner name mapping in SearchBar

c79e792

feat: implement PostInstall for Windows

c0a2982

feat: implemented nile in protocol.ts

10a38db

fix: user credentials not being loaded when copying config

d0156ee

chore: updated documentation

846b7f4

fix: amazon logout not being handled async

d9cc98d

refactor: changed default store_url to GOG

e64ed11

feat: Prime Gaming added to stores

6e4ee06

fix: nile library refresh

46be3cd

refactor: disabled Amazon games Store Page link

bd31985

chore: updated nile binaries

f1714f4

refactor: simplify process killing with new nile version

07a661e

Gustash force-pushed the feat/amazon-games branch from e4dc93a to 07a661e Compare July 15, 2023 09:13

fix: killing games in macOS

819dbe2

imLinguin approved these changes Jul 15, 2023

View reviewed changes

src/backend/storeManagers/nile/games.ts Show resolved Hide resolved

flavioislima merged commit 18f60f2 into Heroic-Games-Launcher:main Jul 15, 2023

Gustash deleted the feat/amazon-games branch July 15, 2023 15:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feat] Add support for Amazon Games #2831

[Feat] Add support for Amazon Games #2831

Gustash commented Jun 30, 2023 •

edited

Loading

This comment was marked as resolved.

derrod commented Jul 5, 2023

imLinguin commented Jul 5, 2023

derrod commented Jul 5, 2023

imLinguin commented Jul 5, 2023

Gustash commented Jul 5, 2023 •

edited

Loading

flavioislima commented Jul 5, 2023

Gustash commented Jul 5, 2023

flavioislima left a comment

flavioislima Jul 14, 2023

flavioislima left a comment

flavioislima commented Jul 14, 2023

Gustash commented Jul 15, 2023 •

edited

Loading

Gustash commented Jul 15, 2023

imLinguin left a comment

[Feat] Add support for Amazon Games #2831

[Feat] Add support for Amazon Games #2831

Conversation

Gustash commented Jun 30, 2023 • edited Loading

Amazon Games Support

This comment was marked as resolved.

derrod commented Jul 5, 2023

imLinguin commented Jul 5, 2023

derrod commented Jul 5, 2023

imLinguin commented Jul 5, 2023

Gustash commented Jul 5, 2023 • edited Loading

flavioislima commented Jul 5, 2023

Gustash commented Jul 5, 2023

flavioislima left a comment

Choose a reason for hiding this comment

flavioislima Jul 14, 2023

Choose a reason for hiding this comment

flavioislima left a comment

Choose a reason for hiding this comment

flavioislima commented Jul 14, 2023

Gustash commented Jul 15, 2023 • edited Loading

Gustash commented Jul 15, 2023

imLinguin left a comment

Choose a reason for hiding this comment

Gustash commented Jun 30, 2023 •

edited

Loading

Gustash commented Jul 5, 2023 •

edited

Loading

Gustash commented Jul 15, 2023 •

edited

Loading