Merge pull request #85 from ItsRiprod/v0.10.0

Crucial v0.10.2 fixes
ItsRiprod · Dec 10, 2024 · c3b5da3 · c3b5da3
2 parents 0d4e549 + 5bb615d
commit c3b5da3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/DeskThingServer/package.json b/DeskThingServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deskthing",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "A DeskThing server UI to interface with the DeskThing car thing app",
   "main": "./out/main/index.js",
   "author": "Riprod",

diff --git a/DeskThingServer/src/main/services/client/websocket.ts b/DeskThingServer/src/main/services/client/websocket.ts
@@ -41,6 +41,8 @@ export const Clients: { client: Client; socket }[] = []
 let currentPort
 let currentAddress
 
+const alwaysAllow = ['preferences', 'ping', 'pong', 'manifest']
+
 const messageThrottles = new Map()
 const THROTTLE_DELAY = 300 // milliseconds
 
@@ -198,7 +200,7 @@ export const setupServer = async (): Promise<void> => {
        * they often send the same request at the same time (i.e. song at its end).
        * As most, if not all, of these requests are burst to every client, they can be grouped together.
        */
-      const alwaysAllow = ['get', 'set', 'update', 'delete']
+
       if (
         !messageThrottles.has(messageKey) ||
         now - messageThrottles.get(messageKey) > THROTTLE_DELAY ||

diff --git a/DeskThingServer/src/renderer/src/pages/Clients/Mapping/components/AvailableKeysComponent.tsx b/DeskThingServer/src/renderer/src/pages/Clients/Mapping/components/AvailableKeysComponent.tsx
@@ -49,7 +49,7 @@ const AvailableKeys: React.FC<AvailableKeysProps> = ({
                 handleKeyPress={handleModeClick}
                 Key={key}
                 currentKey={currentKey}
-                action={currentMapping.mapping[key.id][mode]}
+                action={currentMapping.mapping[key.id]?.[mode || EventMode.KeyDown] || undefined}
               />
             ))}
           </div>

diff --git a/DeskThingServer/src/renderer/src/pages/Clients/Mapping/pages/CarThingPage.tsx b/DeskThingServer/src/renderer/src/pages/Clients/Mapping/pages/CarThingPage.tsx
@@ -44,14 +44,14 @@ const CarThingPage: React.FC<PageProps> = ({
       <div className="flex -translate-x-12 flex-col h-1/3 items-center justify-center aspect-square">
         <div className="flex w-full h-full items-center justify-center">
           <Button
-            className={`flex hover:bg-zinc-700 items-center justify-center rounded-lg p-3 ${mode == EventMode.SwipeUp ? 'bg-zinc-800' : 'bg-zinc-900'}`}
-            onClick={() => onPress('Swipe', EventMode.SwipeUp)}
+            className={`flex hover:bg-zinc-700 items-center justify-center rounded-lg p-3 ${mode == EventMode.SwipeDown ? 'bg-zinc-800' : 'bg-zinc-900'}`}
+            onClick={() => onPress('Swipe', EventMode.SwipeDown)}
           >
             <ActionIcon
               className="w-fit h-fit"
               action={
                 currentMapping && miniplayerKeys.length > 0
-                  ? currentMapping.mapping['Swipe'][EventMode.SwipeUp]
+                  ? currentMapping.mapping['Swipe'][EventMode.SwipeDown]
                   : undefined
               }
             />
@@ -87,14 +87,14 @@ const CarThingPage: React.FC<PageProps> = ({
         </div>
         <div className="flex w-full h-full items-center justify-center">
           <Button
-            className={`flex hover:bg-zinc-700 items-center justify-center rounded-lg p-3 ${mode == EventMode.SwipeDown ? 'bg-zinc-800' : 'bg-zinc-900'}`}
-            onClick={() => onPress('Swipe', EventMode.SwipeDown)}
+            className={`flex hover:bg-zinc-700 items-center justify-center rounded-lg p-3 ${mode == EventMode.SwipeUp ? 'bg-zinc-800' : 'bg-zinc-900'}`}
+            onClick={() => onPress('Swipe', EventMode.SwipeUp)}
           >
             <ActionIcon
               className="w-fit h-fit"
               action={
                 currentMapping && miniplayerKeys.length > 0
-                  ? currentMapping.mapping['Swipe'][EventMode.SwipeDown]
+                  ? currentMapping.mapping['Swipe'][EventMode.SwipeUp]
                   : undefined
               }
             />