feat(assist): assist refactored

ee/utilities/clean.sh

@@ -0,0 +1,8 @@
+rm -rf ./utils/geoIP.js
+rm -rf ./utils/HeapSnapshot.js
+rm -rf ./utils/helper.js
+
+rm -rf servers/peerjs-server.js
+rm -rf servers/sourcemaps-handler.js
+rm -rf servers/sourcemaps-server.js
+rm -rf build.sh

ee/utilities/prepare-dev.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+rsync -avr --exclude=".*" --exclude="node_modules" --ignore-existing ../../utilities/* ./

ee/utilities/utils/helper-ee.js

@@ -1,4 +1,4 @@
-const {objectToObjectOfArrays} = require('./helper');
+const helper = require('./helper');
 const getBodyFromUWSResponse = async function (res) {
     return new Promise(((resolve, reject) => {
         let buffer;
@@ -39,13 +39,9 @@ const extractFiltersFromRequest = async function (req, res) {
         let body = await getBodyFromUWSResponse(res);
         filters = {...filters, ...body};
     } else {
-        if (req.query.userId) {
-            debug && console.log(`[WS]where userId=${req.query.userId}`);
-            filters.userID = [req.query.userId];
-        }
-        filters = {...filters, ...req.body};
+        return helper.extractFiltersFromRequest(req);
     }
-    filters = objectToObjectOfArrays({...filters, ...req.body});
+    filters = helper.objectToObjectOfArrays({...filters, ...req.body});
     return Object.keys(filters).length > 0 ? filters : undefined;
 }
 module.exports = {

utilities/servers/websocket.js

@@ -1,7 +1,7 @@
 const _io = require('socket.io');
 const express = require('express');
 const uaParser = require('ua-parser-js');
-const {extractPeerId, hasFilters, isValidSession, objectToObjectOfArrays} = require('../utils/helper');
+const {extractPeerId, hasFilters, isValidSession, extractFiltersFromRequest} = require('../utils/helper');
 const {geoip} = require('../utils/geoIP');
 const wsRouter = express.Router();
 const UPDATE_EVENT = "UPDATE_SESSION";
@@ -28,16 +28,6 @@ const createSocketIOServer = function (server, prefix) {
     });
 }
 
-const extractFiltersFromRequest = function (req) {
-    let filters = {};
-    if (req.query.userId) {
-        debug && console.log(`[WS]where userId=${req.query.userId}`);
-        filters.userID = [req.query.userId];
-    }
-    filters = objectToObjectOfArrays({...filters, ...req.body});
-    return Object.keys(filters).length > 0 ? filters : undefined;
-}
-
 const extractProjectKeyFromRequest = function (req) {
     if (req.params.projectKey) {
         debug && console.log(`[WS]where projectKey=${req.params.projectKey}`);

utilities/utils/helper.js

@@ -66,6 +66,15 @@ const objectToObjectOfArrays = function (obj) {
     }
     return _obj;
 }
+const extractFiltersFromRequest = function (req) {
+    let filters = {};
+    if (req.query.userId) {
+        debug && console.log(`[WS]where userId=${req.query.userId}`);
+        filters.userID = [req.query.userId];
+    }
+    filters = objectToObjectOfArrays({...filters, ...req.body});
+    return Object.keys(filters).length > 0 ? filters : undefined;
+}
 module.exports = {
-    extractPeerId, request_logger, isValidSession, hasFilters, objectToObjectOfArrays
+    extractPeerId, request_logger, isValidSession, hasFilters, objectToObjectOfArrays, extractFiltersFromRequest
 };