dwt 17.2.0 → 17.2.1

package/README.md

@@ -1,4 +1,4 @@
-# Dynamic Web TWAIN SDK for Scanners
+# Dynamic Web TWAIN SDK for Scanner and Camera
 ![version](https://img.shields.io/npm/v/dwt.svg)
 ![downloads](https://img.shields.io/npm/dm/dwt.svg) 
 ![jsdelivr](https://img.shields.io/jsdelivr/npm/hm/dwt.svg)

package/dist/dynamsoft.webtwain.min.js

@@ -1,4 +1,4 @@
-// @Fri 01/21/2022 101857 
+// @Tue 01/25/2022 142734 
 /*
 * @name: dwt all-in-one package
 * @version: 17.2
@@ -357,28 +357,12 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
       _this.DWT.CheckConnectToTheService(function () {
         Dynamsoft.DWT.ConnectToTheService();
       }, function () {
-
-        if (!Dynamsoft.navInfoSync.bSSL && Dynamsoft._isChrome94plus()) {
-          // check websocket
-          var urls = Dynamsoft.Lib.detect.urls, ws;
-
-          if (urls && urls.length > 0) {
-            var o = urls[0];
-            ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
-          } else {
-            // default
-            ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
-          }
-          ws.onopen = function () {
-            // alert must using https
-            ws.close();
+        if (Dynamsoft._isInsecurePrivateNetwork() && Dynamsoft._isChrome94plus()) {
+          Dynamsoft._checkDWTByWebSocket(function(){
             Dynamsoft.OnHTTPCorsError();
-          };
-
-          ws.onerror = function () {
+          }, function(){
             setTimeout(Dynamsoft.DWT_Reconnect, 500);
-          };
-
+          });
           return;
         }
         setTimeout(Dynamsoft.DWT_Reconnect, 500);
@@ -441,6 +425,54 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
     return false;
   };
 
+  Dynamsoft._isInsecurePrivateNetwork = function() {
+    var _host = location.hostname;
+    if(_host == 'localhost' || _host == '127.0.0.1' || _host.indexOf('192.168.')==0 || _host.indexOf('172.16.')==0 || _host.indexOf('10.')==0) {
+      return false;
+    }
+    return !Dynamsoft.navInfoSync.bSSL;
+  }
+  
+  Dynamsoft._checkDWTByWebSocket = function(callbackSuccess, callbackVersionFailed) {
+    var urls = Dynamsoft.Lib.detect.urls, ws;
+    if (urls && urls.length > 0) {
+      var o = urls[0];
+      ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
+    } else {
+      // default
+      ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
+    }
+
+    ws.onopen = function() {
+      if (ws.readyState == 1) {
+        ws.onopen = null;
+        var strPostStringData = ['{"id":"',new Date().getTime(),'","method":"VersionInfo","version":"',
+            Dynamsoft.Lib.product.getDWTPrefix(), Dynamsoft.Lib.product.getServerVersionInfo(),'"}'].join('');
+        ws.send(strPostStringData);
+      } else if (ws.readyState == 0) {
+        setTimeout(ws.onopen, 100);
+      }
+    };
+
+    ws.onmessage = function (msg) {
+      try {
+        ws.close();
+        if(msg.data.indexOf('Version not found')>=0)
+          callbackVersionFailed();
+        else
+          callbackSuccess();
+      } catch (exp) {
+        callbackVersionFailed();
+        ws.close();
+      }
+      msg = null;
+    };
+
+    ws.onerror = function () {
+        callbackVersionFailed();
+    };
+  }
+
   Dynamsoft._show_install_dialog = function (ProductName, objInstallerUrl, bHTML5, iPlatform, bIE, bSafari, bSSL, strIEVersion, bNeedCheckChrome) {
     var _this = Dynamsoft, ObjString, title, browserActionNeeded,
       EnumPlatform = Dynamsoft.DWT.EnumDWT_PlatformType,
@@ -458,27 +490,12 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
 
     if (_this.DWT) {
 
-      if (bNeedCheckChrome && !Dynamsoft.navInfoSync.bSSL && Dynamsoft._isChrome94plus()) {
-        // check websocket
-        var urls = Dynamsoft.Lib.detect.urls, ws;
-
-        if (urls && urls.length > 0) {
-          var o = urls[0];
-          ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
-        } else {
-          // default
-          ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
-        }
-        ws.onopen = function () {
-          // alert must using https
-          ws.close();
+      if (bNeedCheckChrome && Dynamsoft._isInsecurePrivateNetwork() && Dynamsoft._isChrome94plus()) {
+        Dynamsoft._checkDWTByWebSocket(function(){
           Dynamsoft.OnHTTPCorsError();
-        };
-
-        ws.onerror = function () {
+        }, function(){
           Dynamsoft._show_install_dialog(ProductName, objInstallerUrl, bHTML5, iPlatform, bIE, bSafari, bSSL, strIEVersion, false);
-        };
-
+        });
         return;
       }
 

package/dist/dynamsoft.webtwain.min.mjs

@@ -1,4 +1,4 @@
-// @Fri 01/21/2022 101857 
+// @Tue 01/25/2022 142734 
 /*
 * @name: dwt all-in-one package
 * @version: 17.2
@@ -18,7 +18,7 @@
  * It's used as part of the barcode add-on when required.
  */
 import DSBarcodeReader from "dynamsoft-javascript-barcode";
-
+ 
 // @Wed 01/12/2022 100920_0120 
 /*!
 * Dynamsoft JavaScript Library
@@ -362,28 +362,12 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
       _this.DWT.CheckConnectToTheService(function () {
         Dynamsoft.DWT.ConnectToTheService();
       }, function () {
-
-        if (!Dynamsoft.navInfoSync.bSSL && Dynamsoft._isChrome94plus()) {
-          // check websocket
-          var urls = Dynamsoft.Lib.detect.urls, ws;
-
-          if (urls && urls.length > 0) {
-            var o = urls[0];
-            ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
-          } else {
-            // default
-            ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
-          }
-          ws.onopen = function () {
-            // alert must using https
-            ws.close();
+        if (Dynamsoft._isInsecurePrivateNetwork() && Dynamsoft._isChrome94plus()) {
+          Dynamsoft._checkDWTByWebSocket(function(){
             Dynamsoft.OnHTTPCorsError();
-          };
-
-          ws.onerror = function () {
+          }, function(){
             setTimeout(Dynamsoft.DWT_Reconnect, 500);
-          };
-
+          });
           return;
         }
         setTimeout(Dynamsoft.DWT_Reconnect, 500);
@@ -446,6 +430,54 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
     return false;
   };
 
+  Dynamsoft._isInsecurePrivateNetwork = function() {
+    var _host = location.hostname;
+    if(_host == 'localhost' || _host == '127.0.0.1' || _host.indexOf('192.168.')==0 || _host.indexOf('172.16.')==0 || _host.indexOf('10.')==0) {
+      return false;
+    }
+    return !Dynamsoft.navInfoSync.bSSL;
+  }
+  
+  Dynamsoft._checkDWTByWebSocket = function(callbackSuccess, callbackVersionFailed) {
+    var urls = Dynamsoft.Lib.detect.urls, ws;
+    if (urls && urls.length > 0) {
+      var o = urls[0];
+      ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
+    } else {
+      // default
+      ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
+    }
+
+    ws.onopen = function() {
+      if (ws.readyState == 1) {
+        ws.onopen = null;
+        var strPostStringData = ['{"id":"',new Date().getTime(),'","method":"VersionInfo","version":"',
+            Dynamsoft.Lib.product.getDWTPrefix(), Dynamsoft.Lib.product.getServerVersionInfo(),'"}'].join('');
+        ws.send(strPostStringData);
+      } else if (ws.readyState == 0) {
+        setTimeout(ws.onopen, 100);
+      }
+    };
+
+    ws.onmessage = function (msg) {
+      try {
+        ws.close();
+        if(msg.data.indexOf('Version not found')>=0)
+          callbackVersionFailed();
+        else
+          callbackSuccess();
+      } catch (exp) {
+        callbackVersionFailed();
+        ws.close();
+      }
+      msg = null;
+    };
+
+    ws.onerror = function () {
+        callbackVersionFailed();
+    };
+  }
+
   Dynamsoft._show_install_dialog = function (ProductName, objInstallerUrl, bHTML5, iPlatform, bIE, bSafari, bSSL, strIEVersion, bNeedCheckChrome) {
     var _this = Dynamsoft, ObjString, title, browserActionNeeded,
       EnumPlatform = Dynamsoft.DWT.EnumDWT_PlatformType,
@@ -463,27 +495,12 @@ Dynamsoft.AddonReady(function(c,b){if(!c.product.bHTML5Edition||Dynamsoft.navInf
 
     if (_this.DWT) {
 
-      if (bNeedCheckChrome && !Dynamsoft.navInfoSync.bSSL && Dynamsoft._isChrome94plus()) {
-        // check websocket
-        var urls = Dynamsoft.Lib.detect.urls, ws;
-
-        if (urls && urls.length > 0) {
-          var o = urls[0];
-          ws = Dynamsoft.Lib.getWS(o.host, o.port, o.ssl);
-        } else {
-          // default
-          ws = Dynamsoft.Lib.getWS(Dynamsoft.Lib.product.host, 18622, false);
-        }
-        ws.onopen = function () {
-          // alert must using https
-          ws.close();
+      if (bNeedCheckChrome && Dynamsoft._isInsecurePrivateNetwork() && Dynamsoft._isChrome94plus()) {
+        Dynamsoft._checkDWTByWebSocket(function(){
           Dynamsoft.OnHTTPCorsError();
-        };
-
-        ws.onerror = function () {
+        }, function(){
           Dynamsoft._show_install_dialog(ProductName, objInstallerUrl, bHTML5, iPlatform, bIE, bSafari, bSSL, strIEVersion, false);
-        };
-
+        });
         return;
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dwt",
-    "version": "17.2.0",
+    "version": "17.2.1",
     "author": {
         "name": "Dynamsoft",
         "url": "https://www.dynamsoft.com"