Release v2.4.0

Dockerfile

@@ -0,0 +1,13 @@
+FROM phusion/baseimage:0.11
+
+RUN apt-get update && apt-get install -y sudo iproute2 iputils-ping
+
+RUN echo '* libraries/restart-without-asking boolean true' | sudo debconf-set-selections
+
+COPY docker/bin /usr/bin/
+
+COPY . /usr/bin/tuya-convert
+
+RUN cd /usr/bin/tuya-convert && ./install_prereq.sh
+
+RUN mkdir -p /etc/service/tuya && cd /etc/service/tuya && ln -s /usr/bin/config.sh run

README.md

@@ -32,6 +32,7 @@ These scripts were tested in
 * a Raspberry Pi 3B / 3B+ with Raspbian Stretch and its internal Wifi chip
 * a Raspberry Pi 3B+ + USB-WIFI with this image from [here](https://www.offensive-security.com/kali-linux-arm-images/)
 	https://images.offensive-security.com/arm-images/kali-linux-2018.4a-rpi3-nexmon-64.img.xz
+* Ubuntu 18.04.3 64Bit in VirtualBox on Win10 with a [cheap RTL8188CU Wifi Adapter](http://s.click.aliexpress.com/e/KrKIoPdI) connected to the VM
 
 Any Linux with a Wifi adapter which can act as an Access Point should also work. Please note that we have tested the Raspberry Pi with clean installations only. If you use your Raspberry Pi for anything else, we recommend using another SD card with a clean installation.
 
@@ -48,7 +49,7 @@ On January 28th, 2019, Tuya started [distributing a patch](https://www.heise.de/
 BE SURE THE FIRMWARE FITS YOUR DEVICE!
 1. Place your binary file in the `/files/` directory or use one of the included firmware images.
 
-	Currently a Tasmota [v7.0.0.3](https://github.com/arendst/Tasmota/releases) `tasmota-wifiman.bin` build is included. You can update to a [current version](http://thehackbox.org/tasmota) via OTA after the Tuya-Convert process completes successfully. Please note that while we include this for your convenience, we are not affiliated with the Tasmota project and cannot provide support for post installation issues. Please refer to [the respective project](https://github.com/arendst/Tasmota) for configuration and support.
+	Currently a [Tasmota](https://github.com/arendst/Tasmota) `tasmota-wifiman.bin` build is included in the Tuya-Convert package. You can update to the [current maintenance release](http://thehackbox.org/tasmota) via OTA after the flashing process completes successfully. The included binary does not have any specific hardware configured. Once flashed using Tuya-Convert you will need to configure your device(s) properly. Please note that while we include this firmware for your convenience, we are not affiliated with the Tasmota project and cannot provide support for post installation issues. Please refer to the [Tasmota project](https://github.com/arendst/Tasmota) and [its documentation](http://tasmota.com) for configuration and support.
 
 	An ESPurna [1.13.5](https://github.com/xoseperez/espurna/releases/tag/1.13.5) binary is also included (`espurna-base.bin`). Like before, the binary included does not have any specific hardware defined. Once flashed using Tuya-Convert you can update to the device-specific version via any of the means that ESPurna provides (OTA, web interface update, update via telnet or MQTT). Please refer to the [ESPurna project page](http://espurna.io) for more info and support.
 
@@ -69,6 +70,35 @@ BE SURE THE FIRMWARE FITS YOUR DEVICE!
 
 	If you flashed the included ESPurna firmware file, the procedure will be very similar. The device will broadcast a `ESPURNA-XXXXXX` access point. You will have to connect to it using the default password: `fibonacci`. Once connected open the browser to 192.168.4.1 and follow the initial configuration instructions. Then go to the WIFI tab and configure your home WiFi connection (remember to save) or go to the ADMIN tab to upgrade the firmware to the device-specific image. 
 
+## USING DOCKER
+You may want to use a docker image instead. Advantage of this solution: You don't have to install anything on your host (except docker), everything goes into the docker image.
+Requirements:
+* Linux computer with a wifi adapter
+* Secondary wifi device (e.g. smartphone)
+* docker is installed
+* docker-compose is installed
+
+Create docker image:
+* git clone https://github.com/ct-Open-Source/tuya-convert
+* cd tuya-convert
+* docker build -t tuya:latest .
+
+Setup docker-compose:
+* copy docker/docker-compose.sample.yml to a new folder you created, the file should be named docker-compose.yml
+* you may adjust this docker-compose.yml, if necessary:
+   * environment-variables may be different, for example network-adapter may be different from wlan0
+   * adjust the volume folder, where you want your backups stored
+
+Run the image:
+* go into the folder you copied docker-compose.yml
+* docker-compose up -d
+* docker-compose exec tuya start
+* tuya-convert now starts within docker
+
+Stop the image:
+* docker-compose exec tuya stop
+* docker-compose down 
+
 ## CONTRIBUTING
 
 This project is currently maintained by Colin Kuebler @kueblc

docker/bin/config.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo WLAN=$WLAN >/usr/bin/tuya-convert/config.txt
+echo AP=$AP >>/usr/bin/tuya-convert/config.txt
+echo GATEWAY=$GATEWAY >>/usr/bin/tuya-convert/config.txt

docker/bin/start

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd /usr/bin/tuya-convert
+./start_flash.sh

docker/bin/stop

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd /usr/bin/tuya-convert
+./stop_flash.sh

docker/docker-compose.sample.yml

@@ -0,0 +1,12 @@
+version: '3'
+services:
+  tuya:
+    image: tuya:latest
+    privileged: true
+    network_mode: "host"
+    environment:
+      - WLAN=wlan0
+      - AP=vtrust-flash
+      - GATEWAY=10.42.42.1
+    volumes:
+      - ./data/backups:/usr/bin/tuya-convert/backups

install_prereq.sh

@@ -3,18 +3,8 @@
 set -e
 
 sudo apt-get update
-sudo apt-get install -y git iw dnsmasq hostapd screen curl build-essential python-pip python3-pip python-setuptools python3-setuptools python-wheel python3-wheel python-dev python3-dev mosquitto haveged net-tools libssl-dev
+sudo apt-get install -y git iw dnsmasq hostapd screen curl build-essential python3-pip python3-setuptools python3-wheel python3-dev mosquitto haveged net-tools libssl-dev
 
-PY3_DEPENDENCIES="paho-mqtt pyaes tornado git+https://github.com/M4dmartig4n/sslpsk.git pycrypto"
-PY2_DEPENDENCIES="git+https://github.com/M4dmartig4n/sslpsk.git pycrypto"
-
-if python3 -c 'import sys; exit(0) if sys.version_info.major == 3 and sys.version_info.minor < 7 else exit(1)' ;
-then
-	sudo -H pip3 install $PY3_DEPENDENCIES
-	sudo -H pip2 install $PY2_DEPENDENCIES
-else
-	sudo -H python3 -m pip install $PY3_DEPENDENCIES
-	sudo -H python2 -m pip install $PY2_DEPENDENCIES
-fi
+sudo -H python3 -m pip install paho-mqtt tornado git+https://github.com/drbild/sslpsk.git@use-byte-string-for-identity-hints pycryptodomex
 
 echo "Ready to start upgrade"