molly-db 1.0.16 → 1.0.20

package/main.js

@@ -1,5 +1,4 @@
 const worker = require('worker_threads');
-const fetch = require('axios');
 const url = require('url');
 const fs = require('fs');
 
@@ -15,32 +14,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('exit',(err)=>{ console.log(err);
-            response(startWorker(_path,_self));
-        }); wrk.on('message',(msg)=>{ 
-            console.log(msg); response(msg) 
-        });
-    });
-}
-
-/* --------------------------------------------------------------------------------------- */
-
 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

@@ -6,9 +6,7 @@ function fillDB( _db, _table, _path ){
 
         if( (/^http/).test(_path) ){ try{
             const stream = await fetch.get(_path,{responseType:'stream'});
-            _itr = readline.createInterface({
-                input: stream.data
-            })
+            _itr = readline.createInterface({ input: stream })
         } catch(e) { console.log(`error reading ${_path}`); return response(); }}
 
         else if( fs.existsSync(_path) )

package/module/_worker_.js

@@ -2,13 +2,17 @@ const worker = require('worker_threads');
 const readline = require('readline');
 const crypto = require('./_crypto_');
 const { Buffer } = require('buffer'); 
-const fetch = require('axios');
+const fetch = require('molly-fetch');
+const cluster = require('cluster');
 const http = require('http');
 const url = require('url');
 const fs = require('fs');
 
-const query = worker.workerData;
+/* --------------------------------------------------------------------------------------- */
+
+let query;
 const db = new Object();
+
 /* --------------------------------------------------------------------------------------- */
 
 function _init_(){
@@ -25,11 +29,22 @@ function app(req,res){
 
 /* --------------------------------------------------------------------------------------- */
 
-(()=>{ http.createServer( app ).listen( query.port,()=>{
-    _init_().then(()=>{ worker.parentPort.postMessage({
-        workerID: process.pid, port: query.port,
-        protocol: 'HTTP', status: 'started',
-    }); }).catch(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.16",
+  "version": "1.0.20",
   "name": "molly-db",
   "author": "bececrazy",
   "scripts": {
@@ -9,9 +9,9 @@
   },
   "repository": "https://github.com/EDBC-REPO-NPM/Molly-db",
   "dependencies": {
-    "axios": "^0.27.2",
-    "crypto-js": "^4.1.1",
-    "fs": "^0.0.1-security"
+    "molly-fetch": "^1.0.8",
+    "fs": "^0.0.1-security",
+    "crypto-js": "^4.1.1"
   },
   "description": "Molly-db is a free and open source library for nodejs that allow you create a lightweight encrypted database using Json files",
   "keywords": [