molly-db 1.3.6 → 1.3.8

package/main.js

@@ -18,17 +18,14 @@ function config( _config ) {
 
 class molly_db{
     constructor( opt ){
-        if(opt.pass) this.pass = opt.pass; this.port = opt.port || 27017;
         const dir = path.join(__dirname,'/module/worker_handler.js');
 
-        if( !(new RegExp(process.cwd())).test(opt.path) )
-             this.path = path.join(process.cwd(),opt.path);
-        else this.path = opt.path;
-
-        this.host = opt.host         || '127.0.0.1';
-        this.protocol = opt.protocol || 'http';
-        this.time = opt.saveTime     || .1;
-        this.import = opt.import     || '';
+        this.host = opt?.host         || '127.0.0.1';
+        this.protocol = opt?.protocol || 'http';
+        this.port = opt?.port         || 27017;
+        this.path = opt?.path         || null;
+        this.pass = opt?.pass         || null;
+        this.time = opt?.saveTime     || .1;
         
         return require(dir)(this);
     }

package/module/api_handler.js

@@ -28,15 +28,20 @@ module.exports = function(db,req,res,arg){
 
     req.on('data',(chunk)=>{ raw.push(chunk) });
     req.on('close',()=>{ 
-        const data = JSON.parse(Buffer.concat(raw));
-        send(db,arg,data).then(msg=>{
-            const status = msg.match(/\d+/i)[0];
-            res.writeHead(status,{'content-type': 'text/plain'});
-            res.write(msg); res.end();
-        }).catch(e=>{
+        try {
+            const data = JSON.parse(Buffer.concat(raw));
+            send(db,arg,data).then(msg=>{
+                const status = msg.match(/\d+/i)[0];
+                res.writeHead(status,{'content-type': 'text/plain'});
+                res.write(msg); res.end();
+            }).catch(e=>{
+                res.writeHead(404,{'content-type': 'text/plain'});
+                res.write(e); res.end();
+            })
+        } catch(e) {
             res.writeHead(404,{'content-type': 'text/plain'});
-            res.write(e); res.end();
-        })
+            res.write('unexpected body'); res.end();
+        }
     });
 
 }

package/module/init_handler.js

@@ -1,4 +1,3 @@
-const download = require('./import_handler');
 const crypto = require('./crypto_handler');
 const fetch = require('molly-fetch');
 const readline = require('readline');
@@ -11,23 +10,19 @@ const db = new Object();
 function fillDB( _db, _table, _path, _pass ){
     return new Promise(async(response,reject)=>{
 
-        let _itr = undefined;
+        let stream;
 
-        if( (/^http/).test(_path) ){ try{
-            const stream = await fetch(_path,{responseType:'stream'});
-            _itr = readline.createInterface({ input: stream.data });
-        } catch(e) { return response(`error reading ${_path}`); }}
+        if( fs.existsSync(_path) ) stream = fs.createReadStream(_path);
 
-        else if( fs.existsSync(_path) )
-            _itr = readline.createInterface({
-                input: fs.createReadStream(_path)
-            });
-        
-        else { return response(`error reading ${_path}`); }     
-
-        _itr.on('line',(line)=>{
-            db[_db][_table].push(crypto.decrypt( line,_pass ));
-        }); _itr.on('close',()=>{ response() });
+        else if( (/^http/).test(_path) )
+            stream = (await fetch(_path,{responseType:'stream'})).data;
+            
+        try {
+            const _itr = readline.createInterface({ input: stream });
+            _itr.on('close',()=>{ response() }); _itr.on('line',(line)=>{
+                db[_db][_table].push(crypto.decrypt( line,_pass ));
+            }); 
+        } catch(e) { return response(`error: reading ${_path}`) }
         
     });
 }
@@ -38,19 +33,21 @@ module.exports = function(args){
     return new Promise(async(response,reject)=>{
         try {
     
-            const dir = path.join(args.path,'_init_.json');
-            
-            db._buff_ = fs.readFileSync( dir );
-            db._init_ = JSON.parse( db._buff_ );
-            db._path_ = args.path; delete db._buff_;
+            const dir = `${args.path}/_init_.json`;
+
+            if( !(/^http/).test(args.path) )
+                db._init_ = JSON.parse(fs.readFileSync(dir));
+            else
+                db._init_ = (await fetch(dir)).data;
+                db._path_ = args.path;
             
-            for( var i in db._init_.DB ){
+            for( let i in db._init_.DB ){
     
                 const DB = db._init_.DB[i]; const name = DB.name;
                 delete db[name]; db[name] = new Object();
         
-                for( var j in DB.tables ){ 
-                    const table = DB.tables[j]; const dir = path.join(db._path_,`${table}.json`);
+                for( let j in DB.tables ){ 
+                    const table = DB.tables[j]; const dir = `${db._path_}/${table}.json`;
                     db[name][table] = new Array(); await fillDB( name,table,dir,args.pass );
                 }
         
@@ -58,8 +55,9 @@ module.exports = function(args){
     
         } catch(e) {
             db._init_ = {DB:[]}; db._path_ = args.path;
-            const dir = path.join(args.path,'_init_.json');
-            fs.writeFileSync( dir,JSON.stringify(db._init_) );
+            const dir = `${args.path}/_init_.json`; try {
+                fs.writeFileSync( dir,JSON.stringify(db._init_) );
+            } catch(e) {  }
         }   response(db);
     });
 }

package/module/utils.js

@@ -61,8 +61,8 @@ const encryptDB = function( param, db, _db, _table, _path ){
 const modifyDB = async function( data, db, _name, _table ){
     try{
 
-        const dir = path.join(db._path_,`${_table}.json`);
-        const init = path.join(db._path_,'_init_.json');
+        const init = `${db._path_}/_init_.json`;
+        const dir = `${db._path_}/${_table}.json`;
 
         fs.writeFileSync( init,JSON.stringify(db._init_) );
     
@@ -241,7 +241,7 @@ output.removeDB = function(data,db){
         for( var i in db._init_.DB ){
             if( db._init_.DB[i].name == data.db ){
                 db._init_.DB[i].tables.map(x=>{
-                    const dir = path.join(data.path,`${x}.json`);
+                    const dir = `${data.path}/${x}.json`;
                     if( fs.existsSync(dir) ) fs.unlinkSync(dir);
                 }); 
                 const arr = db._init_.DB; arr.splice(i,1);
@@ -301,7 +301,7 @@ output.removeTable = function(data,db){
     
         for( var i in db._init_.DB ){
             if( db._init_.DB[i].name == data.db ){
-                const dir = path.join(data.path,`${data.table}.json`);
+                const dir = `${data.path}/${data.table}.json`;
                 const j = db._init_.DB[i].tables.indexOf(data.table);
                 if( fs.existsSync(dir) ) fs.unlinkSync(dir);
                 const arr = db._init_.DB[i].tables; arr.splice(j,1);

package/module/worker_handler.js

@@ -7,7 +7,6 @@ const app = require('./api_handler');
 const {Buffer} = require('buffer');
 const utils = require('./utils');
 const http = require('http');
-const path = require('path');
 
 /*--────────────────────────────────────────────────────────────────────────────────────────────--*/
 
@@ -33,7 +32,7 @@ module.exports = (arg)=>{ init( arg ).then((db)=>{
         const server = http.createServer((req,res)=>app(db,req,res,arg));
         server.listen( arg.port, arg.host, ()=>{
             console.log(JSON.stringify({
-                name: 'molly-file', protocol: 'HTTP', 
+                name: 'molly-db', protocol: 'HTTP', 
                 port: arg.port, host: arg.host,
             }));
         }); saveTimeout( arg, db );

package/package.json

@@ -5,12 +5,12 @@
   "repository": "https://github.com/EDBC-REPO-NPM/Molly-db",
   "dependencies": {
     "crypto-js": "^4.1.1",
-    "molly-fetch": "^1.1.2"
+    "molly-fetch": "^1.1.7"
   },
   "license": "MIT",
   "main": "main.js",
   "name": "molly-db",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "author": "bececrazy",
   "description": "Molly-db is a free and open source library for nodejs that allow you create a lightweight encrypted database using Json files",
   "keywords": [

package/module/import_handler.js

@@ -1,3 +0,0 @@
-module.exports = function(){
-    //FIXME: falta crear el importador DB
-}