Random auth keys

Remember last device

Author: tkashkin

data/com.github.tkashkin.boiler.gschema.xml

@@ -8,4 +8,16 @@
 			<default>-1</default>
 		</key>
 	</schema>
+
+	<schema path="/com/github/tkashkin/boiler/devices/" id="com.github.tkashkin.boiler.devices" gettext-domain="com.github.tkashkin.boiler">
+		<key name="last-device" type="s">
+			<default>''</default>
+		</key>
+	</schema>
+
+	<schema path="/com/github/tkashkin/boiler/dev/redmond/rk-g2xx/" id="com.github.tkashkin.boiler.dev.redmond.rk-g2xx" gettext-domain="com.github.tkashkin.boiler">
+		<key name="auth-key" type="s">
+			<default>''</default>
+		</key>
+	</schema>
 </schemalist>

data/screenshots/connect.png

@@ -13,5 +13,5 @@ Standards-Version: 4.1.4
 
 Package: com.github.tkashkin.boiler
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bluez, bluez-tools
+Depends: ${misc:Depends}, ${shlibs:Depends}, bluez
 Description: Simple app to control Redmond Skykettle RK-G200S

data/screenshots/kettle_100.png

@@ -39,6 +39,13 @@ namespace Boiler
 			Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.GETTEXT_DIR);
 			Intl.textdomain(ProjectConfig.GETTEXT_PACKAGE);
 
+			var rk_g2xx_auth = Settings.Dev.Redmond.RK_G2XX.get_instance();
+			if(rk_g2xx_auth.auth_key == "")
+			{
+				var bytes = Utils.random_bytes(8);
+				rk_g2xx_auth.auth_key = Converter.bin_to_hex(bytes, ' ');
+			}
+
 			return app.run(args);
 		}
 	}

data/screenshots/kettle_31.png

@@ -7,10 +7,16 @@ public abstract class Boiler.Devices.Abstract.BTKettle: Object
 	public Bluez.Device bt_device { get; construct; }
 	public Bluez.Manager btmgr { get; construct; }
 
+	public string name { get; protected set; default = ""; }
+	public string description { get; protected set; default = ""; }
+	public string status { get; protected set; default = ""; }
+	public string? pairing_info { get; protected set; default = null; }
+
+	public bool is_paired { get; protected set; default = true; }
 	public bool is_connected { get; protected set; default = false; }
-	public int temperature { get; protected set; default = -1; }
+
 	public bool is_boiling { get; protected set; default = false; }
-	public string status { get; protected set; default = ""; }
+	public int temperature { get; protected set; default = -1; }
 
 	public abstract void start_boiling();
 	public abstract void stop_boiling();

data/screenshots/kettle_60.png

@@ -6,8 +6,13 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 {
 	public const string[] DEVICES = { "RK-G200S", "RK-G210S", "RK-G211S" };
 
+	private uint8[] auth_key = DEFAULT_AUTH_KEY;
+
 	private bool is_authenticated = false;
+
+	private bool auth_thread_running = false;
 	private bool status_thread_running = false;
+
 	private uint8 counter = 0;
 
 	private HashTable<string, Variant> _params = new HashTable<string, Variant>(str_hash, null);
@@ -19,6 +24,20 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 	{
 		Object(bt_device: device, btmgr: btmgr);
 
+		name = bt_device.name;
+		description = bt_device.address;
+		pairing_info = _("Your PC is not paired to the kettle.\nHold kettle power button for 5 seconds");
+
+		var key = Boiler.Settings.Dev.Redmond.RK_G2XX.get_instance().auth_key;
+
+		if(key != "")
+		{
+			if(!Converter.hex_to_bin(key, out auth_key, ' '))
+			{
+				auth_key = DEFAULT_AUTH_KEY;
+			}
+		}
+
 		bt_connect();
 	}
 
@@ -143,23 +162,35 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 	{
 		log("Authenticating...");
 
-		while(true)
-		{
-			if(!is_connected) return;
-
-			var res = send_command(Command.AUTH, AUTH_KEY);
-			if(res.length < 4 || res[3] == 0)
-			{
-				log("Authentication failed, retrying...");
-			}
-			else
+		if(auth_thread_running) return;
+		new Thread<void*>("RK-G2XX-auth-thread", () => {
+			while(true)
 			{
-				log("Authentication succeeded");
-				is_authenticated = true;
-				start_status_thread();
-				break;
+				auth_thread_running = true;
+				if(!is_connected) break;
+
+				var res = send_command(Command.AUTH, auth_key);
+				if(res.length < 4 || res[3] == 0)
+				{
+					log("Authentication failed, retrying...");
+					is_paired = false;
+					Thread.usleep(1000000);
+				}
+				else
+				{
+					log("Authentication succeeded");
+					is_authenticated = true;
+					is_paired = true;
+					description = @"$(bt_device.address) (fw $(get_fw_version()))";
+					start_status_thread();
+					break;
+				}
 			}
-		}
+
+			auth_thread_running = false;
+
+			return null;
+		});
 	}
 
 	public override void start_boiling()
@@ -177,6 +208,13 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 		is_boiling = false;
 	}
 
+	private string get_fw_version()
+	{
+		log("Getting firmware version...");
+		var res = send_command(Command.FW_VERSION, {});
+		return @"$(res[3]).$(res[4])";
+	}
+
 	private void start_status_thread()
 	{
 		if(status_thread_running) return;
@@ -213,13 +251,13 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 	private const string RES_CHAR_UUID     = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
 	private const string CMD_DESC_UUID     = "00002902-0000-1000-8000-00805f9b34fb";
 
-	private const uint8[] COMMAND_START = { 0x55 };
-	private const uint8[] COMMAND_END   = { 0xAA };
-	private const uint8[] AUTH_KEY      = { 0xB5, 0x4C, 0x75, 0xB1, 0xB4, 0x0C, 0x88, 0xEF }; // maybe random
+	private const uint8[] COMMAND_START    = { 0x55 };
+	private const uint8[] COMMAND_END      = { 0xAA };
+	private const uint8[] DEFAULT_AUTH_KEY = { 0xB5, 0x4C, 0x75, 0xB1, 0xB4, 0x0C, 0x88, 0xEF };
 
 	private enum Command
 	{
-		AUTH, STATUS, START_BOILING, STOP_BOILING;
+		AUTH, STATUS, START_BOILING, STOP_BOILING, FW_VERSION;
 
 		public uint8 byte()
 		{
@@ -229,6 +267,7 @@ public class Boiler.Devices.Kettle.Redmond.RK_G2XX: Boiler.Devices.Abstract.BTKe
 				case Command.STATUS:        return 0x06;
 				case Command.START_BOILING: return 0x03;
 				case Command.STOP_BOILING:  return 0x04;
+				case Command.FW_VERSION:    return 0x01;
 			}
 			return 0x00;
 		}

data/screenshots/kettle_90.png

@@ -38,6 +38,7 @@ shared_sources = [
 	icons_gresource,
 	css_gresource,
 
+	'utils/Utils.vala',
 	'utils/Settings.vala',
 	'utils/Converter.vala',
 

debian/control

@@ -37,11 +37,25 @@ class Boiler.UI.Views.Connect.DeviceRow: Gtk.ListBoxRow
 		{
 			var connect_btn = new Button.with_label(_("Connect"));
 
+			var settings = Boiler.Settings.Devices.get_instance();
+
 			connect_btn.clicked.connect(() => {
 				kettle = Devices.connect(device);
-				if(kettle != null) connected(kettle);
+				if(kettle != null)
+				{
+					settings.last_device = device.address;
+					connected(kettle);
+				}
 			});
 
+			if(settings.last_device == device.address)
+			{
+				Idle.add(() => {
+					connect_btn.clicked();
+					return Source.REMOVE;
+				});
+			}
+
 			hbox.add(connect_btn);
 		}
 

src/app.vala

@@ -17,9 +17,12 @@ namespace Boiler.UI.Views.Kettle
 		private Label temp_label;
 		private Label boil_label;
 
-		private Label address_label;
+		private Label title_label;
+		private Label description_label;
 		private Spinner spinner;
 
+		private InfoBar pairing_info;
+
 		private CssProvider? temp_style = new CssProvider();
 		private CssProvider? btn_temp_style = new CssProvider();
 		private bool updating = false;
@@ -32,14 +35,14 @@ namespace Boiler.UI.Views.Kettle
 
 		construct
 		{
-			var title_label = new Label(kettle.bt_device.name);
+			title_label = new Label(kettle.name);
 			title_label.get_style_context().add_class(Granite.STYLE_CLASS_PRIMARY_LABEL);
 			title_label.hexpand = true;
 
-			address_label = new Label(kettle.bt_device.address);
-			address_label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
-			address_label.get_style_context().add_class("small");
-			address_label.hexpand = true;
+			description_label = new Label(kettle.description);
+			description_label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
+			description_label.get_style_context().add_class("small");
+			description_label.hexpand = true;
 
 			temp_label = new Label("");
 			boil_label = new Label("");
@@ -71,16 +74,44 @@ namespace Boiler.UI.Views.Kettle
 			spinner.set_size_request(16, 16);
 			spinner.halign = Align.END;
 
-			attach(title_label, 0, 0, 3, 1);
-			attach(address_label, 0, 1, 3, 1);
-			attach(image, 0, 0, 1, 2);
-			attach(spinner, 2, 0, 1, 2);
-			attach(boil_btn, 1, 2, 1, 1);
+			if(kettle.pairing_info != null)
+			{
+				pairing_info = new InfoBar();
+				pairing_info.show_close_button = false;
+				pairing_info.margin_bottom = 4;
+				pairing_info.message_type = MessageType.WARNING;
+				pairing_info.get_content_area().add(new Label(kettle.pairing_info));
+
+				#if GTK_3_22
+				pairing_info.revealed = false;
+				#else
+				pairing_info.visible = false;
+				#endif
+
+				kettle.notify["is-paired"].connect(() => {
+					#if GTK_3_22
+					pairing_info.revealed = !kettle.is_paired;
+					#else
+					pairing_info.visible = !kettle.is_paired;
+					#endif
+				});
+
+				attach(pairing_info, 0, 0, 3, 1);
+			}
+
+			attach(title_label, 0, 1, 3, 1);
+			attach(description_label, 0, 2, 3, 1);
+			attach(image, 0, 1, 1, 2);
+			attach(spinner, 2, 1, 1, 2);
+			attach(boil_btn, 1, 3, 1, 1);
+
+			kettle.notify["name"].connect(update);
+			kettle.notify["description"].connect(update);
+			kettle.notify["status"].connect(update);
 
 			kettle.notify["is-connected"].connect(update);
 			kettle.notify["temperature"].connect(update);
 			kettle.notify["is-boiling"].connect(update);
-			kettle.notify["status"].connect(update);
 
 			update();
 
@@ -108,14 +139,17 @@ namespace Boiler.UI.Views.Kettle
 
 				lock(kettle)
 				{
-					boil_btn.sensitive = kettle.is_connected;
-					spinner.active = !kettle.is_connected;
+					boil_btn.sensitive = kettle.is_connected && kettle.is_paired;
+					spinner.active = !kettle.is_connected || !kettle.is_paired;
 					spinner.queue_draw();
 
 					boil_btn.active = kettle.is_connected && kettle.is_boiling;
 					temp_label.label = kettle.temperature > 0 ? @"$(kettle.temperature) \u2103" : "";
 					boil_label.label = kettle.is_boiling ? _("Disable") : _("Enable");
-					address_label.tooltip_text = kettle.status;
+
+					title_label.label = kettle.name;
+					description_label.label = kettle.description;
+					description_label.tooltip_text = kettle.status;
 
 					if(window == null || window.get_toplevel() == null)
 					{

src/devices/abstract/BTKettle.vala

@@ -23,4 +23,44 @@ namespace Boiler.Settings
 			return instance;
 		}
 	}
+
+	public class Devices: Granite.Services.Settings
+	{
+		public string last_device { get; set; }
+
+		public Devices()
+		{
+			base(ProjectConfig.PROJECT_NAME + ".devices");
+		}
+
+		private static Devices? instance;
+		public static unowned Devices get_instance()
+		{
+			if(instance == null)
+			{
+				instance = new Devices();
+			}
+			return instance;
+		}
+	}
+
+	public class Dev.Redmond.RK_G2XX: Granite.Services.Settings
+	{
+		public string auth_key { get; set; }
+
+		public RK_G2XX()
+		{
+			base(ProjectConfig.PROJECT_NAME + ".dev.redmond.rk-g2xx");
+		}
+
+		private static RK_G2XX? instance;
+		public static unowned RK_G2XX get_instance()
+		{
+			if(instance == null)
+			{
+				instance = new RK_G2XX();
+			}
+			return instance;
+		}
+	}
 }

src/devices/kettle/redmond/RK_G2XX.vala

@@ -0,0 +1,16 @@
+using GLib;
+
+namespace Boiler.Utils
+{
+	public uint8[] random_bytes(uint length)
+	{
+		uint8[] bytes = new uint8[length];
+
+		for(uint i = 0; i < length; i++)
+		{
+			bytes[i] = (uint8) Random.int_range(0, 256);
+		}
+
+		return bytes;
+	}
+}