Skip to content

Remove unneeded variables #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unneeded variables #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions sonoff/sonoff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The domain of your component. Should be equal to the name of your component.
import logging, time, hmac, hashlib, random, base64, json, socket, requests, re, uuid
import logging, time, hmac, hashlib, base64, json, socket, requests, re
from datetime import timedelta

SCAN_INTERVAL = timedelta(seconds=60)
Expand All @@ -8,10 +8,6 @@
_LOGGER = logging.getLogger(__name__)


def gen_nonce(length=8):
"""Generate pseudorandom number."""
return ''.join([str(random.randint(0, 9)) for i in range(length)])

class Sonoff():
# def __init__(self, hass, email, password, api_region, grace_period):
def __init__(self, username, password, api_region, user_apikey=None, bearer_token=None, grace_period=600):
Expand All @@ -30,11 +26,7 @@ def __init__(self, username, password, api_region, user_apikey=None, bearer_toke
self._ws = None

# app details
self._app_version = '3.5.3'
self._appid = 'oeVkj2lYFGnJu5XUtWisfW4utiN4u9Mq'
self._model = 'iPhone10,6'
self._os = 'iOS'
self._rom_version = '11.1.2'
self._version = '6'

if user_apikey and bearer_token:
Expand Down Expand Up @@ -64,15 +56,8 @@ def do_login(self):

app_details = {
'password' : self._password,
'version' : self._version,
'ts' : int(time.time()),
'nonce' : gen_nonce(15),
'appid' : self._appid,
'imei' : str(uuid.uuid4()),
'os' : self._os,
'model' : self._model,
'romVersion': self._rom_version,
'appVersion': self._app_version
}

if re.match(r'[^@]+@[^@]+\.[^@]+', self._username):
Expand Down Expand Up @@ -163,14 +148,7 @@ def update_devices(self):
query_params = {
'lang': 'en',
'version': self._version,
'ts': int(time.time()),
'nonce': gen_nonce(15),
'appid': self._appid,
'imei': str(uuid.uuid4()),
'os': self._os,
'model': self._model,
'romVersion': self._rom_version,
'appVersion': self._app_version
}
r = requests.get('https://{}-api.coolkit.cc:8080/api/user/device'.format(self._api_region),
params=query_params,
Expand Down Expand Up @@ -226,16 +204,8 @@ def _get_ws(self):
payload = {
'action' : "userOnline",
'userAgent' : 'app',
'version' : 6,
'nonce' : gen_nonce(15),
'apkVesrion': "1.8",
'os' : 'ios',
'at' : self.get_bearer_token(),
'apikey' : self.get_user_apikey(),
'ts' : str(int(time.time())),
'model' : 'iPhone10,6',
'romVersion': '11.1.2',
'sequence' : str(time.time()).replace('.','')
}

self._ws.send(json.dumps(payload))
Expand Down Expand Up @@ -301,7 +271,6 @@ def switch(self, new_state, deviceid, outlet=None):
'deviceid' : str(deviceid),
'sequence' : str(time.time()).replace('.',''),
'controlType' : device['params']['controlType'] if 'controlType' in device['params'] else 4,
'ts' : 0
}

# this key is needed for a shared device
Expand Down