add _id field to callbacks

Author: kylehuff

extension/API/libwebpg/nativeMessaging.js

@@ -172,13 +172,18 @@ webpg.nativeMessaging = {
       let func = result.func || result.type || undefined;
       if (func === "onkeygencomplete")
         func = "onkeygenprogress";
+      let _id = result._id || func;
+
       if (func !== undefined) {
-        let cb = port.callbacks[func] || undefined;
+        let cb = port.callbacks[func][_id] || port.callbacks[func] || undefined;
+
         delete result.func;
-        if (cb) {
+        delete result._id;
+
+        if (cb && typeof(cb) === "function") {
           cb(result);
           if (func !== "onstatusprogress" && (func !== "onkeygenprogress" && result.type !== "onkeygencomplete"))
-            delete port.callbacks[func];
+            delete port.callbacks[func][_id]
         }
       }
     };
@@ -274,28 +279,15 @@ webpg.nativeMessaging = {
           )
         ) ? "onkeygenprogress" : func
 
-    port.callbacks[func] = callback;
+    // generate a unique id for this invocation if one isn't provided
+    if (args._id == undefined)
+      args._id = (func.search("progress") > -1) ? func : new Date().getTime() + parseInt(Math.random()*0xffffffff);
+
+    port.callbacks[func] = port.callbacks[func] || {};
+    port.callbacks[func][args._id] = callback;
+
     port.postMessage(args);
-    /*return;
-    if (callback && (args.async===true || (args.params && args.params.async))) {
-      var port = webpg.nativeMessaging.port();
-      webpg.nativeMessaging.addListener(port, callback);
-      port.postMessage(args);
-    } else {
-      webpg.nativeMessaging.sendMessage(args,
-        function(res) {
-          if (callback && typeof(callback) === "function") {
-            if (webpg.utils.detectedBrowser.product === "chrome" && chrome.runtime.lastError)
-              callback(chrome.runtime.lastError);
-            else
-              callback(res);
-            return res;
-          } else {
-            return res;
-          }
-        }
-      );
-    }*/
+
   },
 
   getFunctionName: function() {

extension/background.js

@@ -588,9 +588,9 @@ webpg.background = {
                       }
                 };
                 if (request.temp_context) {
-                    webpg.plugin.getTemporaryPath(function(temp_path) {
-                      temp_path = temp_path.result || temp_path || "/tmp/.gnupg";
-                      webpg.plugin.gpgSetHomeDir(temp_path, attemptImport);
+                    webpg.plugin.getTemporaryPath(function(path) {
+                      path = path.result || path || "/tmp/.gnupg";
+                      webpg.plugin.gpgSetHomeDir(path, attemptImport);
                     });
                 } else {
                   attemptImport();
@@ -720,7 +720,7 @@ webpg.background = {
             case 'getNamedKey':
                 webpg.utils.info("getNamedKey requested");
                 request.bypassSendResult = true;
-                function getNamedKey() {
+                var getNamedKey = function() {
                   webpg.plugin.getNamedKey(request.key_id, false, false, function(response) {
                     if (request.temp_context) {
                       webpg.plugin.gpgSetHomeDir(gnupghome, function() {
@@ -741,10 +741,9 @@ webpg.background = {
                   });
                 }
                 if (request.temp_context) {
-                  webpg.plugin.getTemporaryPath(function(temp_path) {
-                    if (!temp_path)
-                        temp_path = "/tmp/.gnupg";
-                    webpg.plugin.gpgSetHomeDir(temp_path, function() {
+                  webpg.plugin.getTemporaryPath(function(path) {
+                    path = path.result || temp_path || "/tmp/.gnupg";
+                    webpg.plugin.gpgSetHomeDir(path, function() {
                       getNamedKey();
                     });
                   });
@@ -872,6 +871,7 @@ webpg.background = {
                 break;
 
         }
+
         // Return the response and let the connection be cleaned up.
         if (request.bypassSendResult !== true)
           sendResponse({'result': response});

extension/webpg_results.js

@@ -395,7 +395,7 @@ webpg.inline_results = {
                             for (var imported in import_status.imports) {
                                 if (import_status.imports[imported].fingerprint != "unknown"
                                 && import_status.imports[imported].result === "Success") {
-                                    key_id = import_status.imports[imported].fingerprint;
+                                    var key_id = import_status.imports[imported].fingerprint;
                                     webpg.utils.sendRequest({
                                         'msg': "getNamedKey",
                                         'key_id': key_id,