add cluster info

zhaoxuebin · zhaoxuebin · commit b35b925abcac · 2018-12-14T15:48:54.000+08:00
diff --git a/es.js b/es.js
@@ -1,6 +1,7 @@
 const EventEmitter = require('events').EventEmitter;
-const request = require('./util/request.js');
-const config = require('./util/globalConfig.js');
+const requestBuilder = require('./util/request.js');
+const configManager = require('./util/globalConfig.js');
+const Cluster = require('./src/cluster/cluster.js');
 const Entity = require('./src/entity.js');
 const Condition = require('./src/esCondition.js');
 const Aggs = require('./src/esAggs.js');
@@ -17,7 +18,9 @@ function Connection(opts) {
     const self = this;
     const entities = new Map();
     const BASE_URL = `http://${opts.domain}:${opts.port}/`;
-
+    const config = configManager();
+    Cluster.call(this, BASE_URL, config);
+    const request = requestBuilder(config);
     let testConnection = async () => {
         let body = await request({
             'url': BASE_URL,
@@ -30,14 +33,18 @@ function Connection(opts) {
         await testConnection();
     };
 
+
     this.register = (name, opts, mappings, settings) => {
+        if (!config.has('BASE_URL')) {
+            throw new Error("make sure instance has already connected");
+        }
         if (!opts.index) {
             throw new Error("index could not be blank");
         }
         if (!opts.type) {
             throw new Error('type could not be blank');
         }
-        entities.set(name, new Entity(name, opts, mappings, settings));
+        entities.set(name, new Entity(name, opts, mappings, settings, config));
         return entities.get(name);
     };
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elasticsearch-orm",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "This is a orm for elasticSearch",
   "main": "es.js",
   "scripts": {
diff --git a/src/cluster/cluster.js b/src/cluster/cluster.js
@@ -0,0 +1,40 @@
+const requestBuiler = require('../../util/request.js');
+module.exports = function(BASE_URL, config) {
+    const self = this;
+    const request = requestBuiler(config);
+    this.health = async () => {
+        const url = `${BASE_URL}_cluster/health`;
+        let result = await request({
+            url,
+            'method': 'GET'
+        });
+        return result;
+    };
+
+    this.stats = async () => {
+        const url = `${BASE_URL}_cluster/stats`;
+        let result = await request({
+            url,
+            'method': 'GET'
+        });
+        return result;
+    };
+
+    this.state = async () => {
+        const url = `${BASE_URL}_cluster/state`;
+        let result = await request({
+            url,
+            'method': 'GET'
+        });
+        return result;
+    };
+
+    this.indices = async () => {
+        const url = `${BASE_URL}_cat/indices?format=json`;
+        const result = await request({
+            url,
+            'method': 'GET'
+        });
+        return result;
+    }
+};
diff --git a/src/entity.js b/src/entity.js
@@ -1,26 +1,26 @@
-const request = require('../util/request.js');
-const config = require('../util/globalConfig.js');
+const requestBuilder = require('../util/request.js');
 const UrlBuilder = require('./uri-builder/urlBuilder.js');
 const Condition = require('./esCondition.js'),
     Query = require('./esQuery.js'),
     Aggs = require('./esAggs.js');
-module.exports = function(name, opts, mappings = {}, settings) {
+module.exports = function(name, opts, mappings = {}, settings, config) {
     const self = this;
+    const request = requestBuilder(config);
     //Condition.call(this);
     const DOMAIN = config.get('domain'),
         PORT = config.get('port'),
         BASE_URL = config.get('BASE_URL'),
         INDEX = opts.index,
         TYPE = opts.type;
-    const urlBuilder = new UrlBuilder(BASE_URL, INDEX, TYPE);
+    const urlBuilder = new UrlBuilder(BASE_URL, INDEX, TYPE, config);
     let exists, dbMappings;
     let shardsCount;
     this.sortList = [];
     this.aggsList = [];
     this.sourceList = undefined;
     Object.keys(new Condition()).forEach((key) => {
         self[key] = (...args) => {
-            let query = new Query(BASE_URL, INDEX, TYPE);
+            let query = new Query(BASE_URL, INDEX, TYPE, config);
             query[key].apply(query, args);
             return query;
         };
@@ -180,15 +180,15 @@ module.exports = function(name, opts, mappings = {}, settings) {
         if (isNaN(from)) {
             throw new Error('from parameter is invalid');
         }
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         query.from(from);
         return query;
     };
     this.size = (size) => {
         if (isNaN(size)) {
             throw new Error('from parameter is invalid');
         }
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         query.size(size);
         return query;
     };
@@ -239,7 +239,7 @@ module.exports = function(name, opts, mappings = {}, settings) {
     };
 
     this.sort = (...args) => {
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         query.sort.apply(query, args);
         return query;
         // if (args.length === 1 && typeof args[0] === 'object') {
@@ -279,7 +279,7 @@ module.exports = function(name, opts, mappings = {}, settings) {
     this.checkIndexExists = checkIndexExists;
 
     this.source = (sources) => {
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         query.source(sources);
         return query;
     };
@@ -288,7 +288,7 @@ module.exports = function(name, opts, mappings = {}, settings) {
         if (!aggs instanceof Aggs) {
             throw new Error('arguments type error');
         }
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         query.aggs(aggs);
         return query;
     };
@@ -407,7 +407,7 @@ module.exports = function(name, opts, mappings = {}, settings) {
     }
 
     this.query = async (options = {}) => {
-        let query = new Query(BASE_URL, INDEX, TYPE);
+        let query = new Query(BASE_URL, INDEX, TYPE, config);
         let ret = await query.query(options);
         return ret;
     };
diff --git a/src/esQuery.js b/src/esQuery.js
@@ -1,9 +1,10 @@
-const request = require('../util/request.js');
+const requestBuilder = require('../util/request.js');
 const Condition = require('./esCondition.js'),
     Aggs = require('./esAggs.js');
 const UrlBuilder = require('./uri-builder/urlBuilder.js');
-module.exports = function(BASE_URL, INDEX, TYPE) {
-    const urlBuilder = new UrlBuilder(BASE_URL, INDEX, TYPE);
+module.exports = function(BASE_URL, INDEX, TYPE, config) {
+    const urlBuilder = new UrlBuilder(BASE_URL, INDEX, TYPE, config);
+    const request = requestBuilder(config);
     Condition.call(this);
     this.sortList = [];
     this.aggsList = [];
diff --git a/src/uri-builder/urlBuilder.js b/src/uri-builder/urlBuilder.js
@@ -1,5 +1,4 @@
-const config = require('../../util/globalConfig.js');
-module.exports = function(BASE, INDEX, TYPE) {
+module.exports = function(BASE, INDEX, TYPE, config) {
 
     const getJoinFlag = (mappings) => {
         return Object.keys(mappings).some((key) => {
diff --git a/test/cluster/cluster.js b/test/cluster/cluster.js
@@ -0,0 +1,83 @@
+const orm = require('../../es.js');
+const expect = require('chai').expect;
+const config = require('../config.json');
+let instance;
+const getInstance = () => {
+    return new Promise((resolve, reject) => {
+        if (!instance) {
+            instance = orm({
+                'domain': config.host,
+                'port': config.port
+            });
+            instance.on("connected", () => {
+                resolve(instance);
+            });
+            instance.on('error', (e) => {
+                reject(e);
+            });
+        } else {
+            resolve(instance);
+        }
+    });
+}
+
+
+describe('集群相关信息的测试脚本', function() {
+    it('集群健康信息', function(done) {
+        (async () => {
+            const instance = await getInstance();
+            const health = await instance.health();
+            return health;
+        })().then((ret) => {
+            ["cluster_name", "status", "timed_out", "number_of_nodes", "number_of_data_nodes", "active_primary_shards", "active_shards", "relocating_shards", "initializing_shards", "unassigned_shards", "delayed_unassigned_shards", "number_of_pending_tasks", "number_of_in_flight_fetch", "task_max_waiting_in_queue_millis", "active_shards_percent_as_number"].forEach((key) => {
+                expect(ret).to.have.property(key);
+            })
+            done();
+        }).catch((e) => {
+            done(e);
+        })
+    });
+    it('集群的统计状态', function(done) {
+        (async () => {
+            const instance = await getInstance();
+            const stats = await instance.stats();
+            return stats;
+        })().then((ret) => {
+            ['nodes', '_nodes', 'status', 'indices'].forEach((key) => {
+                expect(ret).to.have.property(key);
+            });
+            done();
+        }).catch((e) => {
+            done(e);
+        })
+    });
+    it('集群的状态', function(done) {
+        (async () => {
+            const instance = await getInstance();
+            const state = await instance.state();
+            return state;
+        })().then((ret) => {
+            ['nodes', 'metadata', 'master_node', 'routing_table'].forEach((key) => {
+                expect(ret).to.have.property(key);
+            });
+            done();
+        }).catch((e) => {
+            done(e);
+        })
+    });
+    it('集群的索引列表', function(done) {
+        (async () => {
+            const instance = await getInstance();
+            const indices = await instance.indices();
+            return indices;
+        })().then((ret) => {
+            for (let i = 0; i < ret.length; i++) {
+                expect(ret[i]).to.have.property('status');
+                expect(ret[i]).to.have.property('health');
+            }
+            done();
+        }).catch((e) => {
+            done(e);
+        })
+    });
+});
diff --git a/test/entity/query.js b/test/entity/query.js
@@ -10,8 +10,8 @@ const getEntity = () => {
         });
         instance.on('connected', () => {
             let testType = instance.register('testType', {
-                'index': 'mocha_test',
-                'type': 'mocha_test'
+                'index': 'test',
+                'type': 'test_type'
             }, {
                 'home': {
                     'type': "geo_point"
diff --git a/test/es.test.js b/test/es.test.js
@@ -34,8 +34,8 @@ describe('连接相关测试', function() {
         });
         instance.on('connected', () => {
             let testType = instance.register('testType', {
-                'index': 'mocha_test',
-                'type': 'mocha_test'
+                'index': 'test',
+                'type': 'test_type2'
             }, {
                 'age': {
                     'type': 'integer'
@@ -50,7 +50,7 @@ describe('连接相关测试', function() {
                     'type': 'date'
                 }
             });
-            (async() => {
+            (async () => {
                 await testType.sync();
             })().then(() => {
                 done();
@@ -65,21 +65,22 @@ describe('连接相关测试', function() {
             'domain': config.host,
             'port': config.port
         });
-        let testType = instance.register('testType', {
-            'index': 'mocha_test',
-            'type': 'mocha_test'
-        }, {
-            'home': {
-                'type': "geo_point"
-            }
-        });
-        (async() => {
-            await testType.sync();
-        })().then(() => {
-            done();
-        }).catch((e) => {
-            done(e);
+        instance.on('connected', () => {
+            let testType = instance.register('testType', {
+                'index': 'mocha_test',
+                'type': 'mocha_test'
+            }, {
+                'home': {
+                    'type': "geo_point"
+                }
+            });
+            (async () => {
+                await testType.sync();
+            })().then(() => {
+                done();
+            }).catch((e) => {
+                done(e);
+            });
         });
     });
-
 });
diff --git a/test/uri-builder/urlBuilder.test.js b/test/uri-builder/urlBuilder.test.js
@@ -47,7 +47,9 @@ describe('URL 构建器相关', function() {
 
 
     it('滚动逻辑', function() {
-        let builder = new UrlBuilder(BASE, INDEX, TYPE);
+        const config = new Map();
+        config.set('scroll', '1m');
+        let builder = new UrlBuilder(BASE, INDEX, TYPE, config);
         expect(builder.buildScrollUrl('id')).to.equal(BASE + '_search/scroll/id?scroll=1m');
         expect(builder.buildScrollUrl('id', {
             'scroll': '5m'
diff --git a/util/globalConfig.js b/util/globalConfig.js
@@ -1,4 +1,6 @@
-const map = new Map();
-map.set('scroll', '1m');
-map.set('timeout', 30 * 1000);
-module.exports = map;
+module.exports = () => {
+    const map = new Map();
+    map.set('scroll', '1m');
+    map.set('timeout', 30 * 1000);
+    return map;
+};
diff --git a/util/request.js b/util/request.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "elasticsearch-orm",`
`3`		`- "version": "1.0.20",`
	`3`	`+ "version": "1.0.21",`
`4`	`4`	`"description": "This is a orm for elasticSearch",`
`5`	`5`	`"main": "es.js",`
`6`	`6`	`"scripts": {`