installer stuff

Author: colinhartigan

.gitignore

@@ -5,4 +5,5 @@ build/
 dist/
 .env
 config.json
-main.spec
+main.spec
+installer/

LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Colin Hartigan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

installer/installer compiler.iss

@@ -0,0 +1,53 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "VALORANT-RPC Installer"
+#define MyAppVersion "2.0"
+#define MyAppPublisher "Colin Hartigan"
+#define MyAppURL "https://github.com/colinhartigan/valorant-rpc"
+#define MyAppExeName "valorant-rpc.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{C7C0CB9D-5B3A-46FC-8C0D-35D85EBD30F4}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\valorant-rpc
+DefaultGroupName=VALORANT-RPC
+DisableProgramGroupPage=yes
+LicenseFile=D:\colin\programming\VALORANT\valorant-rpc\LICENSE.txt
+InfoAfterFile=D:\colin\programming\VALORANT\valorant-rpc\installer\post-install.txt
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
+OutputDir=D:\colin\programming\VALORANT\valorant-rpc\installer\installer output
+OutputBaseFilename=VALORANT-RPC installer
+SetupIconFile=D:\colin\programming\VALORANT\valorant-rpc\assets\game_icon_white.ico
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\colin\programming\VALORANT\valorant-rpc\dist\valorant-rpc\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\colin\programming\VALORANT\valorant-rpc\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

installer/post-install.txt

@@ -0,0 +1,5 @@
+Thank you for installing VALORANT-RPC!
+https://github.com/colinhartigan/valorant-rpc
+
+You're almost done installing, but there's one more step to ensure a seamless experience while using the client:
+https://github.com/colinhartigan/valorant-rpc#part-2-changing-the-valorant-launch-target

main.py

@@ -1,3 +1,14 @@
 from valorantrpc import main
 
-main.run()
+if __name__ == "__main__":
+    print('''
+_    _____    __    ____  ____  ___    _   ________            ____  ____  ______
+| |  / /   |  / /   / __ \/ __ \/   |  / | / /_  __/           / __ \/ __ \/ ____/
+| | / / /| | / /   / / / / /_/ / /| | /  |/ / / /    ______   / /_/ / /_/ / /     
+| |/ / ___ |/ /___/ /_/ / _, _/ ___ |/ /|  / / /    /_____/  / _, _/ ____/ /___   
+|___/_/  |_/_____/\____/_/ |_/_/  |_/_/ |_/ /_/             /_/ |_/_/    \____/                                                      
+
+    https://github.com/colinhartigan/valorant-rpc   
+    
+    ''')
+    main.run()

valorant-rpc.spec

@@ -6,11 +6,11 @@ block_cipher = None
 a = Analysis(['main.py'],
              pathex=['D:\\colin\\programming\\VALORANT\\valorant-rpc'],
              binaries=[],
-             datas=[("data/config.json", "data"),("data/.env", "data"), ("data/favicon.ico", "data")],
+             datas=[("data/favicon.ico", "data")],
              hiddenimports=['pystray._win32'],
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['matplotlib','notebook'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

valorantrpc/main.py

@@ -1,4 +1,5 @@
-from valorantrpc import webserver,riot_api,utils,oauth,client_api,match_session
+from valorantrpc import webserver,riot_api,utils,oauth,client_api,match_session,unenhanced_match_session
+from valorantrpc.exceptions import AuthError
 import pypresence,asyncio,json,base64,time,threading,os,subprocess,psutil,ctypes,sys,pystray
 from win10toast import ToastNotifier
 from pystray import Icon as icon, Menu as menu, MenuItem as item
@@ -19,8 +20,8 @@
 systray = None
 loop = None
 window_shown = False
-client_id = str(os.environ.get('CLIENT_ID'))
-client_secret = str(os.environ.get('CLIENT_SECRET'))
+client_id = None
+client_secret = None
 client = None
 last_presence = {}
 session = None
@@ -31,7 +32,7 @@
 config = {} 
 
 
-
+default_client_id = "811469787657928704"
 current_release = "v2.0b1" #don't forget to update this you bimbo
 
 
@@ -84,8 +85,7 @@ def close_program():
 def update_rpc(data):
     if data is None:
         return
-    global session  
-
+    global session,use_enhanced_presence,party_invites_enabled
     if not data["isIdle"]:
         #menu
         if data["sessionLoopState"] == "MENUS" and data["partyState"] != "CUSTOM_GAME_SETUP":
@@ -99,7 +99,7 @@ def update_rpc(data):
                 small_text="Party Leader" if utils.validate_party_size(data) else None,
                 party_id=data["partyId"],
                 party_size=data["party_size"],
-                join=data["join_state"]
+                join=data["join_state"] if party_invites_enabled else None
             )
 
         #custom setup
@@ -115,7 +115,21 @@ def update_rpc(data):
                 small_text="Party Leader" if utils.validate_party_size(data) else None,
                 party_id=data["partyId"],
                 party_size=data['party_size'],
-                join=data['join_state']
+                join=data['join_state'] if party_invites_enabled else None
+            )
+
+        #in da range
+        elif data["sessionLoopState"] == "INGAME" and data["provisioningFlow"] == "ShootingRange":
+            game_map = utils.maps[data["matchMap"].split("/")[-1]]
+            client.set_activity(
+                state=data['party_state'],
+                details="THE RANGE",
+                large_image=f"splash_{game_map.lower()}",
+                large_text=game_map,
+                small_image=utils.mode_images[data['queue_id'].lower()],
+                party_id=data["partyId"],
+                party_size=data['party_size'],
+                join=data['join_state'] if party_invites_enabled else None
             )
 
         if use_enhanced_presence:
@@ -137,7 +151,20 @@ def update_rpc(data):
 
         else:
             # if not, use older presence stuff
-            pass
+            if data["sessionLoopState"] == "PREGAME":
+                if last_state != "PREGAME":
+                    # new game session, create match object
+                    if session is None: 
+                        session = unenhanced_match_session.Session(client)
+                        session.init_pregame(data)
+                        print('new sesh')
+
+            elif data["sessionLoopState"] == "INGAME":
+                # if a match doesn't have a pregame
+                if last_state != "INGAME":
+                    if session is None:
+                        session = unenhanced_match_session.Session(client)
+                        session.init_ingame(data)
 
 
 
@@ -212,44 +239,43 @@ def main(loop):
     startup routine: load config, start VALORANT, load lockfile, wait for presence
     once startup is complete, run the listening loop
     '''
-    global client,client_id,client_secret,config
-
-    print('''
- _    _____    __    ____  ____  ___    _   ________            ____  ____  ______
-| |  / /   |  / /   / __ \/ __ \/   |  / | / /_  __/           / __ \/ __ \/ ____/
-| | / / /| | / /   / / / / /_/ / /| | /  |/ / / /    ______   / /_/ / /_/ / /     
-| |/ / ___ |/ /___/ /_/ / _, _/ ___ |/ /|  / / /    /_____/  / _, _/ ____/ /___   
-|___/_/  |_/_____/\____/_/ |_/_/  |_/_/ |_/ /_/             /_/ |_/_/    \____/                                                      
-
-https://github.com/colinhartigan/valorant-rpc   
- 
-    ''')
+    global client,client_id,client_secret,config,use_enhanced_presence,party_invites_enabled
 
     # load config
     config = utils.get_config() 
+
     launch_timeout = config['settings']['launch_timeout']
-    if config['rpc-client-override']['client_id'] != "":
+    if config['rpc-client-override']['client_id'] != "" and config['rpc-client-override']['client_id'] != default_client_id:
         print("[i] overriding client id!")
         client_id = config['rpc-client-override']['client_id']
+    else:
+        client_id = default_client_id
     if config['rpc-client-override']['client_secret'] != "":
         print("[i] overriding client secret!")
         client_secret = config['rpc-client-override']['client_secret']
+        party_invites_enabled = True
     else:
         party_invites_enabled = False
 
     if config['riot-account']['username'] != '' and config['riot-account']['password'] != '':
-        use_enhanced_presence = True 
+        use_enhanced_presence = True
     else:
         print('[i] no riot account detected, using old presence')
         use_enhanced_presence = False
         #figure out if i can still use client.set_activity without whitelisting/oauthing; if so, then just use that
 
-
     # setup client
-    client = pypresence.Client(client_id,loop=loop) 
+    client = pypresence.Client(int(client_id),loop=loop) 
     webserver.run()
     client.start()
-    #oauth.authorize(client,client_id,client_secret)
+
+    # authorize app if party invites enabled
+    if party_invites_enabled:
+        try:
+            oauth.authorize(client,client_id,client_secret)
+        except:
+            use_enhanced_presence = False 
+            print('[!] could not authenticate, check the client secret')
 
     launch_timer = 0
 
@@ -298,11 +324,6 @@ def main(loop):
             if launch_timer >= launch_timeout:
                 close_program()
             time.sleep(1)
-    print("[i] lockfile loaded! hiding window...")
-    time.sleep(1)
-    systray_thread = threading.Thread(target=run_systray)
-    systray_thread.start()
-    user32.ShowWindow(hWnd, 0)
 
     #check for presence
     launch_timer = 0
@@ -315,6 +336,13 @@ def main(loop):
             if launch_timer >= launch_timeout:
                 close_program()
             time.sleep(1)
+
+    print("[i] presence detected! hiding window...")
+    time.sleep(1)
+    systray_thread = threading.Thread(target=run_systray)
+    systray_thread.start()
+    user32.ShowWindow(hWnd, 0)
+    
     print("[i] starting loop")
     update_rpc(presence)
     #print(f"LOCKFILE: {lockfile}")

valorantrpc/match_session.py

@@ -1,4 +1,4 @@
-from . import utils,riot_api,client_api
+from . import utils,client_api
 from .exceptions import AuthError
 import os
 import asyncio
@@ -68,7 +68,6 @@ def pregame_loop(self,presence_data):
 
         self.client.set_activity(
             state=presence_data['party_state'],
-            #details=("Selecting Agent" if not self.selected else "Agent Locked"),# + (f" - {self.mode}" if self.mode else ""),
             details="Pregame" + (f" - {self.mode}" if self.mode else ""),
             end=self.state_end_time,
             large_image=f"agent_{self.agent_name.lower()}" if (self.agent_name != "Selecting" and self.agent_name != "Observer") else "game_icon_white",

valorantrpc/oauth.py

@@ -3,10 +3,12 @@
 from dotenv import load_dotenv
 import os
 from . import utils
+from valorantrpc.exceptions import AuthError
 
 api_endpoint = 'https://discord.com/api/v8'
 
 def exchange_code(code,client_id,client_secret):
+    dir_path = os.path.dirname(os.path.realpath(__file__))
     data = {
         'client_id': client_id,
         'client_secret': client_secret,
@@ -20,7 +22,7 @@ def exchange_code(code,client_id,client_secret):
     }
     r = requests.post('%s/oauth2/token' % api_endpoint, data=data, headers=headers)
     r.raise_for_status()
-    with open('config.json','r+') as f:
+    with open(os.path.join(dir_path, '../data/config.json'), 'r+') as f:
         data = json.load(f)
         data['rpc-oauth'] = r.json()
         f.seek(0)
@@ -30,6 +32,7 @@ def exchange_code(code,client_id,client_secret):
     return r.json()
 
 def refresh_token(refresh_token,client_id,client_secret):
+    dir_path = os.path.dirname(os.path.realpath(__file__))
     data = {
         'client_id': client_id,
         'client_secret': client_secret,
@@ -43,7 +46,7 @@ def refresh_token(refresh_token,client_id,client_secret):
     }
     r = requests.post('%s/oauth2/token' % api_endpoint, data=data, headers=headers)
     r.raise_for_status()
-    with open('config.json','r+') as f:
+    with open(os.path.join(dir_path, '../data/config.json'), 'r+') as f:
         data = json.load(f)
         data['rpc-oauth'] = r.json()
         f.seek(0)
@@ -56,13 +59,21 @@ def refresh_token(refresh_token,client_id,client_secret):
 def authorize(client,client_id,client_secret):
     config = utils.get_config()
     if config['rpc-oauth'] == {}:
-        print("authenticating with discord")
-        auth = client.authorize(client_id,['rpc'])
-        config = utils.get_config()
-        code_grant = auth['data']['code']
-        result = exchange_code(code_grant,client_id,client_secret)
-        client.authenticate(result['access_token'])
+        try:
+            print("[i] authenticating with discord")
+            auth = client.authorize(client_id,['rpc'])
+            config = utils.get_config()
+            code_grant = auth['data']['code']
+            result = exchange_code(code_grant,client_id,client_secret)
+            print(result)
+            client.authenticate(result['access_token'])
+        except Exception as e:
+            print(e)
+            raise AuthError
     else:
-        print("already authenticated!")
-        new_token = refresh_token(config['rpc-oauth']['refresh_token'],client_id,client_secret)
-        client.authenticate(new_token['access_token'])
+        try:
+            print("[i] already authenticated! refreshing token...")
+            new_token = refresh_token(config['rpc-oauth']['refresh_token'],client_id,client_secret)
+            client.authenticate(new_token['access_token'])
+        except:
+            raise AuthError