Merge branch 'add-submit-entry' into main

Author: Matthew17-21

README.md

@@ -26,13 +26,26 @@ $ python3 main.py
 | keys | dict | dict containing keys to solving sites | - |
 | generate_random | bool | Should the program generate random password. | `true` or `false` |
 | choices | array | Array of password choices | - |
-
+| user_agents| array | Array of user-agents for mobile & desktop | - |
 
 ### /newegg/*
 - Contains the core software code. 
 
+# Creating Accounts
+- If you want to create accounts via mobile, change line 93 in `main.py` from `desktop.Create_Account(self, email)` to `mobile.Create_Account(self, email)`
+    * And vice versa 
+- MAKE SURE YOU STORE YOUR SESSIONS SOMEWHERE (Don't delete the `.log` file)
+
+# Submitting Entries
+- In order to submit entries, you must make sure:
+    * The program will pull accounts/sessions from the filename that was used to create accounts (`output_filename` in the settings.json file).
+    * Your .log file is in the main directory (alongside with `main.py`)
+    * Accounts/Sessions are still in the .log file
+    * The program will automatically enter on the same platform as the account was created (Desktop or App)
+    * MAKE SURE YOU KEEP YOUR SESSIONS (Don't delete the `.log` file)
+
 # Recommendations
-1. **MAKE SURE YOU STORE YOUR SESSIONS SOMEWHERE**
+1. **MAKE SURE YOU STORE YOUR SESSIONS SOMEWHERE (Don't delete the `.log` file)**
 2. Althought not completely necessary, but you should add/delete/randomify events for accertify.
 3. Make sure iOS app version is up to date
 4. Handle exceptions better
@@ -47,12 +60,23 @@ $ python3 main.py
     * I recommend using anticaptcha for V3, but Capmonster & 2Captcha is also available.
 - Only tested on Python 3.7
     * *Should* work on other versions, but I can't promise anything.
-- This is intended for devs, so try not to change too much code as it might break something.
+- This is intended for devs. If you aren't familiar with python, try not to change too much code as it might break something.
 - This isn't a reflection of how I actually write code so pls don't judge too hard :joy:
     * I've been writing in Go lately, hence the structure of the whole thing.
-- If you want to create accounts via mobile, change line 79 in `main.py` from `desktop.Create_Account(self, email)` to `mobile.Create_Account(self, email)`
-    * And vice versa 
-- There are lots of ways to make this better, cleaner and better on memory. If I find till I'll update this repo.
+- There are lots of ways to make this better, cleaner and better on memory. If I find time, I'll update this repo.
+
+
+# Maintenance
+- This bot is fully functional with success. I won't be working on it much. I'll only work on it when:
+    * They make some massive change
+    * Have *loads* of free time and can complete the [to do list](https://github.com/Matthew17-21/Newegg-Shuffle#to-do)
+- Pull requests are always welcome
+- If any issues were to arise, [open an issue](https://github.com/Matthew17-21/Newegg-Shuffle/issues/new)
+    * Please incude:
+        * Python version
+        * Error
+        * How to replicate
+- You may also contact me on discord - `Matthew#6937` with any questions or concerns
 
 # FAQ
 1. Does this work out of the box?
@@ -68,8 +92,12 @@ $ python3 main.py
 
 # Success
 ![Genning](https://i.imgur.com/lvrTp36.png)
+![Running](https://i.imgur.com/r8gPUIq.png)
 ![Success](https://i.imgur.com/8csUoqR.png)
 
 # TO DO 
-1. [] Clean up code
-2. [] Update documentation
+1. [] Clean up & document code
+2. [] Release GUI version
+3. [] Maybe a folder for logs?
+4. [] Release in Go
+5. [] Inherit, don't pass.

data/settings.json

@@ -1,4 +1,5 @@
 {
+    "ios_app_version": "6.23.0",
     "output_filename": "Successfully created accounts.log",
     "captcha": {
         "version": "v3",
@@ -17,6 +18,14 @@
             "Also,IfYouHaventNoticed,!!1!",
             "ThereNeedsToBeANumberAndSpecialChar!12!"
         ]
+    },
+    "user_agents": {
+        "mobile":[
+            "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Mobile/15E148 Safari/604.1"
+        ],
+        "desktop":[
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36"
+        ]
     }
 
 }

main.py

@@ -1,5 +1,7 @@
 import sys
 try:
+    import os
+    import platform
     import logging
     import json
     import threading
@@ -10,21 +12,21 @@
     colorama.init()
     init(autoreset=True)
     from captchatools import captcha_harvesters
-    from newegg.create_account import desktop, mobile, static_data
+    from newegg.create_account import static_data
+    import time
 except ModuleNotFoundError:
     print("Make sure you ran pip3 install -r requirements.txt")
+    time.sleep(999)
     sys.exit(0)
 
 
-with open("./data/settings.json") as settingsFile:
-    settings = json.load(settingsFile)
-logging.basicConfig(filename=settings["output_filename"], level=logging.INFO)
 
 class Newegg:
     def __init__(self):
         self.screenlock = Semaphore(value=1)
 
         # Load config
+        settings = self.load_settings()
         self.settings = settings
         if settings["captcha"]["captcha_solver"] == 1 or str( settings["captcha"]["captcha_solver"]).lower() == "capmonster":
             api_key = settings["captcha"]["keys"]["capmonster"]
@@ -33,9 +35,9 @@ def __init__(self):
         elif settings["captcha"]["captcha_solver"] == 3 or str( settings["captcha"]["captcha_solver"]).lower() == "2captcha":
             api_key = settings["captcha"]["keys"]["2captcha"]
 
-        if settings["captcha"]["version"] == "v3":
+        if settings["captcha"]["version"].lower() == "v3":
             sitekey = static_data.v3_sitekey
-        elif settings["captcha"]["version"] == "v3":
+        elif settings["captcha"]["version"].lower() == "v2":
             sitekey = static_data.v2_sitekey
 
 
@@ -47,33 +49,148 @@ def __init__(self):
                                 min_score=0.7, action="Register", captcha_type=settings["captcha"]["version"]
         )
 
-        # Start the bot.
+        # Start the bot when initialized.
         self.main()
 
     def main(self):
-        num_tasks = eval(input(Fore.BLUE + "Enter amount of tasks at a time: " + Fore.WHITE + " "))
+        '''
+        Main method.
+
+        This method will be called (automatically) when the bot starts.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        '''
+
+        # Get user input for what they want to do
+        print()
+        print(Fore.CYAN + '1' ,Fore.MAGENTA + "=", Fore.YELLOW +  "Create Accounts")
+        print(Fore.CYAN + '2' ,Fore.MAGENTA + "=", Fore.YELLOW +  "Submit Entries")
+        choice = eval(input("{}".format(Fore.MAGENTA + "Enter your choice: " + Fore.CYAN)))
+        if choice == 1:
+            self.create_accounts()
+        elif choice == 2:
+            self.submit_entries()
+    
+    def load_settings(self):
+        # Some users said their program couldn't find the files
+        # So this is a quick fix to that.
+        original_path = os.getcwd()
+        os.chdir("./data/")
+        self.PATH_EMAILS  = os.getcwd() + "\\emails.txt"
+        self.PATH_PROXIES  = os.getcwd() + "\\proxies.txt"
+        if platform.system() == "Linux" or platform.system() == "Darwin":
+            self.PATH_EMAILS  = self.PATH_EMAILS.replace("\\", "/")
+            self.PATH_PROXIES  = self.PATH_PROXIES.replace("\\", "/")
+        
+
+        # Open settings file
+        settings_file_path = os.getcwd() + "/settings.json"
+        os.chdir(original_path)
+        with open(settings_file_path) as settingsFile:
+            try:
+                return json.load(settingsFile)
+            except json.JSONDecodeError:
+                print(Fore.RED + "There is an error in your settings.json file." +
+                    "Make sure the commas are correct and there aren't any extra commas!")
+                time.sleep(999)
+                sys.exit(0)
+
+    def create_accounts(self):
+        '''
+        This method will be called when the user wants to create Newegg Accounts.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        
+        It will pull emails from the /data/emails.txt folder and use those
+        to create the accounts
+        '''
+        from newegg.create_account import desktop, app, static_data
+
+        # Prompt for how many tasks
+        num_tasks = eval(input(Fore.BLUE + "\nEnter amount of tasks at a time: " + Fore.WHITE + " "))
         self.sema = threading.Semaphore(value=num_tasks)
         threads = []
 
-        with open("./data/emails.txt") as email_file:
+        # Start to create create accounts
+        with open(self.PATH_EMAILS) as email_file:
             for line in email_file.readlines():
                 email = line.split(':')[0].strip("\n")
                 self.sema.acquire()
-                thread = threading.Thread(target=self.create,args=(email,))
+                thread = threading.Thread(target=desktop.Create_Account,args=(self,email))
                 threads.append(thread)
                 thread.start()
 
-    def create(self,email):
-        task = desktop.Create_Account(self, email)
-        data = task.start()
+    def submit_entries(self):
+        '''
+        This method will be called when the user wants to enter the Newegg raffle.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        It'll pull sessions from the file that the user used to create accounts
+        '''
+        from newegg.submit_raffle import raffles, app, desktop
+        path_to_created_accounts = os.getcwd() + "\\{}".format(self.settings["output_filename"]) if \
+            platform.system == "Windows"  else os.getcwd() + "/{}".format(self.settings["output_filename"])
+
+        # Because Newegg still has V2 captcha enabled for submitting entries,
+        # we'll use that over V3. If for whatever reason you want to use V3,
+        # you would have to change this line of code. 
+        self.captcha_solver.sitekey = "6Lcv-WUUAAAAAA9hyir8HPKZ44OvDLg1oZqnq_9d"
+        self.captcha_solver.captcha_type = "v2"
+
+        # Scrape & display raffle items
+        print()
+        print(Fore.YELLOW + "Getting items in raffle...")
+        items = raffles.get_items()
+        index = 0
+        for item in items:
+            print(Fore.GREEN + str(index) ,Fore.MAGENTA + "=", Fore.CYAN + "{} (${})".format( item["name"], item["price"]))
+            index +=1
 
-        # Log Data
-        logging.info("{}:{}".format(
-            email,
-            json.dumps(data)
-        ))
-        self.sema.release()
 
+        # Get user choice(s) for the items they want to enter for
+        self.PRODUCTS_TO_ENTER = [] # This will be the array used to submit entries
+        choices = input(Fore.MAGENTA + "Enter the numbers of all the products you'd like to enter for, seperated by a space. (Example: 1 5 7 9 ): " + Fore.GREEN)
+        for choice in choices.split():
+            try:
+                self.PRODUCTS_TO_ENTER.append({"ItemNumber": items[eval(choice)]["id"]})
+            except Exception:
+                print(Fore.RED + f"There was an error with item: #{choice}. Skipping that item.")
+
+
+        # Show how many accounts have been made / are about to enter the raffle
+        print()
+        try:    
+            with open(path_to_created_accounts) as email_file:
+                print( Fore.BLUE + "Amount of accounts loaded: {} ({})".format(
+                    Fore.CYAN + str(len(email_file.readlines())), 
+                    self.settings["output_filename"])
+                )
+        except (FileExistsError, FileNotFoundError):
+            print(Fore.RED + "Could not find the file with sessions. Check repo fore help.")
+            time.sleep(100)
+            return
+
+
+        # Prompt how many tasks
+        num_tasks = eval(input(Fore.BLUE + "Enter amount of tasks at a time: " + Fore.WHITE + " "))
+        self.sema = threading.Semaphore(value=num_tasks)
+        threads = []
+
+
+        # Enter raffle
+        with open(path_to_created_accounts) as email_file: # Get the emails from the file the user named
+            for line in email_file.readlines():
+                if "error" not in line:
+                    self.sema.acquire()
+                    email = line.split(':')[2].strip("\n")
+                    sessionData = json.loads(":".join(line.split(":")[3:]))
+
+                    # If the acct was created via desktop, it will enter via that way
+                    # If the acct was created via app, it will enter via that way
+                    if sessionData["desktop"] == {}: # If there are no desktop cookies, means it was created via APP
+                        task = threading.Thread(target=app.SubmitRaffle,args=(self,email, sessionData))
+                    else:
+                        task = threading.Thread(target=desktop.SubmitRaffle,args=(self,email, sessionData))
+                    threads.append(task)
+                    task.start()
 
 
 Newegg()

newegg/create_account/mobile.py renamed to newegg/create_account/app.py

@@ -19,21 +19,25 @@
 from Crypto.Cipher import PKCS1_v1_5 as Cipher_pksc1_v1_5
 from Crypto.PublicKey import RSA
 from . import static_data, Accertify
-
+from threading import Thread
 POSTURL_ticketID = "https://secure.m.newegg.com//Application/UnifiedLogin/Landingpage"
 
 
 
 class Create_Account:
     def __init__(self, NeweggParent:object, email):
+        # I don't like how I'm passing these in. I'm going to change this soon.
+        logging.basicConfig(filename=NeweggParent.settings["output_filename"], level=logging.INFO)
         self.screenlock = NeweggParent.screenlock
         self.captcha_solver = NeweggParent.captcha_solver
+        self.sema = NeweggParent.sema
+        self.PATH_PROXIES  = NeweggParent.PATH_PROXIES
+
 
         # Define basic info
         self.current_task = email
         self.email = email
         self.logging_data = {}
-
         if NeweggParent.settings["password"]["generate_random"]:
             self.password = self.randompassword()
         else:
@@ -47,14 +51,32 @@ def __init__(self, NeweggParent:object, email):
         self.HEADERS_createAccount = static_data.HEADERS_createAccount
         self.HEADERS_afterCreate = static_data.HEADERS_afterCreate
 
+        # Update Headers
+        user_agent = random.choice(NeweggParent.settings["user_agents"]["mobile"])
+        self.HEADERS_getTicketID["User-Agent"] = user_agent
+        self.HEADERS_getFormKeys["User-Agent"] = user_agent
+        self.HEADERS_createAccount["User-Agent"] = user_agent
+        self.HEADERS_afterCreate["User-Agent"] = user_agent
+
+        self.start()
+
     def start(self):
         self.getProxy()
         self.get_ticket_id()
         if self.create_account():
             self.get_cookies()
-        return self.logging_data
+        
+        logging.info("{}:{}".format(
+            self.email,
+            json.dumps(self.logging_data)
+        ))
+        self.sema.release()
+        return
 
     def get_ticket_id(self):
+        '''
+        The get_ticket_id methods returns an ID that is used in POST URL's to create account
+        '''
         while True:
             try:
                 # Get Cookies
@@ -65,7 +87,6 @@ def get_ticket_id(self):
                 self.session.get(GETURL_getCookies, headers=self.HEADERS_getCookies)
 
 
-
                 # Get Ticket ID
                 payload = "Payload=%7B%22enableGustCheckout%22%3Afalse%2C%22regionCode%22%3A%22USA%22%2C%22LastLoginName%22%3A%22%22%2C%22themeStyle%22%3A0%2C%22userState%22%3A%22%7B%5C%22APPType%5C%22%3A%5C%22ios%5C%22%2C%5C%22path%5C%22%3A%5C%22SignUp%5C%22%7D%22%7D"
                 resp = self.session.post(POSTURL_ticketID, headers=self.HEADERS_getTicketID, data=payload, allow_redirects=False)
@@ -94,6 +115,9 @@ def get_ticket_id(self):
                 continue
 
     def create_account(self):
+        '''
+        The create_account is called when all the info is gather and creates accounts.
+        '''
         POSTURL_createAccount = f"https://secure.newegg.com/identity/api/SignUp?ticket={self.ticketID}"
         GETURL_tokenData = f"https://secure.newegg.com/identity/api/InitSignUp?ticket={self.ticketID}"
         self.HEADERS_createAccount["Referer"] = self.ticketURL
@@ -189,7 +213,7 @@ def create_account(self):
 
     def getProxy(self):
         # Load proxy from file
-        with open("./data/proxies.txt", "r") as file:
+        with open(self.PATH_PROXIES, "r") as file:
             proxies = file.readlines()
         if len(proxies) > 0:
             line = proxies[random.randint(0, len(proxies) - 1)].strip("\n").split(":")