dashcam 1.0.1-beta.2 → 1.0.1-beta.22

package/lib/tracking/LogsTracker.js

@@ -55,6 +55,7 @@ export class LogsTracker {
 
     this.files[filePath] = {
       status,
+      filePath, // Store file path for later reference
       unsubscribe: this.fileTrackerManager.subscribe(filePath, callback),
     };
     
@@ -98,13 +99,25 @@ export class LogsTracker {
 
   getStatus() {
     let items = [];
+    let filePathMap = {};
+    
     if (this.isWatchOnly) {
-      items = Object.keys(this.files).map((filePath) => ({
-        ...this.fileTrackerManager.getStats(filePath),
-        item: this.fileToIndex[filePath],
-      }));
+      items = Object.keys(this.files).map((filePath) => {
+        const index = this.fileToIndex[filePath];
+        filePathMap[index] = filePath;
+        return {
+          ...this.fileTrackerManager.getStats(filePath),
+          item: index, // Keep numeric index to match events
+        };
+      });
     } else {
-      items = Object.values(this.files).map(({ status }) => status);
+      items = Object.values(this.files).map(({ status, filePath }) => {
+        const index = status.item;
+        filePathMap[index] = filePath;
+        return {
+          ...status,
+        };
+      });
     }
 
     const totalCount = items.reduce((acc, status) => acc + status.count, 0);
@@ -112,11 +125,12 @@ export class LogsTracker {
     return [
       {
         id: 'CLI',
-        name: 'CLI',
+        name: 'File Logs', // More descriptive name
         type: 'cli',
         fileLocation: this.fileLocation,
         items: items,
         count: totalCount,
+        filePathMap: filePathMap, // Include mapping for UI to display file paths
       },
     ];
   }
@@ -126,7 +140,7 @@ export class LogsTracker {
     const status = this.getStatus();
     return status.length > 0 ? status[0] : {
       id: 'CLI',
-      name: 'CLI', 
+      name: 'File Logs', 
       type: 'cli',
       fileLocation: this.fileLocation,
       items: [],

package/lib/tracking/icons/index.js

@@ -20,8 +20,9 @@ async function ensureIconModule() {
     const windowsModule = await import("./windows.js");
     getIconAsBuffer = windowsModule.getIconAsBuffer;
   } else {
-    // Linux fallback
-    getIconAsBuffer = () => null;
+    // Linux support
+    const linuxModule = await import("./linux.js");
+    getIconAsBuffer = linuxModule.getIconAsBuffer;
   }
   
   iconModuleLoaded = true;

package/lib/tracking/icons/linux.js

@@ -0,0 +1,277 @@
+import { logger } from "../../logger.js";
+import { execa } from "execa";
+import fs from "fs";
+import path from "path";
+import os from "os";
+
+/**
+ * Find icon for a Linux application using various strategies
+ */
+const findLinuxIcon = async (appName) => {
+  // Strategy 1: Look for .desktop file
+  const desktopFile = await findDesktopFile(appName);
+  if (desktopFile) {
+    const iconName = await extractIconFromDesktop(desktopFile);
+    if (iconName) {
+      const iconPath = await findIconInTheme(iconName);
+      if (iconPath) {
+        logger.debug("Found icon via .desktop file", { appName, iconPath });
+        return iconPath;
+      }
+    }
+  }
+
+  // Strategy 2: Try to find icon directly in icon themes
+  const iconPath = await findIconInTheme(appName);
+  if (iconPath) {
+    logger.debug("Found icon in theme", { appName, iconPath });
+    return iconPath;
+  }
+
+  // Strategy 3: Common application paths
+  const commonPaths = [
+    `/usr/share/pixmaps/${appName}.png`,
+    `/usr/share/pixmaps/${appName}.svg`,
+    `/usr/share/icons/hicolor/48x48/apps/${appName}.png`,
+    `/usr/share/icons/hicolor/scalable/apps/${appName}.svg`,
+  ];
+
+  for (const iconPath of commonPaths) {
+    if (fs.existsSync(iconPath)) {
+      logger.debug("Found icon in common path", { appName, iconPath });
+      return iconPath;
+    }
+  }
+
+  logger.debug("No icon found for Linux app", { appName });
+  return null;
+};
+
+/**
+ * Find .desktop file for an application
+ */
+const findDesktopFile = async (appName) => {
+  const desktopDirs = [
+    "/usr/share/applications",
+    "/usr/local/share/applications",
+    path.join(os.homedir(), ".local/share/applications"),
+  ];
+
+  // Try exact match first
+  for (const dir of desktopDirs) {
+    const desktopFile = path.join(dir, `${appName}.desktop`);
+    if (fs.existsSync(desktopFile)) {
+      return desktopFile;
+    }
+  }
+
+  // Try case-insensitive search
+  for (const dir of desktopDirs) {
+    try {
+      if (!fs.existsSync(dir)) continue;
+      
+      const files = fs.readdirSync(dir);
+      const match = files.find(
+        (f) => f.toLowerCase() === `${appName.toLowerCase()}.desktop`
+      );
+      if (match) {
+        return path.join(dir, match);
+      }
+    } catch (error) {
+      logger.debug("Error reading desktop directory", { dir, error: error.message });
+    }
+  }
+
+  return null;
+};
+
+/**
+ * Extract icon name from .desktop file
+ */
+const extractIconFromDesktop = async (desktopFilePath) => {
+  try {
+    const content = fs.readFileSync(desktopFilePath, "utf8");
+    const iconMatch = content.match(/^Icon=(.+)$/m);
+    if (iconMatch) {
+      return iconMatch[1].trim();
+    }
+  } catch (error) {
+    logger.debug("Error reading desktop file", { 
+      desktopFilePath, 
+      error: error.message 
+    });
+  }
+  return null;
+};
+
+/**
+ * Find icon in XDG icon themes
+ */
+const findIconInTheme = async (iconName) => {
+  // Common icon theme locations and sizes
+  const iconThemes = ["hicolor", "gnome", "Adwaita", "breeze", "oxygen"];
+  const iconSizes = ["48x48", "64x64", "scalable", "128x128", "256x256"];
+  const iconFormats = ["png", "svg", "xpm"];
+
+  const searchPaths = [
+    "/usr/share/icons",
+    "/usr/local/share/icons",
+    path.join(os.homedir(), ".local/share/icons"),
+    path.join(os.homedir(), ".icons"),
+  ];
+
+  for (const basePath of searchPaths) {
+    if (!fs.existsSync(basePath)) continue;
+
+    for (const theme of iconThemes) {
+      const themePath = path.join(basePath, theme);
+      if (!fs.existsSync(themePath)) continue;
+
+      for (const size of iconSizes) {
+        const sizePath = path.join(themePath, size, "apps");
+        if (!fs.existsSync(sizePath)) continue;
+
+        for (const format of iconFormats) {
+          const iconPath = path.join(sizePath, `${iconName}.${format}`);
+          if (fs.existsSync(iconPath)) {
+            return iconPath;
+          }
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+/**
+ * Convert image to PNG if needed
+ */
+const convertToPng = async (iconPath) => {
+  const ext = path.extname(iconPath).toLowerCase();
+  
+  // If already PNG, read and return
+  if (ext === ".png") {
+    return fs.readFileSync(iconPath);
+  }
+
+  // For SVG, try to convert using ImageMagick or rsvg-convert
+  if (ext === ".svg") {
+    const tmpPngPath = path.join(os.tmpdir(), `icon-${Date.now()}.png`);
+    
+    try {
+      // Try rsvg-convert first (commonly available on Linux)
+      await execa("rsvg-convert", [
+        "-w", "48",
+        "-h", "48",
+        "-o", tmpPngPath,
+        iconPath
+      ]);
+      
+      const buffer = fs.readFileSync(tmpPngPath);
+      fs.unlinkSync(tmpPngPath);
+      return buffer;
+    } catch (error) {
+      logger.debug("rsvg-convert failed, trying ImageMagick", { error: error.message });
+      
+      try {
+        // Fallback to ImageMagick convert
+        await execa("convert", [
+          "-background", "none",
+          "-resize", "48x48",
+          iconPath,
+          tmpPngPath
+        ]);
+        
+        const buffer = fs.readFileSync(tmpPngPath);
+        fs.unlinkSync(tmpPngPath);
+        return buffer;
+      } catch (convertError) {
+        logger.debug("ImageMagick convert failed", { error: convertError.message });
+        
+        // Clean up temp file if it exists
+        if (fs.existsSync(tmpPngPath)) {
+          fs.unlinkSync(tmpPngPath);
+        }
+        
+        return null;
+      }
+    }
+  }
+
+  // For XPM, try ImageMagick
+  if (ext === ".xpm") {
+    const tmpPngPath = path.join(os.tmpdir(), `icon-${Date.now()}.png`);
+    
+    try {
+      await execa("convert", [
+        "-background", "none",
+        "-resize", "48x48",
+        iconPath,
+        tmpPngPath
+      ]);
+      
+      const buffer = fs.readFileSync(tmpPngPath);
+      fs.unlinkSync(tmpPngPath);
+      return buffer;
+    } catch (error) {
+      logger.debug("Failed to convert XPM to PNG", { error: error.message });
+      
+      // Clean up temp file if it exists
+      if (fs.existsSync(tmpPngPath)) {
+        fs.unlinkSync(tmpPngPath);
+      }
+      
+      return null;
+    }
+  }
+
+  logger.debug("Unsupported icon format", { ext, iconPath });
+  return null;
+};
+
+/**
+ * Get icon as buffer for Linux application
+ * @param {string} appPath - Path to the application or process name
+ */
+const getIconAsBuffer = async (appPath) => {
+  try {
+    // Extract app name from path
+    let appName = path.basename(appPath);
+    
+    // Remove common extensions
+    appName = appName.replace(/\.(exe|bin|sh|py|js)$/i, "");
+    
+    logger.debug("Extracting icon for Linux app", { appName, appPath });
+    
+    // Find the icon file
+    const iconPath = await findLinuxIcon(appName);
+    if (!iconPath) {
+      logger.debug("No icon found for Linux app", { appName });
+      return null;
+    }
+    
+    // Convert to PNG if needed
+    const buffer = await convertToPng(iconPath);
+    if (!buffer) {
+      logger.debug("Failed to convert icon to PNG", { iconPath });
+      return null;
+    }
+    
+    logger.debug("Successfully extracted Linux icon", {
+      appName,
+      iconPath,
+      bufferSize: buffer.length,
+    });
+    
+    return { extension: "png", buffer };
+  } catch (error) {
+    logger.warn("Failed to extract Linux icon", {
+      appPath,
+      error: error.message,
+    });
+    return null;
+  }
+};
+
+export { getIconAsBuffer };

package/lib/uploader.js

@@ -371,8 +371,12 @@ export async function upload(filePath, metadata = {}) {
     for (const logStatus of trimmedLogs) {
       if (logStatus.count > 0 && logStatus.trimmedFileLocation && fs.existsSync(logStatus.trimmedFileLocation)) {
         try {
+          // Use the name from the status, or a default descriptive name
+          // The name is what shows in the "App" dropdown, not the file path
+          let logName = logStatus.name || 'File Logs';
+          
           logger.debug('Creating log STS credentials', {
-            name: logStatus.name || `Log ${logStatus.id}`,
+            name: logName,
             type: logStatus.type,
             count: logStatus.count
           });
@@ -380,7 +384,7 @@ export async function upload(filePath, metadata = {}) {
           const logSts = await auth.createLogSts(
             newReplay.replay.id,
             logStatus.id || `log-${Date.now()}`,
-            logStatus.name || `Log ${logStatus.id}`,
+            logName,
             logStatus.type || 'application'
           );
           
@@ -440,9 +444,12 @@ export async function upload(filePath, metadata = {}) {
   });
 
   logExit();
+  
+  const shareLink = newReplay.replay.shareLink;
+  
   return {
     replay: newReplay.replay,
-    shareLink: newReplay.replay.shareLink
+    shareLink: shareLink
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashcam",
-  "version": "1.0.1-beta.2",
+  "version": "1.0.1-beta.22",
   "description": "Minimal CLI version of Dashcam desktop app",
   "main": "bin/index.js",
   "bin": {
@@ -55,6 +55,9 @@
     "@yao-pkg/pkg": "^6.10.1",
     "esbuild": "^0.19.0"
   },
+  "overrides": {
+    "@mapbox/node-pre-gyp": "^2.0.0"
+  },
   "type": "module",
   "engines": {
     "node": ">=20.0.0"

package/scripts/sync-version.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Sync local version with npm registry
+# This fixes version drift when publishes fail
+
+echo "🔍 Checking version sync..."
+
+# Get current version in package.json
+LOCAL_VERSION=$(node -p "require('./package.json').version")
+echo "📦 Local version: $LOCAL_VERSION"
+
+# Get current beta version from npm
+NPM_BETA_VERSION=$(npm view dashcam dist-tags.beta 2>/dev/null)
+if [ -z "$NPM_BETA_VERSION" ]; then
+  echo "⚠️  No beta tag found on npm, checking latest version..."
+  NPM_BETA_VERSION=$(npm view dashcam versions --json | jq -r '.[] | select(contains("beta"))' | tail -1)
+fi
+echo "📡 NPM beta version: $NPM_BETA_VERSION"
+
+# Get all local git tags
+echo ""
+echo "🏷️  Local git tags:"
+git tag | grep beta | tail -5
+
+echo ""
+echo "📡 NPM published versions:"
+npm view dashcam versions --json | jq -r '.[] | select(contains("beta"))' | tail -5
+
+echo ""
+if [ "$LOCAL_VERSION" != "$NPM_BETA_VERSION" ]; then
+  echo "⚠️  Version mismatch detected!"
+  echo "   Local:  $LOCAL_VERSION"
+  echo "   NPM:    $NPM_BETA_VERSION"
+  echo ""
+  read -p "Do you want to sync package.json to $NPM_BETA_VERSION? (y/n) " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    npm version $NPM_BETA_VERSION --no-git-tag-version --allow-same-version
+    echo "✅ Synced package.json to $NPM_BETA_VERSION"
+    echo ""
+    echo "⚠️  Note: You may have unpublished git tags. To clean them up:"
+    echo "   git tag | grep beta | tail -10  # Review tags"
+    echo "   git tag -d v1.0.1-beta.XX       # Delete unpublished tags"
+    echo "   git push origin :refs/tags/v1.0.1-beta.XX  # Delete remote tags"
+  fi
+else
+  echo "✅ Versions are in sync!"
+fi