Merge branch 'main' into iratings

Author: tariknz

.gitignore

@@ -92,7 +92,7 @@ typings/
 out/
 
 *storybook.log
-test-data/*.png
+test-data/**/*.png
 test-data/unused
 src/**/tracks/*.svg
 asset-data

package-lock.json

@@ -24,8 +24,11 @@ export async function dumpCurrentTelemetry() {
         await writeFile(`${dirPath}/session.json`, session, 'utf-8'),
       ]);
       console.log(`Saved to: ${dirPath}`);
+      return { dirPath };
     } else {
       console.warn('No telemetry data received');
     }
   }
+  
+  return { dirPath: null };
 }

src/app/bridge/iracingSdk/dumpTelemetry.ts

@@ -3426,7 +3426,7 @@
         "CarClassPowerAdjust": "0.000 %",
         "CarClassDryTireSetLimit": "0 %",
         "CarClassColor": 16767577,
-        "CarClassEstLapTime": 113.6302,
+        "CarClassEstLapTime": 126.6302,
         "IRating": 1367,
         "LicLevel": 15,
         "LicSubLevel": 375,

src/app/bridge/iracingSdk/mock-data/session.json

@@ -3426,7 +3426,7 @@
         "CarClassPowerAdjust": "0.000 %",
         "CarClassDryTireSetLimit": "0 %",
         "CarClassColor": 16767577,
-        "CarClassEstLapTime": 113.6302,
+        "CarClassEstLapTime": 126.6302,
         "IRating": 1367,
         "LicLevel": 15,
         "LicSubLevel": 375,

src/app/irsdk/node/utils/mock-data/session.json

@@ -63,7 +63,7 @@ export class OverlayManager {
       title: `iRacing Dashies - ${title}`,
       transparent: true,
       frame: false,
-      focusable: false,
+      focusable: true, //for OpenKneeeboard/VR
       resizable: false,
       movable: false,
       roundedCorners: false,

src/app/overlayManager.ts

@@ -1,6 +1,8 @@
-import { nativeImage, Tray, Menu, app, globalShortcut } from 'electron';
+import { nativeImage, Tray, Menu, app, globalShortcut, desktopCapturer } from 'electron';
 import { TelemetrySink } from './bridge/iracingSdk/telemetrySink';
 import { OverlayManager } from './overlayManager';
+import { writeFile } from 'node:fs/promises';
+import path from 'node:path';
 
 class Taskbar {
   private tray: Tray;
@@ -65,11 +67,34 @@ class Taskbar {
     this.overlayManager.toggleLockOverlays();
   }
 
-  private saveTelemetry(): void {
-    if (process.platform === 'darwin') return;
-    import('./bridge/iracingSdk/dumpTelemetry').then(
-      async ({ dumpCurrentTelemetry }) => await dumpCurrentTelemetry()
-    );
+  private async saveTelemetry(): Promise<void> {
+    try {
+      // First, import and call dumpTelemetry to get the directory path
+      const { dumpCurrentTelemetry } = await import('./bridge/iracingSdk/dumpTelemetry');
+      const telemetryResult = await dumpCurrentTelemetry();
+      
+      // Check if dirPath exists and is not null
+      const dirPath = telemetryResult && 'dirPath' in telemetryResult ? telemetryResult.dirPath : null;
+      if (dirPath) {
+        // Capture all screens
+        const sources = await desktopCapturer.getSources({
+          types: ['screen'],
+          thumbnailSize: { width: 1920, height: 1080 } // Use a standard resolution
+        });
+        
+        // Save each screen as a separate file
+        await Promise.all(sources.map(async (source, index) => {
+          if (source.thumbnail) {
+            const screenshotPath = path.join(dirPath, `screenshot_${index + 1}.png`);
+            const pngData = source.thumbnail.toPNG();
+            await writeFile(screenshotPath, pngData);
+            console.log(`Screenshot ${index + 1} saved to: ${screenshotPath}`);
+          }
+        }));
+      }
+    } catch (error) {
+      console.error('Error capturing screenshots:', error);
+    }
   }
 
   private registerShortcuts(): void {

src/app/setupTaskbar.ts

@@ -69,5 +69,15 @@ export const defaultDashboard: DashboardLayout = {
         height: 330,
       },
     },
+    {
+      id: 'fastercarsfrombehind',
+      enabled: false,
+      layout: {
+        x: 700,
+        y: 200,
+        width: 400,
+        height: 40,
+      },
+    }
   ],
 };

src/app/storage/defaultDashboard.ts

@@ -14,6 +14,7 @@ import { Settings } from './components/Settings/Settings';
 import { Relative } from './components/Standings/Relative';
 import { Weather } from './components/Weather';
 import { TrackMap } from './components/TrackMap/TrackMap';
+import { FasterCarsFromBehind } from './components/FasterCarsFromBehind/FasterCarsFromBehind';
 import { EditMode } from './components/EditMode/EditMode';
 
 // TODO: type this better, right now the config comes from settings
@@ -25,6 +26,7 @@ const WIDGET_MAP: Record<string, (config: any) => React.JSX.Element> = {
   settings: Settings,
   map: TrackMap,
   weather: Weather,
+  fastercarsfrombehind: FasterCarsFromBehind,
 };
 
 const AppRoutes = () => {

src/frontend/App.tsx

@@ -0,0 +1,18 @@
+import { Meta, StoryObj } from '@storybook/react';
+import { FasterCarsFromBehind } from './FasterCarsFromBehind';
+import { TelemetryDecorator } from '../../../../.storybook/telemetryDecorator';
+
+export default {
+  component: FasterCarsFromBehind,
+  parameters: {
+    controls: {
+      exclude: ['telemetryPath'],
+    }
+  }
+} as Meta<typeof FasterCarsFromBehind>;
+
+type Story = StoryObj<typeof FasterCarsFromBehind>;
+
+export const Primary: Story = {
+  decorators: [TelemetryDecorator('/test-data/1747384033336')],
+};