Merge branch 'dev' into assist

2021-06-29 14:28:52 +02:00 · 2021-06-29 14:28:52 +02:00 · 0c78d83774
commit 0c78d83774
parent 5a9fec1f25 d1f44f871c
59 changed files with 3028 additions and 320 deletions
--- a/.github/workflows/api-ee.yaml
+++ b/.github/workflows/api-ee.yaml
@ -47,7 +47,7 @@ jobs:
        sed -i "s#minio_secret_key.*#minio_secret_key: \"${{ secrets.EE_MINIO_SECRET_KEY }}\" #g" vars.yaml
        sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml
        sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml
-        sed -i "s/tag:.*/tag: \"$IMAGE_TAG\"/g" vars.yaml
+        sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml
        bash kube-install.sh --app chalice
      env:
        DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@ -47,7 +47,7 @@ jobs:
        sed -i "s#minio_secret_key.*#minio_secret_key: \"${{ secrets.OSS_MINIO_SECRET_KEY }}\" #g" vars.yaml
        sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml
        sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml
-        sed -i "s/tag:.*/tag: \"$IMAGE_TAG\"/g" app/chalice.yaml
+        sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml
        bash kube-install.sh --app chalice
      env:
        DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
--- a/.github/workflows/utilities.yaml
+++ b/.github/workflows/utilities.yaml
@ -0,0 +1,64 @@
+# This action will push the utilities changes to aws
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - utilities/**
+
+name: Build and Deploy Utilities
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        # We need to diff with old commit 
+        # to see which workers got changed.
+        fetch-depth: 2
+
+    - name: Docker login
+      run: |
+        docker login ${{ secrets.OSS_REGISTRY_URL }} -u ${{ secrets.OSS_DOCKER_USERNAME }} -p "${{ secrets.OSS_REGISTRY_TOKEN }}" 
+
+    - uses: azure/k8s-set-context@v1
+      with:
+        method: kubeconfig
+        kubeconfig: ${{ secrets.OSS_KUBECONFIG }} # Use content of kubeconfig in secret.
+      id: setcontext
+
+    - name: Building and Pusing api image
+      id: build-image
+      env:
+        DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
+        IMAGE_TAG: ${{ github.sha }}
+        ENVIRONMENT: staging
+      run: |
+        cd utilities
+        PUSH_IMAGE=1 bash build.sh
+    - name: Deploy to kubernetes
+      run: |
+        cd scripts/helm/
+        sed -i "s#minio_access_key.*#minio_access_key: \"${{ secrets.OSS_MINIO_ACCESS_KEY }}\" #g" vars.yaml
+        sed -i "s#minio_secret_key.*#minio_secret_key: \"${{ secrets.OSS_MINIO_SECRET_KEY }}\" #g" vars.yaml
+        sed -i "s#domain_name.*#domain_name: \"foss.openreplay.com\" #g" vars.yaml
+        sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml
+        sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml
+        bash kube-install.sh --app utilities
+      env:
+        DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
+        IMAGE_TAG: ${{ github.sha }}
+        ENVIRONMENT: staging
+
+    # - name: Debug Job
+    #   if: ${{ failure() }}
+    #   uses: mxschmitt/action-tmate@v3
+    #   env:
+    #     DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
+    #     IMAGE_TAG: ${{ github.sha }}
+    #     ENVIRONMENT: staging
+    #
--- a/.github/workflows/workers.yaml
+++ b/.github/workflows/workers.yaml
@ -70,7 +70,7 @@ jobs:
        sed -i "s#kubeconfig.*#kubeconfig_path: ${KUBECONFIG}#g" vars.yaml
        for image in $(cat ../../backend/images_to_build.txt);
        do
-          sed -i "s/tag:.*/tag: \"$IMAGE_TAG\"/g" app/${image}.yaml
+          sed -i "s/image_tag:.*/image_tag: \"$IMAGE_TAG\"/g" vars.yaml
          # Deploy command
          bash kube-install.sh --app $image
        done
--- a/api/.chalice/config.json
+++ b/api/.chalice/config.json
@ -30,9 +30,10 @@
        "sessions_bucket": "mobs",
        "sessions_region": "us-east-1",
        "put_S3_TTL": "20",
-        "sourcemaps_reader": "http://127.0.0.1:3000/",
+        "sourcemaps_reader": "http://utilities-openreplay.app.svc.cluster.local:9000/sourcemaps",
        "sourcemaps_bucket": "sourcemaps",
        "js_cache_bucket": "sessions-assets",
+        "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/peers",
        "async_Token": "",
        "EMAIL_HOST": "",
        "EMAIL_PORT": "587",
--- a/api/Dockerfile
+++ b/api/Dockerfile
@ -4,14 +4,6 @@ WORKDIR /work
 COPY . .
 RUN pip install -r requirements.txt -t ./vendor --upgrade
 RUN pip install chalice==1.22.2
-# Installing Nodejs
-RUN apt update && apt install -y curl && \
-    curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \
-    apt install -y nodejs && \
-    apt remove --purge -y curl && \
-    rm -rf /var/lib/apt/lists/* && \
-    cd sourcemaps_reader && \
-    npm install

 # Add Tini
 # Startup daemon
--- a/api/build.sh
+++ b/api/build.sh
@ -27,6 +27,8 @@ function build_api(){
    docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/chalice:${git_sha1} .
    [[ $PUSH_IMAGE -eq 1 ]] && {
        docker push ${DOCKER_REPO:-'local'}/chalice:${git_sha1}
+        docker tag ${DOCKER_REPO:-'local'}/chalice:${git_sha1} ${DOCKER_REPO:-'local'}/chalice:latest
+        docker push ${DOCKER_REPO:-'local'}/chalice:latest
    }
 }

--- a/api/chalicelib/blueprints/bp_core.py
+++ b/api/chalicelib/blueprints/bp_core.py
@ -10,7 +10,8 @@ from chalicelib.core import log_tool_rollbar, sourcemaps, events, sessions_assig
    log_tool_elasticsearch, log_tool_datadog, \
    log_tool_stackdriver, reset_password, sessions_favorite_viewed, \
    log_tool_cloudwatch, log_tool_sentry, log_tool_sumologic, log_tools, errors, sessions, \
-    log_tool_newrelic, announcements, log_tool_bugsnag, weekly_report, integration_jira_cloud, integration_github
+    log_tool_newrelic, announcements, log_tool_bugsnag, weekly_report, integration_jira_cloud, integration_github, \
+    assist
 from chalicelib.core.collaboration_slack import Slack
 from chalicelib.utils import email_helper

@ -875,3 +876,9 @@ def all_issue_types(context):
@app.route('/{projectId}/flows', methods=['GET', 'PUT', 'POST', 'DELETE'])
 def removed_endpoints(projectId=None, context=None):
    return Response(body={"errors": ["Endpoint no longer available"]}, status_code=410)
+
+
+@app.route('/{projectId}/assist/sessions', methods=['GET'])
+def sessions_live(projectId, context):
+    data = assist.get_live_sessions(projectId)
+    return {'data': data}
--- a/api/chalicelib/core/assist.py
+++ b/api/chalicelib/core/assist.py
@ -0,0 +1,43 @@
+from chalicelib.utils import pg_client, helper
+from chalicelib.core import projects
+import requests
+from chalicelib.utils.helper import environ
+
+SESSION_PROJECTION_COLS = """s.project_id,
+                           s.session_id::text AS session_id,
+                           s.user_uuid,
+                           s.user_id,
+                           s.user_agent,
+                           s.user_os,
+                           s.user_browser,
+                           s.user_device,
+                           s.user_device_type,
+                           s.user_country,
+                           s.start_ts,
+                           s.user_anonymous_id,
+                           s.platform
+                           """
+
+
+def get_live_sessions(project_id):
+    project_key = projects.get_project_key(project_id)
+    connected_peers = requests.get(environ["peers"] + f"/{project_key}")
+    if connected_peers.status_code != 200:
+        print("!! issue with the peer-server")
+        print(connected_peers.text)
+        return []
+    connected_peers = connected_peers.json().get("data", [])
+
+    if len(connected_peers) == 0:
+        return []
+    connected_peers = tuple(connected_peers)
+    with pg_client.PostgresClient() as cur:
+        query = cur.mogrify(f"""\
+                    SELECT {SESSION_PROJECTION_COLS}, %(project_key)s||'-'|| session_id AS peer_id
+                    FROM public.sessions AS s
+                    WHERE s.project_id = %(project_id)s 
+                        AND session_id IN %(connected_peers)s;""",
+                            {"project_id": project_id, "connected_peers": connected_peers, "project_key":project_key})
+        cur.execute(query)
+        results = cur.fetchall()
+    return helper.list_to_camel_case(results)
--- a/api/entrypoint.sh
+++ b/api/entrypoint.sh
@ -1,6 +1,3 @@
 #!/bin/bash
-cd sourcemaps_reader
-nohup node server.js &> /tmp/sourcemaps_reader.log &
-cd ..
 python env_handler.py
 chalice local --no-autoreload --host 0.0.0.0 --stage ${ENTERPRISE_BUILD}
--- a/api/sourcemaps_reader/.gitignore
+++ b/api/sourcemaps_reader/.gitignore
@ -1,11 +0,0 @@
-# package directories
-node_modules
-jspm_packages
-
-# Serverless directories
-.serverless/*.zip
-
-
-node_modules/
-.idea
-test.js
--- a/api/sourcemaps_reader/README.md
+++ b/api/sourcemaps_reader/README.md
@ -1,15 +0,0 @@
-# sourcemap-reader
-Source Map Reader
-
-# For SAAS:
-to run local; put your test values in handler then run `node handler.js`
-to deploy `sls deploy --stage [staging|prod|dev]`
-
-# Requirements:
- nodeJS 12 or greater
-
-# Install for OS:
-```
-npm install
-node server.js
-```
--- a/api/sourcemaps_reader/package-lock.json
+++ b/api/sourcemaps_reader/package-lock.json
@ -1,109 +0,0 @@
-{
-  "name": "sourcemap-reader",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "aws-sdk": {
-      "version": "2.654.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.654.0.tgz",
-      "integrity": "sha512-RAx/SJ74zAqBW1wyRxiHNflmrv50i35pu8kPxfMIJ418TJzIMt+LKgn55rTJgyUdUzKi+MC9XMY4n7IDtwj3HA==",
-      "requires": {
-        "buffer": "4.9.1",
-        "events": "1.1.1",
-        "ieee754": "1.1.13",
-        "jmespath": "0.15.0",
-        "querystring": "0.2.0",
-        "sax": "1.2.1",
-        "url": "0.10.3",
-        "uuid": "3.3.2",
-        "xml2js": "0.4.19"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
-          }
-        },
-        "events": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-        },
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        },
-        "url": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-          "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "jmespath": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
-    "sax": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
-    },
-    "source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-    },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-    },
-    "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~9.0.1"
-      }
-    },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-    }
-  }
-}
--- a/api/sourcemaps_reader/package.json
+++ b/api/sourcemaps_reader/package.json
@ -1,16 +0,0 @@
-{
-  "name": "sourcemap-reader",
-  "version": "1.0.0",
-  "description": "",
-  "main": "handler.js",
-  "dependencies": {
-    "aws-sdk": "^2.654.0",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Kraiem taha yassine <tahayk2@gmail.com>",
-  "license": "ISC"
-}
--- a/api/sourcemaps_reader/server.js
+++ b/api/sourcemaps_reader/server.js
@ -1,38 +0,0 @@
-const http = require('http');
-const handler = require('./handler');
-const hostname = '127.0.0.1';
-const port = 3000;
-
-const server = http.createServer((req, res) => {
-    if (req.method === 'POST') {
-        let data = '';
-        req.on('data', chunk => {
-            data += chunk;
-        });
-        req.on('end', function () {
-            data = JSON.parse(data);
-            console.log("Starting parser for: " + data.key);
-            // process.env = {...process.env, ...data.bucket_config};
-            handler.sourcemapReader(data)
-                .then((results) => {
-                    res.statusCode = 200;
-                    res.setHeader('Content-Type', 'application/json');
-                    res.end(JSON.stringify(results));
-                })
-                .catch((e) => {
-                    console.error("Something went wrong");
-                    console.error(e);
-                    res.statusCode(500);
-                    res.end(e);
-                });
-        })
-    } else {
-        res.statusCode = 405;
-        res.setHeader('Content-Type', 'text/plain');
-        res.end('Method Not Allowed');
-    }
-});
-
-server.listen(port, hostname, () => {
-    console.log(`Server running at http://${hostname}:${port}/`);
-});
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@ -4,15 +4,11 @@ RUN apk add --no-cache git openssh openssl-dev pkgconf gcc g++ make libc-dev bas

 WORKDIR /root

-COPY go.mod .
-COPY go.sum .
+COPY . .

 RUN go mod download

-COPY . .
-
 ARG SERVICE_NAME
-
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openreplay/backend/services/$SERVICE_NAME

 FROM alpine
@ -39,6 +35,7 @@ ENV TZ=UTC \
    AWS_REGION_WEB=eu-central-1 \
    AWS_REGION_IOS=eu-west-1 \
    AWS_REGION_ASSETS=eu-central-1 \
+    CACHE_ASSETS=true \
    ASSETS_SIZE_LIMIT=6291456


--- a/backend/Dockerfile-all
+++ b/backend/Dockerfile-all
@ -35,6 +35,7 @@ ENV TZ=UTC \
    AWS_REGION_WEB=eu-central-1 \
    AWS_REGION_IOS=eu-west-1 \
    AWS_REGION_ASSETS=eu-central-1 \
+    CACHE_ASSETS=true \
    ASSETS_SIZE_LIMIT=6291456

 RUN mkdir $FS_DIR
--- a/backend/pkg/url/assets/css.go
+++ b/backend/pkg/url/assets/css.go
@ -51,13 +51,27 @@ func ExtractURLsFromCSS(css string) []string {
 	return urls
 }

-func (r *Rewriter) RewriteCSS(sessionID uint64, baseurl string, css string) string {
+func rewriteLinks(css string, rewrite func(rawurl string) string) string {
 	for _, idx := range cssUrlsIndex(css) {
 		f := idx[0]
 		t := idx[1]
 		rawurl, q := unquote(css[f:t])
 		// why exactly quote back?
-		css = css[:f] + q + r.RewriteURL(sessionID, baseurl, rawurl) + q + css[t:]
+		css = css[:f] + q + rewrite(rawurl) + q + css[t:]
 	}
+	return css
+}
+
+func ResolveCSS(baseURL string, css string) string {
+	css = rewriteLinks(css, func(rawurl string) string {
+		return ResolveURL(baseURL, rawurl)
+	})
+	return strings.Replace(css, ":hover", ".-asayer-hover", -1)
+}
+
+func (r *Rewriter) RewriteCSS(sessionID uint64, baseurl string, css string) string {
+	css = rewriteLinks(css, func(rawurl string) string {
+		return r.RewriteURL(sessionID, baseurl, rawurl)
+	})
 	return strings.Replace(css, ":hover", ".-asayer-hover", -1)
 }
--- a/backend/pkg/url/assets/url.go
+++ b/backend/pkg/url/assets/url.go
@ -50,7 +50,7 @@ func GetFullCachableURL(baseURL string, relativeURL string) (string, bool) {
 }


-const ASAYER_QUERY_START = "ASAYER_QUERY_ESCtRT"
+const OPENREPLAY_QUERY_START = "OPENREPLAY_QUERY"

 func getCachePath(rawurl string) string {
 	u, _ := url.Parse(rawurl)
@ -59,7 +59,7 @@ func getCachePath(rawurl string) string {
 		if (s[len(s) - 1] != '/') {
 			s += "/"
 		}
-		s += ASAYER_QUERY_START + url.PathEscape(u.RawQuery)
+		s += OPENREPLAY_QUERY_START + url.PathEscape(u.RawQuery)
 	}
 	return s
 }
--- a/backend/services/assets/main.go
+++ b/backend/services/assets/main.go
@ -64,6 +64,8 @@ func main() {
 			log.Printf("Caught signal %v: terminating\n", sig)
 			consumer.Close()
 			os.Exit(0)
+		case err := <-cacher.Errors:
+			log.Printf("Error while caching: %v", err)
 		case <-tick:
 			cacher.UpdateTimeouts()
 		default:
--- a/backend/services/http/assets.go
+++ b/backend/services/http/assets.go
@ -6,7 +6,7 @@ import (
 )

 func sendAssetForCache(sessionID uint64, baseURL string, relativeURL string) {
-	if fullURL, cachable := assets.GetFullCachableURL(baseURL, relativeURL); cachable {
+	if fullURL, cacheable := assets.GetFullCachableURL(baseURL, relativeURL); cacheable {
 		producer.Produce(topicTrigger, sessionID, messages.Encode(&messages.AssetCache{
 			URL: fullURL,
 		}))
@ -17,4 +17,20 @@ func sendAssetsForCacheFromCSS(sessionID uint64, baseURL string, css string) {
 	for _, u := range assets.ExtractURLsFromCSS(css) { // TODO: in one shot with rewriting
 		sendAssetForCache(sessionID, baseURL, u)
 	}
+}
+
+func handleURL(sessionID uint64, baseURL string, url string) string {
+	if cacheAssets {
+		sendAssetForCache(sessionID, baseURL, url)
+		return rewriter.RewriteURL(sessionID, baseURL, url)
+	}
+	return assets.ResolveURL(baseURL, url)
+}
+
+func handleCSS(sessionID uint64, baseURL string, css string) string {
+	if cacheAssets {
+		sendAssetsForCacheFromCSS(sessionID, baseURL, css)
+		return rewriter.RewriteCSS(sessionID, baseURL, css)
+	}
+	return assets.ResolveCSS(baseURL, css)
 }
--- a/backend/services/http/handlers.go
+++ b/backend/services/http/handlers.go
@ -174,32 +174,28 @@ func pushMessagesSeparatelyHandler(w http.ResponseWriter, r *http.Request) {
 		switch m := msg.(type) {
 		case *SetNodeAttributeURLBased:
 			if m.Name == "src" || m.Name == "href" {
-				sendAssetForCache(sessionData.ID, m.BaseURL, m.Value)
 				msg = &SetNodeAttribute{
 					ID:    m.ID,
 					Name:  m.Name,
-					Value: rewriter.RewriteURL(sessionData.ID, m.BaseURL, m.Value),
+					Value: handleURL(sessionData.ID, m.BaseURL, m.Value),
 				}
 			} else if m.Name == "style" {
-				sendAssetsForCacheFromCSS(sessionData.ID, m.BaseURL, m.Value)
 				msg = &SetNodeAttribute{
 					ID:    m.ID,
 					Name:  m.Name,
-					Value: rewriter.RewriteCSS(sessionData.ID, m.BaseURL, m.Value),
+					Value: handleCSS(sessionData.ID, m.BaseURL, m.Value),
 				}
 			}
 		case *SetCSSDataURLBased:
-			sendAssetsForCacheFromCSS(sessionData.ID, m.BaseURL, m.Data)
 			msg = &SetCSSData{
 				ID:   m.ID,
-				Data: rewriter.RewriteCSS(sessionData.ID, m.BaseURL, m.Data),
+				Data: handleCSS(sessionData.ID, m.BaseURL, m.Data),
 			}
 		case *CSSInsertRuleURLBased:
-			sendAssetsForCacheFromCSS(sessionData.ID, m.BaseURL, m.Rule)
 			msg = &CSSInsertRule{
 				ID:    m.ID,
 				Index: m.Index,
-				Rule:  rewriter.RewriteCSS(sessionData.ID, m.BaseURL, m.Rule),
+				Rule:  handleCSS(sessionData.ID, m.BaseURL, m.Rule),
 			}
 		}

--- a/backend/services/http/main.go
+++ b/backend/services/http/main.go
@ -35,6 +35,7 @@ var topicRaw string
 var topicTrigger string
 var topicAnalytics string
 // var kafkaTopicEvents string
+var cacheAssets bool

 func main() {
 	log.SetFlags(log.LstdFlags | log.LUTC | log.Llongfile)
@ -52,6 +53,8 @@ func main() {
 	uaParser = uaparser.NewUAParser(env.String("UAPARSER_FILE"))
 	geoIP = geoip.NewGeoIP(env.String("MAXMINDDB_FILE"))
 	flaker = flakeid.NewFlaker(env.WorkerID())
+	cacheAssets = env.Bool("CACHE_ASSETS")
+
 	HTTP_PORT := env.String("HTTP_PORT")

 	server := &http.Server{
--- a/ee/api/.chalice/config.json
+++ b/ee/api/.chalice/config.json
@ -33,8 +33,9 @@
        "sessions_bucket": "mobs",
        "sessions_region": "us-east-1",
        "put_S3_TTL": "20",
-        "sourcemaps_reader": "http://127.0.0.1:3000/",
+        "sourcemaps_reader": "http://utilities-openreplay.app.svc.cluster.local:9000/sourcemaps",
        "sourcemaps_bucket": "sourcemaps",
+        "peers": "http://utilities-openreplay.app.svc.cluster.local:9000/assist/peers",
        "js_cache_bucket": "sessions-assets",
        "async_Token": "",
        "EMAIL_HOST": "",
--- a/ee/connectors/data_analysis_cookbook/buying_clients.ipynb
+++ b/ee/connectors/data_analysis_cookbook/buying_clients.ipynb
--- a/ee/connectors/data_analysis_cookbook/credentials.yml.example
+++ b/ee/connectors/data_analysis_cookbook/credentials.yml.example
@ -0,0 +1,6 @@
+pg:
+  user: user
+  password: ******
+  database: db_name
+  host: '127.0.0.1'
+  port: 8080
--- a/ee/connectors/data_analysis_cookbook/explorational_analysis.ipynb
+++ b/ee/connectors/data_analysis_cookbook/explorational_analysis.ipynb
--- a/ee/connectors/deploy/requirements_clickhouse.txt
+++ b/ee/connectors/deploy/requirements_clickhouse.txt
@ -9,6 +9,6 @@ pytz==2021.1
 requests==2.25.1
 SQLAlchemy==1.3.23
 tzlocal==2.1
-urllib3==1.26.3
+urllib3==1.26.5
 PyYAML==5.4.1

--- a/ee/connectors/deploy/requirements_pg.txt
+++ b/ee/connectors/deploy/requirements_pg.txt
@ -8,5 +8,5 @@ pytz==2021.1
 requests==2.25.1
 SQLAlchemy==1.3.23
 tzlocal==2.1
-urllib3==1.26.3
+urllib3==1.26.5
 PyYAML==5.4.1
--- a/ee/connectors/deploy/requirements_redshift.txt
+++ b/ee/connectors/deploy/requirements_redshift.txt
@ -9,7 +9,7 @@ pytz==2021.1
 requests==2.25.1
 SQLAlchemy==1.3.23
 tzlocal==2.1
-urllib3==1.26.3
+urllib3==1.26.5
 pandas-redshift
 PyYAML
 awswrangler
--- a/ee/connectors/deploy/requirements_snowflake.txt
+++ b/ee/connectors/deploy/requirements_snowflake.txt
@ -13,7 +13,7 @@ botocore==1.18.18
 certifi==2020.6.20
 cffi==1.14.3
 chardet==3.0.4
-cryptography==2.9.2
+cryptography==3.4.7
 idna==2.10
 isodate==0.6.0
 jmespath==0.10.0
@ -30,5 +30,5 @@ requests==2.23.0
 requests-oauthlib==1.3.0
 s3transfer==0.3.3
 six==1.15.0
-urllib3==1.25.11
+urllib3==1.26.5

--- a/frontend/.storybook/webpack.config.js
+++ b/frontend/.storybook/webpack.config.js
@ -3,7 +3,8 @@ const mainConfig = require('../webpack.config.js');

 module.exports = async ({ config }) => {
  var conf = mainConfig();
-  config.resolve.alias = Object.assign(pathAlias, config.resolve.alias); // Path Alias
+  config.resolve.alias = Object.assign(conf.resolve.alias, config.resolve.alias); // Path Alias
+  config.resolve.extensions = conf.resolve.extensions
  config.module.rules = conf.module.rules;
  config.module.rules[0].use[0] = 'style-loader';  // instead of separated css
  config.module.rules[1].use[0] = 'style-loader';
--- a/frontend/app/components/Dashboard/Widgets/MissingResources/ResourceInfo.js
+++ b/frontend/app/components/Dashboard/Widgets/MissingResources/ResourceInfo.js
@ -10,7 +10,7 @@ export default class ResourceInfo extends React.PureComponent {
      <div className="flex flex-col" >
        <TextEllipsis className={ styles.name } text={ data.name } hintText={ data.url } />
        <div className={ styles.timings }>
-          { `${ diffFromNowString(data.endedAt) } ago - ${ diffFromNowString(data.startedAt) } old` }
+          { data.endedAt && data.startedAt && `${ diffFromNowString(data.endedAt) } ago - ${ diffFromNowString(data.startedAt) } old` }
        </div>
      </div>
    );
--- a/frontend/env.js
+++ b/frontend/env.js
@ -20,8 +20,18 @@ const oss = {
 	MINIO_USE_SSL: process.env.MINIO_USE_SSL,
 	MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
 	MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
-	TRACKER_VERSION: '3.0.3', // trackerInfo.version,
+	TRACKER_VERSION: '3.0.5', // trackerInfo.version,
 }
+
+const local = {
+	...oss,
+	API_EDP: 'https://sacha.openreplay.com/api',//'https://do.openreplay.com/api',
+	ASSETS_HOST: 'https://sacha.openreplay.com/assets',//'https://do.openreplay.com/assets',
+	SOURCEMAP: false,
+	PRODUCTION: false,
+}
+
 module.exports = {
    oss,
+    local,
 };
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@ -129,7 +129,7 @@ module.exports = (envName = 'local') => {
        },
        {
          test: /\.css$/,
-          include: [ /node_modules/, /app\/styles/ ],
+          include: [ path.join(__dirname, "node_modules"), path.join(__dirname, "app/styles") ],
          use: [
            cssFileLoader,
            {
@ -148,7 +148,7 @@ module.exports = (envName = 'local') => {
        },
        {
  	      test: /\.js$/,
-  	      include: path.join(__dirname, "app"),
+  	      include: [ path.join(__dirname, "app"), path.join(__dirname, ".storybook") ],
  	      use: babelLoader,
  	    },
        {
--- a/scripts/helm/app/chalice.yaml
+++ b/scripts/helm/app/chalice.yaml
@ -61,6 +61,8 @@ env:
  S3_HOST: 'http://minio.db.svc.cluster.local:9000'
  S3_KEY: minios3AccessKeyS3cr3t
  S3_SECRET: m1n10s3CretK3yPassw0rd
+  sourcemaps_reader: 'http://utilities-openreplay.app.svc.cluster.local:9000/sourcemaps'
+  peers: 'http://utilities-openreplay.app.svc.cluster.local:9000/peers'
  # Enable logging for python app
  # Ref: https://stackoverflow.com/questions/43969743/logs-in-kubernetes-pod-not-showing-up
  PYTHONUNBUFFERED: '0'
--- a/scripts/helm/app/utilities.yaml
+++ b/scripts/helm/app/utilities.yaml
@ -0,0 +1,28 @@
+namespace: app
+image:
+  repository: rg.fr-par.scw.cloud/foss
+  name: utilities
+  pullPolicy: IfNotPresent
+  tag: latest
+
+imagePullSecrets:
+  - name: aws-registry
+
+service:
+  type: ClusterIP
+  port: 9000
+
+resources:
+  limits:
+    cpu: 1000m
+    memory: 1Gi
+  requests:
+    cpu: 1m
+    memory: 1Mi
+env:
+  AWS_DEFAULT_REGION: us-east-1
+  # Override with your https://domain_name
+  # eg: https://openreplay.mycompany.com
+  S3_HOST: 'http://minio.db.svc.cluster.local:9000'
+  S3_KEY: minios3AccessKeyS3cr3t
+  S3_SECRET: m1n10s3CretK3yPassw0rd
--- a/scripts/helm/local_run.md
+++ b/scripts/helm/local_run.md
@ -0,0 +1,56 @@
+## How to build and run an application from local
+
+### For workers
+
+Workers are the application which handle core functionalities.
+
+- List of workers are
+  - alerts
+  - assets
+  - db
+  - ender
+  - http
+  - integrations
+  - sink
+  - storage
+
+- Build: 
+  ```
+  cd openreplay/backend
+  # IMAGE_TAG=<version of openreplay, check in vars.yaml> DOCKER_REPO=rg.fr-par.scw.cloud/foss bash build.sh <worker_name>
+  # For example,
+  IMAGE_TAG=v1.0.0 DOCKER_REPO=rg.fr-par.scw.cloud/foss bash build.sh assets
+  ```
+- Deploy:
+  ```
+  cd openreplay/scripts/helm
+  bash openreplay-cli --install <worker_name>
+  ```
+## For api 
+  
+All apis are handled by application called, chalice, which is a python3 application.
+
+- Build:
+  ```
+  cd openreplay/api/
+  # IMAGE_TAG=<version of openreplay, check in vars.yaml> DOCKER_REPO=rg.fr-par.scw.cloud/foss bash build.sh
+  # For example,
+  IMAGE_TAG=v1.0.0 DOCKER_REPO=rg.fr-par.scw.cloud/foss bash build.sh
+  ```
+- Deploy:
+  ```
+  cd openreplay/scripts/helm
+  bash openreplay-cli --install chalice
+  ```
+  
+## For frontend
+
+Frontend is mainly JS components. When we're installing it, it's built and then installed. So you don't have to run a separate build for frontend.
+
+Note: if you want to see how it gets build, please refer, `openreplay/frontend/build.sh`
+
+- Build and Deploy:
+  ```
+  cd openreplay/scripts/helm
+  bash openreplay-cli --install frontend
+  ```
--- a/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml
+++ b/scripts/helm/nginx-ingress/nginx-ingress/templates/configmap.yaml
@ -68,6 +68,14 @@ data:
      proxy_set_header Host $host;
      proxy_pass http://chalice-openreplay.app.svc.cluster.local:8000;
    }
+    location /assist/ {
+      rewrite ^/assist/(.*) /$1 break;
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "Upgrade";
+      proxy_set_header Host $host;
+      proxy_pass http://utilities-openreplay.app.svc.cluster.local:9000;
+    }
    location /assets/ {
      rewrite ^/assets/(.*) /sessions-assets/$1 break;
      proxy_http_version 1.1;
--- a/scripts/helm/roles/openreplay/templates/utilities.yaml
+++ b/scripts/helm/roles/openreplay/templates/utilities.yaml
@ -0,0 +1,17 @@
+{% if docker_registry_url is defined and docker_registry_url %}
+image:
+  repository: {{ docker_registry_url }}
+  tag: {{ image_tag }}
+{% endif %}
+
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
+imagePullSecrets: []
+{% endif %}
+env:
+  S3_KEY: "{{ minio_access_key }}"
+  S3_SECRET: "{{ minio_secret_key }}"
+  S3_HOST: "https://{{ domain_name }}"
+  jwt_secret: "{{ jwt_secret_key }}"
+{% if env is defined and env.chalice is defined and env.chalice%}
+  {{ env.chalice | to_nice_yaml | trim | indent(2) }}
+{% endif %}
--- a/sourcemap-uploader/cli.js
+++ b/sourcemap-uploader/cli.js
@ -21,7 +21,8 @@ parser.addArgument(['-p', '-i', '--project-key'], { // -i is depricated
 parser.addArgument(['-s', '--server'], {
  help: 'OpenReplay API server URL for upload',
 });
-parser.addArgument(['-v', '--verbose'], {
+// Should be verbose, but conflicting on npm compilation into bin
+parser.addArgument(['-l', '--logs'], {
  help: 'Log requests information',
  action: 'storeTrue',
 });
--- a/sourcemap-uploader/package.json
+++ b/sourcemap-uploader/package.json
@ -1,6 +1,6 @@
 {
  "name": "@openreplay/sourcemap-uploader",
-  "version": "3.0.3",
+  "version": "3.0.4",
  "description": "NPM module to upload your JS sourcemaps files to OpenReplay",
  "bin": "cli.js",
  "main": "index.js",
--- a/tracker/tracker/package-lock.json
+++ b/tracker/tracker/package-lock.json
@ -1,6 +1,6 @@
 {
-  "name": "@asayerio/tracker",
-  "version": "5.6.5",
+  "name": "@openreplay/tracker",
+  "version": "3.1.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -4513,9 +4513,9 @@
      "dev": true
    },
    "typescript": {
-      "version": "3.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
-      "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz",
+      "integrity": "sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==",
      "dev": true
    },
    "unc-path-regex": {
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@openreplay/tracker",
  "description": "The OpenReplay tracker main package",
-  "version": "3.0.4",
+  "version": "3.0.5",
  "keywords": [
    "logging",
    "replay"
@ -18,9 +18,9 @@
    "clean": "rm -Rf build && rm -Rf lib && rm -Rf cjs",
    "tsc": "tsc -b src/main && tsc -b src/webworker && tsc --project src/main/tsconfig-cjs.json",
    "rollup": "rollup --config rollup.config.js",
-    "compile": "node --experimental-modules --experimental-json-modules compile.js",
+    "compile": "node --experimental-modules --experimental-json-modules scripts/compile.js",
    "build": "npm run clean && npm run tsc && npm run rollup && npm run compile",
-    "prepare": "node checkver.cjs && npm run build"
+    "prepare": "node scripts/checkver.cjs && npm run build"
  },
  "devDependencies": {
    "@babel/core": "^7.10.2",
@ -38,7 +38,7 @@
    "rollup": "^2.17.0",
    "rollup-plugin-terser": "^6.1.0",
    "semver": "^6.3.0",
-    "typescript": "^3.9.5"
+    "typescript": "^4.3.4"
  },
  "dependencies": {
    "error-stack-parser": "^2.0.6"
--- a/tracker/tracker/scripts/checkver.cjs
+++ b/tracker/tracker/scripts/checkver.cjs
@ -1,5 +1,5 @@
 const semver = require("semver");
-const { engines } = require("./package");
+const { engines } = require("../package");
 const version = engines.node;
 if (!semver.satisfies(process.version, version)) {
    console.error(`Required node version ${version}, got ${process.version}.`)
--- a/tracker/tracker/scripts/compile.js
+++ b/tracker/tracker/scripts/compile.js
@ -1,6 +1,6 @@
 import { promises as fs } from 'fs';
 import replaceInFiles from 'replace-in-files';
-import packageConfig from './package.json';
+import packageConfig from '../package.json';

 async function main() {
  const webworker = await fs.readFile('build/webworker.js', 'utf8');
--- a/tracker/tracker/src/main/modules/performance.ts
+++ b/tracker/tracker/src/main/modules/performance.ts
@ -2,13 +2,19 @@ import App from '../app';
 import { IN_BROWSER } from '../utils';
 import { PerformanceTrack } from '../../messages';

-const perf: {
-  memory: {
-    jsHeapSizeLimit?: number;
-    totalJSHeapSize?: number;
-    usedJSHeapSize?: number;
-  };
-} = IN_BROWSER && 'memory' in performance ? performance : { memory: {} };
+
+type Perf = {
+  memory: { 
+    totalJSHeapSize?: number,
+    usedJSHeapSize?: number,
+    jsHeapSizeLimit?: number,
+  }
+}
+
+const perf: Perf = IN_BROWSER && 'memory' in performance // works in Chrome only
+  ? performance as any
+  : { memory: {} }
+

 export const deviceMemory = IN_BROWSER ? ((navigator as any).deviceMemory || 0) * 1024 : 0;
 export const jsHeapSizeLimit = perf.memory.jsHeapSizeLimit || 0;
--- a/tracker/tracker/src/messages/webworker.ts
+++ b/tracker/tracker/src/messages/webworker.ts
@ -1,6 +1,8 @@
+// TODO: "common" folder instead of "messages". (better file structure)
 export interface Options {
  connAttemptCount?: number;
  connAttemptGap?: number;
+  beaconSize?: number;
 }

 type Settings = {
@ -11,4 +13,4 @@ type Settings = {
  timeAdjustment?: number;
 } & Partial<Options>;

-export type MessageData = null | "stop" | Settings | Array<{ _id: number }>;
+export type WorkerMessageData = null | "stop" | Settings | Array<{ _id: number }>;
--- a/tracker/tracker/src/webworker/index.ts
+++ b/tracker/tracker/src/webworker/index.ts
@ -2,13 +2,15 @@ import { classes, BatchMeta, Timestamp, SetPageVisibility, CreateDocument } from
 import Message from '../messages/message';
 import Writer from '../messages/writer';

-import type { MessageData } from './types';
+import type { WorkerMessageData } from '../messages/webworker';
+

-// TODO: what if on message overflows? (maybe one option)
-const MAX_BATCH_SIZE = 4 * 1e5; // Max 400kB  
 const SEND_INTERVAL = 20 * 1000;
+const BEACON_SIZE_LIMIT = 1e6 // Limit is set in the backend/services/http
+let beaconSize = 4 * 1e5; // Default 400kB

-const writer: Writer = new Writer(MAX_BATCH_SIZE);
+
+let writer: Writer = new Writer(beaconSize);

 let ingestPoint: string = "";
 let token: string = "";
@ -31,9 +33,12 @@ let busy = false;
 let attemptsCount = 0;
 let ATTEMPT_TIMEOUT = 8000;
 let MAX_ATTEMPTS_COUNT = 10;
+
+// TODO?: exploit https://developer.mozilla.org/en-US/docs/Web/API/Navigator/sendBeacon
 function sendBatch(batch: Uint8Array):void {
  const req = new XMLHttpRequest();
-  req.open("POST", ingestPoint + "/v1/web/i");  // TODO opaque request?
+  // TODO:  async=false (3d param) instead of sendQueue array ?
+  req.open("POST", ingestPoint + "/v1/web/i", false);  // TODO opaque request?
  req.setRequestHeader("Authorization", "Bearer " + token);
  // req.setRequestHeader("Content-Type", "");
  req.onreadystatechange = function() {
@ -41,7 +46,7 @@ function sendBatch(batch: Uint8Array):void {
      if (this.status == 0) {
        return; // happens simultaneously with onerror TODO: clear codeflow
      }
-      if (this.status >= 400) {
+      if (this.status >= 400) { // TODO: test workflow. After 400+ it calls /start for some reason
        reset();
        sendQueue.length = 0;
        if (this.status === 403) { // Unauthorised (Token expired)
@ -69,7 +74,7 @@ function sendBatch(batch: Uint8Array):void {
    attemptsCount++;
    setTimeout(() => sendBatch(batch), ATTEMPT_TIMEOUT); 
  }
-  req.send(batch);
+  req.send(batch.buffer);
 }

 function send(): void {
@ -100,7 +105,7 @@ function hasTimestamp(msg: any): msg is { timestamp: number } {
  return typeof msg === 'object' && typeof msg.timestamp === 'number';
 }

-self.onmessage = ({ data }: MessageEvent) => {
+self.onmessage = ({ data }: MessageEvent<WorkerMessageData>) => {
  if (data === null) {
    send();
    return;
@ -118,6 +123,7 @@ self.onmessage = ({ data }: MessageEvent) => {
    timeAdjustment = data.timeAdjustment || timeAdjustment;
    MAX_ATTEMPTS_COUNT = data.connAttemptCount || MAX_ATTEMPTS_COUNT;
    ATTEMPT_TIMEOUT = data.connAttemptGap || ATTEMPT_TIMEOUT;
+    beaconSize = Math.min(BEACON_SIZE_LIMIT, data.beaconSize || beaconSize);
    if (writer.isEmpty()) {
      writeBatchMeta();
    }
@ -126,7 +132,7 @@ self.onmessage = ({ data }: MessageEvent) => {
    }
    return;
  }
-  data.forEach((data: any) => {
+  data.forEach((data) => {
    const message: Message = new (<any>classes.get(data._id))();
    Object.assign(message, data);

@ -140,20 +146,26 @@ self.onmessage = ({ data }: MessageEvent) => {
      }
    }

-    writer.checkpoint();
-    nextIndex++;
-    if (message.encode(writer)) {
-      isEmpty = false; 
-    } else {
+    writer.checkpoint(); // TODO: incapsulate in writer
+    if (!message.encode(writer)) {
      send();
-      if (message.encode(writer)) {
-        isEmpty = false;
-      } else {
-        // MAX_BATCH_SIZE overflow by one message
-        // TODO: correct handle
-        nextIndex--;
-        return;
-      }
+      // writer.reset(); // TODO: sematically clear code
+      if (!message.encode(writer)) { // Try to encode within empty state
+        // MBTODO: tempWriter for one message?
+        while (!message.encode(writer)) {
+          if (beaconSize === BEACON_SIZE_LIMIT) {
+            console.warn("OpenReplay: beacon size overflow.");
+            writer.reset();
+            writeBatchMeta();
+            return
+          }
+          beaconSize = Math.min(beaconSize*2, BEACON_SIZE_LIMIT);
+          writer = new Writer(beaconSize);
+          writeBatchMeta();
+        }
+      } 
    };
+    nextIndex++; // TODO: incapsulate in writer
+    isEmpty = false;
  });
 };
--- a/tracker/tracker/src/webworker/transformer.js
+++ b/tracker/tracker/src/webworker/transformer.js
@ -1,21 +0,0 @@
-import Message from '../messages/message';
-
-
-
-
-class MessageTransformer {
-	private urlRewriter?: URLRewriter
-
-	constructor() {
-
-	}
-
-  transform(m: Message): Message {
-		if (m instanceof SetNodeAttribute) {
-			if (m.name == "src" || m.name == "href") {
-				sendAssetForCache
-			}
-		}
-	}
-
-}
--- a/utilities/.gitignore
+++ b/utilities/.gitignore
@ -0,0 +1,5 @@
+.idea
+node_modules
+npm-debug.log
+.cache
+test.html
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@ -0,0 +1,15 @@
+FROM node:12.22-stretch
+WORKDIR /work
+COPY . .
+RUN npm install
+
+
+# Add Tini
+# Startup daemon
+ENV TINI_VERSION v0.19.0
+ARG envarg
+ENV ENTERPRISE_BUILD ${envarg}
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]
+CMD npm start
--- a/utilities/build.sh
+++ b/utilities/build.sh
@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Script to build api module
+# flags to accept:
+# Default will be OSS build.
+
+# Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
+
+git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
+check_prereq() {
+    which docker || {
+        echo "Docker not installed, please install docker."
+        exit=1
+    }
+    [[ exit -eq 1 ]] && exit 1
+}
+
+function build_api(){
+    # Copy enterprise code
+    [[ $1 == "ee" ]] && {
+        cp -rf ../ee/utilities/* ./
+    }
+    docker build -f ./Dockerfile -t ${DOCKER_REPO:-'local'}/utilities:${git_sha1} .
+    [[ $PUSH_IMAGE -eq 1 ]] && {
+        docker push ${DOCKER_REPO:-'local'}/utilities:${git_sha1}
+        docker tag ${DOCKER_REPO:-'local'}/utilities:${git_sha1} ${DOCKER_REPO:-'local'}/utilities:latest
+        docker push ${DOCKER_REPO:-'local'}/utilities:latest
+    }
+}
+
+check_prereq
+build_api $1
--- a/utilities/package-lock.json
+++ b/utilities/package-lock.json
@ -0,0 +1,779 @@
+{
+  "name": "utilities_server",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
+      "requires": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/connect": {
+      "version": "3.4.34",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz",
+      "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/cors": {
+      "version": "2.8.10",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
+      "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="
+    },
+    "@types/express": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz",
+      "integrity": "sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q==",
+      "requires": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.18",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz",
+      "integrity": "sha512-gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA==",
+      "requires": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*"
+      }
+    },
+    "@types/mime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+    },
+    "@types/node": {
+      "version": "15.12.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
+      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA=="
+    },
+    "@types/qs": {
+      "version": "6.9.6",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
+      "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="
+    },
+    "@types/range-parser": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
+      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
+    },
+    "@types/serve-static": {
+      "version": "1.13.9",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz",
+      "integrity": "sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==",
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.5.tgz",
+      "integrity": "sha512-8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "aws-sdk": {
+      "version": "2.932.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.932.0.tgz",
+      "integrity": "sha512-U6MWUtFD0npWa+ReVEgm0fCIM0fMOYahFp14GLv8fC+BWOTvh5Iwt/gF8NrLomx42bBjA1Abaw6yhmiaSJDQHQ==",
+      "requires": {
+        "buffer": "4.9.2",
+        "events": "1.1.1",
+        "ieee754": "1.1.13",
+        "jmespath": "0.15.0",
+        "querystring": "0.2.0",
+        "sax": "1.2.1",
+        "url": "0.10.3",
+        "uuid": "3.3.2",
+        "xml2js": "0.4.19"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "jmespath": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
+    },
+    "mime-types": {
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "requires": {
+        "mime-db": "1.48.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "peer": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/peer/-/peer-0.6.1.tgz",
+      "integrity": "sha512-zPJSPoZvo+83sPJNrW8o93QTktx7dKk67965RRDDNAIelWw1ZwE6ZmmhsvRrdNRlK0knQb3rR8GBdZlbWzCYJw==",
+      "requires": {
+        "@types/cors": "^2.8.6",
+        "@types/express": "^4.17.3",
+        "@types/ws": "^7.2.3",
+        "body-parser": "^1.19.0",
+        "cors": "^2.8.5",
+        "express": "^4.17.1",
+        "uuid": "^3.4.0",
+        "ws": "^7.2.3",
+        "yargs": "^15.3.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+    },
+    "qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "ws": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz",
+      "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="
+    },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~9.0.1"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+    },
+    "y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    }
+  }
+}
--- a/utilities/package.json
+++ b/utilities/package.json
@ -0,0 +1,26 @@
+{
+  "name": "utilities_server",
+  "version": "1.0.0",
+  "description": "assist server to get live sessions & sourcemaps reader to get stack trace",
+  "main": "peerjs-server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/openreplay/openreplay.git"
+  },
+  "author": "KRAIEM Taha Yassine <tahayk2@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/openreplay/openreplay/issues"
+  },
+  "homepage": "https://github.com/openreplay/openreplay#readme",
+  "dependencies": {
+    "aws-sdk": "^2.654.0",
+    "express": "^4.17.1",
+    "peer": "^0.6.1",
+    "source-map": "^0.7.3"
+  }
+}
--- a/utilities/server.js
+++ b/utilities/server.js
@ -0,0 +1,33 @@
+var sourcemapsReaderServer = require('./servers/sourcemaps-server');
+var {peerRouter, peerConnection, peerDisconnect} = require('./servers/peerjs-server');
+var express = require('express');
+const {ExpressPeerServer} = require('peer');
+
+const HOST = '0.0.0.0';
+const PORT = 9000;
+
+
+var app = express();
+app.use((req, res, next) => {
+    console.log(new Date().toTimeString(), req.method, req.originalUrl);
+    next();
+});
+
+app.use('/sourcemaps', sourcemapsReaderServer);
+app.use('/assist', peerRouter);
+
+const server = app.listen(PORT, HOST, () => {
+    console.log(`App listening on http://${HOST}:${PORT}`);
+    console.log('Press Ctrl+C to quit.');
+});
+const peerServer = ExpressPeerServer(server, {
+    debug: true,
+    path: '/',
+    proxied: true,
+    allow_discovery: true
+});
+peerServer.on('connection', peerConnection);
+peerServer.on('disconnect', peerDisconnect);
+app.use('/', peerServer);
+app.enable('trust proxy');
+module.exports = server;
--- a/utilities/servers/peerjs-server.js
+++ b/utilities/servers/peerjs-server.js
@ -0,0 +1,64 @@
+var express = require('express');
+var peerRouter = express.Router();
+
+
+const extractPeerId = (peerId) => {
+    let splited = peerId.split("-");
+    if (splited.length !== 2) {
+        console.error(`cannot split peerId: ${client.id}`);
+        return {};
+    }
+    return {projectKey: splited[0], sessionId: splited[1]};
+};
+const connectedPeers = {};
+
+const peerConnection = (client) => {
+    console.log(`initiating ${client.id}`);
+    const {projectKey, sessionId} = extractPeerId(client.id);
+    if (projectKey === undefined || sessionId === undefined) {
+        return;
+    }
+    connectedPeers[projectKey] = connectedPeers[projectKey] || [];
+    if (connectedPeers[projectKey].indexOf(sessionId) === -1) {
+        console.log(`new connexion ${client.id}`);
+        connectedPeers[projectKey].push(sessionId);
+    } else {
+        console.log(`reconnecting peer ${client.id}`);
+    }
+
+
+};
+const peerDisconnect = (client) => {
+    console.log(`disconnect ${client.id}`);
+    const {projectKey, sessionId} = extractPeerId(client.id);
+    if (projectKey === undefined || sessionId === undefined) {
+        return;
+    }
+    const i = (connectedPeers[projectKey] || []).indexOf(sessionId);
+    if (i === -1) {
+        console.log(`session not found ${client.id}`);
+    } else {
+        connectedPeers[projectKey].splice(i, 1);
+    }
+}
+
+
+peerRouter.get('/peers', function (req, res) {
+    console.log("looking for all available sessions");
+    res.statusCode = 200;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({"data": connectedPeers}));
+});
+peerRouter.get('/peers/:projectKey', function (req, res) {
+    console.log(`looking for available sessions for ${req.params.projectKey}`);
+    res.statusCode = 200;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({"data": connectedPeers[req.params.projectKey] || []}));
+});
+
+
+module.exports = {
+    peerRouter,
+    peerConnection,
+    peerDisconnect
+};
--- a/utilities/servers/sourcemaps-handler.js
+++ b/utilities/servers/sourcemaps-handler.js
@ -1,7 +1,7 @@
 'use strict';
 const sourceMap = require('source-map');
 const AWS = require('aws-sdk');
-const sourceMapVersion = require('./package.json').dependencies["source-map"];
+const sourceMapVersion = require('../package.json').dependencies["source-map"];
 const URL = require('url');
 const getVersion = version => version.replace(/[\^\$\=\~]/, "");

@ -88,24 +88,4 @@ module.exports.sourcemapReader = async event => {
                });
        });
    });
-};
-
-
-// let v = {
-//     'key': '1725/99f96f044fa7e941dbb15d7d68b20549',
-//     'positions': [{'line': 1, 'column': 943}],
-//     'padding': 5,
-//     'bucket': 'asayer-sourcemaps'
-// };
-// let v = {
-//     'key': '1/65d8d3866bb8c92f3db612cb330f270c',
-//     'positions': [{'line': 1, 'column': 0}],
-//     'padding': 5,
-//     'bucket': 'asayer-sourcemaps-staging'
-// };
-// module.exports.sourcemapReader(v).then((r) => {
-//     // console.log(r);
-//     const fs = require('fs');
-//     let data = JSON.stringify(r);
-//     fs.writeFileSync('results.json', data);
-// });
+};
--- a/utilities/servers/sourcemaps-server.js
+++ b/utilities/servers/sourcemaps-server.js
@ -0,0 +1,30 @@
+var express = require('express');
+var handler = require('./sourcemaps-handler');
+var router = express.Router();
+
+router.post('/', (req, res) => {
+    let data = '';
+    req.on('data', chunk => {
+        data += chunk;
+    });
+    req.on('end', function () {
+        data = JSON.parse(data);
+        console.log("Starting parser for: " + data.key);
+        // process.env = {...process.env, ...data.bucket_config};
+        handler.sourcemapReader(data)
+            .then((results) => {
+                res.statusCode = 200;
+                res.setHeader('Content-Type', 'application/json');
+                res.end(JSON.stringify(results));
+            })
+            .catch((e) => {
+                console.error("Something went wrong");
+                console.error(e);
+                res.statusCode(500);
+                res.end(e);
+            });
+    })
+
+});
+
+module.exports = router;