molly-db 1.0.11 → 1.0.14

package/main.js

@@ -15,28 +15,31 @@ function config( _config ) {
 
 /* --------------------------------------------------------------------------------------- */
 
+function startWorker(_path,_self){
+    return new Promise((response,reject)=>{
+        const wrk = new worker.Worker(
+            _path,{ workerData:_self,
+                env: worker.SHARE_ENV,
+        }); wrk.on('message',(msg)=>{ 
+            console.log(msg)
+            response(msg) 
+        }); wrk.on('exit',(err)=>{ console.log(err);
+            response(startWorker(_path,_self));
+        }); 
+    });
+}
+
+/* --------------------------------------------------------------------------------------- */
+
 class molly_db{
 
     constructor( opt ){
-        return new Promise((response,reject)=>{
-            if( opt.pass )
-                this.pass = opt.pass;
-                this.port = opt.port || 27017;
-                this.path = opt.path.replace(/^\./,process.cwd());
-            
-            if( this.worker ) return console.log(`server is running`);
-
-            this.worker = new worker.Worker(
-                   `${__dirname}/module/_worker_.js`,{
-                    env: worker.SHARE_ENV,
-                    workerData: this
-                }
-            );
-
-            this.worker.on('exit',(err)=>{ console.log(err); reject() });
-            this.worker.on('error',(err)=>{ console.log(err); reject() });
-            this.worker.on('message',(msg)=>{ console.log(msg); response() });
-        });
+        if( opt.pass )
+            this.pass = opt.pass;
+            this.port = opt.port || 27017;
+            this.path = opt.path.replace(/^\./,process.cwd());
+            this.workerPath = `${__dirname}/module/_worker_.js`;
+        return startWorker( this.workerPath,this );
     }
 
 }

package/module/_init_.js

@@ -4,21 +4,23 @@ function fillDB( _db, _table, _path ){
 
         let _itr = undefined;
 
-        if( (/^http/).test(_path) ){
+        if( (/^http/).test(_path) ){ try{
             const stream = await fetch.get(_path,{responseType:'stream'});
             _itr = readline.createInterface({
                 input: stream.data
-            });
-        
-        } else    
+            })
+        } catch(e) { console.log(`error reading ${_path}`); return response(); }}
+
+        else if( fs.existsSync(_path) )
             _itr = readline.createInterface({
                 input: fs.createReadStream(_path)
             });
+        
+        else { console.log(`error reading ${_path}`); return response(); }     
 
-        _itr.on('close',()=>{ response() });
         _itr.on('line',(line)=>{
             db[_db][_table].push(crypto.decrypt( line,query.pass ));
-        });
+        }); _itr.on('close',()=>{ response() });
         
     });
 }
@@ -50,8 +52,7 @@ function fillDB( _db, _table, _path ){
             for( var j in DB.tables ){
                 const table = DB.tables[j];
                 const path = `${db._path_}/${table}.json`;
-                db[name][table] = new Array();
-                await fillDB( name,table,path );
+                db[name][table] = new Array(); await fillDB( name,table,path );
             }
     
         }

package/module/_server_.js

@@ -21,20 +21,13 @@ function json( _data ){
 
 function bodyParser( _data ){
 
-    const date = Date.now();
-    const result = new Array();
+    const date = Date.now(); _data = JSON.parse(_data);
+    const result = typeof _data != 'String' ? _data : [ _data ];
 
-    if( typeof _data.length == 'number' ){
-        for( var i in _data ){
-            if(!_data[i]?.hash)
-                _data[i].hash = crypto.hash( date,0 );
-            result.push(JSON.stringify(_data[i]));
-        }
-    } else {
-        if(!_data?.hash)
-            _data.hash = crypto.hash( date,0 );
-        result.push(JSON.stringify(_data));
-    }   return result;
+    return result.map(x=>{ if( !x?.hash )
+        x.hash = crypto.hash( date,Math.random() );
+        return JSON.stringify(x);
+    }) 
 
 }
 
@@ -45,9 +38,8 @@ function getBody(){
                 const data = new Array();
                 req.on('data',(chunk)=>{ data.push(chunk); });
                 req.on('close',()=>{ try{
-                    const buff = Buffer.concat(data);
-                    const json = JSON.parse(buff);                   
-                    response( bodyParser(json) ); 
+                    const buff = Buffer.concat(data);   
+                    response( bodyParser(buff) ); 
                 } catch(e) { response(false) } });
             } else { response(true) }
         } catch(e) { response(false) } 
@@ -141,50 +133,46 @@ function hash( _params ){
 
 /* --------------------------------------------------------------------------------------- */
 
-function shift( _params ){ 
-    const result = db[_params.db][_params.table].shift(); save( _params ); return result;
+async function shift( _params ){ 
+    const result = db[_params.db][_params.table].shift(); await save( _params ); return result;
 }
 
-function pop( _params ){ 
-    const result = db[_params.db][_params.table].pop(); save( _params ); return result; 
+async function pop( _params ){ 
+    const result = db[_params.db][_params.table].pop(); await save( _params ); return result; 
 }
 
 /* --------------------------------------------------------------------------------------- */
 
-async function push( _params ){
-
-    db[_params.db][_params.table].push( ...body );
-
-    save( _params ); return [{
-        database: _params.db,
-        table: _params.table,
-        status: 'pushed'
-    }];
-
+function lengthOf( _params ){ return db[_params.db][_params.table].length; }
+function indexOf( _params ){ 
+    return db[_params.db][_params.table].indexOf(x=>{
+        const regex = new RegExp(_params.target,'gi');
+        return regex.test(x);
+    });
 }
 
-async function splice( _params ){
+/* --------------------------------------------------------------------------------------- */
+
+async function unshift( _params ){
 
-    db[_params.db][_params.table].splice(
-        _params.offset,_params.length,...body
-    );
+    db[_params.db][_params.table].unshift( ...body );
 
-    save( _params ); return [{
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
-        status: 'spliced'
+        status: 'unshifted'
     }];
 }
 
-async function unshift( _params ){
-
-    db[_params.db][_params.table].unshift( ...body );
+async function push( _params ){
 
-    save( _params ); return [{
+    db[_params.db][_params.table].push( ...body );
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
-        status: 'unshifted'
+        status: 'pushed'
     }];
+
 }
 
 /* --------------------------------------------------------------------------------------- */
@@ -199,7 +187,7 @@ async function update( _params ){
     if( !(index<0) ) 
         db[_params.db][_params.table].splice( index,1,...body );
 
-    save( _params ); return [{
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'udated'
@@ -216,7 +204,7 @@ async function remove( _params ){
     if( !(index<0) )
         db[_params.db][_params.table].splice( index,1 );
 
-    save( _params ); return [{
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'removed'
@@ -225,7 +213,7 @@ async function remove( _params ){
 
 /* --------------------------------------------------------------------------------------- */
 
-function addDB( _params ){
+async function addDB( _params ){
     try{
 
         db._init_.DB.push({
@@ -233,7 +221,7 @@ function addDB( _params ){
             name: _params.db,
         }); db[_params.db] = new Array(); 
     
-        save( _params ); return [{
+        await save( _params ); return [{
             database: _params.db,
             status: 'DB added'
         }];
@@ -241,7 +229,7 @@ function addDB( _params ){
     } catch(e) {  }
 }
 
-function removeDB( _params ){
+async function removeDB( _params ){
     try{
 
         const i = db._init_.DB.findIndex(x=>{
@@ -254,7 +242,7 @@ function removeDB( _params ){
         }); db._init_.DB.splice(i,1);
         db[_params.db] = new Array();
     
-        save( _params ); return [{
+        await save( _params ); return [{
             database: _params.db,
             table: _params.table,
             status: 'DB deleted'
@@ -263,18 +251,19 @@ function removeDB( _params ){
     } catch(e) {  }
 }
 
-function modifyDB( _name, _table ){
+async function modifyDB( _name, _table ){
     try{
 
         const init = `${query.path}/_init_.json`;
         const path = `${query.path}/${_table}.json`;
-    
         fs.writeFileSync( init,JSON.stringify(db._init_) );
     
         try {
             const length = db[_name][_table].length;
-            if( length>0 ) encryptDB( _name, _table, path );
-            else fs.writeFileSync( path,'' );
+            if( length>0 ) 
+                await encryptDB( _name, _table, path );
+            else 
+                fs.writeFileSync( path,'' );
         } catch(e) { 
             fs.unlinkSync( path ); 
         }  
@@ -284,7 +273,7 @@ function modifyDB( _name, _table ){
 
 /* --------------------------------------------------------------------------------------- */
 
-function addTable( _params ){
+async function addTable( _params ){
 
     if( db[_params.db][_params.table] )
     return {
@@ -299,7 +288,7 @@ function addTable( _params ){
 
     db[_params.db][_params.table] = new Array();
     
-    save( _params ); return [{
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'table added'
@@ -307,7 +296,7 @@ function addTable( _params ){
 
 }
 
-function removeTable( _params ){
+async function removeTable( _params ){
 
     const i = db._init_.DB.findIndex(x=>{
         return x.name == _params.db;
@@ -320,7 +309,7 @@ function removeTable( _params ){
     db._init_.DB[i].tables.splice(j,1);
     delete db[_params.db][_params.table];
 
-    save( _params ); return [{
+    await save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'table removed'
@@ -337,8 +326,8 @@ function refresh( _params ){
     });
 }
 
-function save( _params ){
-    modifyDB( _params.db,_params.table );
+async function save( _params ){
+    await modifyDB( _params.db,_params.table );
     return [{
         database: _params.db,
         table: _params.table,
@@ -360,6 +349,9 @@ function save( _params ){
         else if( api.pathname == '/match' ) json( await match(params) )
         else if( api.pathname == '/update' ) json( await update(params) )
 
+        else if( api.pathname == '/index' ) json( await indexOf(params) )
+        else if( api.pathname == '/lengt' ) json( await lengthOf(params) )
+
         /* Save Api */
         else if( api.pathname == '/save' ) json( await save(params) )
         else if( api.pathname == '/remove' ) json( await remove(params) )

package/module/_worker_.js

@@ -1,7 +1,7 @@
 const worker = require('worker_threads');
 const readline = require('readline');
 const crypto = require('./_crypto_');
-const {Buffer} = require('buffer'); 
+const { Buffer } = require('buffer'); 
 const fetch = require('axios');
 const http = require('http');
 const url = require('url');
@@ -13,8 +13,7 @@ const db = new Object();
 
 function _init_(){
     return new Promise((response,reject)=>{
-        try{
-            eval( fs.readFileSync(`${__dirname}/_init_.js`).toString() );
+        try{ eval( fs.readFileSync(`${__dirname}/_init_.js`).toString() );
         } catch(e){ console.log(e); }
     });
 }
@@ -22,28 +21,21 @@ function _init_(){
 /* --------------------------------------------------------------------------------------- */
 
 function app(req,res){
-    try{
-        eval( fs.readFileSync(`${__dirname}/_server_.js`).toString() );
+    try{ eval( fs.readFileSync(`${__dirname}/_server_.js`).toString() );
     } catch(e) { console.log(e) }
 }
 
 /* --------------------------------------------------------------------------------------- */
 
 (()=>{
-    try{
-        http.createServer( app ).listen( query.port,()=>{
-            console.log('molly-db cluster is running, please wait');
-            _init_().then(()=>{
-                worker.parentPort.postMessage({
-                    protocol: 'HTTP',
-                    status: 'started',
-                    workerID: process.pid,
-                    msg: 'molly-db is running',
-                    server: `http://localhost:${query.port}`,
-                });
-            }).catch(e=>{ process.exit(1); });
-        });
-    } catch(e) {}
+    http.createServer( app ).listen( query.port,()=>{
+        _init_().then(()=>{
+            worker.parentPort.postMessage({
+                protocol: 'HTTP', status: 'started',
+                workerID: process.pid, port: query.port,
+            });
+        }).catch(e=>{ console.log(e); process.exit(1); });
+    });
 })();
 
 /* --------------------------------------------------------------------------------------- */

package/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "main": "main.js",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "name": "molly-db",
   "author": "bececrazy",
   "scripts": {