diff --git a/ee/utilities/clean.sh b/ee/utilities/clean.sh new file mode 100755 index 000000000..3e8ec080b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/ee/utilities/prepare-dev.sh b/ee/utilities/prepare-dev.sh new file mode 100755 index 000000000..2daecbfc1 --- /dev/null +++ b/ee/utilities/prepare-dev.sh @@ -0,0 +1,2 @@ +#!/bin/bash +rsync -avr --exclude=".*" --exclude="node_modules" --ignore-existing ../../utilities/* ./ \ No newline at end of file diff --git a/ee/utilities/utils/helper-ee.js b/ee/utilities/utils/helper-ee.js index 522158a01..7853d67ad 100644 --- a/ee/utilities/utils/helper-ee.js +++ b/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 = { diff --git a/utilities/servers/websocket.js b/utilities/servers/websocket.js index 8ef276939..5658bbd57 100644 --- a/utilities/servers/websocket.js +++ b/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}`); diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js index a874efa65..54fbfd8ef 100644 --- a/utilities/utils/helper.js +++ b/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 }; \ No newline at end of file