bump version to 1.11.2

This reverts commit c8538f5d03.

.forgejo/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Upload release
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          npm install --platform=win32 &&
+          apt-get update &&
+          apt-get install -y zip
+
+      - name: Build the app
+        run: npm run make -- --platform=win32
+
+      - name: Create release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          token: ${{ secrets.TOKEN }}
+          files: out/make/zip/win32/x64/dsr-win32-x64-${{ github.ref_name }}.zip
+          draft: true

README.md

@@ -1,10 +1,10 @@
-# Discord Video Sharing
+# Discord Video Sharing [![status-badge](https://git.mylloon.fr/Anri/dsr/badges/workflows/release.yml/badge.svg)](https://git.mylloon.fr/Anri/dsr/actions?workflow=release.yml)
 
 Tool for sharing video to Discord.
 
 > This tool was primarily made for video captured by NVidia Shadowplay.
 
-## Download/Install
+## Download/Install/Update
 
 2 choices :
 
@@ -15,22 +15,36 @@ Tool for sharing video to Discord.
   irm https://git.mylloon.fr/Anri/dsr/raw/branch/main/install.ps1 | iex
   ```
 
-> - If you have Discord Nitro: add `/nitro` flag when running DSR.
-> - If you have an NVidia GPU with NVenc: add `/nvenc` flag when running DSR.
+## Available flags
+
+You can add thoses flags in the `Target` field of your Windows shortcut.
+
+|               |                                                       |
+| ------------- | ----------------------------------------------------- |
+| `/nitro`      | Increase the file limit to 500Mo                      |
+| `/nitrobasic` | Increase the file limit to 50Mo                       |
+|               |                                                       |
+| `/nvenc_h264` | Enable NVenc with H.264 encoder (NVidia GPU required) |
+| `/nvenc_h265` | Enable NVenc with H.265 encoder (NVidia GPU required) |
+| `/h265`       | Enable the H.265 CPU encoder (slow compression)       |
+
+> NVenc support is experimental, but faster than CPU counterparts.
 
 ## More info
 
 - [x] KISS interface
   - [x] Support drag&drop into the icon
-- [x] Keep the video under 25mb (discord limitation)
-  - [x] NVenc support
+- [x] Keep the video under discord limitation
+  - [x] Defaults to H.264 CPU encoder
   - [x] If already under the limit, the file won't be compressed
-  - [x] Nitro suppport via `/nitro` flag
-- [x] Merge audio files into one track when recorded with system audio and microphone
-      split up, while keeping the original ones (with conveninant metadata)
-  - [x] Works also with file with only one audio track
+  - [x] NVenc support
+  - [x] Nitro suppport
+- [x] Merge 2 audio files into one track when recorded with system audio and microphone
+      split up, while keeping the original ones (with conveniant metadata)
+  - [x] Works also with file with only one or more than 2 audio track, by doing
+        nothing
 - [x] Support multiples files at once
-- [x] Optimize for video streaming
+- [x] Always optimize for video streaming
 
 ## Package the app for Windows
 

install.ps1

@@ -1,30 +1,41 @@
-# Enable TLSv1.2 for compatibility with older clients
+param (
+  [switch]$Force
+)
+
+# Enable TLSv1.2 for compatibility with older windows versions
 [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
 
+$path = "$env:LOCALAPPDATA\DSR"
+$update = Test-Path -Path $path\*
+
 # Download
 $releases = "https://git.mylloon.fr/api/v1/repos/Anri/dsr/releases/latest"
 $link = (Invoke-WebRequest $releases | ConvertFrom-Json)[0].assets.browser_download_url
 $archive = "$env:TEMP\dsr.zip"
 Invoke-WebRequest -Uri $link -OutFile $archive
-Remove-Item "$env:LOCALAPPDATA\DSR" -Recurse -ErrorAction SilentlyContinue
+Remove-Item "$path" -Recurse -ErrorAction SilentlyContinue
+
+# Close running DSR
+Stop-Process -Name "DSR" -Force -ErrorAction SilentlyContinue
 
 # Installation
-Expand-Archive -Path $archive -DestinationPath "$env:LOCALAPPDATA\DSR" -Force
-Move-Item -Path "$env:LOCALAPPDATA\DSR\dsr-win32-x64\*" -Destination "$env:LOCALAPPDATA\DSR" -Force
-Remove-Item "$env:LOCALAPPDATA\DSR\dsr-win32-x64"
-
-# Add shortcut
-$WshShell = New-Object -comObject WScript.Shell
-$Shortcut = $WshShell.CreateShortcut("$env:APPDATA\Microsoft\Windows\Start Menu\Programs\DSR.lnk")
-$Shortcut.TargetPath = "$env:LOCALAPPDATA\DSR\dsr.exe"
-$Shortcut.Save()
-
-# Add new app to registry
-REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v DisplayName /t REG_SZ /d "DSR"
-REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v InstallLocation /t REG_SZ /d "$env:LOCALAPPDATA\DSR"
+Expand-Archive -Path $archive -DestinationPath "$path" -Force
+Move-Item -Path "$path\dsr-win32-x64\*" -Destination "$path" -Force
+Remove-Item "$path\dsr-win32-x64"
 
 # Ask user to add a shortcut to the desktop
-if ($Host.UI.PromptForChoice(
+if (-not $update -Or $Force) {
+  # Add shortcut
+  $WshShell = New-Object -comObject WScript.Shell
+  $Shortcut = $WshShell.CreateShortcut("$env:APPDATA\Microsoft\Windows\Start Menu\Programs\DSR.lnk")
+  $Shortcut.TargetPath = "$path\dsr.exe"
+  $Shortcut.Save()
+
+  # Add new app to registry
+  REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v DisplayName /t REG_SZ /d "DSR"
+  REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\dsr" /f /v InstallLocation /t REG_SZ /d "$path"
+
+  if ($Host.UI.PromptForChoice(
     "***********************",
     "Add a desktop shortcut?",
     @(
@@ -34,6 +45,7 @@ if ($Host.UI.PromptForChoice(
     $WshShell = New-Object -comObject WScript.Shell
     $Desktop = [Environment]::GetFolderPath("Desktop")
     $Shortcut = $WshShell.CreateShortcut("$Desktop\DSR.lnk")
-  $Shortcut.TargetPath = "$env:LOCALAPPDATA\DSR\dsr.exe"
+    $Shortcut.TargetPath = "$path\dsr.exe"
     $Shortcut.Save()
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsr",
-  "version": "1.8.3",
+  "version": "1.11.2",
   "description": "Discord Video Sharing",
   "main": "./dist/main.js",
   "scripts": {
@@ -18,20 +18,23 @@
   "author": "Mylloon",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@electron-forge/maker-zip": "^7.3",
+    "@electron-forge/maker-zip": "^7.5",
     "ffmpeg-static": "^5.2",
     "ffprobe-static": "^3.1",
-    "typescript": "^5.4"
+    "typescript": "^5.6"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.3",
+    "@electron-forge/cli": "^7.5",
     "@types/ffprobe-static": "^2.0",
-    "electron": "^29.2"
+    "electron": "^33.0"
   },
   "config": {
     "forge": {
       "packagerConfig": {
-        "icon": "./image/icon.ico"
+        "icon": "./image/icon.ico",
+        "asar": {
+          "unpack": "**/node_modules/*-static/**"
+        }
       },
       "makers": [
         {

src/main.ts

@@ -1,15 +1,19 @@
-import { BrowserWindow, app, dialog, ipcMain } from "electron";
-import { statSync } from "fs";
+import { app, BrowserWindow, dialog, ipcMain, Notification } from "electron";
+import { statSync, copyFileSync } from "fs";
 import {
   deleteFile,
   deleteTwoPassFiles,
   execute,
   getNewFilename,
   getVideoDuration,
+  getNumberOfAudioTracks,
   printAndDevTool,
+  processes,
 } from "./utils/misc";
 import path = require("path");
-import ffmpegPath = require("ffmpeg-static");
+
+import ffmpeg = require("ffmpeg-static");
+const ffmpegPath = `${ffmpeg}`.replace("app.asar", "app.asar.unpacked");
 
 let error = false;
 
@@ -18,11 +22,12 @@ const moviesFilter = {
   extensions: ["mp4", "mkv"],
 };
 
+const metadataAudioSize = 3;
 const metadataAudio = `-metadata:s:a:0 title="System sounds and microphone" \
                        -metadata:s:a:1 title="System sounds" \
                        -metadata:s:a:2 title="Microphone"`;
 
-const extraArgs = "-movflags +faststart";
+const shareOpt = "-movflags +faststart";
 
 /** Register a new error  */
 const registerError = (win: BrowserWindow, err: string) => {
@@ -47,6 +52,11 @@ const createWindow = () => {
   return win;
 };
 
+// For notification on Windows
+if (process.platform === "win32") {
+  app.setAppUserModelId(app.name);
+}
+
 /* Ready to create the window */
 app.whenReady().then(() => {
   const win = createWindow();
@@ -61,6 +71,13 @@ app.whenReady().then(() => {
 
   /** Send confirmation to user */
   const confirmation = async (message: string) => {
+    // Send notification
+    new Notification({
+      title: "Status",
+      body: message,
+    }).show();
+
+    // Open dialog
     await dialog.showMessageBox(win, { message });
   };
 
@@ -68,14 +85,15 @@ app.whenReady().then(() => {
   const getFilename = (filepath: string) => path.parse(filepath).base;
 
   /** Merge all audios track of a video into one
-   *  In case video have only one track, silently pass */
+   *  In case video doesn't have exactly two audio streams, silently pass */
   const mergeAudio = async (file: string) => {
     const tmpFile = getNewFilename(file, "TMP_");
     let outFile;
 
-    // One track for the video
-    let nbTracks = 1;
+    let audioTracks = getNumberOfAudioTracks(file);
 
+    switch (audioTracks.length) {
+      case 2:
         // Merge 2 audio
         // See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo
         await execute(
@@ -84,38 +102,10 @@ app.whenReady().then(() => {
            -filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \
            -c:v copy \
            "${tmpFile}"`
-    )
-      .catch(async (e) => {
-        if (
-          `${e}`.includes(
-            "Cannot find a matching stream for unlabeled input pad 1 on filter"
-          )
-        ) {
-          // Only one audio in the file
-          outFile = getNewFilename(file, "(processed) ");
-          nbTracks += 1;
-
-          // Do a copy
-          await execute(`"${ffmpegPath}" -y \
-          -i "${file}" \
-          -codec copy \
-          ${extraArgs} \
-          "${outFile}"`).catch((e) => registerError(win, e));
-
-          // We throw the error since we do not want to merge any audio
-          return Promise.resolve("skip");
-        } else {
-          // Error handling
-          registerError(win, e);
-        }
-      })
-      .then(async (val) => {
-        if (val == "skip") {
-          return;
-        }
+        );
 
         outFile = getNewFilename(file, "(merged audio) ");
-        nbTracks += 3;
+
         // Add merged audio as first position to original video and make it default
         // About disposition: https://ffmpeg.org/ffmpeg.html#Main-options
         // Also rename all tracks accordingly to what they are
@@ -125,13 +115,23 @@ app.whenReady().then(() => {
          -map 0 -map 1:a -c:v copy \
          -disposition:a 0 -disposition:a:0 default \
          ${metadataAudio} \
-         ${extraArgs} \
          "${outFile}"`
         ).catch((e) => registerError(win, e));
 
         // Delete the temporary video file
         deleteFile(tmpFile);
-      });
+
+        audioTracks = getNumberOfAudioTracks(outFile);
+
+        break;
+      default:
+        // Other cases: no merge needed
+        outFile = getNewFilename(file, "(nomerge) ");
+
+        // Do a copy
+        copyFileSync(file, outFile);
+        break;
+    }
 
     const duration = getVideoDuration(outFile);
     const stats = statSync(outFile);
@@ -140,28 +140,34 @@ app.whenReady().then(() => {
       title: outFile,
       size: stats.size / 1024 / 1024,
       duration,
-      nbTracks,
+      audioTracks,
     };
   };
 
-  /** Reduce size of a file */
+  /** Reduce size of a file
+   * Returns an empty string in case of failing
+   */
   const reduceSize = async (
     file: string,
     bitrate: number,
-    nbTracks: number
+    audioTracks: number[]
   ) => {
-    const audioBitrate = 400; // keep some room
-    let videoBitrate = bitrate - audioBitrate;
+    const audioBitrate = Math.ceil(
+      audioTracks.reduce((sum, current) => current + sum, 50) // initial value > 0 for extra room
+    );
+    const videoBitrate = bitrate - audioBitrate;
+    let finalFile;
 
-    const finalFile = getNewFilename(file, "Compressed - ");
+    if (videoBitrate > 0) {
+      finalFile = getNewFilename(file, "Compressed - ");
 
       // Trash the output, depends on the platform
       const nul = process.platform === "win32" ? "NUL" : "/dev/null";
 
-    // Mapping of tracks for FFMPEG
-    const mappingTracks = Array(nbTracks)
+      // Mapping of tracks for FFMPEG, adding 1 for the video stream
+      const mappingTracks = Array(audioTracks.length + 1)
         .fill("-map 0:")
-      .map(function (str, index) {
+        .map((str, index) => {
           return str + index;
         })
         .join(" ");
@@ -170,13 +176,21 @@ app.whenReady().then(() => {
       let hwAcc = "";
 
       const argv = process.argv;
-    if (argv.includes("/nvenc")) {
-      // Use NVenc
+      if (argv.includes("/nvenc_h264")) {
+        // Use NVenc H.264
         codec = "h264_nvenc";
         hwAcc = "-hwaccel cuda";
+      }
 
-      // Increase video bitrate
-      videoBitrate = Math.floor(videoBitrate * 1.85);
+      if (argv.includes("/nvenc_h265")) {
+        // Use NVenc H.265
+        codec = "hevc_nvenc";
+        hwAcc = "-hwaccel cuda";
+      }
+
+      if (argv.includes("/h265")) {
+        // Use H.265 encoder
+        codec = "libx265";
       }
 
       // Compress the video
@@ -191,17 +205,41 @@ app.whenReady().then(() => {
        -i "${file}" \
        -c:v ${codec} -b:v ${videoBitrate}k -pass 2 -c:a copy \
        ${mappingTracks} -f mp4 \
-       ${metadataAudio} \
-       ${extraArgs} \
+       -profile:v main \
+       ${audioTracks.length === metadataAudioSize ? metadataAudio : ""} \
+       ${shareOpt} \
+       "${finalFile}"`
+      ).catch((e) => registerError(win, e));
+
+      // Delete the 2 pass temporary files
+      deleteTwoPassFiles(process.cwd());
+    } else {
+      finalFile = "";
+    }
+
+    // Delete the old video file
+    deleteFile(file);
+
+    return finalFile;
+  };
+
+  /** Move metadata at the begenning of the file */
+  const moveMetadata = async (file: string, nbTracks: number) => {
+    const finalFile = getNewFilename(file, "Broadcastable - ");
+
+    // Optimize for streaming
+    await execute(
+      `"${ffmpegPath}" -y \
+       -i "${file}" \
+       -map 0 -codec copy \
+       ${shareOpt} \
+       ${nbTracks === metadataAudioSize ? metadataAudio : ""} \
        "${finalFile}"`
     ).catch((e) => registerError(win, e));
 
     // Delete the old video file
     deleteFile(file);
 
-    // Delete the 2 pass temporary files
-    deleteTwoPassFiles(process.cwd());
-
     return finalFile;
   };
 
@@ -213,9 +251,20 @@ app.whenReady().then(() => {
   ipcMain.handle("mergeAudio", (_, file: string) => mergeAudio(file));
   ipcMain.handle(
     "reduceSize",
-    (_, file: string, bitrate: number, nbTracks: number) =>
-      reduceSize(file, bitrate, nbTracks)
+    (_, file: string, bitrate: number, audioTracks: number[]) =>
+      reduceSize(file, bitrate, audioTracks)
+  );
+  ipcMain.handle("moveMetadata", (_, file: string, nbTracks: number) =>
+    moveMetadata(file, nbTracks)
   );
   ipcMain.handle("exit", () => (error ? {} : app.quit()));
   ipcMain.handle("confirmation", (_, text: string) => confirmation(text));
 });
+
+app.on("window-all-closed", () => {
+  processes.forEach((process) => {
+    process.stdin.write("q");
+  });
+
+  app.quit();
+});

src/preload.ts

@@ -13,8 +13,10 @@ contextBridge.exposeInMainWorld("internals", {
     ipcRenderer.invoke("getFilename", filepath),
   askFiles: () => ipcRenderer.invoke("askFiles"),
   mergeAudio: (file: string) => ipcRenderer.invoke("mergeAudio", file),
-  reduceSize: (file: string, bitrate: number, nbTracks: number) =>
-    ipcRenderer.invoke("reduceSize", file, bitrate, nbTracks),
+  reduceSize: (file: string, bitrate: number, audioTracks: number[]) =>
+    ipcRenderer.invoke("reduceSize", file, bitrate, audioTracks),
+  moveMetadata: (file: string, nbTracks: number) =>
+    ipcRenderer.invoke("moveMetadata", file, nbTracks),
   exit: () => ipcRenderer.invoke("exit"),
   confirmation: (text: string) => ipcRenderer.invoke("confirmation", text),
 });

src/scripts/renderer.ts

@@ -11,13 +11,14 @@ let internals: {
     title: string;
     duration: number;
     size: number;
-    nbTracks: number;
+    audioTracks: number[];
   }>;
   reduceSize: (
     file: string,
     bitrate: number,
-    nbTracks: number
+    audioTracks: number[]
   ) => Promise<string>;
+  moveMetadata: (file: string, nbTracks: number) => Promise<string>;
   confirmation: (text: string) => Promise<void>;
 };
 
@@ -55,13 +56,16 @@ const getFiles = async () => {
 /** Returns maximum allowed size for files in MB */
 const fetchMaxSize = async () => {
   const argv = await internals.argv();
-  if (argv.includes("/nitro")) {
+  if (argv.includes("/nitrobasic")) {
+    // Nitro Basic user
+    return 50;
+  } else if (argv.includes("/nitro")) {
     // Nitro user
     return 500;
-  }
-
+  } else {
     // Free user
-  return 25;
+    return 10;
+  }
 };
 
 /** Either replace the message, or add some info */
@@ -99,6 +103,7 @@ const main = async () => {
   updateMessage("Récupération des fichiers...");
   const files = await getFiles();
   let processedFiles = "";
+  let numberOfUncompressableFiles = 0;
 
   // Iterate over all the retrieved files
   for (const [idx, file] of files.entries()) {
@@ -131,19 +136,39 @@ const main = async () => {
       finalTitle = await internals.reduceSize(
         newFile.title,
         bitrate,
-        newFile.nbTracks
+        newFile.audioTracks
+      );
+    } else {
+      updateMessage(`\nPréparation pour le partage...`, true, Mode.Append);
+
+      // Move the metadata to make it playable before everything is downloaded
+      finalTitle = await internals.moveMetadata(
+        newFile.title,
+        newFile.audioTracks.length
       );
     }
 
     // Append title to the list of processed files
+    if (finalTitle.length > 0) {
       processedFiles += `\n- ${finalTitle}`;
       updateMessage(`Fichier ${counter} traités.`);
+    } else {
+      processedFiles += `\n- ${file} [incompressable]`;
+      updateMessage(`Fichier ${counter} trop large pour être compressé.`);
+      numberOfUncompressableFiles++;
+    }
+  }
+
+  let errorMessage = "";
+  if (numberOfUncompressableFiles > 0) {
+    errorMessage += `\nNombre de fichier incompressable : ${numberOfUncompressableFiles}.`;
   }
 
   // Send confirmation to the user that we're done
   await internals.confirmation(
-    `${files.length} fichiers traités : ${processedFiles}`
+    `${files.length} fichiers traités : ${processedFiles}` + errorMessage
   );
+
   await internals.exit();
 };
 

src/utils/misc.ts

@@ -1,9 +1,13 @@
-import ffprobe = require("ffprobe-static");
 import child_process = require("child_process");
 import path = require("path");
 import { BrowserWindow } from "electron";
 import { existsSync, unlink } from "fs";
 
+import ffprobe = require("ffprobe-static");
+const ffprobePath = ffprobe.path.replace("app.asar", "app.asar.unpacked");
+
+export const processes: child_process.ChildProcess[] = [];
+
 /** Create a new filename from the OG one */
 export const getNewFilename = (ogFile: string, part: string) => {
   const oldFile = path.parse(ogFile);
@@ -12,11 +16,20 @@ export const getNewFilename = (ogFile: string, part: string) => {
 
 /** Return the duration of a video in second */
 export const getVideoDuration = (file: string) => {
-  const command = `"${ffprobe.path}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
+  const command = `"${ffprobePath}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
   const durationString = child_process.execSync(command).toString().trim();
   return parseFloat(durationString);
 };
 
+/** Return the number of audio tracks */
+export const getNumberOfAudioTracks = (file: string): number[] => {
+  const command = `"${ffprobePath}" -v error -show_entries stream=bit_rate -select_streams a -of json "${file}"`;
+  const result = child_process.execSync(command, { encoding: "utf8" });
+  return JSON.parse(result).streams.map(
+    (v: { bit_rate: string }) => Number(v.bit_rate) / 1000
+  );
+};
+
 /** Print an error to the console and open the dev tool panel */
 export const printAndDevTool = (win: BrowserWindow, err: string) => {
   win.webContents.openDevTools();
@@ -28,13 +41,18 @@ export const execute = (
   command: string
 ): Promise<{ stdout: string; stderr: string }> => {
   return new Promise((resolve, reject) => {
-    child_process.exec(command, (error, stdout, stderr) => {
+    const process = child_process.exec(command, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       } else {
         resolve({ stdout, stderr });
       }
     });
+
+    processes.push(process);
+    process.on("exit", () => {
+      processes.splice(processes.indexOf(process), 1);
+    });
   });
 };