Firmware update via MQTT

README.md

@@ -68,7 +68,7 @@ Please note Version 4 documentation is at [sming.readthedocs.io](https://sming.r
     * With clients supporting: HTTP, MQTT, WebSockets and SMTP.
     * And servers for: DNS, FTP, HTTP(+ WebSockets), Telnet.
     * With [SSL support](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/ssl/index.html) for all network clients and servers. Based on [axTLS](http://axtls.sourceforge.net/) and [BearSSL](https://www.bearssl.org/).
-    * Out of the box support for OTA over HTTPS.
+    * Over-The-Air(OTA) firmware upgrades via HTTP(S) and MQTT(S).
 * ESP8266 specific features.
     * Integrated boot loader [rboot](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/rboot/index.html) with support for 1MB ROMs, OTA firmware updating and ROM switching.
     * [Crash handlers](https://sming.readthedocs.io/en/latest/information/debugging.html) for analyzing/handling system restarts due to fatal errors or WDT resets.

Sming/Arch/Host/Components/hostlib/startup.cpp

@@ -241,7 +241,7 @@ int main(int argc, char* argv[])
 		}
 
 		if(config.pause != 0) {
-			hostmsg("If required, you may start terminal application(s) now");
+			host_debug_i("If required, you may start terminal application(s) now");
 			pause(config.pause);
 		}
 

Sming/Arch/Host/spiffs-two-roms.hw

@@ -0,0 +1,13 @@
+{
+	"name": "Two ROM slots with single SPIFFS",
+	"base_config": "spiffs",
+	"partitions": {
+		"rom1": {
+			"address": "0x108000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "ota_1",
+			"filename": "$(BLANK_BIN)"
+		}
+	}
+}

Sming/Libraries/OtaUpgradeMqtt/README.rst

@@ -0,0 +1,155 @@
+OTA Firmware Upgrade via MQTT
+=============================
+
+.. highlight:: c++
+
+Introduction
+------------
+
+This library allows Sming applications to upgrade their firmware Over-The-Air (OTA) using the MQTT protocol.
+MTQTT has less overhead compared to HTTP and can be used for faster delivery of application updates.
+
+Using
+-----
+
+1. Add ``COMPONENT_DEPENDS += OtaUpgradeMqtt`` to your application componenent.mk file.
+2. Add these lines to your application::
+
+      #include <OtaUpgrade/Mqtt/RbootPayloadParser.h>
+
+      #if ENABLE_OTA_ADVANCED
+      #include <OtaUpgrade/Mqtt/AdvancedPayloadParser.h>
+      #endif
+
+      MqttClient mqtt;
+
+      // Call when IP address has been obtained
+      void onIp(IpAddress ip, IpAddress mask, IpAddress gateway)
+      {
+         // ...
+
+         mqtt.connect(Url(MQTT_URL), "sming");
+
+      #if ENABLE_OTA_ADVANCED
+          /*
+           * The advanced parser suppors all firmware upgrades supported by the `OtaUpgrade` library.
+           * `OtaUpgrade` library provides firmware signing, firmware encryption and so on.
+           */
+          auto parser = new OtaUpgrade::Mqtt::AdvancedPayloadParser(APP_VERSION_PATCH);
+      #else
+          /*
+           * The command below uses class that stores the firmware directly
+           * using RbootOutputStream on a location provided by us
+           */
+          auto parser = new OtaUpgrade::Mqtt::RbootPayloadParser(part, APP_VERSION_PATCH);
+       #endif
+
+            mqtt.setPayloadParser([parser]
+            (MqttPayloadParserState& state, mqtt_message_t* message, const char* buffer, int length) -> int
+            {
+               return parser->parse(state, message, buffer, length);
+            });
+
+            String updateTopic = "a/test/u/4.3";
+            mqtt.subscribe(updateTopic);
+
+         // ...
+      }
+
+See the :sample:`Upgrade` sample application.
+
+Versioning Principles
+---------------------
+To simplify the OTA process we strongly recommend the following versioning principles for your application:
+
+1. Use `semantic versioning <https://semver.org/>`_.
+   If your current application version is 4.3.1 then 4 is the major, 3 is the minor and 1 is the patch version number.
+
+2. Every application firmware knows its version.
+
+3. An application with the same major and minor version should be compatible for update no matter what the patch number is.
+   If the new firmware is not compatible then a new minor or major version should be used.
+
+Theory Of Operation
+-------------------
+1. On a period of time the application connects to check if there is a new version of the firmware.
+   In your application this period has to be carefully selected so that OTA updates occur when the device has
+   enough resources: memory, space on flash, power and time to complete such an update. Also there should be no critical task running at the moment.
+   Depending on the size of the new firmware and the speed of the connection an update can take 10 to 20 seconds.
+
+2. The application connects via MQTT to a remote server and subscribes to a special topic. The topic is based on the
+   application id and its current version. If the current application id is ``test`` and version is ``4.3.1`` then the topic that will be used for OTA is ``a/test/u/4.3``.
+
+3. If there is a need to support both stable and unstable/nightly builds then the topic name can have `s` or `u` suffix. For example
+   all stable versions should be published and downloaded from the topic ``a/test/u/4.3/s``. For the unstable ones we can use the topic ``a/test/u/4.3/u``.
+   If an application is interested in both stable and unstable versions then it can subscribe using the following pattern ``a/test/u/4.3/+``.
+
+4. The application is waiting for new firmware. When the application is on battery than it makes sense to wait for a limited time and if there is no
+   message coming back to disconnect.
+
+Firmware packaging
+------------------
+The firmware update must come as one MQTT message. The MQTT protocol allows messages with a maximum size of 268435455 bytes approx 260MB.
+This should be perfectly enough for a device that has maximum 1MB available for an application ROM.
+
+One MQTT message contains:
+
+- patch version of the firmware
+- followed by the firmware data itself
+
+Based on the :envvar:`ENABLE_OTA_VARINT_VERSION` the patch version can be encoded either using one byte or a `varint <https://developers.google.com/protocol-buffers/docs/encoding#varints>`_.
+Based on :envvar:`ENABLE_OTA_ADVANCED` the firmware data can be either without any encoding or be signed and encrypted.
+
+To simplify the packaging this library comes with a tool called ``deployer``. To create a package type the following from your application::
+
+   make ota-pack OTA_PATCH_VERSION=127
+
+Replace 127 with the desired patch version.
+If the option ``OTA_PATCH_VERSION`` is omitted from the command line then the patch version will be generated automatically and it will contain the current unix timestamp.
+
+Once a package is created it can be deployed to the firmware MQTT server using the command below::
+
+   make ota-deploy MQTT_FIRMWARE_URL=mqtt://relser:[email protected]/a/test/u/4.3
+
+The ``MQTT_FIRMWARE_URL`` above specifies that
+
+- protocol is: mqtt without SSL. Allowed values here are ``mqtt`` and ``mqtts``. The latter uses SSL.
+- user is: relser
+- password is: relpassword
+- host is: attachix.com
+- path is: /a/test/u/4.3. The path without leading and ending slashes is used to generate the topic name ``a/test/u/4.3``.
+
+Make sure to replace the MQTT_FIRMWARE_URL value with your MQTT server credentials, host and topic.
+
+Security
+--------
+For additional security a standard SSL/TLS can be used
+
+1. The communication should be secured using standard SSL.
+
+2. To prove that the server is the correct one: The MQTT clients should pin the public key fingerprint on the server.
+   OR have a list of public key fingerprints that are allowed.
+
+3. To prove that the clients are allowed to connect: Every MQTT client should also have a client certificate that is signed by the server.
+
+Configuration
+-------------
+
+.. envvar:: ENABLE_OTA_VARINT_VERSION
+
+   Default: 1 (enabled)
+
+   If set to 1 the OTA upgrade mechanism and application will use a `varint <https://developers.google.com/protocol-buffers/docs/encoding#varints>`_
+   encoding for the patch version. Thus allowing unlimited number of patch versions. Useful for enumerating unstable/nightly releases.
+   A bit more difficult to read and write but allows for unlimited versions.
+
+   If set to 0 the OTA upgrade mechanism and application will use one byte for the patch version which will limit it to 256 possible patch versions.
+   Useful for enumarating stable releases. Easier to write and read but limited to 256 versions only.
+
+.. envvar:: ENABLE_OTA_ADVANCED
+
+   Default: 0 (disabled)
+
+   If set to 1 the library will work with OtaUpgradeStream which supports signature and encryption of the firmware data itself.
+   See :component:`OtaUpgrade` for details. In the application the AdvancedPayloadParser can be used to do the MQTT message handling.
+

Sming/Libraries/OtaUpgradeMqtt/api.rst

@@ -0,0 +1,8 @@
+OTA Upgrade over MQTT classes
+=============================
+
+.. doxygentypedef:: OtaUpgrade::Mqtt
+
+.. doxygenclass:: OtaUpgrade::Mqtt::PayloadParser
+.. doxygenclass:: OtaUpgrade::Mqtt::RbootPayloadParser
+.. doxygenclass:: OtaUpgrade::Mqtt::AdvancedPayloadParser

Sming/Libraries/OtaUpgradeMqtt/component.mk

@@ -0,0 +1,49 @@
+COMPONENT_SRCDIRS  := 
+COMPONENT_SRCFILES := src/PayloadParser.cpp src/RbootPayloadParser.cpp 
+COMPONENT_INCDIRS  := src/include
+
+# If enabled (set to 1) then we can use all sofisticated mechanisms to upgrade the firmware using the ``OtaUpgrade`` library.
+COMPONENT_VARS := ENABLE_OTA_ADVANCED
+ENABLE_OTA_ADVANCED ?= 0
+
+ifneq ($(ENABLE_OTA_ADVANCED),0)
+	COMPONENT_SRCFILES += src/AdvancedPayloadParser.cpp
+	COMPONENT_DEPENDS  := OtaUpgrade
+endif
+
+# If enabled (set to 1) then we can use unlimited number of patch versions
+COMPONENT_VARS += ENABLE_OTA_VARINT_VERSION 
+ENABLE_OTA_VARINT_VERSION ?= 1
+
+COMPONENT_CXXFLAGS := -DENABLE_OTA_ADVANCED=$(ENABLE_OTA_ADVANCED) \
+					  -DENABLE_OTA_VARINT_VERSION=$(ENABLE_OTA_VARINT_VERSION)
+
+##@Firmware Upgrade
+
+OTA_TOOLS := $(COMPONENT_PATH)/tools
+OTA_DEPLOYMENT_TOOL = $(OTA_TOOLS)/deployer/out/Host/debug/firmware/deployer$(TOOL_EXT)
+
+$(OTA_DEPLOYMENT_TOOL):
+	$(Q) $(MAKE) -C $(OTA_TOOLS)/deployer SMING_ARCH=Host ENABLE_CUSTOM_LWIP=2
+
+
+# SDP = Sming Deployment Pakage
+OTA_PACKAGE_EXT =.sdp
+
+OTA_PATCH_VERSION ?= $(shell date +%s)
+
+PACKAGE_IN = $(RBOOT_ROM_0_BIN)
+ifneq ($(ENABLE_OTA_ADVANCED), 0)
+	PACKAGE_IN = $(OTA_UPGRADE_FILE)
+endif
+PACKAGE_OUT = $(PACKAGE_IN)$(OTA_PACKAGE_EXT)
+
+.PHONY: ota-pack
+ota-pack: $(PACKAGE_OUT) ##Creates a deployment package from the current application (use OTA_PATCH_VERSION to specify the version number)
+
+$(PACKAGE_OUT): $(PACKAGE_IN) $(OTA_DEPLOYMENT_TOOL) 
+	$(Q) $(OTA_DEPLOYMENT_TOOL) pack --debug=0 --nonet -- $(PACKAGE_IN) $(PACKAGE_OUT) $(OTA_PATCH_VERSION) $(ENABLE_OTA_VARINT_VERSION)
+
+.PHONY: ota-deploy
+ota-deploy: $(PACKAGE_OUT) ##Uploads new firmware version of the current application (use MQTT_FIRMWARE_URL to specify the MQTT URL)
+	$(Q) $(OTA_DEPLOYMENT_TOOL) deploy --debug=0 -- $(PACKAGE_OUT) $(MQTT_FIRMWARE_URL)