molly-db 1.0.30 → 1.0.33

package/module/_api_.js

@@ -9,8 +9,6 @@ function list( _params ){
 
 function match( _params ){
     try{
-
-    } catch(e) {
         const result = new Array();
         db[_params.db][_params.table].map((x)=>{
             const reg = crypto.slugify(_params.target);
@@ -21,7 +19,7 @@ function match( _params ){
         return parseData( result.map(x=>JSON.parse(x)).slice(
             _params.offset, Number(_params.offset)+Number(_params.length)
         ), result.length);
-    }
+    } catch(e) { return parseError(e) }
 }
 
 function hash( _params ){
@@ -99,11 +97,11 @@ async function addTable( _params ){
             }
         }
         
-        /*await save( _params )*/ return [{
+        /*await save( _params )*/ return {
             status: 'table added',
             database: _params.db,
             table: _params.table,
-        }];
+        };
 
     } catch(e) { return parseError(e) }
 }
@@ -125,11 +123,11 @@ async function removeTable( _params ){
             }
         }
     
-        /*await save( _params )*/ return [{
+        /*await save( _params )*/ return {
             status: 'table removed',
             database: _params.db,
             table: _params.table,
-        }];
+        };
 
     } catch(e) { return parseError(e) }
 }
@@ -149,10 +147,10 @@ async function addDB( _params ){
             tables: [], name: _params.db,
         }); db[_params.db] = new Array();
     
-        /*await save( _params )*/ return [{
+        /*await save( _params )*/ return {
             database: _params.db,
             status: 'DB added'
-        }];
+        };
 
     } catch(e) { return parseError(e) }
 }
@@ -177,11 +175,11 @@ async function removeDB( _params ){
             }
         }
     
-        /*await save( _params )*/ return [{
+        /*await save( _params )*/ return {
             database: _params.db,
             table: _params.table,
             status: 'DB deleted'
-        }];
+        };
 
     } catch(e) { return parseError(e) }
 }
@@ -204,11 +202,11 @@ async function modifyDB( _name, _table ){
 
 /* --------------------------------------------------------------------------------------- */
 
-async function saveAll( _params ){
+async function saveAll(){
     try{for( var i in db['_init_'] ){ for( var j in db['_init_'][i] ){
         const {name,tables} = db['_init_'][i][j];
         for( var k in tables ) 
             await modifyDB(name,tables[k])
-    }}  return parseData([]);
-    } catch(e) { return parseError(e) }
+    }}  return { status: 'DB Saved' };
+    } catch(e) { console.log(e); return parseError(e) }
 }

package/module/_app_.js

@@ -145,42 +145,41 @@ async function save( _params ){
 (async ()=>{
     try{
         
-        body = await getBody();
-        params = await validate(params); 
+        if( api.pathname == '/saveAll' ) 
+            return json( await saveAll() );
+            params = await validate(params);
+            body = await getBody();
 
         /* Find Api */
-        if( api.pathname == '/list' ) json( await list(params) )
-        else if( api.pathname == '/hash' ) json( await hash(params) )
-        else if( api.pathname == '/match' ) json( await match(params) )
-        else if( api.pathname == '/update' ) json( await update(params) )
-
-        else if( api.pathname == '/index' ) json( await indexOf(params) )
-        else if( api.pathname == '/length' ) json( await lengthOf(params) )
-
-        /* Save Api */
-        else if( api.pathname == '/save' ) json( await save(params) )
-        else if( api.pathname == '/remove' ) json( await remove(params) )
-        else if( api.pathname == '/refresh' ) json( await refresh(params) )
-        else if( api.pathname == '/saveAll' ) json( await saveAll(params) )
-
-        /* Remove Api */
-        else if( api.pathname == '/pop' ) json( await pop(params) )
-        else if( api.pathname == '/shift' ) json( await shift(params) )
-
-        /* Modify Api */
-        else if( api.pathname == '/push' ) json( await push(params) )
-        else if( api.pathname == '/splice' ) json( await splice(params) )
-        else if( api.pathname == '/unshift' ) json( await unshift(params) )
-
-        /* Modify Table Api */
-        else if( api.pathname == '/addDB' ) json( await addDB(params) )
-        else if( api.pathname == '/removeDB' ) json( await removeDB(params) )
-
-        /* Modify Table Api */
-        else if( api.pathname == '/addTable' ) json( await addTable(params) )
-        else if( api.pathname == '/removeTable' ) json( await removeTable(params) )
-
-        else error(parseError('Oops something went wrong'));
+        switch( api.pathname ){
+
+            case '/pop':        return json( await pop(params) );
+            case '/shift':      return json( await shift(params) );
+
+            case '/list':       return json( await list(params) );
+            case '/hash':       return json( await hash(params) );
+            case '/match':      return json( await match(params) );
+            case '/update':     return json( await update(params) );
+
+            case '/push':       return json( await push(params) );
+            case '/slice':      return json( await splice(params) );
+            case 'unshift':     return json( await unshift(params) );
+
+            case '/save':       return json( await save(params) );
+            case '/remove':     return json( await remove(params) );
+            case '/refresh':    return json( await refresh(params) );
+
+            case '/index':      return json( await indexOf(params) );
+            case '/length':     return json( await lengthOf(params) );
+
+            case '/addDB':      return json( await addDB(params) );
+            case '/removeDB':   return json( await removeDB(params) );
+            case '/addTable':   return json( await addTable(params) );
+            case '/removeTable':return json( await removeTable(params) );
+
+            default:            return error(parseError('Oops something went wrong'));
+
+        }
 
     } catch(e) { error(parseError(e)); }
 })();

package/module/_worker_.js

@@ -26,13 +26,12 @@ async function app(req,res){ await eval(`try{ ${api_script} \n ${app_script} }ca
 function saveTimeout(){
     time = process.mollyDB.time * 3600000;
     setTimeout(() => {
-        if( db._update_ == true ){
+        if( db._update_ ){db._update_ = false;
+            const port = process.mollyDB.port;
             const api = url.format({
-                path: '/saveAll?db=&table=',
-                port: process.mollyDB.port,
-                host: 'http://127.0.0.1',
+                host: 'http://127.0.0.1:${port}',
+                path: '/saveAll'
             }); fetch(api).then().catch();
-            db._update_ = false;
         }
     }, time);
 }

package/package.json

@@ -2,7 +2,7 @@
   "license": "MIT",
   "main": "main.js",
   "name": "molly-db",
-  "version": "1.0.30",
+  "version": "1.0.33",
   "author": "bececrazy",
   "scripts": { "start": "node main" },
   "repository": "https://github.com/EDBC-REPO-NPM/Molly-db",