clan/clan-core
11
2
Fork 13
Code Issues 91 Pull Requests 5 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'sunshine: improve launching of pairing' (#1021) from a-kenji-sunshine/improve-accept into main
All checks were successful
checks / check-links (push) Successful in 21s
Details
checks / checks-impure (push) Successful in 1m50s
Details
checks / checks (push) Successful in 3m32s
Details

Browse Source
This commit is contained in:
clan-bot 2024-03-20 09:00:58 +00:00
commit ae50796e1d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clanModules/sunshine.nix
View File

@ -155,7 +155,7 @@ in
startLimitBurst = 5;
startLimitIntervalSec = 500;
script = ''
${lib.getExe pkgs.sunshine} --creds sunshine sunshine
${lib.getExe pkgs.sunshine} ${sunshineConfiguration} --creds sunshine sunshine
'';
serviceConfig = {
Restart = "on-failure";

1
pkgs/flake-module.nix
View File

@ -19,6 +19,7 @@
tea-create-pr = pkgs.callPackage ./tea-create-pr { };
zerotier-members = pkgs.callPackage ./zerotier-members { };
zt-tcp-relay = pkgs.callPackage ./zt-tcp-relay { };
moonlight-sunshine-accept = pkgs.callPackage ./moonlight-sunshine-accept { };
merge-after-ci = pkgs.callPackage ./merge-after-ci { inherit (config.packages) tea-create-pr; };
pending-reviews = pkgs.callPackage ./pending-reviews { };
}

15
pkgs/moonlight-sunshine-accept/moonlight_sunshine_accept/moonlight/run.py
View File

@ -10,18 +10,19 @@ class MoonlightPairing:
self.found = threading.Event()
def init_pairing(self, host: str, pin: str) -> bool:
# host = f"[{host}]"
args = ["moonlight", "pair", host, "--pin", pin]
print("Trying to pair")
try:
self.process = subprocess.Popen(
args, stderr=subprocess.PIPE, stdout=subprocess.PIPE
)
print(f"Running command: {args}")
self.process = subprocess.Popen(args, stdout=subprocess.PIPE)
print("Pairing initiated")
thread = threading.Thread(
target=self.stream_output,
args=('Latest supported GFE server: "99.99.99.99"',),
)
thread.start()
print("Thread started")
return True
except Exception as e:
print(
@ -51,6 +52,8 @@ class MoonlightPairing:
self.found.set()
break
def wait_until_started(self) -> None:
self.found.wait()
print("Started up.")
def wait_until_started(self, timeout: int = 10) -> None:
if self.found.wait(timeout):
print("Started up.")
else:
print("Starting up took took too long. Terminated the process.")