Merge branch 'feature/ui' into feature/ui-use-users-own-browser

packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/index.ts

@@ -3,7 +3,7 @@ import checkAndDownloadPuppeteerExecutable, {
   checkCachedPuppeteerExecutable,
   getExpectCachedPuppeteerExecutablePath
 } from './check-and-download-puppeteer-executable'
-import * as net from 'net'
+import * as fs from 'fs'
 import { pipeWriteRegardlessError } from '../utils/pipe'
 import {
   removeLastUsedAndAvailableBrowserPath,
@@ -42,10 +42,10 @@ export const getAnyAvailablePuppeteerExecutablePath = async (): Promise<string |
 
 export const checkAndDownloadDependenciesForInit = async () => {
   process.on('disconnect', () => app.exit())
-  app.dock.hide()
+  app.dock?.hide()
-  let pipe: null | net.Socket = null
+  let pipe: null | fs.WriteStream = null
   try {
-    pipe = new net.Socket({ fd: 3 })
+    pipe = fs.createWriteStream(null, { fd: 3 })
   } catch {
     console.warn('pipe is not available')
   }
@@ -59,37 +59,65 @@ export const checkAndDownloadDependenciesForInit = async () => {
 
   try {
     let timeoutTimer = 0
-    await new Promise((resolve, reject) => {
+    const promiseWithResolver = (() => {
-      checkAndDownloadPuppeteerExecutable({
+      const o = {} as unknown as {
-        downloadProgressCallback(downloadedBytes: number, totalBytes: number) {
+        promise: Promise<unknown>
-          clearTimeout(timeoutTimer)
+        resolve: (result: unknown) => void
-          if (downloadedBytes !== totalBytes) {
+        reject: (reason: unknown) => void
-            timeoutTimer = setTimeout(() => {
+      }
-              // will encounter this when network disconnected when downloading
+      o.promise = new Promise((resolve, reject) => {
-              reject(new Error('PROGRESS_NOT_CHANGED_TOO_LONG'))
+        o.resolve = resolve
-            }, 30 * 1000)
+        o.reject = reject
-          }
+      })
-          console.log(downloadedBytes / totalBytes)
+      return o
+    })()
+
+    let throttleProgressTimer: number | null = null
+    checkAndDownloadPuppeteerExecutable({
+      downloadProgressCallback(downloadedBytes: number, totalBytes: number) {
+        clearTimeout(timeoutTimer)
+        if (downloadedBytes !== totalBytes) {
+          timeoutTimer = setTimeout(() => {
+            // will encounter this when network disconnected when downloading
+            promiseWithResolver.reject(new Error('PROGRESS_NOT_CHANGED_TOO_LONG'))
+          }, 5 * 1000)
+        } else {
+          clearTimeout(throttleProgressTimer)
+          throttleProgressTimer = null
+        }
+
+        if (!throttleProgressTimer) {
+          // console.log(JSON.stringify({
+          //   type: 'DOWNLOAD_PROGRESS_UPDATE',
+          //   level: 'DEBUG',
+          //   percent: downloadedBytes / totalBytes
+          // }))
+
           pipeWriteRegardlessError(
             pipe,
             JSON.stringify({
               type: 'PUPPETEER_DOWNLOAD_PROGRESS',
               totalBytes,
               downloadedBytes
-            })
+            }) + '\r\n'
-          ) + '\r\n'
+          )
+          throttleProgressTimer = setTimeout(() => {
+            throttleProgressTimer = null
+          }, 2500)
         }
-      }).then(
+      }
-        () => {
-          resolve(void 0)
-        },
-        (err) => {
-          reject(err)
-        }
-      )
     })
+      .then(() => {
+        promiseWithResolver.resolve(void 0)
+      })
+      .catch((err) => {
+        promiseWithResolver.reject(err)
+      })
+
+    await promiseWithResolver.promise
     app.exit(DOWNLOAD_ERROR_EXIT_CODE.NO_ERROR)
   } catch (err) {
+    console.error(err)
     app.exit(DOWNLOAD_ERROR_EXIT_CODE.DOWNLOAD_ERROR)
   }
 }

packages/ui/src/main/flow/GEEK_AUTO_START_CHAT_WITH_BOSS.ts

@@ -2,7 +2,10 @@ import DingtalkPlugin from '@geekgeekrun/dingtalk-plugin/index.mjs'
 import { app } from 'electron'
 import { SyncHook, AsyncSeriesHook } from 'tapable'
 import { readConfigFile } from '@geekgeekrun/geek-auto-start-chat-with-boss/runtime-file-utils.mjs'
-import * as net from 'net'
+import * as fs from 'fs'
+import {
+  checkPuppeteerExecutable,
+} from './CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer-executable'
 import { pipeWriteRegardlessError } from './utils/pipe'
 import { getAnyAvailablePuppeteerExecutablePath } from './CHECK_AND_DOWNLOAD_DEPENDENCIES'
 
@@ -23,11 +26,11 @@ export const runAutoChat = async () => {
     closeBrowserWindow()
     app.exit()
   })
-  app.dock.hide()
+  app.dock?.hide()
-  let pipe: null | net.Socket = null
+  let pipe: null | fs.WriteStream = null
   try {
-    pipe = new net.Socket({ fd: 3 })
+    pipe = fs.createWriteStream(null, { fd: 3 })
-  } catch (err) {
+  } catch {
     console.warn('pipe is not available')
   }
   pipeWriteRegardlessError(

packages/ui/src/main/flow/utils/pipe.ts

@@ -1,12 +1,17 @@
-import * as net from 'net'
+import * as fs from 'fs'
 
-export const pipeWriteRegardlessError = (
+export const pipeWriteRegardlessError = async (
-  pipe: net.Socket | null,
+  pipe: fs.WriteStream | null,
-  ...writeArgs: Parameters<net.Socket['write']>
+  chunk: unknown,
+  option?
 ) => {
-  try {
+  return new Promise((resolve) => {
-    pipe?.write(...writeArgs)
+    // debugger
-  } catch (error) {
+    pipe?.write(chunk, option, (error) => {
-    console.log('pipe.write Error', error)
+      if (error) {
-  }
+        console.log('pipe.write Error', error)
+      }
+      resolve(undefined)
+    })
+  })
 }