jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(sourcemaps-reader): config heapdump

Browse source 
feat(assist): config heapdump
feat(peers): config heapdump
feat(peers): endpoint key
feat(sourcemaps-reader): env-vars S3 config
feat(chalice): no S3 config for sourcempas reader
This commit is contained in:
Taha Yassine Kraiem 2022-09-19 16:47:23 +01:00
parent a715cf9ffc
commit 97ee3e6192
6 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/chalicelib/core/sourcemaps_parser.py
View file

@ -16,13 +16,9 @@ def get_original_trace(key, positions):
"key": key,
"positions": positions,
"padding": 5,
"bucket": config('sourcemaps_bucket'),
"S3_KEY": config('S3_KEY', default=config('AWS_ACCESS_KEY_ID')),
"S3_SECRET": config('S3_SECRET', default=config('AWS_SECRET_ACCESS_KEY')),
"region": config('sessions_region', default=config('AWS_DEFAULT_REGION'))
"bucket": config('sourcemaps_bucket')
}
if len(config('S3_HOST', default="")) > 0:
payload["S3_HOST"] = config('S3_HOST')
try:
r = requests.post(SMR_URL, json=payload, timeout=config("sourcemapTimeout", cast=int, default=5))
if r.status_code != 200:

5
ee/utilities/server.js
View file

@ -14,9 +14,10 @@ const HOST = process.env.LISTEN_HOST || '0.0.0.0';
const PORT = process.env.LISTEN_PORT || 9001;
assert.ok(process.env.ASSIST_KEY, 'The "ASSIST_KEY" environment variable is required');
const P_KEY = process.env.ASSIST_KEY;
const PREFIX = process.env.PREFIX || process.env.prefix || `/assist`
let debug = process.env.debug === "1";
const PREFIX = process.env.PREFIX || process.env.prefix || `/assist`
const heapdump = process.env.heapdump === "1";
if (process.env.uws !== "true") {
let wsapp = express();
@ -28,7 +29,7 @@ if (process.env.uws !== "true") {
res.end("ok!");
}
);
wsapp.use(`/heapdump/${P_KEY}`, dumps.router);
heapdump && wsapp.use(`/heapdump/${P_KEY}`, dumps.router);
wsapp.use(`${PREFIX}/${P_KEY}`, socket.wsRouter);
wsapp.enable('trust proxy');
const wsserver = wsapp.listen(PORT, HOST, () => {

9
peers/server.js
View file

@ -4,16 +4,19 @@ const {peerRouter, peerConnection, peerDisconnect, peerError} = require('./serve
const express = require('express');
const {ExpressPeerServer} = require('peer');
const debug = process.env.debug === "1" || false;
const debug = process.env.debug === "1";
const heapdump = process.env.heapdump === "1";
const HOST = process.env.LISTEN_HOST || '0.0.0.0';
const PORT = process.env.LISTEN_PORT || 9000;
assert.ok(process.env.ASSIST_KEY, 'The "ASSIST_KEY" environment variable is required');
const P_KEY = process.env.ASSIST_KEY;
const app = express();
app.use(request_logger("[app]"));
app.use(`/${process.env.S3_KEY}/assist`, peerRouter);
app.use(`/${process.env.S3_KEY}/heapdump`, dumps.router);
app.use(`/${P_KEY}/assist`, peerRouter);
heapdump && app.use(`/${P_KEY}/heapdump`, dumps.router);
const server = app.listen(PORT, HOST, () => {
console.log(`App listening on http://${HOST}:${PORT}`);

5
sourcemap-reader/server.js
View file

@ -6,7 +6,8 @@ const {request_logger} = require("./utils/helper");
const HOST = process.env.SMR_HOST || '127.0.0.1';
const PORT = process.env.SMR_PORT || 9000;
const PREFIX = process.env.PREFIX || process.env.prefix || `/sourcemaps`
const P_KEY = process.env.SMR_KEY || process.env.S3_KEY || 'smr';
const P_KEY = process.env.SMR_KEY || 'smr';
const heapdump = process.env.heapdump === "1";
const app = express();
app.use(request_logger("[SR]"));
@ -16,7 +17,7 @@ app.get(['/', PREFIX, `${PREFIX}/`, `${PREFIX}/${P_KEY}`, `${PREFIX}/${P_KEY}/`]
}
);
app.use(`${PREFIX}/${P_KEY}`, sourcemapsReaderServer);
app.use(`/heapdump/${P_KEY}`, dumps.router);
heapdump && app.use(`/heapdump/${P_KEY}`, dumps.router);
const server = app.listen(PORT, HOST, () => {
console.log(`SR App listening on http://${HOST}:${PORT}`);

12
sourcemap-reader/servers/sourcemaps-handler.js
View file

@ -12,16 +12,8 @@ console.log(`>sourceMap initialised using ${process.env.MAPPING_WASM || '/mappin
module.exports.sourcemapReader = async event => {
let s3;
if (event.S3_HOST) {
s3 = new AWS.S3({
endpoint: event.S3_HOST,
accessKeyId: event.S3_KEY,
secretAccessKey: event.S3_SECRET,
region: event.region,
s3ForcePathStyle: true, // needed with minio?
signatureVersion: 'v4'
});
} else if (process.env.S3_HOST) {
if (process.env.S3_HOST) {
s3 = new AWS.S3({
endpoint: process.env.S3_HOST,
accessKeyId: process.env.S3_KEY,

3
utilities/server.js
View file

@ -5,6 +5,7 @@ const {request_logger} = require("./utils/helper");
const assert = require('assert').strict;
const debug = process.env.debug === "1";
const heapdump = process.env.heapdump === "1";
const HOST = process.env.LISTEN_HOST || '0.0.0.0';
const PORT = process.env.LISTEN_PORT || 9001;
assert.ok(process.env.ASSIST_KEY, 'The "ASSIST_KEY" environment variable is required');
@ -22,7 +23,7 @@ wsapp.get(['/', PREFIX, `${PREFIX}/`, `${PREFIX}/${P_KEY}`, `${PREFIX}/${P_KEY}/
}
);
wsapp.use(`${PREFIX}/${P_KEY}`, socket.wsRouter);
wsapp.use(`/heapdump/${P_KEY}`, dumps.router);
heapdump && wsapp.use(`/heapdump/${P_KEY}`, dumps.router);
const wsserver = wsapp.listen(PORT, HOST, () => {
console.log(`WS App listening on http://${HOST}:${PORT}`);