tiktokautouploader 4.1__py2.py3-none-any.whl → 4.2__py2.py3-none-any.whl

tiktokautouploader/Js_assets/login.js

@@ -1,5 +1,5 @@
 const { chromium } = require('playwright-extra')
-
+const fs = require('fs');
 
 const stealth = require('puppeteer-extra-plugin-stealth')()
 
@@ -18,8 +18,33 @@ async function checkForRedirect(page) {
 }
 
 (async () => {
+    const args = process.argv.slice(2);
+    let proxy = null;
+
+    for (let i = 0; i < args.length; i++) {
+        if (args[i] === '--proxy' && args[i + 1]) {
+            try {
+                fs.writeFileSync('proxy_data.txt', args[i+1]);
+                proxy = JSON.parse(args[i + 1]);  // Parse the proxy string as JSON
+            } catch (error) {
+                console.error('Failed to parse proxy argument:', error);
+            }
+        }
+    }
+
+    const browserOptions = {
+        headless: false,
+    };
+
+    if (proxy && proxy.server) {
+        browserOptions.proxy = {
+            server: proxy.server,
+            username: proxy.username || undefined,
+            password: proxy.password || undefined,
+        }
+    }
     let redirected = false;
-    const browser = await chromium.launch({ headless: false });
+    const browser = await chromium.launch(browserOptions);
     const page = await browser.newPage();
     await page.goto('https://www.tiktok.com/login');
 
@@ -32,9 +57,8 @@ async function checkForRedirect(page) {
 
     sleep(2000)
     const cookies = await page.context().cookies();
-    const fs = require('fs');
     fs.writeFileSync('TK_cookies.json', JSON.stringify(cookies, null, 2));
 
-    
+
     await browser.close();
 })();

tiktokautouploader/function.py

@@ -39,6 +39,9 @@ def check_expiry(accountname):
     for cookie in cookies:
         if cookie['name'] in ['sessionid', 'sid_tt', 'sessionid_ss', 'passport_auth_status']:
             expiry = cookie.get('expires')
+            # for manually extracted cookies
+            if not expiry:
+                expiry = cookie.get('expirationDate')
             cookies_expire.append(expiry < current_time)
 
     if all(cookies_expire):
@@ -46,9 +49,18 @@ def check_expiry(accountname):
 
     return expired
 
-def run_javascript():
+def run_javascript(proxy_data=None):
+    env_vars = {"PROXY": str(proxy_data) if proxy_data is not None else ""}
     js_file_path = pkg_resources.resource_filename(__name__, 'Js_assets/login.js')
-    result = subprocess.run(['node', js_file_path], capture_output=True, text=True)
+    proxy_argument = str(proxy_data) if proxy_data is not None else str({})
+    try:
+        result = subprocess.run(
+            ['node', js_file_path, '--proxy', proxy_argument],
+            capture_output=True,
+            text=True,
+        )
+    except Exception as e:
+        sys.exit(f"Error while running the JavaScript file, when trying to parse cookies: {e}")
     return result
 
 def install_js_dependencies():
@@ -59,9 +71,16 @@ def install_js_dependencies():
         print("JavaScript dependencies not found. Installing...")
         try:
             subprocess.run(['npm', 'install', '--silent'], cwd=js_dir, check=True)
-        except subprocess.CalledProcessError as e:
+        except Exception as e:
             print("An error occurred during npm installation.")
             print(f"Error details: {e}")
+
+            print("Trying to install JavaScript dependencies with shell...")
+            try:
+                subprocess.run(['npm', 'install', '--silent'], cwd=js_dir, check=True, shell=True)
+            except Exception as e:
+                print("An error occurred during shell npm installation.")
+                print(f"Error details: {e}")
     else:
         time.sleep(0.1)
 
@@ -146,7 +165,7 @@ def run_inference_on_image_tougher(image_path, object):
 
     #rk <- Roboflow key
     rk = 'kyHFbAWkOWfGz8fSEw8O'
-    
+
     CLIENT = InferenceHTTPClient(
         api_url="https://detect.roboflow.com",
         api_key=f"{rk}"
@@ -179,7 +198,6 @@ def run_inference_on_image(image_path):
 
     #rk <- Roboflow key
     rk = 'kyHFbAWkOWfGz8fSEw8O'
-
     CLIENT = InferenceHTTPClient(
         api_url="https://detect.roboflow.com",
         api_key=f"{rk}"
@@ -236,9 +254,37 @@ def click_on_objects(page, object_coords):
         page.mouse.click(x, y)
         time.sleep(0.5)
 
+def validate_proxy(proxy):
+    if not proxy:
+        return
 
+    if not isinstance(proxy, dict):
+        raise ValueError("Proxy must be a dictionary.")
 
-def upload_tiktok(video, description, accountname, hashtags=None, sound_name=None, sound_aud_vol='mix', schedule=None, day=None, copyrightcheck=False, suppressprint=False, headless=True, stealth=False):
+    if "server" not in proxy or not isinstance(proxy["server"], str):
+        raise ValueError("Proxy must contain a 'server' key with a string value.")
+
+    try:
+        proxies = {
+            "http": f'http://{proxy["server"]}/',
+            "http": f'https://{proxy["server"]}/',
+        }
+        if proxy.get("username"):
+            proxies = {
+                "http": f'http://{proxy.get("username")}:{proxy.get("password")}@{proxy["server"]}/',
+                "http": f'https://{proxy.get("username")}:{proxy.get("password")}@{proxy["server"]}/',
+            }
+
+        response = requests.get("https://www.google.com", proxies=proxies)
+        if response.status_code == 200:
+            print("Proxy is valid!")
+        else:
+            raise ValueError(f"Proxy test failed with status code: {response.status_code}")
+    except Exception as e:
+        raise ValueError(f"Invalid proxy configuration when trying to simple request: {e}")
+
+
+def upload_tiktok(video, description, accountname, hashtags=None, sound_name=None, sound_aud_vol='mix', schedule=None, day=None, copyrightcheck=False, suppressprint=False, headless=True, stealth=False, proxy=None):
 
     """
     UPLOADS VIDEO TO TIKTOK
@@ -246,15 +292,16 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
     video (str) -> path to video to upload
     description (str) -> description for video
     accountname (str) -> account to upload on
-    hashtags (str)(array) -> hashtags for video
-    sound_name (str) -> name of tik tok sound to use for video
-    sound_aud_vol (str) -> volume of tik tok sound, 'main', 'mix' or 'background', check documentation for more info -> https://github.com/haziq-exe/TikTokAutoUploader
-    schedule (str) -> format HH:MM, your local time to upload video
-    day (int) -> day to schedule video for, check documentation for more info -> https://github.com/haziq-exe/TikTokAutoUploader
-    copyrightcheck (bool) -> include copyright check or not; CODE FAILS IF FAIL COPYRIGHT CHECK
-    suppressprint (bool) -> True means function doesnt print anything to provide updates on progress
-    headless (bool) -> run in headless mode or not
-    stealth (bool) -> will wait second(s) before each operation
+    hashtags (str)(array)(opt) -> hashtags for video
+    sound_name (str)(opt) -> name of tik tok sound to use for video
+    sound_aud_vol (str)(opt) -> volume of tik tok sound, 'main', 'mix' or 'background', check documentation for more info -> https://github.com/haziq-exe/TikTokAutoUploader
+    schedule (str)(opt) -> format HH:MM, your local time to upload video
+    day (int)(opt) -> day to schedule video for, check documentation for more info -> https://github.com/haziq-exe/TikTokAutoUploader
+    copyrightcheck (bool)(opt) -> include copyright check or not; CODE FAILS IF FAIL COPYRIGHT CHECK
+    suppressprint (bool)(opt) -> True means function doesnt print anything to provide updates on progress
+    headless (bool)(opt) -> run in headless mode or not
+    stealth (bool)(opt) -> will wait second(s) before each operation
+    proxy (dict)(opt) -> proxy server to run code on, check documentation for more info -> https://github.com/haziq-exe/TikTokAutoUploader
     --------------------------------------------------------------------------------------------------------------------------------------------
     """
     try:
@@ -262,6 +309,11 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
     except:
         time.sleep(0.1)
 
+    try:
+        validate_proxy(proxy)
+    except Exception as e:
+        sys.exit(f'Error validating proxy: {e}')
+
     retries = 0
     cookie_read = False
     oldQ = 'N.A'
@@ -280,7 +332,7 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
     if cookie_read == False:
         install_js_dependencies()
         login_warning(accountname=accountname)
-        result = run_javascript()
+        result = run_javascript(proxy_data=proxy)
         os.rename('TK_cookies.json', f'TK_cookies_{accountname}.json')
 
         cookies, cookie_read = read_cookies(f"TK_cookies_{accountname}.json")
@@ -290,7 +342,7 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
  
     with sync_playwright() as p:
         
-        browser = p.firefox.launch(headless=headless)
+        browser = p.firefox.launch(headless=headless, proxy=proxy)
         context = browser.new_context()
         context.add_cookies(cookies)
         page = context.new_page()
@@ -471,8 +523,9 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
                         except:
                             if suppressprint == False:
                                 print(f"Tik tok hashtag not working for {hashtag}, moving onto next")
-                            for _ in range(len(hashtag)):
-                                page.keyboard.press("Backspace")
+                            page.keyboard.type(f"{hashtag[-1]} ")
+                            # for _ in range(len(hashtag)):
+                            #     page.keyboard.press("Backspace")
         
         if suppressprint == False:
             print("Description and Hashtags added")
@@ -485,7 +538,7 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
         time.sleep(0.2)
         if suppressprint == False:
             print("Tik tok done loading file onto servers")
-
+        
         if (schedule == None) and (day != None):
             sys.exit("ERROR: CANT SCHEDULE FOR ANOTHER DAY USING 'day' WITHOUT ALSO INCLUDING TIME OF UPLOAD WITH 'schedule'; PLEASE ALSO INCLUDE TIME WITH 'schedule' PARAMETER")
 
@@ -646,12 +699,13 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
                         break
                     if page.locator("span", has_text="Copyright issues detected.").is_visible():
                         sys.exit("COPYRIGHT CHECK FAILED: VIDEO SAVED AS DRAFT, COPYRIGHT AUDIO DETECTED FROM TIKTOK")
+            
 
             try:
                 if schedule == None:
                     if stealth == True:
                         time.sleep(1)
-                    page.click('button:has-text("Post")[aria-disabled="false"]', timeout=10000)
+                    page.click('button:has-text("Post")', timeout=10000)
                     uploaded = False
                     checks = 0
                     while uploaded == False:
@@ -695,7 +749,7 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
             time.sleep(0.5)
             page.close()
 
-            browser = p.chromium.launch(headless=headless)
+            browser = p.chromium.launch(headless=headless, proxy=proxy)
 
             context = browser.new_context()
             context.add_cookies(cookies)
@@ -819,7 +873,7 @@ def upload_tiktok(video, description, accountname, hashtags=None, sound_name=Non
                 if schedule == None:
                     if stealth == True:
                         time.sleep(1)
-                    page.click('button:has-text("Post")[aria-disabled="false"]', timeout=10000)
+                    page.click('button:has-text("Post")', timeout=10000)
                     uploaded = False
                     checks = 0
                     while uploaded == False:

{tiktokautouploader-4.1.dist-info → tiktokautouploader-4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tiktokautouploader
-Version: 4.1
+Version: 4.2
 Summary: Upload or schedule videos to TikTok with viral TikTok sounds and hashtags.
 Project-URL: Homepage, https://github.com/haziq-exe/TikTokAutoUploader
 Author-email: HAZIQ <haziqmk123@gmail.com>

tiktokautouploader-4.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+tiktokautouploader/__init__.py,sha256=u7OWCK_u68ST8dfrkSF4Yw44CJOzV9NXI6ASRuoDfmE,64
+tiktokautouploader/function.py,sha256=3_FNO_ayvEbuLECqet_VtOzVAsSGgMbkw2z0k_4hfzs,49215
+tiktokautouploader/Js_assets/login.js,sha256=NOuTNaGteOAhae-D6-WUH7aMKokCC6rO49EOzAo5vjQ,1690
+tiktokautouploader/Js_assets/package.json,sha256=aNbwSOpEpDUlplSuXugHVeN11riVwV4ofVkRPwHzbLs,273
+tiktokautouploader-4.2.dist-info/METADATA,sha256=m1lNmgDggM81_k3iBri-h7eAe8w7kogignTvj5ppSMs,5835
+tiktokautouploader-4.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+tiktokautouploader-4.2.dist-info/RECORD,,

tiktokautouploader-4.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-tiktokautouploader/__init__.py,sha256=u7OWCK_u68ST8dfrkSF4Yw44CJOzV9NXI6ASRuoDfmE,64
-tiktokautouploader/function.py,sha256=V0RU7usdPkZtsj_hR84LogRVjSWB1CeVjBAbVUYbF90,46887
-tiktokautouploader/Js_assets/login.js,sha256=SLhtPYo8ZfTRUnbR7Xqp084lSuAOqIWUxi75FlFH3vs,966
-tiktokautouploader/Js_assets/package.json,sha256=aNbwSOpEpDUlplSuXugHVeN11riVwV4ofVkRPwHzbLs,273
-tiktokautouploader-4.1.dist-info/METADATA,sha256=LGnXE25BKdSh4EBrHn1RCjs7bPpCBIyhu-LNF8oWEgc,5835
-tiktokautouploader-4.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-tiktokautouploader-4.1.dist-info/RECORD,,