Merge pull request #236 from davidteather/nightly

V3.4.6

.gitignore

@@ -15,4 +15,5 @@ dist/*
 *.egg-info
 .pytest_cache/*
 test.mp4
-test.txt
+test.txt
+.pytest_cache/*

TikTokApi/browser.py

@@ -3,7 +3,6 @@
 import random
 import time
 import string
-import atexit
 import requests
 import logging
 from threading import Thread
@@ -13,6 +12,11 @@
 
 from .get_acrawler import get_acrawler
 
+async_support = False
+def set_async():
+    global async_support
+    async_support = True
+
 class browser:
     def __init__(self, url, language='en', proxy=None, find_redirect=False, api_url=None, debug=False, newParams=False):
         self.url = url
@@ -48,12 +52,10 @@ def __init__(self, url, language='en', proxy=None, find_redirect=False, api_url=
             'handleSIGTERM': False,
             'handleSIGHUP': False
         }
-
-        try:
+        
+        if async_support:
             loop = asyncio.new_event_loop()
-
-            t = Thread(target=self.__start_background_loop, args=(loop, ))
-            t.setDaemon(True)
+            t = Thread(target=self.__start_background_loop, args=(loop, ), daemon=True)
             t.start()
             if find_redirect:
                 fut = asyncio.run_coroutine_threadsafe(self.find_redirect(), loop)
@@ -62,10 +64,24 @@ def __init__(self, url, language='en', proxy=None, find_redirect=False, api_url=
             else:
                 fut = asyncio.run_coroutine_threadsafe(self.start(), loop)
             fut.result()
-        except:
-            loop.close()
+        else:
+            try:
+                self.loop = asyncio.new_event_loop()
+                if find_redirect:
+                    self.loop.run_until_complete(self.find_redirect())
+                elif newParams:
+                    self.loop.run_until_complete(self.newParams())
+                else:
+                    self.loop.run_until_complete(self.start())
+            except:
+                self.loop.close()
 
-    async def newParams(self):
+    def __start_background_loop(self, loop):
+        asyncio.set_event_loop(loop)
+        loop.run_forever()
+
+
+    async def newParams(self) -> None:
         self.browser = await pyppeteer.launch(self.options)
         self.page = await self.browser.newPage()
         await self.page.goto("about:blank")
@@ -87,6 +103,8 @@ async def newParams(self):
         await self.browser.close()
         self.browser.process.communicate()
 
+        return 0
+
     async def start(self):
         self.browser = await pyppeteer.launch(self.options)
         self.page = await self.browser.newPage()
@@ -188,8 +206,4 @@ def __format_proxy(self, proxy):
             return None
 
     def __get_js(self, proxy=None):
-        return requests.get("https://sf16-muse-va.ibytedtos.com/obj/rc-web-sdk-gcs/acrawler.js", proxies=self.__format_proxy(proxy)).text
-
-    def __start_background_loop(self, loop):
-        asyncio.set_event_loop(loop)
-        loop.run_forever()
+        return requests.get("https://sf16-muse-va.ibytedtos.com/obj/rc-web-sdk-gcs/acrawler.js", proxies=self.__format_proxy(proxy)).text

TikTokApi/tiktok.py

@@ -1,4 +1,4 @@
-import asyncio
+
 import pyppeteer
 import random
 import requests

setup.py

@@ -8,7 +8,7 @@
 setuptools.setup(
   name = 'TikTokApi',         
   packages = ['TikTokApi'], 
-  version = '3.4.5',
+  version = '3.4.6',
   license='MIT',       
   description = 'The Unofficial TikTok API Wrapper in Python 3.',   
   author = 'David Teather',