[fix]elasticsarch传入， fast-xml-parser review by songym

luoxiao-supermap · luoxiao-supermap · commit d100ca7041b9 · 2023-08-25T18:36:37.000+08:00
diff --git a/build/webpack.config.base.js b/build/webpack.config.base.js
@@ -58,24 +58,13 @@ module.exports = {
 
     //其它解决方案配置
     resolve: {
-        extensions: ['.js', '.json', '.css'],
-        mainFields: ['browser', 'main'],
-        fallback: {
-          fs: false,
-          http: require.resolve('stream-http'),
-          https: require.resolve('https-browserify'),
-          os: require.resolve('os-browserify/browser'),
-          stream: require.resolve('stream-browserify'),
-          tty: require.resolve('tty-browserify'),
-          zlib: require.resolve('browserify-zlib')
-        }
+        extensions: ['.js', '.json', '.css']
     },
 
     externals: {
         echarts: 'function(){try{return echarts}catch(e){return {}}}()',
         mapv: 'function(){try{return mapv}catch(e){return {}}}()',
         '@antv/g6': 'function(){try{return G6}catch(e){return {}}}()',
-        '@elastic/elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
         '@tensorflow/tfjs': 'function(){try{return tf}catch(e){return {}}}()'
     },
 
diff --git a/build/webpack.config.mapboxgl.js b/build/webpack.config.mapboxgl.js
@@ -30,13 +30,7 @@ module.exports = {
       xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
       canvg: 'function(){try{return canvg}catch(e){return {}}}()',
       jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
-    }),
-    function ({context, request}, callback) {
-      if (/xml-js\/lib\/xml2json/.test(request)) {
-        return callback(null, 'function(){try{return xml2json}catch(e){return {}}}()');
-      }
-      callback();
-    }
+    })
   ],
 
   module: {
diff --git a/examples/leaflet/ESHeatMap.html b/examples/leaflet/ESHeatMap.html
@@ -56,7 +56,7 @@
             return popup;
         };
         info.addTo(map);
-        liveESService = new L.supermap.ElasticSearch(dataUrl);
+        liveESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);
     }
 
     function handleMapEvent(div, map) {
diff --git a/examples/leaflet/PlanesMonitor.html b/examples/leaflet/PlanesMonitor.html
@@ -57,8 +57,8 @@
 
     function init() {
         initMap();
-        liveESService = new L.supermap.ElasticSearch(dataUrl);
-        trackESService = new L.supermap.ElasticSearch(dataUrl);
+        liveESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);
+        trackESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);
         planeStyles = initPlaneStyles();
     }
 
diff --git a/examples/mapboxgl/iPortalWebmap_heat.html b/examples/mapboxgl/iPortalWebmap_heat.html
@@ -15,7 +15,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap_heat"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include='convert,jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
 <div id="map" style="width: 100%;height:100%"></div>
diff --git a/examples/mapboxgl/iPortalWebmap_label.html b/examples/mapboxgl/iPortalWebmap_label.html
@@ -15,7 +15,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap_label"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include='convert,jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
 <div id="map" style="width: 100%;height:100%"></div>
diff --git a/examples/mapboxgl/iPortalWebmap_range.html b/examples/mapboxgl/iPortalWebmap_range.html
@@ -15,7 +15,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap_range"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include='convert,jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
 <div id="map" style="width: 100%;height:100%"></div>
diff --git a/examples/mapboxgl/iPortalWebmap_unicode.html b/examples/mapboxgl/iPortalWebmap_unicode.html
@@ -15,7 +15,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap_unicode"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include='convert,jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
 <div id="map" style="width: 100%;height:100%"></div>
diff --git a/examples/mapboxgl/iPortalWebmap_unique.html b/examples/mapboxgl/iPortalWebmap_unique.html
@@ -15,7 +15,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap_unique"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include='convert,jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
 <div id="map" style="width: 100%;height:100%"></div>
diff --git a/package.json b/package.json
@@ -138,6 +138,7 @@
     "canvg": "3.0.10",
     "core-js": "^3.30.2",
     "echarts": "5.4.3",
+    "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "flatgeobuf": "3.23.1",
@@ -160,8 +161,7 @@
     "rbush": "^2.0.2",
     "three": "0.150.1",
     "util": "^0.12.4",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz",
-    "xml-js": "1.6.11"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "pre-commit": [
     "lint"
diff --git a/src/common/package.json b/src/common/package.json
@@ -15,7 +15,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@antv/g6": "^4.8.14",
-    "@elastic/elasticsearch": "^5.6.22",
     "echarts": "5.4.3",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
diff --git a/src/common/thirdparty/elasticsearch/ElasticSearch.js b/src/common/thirdparty/elasticsearch/ElasticSearch.js
@@ -11,47 +11,21 @@ import {Util} from "../../commontypes/Util";
  * @category ElasticSearch
  * @modulecategory Services
  * @param {string} url - ElasticSearch服务地址。
+ * @param {Object} es - elasticsearch的全局变量。注意：需要@elastic/elasticsearch@5.6.22或者elasticsearch@16.7.3。
  * @param {Object} options - 参数。
  * @param {function} [options.change] - 服务器返回数据后执行的函数。废弃,不建议使用。使用search或msearch方法。
  * @param {boolean} [options.openGeoFence=false] - 是否开启地理围栏验证，默认为不开启。
  * @param {function} [options.outOfGeoFence] - 数据超出地理围栏后执行的函数。
  * @param {Object} [options.geoFence] - 地理围栏。
- * @description
- * <h3 style="font-size: 20px;margin-top: 20px;margin-bottom: 10px;">Tips</h3>
- * 该功能依赖<a href="https://github.com/elastic/elasticsearch">@elastic/elasticsearch</a>, webpack5或其他不包含Node.js Polyfills的打包工具，需要加入相关配置，以webpack为例：<br/>
-  <p style="margin-top:10px;">首先安装相关Polyfills</p><pre><code>npm i stream-http  https-browserify stream-browserify tty-browserify browserify-zlib os-browserify buffer url assert process events util -D</code></pre>
-  然后配置webpack<pre><code>module.exports: {
-    resolve: {
-      alias: {
-        process: 'process/browser',
-      },
-      mainFields: ['browser', 'main'],
-      fallback: {
-        fs: false,
-        http: require.resolve('stream-http'),
-        https: require.resolve('https-browserify'),
-        os: require.resolve('os-browserify/browser'),
-        stream: require.resolve('stream-browserify'),
-        tty: require.resolve('tty-browserify'),
-        zlib: require.resolve('browserify-zlib'),
-        assert: require.resolve('assert'),
-        util: require.resolve('util'),
-        events: require.resolve('events')
-      }
-    }
-    plugins: [
-      new webpack.ProvidePlugin({
-        process: 'process/browser',
-        Buffer: ['buffer', 'Buffer']
-      }),
-    ]
-}</code></pre>
  * @usage
  */
 
 export class ElasticSearch {
 
-    constructor(url, options) {
+    constructor(url, es, options) {
+        if (!es || (typeof es !== 'function' && typeof es !== 'object') || typeof es.Client !== 'function') {
+          throw Error('Please enter the global variable of @elastic/elasticsearch@5.6.22 or elasticsearch@16.7.3 for the second parameter!');
+        }
         options = options || {};
         /**
          *  @member {string} ElasticSearch.prototype.url
@@ -62,7 +36,6 @@ export class ElasticSearch {
          *  @member {Object} ElasticSearch.prototype.client
          *  @description client ES客户端。
          */
-        var es = require('@elastic/elasticsearch');
         try {
           // 老版本
           this.client = new es.Client({
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -17,7 +17,7 @@ import { parseCondition, parseConditionFeature } from '@supermap/iclient-common/
 import { Util } from '../core/Util';
 import { QueryService } from '../services/QueryService';
 import Canvg from 'canvg';
-
+import { XMLParser } from "fast-xml-parser";
 
 const MB_SCALEDENOMINATOR_3857 = [
 	'559082264.0287178',
@@ -88,19 +88,6 @@ const DEFAULT_WELLKNOWNSCALESET = ['GoogleCRS84Quad', 'GoogleMapsCompatible'];
  * @fires WebMap#getfeaturesfailed
  * @fires WebMap#addlayerssucceeded
  * @extends {mapboxgl.Evented}
- * @description
- * <h3 style="font-size: 20px;margin-top: 20px;margin-bottom: 10px;">Tips</h3>
- * 该功能的WMTS地图依赖<a href="https://github.com/nashwaan/xml-js">xml-js</a>, webpack5或其他不包含Node.js Polyfills的打包工具，需要加入相关配置，以webpack为例：<br/>
-  <p style="margin-top:10px;">首先安装相关Polyfills</p><pre><code>npm i stream-browserify -D</code></pre>
-  然后配置webpack<pre><code>module.exports: {
-    resolve: {
-      mainFields: ['browser', 'main'],
-      fallback: {
-        fs: false,
-        stream: require.resolve('stream-browserify')
-      }
-    }
-}</code></pre>
  * @usage
  */
 export class WebMap extends mapboxgl.Evented {
@@ -468,16 +455,16 @@ export class WebMap extends mapboxgl.Evented {
 				return response.text();
 			})
 			.then(capabilitiesText => {
-        const xml2json = require('xml-js/lib/xml2json');
-                let tileMatrixSet = JSON.parse(xml2json(capabilitiesText, { compact: true, spaces: 4 }))
+        const parser = new XMLParser({numberParseOptions:{hex : false, leadingZeros: false,eNotation: false},alwaysCreateTextNode: true, textNodeName: "_text"});
+                let tileMatrixSet = parser.parse(capabilitiesText)
                     .Capabilities.Contents.TileMatrixSet;
                 if (!Array.isArray(tileMatrixSet)) {
                     tileMatrixSet = [tileMatrixSet];
                 }
 				for (let i = 0; i < tileMatrixSet.length; i++) {
 					if (
 						tileMatrixSet[i]['ows:Identifier'] &&
-						tileMatrixSet[i]['ows:Identifier']['_text'] === mapInfo.tileMatrixSet
+						(tileMatrixSet[i]['ows:Identifier']['_text'] + '') === mapInfo.tileMatrixSet
 					) {
 						if (DEFAULT_WELLKNOWNSCALESET.indexOf(tileMatrixSet[i]['WellKnownScaleSet']['_text']) > -1) {
 							isMatched = true;
@@ -496,7 +483,7 @@ export class WebMap extends mapboxgl.Evented {
 								}
 								if (
 									defaultCRSScaleDenominators[j] !==
-									tileMatrixSet[i].TileMatrix[j]['ScaleDenominator']['_text']
+									(tileMatrixSet[i].TileMatrix[j]['ScaleDenominator']['_text'] + '')
 								) {
 									break;
 								}
diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -20,7 +20,7 @@
     "three": "0.150.1",
     "@supermap/iclient-common": "11.1.1-dev",
     "canvg": "3.0.10",
-    "xml-js": "1.6.11",
+    "fast-xml-parser": "^4.2.7",
     "flatgeobuf": "3.23.1",
     "rbush": "^2.0.2",
     "proj4": "2.9.0"
diff --git a/src/maplibregl/package.json b/src/maplibregl/package.json
@@ -20,7 +20,6 @@
     "three": "0.150.1",
     "canvg": "3.0.10",
     "proj4": "2.9.0",
-    "xml-js": "1.6.11",
     "@supermap/iclient-common": "11.1.1-dev",
     "rbush": "^2.0.2"
   }
diff --git a/test/common/thirdparty/elasticsearch/@elasticSpec.js b/test/common/thirdparty/elasticsearch/@elasticSpec.js
@@ -2,10 +2,11 @@ import { ElasticSearch } from '../../../../src/common/thirdparty/elasticsearch/E
 import { Point } from '../../../../src/common/commontypes/geometry/Point';
 import { LinearRing } from '../../../../src/common/commontypes/geometry/LinearRing';
 import { Polygon } from '../../../../src/common/commontypes/geometry/Polygon';
+import es from '@elastic/elasticsearch';
 
 describe('@elastic/ElasticSearch', () => {
   it('constructor, setGeoFence', () => {
-    var elasticSearch = new ElasticSearch('https://fake.iclient.supermap.io/es');
+    var elasticSearch = new ElasticSearch('https://fake.iclient.supermap.io/es', es);
     expect(elasticSearch.geoFence).toBeNull();
     var points = [
       new Point(0, 4010338),
@@ -24,7 +25,7 @@ describe('@elastic/ElasticSearch', () => {
   });
   it('search', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'search').and.callFake(function () {
       const resp = { aggregations: { zoomedInView: {} } };
@@ -39,7 +40,7 @@ describe('@elastic/ElasticSearch', () => {
   });
   it('msearch', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'msearch').and.callFake(function () {
       const resp = { body: { responses: {} } };
@@ -54,7 +55,7 @@ describe('@elastic/ElasticSearch', () => {
   });
   it('bulk', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'bulk').and.callFake(function (params, callback) {
       const resp = { body: { items: [] } };
@@ -66,4 +67,23 @@ describe('@elastic/ElasticSearch', () => {
       done();
     });
   });
+  it('no es', (done) => {
+    var dataUrl = 'https://fake.iclient.supermap.io/es';
+    try {
+      new ElasticSearch(dataUrl);
+    } catch (e) {
+      expect(e.message).toBe('Please enter the global variable of @elastic/elasticsearch@5.6.22 or elasticsearch@16.7.3 for the second parameter!');
+    }
+    try {
+      new ElasticSearch(dataUrl, {});
+    } catch (e) {
+      expect(e.message).toBe('Please enter the global variable of @elastic/elasticsearch@5.6.22 or elasticsearch@16.7.3 for the second parameter!');
+    }
+    try {
+      new ElasticSearch(dataUrl, function () {});
+    } catch (e) {
+      expect(e.message).toBe('Please enter the global variable of @elastic/elasticsearch@5.6.22 or elasticsearch@16.7.3 for the second parameter!');
+      done();
+    }
+  });
 });
diff --git a/test/common/thirdparty/elasticsearch/ElasticSearchSpec.js b/test/common/thirdparty/elasticsearch/ElasticSearchSpec.js
@@ -10,12 +10,9 @@ export function mockES() {
   });
 }
 describe('old ElasticSearch', () => {
-  beforeEach(() => {
-    mockES();
-  });
   it('search', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'search').and.callFake(function () {
       const resp = { aggregations: { zoomedInView: {} } };
@@ -30,7 +27,7 @@ describe('old ElasticSearch', () => {
   });
   it('msearch', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'msearch').and.callFake(function () {
       const resp = { responses: { aggregations: { zoomedInView: {} } } };
@@ -45,7 +42,7 @@ describe('old ElasticSearch', () => {
   });
   it('bulk', (done) => {
     var dataUrl = 'https://fake.iclient.supermap.io/es';
-    var elasticSearch = new ElasticSearch(dataUrl);
+    var elasticSearch = new ElasticSearch(dataUrl, es);
     expect(elasticSearch.url).toBe(dataUrl);
     spyOn(elasticSearch.client, 'bulk').and.callFake(function (params, callback) {
       const resp = { items: [] };

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`return popup;`
`57`	`57`	`};`
`58`	`58`	`info.addTo(map);`
`59`		`- liveESService = new L.supermap.ElasticSearch(dataUrl);`
	`59`	`+ liveESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`function handleMapEvent(div, map) {`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@`
`57`	`57`
`58`	`58`	`function init() {`
`59`	`59`	`initMap();`
`60`		`- liveESService = new L.supermap.ElasticSearch(dataUrl);`
`61`		`- trackESService = new L.supermap.ElasticSearch(dataUrl);`
	`60`	`+ liveESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);`
	`61`	`+ trackESService = new L.supermap.ElasticSearch(dataUrl, elasticsearch);`
`62`	`62`	`planeStyles = initPlaneStyles();`
`63`	`63`	`}`
`64`	`64`