Sort json keys for custom layout ids (#1592)

ianyh · Jan 23, 2024 · 935efdc · 935efdc
1 parent a99d411
commit 935efdc
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/Amethyst/Layout/Layouts/CustomLayout.swift b/Amethyst/Layout/Layouts/CustomLayout.swift
@@ -153,7 +153,7 @@ class CustomLayout<Window: WindowType>: StatefulLayout<Window> {
             let window = JSWindow<Window>(id: id, window: layoutWindow)
             return partialResult.merging([layoutWindow.id: window]) { current, _ in return current }
         }
-        let jsWindowsArg = windows.map { window -> [String: Any] in
+        let jsWindowsArg = windows.map { window -> [String: Any?] in
             let jsWindow = jsWindows[window.id]!
             return [
                 "id": jsWindow.id,
@@ -162,7 +162,7 @@ class CustomLayout<Window: WindowType>: StatefulLayout<Window> {
             ]
         }
 
-        let extendedFrames: [[String: Any]]? = extendedFrameAssignments(windowSet, on: screen)?.compactMap { frameAssignmentOperation in
+        let extendedFrames: [[String: Any?]]? = extendedFrameAssignments(windowSet, on: screen)?.compactMap { frameAssignmentOperation in
             let frameAssignment = frameAssignmentOperation.frameAssignment
             guard let jsWindow = jsWindows[frameAssignment.window.id] else {
                 return nil
@@ -273,15 +273,20 @@ class CustomLayout<Window: WindowType>: StatefulLayout<Window> {
     }
 
     private func idHash(forWindowID windowID: WindowID) -> String? {
-        guard let encodedID = try? JSONEncoder().encode(windowID) else {
-            return nil
-        }
+        do {
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .sortedKeys
 
-        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-        encodedID.withUnsafeBytes {
-            _ = CC_SHA256($0.baseAddress, CC_LONG(encodedID.count), &hash)
+            let encodedID = try encoder.encode(windowID)
+            var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+            encodedID.withUnsafeBytes {
+                _ = CC_SHA256($0.baseAddress, CC_LONG(encodedID.count), &hash)
+            }
+            return hash.map { String(format: "%02hhx", $0) }.joined()
+        } catch {
+            log.warning("Failed to hash window id: \(error)")
+            return nil
         }
-        return hash.map { String(format: "%02hhx", $0) }.joined()
     }
 
     private func jsChange(forChange change: Change<Window>) -> [String: String] {