Merge pull request #16 from Shikakiben/test

Test

Author: Shikakiben

.github/workflows/appimage.yml

@@ -2,6 +2,10 @@ name: Anylinux-AppImage
 concurrency:
   group: build-${{ github.ref }}
   cancel-in-progress: true
+
+env:
+  VERSION: beta-0.${{ github.run_number }}
+
 on:
   push:
     branches:
@@ -10,10 +14,57 @@ on:
     - cron: "0 7 1/21 * *" # We default to rebuilding every 21 days, change this to your liking
   workflow_dispatch: {}
 
+
 jobs:
+  build-prebuild-glibc:
+    name: Build prebuild glibc
+    runs-on: ubuntu-latest
+    container: ubuntu:20.04
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install build tools
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update && apt-get install -y build-essential python3 gcc-10 g++-10 curl
+          update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100
+          update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
+      - name: build AM-GUI
+        run: |     
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+          . "$HOME/.nvm/nvm.sh"
+          nvm install 22
+          node -v
+          npm -v
+          npm install --ignore-scripts
+          npx electron-rebuild --force
+      - name: Upload prebuild
+        uses: actions/upload-artifact@v5
+        with:
+          name: prebuild-glibc
+          path: node_modules/@homebridge/node-pty-prebuilt-multiarch/build/Release/pty.node
+
+  build-prebuild-musl:
+    name: Build prebuild musl
+    runs-on: ubuntu-latest
+    container: node:22-alpine
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install build tools
+        run: apk add --no-cache python3 make g++ linux-headers
+      - name: build AM-GUI
+        run: |          
+          npm install --ignore-scripts
+          npx electron-rebuild --force
+      - name: Upload prebuild
+        uses: actions/upload-artifact@v5
+        with:
+          name: prebuild-musl
+          path: node_modules/@homebridge/node-pty-prebuilt-multiarch/build/Release/pty.node
+
   build:
     name: "${{ matrix.name }} (${{ matrix.arch }})"
     runs-on: ${{ matrix.runs-on }}
+    needs: [build-prebuild-glibc, build-prebuild-musl]
     strategy:
       matrix:
         include:
@@ -23,12 +74,42 @@ jobs:
           # comment out these 3 lines if aarch64 is not wanted
 #          - runs-on: ubuntu-24.04-arm
 #            name: Build AppImage
-#            arch: aarch64
+#            arch: aarch64 
+        
     container: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5
       - name: Preparing Container
         uses: pkgforge-dev/anylinux-setup-action@8872fabe63f9a00b35e25b2f46da62a05afc9a7d # v1
+      - name: Setup Node
+        run: |
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+          . "$HOME/.nvm/nvm.sh"
+          nvm install 22
+          node -v
+          npm -v      
+          npm install
+          npx patch-package      
+      - name: Download prebuilds glibc
+        uses: actions/download-artifact@v5
+        with:
+          name: prebuild-glibc
+          path: temp-glibc
+      - name: Download prebuilds musl
+        uses: actions/download-artifact@v5
+        with:
+          name: prebuild-musl
+          path: temp-musl
+      - name: Place prebuilds
+        run: |
+          rm -rf node_modules/@homebridge/node-pty-prebuilt-multiarch/prebuilds
+          mkdir -p node_modules/@homebridge/node-pty-prebuilt-multiarch/prebuilds/linux-x64
+          cp temp-glibc/pty.node node_modules/@homebridge/node-pty-prebuilt-multiarch/prebuilds/linux-x64/pty.node
+          cp temp-musl/pty.node node_modules/@homebridge/node-pty-prebuilt-multiarch/prebuilds/linux-x64/pty-musl.node
+      - name: Run dist
+        run: |
+          . "$HOME/.nvm/nvm.sh"
+          npm run dist
       - name: Install Dependencies
         run: /bin/sh ./scripts/get-dependencies.sh
       - name: Make AppImage

AM-GUI.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=AM-GUI
-Exec=bin/start-am-gui.sh
+Exec=am-gui %U
 Icon=AM-GUI.png
 StartupWMClass=AM-GUI
 Terminal=false

AM-INSTALLER

@@ -1,3 +1,7 @@
+// Fixe les variables d'environnement terminal si absentes (utile pour AppImage)
+if (!process.env.TERM) process.env.TERM = 'xterm-256color';
+if (!process.env.COLORTERM) process.env.COLORTERM = 'truecolor';
+
 const { app, BrowserWindow, ipcMain, Menu, protocol, shell } = require('electron');
 const path = require('path');
 const fs = require('fs');
@@ -37,16 +41,32 @@ if (!gotTheLock) {
 }
 
 // --- Gestion accélération GPU (doit être AVANT app.whenReady) ---
+// Vérifier d'abord les arguments de ligne de commande
+const hasDisableGpuFlag = process.argv.includes('--disable-gpu');
+
 let disableGpuPref = false;
 try {
   const prefPath = path.join(app.getPath('userData'), 'gpu-pref.json');
+  console.log('[GPU DEBUG] Checking GPU pref file at:', prefPath);
   if (fs.existsSync(prefPath)) {
     const raw = fs.readFileSync(prefPath, 'utf8');
+    console.log('[GPU DEBUG] File content:', raw);
     disableGpuPref = JSON.parse(raw).disableGpu === true;
+    console.log('[GPU DEBUG] disableGpuPref parsed to:', disableGpuPref);
+  } else {
+    console.log('[GPU DEBUG] File does not exist');
   }
-} catch(_){ }
-if (disableGpuPref && typeof app.disableHardwareAcceleration === 'function') {
+} catch(e){ 
+  console.log('[GPU DEBUG] Error reading GPU pref:', e);
+}
+
+// Désactiver GPU si demandé par flag CLI ou par préférence
+const shouldDisableGpu = hasDisableGpuFlag || disableGpuPref;
+if (shouldDisableGpu && typeof app.disableHardwareAcceleration === 'function') {
+  console.log('[GPU DEBUG] Calling app.disableHardwareAcceleration() - reason:', hasDisableGpuFlag ? 'CLI flag' : 'user preference');
   app.disableHardwareAcceleration();
+} else {
+  console.log('[GPU DEBUG] NOT calling app.disableHardwareAcceleration(), shouldDisable:', shouldDisableGpu, 'function exists:', typeof app.disableHardwareAcceleration === 'function');
 }
 
 const errorLogPath = path.join(app.getPath('userData'), 'error.log');
@@ -209,7 +229,7 @@ function buildSandboxAnswerScript(shouldConfigure, dirSelections, customPath) {
 
 function runSandboxTask(sender, { pm, action, args, stdinScript, appName }) {
   return new Promise((resolve) => {
-    const pty = require('node-pty');
+    const pty = require('@homebridge/node-pty-prebuilt-multiarch');
     const id = `${action}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 7)}`;
     const env = Object.assign({}, process.env, {
       TERM: 'xterm',
@@ -309,6 +329,12 @@ ipcMain.handle('set-gpu-pref', async (_event, val) => {
   } catch(e){ return { ok:false, error: e.message||String(e) }; }
 });
 
+// IPC pour redémarrer l'application (utilisé après changement GPU)
+ipcMain.handle('restart-app', async () => {
+  app.relaunch();
+  app.quit();
+});
+
 function createWindow () {
   // Détection simple de l'environnement de bureau pour stylage léger
   function detectDesktopEnv() {
@@ -463,7 +489,7 @@ ipcMain.handle('am-action', async (event, action, software) => {
 
   return new Promise((resolve) => {
     try {
-      const pty = require('node-pty');
+      const pty = require('@homebridge/node-pty-prebuilt-multiarch');
       const env = Object.assign({}, process.env, {
         TERM: 'xterm',
         COLS: '80',
@@ -543,7 +569,7 @@ ipcMain.handle('install-start', async (event, name) => {
   const startedAt = Date.now();
   let stdoutRemainder = '';
   let stderrRemainder = '';
-  const pty = require('node-pty');
+  const pty = require('@homebridge/node-pty-prebuilt-multiarch');
   const env = Object.assign({}, process.env, {
     TERM: 'xterm',
     COLS: '80',
@@ -695,7 +721,7 @@ ipcMain.handle('updates-start', async (event) => {
   const id = Date.now().toString(36) + '-' + Math.random().toString(36).slice(2,8);
   let child;
   let output = '';
-  const pty = require('node-pty');
+  const pty = require('@homebridge/node-pty-prebuilt-multiarch');
   const env = Object.assign({}, process.env, {
     TERM: 'xterm',
     COLS: '80',