fix: check dep when activate in mac

electron-builder.yml

@@ -1,4 +1,4 @@
-appId: com.electron.app
+appId: site.fideo.app
 productName: fideo
 directories:
   buildResources: build

src/main/ffmpeg/index.ts

@@ -48,6 +48,10 @@ export const downloadDepProgressInfo: IDownloadDepProgressInfo = {
   showRetry: false
 }
 
+export let downloadReq = {
+  destroy: () => {}
+}
+
 const setFfmpegAndFfprobePath = (dirname: string) => {
   const ffmpegPath = isMac
     ? path.resolve(dirname, 'ffmpeg-mac/ffmpeg')
@@ -80,6 +84,9 @@ export async function makeSureDependenciesExist(
 
   downloadDepProgressInfo.downloading = true
   download(downloadUrl, dirname, { extract: true })
+    .on('request', (req) => {
+      downloadReq = req
+    })
     .on('downloadProgress', ({ percent }) => {
       downloadDepProgressInfo.progress = percent
       log(`ffmpeg download progress: ${percent}`)

src/main/ffmpeg/record.ts

@@ -253,8 +253,6 @@ export async function recordStream(
 
   ffmpegProcess.inputOptions(['-re'])
 
-  console.log(ffmpegProcess, '=============================')
-
   setRecordStreamFfmpegProcessMap(title, ffmpegProcess)
 
   ffmpegProcess.inputOption(

src/main/index.ts

@@ -37,7 +37,8 @@ import {
   makeSureDependenciesExist,
   downloadDepProgressInfo,
   checkFfmpegExist,
-  checkFfprobeExist
+  checkFfprobeExist,
+  downloadReq
 } from './ffmpeg'
 
 async function checkUpdate() {
@@ -100,7 +101,7 @@ const stopDownloadDepTimerWhenAllDownloadDepEnd = () => {
 }
 
 let win: BrowserWindow | null
-function createWindow(): void {
+async function createWindow() {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
     width: 900,
@@ -138,6 +139,7 @@ function createWindow(): void {
   } else {
     mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
   }
+  await handleMakeSureDependenciesExist()
 }
 
 function showNotification(title: string, body: string) {
@@ -173,9 +175,7 @@ async function handleMakeSureDependenciesExist() {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(async () => {
   // Set app user model id for windows
-  electronApp.setAppUserModelId('com.electron')
-
-  await handleMakeSureDependenciesExist()
+  electronApp.setAppUserModelId('site.fideo.app')
 
   // Default open or close DevTools by F12 in development
   // and ignore CommandOrControl + R in production.
@@ -288,21 +288,24 @@ app.whenReady().then(async () => {
     stillRecordStreamKeys.forEach((key) => {
       killRecordStreamFfmpegProcess(key)
     })
+    downloadReq.destroy()
     clearTimerWhenAllFfmpegProcessEnd()
     stopDownloadDepTimerWhenAllDownloadDepEnd()
     win?.destroy()
   })
 
-  createWindow()
+  await createWindow()
 
   setTimeout(() => {
     checkUpdate()
   }, 1000)
 
-  app.on('activate', function () {
+  app.on('activate', async function () {
     // On macOS it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+    if (BrowserWindow.getAllWindows().length === 0) {
+      await createWindow()
+    }
   })
 })