molly-db 1.0.14 → 1.0.17

package/main.js

@@ -15,31 +15,12 @@ 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 ){
-        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 );
+    constructor( opt ){ if( opt.pass )
+        this.pass = opt.pass; this.port = opt.port || 27017;
+        this.path = opt.path.replace( /^\./,process.cwd() );
+        return require(`${__dirname}/module/_worker_.js`)(this);
     }
 
 }

package/module/_init_.js

@@ -27,7 +27,7 @@ function fillDB( _db, _table, _path ){
 
 /* --------------------------------------------------------------------------------------- */
 
-(async()=>{
+(()=>{ return new Promise(async(response,reject)=>{
     try {
 
         const path = `${query.path}/_init_.json`;
@@ -65,4 +65,6 @@ function fillDB( _db, _table, _path ){
         fs.writeFileSync( path,JSON.stringify(db._init_) );
 
     }   response();
-})();
+
+
+}); })();

package/module/_server_.js

@@ -22,12 +22,12 @@ function json( _data ){
 function bodyParser( _data ){
 
     const date = Date.now(); _data = JSON.parse(_data);
-    const result = typeof _data != 'String' ? _data : [ _data ];
+    const result = _data.length ? _data : [_data];
 
     return result.map(x=>{ if( !x?.hash )
         x.hash = crypto.hash( date,Math.random() );
         return JSON.stringify(x);
-    }) 
+    });
 
 }
 
@@ -379,4 +379,4 @@ async function save( _params ){
     } catch(e) { error(e?.message||e); }
 })();
 
-/* --------------------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------------------- */

package/module/_worker_.js

@@ -2,20 +2,22 @@ const worker = require('worker_threads');
 const readline = require('readline');
 const crypto = require('./_crypto_');
 const { Buffer } = require('buffer'); 
+const cluster = require('cluster');
 const fetch = require('axios');
 const http = require('http');
 const url = require('url');
 const fs = require('fs');
 
-const query = worker.workerData;
+/* --------------------------------------------------------------------------------------- */
+
+let query;
 const db = new Object();
+
 /* --------------------------------------------------------------------------------------- */
 
 function _init_(){
-    return new Promise((response,reject)=>{
-        try{ eval( fs.readFileSync(`${__dirname}/_init_.js`).toString() );
-        } catch(e){ console.log(e); }
-    });
+    try{ return eval( fs.readFileSync(`${__dirname}/_init_.js`).toString() );
+    } catch(e){ console.log(e); }
 }
 
 /* --------------------------------------------------------------------------------------- */
@@ -27,15 +29,22 @@ function app(req,res){
 
 /* --------------------------------------------------------------------------------------- */
 
-(()=>{
-    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); });
+module.exports = (args)=>{ query = args;
+    return new Promise((response,reject)=>{
+        if (cluster.isPrimary) { const worker = cluster.fork();
+            cluster.on('exit', (worker, code, signal) => { cluster.fork();
+                console.log(`worker ${worker.process.pid} died`);
+            }); worker.on('message', (msg)=>{ console.log(msg); response(); }); 
+                worker.on('exit', (msg)=>{ reject(msg); });
+        } else {
+            http.createServer( app ).listen( query.port,()=>{
+                _init_().then(()=>{ process.send({
+                    workerID: process.pid, port: query.port,
+                    protocol: 'HTTP', status: 'started',
+                })}).catch(e=>{ console.log(e); });
+            });      
+        }
     });
-})();
+}
 
 /* --------------------------------------------------------------------------------------- */

package/package.json

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