molly-db 1.0.9 → 1.0.12

package/main.js

@@ -33,9 +33,9 @@ class molly_db{
                 }
             );
 
-            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() });
+            this.worker.on('exit',(err)=>{ console.log(err); reject(err) });
+            this.worker.on('error',(err)=>{ console.log(err); reject(err) });
+            this.worker.on('message',(msg)=>{ console.log(msg); response(msg) });
         });
     }
 

package/module/_init_.js

@@ -58,12 +58,10 @@ function fillDB( _db, _table, _path ){
 
     } catch(e) {
 
-        const path = `${query.path}/_init_.json`;
-        db._buff_ = fs.readFileSync( path );
+        db._init_ = { DB:[] };
         db._path_ = query.path;
-        db._init_ = { DB:[] }
-
-        fs.writeFileSync( path,db._init_ );
+        const path = `${query.path}/_init_.json`;
+        fs.writeFileSync( path,JSON.stringify(db._init_) );
 
     }   response();
 })();

package/module/_server_.js

@@ -2,6 +2,7 @@
 const api = url.parse( req.url,true );
 let params = api.query;
 let body = undefined;
+let parse = api;
 
 /* --------------------------------------------------------------------------------------- */
 
@@ -18,21 +19,35 @@ function json( _data ){
 
 /* --------------------------------------------------------------------------------------- */
 
+function bodyParser( _data ){
+
+    const date = Date.now();
+    const result = new Array();
+
+    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;
+
+}
+
 function getBody(){
     return new Promise((response,reject)=>{
         try{
-            if( req.method == 'POST' ){
+            if( req.method == 'POST' || (/push|unshift|splice|update/).test(api.pathname) ){
                 const data = new Array();
                 req.on('data',(chunk)=>{ data.push(chunk); });
                 req.on('close',()=>{ try{
-                    const buff = Buffer.concat(data).toString();
-                    const object = JSON.parse(buff);
-                    const date = Date.now();
-                        
-                    if( !object.hash )
-                        object.hash = crypto.hash( date,0 );
-                        
-                    response(JSON.stringify(object)); 
+                    const buff = Buffer.concat(data);
+                    const json = JSON.parse(buff);                   
+                    response( bodyParser(json) ); 
                 } catch(e) { response(false) } });
             } else { response(true) }
         } catch(e) { response(false) } 
@@ -66,8 +81,14 @@ function validate( _params ){
 
         let validator = false;
 
-        const vtb = (key)=>{ return db._init_.DB.some(x=>{ return x.tables.join().match(key); }) }
         const vdb = (key)=>{ return db._init_.DB.some(x=>{ return x.name == key; }) }
+        const vtb = (key)=>{ return db._init_.DB.some(x=>{ return x.tables.join().match(key); }) }
+
+        validator = [
+            [ !_params?.offset, '_params.offset = 0' ],
+            [ !_params?.target, '_params.target = ""' ],
+            [ !_params?.length, '_params.length = 100' ],
+        ].every(x=>{ if(x[0]) eval(x[1]); return true; });
 
         validator = [
             [!body, {status:'error',message:'invalid data'}],
@@ -75,16 +96,12 @@ function validate( _params ){
             [!_params?.table, {status:'error',message:'no table name added'}]
         ].some(x=>{ if(x[0]) reject(x[1]); return x[0];}); if(validator) return 0;
 
-        validator = [
-            [!vdb(_params?.db), {status:'error',message:`no db called ${_params.db} exist`}],
-            [!vtb(_params?.table), {status:'error',message:`no table called ${_params.table} exist`}]
-        ].some(x=>{ if(x[0]) reject(x[1]); return x[0];}); if(validator) return 0;
-
-        validator = [
-            [ !_params.offset, '_params.offset = 0' ],
-            [ !_params.target, '_params.target = ""' ],
-            [ !_params.length, '_params.length = 100' ],
-        ].map(x=>{ if(x[0]) eval(x[1]) });
+        if( !(/table|db/gi).test(parse.pathname) ){
+            validator = [
+                [!vdb(_params?.db), {status:'error',message:`no db called ${_params.db} exist`}],
+                [!vtb(_params?.table), {status:'error',message:`no table called ${_params.table} exist`}]
+            ].some(x=>{ if(x[0]) reject(x[1]); return x[0];}); if(validator) return 0;
+        }
 
         response(_params);
 
@@ -136,7 +153,7 @@ function pop( _params ){
 
 async function push( _params ){
 
-    db[_params.db][_params.table].push( body );
+    db[_params.db][_params.table].push( ...body );
 
     save( _params ); return [{
         database: _params.db,
@@ -149,7 +166,7 @@ async function push( _params ){
 async function splice( _params ){
 
     db[_params.db][_params.table].splice(
-        _params.offset,_params.length,body
+        _params.offset,_params.length,...body
     );
 
     save( _params ); return [{
@@ -161,7 +178,7 @@ async function splice( _params ){
 
 async function unshift( _params ){
 
-    db[_params.db][_params.table].unshift( body );
+    db[_params.db][_params.table].unshift( ...body );
 
     save( _params ); return [{
         database: _params.db,
@@ -180,7 +197,7 @@ async function update( _params ){
     });
 
     if( !(index<0) ) 
-        db[_params.db][_params.table].splice( index,1,body );
+        db[_params.db][_params.table].splice( index,1,...body );
 
     save( _params ); return [{
         database: _params.db,
@@ -206,32 +223,17 @@ async function remove( _params ){
     }];
 }
 
-async function save( _params ){
-
-    modifyDB( _params.db,_params.table );
-    return [{
-        database: _params.db,
-        table: _params.table,
-        status: 'saved'
-    }];
-}
-
 /* --------------------------------------------------------------------------------------- */
 
 function addDB( _params ){
     try{
 
-        const init = `${query.path}/_init_.json`;
-
         db._init_.DB.push({
+            tables: [],
             name: _params.db,
-            tables: []
-        });
-    
-        db[_params.db] = new Array(); 
-        fs.writeFileSync( init,JSON.stringify(db._init_) );
+        }); db[_params.db] = new Array(); 
     
-        return [{
+        save( _params ); return [{
             database: _params.db,
             status: 'DB added'
         }];
@@ -242,7 +244,6 @@ function addDB( _params ){
 function removeDB( _params ){
     try{
 
-        const init = `${query.path}/_init_.json`;
         const i = db._init_.DB.findIndex(x=>{
             return x.name == _params.db
         }); 
@@ -251,11 +252,9 @@ function removeDB( _params ){
             const path = `${query.path}/${x}.json`;
             fs.unlinkSync(path);
         }); db._init_.DB.splice(i,1);
-    
         db[_params.db] = new Array();
-        fs.writeFileSync( init,JSON.stringify(db._init_) );
     
-        return [{
+        save( _params ); return [{
             database: _params.db,
             table: _params.table,
             status: 'DB deleted'
@@ -300,7 +299,7 @@ function addTable( _params ){
 
     db[_params.db][_params.table] = new Array();
     
-    return [{
+    save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'table added'
@@ -321,7 +320,7 @@ function removeTable( _params ){
     db._init_.DB[i].tables.splice(j,1);
     delete db[_params.db][_params.table];
 
-    return [{
+    save( _params ); return [{
         database: _params.db,
         table: _params.table,
         status: 'table removed'
@@ -338,6 +337,15 @@ function refresh( _params ){
     });
 }
 
+function save( _params ){
+    modifyDB( _params.db,_params.table );
+    return [{
+        database: _params.db,
+        table: _params.table,
+        status: 'saved'
+    }];
+}
+
 /* --------------------------------------------------------------------------------------- */
 
 (async ()=>{

package/module/_worker_.js

@@ -32,14 +32,10 @@ function app(req,res){
 (()=>{
     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}`,
+                    protocol: 'HTTP', status: 'started',
+                    workerID: process.pid, port: query.port,
                 });
             }).catch(e=>{ process.exit(1); });
         });

package/package.json

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