gis-common 1.0.18 → 1.2.1

package/dist/resource.min.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("mqtt"));
+		module.exports = factory();
 	else if(typeof define === 'function' && define.amd)
-		define("Gis", ["mqtt"], factory);
+		define("Gis", [], factory);
 	else if(typeof exports === 'object')
-		exports["Gis"] = factory(require("mqtt"));
+		exports["Gis"] = factory();
 	else
-		root["Gis"] = factory(root["mqtt"]);
-})(window, function(__WEBPACK_EXTERNAL_MODULE__0__) {
+		root["Gis"] = factory();
+})(window, function() {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -91,17 +91,11 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE__0__;
-
-/***/ }),
-/* 1 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -130,7 +124,6 @@ __webpack_require__.d(__webpack_exports__, "CanvasDrawer", function() { return /
 __webpack_require__.d(__webpack_exports__, "ElQuery", function() { return /* reexport */ core_ElQuery; });
 __webpack_require__.d(__webpack_exports__, "EventDispatcher", function() { return /* reexport */ core_EventDispatcher; });
 __webpack_require__.d(__webpack_exports__, "HashMap", function() { return /* reexport */ core_HashMap; });
-__webpack_require__.d(__webpack_exports__, "MqttClient", function() { return /* reexport */ core_MqttClient; });
 __webpack_require__.d(__webpack_exports__, "WebSocketClient", function() { return /* reexport */ core_WebSocketClient; });
 __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /* reexport */ core_WebStorage; });
 
@@ -316,7 +309,7 @@ __webpack_require__.d(__webpack_exports__, "WebStorage", function() { return /*
      * @param {*} json
      * @returns {*}
      */
-    json2Query: function json2Query(json) {
+    jsontoQuery: function jsontoQuery(json) {
         var tempArr = [];
         for (var i in json) {
             var key = i;
@@ -717,22 +710,22 @@ Array.prototype.clear = function () {
 
         var exp = new Date();
         exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
-        document.cookie = name + '=' + escape(value) + ';expires=' + exp.toGMTString();
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
     },
     remove: function remove(name) {
         var exp = new Date();
         exp.setTime(exp.getTime() - 1);
-        var cval = this.get(name);
+        var cval = getCookie(name);
         if (cval != null) {
-            document.cookie = name + '=' + cval + ';expires=' + exp.toGMTString();
+            document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
         }
     },
     get: function get(name) {
-        var arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'));
+        var arr = document.cookie.match(new RegExp("(^| )" + name + "=([^;]*)(;|$)"));
         if (arr != null) {
             return arr[2];
         } else {
-            return '';
+            return "";
         }
     }
 });
@@ -1493,7 +1486,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
 });
 // CONCATENATED MODULE: ./src/utils/StringUtils.js
-
 /* harmony default export */ var StringUtils = ({
     /**
      * 常用正则验证
@@ -1611,62 +1603,17 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
                 return str;
         }
     },
-
-    /**
-     * 处理字符串模板
-     * eg: tag`${abc}`
-     * @param {*} strArray
-     * @param {*} args
-     * @returns {*}
-     */
     tag: function tag(strArray) {
         for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
             args[_key - 1] = arguments[_key];
         }
 
         args = args.map(function (val) {
-            switch (CommUtils.getDataType(val)) {
-                case 'Object':
-                    return val || '{}';
-                case 'Array':
-                    return val || '[]';
-                default:
-                    return val || '';
-            }
+            return val || '';
         });
         return strArray.reduce(function (prev, next, index) {
             return '' + prev + args[index - 1] + next;
         });
-    },
-
-    /**
-     * 获取字符串字节长度
-     * @param {*} str
-     * @returns {*}
-     */
-    getByteLength: function getByteLength(str) {
-        return str.replace(/[\u0391-\uFFE5]/g, 'aa').length;
-    },
-
-    /**
-     * 根据字节长度截取字符串
-     * @param {*} str
-     * @param {*} n
-     * @returns {*}
-     */
-    subStringByte: function subStringByte(str, n) {
-        var r = /[^\x00-\xff]/g;
-        if (str.replace(r, 'mm').length <= n) {
-            return str;
-        }
-        var m = Math.floor(n / 2);
-        for (var i = m; i < str.length; i++) {
-            var sub = str.substring(0, i);
-            if (sub.replace(r, 'mm').length >= n) {
-                return sub;
-            }
-        }
-        return str;
     }
 });
 // CONCATENATED MODULE: ./src/utils/index.js
@@ -2092,184 +2039,27 @@ var HashMap = function () {
 }();
 
 /* harmony default export */ var core_HashMap = (HashMap);
-// EXTERNAL MODULE: external "mqtt"
-var external_mqtt_ = __webpack_require__(0);
-
-// CONCATENATED MODULE: ./src/core/MqttClient.js
-var MqttClient_createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-function MqttClient_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-
-
-
-
-
-
-var MqttClient_MqttClient = function (_EventDispatcher) {
-    _inherits(MqttClient, _EventDispatcher);
-
-    /**
-     * Creates an instance of MqttClient.
-     * @param {*} config mqtt实例参数
-     */
-    function MqttClient() {
-        var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-        MqttClient_classCallCheck(this, MqttClient);
-
-        var _this = _possibleConstructorReturn(this, (MqttClient.__proto__ || Object.getPrototypeOf(MqttClient)).call(this));
-
-        _this.context = CommUtils.extend(MqttClient.defaultContext, config);
-        _this.options = {
-            connectTimeout: _this.context.MQTT_TIMEOUTM,
-            clientId: CommUtils.generateGuid(),
-            username: _this.context.MQTT_USERNAME,
-            password: _this.context.MQTT_PASSWORD,
-            clean: true
-        };
-        _this.client = Object(external_mqtt_["connect"])(_this.context.MQTT_SERVICE, _this.options);
-        _this._onConnect();
-        _this._onMessage();
-        MqttClient.instance = _this;
-        return _this;
-    }
-
-    MqttClient_createClass(MqttClient, [{
-        key: "_onConnect",
-        value: function _onConnect() {
-            var _this2 = this;
-
-            this.client.on("connect", function () {
-                console.log("链接mqtt成功==>" + _this2.context.MQTT_SERVICE);
-                _this2.dispatchEvent({ type: EventTypeConstant.MQTT_CONNECT, message: _this2 });
-            });
-            this.client.on("error", function (err) {
-                console.log("链接mqtt报错", err);
-                _this2.dispatchEvent({ type: EventTypeConstant.MQTT_ERROR, message: _this2 });
-                _this2.client.end();
-                _this2.client.reconnect();
-            });
-        }
-    }, {
-        key: "_onMessage",
-        value: function _onMessage() {
-            var _this3 = this;
-
-            this.client.on("message", function (topic, message) {
-                var dataString = message;
-                var data = "";
-                if (message instanceof Uint8Array) {
-                    dataString = message.toString();
-                }
-                try {
-                    data = JSON.parse(dataString);
-                } catch (error) {
-                    throw new Error(ErrorTypeConstant.JSON_PARSE_ERROR);
-                }
-                _this3.dispatchEvent({
-                    type: EventTypeConstant.MQTT_MESSAGE,
-                    message: { topic: topic, data: data }
-                });
-            });
-        }
-    }, {
-        key: "sendMsg",
-        value: function sendMsg(topic, msg) {
-            if (!this.client.connected) {
-                console.error("客户端未连接");
-                return;
-            }
-            this.client.publish(topic, msg, { qos: 1, retain: true });
-        }
-    }, {
-        key: "subscribe",
-        value: function subscribe(topic) {
-            this.client.subscribe(topic, { qos: 1 }, function (error, res) {
-                if (error instanceof Error || res.length === 0) {
-                    console.error("\u8BA2\u9605\u5931\u8D25==>" + topic, error);
-                } else {
-                    console.log("\u8BA2\u9605\u6210\u529F==>" + topic);
-                }
-            });
-            return this;
-        }
-    }, {
-        key: "unsubscribe",
-        value: function unsubscribe(topic) {
-            this.client.unsubscribe(topic, { qos: 1 }, function (error, res) {
-                if (error instanceof Error || res.length === 0) {
-                    console.error("\u53D6\u6D88\u8BA2\u9605\u5931\u8D25==>" + topic, error);
-                } else {
-                    console.log("\u53D6\u6D88\u8BA2\u9605\u6210\u529F==>" + topic);
-                }
-            });
-            return this;
-        }
-    }, {
-        key: "unconnect",
-        value: function unconnect() {
-            this.client.end();
-            this.client = null;
-            this.dispatchEvent({ type: EventTypeConstant.MQTT_CLOSE, message: null });
-            console.log("断开mqtt成功==>" + this.context.MQTT_SERVICE);
-        }
-        /**
-         * @description 获取并冻结mqtt实例
-         * @static
-         * @param {*} [config={}]
-         * @returns {MqttClient}
-         */
-
-    }], [{
-        key: "getInstance",
-        value: function getInstance() {
-            var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-            if (MqttClient.instance) {
-                return Object.freeze(MqttClient.instance);
-            } else {
-                return Object.freeze(new MqttClient(config));
-            }
-        }
-    }]);
-
-    return MqttClient;
-}(core_EventDispatcher);
-
-/* harmony default export */ var core_MqttClient = (MqttClient_MqttClient);
-
-MqttClient_MqttClient.defaultContext = {
-    MQTT_TIMEOUTM: 20000,
-    MQTT_USERNAME: "iRVMS-WEB",
-    MQTT_PASSWORD: "novasky888",
-    MQTT_SERVICE: "ws://" + window.document.domain + ":20007/mqtt"
-};
 // CONCATENATED MODULE: ./src/core/WebSocketClient.js
 var WebSocketClient_createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 function WebSocketClient_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function WebSocketClient_possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function WebSocketClient_inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 
 
 
 var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
-    WebSocketClient_inherits(WebSocketClient, _EventDispatcher);
+    _inherits(WebSocketClient, _EventDispatcher);
 
     function WebSocketClient() {
-        var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'ws://127.0.0.1:10088';
+        var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "ws://127.0.0.1:10088";
 
         WebSocketClient_classCallCheck(this, WebSocketClient);
 
-        var _this = WebSocketClient_possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
+        var _this = _possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
 
         _this.maxCheckTimes = 10;
         _this.url = url;
@@ -2283,7 +2073,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
     }
 
     WebSocketClient_createClass(WebSocketClient, [{
-        key: 'connect',
+        key: "connect",
         value: function connect() {
             var _this2 = this;
 
@@ -2291,46 +2081,49 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             this.disconnect();
             if (this.url) {
                 try {
-                    console.info('创建ws连接' + this.url);
+                    console.info("创建ws连接" + this.url);
                     this.client = new WebSocket(this.url);
                     if (this.client) {
-                        this.client.onopen = function (message) {
-                            _this2.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_CONNECT,
-                                message: message
-                            });
-                        };
-                        this.client.onmessage = function (message) {
-                            _this2.connectStatus = true;
-                            _this2.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_MESSAGE,
-                                message: message
-                            });
-                        };
-                        this.client.onclose = function (message) {
-                            _this2.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_CLOSE,
-                                message: message
-                            });
-                        };
-                        this.client.onerror = function (message) {
-                            _this2.dispatchEvent({
-                                type: EventTypeConstant.WEB_SOCKET_ERROR,
-                                message: message
-                            });
-                        };
+                        // 当连接成功或连接失败达到最大重连次数的一半时
+                        if (!this.connectStatus && this.checkTimes === Math.floor(this.maxCheckTimes / 2) || this.connectStatus) {
+                            this.client.onopen = function (message) {
+                                _this2.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_CONNECT,
+                                    message: message
+                                });
+                            };
+                            this.client.onmessage = function (message) {
+                                _this2.connectStatus = true;
+                                _this2.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_MESSAGE,
+                                    message: message
+                                });
+                            };
+                            this.client.onclose = function (message) {
+                                _this2.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_CLOSE,
+                                    message: message
+                                });
+                            };
+                            this.client.onerror = function (message) {
+                                _this2.dispatchEvent({
+                                    type: EventTypeConstant.WEB_SOCKET_ERROR,
+                                    message: message
+                                });
+                            };
+                        }
                     }
                 } catch (ex) {
-                    console.error('创建ws连接失败' + this.url + ':' + ex);
+                    console.error("创建ws连接失败" + this.url + ":" + ex);
                 }
             }
         }
     }, {
-        key: 'disconnect',
+        key: "disconnect",
         value: function disconnect() {
             if (this.client) {
                 try {
-                    console.log('ws断开连接' + this.url);
+                    console.log("ws断开连接" + this.url);
                     this.client.close();
                     this.client = null;
                 } catch (ex) {
@@ -2339,7 +2132,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: 'connCheckStatus',
+        key: "connCheckStatus",
         value: function connCheckStatus(times) {
             var _this3 = this;
 
@@ -2352,30 +2145,30 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }, 2000);
         }
     }, {
-        key: 'send',
+        key: "send",
         value: function send(message) {
             if (this.client && this.client.readyState === 1) {
                 this.client.send(message);
                 return true;
             }
-            console.error(this.url + '消息发送失败：' + message);
+            console.error(this.url + "消息发送失败：" + message);
             return false;
         }
     }, {
-        key: 'heartbeat',
+        key: "heartbeat",
         value: function heartbeat() {
             var _this4 = this;
 
             setTimeout(function () {
                 if (_this4.client && _this4.client.readyState === 1) {
-                    _this4.send('HeartBeat');
+                    _this4.send("HeartBeat");
                 }
-                console.log('HeartBeat,' + _this4.url);
+                console.log("HeartBeat," + _this4.url);
                 setTimeout(_this4.heartbeat, 30000);
             }, 1000);
         }
     }], [{
-        key: 'getInstance',
+        key: "getInstance",
         value: function getInstance() {
             if (WebSocketClient.instance) {
                 return WebSocketClient.instance;
@@ -2384,7 +2177,7 @@ var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
             }
         }
     }, {
-        key: '_instance',
+        key: "_instance",
         get: function get() {
             return this.getInstance();
         }
@@ -2505,7 +2298,7 @@ var WebStorage_WebStorage = function () {
 
 
 
-
+// export { default as MqttClient } from "./core/MqttClient";
 
 
 

package/package.json

@@ -1,35 +1,35 @@
-{
-    "name": "gis-common",
-    "description": "gis-common",
-    "main": "dist/resource.min.js",
-    "version": "1.0.18",
-    "author": "Guo.Yan <luv02@vip.qq.com>",
-    "license": "MIT",
-    "private": false,
-    "scripts": {
-        "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --port 7000",
-        "build": "cross-env NODE_ENV=production webpack --progress"
-    },
-    "dependencies": {
-        "mqtt": "^4.2.8"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ],
-    "files": [],
-    "devDependencies": {
-        "babel-core": "^6.26.0",
-        "babel-loader": "^7.1.2",
-        "babel-preset-env": "^1.6.0",
-        "babel-preset-stage-3": "^6.24.1",
-        "cross-env": "^5.0.5",
-        "css-loader": "^0.28.7",
-        "uglifyjs-webpack-plugin": "^2.2.0",
-        "webpack": "^4.23.1",
-        "webpack-cli": "^4.9.1",
-        "webpack-dev-server": "^2.9.1",
-        "clean-webpack-plugin": "^4.0.0-alpha.0"
-    }
-}
+{
+    "name": "gis-common",
+    "description": "gis-common",
+    "main": "dist/resource.min.js",
+    "version": "1.2.1",
+    "author": "Guo.Yan <luv02@vip.qq.com>",
+    "license": "MIT",
+    "private": false,
+    "scripts": {
+        "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --port 7000",
+        "build": "cross-env NODE_ENV=production webpack --progress"
+    },
+    "dependencies": {
+        "mqtt": "^4.2.8"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ],
+    "files": [],
+    "devDependencies": {
+        "babel-core": "^6.26.0",
+        "babel-loader": "^7.1.2",
+        "babel-preset-env": "^1.6.0",
+        "babel-preset-stage-3": "^6.24.1",
+        "cross-env": "^5.0.5",
+        "css-loader": "^0.28.7",
+        "uglifyjs-webpack-plugin": "^2.2.0",
+        "webpack": "^4.23.1",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "^2.9.1",
+        "clean-webpack-plugin": "^4.0.0-alpha.0"
+    }
+}