Merge branch 'main' of https://github.com/BluDood/GlanceThing

Author: BluDood

.github/workflows/build-nightly.yml

@@ -6,6 +6,10 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
 
@@ -20,7 +24,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci
@@ -44,7 +48,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci
@@ -58,6 +62,31 @@ jobs:
           name: glancething-nightly-macos-${{ github.ref_name }}
           path: ./dist/glancething-nightly-*.dmg
 
+  build-linux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build the project
+        run: npm run build:linux:nightly
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: glancething-nightly-linux-${{ github.ref_name }}
+          path: ./dist/glancething-nightly-*.AppImage
+
+
   build-client:
     runs-on: ubuntu-latest
     defaults:
@@ -71,7 +100,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci

.github/workflows/build-release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci
@@ -69,6 +69,36 @@ jobs:
         with:
           files: ./dist/glancething-*.dmg
 
+  build-linux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build the project
+        run: npm run build:linux
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: glancething-linux-${{ github.ref_name }}
+          path: ./dist/glancething-*.AppImage
+
+      - name: Upload to GitHub Releases
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./dist/glancething-*.AppImage
+
   build-client:
     runs-on: ubuntu-latest
     defaults:
@@ -82,7 +112,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
 
       - name: Install dependencies
         run: npm ci

electron-builder.nightly.yml

@@ -35,7 +35,6 @@ dmg:
 linux:
   target:
     - AppImage
-    - deb
   maintainer: BluDood
   category: Utility
 appImage:
@@ -47,4 +46,4 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 extraMetadata:
-  name: glancething-nightly
+  name: glancething-nightly

electron-builder.yml

@@ -35,7 +35,6 @@ dmg:
 linux:
   target:
     - AppImage
-    - deb
   maintainer: BluDood
   category: Utility
 appImage:

package-lock.json

@@ -15,8 +15,10 @@
     "build:unpack": "npm run build && electron-builder --dir",
     "build:win": "npm run build && electron-builder --win",
     "build:mac": "npm run build && electron-builder --mac",
+    "build:linux": "npm run build && electron-builder --linux",
     "build:win:nightly": "npm run build && electron-builder --win --config electron-builder.nightly.yml",
-    "build:mac:nightly": "npm run build && electron-builder --mac --config electron-builder.nightly.yml"
+    "build:mac:nightly": "npm run build && electron-builder --mac --config electron-builder.nightly.yml",
+    "build:linux:nightly": "npm run build && electron-builder --linux --config electron-builder.nightly.yml"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.2",
@@ -57,6 +59,7 @@
   },
   "optionalDependencies": {
     "node-nowplaying-win32-x64-msvc": "0.1.0",
-    "node-nowplaying-darwin-universal": "0.1.0"
+    "node-nowplaying-darwin-universal": "0.1.0",
+    "node-nowplaying-linux-x64-gnu": "0.1.0"
   }
 }

package.json

@@ -12,7 +12,6 @@ import {
 } from 'electron'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import { join } from 'path'
-import os from 'os'
 
 import {
   getPlaybackHandlerConfig,
@@ -475,7 +474,7 @@ async function setupIpcHandlers() {
 
 async function setupTray() {
   const icon =
-    os.platform() === 'darwin'
+    process.platform === 'darwin'
       ? nativeImage
           .createFromPath(`${resourceFolder}/tray.png`)
           .resize({ height: 24, width: 24 })
@@ -515,7 +514,7 @@ async function setupTray() {
   )
 
   tray.on('click', () => {
-    if (os.platform() === 'darwin') return
+    if (process.platform === 'darwin') return
     if (mainWindow) {
       mainWindow.show()
     } else {

src/main/index.ts

@@ -5,10 +5,10 @@ import path from 'path'
 import fs from 'fs'
 
 import {
+  buildUnzipCommand,
   execAsync,
   getLogLevel,
   getPlatformADB,
-  getPlatformTar,
   log,
   LogLevel
 } from './utils.js'
@@ -21,10 +21,15 @@ export async function getAdbExecutable() {
 
   if (res && platform() !== 'darwin') return 'adb'
 
-  const { downloadURL, executable } = getPlatformADB()
+  const adbInfo = getPlatformADB()
+  if (!adbInfo) {
+    log('Failed to find adb for platform', 'adb', LogLevel.ERROR)
+    throw new Error('adb_platform_not_found')
+  }
+  const { url, cmd } = adbInfo
   const userDataPath = app.getPath('userData')
   const platformToolsPath = path.join(userDataPath, 'platform-tools')
-  const adbPath = path.join(platformToolsPath, executable)
+  const adbPath = path.join(platformToolsPath, cmd)
 
   if (fs.existsSync(adbPath)) return `"${adbPath}"`
 
@@ -37,7 +42,7 @@ export async function getAdbExecutable() {
 
   if (fs.existsSync(downloadPath)) fs.unlinkSync(downloadPath)
 
-  const download = await axios.get(downloadURL, {
+  const download = await axios.get(url, {
     responseType: 'stream',
     validateStatus: () => true
   })
@@ -51,16 +56,20 @@ export async function getAdbExecutable() {
 
   download.data.pipe(writer)
 
-  await new Promise((resolve, reject) => {
+  await new Promise<void>((resolve, reject) => {
     writer.on('finish', resolve)
     writer.on('error', reject)
   })
 
   log('Downloaded ADB!', 'adb')
 
-  const extract = await execAsync(
-    `${getPlatformTar()} -xf ${downloadPath} -C "${userDataPath}"`
-  )
+  const unzipCommand = buildUnzipCommand(downloadPath, userDataPath)
+  if (!unzipCommand) {
+    log('Failed to find unzip command for platform', 'adb', LogLevel.ERROR)
+    throw new Error('adb_platform_not_found')
+  }
+
+  const extract = await execAsync(unzipCommand)
 
   if (extract === null) {
     log('Failed to extract adb', 'adb')

src/main/lib/adb.ts

@@ -3,6 +3,7 @@ import { log } from '../utils.js'
 
 import { PlaybackData, RepeatMode } from '../../types/Playback.js'
 import { createRequire } from 'node:module'
+import axios from 'axios'
 
 declare class NowPlaying {
   constructor(
@@ -115,6 +116,15 @@ function importAddon() {
       log('Failed to import native addon', 'Native')
       return null
     }
+  } else if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      try {
+        return require('node-nowplaying-linux-x64-gnu')
+      } catch (e) {
+        log('Failed to import native addon', 'Native')
+        return null
+      }
+    }
   }
 
   log('No native addon available for this platform', 'Native')
@@ -259,14 +269,23 @@ class NativeHandler extends BasePlaybackHandler {
   }
 
   async getImage(): Promise<Buffer | null> {
-    if (!this.current?.thumbnail) return null
-
-    const base64 = this.current.thumbnail.replace(
-      /^data:image\/\w+;base64,/,
-      ''
-    )
-    const buffer = Buffer.from(base64, 'base64')
-    return buffer
+    const thumb = this.current?.thumbnail
+    if (!thumb) return null
+
+    if (thumb.startsWith('data:image')) {
+      const base64 = thumb.replace(/^data:image\/\w+;base64,/, '')
+      const buffer = Buffer.from(base64, 'base64')
+      return buffer
+    } else if (
+      thumb.startsWith('https://') ||
+      thumb.startsWith('http://')
+    ) {
+      const res = await axios.get(thumb, {
+        responseType: 'arraybuffer'
+      })
+
+      return res.data
+    } else return null
   }
 }