@toolspack/ttd-common 1.1.6 → 1.2.0

package/src/packages/ukey/nmCryptokit.ToToDi.js

@@ -34,44 +34,59 @@ window.nmCryptokit = nmCryptokit
 // Encapsulate Chrome sendMessage callback to Promise
 nmCryptokit.SendMessageforChrome = function(request) {
     return new Promise( function (resolve, reject) {
-        chrome.runtime.sendMessage(nmCryptokit.chromeExtension, request, function (response) {
-			if (response) {
-				if(0 == response.errorcode){ 
-                    resolve(response);                                    
-				}
-				else{
-                    reject(response);
-				}
-			}
-			else {
-			    var result = new Object();
-			    result.errorcode = 1;
-			    result.result = chrome.runtime.lastError.message;
-			    reject(result);
-			}
-		});
+        if (chrome.runtime?.sendMessage){
+            chrome.runtime.sendMessage(nmCryptokit.chromeExtension, request, function (response) {
+                if (response) {
+                    if(0 == response.errorcode){ 
+                        resolve(response);                                    
+                    }
+                    else{
+                        reject(response);
+                    }
+                }
+                else {
+                    var result = new Object();
+                    result.errorcode = 1;
+                    result.result = chrome.runtime.lastError.message;
+                    reject(result);
+                }
+            });
+        } else {
+            reject({
+                errorcode: 1,
+                result: '缺失必要签署组件！' 
+            });
+        }
+       
     });
 }
 
 // Encapsulate Chrome sendMessage callback to Promise
 nmCryptokit.SendMessageforEdge = function(request) {
     return new Promise( function (resolve, reject) {
-        chrome.runtime.sendMessage(nmCryptokit.edgeExtension, request, function (response) {
-			if (response) {
-				if(0 == response.errorcode){ 
-                    resolve(response);                                    
-				}
-				else{
-                    reject(response);
-				}
-			}
-			else {
-			    var result = new Object();
-			    result.errorcode = 1;
-			    result.result = chrome.runtime.lastError.message;
-			    reject(result);
-			}
-		});
+        if (chrome.runtime?.sendMessage) {
+            chrome.runtime.sendMessage(nmCryptokit.edgeExtension, request, function (response) {
+                if (response) {
+                    if(0 == response.errorcode){ 
+                        resolve(response);                                    
+                    }
+                    else{
+                        reject(response);
+                    }
+                }
+                else {
+                    var result = new Object();
+                    result.errorcode = 1;
+                    result.result = chrome.runtime.lastError.message;
+                    reject(result);
+                }
+            });
+        } else {
+            reject({
+                errorcode: 1,
+                result: '缺失必要签署组件！' 
+            });
+        }
     });
 }
 
@@ -117,9 +132,7 @@ nmCryptokit.SendMessage = function(browser, requestJSON) {
 nmCryptokit.checkExtension = function(browser) {
     return new Promise(function (resolve, reject) {
         var result = new Object();
-        console.log('444', browser)
         if (nmCryptokit.Browser.Chrome == browser || nmCryptokit.Browser.Edg == browser) {
-            // chrome.runtime.sendMessage() could check extension  existence.
             if(chrome.runtime) {
                 resolve(browser);
             }
@@ -148,10 +161,7 @@ nmCryptokit.checkExtension = function(browser) {
 }
 	
 nmCryptokit.prototype.init = function () {
-
     var browser = this.browser;
-    console.log('2223', browser)
-
     return nmCryptokit.checkExtension(browser)
         .then(function (browser) {
             var request = new Object();
@@ -176,37 +186,29 @@ nmCryptokit.prototype.init = function () {
 
 
 nmCryptokit.prototype.uninit = function () {
-
     var request = new Object();                   
     request.action = "disconnect";
     request.host = nmCryptokit.productID;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }
 
 
 nmCryptokit.prototype.getExtensionVersion = function ( ) {
-
     var request = new Object();
     var funcInfo = new Object();
-    
     funcInfo.function = "getExtensionVersion";
     funcInfo.params = null;
     request.action = "getExtensionVersion";
     request.funcInfo = funcInfo;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }
 
 nmCryptokit.prototype.GetSealImage = function (bstrP11Name) {
-
     var request = new Object();
     var funcInfo = new Object();
     var paramArr = new Array();
     var randomId = GenerateRandomId();
-
     paramArr.push(bstrP11Name);
-
     funcInfo.function = "GetSealImage";
     funcInfo.params = paramArr;
     funcInfo.randomId = randomId;
@@ -226,10 +228,8 @@ nmCryptokit.prototype.getHostVersion = function () {
     funcInfo.function = "GetVersion";
     funcInfo.params = null;
     funcInfo.randomId = randomId;
-       
     request.action = "invoke";
     request.funcInfo = funcInfo;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }