feat: collect

cnumr · Jun 30, 2024 · cd0f068 · cd0f068
1 parent d16f66c
commit cd0f068
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 119 deletions.
diff --git a/electron-app/ecoindex-app/README.md b/electron-app/ecoindex-app/README.md
@@ -13,13 +13,14 @@
 - [ ] Auto build with CI/CD
 - [ ] Translate
 - [x] Create simple mesure
-- [ ] Fix not showing buttons to install plugin
+- [ ] Use path /usr/bin and /usr/bin/which to launch node `/usr/bin/which node` and npm `/usr/bin/which npm` action
+- [x] Fix not showing buttons to install plugin
   - [ ] handler for install plugin
 - [ ] Fix not showing buttons to install Node
   - [ ] handler for install Node
 - [ ] Create complex mesure
   - [x] Save JSON on disk
-    - [ ] Fix extra-header not JSON (todo)
+    - [x] Fix extra-header not JSON
   - [ ] Read/Reload JSON from disk (doing)
   - [ ] Use JSON to display data
-  - [ ] Launch mesure from JSON (save before)
+  - [x] Launch mesure from JSON (save before)
diff --git a/electron-app/ecoindex-app/src/interface.d.ts b/electron-app/ecoindex-app/src/interface.d.ts
@@ -14,8 +14,7 @@ export interface IElectronAPI {
   isNodeInstalled: () => Promise<boolean>
   isLighthouseEcoindexPluginInstalled: () => Promise<boolean>
   handleSimpleMesures: (urlsList: SimpleUrlInput[]) => void
-  handleJsonMesures: (json: IJsonMesureData) => void
-  handleJsonSave: (json: IJsonMesureData) => void
+  handleJsonSaveAndCollect: (json: IJsonMesureData, andCollect: boolean) => void
   handleJsonReadAndReload: () => void
 }
 

diff --git a/electron-app/ecoindex-app/src/main/main.ts b/electron-app/ecoindex-app/src/main/main.ts
@@ -54,10 +54,9 @@ const createWindow = (): void => {
 // Some APIs can only be used after this event occurs.
 app.on('ready', () => {
   // simple handlers
-  ipcMain.handle(channels.SIMPLE_MESURES, handleSimpleMesures)
+  ipcMain.handle(channels.SIMPLE_MESURES, handleSimpleCollect)
   // json handlers
-  ipcMain.handle(channels.JSON_MESURES, handleJsonMesures)
-  ipcMain.handle(channels.SAVE_JSON_FILE, handleJsonSave)
+  ipcMain.handle(channels.SAVE_JSON_FILE, handleJsonSaveAndCollect)
   ipcMain.handle(channels.READ_RELOAD_JSON_FILE, handleJsonReadAndReload)
   // communs handlers and getters
   ipcMain.handle(channels.GET_NODE_VERSION, getNodeVersion)
@@ -234,32 +233,22 @@ const handleWorkDir = async (event: IpcMainEvent, newDir: string) => {
   return await workDir
 }
 
-async function handleSimpleMesures(
-  event: IpcMainEvent,
-  urlsList: SimpleUrlInput[],
-) {
-  if (!urlsList || urlsList.length === 0) {
-    throw new Error('Urls list is empty')
-  }
-  showNotification({
-    body: 'Process intialization 🧩',
-    subtitle: 'Simple mesures',
-  })
-  console.log('Simple mesure start...')
-
+async function prepareJsonCollect(): Promise<{
+  logStream: fs.WriteStream
+  command: string[]
+  nodeDir: string
+  workDir: string
+}> {
   // create stream to log the output. TODO: use specified path
-  const _workDir = await workDir
-  if (!_workDir || _workDir === '') {
-    throw new Error('Work dir not found')
-  }
-  console.log(`Work dir: ${_workDir}`)
-  const logFilePath = `${_workDir}/logfile.txt`
-  const logStream = fs.createWriteStream(logFilePath)
-  logStream.write('fake mesure start...\n')
-  console.log(`Urls list: ${JSON.stringify(urlsList)}`)
-  logStream.write(`Urls list: ${urlsList}`)
-
   try {
+    const _workDir = await workDir
+    if (!_workDir || _workDir === '') {
+      throw new Error('Work dir not found')
+    }
+    console.log(`Work dir: ${_workDir}`)
+    const logFilePath = `${_workDir}/logfile.txt`
+    const logStream = fs.createWriteStream(logFilePath)
+
     const _shellEnv = await shellEnv()
     logStream.write(`Shell Env: ${JSON.stringify(_shellEnv, null, 2)}\n`)
 
@@ -275,6 +264,79 @@ async function handleSimpleMesures(
       `${npmDir}/lighthouse-plugin-ecoindex/cli/index.js`,
       'collect',
     ]
+    return { logStream, command, nodeDir, workDir: _workDir }
+  } catch (error) {
+    console.error('Error', error)
+  }
+}
+
+async function runJsonCollect(
+  command: string[],
+  nodeDir: string,
+  event: IpcMainEvent,
+  logStream: fs.WriteStream,
+): Promise<string> {
+  const childProcess: ChildProcess = spawn(`${nodeDir}`, command, {
+    stdio: ['pipe', 'pipe', process.stderr],
+    shell: true,
+  })
+
+  childProcess.on('exit', (code, signal) => {
+    logStream.write(
+      `Child process exited with code ${code} and signal ${signal}\n`,
+    )
+  })
+
+  childProcess.on('close', code => {
+    logStream.write(`Child process close with code ${code}\n`)
+    logStream.write('Mesure done 🚀\n')
+  })
+
+  childProcess.stdout.on('data', data => {
+    logStream.write(`stdout: ${data}\n`)
+  })
+
+  if (childProcess.stderr) {
+    childProcess.stderr.on('data', data => {
+      logStream.write(`stderr: ${data.toString()}\n`)
+    })
+  }
+
+  childProcess.on('disconnect', () => {
+    logStream.write('Child process disconnected\n')
+  })
+
+  childProcess.on('message', (message, sendHandle) => {
+    logStream.write(`Child process message: ${message}\n`)
+  })
+
+  await _echoReadable(event, childProcess.stdout)
+  return 'mesure done'
+}
+
+async function handleSimpleCollect(
+  event: IpcMainEvent,
+  urlsList: SimpleUrlInput[],
+) {
+  if (!urlsList || urlsList.length === 0) {
+    throw new Error('Urls list is empty')
+  }
+  showNotification({
+    body: 'Process intialization 🧩',
+    subtitle: 'Simple mesures',
+  })
+  console.log('Simple mesure start...')
+
+  const {
+    command,
+    logStream,
+    nodeDir,
+    workDir: _workDir,
+  } = await prepareJsonCollect()
+  logStream.write('Simple mesure start...\n')
+  console.log(`Urls list: ${JSON.stringify(urlsList)}`)
+  logStream.write(`Urls list: ${urlsList}`)
+  try {
     urlsList.forEach(url => {
       if (url.value) {
         command.push('-u')
@@ -290,41 +352,11 @@ async function handleSimpleMesures(
       body: 'Mesures started 🚀',
       subtitle: 'Simple mesures',
     })
-    const childProcess: ChildProcess = spawn(`${nodeDir}`, command, {
-      stdio: ['pipe', 'pipe', process.stderr],
-      shell: true,
-    })
-
-    childProcess.on('exit', (code, signal) => {
-      logStream.write(
-        `Child process exited with code ${code} and signal ${signal}\n`,
-      )
-    })
-
-    childProcess.on('close', code => {
-      logStream.write(`Child process close with code ${code}\n`)
-      logStream.write('Simple mesure done 🚀\n')
-    })
-
-    childProcess.stdout.on('data', data => {
-      logStream.write(`stdout: ${data}\n`)
-    })
-
-    if (childProcess.stderr) {
-      childProcess.stderr.on('data', data => {
-        logStream.write(`stderr: ${data.toString()}\n`)
-      })
+    try {
+      await runJsonCollect(command, nodeDir, event, logStream)
+    } catch (error) {
+      throw new Error('Simple collect error')
     }
-
-    childProcess.on('disconnect', () => {
-      logStream.write('Child process disconnected\n')
-    })
-
-    childProcess.on('message', (message, sendHandle) => {
-      logStream.write(`Child process message: ${message}\n`)
-    })
-
-    await _echoReadable(event, childProcess.stdout)
     // process.stdout.write(data)
     // console.log(result.stdout.toString());
     showNotification({
@@ -339,22 +371,10 @@ async function handleSimpleMesures(
   // alert process done
 }
 
-const handleJsonMesures = async (
-  event: IpcMainEvent,
-  jsonDatas: IJsonMesureData,
-) => {
-  if (!jsonDatas) {
-    throw new Error('Json data is empty')
-  }
-  showNotification({
-    body: 'Process intialization 🧩',
-    subtitle: 'Json mesures handler',
-  })
-}
-
-const handleJsonSave = async (
+const handleJsonSaveAndCollect = async (
   event: IpcMainEvent,
   jsonDatas: IJsonMesureData,
+  andCollect: boolean,
 ) => {
   if (!jsonDatas) {
     throw new Error('Json data is empty')
@@ -373,17 +393,65 @@ const handleJsonSave = async (
     console.log(`Work dir: ${_workDir}`)
     const jsonFilePath = `${_workDir}/${utils.JSON_FILE_NAME}`
     const jsonStream = fs.createWriteStream(jsonFilePath)
-    jsonStream.write(JSON.stringify(jsonDatas))
+    if (jsonDatas['extra-header']) {
+      try {
+        jsonDatas['extra-header'] = JSON.parse(
+          Object(jsonDatas['extra-header']),
+        )
+        String(jsonDatas['extra-header']).replace(/\\/g, '')
+      } catch (error) {
+        console.error(`extra-header is not in Json format.`, error)
+        jsonDatas['extra-header'] = {}
+      }
+    }
+    jsonStream.write(JSON.stringify(jsonDatas, null, 2))
     showNotification({
       body: 'Json file saved 📁',
       subtitle: 'Json save handler',
     })
+    if (andCollect) {
+      showNotification({
+        body: 'Process intialization 🧩',
+        subtitle: 'Json mesures handler',
+      })
+      console.log('Json mesure start...')
+
+      const {
+        command,
+        logStream,
+        nodeDir,
+        workDir: _workDir,
+      } = await prepareJsonCollect()
+      logStream.write('Json mesure start...\n')
+      logStream.write(`JSON datas ${JSON.stringify(jsonDatas, null, 2)}\n`)
+      command.push('--json-file')
+      command.push(_workDir + '/' + utils.JSON_FILE_NAME)
+      console.log(command)
+      try {
+        await runJsonCollect(command, nodeDir, event, logStream)
+      } catch (error) {
+        throw new Error('Simple collect error')
+      }
+      showNotification({
+        body: `Mesures done, you can consult reports in\n${_workDir}`,
+        subtitle: 'Json mesures',
+      })
+      console.log('Json mesure done 🚀')
+      return 'mesure done'
+    }
   } catch (error) {
-    _sendMessageToFrontLog('ERROR', 'Json file not saved', error)
-    showNotification({
-      body: 'Json file not saved 📁',
-      subtitle: 'Json save handler',
-    })
+    if (!andCollect) {
+      _sendMessageToFrontLog('ERROR', 'Json file not saved', error)
+      showNotification({
+        body: 'Json file not saved 📁',
+        subtitle: 'Json save handler',
+      })
+    } else {
+      showNotification({
+        body: 'Json file not saved or collect 📁',
+        subtitle: 'Json save and collect handler',
+      })
+    }
   }
 }
 

diff --git a/electron-app/ecoindex-app/src/main/preload.ts b/electron-app/ecoindex-app/src/main/preload.ts
@@ -19,10 +19,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
   handleSimpleMesures: (urlsList: SimpleUrlInput[]) =>
     ipcRenderer.invoke(channels.SIMPLE_MESURES, urlsList),
   // json handlers
-  handleJsonMesures: (jsonDatas: IJsonMesureData) =>
-    ipcRenderer.invoke(channels.JSON_MESURES, jsonDatas),
-  handleJsonSave: (jsonDatas: IJsonMesureData) =>
-    ipcRenderer.invoke(channels.SAVE_JSON_FILE, jsonDatas),
+  handleJsonSaveAndCollect: (jsonDatas: IJsonMesureData, andCollect: boolean) =>
+    ipcRenderer.invoke(channels.SAVE_JSON_FILE, jsonDatas, andCollect),
   handleJsonReadAndReload: () =>
     ipcRenderer.invoke(channels.READ_RELOAD_JSON_FILE),
 

diff --git a/electron-app/ecoindex-app/src/renderer/App.tsx b/electron-app/ecoindex-app/src/renderer/App.tsx
@@ -129,19 +129,6 @@ function Hello() {
     }
   }
 
-  const runJsonMesures = () => {
-    console.log('Json mesures clicked')
-    try {
-      window.electronAPI.handleJsonMesures(jsonDatas)
-    } catch (error) {
-      console.error('Error on runJsonMesures', error)
-      showNotification('', {
-        body: 'Error on runJsonMesures',
-        subtitle: 'Courses Mesure (Full mode)',
-      })
-    }
-  }
-
   const runJsonReadAndReload = () => {
     console.log('Json read and reload clicked')
     try {
@@ -155,14 +142,14 @@ function Hello() {
     }
   }
 
-  const runJsonSave = () => {
+  const runJsonSaveAndCollect = (saveAndCollect = false) => {
     console.log('Json save clicked')
     try {
-      window.electronAPI.handleJsonSave(jsonDatas)
+      window.electronAPI.handleJsonSaveAndCollect(jsonDatas, saveAndCollect)
     } catch (error) {
-      console.error('Error on runJsonSave', error)
+      console.error('Error on runJsonSaveAndCollect', error)
       showNotification('', {
-        body: 'Error on runJsonSave',
+        body: 'Error on runJsonSaveAndCollect',
         subtitle: 'Courses Mesure (Full mode)',
       })
     }
@@ -188,8 +175,8 @@ function Hello() {
   }
 
   const increment = () => {
-    console.log('increment')
     loadingScreen = loadingScreen + 1
+    console.log(`Verify configuration step ${loadingScreen}/4`)
     const counter = document.getElementById('counter') as HTMLElement
     counter.innerText = `Loading... ${loadingScreen}/4`
     const loadingPopin = document.getElementById('loadingPopin') as HTMLElement
@@ -333,9 +320,9 @@ function Hello() {
               language={language}
               jsonDatas={jsonDatas}
               setJsonDatas={setJsonDatas}
-              mesure={runJsonMesures}
+              mesure={() => runJsonSaveAndCollect(true)}
               reload={runJsonReadAndReload}
-              save={runJsonSave}
+              save={runJsonSaveAndCollect}
               notify={handlerJsonNotify}
               className={cn(
                 'tab-content',