simon987/ws_bucket_client
1
0
Fork 0
mirror of https://github.com/simon987/ws_bucket_client.git synced 2025-04-19 18:26:44 +00:00
Code Issues Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
simon987 2019-03-16 11:14:06 -04:00
parent 35f86961f0
commit b094db1967
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api.py
View File

@ -3,6 +3,7 @@ import hmac
import json import json
from email.utils import formatdate from email.utils import formatdate
from typing import BinaryIO from typing import BinaryIO
from urllib.parse import urlparse
import requests import requests
import websocket import websocket
@ -13,9 +14,10 @@ API_TIMEOUT = 10
class WsBucketApi: class WsBucketApi:
def __init__(self, url: str, secret: str): def __init__(self, url: str, secret: str, ws_scheme: str = "ws"):
self._url = url self._url = urlparse(url)
self._secret = secret.encode("utf8") self._secret = secret.encode("utf8")
self._ws_scheme = ws_scheme
def allocate(self, token: str, max_size: int, file_name: str): def allocate(self, token: str, max_size: int, file_name: str):
return self._http_post("/slot", { return self._http_post("/slot", {
@ -29,7 +31,7 @@ class WsBucketApi:
def upload(self, token: str, stream: BinaryIO, max_size: int): def upload(self, token: str, stream: BinaryIO, max_size: int):
ws = websocket.WebSocket() ws = websocket.WebSocket()
ws.connect("ws://" + self._url + "/upload", header={ ws.connect(self._ws_scheme + "://" + self._url.netloc + "/upload", header={
"X-Upload-Token": token, "X-Upload-Token": token,
}) })
@ -50,7 +52,7 @@ class WsBucketApi:
retries = 0 retries = 0
while retries < MAX_HTTP_RETRIES: while retries < MAX_HTTP_RETRIES:
try: try:
response = requests.post("http://" + self._url + endpoint, timeout=API_TIMEOUT, response = requests.post(self._url.scheme + "://", self._url.netloc + endpoint, timeout=API_TIMEOUT,
headers=headers, data=body.encode("utf8")) headers=headers, data=body.encode("utf8"))
return response return response
except Exception as e: except Exception as e:
@ -67,7 +69,7 @@ class WsBucketApi:
retries = 0 retries = 0
while retries < MAX_HTTP_RETRIES: while retries < MAX_HTTP_RETRIES:
try: try:
response = requests.get("http://" + self._url + endpoint, timeout=API_TIMEOUT, response = requests.get(self._url.scheme + "://" + self._url.netloc + endpoint, timeout=API_TIMEOUT,
headers=headers) headers=headers)
return response return response
except Exception as e: except Exception as e: