Merge pull request #23 from beetapp/eos_prompt

Eos prompt

Author: grctest

.vscode/settings.json

@@ -10,6 +10,6 @@
     "eslint.provideLintTask": true,
     "eslint.run": "onSave",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     }
 }

src/background.js

@@ -1,6 +1,8 @@
 import path from "path";
 import url from "url";
 import fs from "fs";
+import fsPromises from "fs/promises";
+
 import os from "os";
 
 import queryString from "query-string";
@@ -46,7 +48,6 @@ const logger = new Logger(isDevMode ? 3 : 0);
 let tray = null;
 let regexBTS = /1.2.\d+/g;
 
-
 async function _readFile(filePath) {
     return new Promise((resolve, reject) => {
         if (!filePath || !filePath.includes(".bin")) {
@@ -618,6 +619,8 @@ const createWindow = async () => {
     ipcMain.handle("blockchainRequest", async (event, arg) => {
         const { methods, account, chain } = arg;
 
+        console.log({ methods, account, chain });
+
         let blockchain;
         try {
             blockchain = await getBlockchainAPI(chain);
@@ -864,7 +867,7 @@ const createWindow = async () => {
                     allowedOperations
                 );
             } catch (error) {
-                console.log(error);
+                console.log({ error, location: "_parseDeeplink" });
             }
 
             if (apiobj && apiobj.type === Actions.INJECTED_CALL) {
@@ -892,50 +895,51 @@ const createWindow = async () => {
 
         if (methods.includes("localFileUpload")) {
             const { allowedOperations, filePath } = arg;
+            try {
+                const data = await fsPromises.readFile(filePath, "utf-8");
+
+                let apiobj;
+                try {
+                    apiobj = await _parseDeeplink(
+                        data,
+                        "local",
+                        chain,
+                        blockchain,
+                        blockchainActions,
+                        allowedOperations,
+                        null, // avoid TOTP
+                        true // changes request parsing
+                    );
+                } catch (error) {
+                    console.log(error);
+                }
 
-            fs.readFile(filePath, "utf-8", async (error, data) => {
-                if (!error) {
-                    let apiobj;
+                if (apiobj && apiobj.type === Actions.INJECTED_CALL) {
+                    let status;
                     try {
-                        apiobj = await _parseDeeplink(
-                            data,
-                            "local",
-                            chain,
+                        status = await inject(
                             blockchain,
-                            blockchainActions,
-                            allowedOperations,
-                            null, // avoid TOTP
-                            true // changes request parsing
+                            apiobj,
+                            mainWindow.webContents
                         );
                     } catch (error) {
-                        console.log(error);
+                        console.log({ error: error || "No status" });
                     }
 
-                    if (apiobj && apiobj.type === Actions.INJECTED_CALL) {
-                        let status;
-                        try {
-                            status = await inject(
-                                blockchain,
-                                apiobj,
-                                mainWindow.webContents
-                            );
-                        } catch (error) {
-                            console.log({ error: error || "No status" });
-                        }
+                    console.log({ status });
 
-                        if (
-                            status &&
-                            status.result &&
-                            !status.result.isError &&
-                            !status.result.canceled
-                        ) {
-                            responses["localFileUpload"] = status.result;
-                        }
+                    if (
+                        status &&
+                        status.result &&
+                        !status.result.isError &&
+                        !status.result.canceled
+                    ) {
+                        responses["localFileUpload"] = status.result;
                     }
-                } else {
-                    console.log({ error });
                 }
-            });
+            } catch (error) {
+                console.log({ error });
+            }
         }
 
         if (methods.includes("processQR")) {
@@ -1079,7 +1083,7 @@ const createWindow = async () => {
                 }
             }
         }
-        
+
         if (methods.includes("decryptBackup")) {
             const { filePath, pass } = arg;
 
@@ -1099,7 +1103,7 @@ const createWindow = async () => {
                 } catch (error) {
                     console.log({ error });
                 }
-                
+
                 if (unlocked) {
                     let retrievedAccounts;
                     try {
@@ -1110,12 +1114,12 @@ const createWindow = async () => {
                     } catch (error) {
                         console.log({ error });
                     }
-    
+
                     if (retrievedAccounts) {
                         responses["decryptBackup"] = retrievedAccounts;
                     }
                 }
-                
+
                 wh = null;
             }
         }