gis-common 1.2.1 → 2.0.1

package/dist/resource.min.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
+		module.exports = factory(require("mqtt"));
 	else if(typeof define === 'function' && define.amd)
-		define("Gis", [], factory);
+		define("Gis", ["mqtt"], factory);
 	else if(typeof exports === 'object')
-		exports["Gis"] = factory();
+		exports["Gis"] = factory(require("mqtt"));
 	else
-		root["Gis"] = factory();
-})(window, function() {
+		root["Gis"] = factory(root["mqtt"]);
+})(window, function(__WEBPACK_EXTERNAL_MODULE__0__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -91,11 +91,17 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
+/***/ (function(module, exports) {
+
+module.exports = __WEBPACK_EXTERNAL_MODULE__0__;
+
+/***/ }),
+/* 1 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -124,6 +130,7 @@ __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; });
 
@@ -2039,27 +2046,184 @@ 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 _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_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; }
+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; }
 
 
 
 
 var WebSocketClient_WebSocketClient = function (_EventDispatcher) {
-    _inherits(WebSocketClient, _EventDispatcher);
+    WebSocketClient_inherits(WebSocketClient, _EventDispatcher);
 
     function WebSocketClient() {
         var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "ws://127.0.0.1:10088";
 
         WebSocketClient_classCallCheck(this, WebSocketClient);
 
-        var _this = _possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
+        var _this = WebSocketClient_possibleConstructorReturn(this, (WebSocketClient.__proto__ || Object.getPrototypeOf(WebSocketClient)).call(this));
 
         _this.maxCheckTimes = 10;
         _this.url = url;
@@ -2298,7 +2462,7 @@ var WebStorage_WebStorage = function () {
 
 
 
-// export { default as MqttClient } from "./core/MqttClient";
+
 
 
 

package/package.json

@@ -2,7 +2,7 @@
     "name": "gis-common",
     "description": "gis-common",
     "main": "dist/resource.min.js",
-    "version": "1.2.1",
+    "version": "2.0.1",
     "author": "Guo.Yan <luv02@vip.qq.com>",
     "license": "MIT",
     "private": false,
@@ -10,9 +10,6 @@
         "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",
@@ -24,12 +21,15 @@
         "babel-loader": "^7.1.2",
         "babel-preset-env": "^1.6.0",
         "babel-preset-stage-3": "^6.24.1",
+        "clean-webpack-plugin": "^4.0.0-alpha.0",
         "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"
+        "webpack-dev-server": "^2.9.1"
+    },
+    "dependencies": {
+        "mqtt": "^4.3.7"
     }
 }