molly-db 1.3.5 → 1.3.6

package/main.js

@@ -25,11 +25,10 @@ class molly_db{
              this.path = path.join(process.cwd(),opt.path);
         else this.path = opt.path;
 
-        this.host = opt.host         || 'localhost';
+        this.host = opt.host         || '127.0.0.1';
         this.protocol = opt.protocol || 'http';
         this.time = opt.saveTime     || .1;
         this.import = opt.import     || '';
-        this.threads = opt.thread    || 1;
         
         return require(dir)(this);
     }

package/module/api_handler.js

@@ -1,45 +1,44 @@
+
+const memory = require('./memory_handler');
 const cluster = require('cluster');
 const {Buffer} = require('buffer');
 const output = new Object();
 
 /*--────────────────────────────────────────────────────────────────────────────────────────────--*/
 
-output.http = function(req,res){
+function send( db,arg,msg ){
+    const empty = '{ "status":"404", "message":"empty data" }';
+    const error = '{ "status":"404", "message":"error data" }';
+    return new Promise((response,reject)=>{
+        try {memory(arg,msg,db)
+            .then(x=> response(JSON.stringify(x)||empty) )
+            .catch(e=>response(JSON.stringify(e)||empty) )
+        } catch(e) { response(error) }
+    }) 
+}
+
+/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
+
+module.exports = function(db,req,res,arg){
 
     if( req.method != 'POST' ){
         res.writeHead(200,{'content-type': 'text/plain'});
         return res.end('Only Post Method Avalilable');
     }   const raw = new Array();
 
-    req.on('close',()=>{ process.send(Buffer.concat(raw)) });
     req.on('data',(chunk)=>{ raw.push(chunk) });
-
-    cluster.worker.once('message',(msg)=>{
-        const status = msg.match(/\d+/i)[0];
-        res.writeHead(status,{'content-type': 'text/plain'});
-        res.write(msg); res.end();
-    })
+    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=>{
+            res.writeHead(404,{'content-type': 'text/plain'});
+            res.write(e); res.end();
+        })
+    });
 
 }
 
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
-
-output.WebSocket = function( message,client ){
-    cluster.worker.once('message',(msg)=>{
-        client.send(msg);
-    }); process.send(message);
-}
-
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
-
-output.Socket = function( message,client ){
-    cluster.worker.once('message',(msg)=>{
-        client.write(msg);
-    }); process.send(message);
-}
-
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
-
-module.exports = output;
-
 /*--────────────────────────────────────────────────────────────────────────────────────────────--*/

package/module/worker_handler.js

@@ -3,8 +3,10 @@
 const memory = require('./memory_handler');
 const worker = require('worker_threads');
 const init = require('./init_handler');
+const app = require('./api_handler');
 const {Buffer} = require('buffer');
 const utils = require('./utils');
+const http = require('http');
 const path = require('path');
 
 /*--────────────────────────────────────────────────────────────────────────────────────────────--*/
@@ -25,23 +27,17 @@ function saveTimeout(data,db){
 
 /*--────────────────────────────────────────────────────────────────────────────────────────────--*/
 
-module.exports = (args)=>{
-    process.env.MOLLY_DB_ARGS = JSON.stringify(args);
-    init( args ).then((db)=>{ saveTimeout( args, db );
-        const dir = path.join(__dirname,'server_worker.js');
-        const srv = new worker.Worker(dir,{ workerData: args });
-        srv.on('error',Error); srv.on('exit',Exit); srv.on('message',(msg)=>{
-            const empty = '{ "status":"404", "message":"empty data" }';
-            const error = '{ "status":"404", "message":"error data" }';
-            try {
-                const raw = Buffer.from(msg).toString(); 
-                memory(args,JSON.parse(raw),db).then(x=>{ 
-                    const out = JSON.stringify(x); srv.postMessage(out||empty);
-                }).catch(e=>{
-                    const out = JSON.stringify(e); srv.postMessage(out||empty);
-                })
-            } catch(e) { console.log(e); srv.postMessage(error) }
-        });
+module.exports = (arg)=>{ init( arg ).then((db)=>{
+
+        process.env.MOLLY_DB_arg = JSON.stringify(arg);
+        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', 
+                port: arg.port, host: arg.host,
+            }));
+        }); saveTimeout( arg, db );
+
     }).catch((e)=>{ console.log(e) });
 }
 

package/package.json

@@ -5,13 +5,12 @@
   "repository": "https://github.com/EDBC-REPO-NPM/Molly-db",
   "dependencies": {
     "crypto-js": "^4.1.1",
-    "molly-fetch": "^1.1.2",
-    "ws": "^8.11.0"
+    "molly-fetch": "^1.1.2"
   },
   "license": "MIT",
   "main": "main.js",
   "name": "molly-db",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "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/server_worker.js

@@ -1,71 +0,0 @@
-const worker = require('worker_threads');
-const app = require('./api_handler');
-const cluster = require('cluster');
-const http = require('http');
-const net = require('net');
-const ws = require('ws');
-
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
-
-function createHTTPServer(){
-    http.createServer( app.http ).listen( process.env.port, process.env.host, ()=>{
-        console.log({
-            protocol: 'HTTP', status: 'started',
-            wrkID: process.pid, port: process.env.port,
-            host: process.env.host
-        });
-    });
-}
-
-function createWebSocketServer(){
-    const srv = new ws.WebSocketServer({ port: process.env.port, host: process.env.host });
-    srv.on('connection',(client)=>{
-        client.on('message',(msg)=>app.WebSocket(msg,client));
-    }); console.log ({
-        protocol: 'WebSocket', status: 'started',
-        wrkID: process.pid, port: process.env.port,
-        host: process.env.host
-    });
-}
-
-function createSocketServer(){
-    const srv = net.createServer({ port: process.env.port, host: process.env.host });
-    srv.on('connection',(client)=>{
-        client.on('message',(msg)=>app.Socket(msg,client));
-    }); console.log ({
-        protocol: 'Socket', status: 'started',
-        wrkID: process.pid, port: process.env.port,
-        host: process.env.host
-    });
-}
-
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/
-
-(()=>{
-
-    if( cluster.isPrimary ) { 
-        const env = worker.workerData;
-        const data = worker.workerData;
-        for ( let i=data.threads; i--; ){ 
-            
-            const wrk = cluster.fork(data,env);
-
-            cluster.on('exit', (wrk, code, signal) => { cluster.fork(data,env);
-                console.log(`wrk ${wrk.process.pid} died`);
-            }); wrk.on('exit', (msg)=>{ console.log(msg); });
-
-            wrk.on('message', (msg)=>{ worker.parentPort.postMessage(msg) });
-            worker.parentPort.on('message',(msg)=>{ wrk.send(msg) });
-            
-        }
-    } else {
-        switch( process.env.protocol ){
-            case 'WebSocket': createWebSocketServer(); break;
-            case 'Socket': createSocketServer(); break;
-            default: createHTTPServer(); break;
-        }
-    } 
-    
-})();
-
-/*--────────────────────────────────────────────────────────────────────────────────────────────--*/