support moyu new ai smart cube

csus4uwu · Aug 25, 2023 · 3204f8d · 3204f8d
1 parent 49af618
commit 3204f8d
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/src/js/bluetooth.js b/src/js/bluetooth.js
@@ -215,7 +215,9 @@ var GiikerCube = execMain(function() {
 			"NoRgnAHANATADDWJYwMxQOxiiEcfYgSK6Hpr4TYCs0IG1OEAbDszALpA",
 			"NoNg7ANATFIQnARmogLBRUCs0oAYN8U5J45EQBmFADg0oJAOSlUQF0g",
 			"NoRgNATGBs1gLABgQTjCeBWSUDsYBmKbCeMADjNnXxHIoIF0g",
-			"NoRg7ANAzBCsAMEAsioxBEIAc0Cc0ATJkgSIYhXIjhMQGxgC6QA"
+			"NoRg7ANAzBCsAMEAsioxBEIAc0Cc0ATJkgSIYhXIjhMQGxgC6QA",
+			"NoVgNAjAHGBMYDYCcdJgCwTFBkYVgAY9JpJYUsYBmAXSA",
+			"NoRgNAbAHGAsAMkwgMyzClH0LFcArHnAJzIqIBMGWEAukA"
 		];
 
 		function getKey(version, value) {
@@ -230,9 +232,10 @@ var GiikerCube = execMain(function() {
 			return key;
 		}
 
-		function getKeyV2(value) {
-			var key = JSON.parse(LZString.decompressFromEncodedURIComponent(KEYS[2]));
-			var iv = JSON.parse(LZString.decompressFromEncodedURIComponent(KEYS[3]));
+		function getKeyV2(value, ver) {
+			ver = ver || 0;
+			var key = JSON.parse(LZString.decompressFromEncodedURIComponent(KEYS[2 + ver * 2]));
+			var iv = JSON.parse(LZString.decompressFromEncodedURIComponent(KEYS[3 + ver * 2]));
 			for (var i = 0; i < 6; i++) {
 				key[i] = (key[i] + value[5 - i]) % 255;
 				iv[i] = (iv[i] + value[5 - i]) % 255;
@@ -371,7 +374,7 @@ var GiikerCube = execMain(function() {
 			});
 		}
 
-		function v2initKey(forcePrompt, isWrongKey) {
+		function v2initKey(forcePrompt, isWrongKey, ver) {
 			var savedMacMap = JSON.parse(kernel.getProp('giiMacMap', '{}'));
 			var mac = savedMacMap[deviceName];
 			if (!mac || forcePrompt) {
@@ -387,16 +390,16 @@ var GiikerCube = execMain(function() {
 				savedMacMap[deviceName] = mac;
 				kernel.setProp('giiMacMap', JSON.stringify(savedMacMap));
 			}
-			v2initDecoder(mac);
+			v2initDecoder(mac, ver);
 		}
 
-		function v2initDecoder(mac) {
+		function v2initDecoder(mac, ver) {
 			var value = [];
 			for (var i = 0; i < 6; i++) {
 				value.push(parseInt(mac.slice(i * 3, i * 3 + 2), 16));
 			}
-			var keyiv = getKeyV2(value);
-			DEBUG && console.log('[gancube] key', JSON.stringify(keyiv));
+			var keyiv = getKeyV2(value, ver);
+			DEBUG && console.log('[gancube] ver=', ver, ' key=', JSON.stringify(keyiv));
 			decoder = $.aes128(keyiv[0]);
 			decoder.iv = keyiv[1];
 		}
@@ -433,7 +436,7 @@ var GiikerCube = execMain(function() {
 			return v2sendRequest([10, 5, 57, 119, 0, 0, 1, 35, 69, 103, 137, 171, 0, 0, 0, 0, 0, 0, 0, 0]);
 		}
 
-		function v2init() {
+		function v2init(ver) {
 			DEBUG && console.log('[gancube] v2init start');
 			keyCheck = 0;
 			if (deviceMac) {
@@ -446,9 +449,9 @@ var GiikerCube = execMain(function() {
 					savedMacMap[deviceName] = deviceMac;
 					kernel.setProp('giiMacMap', JSON.stringify(savedMacMap));
 				}
-				v2initDecoder(deviceMac);
+				v2initDecoder(deviceMac, ver);
 			} else {
-				v2initKey(true);
+				v2initKey(true, false, ver);
 			}
 			return _service_v2data.getCharacteristics().then(function(chrcts) {
 				DEBUG && console.log('[gancube] v2init find chrcts', chrcts);
@@ -506,7 +509,7 @@ var GiikerCube = execMain(function() {
 					}
 				}
 				if (_service_v2data) {
-					return v2init();
+					return v2init((deviceName || '').startsWith('AiCube') ? 1 : 0);
 				}
 				if (_service_data && _service_meta) {
 					return v1init();
@@ -1076,6 +1079,8 @@ var GiikerCube = execMain(function() {
 					namePrefix: 'GAN'
 				}, {
 					namePrefix: 'MG'
+				}, {
+					namePrefix: 'AiCube'
 				}, {
 					namePrefix: 'GoCube'
 				}, {
@@ -1093,7 +1098,7 @@ var GiikerCube = execMain(function() {
 			if (device.name.startsWith('Gi') || device.name.startsWith('Mi Smart Magic Cube')) {
 				cube = GiikerCube;
 				return GiikerCube.init(device);
-			} else if (device.name.startsWith('GAN') || device.name.startsWith('MG')) {
+			} else if (device.name.startsWith('GAN') || device.name.startsWith('MG') || device.name.startsWith('AiCube')) {
 				cube = GanCube;
 				return GanCube.init(device);
 			} else if (device.name.startsWith('GoCube') || device.name.startsWith('Rubiks')) {