This repository has been archived by the owner on Sep 18, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Add telemetry #179
Open
leventdem
wants to merge
7
commits into
sync-profile
Choose a base branch
from
add-telemetry
base: sync-profile
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add telemetry #179
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
369684d
Add express server API for post commands dedicated to logs
leventdem 9412b19
Add addLog action
leventdem 04c6861
Call addLog through Redux for two logs
leventdem 3f2a5e2
Update reducers
leventdem 8300e35
Add postLog (endpoint is taken from env)
leventdem 108a47d
Add cors and update scripts to run log server
leventdem 744a58e
>update lock
leventdem File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
const express = require('express') | ||
const cors = require('cors') | ||
|
||
const app = express() | ||
const port = 3010 | ||
const maxBodySize = 150 | ||
const allowedOrigins = [ | ||
'http://localhost:3000', | ||
'https://masq.qwant.com'] | ||
|
||
const authorizedEvents = [ | ||
'click_selectUser', | ||
'click_handleOpenSignup' | ||
] | ||
|
||
const authorizedLog = (log) => { | ||
if (log.type && authorizedEvents.includes(log.type)) { return true } | ||
return false | ||
} | ||
|
||
app.use(cors({ | ||
origin: function (origin, callback) { // allow requests with no origin | ||
// (like mobile apps or curl requests) | ||
if (!origin) return callback(null, true); if (allowedOrigins.indexOf(origin) === -1) { | ||
const msg = 'The CORS policy for this site does not allow access from the specified Origin.' | ||
return callback(new Error(msg), false) | ||
} return callback(null, true) | ||
} | ||
})) | ||
|
||
app.listen(port, () => console.log(`Masq app listening on port ${port}!`)) | ||
|
||
app.post('/logs', | ||
express.json({ strict: true, limit: maxBodySize }), | ||
(req, res) => { | ||
console.log(req.body.log) | ||
if (authorizedLog(req.body.log)) { | ||
res.json(req.body) | ||
} else { | ||
res.sendStatus(400) | ||
} | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,36 @@ | ||
|
||
import Compressor from 'compressorjs' | ||
import * as common from 'masq-common' | ||
import fetch from 'node-fetch' | ||
|
||
const { encrypt, decrypt } = common.crypto | ||
|
||
const MAX_IMAGE_SIZE = 100000 // 100 KB | ||
|
||
const postLog = async (log) => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok |
||
if (process.env.REACT_APP_LOG_ENDPOINT) { | ||
try { | ||
debug(`Send log ${JSON.stringify(log)} to ${process.env.REACT_APP_LOG_ENDPOINT}`) | ||
const response = await fetch(process.env.REACT_APP_LOG_ENDPOINT, { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json' | ||
}, | ||
body: JSON.stringify({ | ||
log | ||
}) | ||
}) | ||
const data = await response.json() | ||
return data.log | ||
} catch (error) { | ||
console.error('Error to post log ', log) | ||
} | ||
} else { | ||
debug('No endpoint provided, please update REACT_APP_LOG_ENDPOINT in .env') | ||
return log | ||
} | ||
} | ||
|
||
const isUsernameAlreadyTaken = (username, id) => { | ||
const ids = Object | ||
.keys(window.localStorage) | ||
|
@@ -96,6 +121,7 @@ const promiseTimeout = function (ms, promise) { | |
export { | ||
isUsernameAlreadyTaken, | ||
promiseTimeout, | ||
postLog, | ||
compressImage, | ||
MAX_IMAGE_SIZE, | ||
waitForPeer, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we are in browser's context, we can use window.fetch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, done.