hola-server 0.5.2 → 0.5.4

package/db/db.js

@@ -131,7 +131,7 @@ const bulk_update = async (col, items, attrs) => {
 };
 
 class DB {
-  constructor(url, poolSize) {
+  constructor(url, poolSize, callback) {
     if (!url) {
       return;
     }
@@ -143,6 +143,10 @@ class DB {
         log_error(LOG_DB, err);
       }
     });
+
+    this.db.on('connect', function () {
+      callback && callback();
+    });
   }
 
   /**
@@ -343,19 +347,19 @@ class DB {
   }
 }
 
-let db_instance = new DB();
+let db_instance = null;
 
 /**
  *
  * @returns db instance of mongodb
  */
-const get_db = () => {
+const get_db = (callback) => {
   if (db_instance && db_instance.db) {
     return db_instance;
   } else {
     const mongo = get_settings().mongo;
 
-    db_instance = new DB(mongo.url, mongo.pool);
+    db_instance = new DB(mongo.url, mongo.pool, callback);
     return db_instance;
   }
 };

package/db/entity.js

@@ -127,7 +127,9 @@ class Entity {
                         //refer field
                         const refer_entity = new Entity(get_entity_meta(search_field.ref));
                         const oids = await refer_entity.find_by_ref_value(value, { _id: 1 }, this.meta.collection);
-                        if (oids.length > 0) {
+                        if (oids.length == 1) {
+                            and_array.push({ [search_field.name]: oids.map(o => o._id + "")[0] });
+                        } else if (oids.length > 1) {
                             and_array.push({ [search_field.name]: { "$in": oids.map(o => o._id + "") } });
                         }
                     } else {

package/http/express.js

@@ -68,9 +68,4 @@ const init_express_server = (base_dir, callback) => {
     return app;
 }
 
-module.exports = { init_express_server };
-
-const str = "/monitor/635c7e6aecf2f40bf70feca9";
-const exclude_urls = ["/monitor/.*?/"];
-
-
+module.exports = { init_express_server };

package/index.js

@@ -1,9 +1,11 @@
+const { get_db } = require('./db/db');
+const { Entity } = require('./db/entity');
 const { init_settings } = require('./setting');
-const { init_express_server } = require('./http/express');
 const { init_router } = require('./http/router');
+const { init_express_server } = require('./http/express');
 const { register_type, get_type } = require('./core/type');
 const { EntityMeta, get_entity_meta } = require('./core/meta');
-const { Entity } = require('./db/entity');
+
 
 const array = require('./core/array');
 const date = require('./core/date');
@@ -23,7 +25,7 @@ const { gen_i18n } = require('./tool/gen_i18n');
 const { log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query } = require('./db/db');
 
 module.exports = {
-    init_settings, init_express_server, init_router, register_type, get_type,
+    init_settings, init_express_server, init_router, register_type, get_type, get_db,
     Entity, EntityMeta, get_entity_meta, array, date, file, number, obj, random, thread, validate, code, err, params, context, gridfs, gen_i18n,
     log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {