diff options
| author | Joker_ <[email protected]> | 2020-07-12 23:39:03 +0800 |
|---|---|---|
| committer | Joker_ <[email protected]> | 2020-07-12 23:39:03 +0800 |
| commit | 19dfbf7f2bc78ab4a5dba908ddb3ee64ab29b578 (patch) | |
| tree | 7bec353f8228764f2c391eaa241bcbb838d4b3ad /src/api/logs.js | |
| parent | 9de394eedfb9913df5fe44b73f9e1a6da387a165 (diff) | |
URI-encode secret before appending to websocket URL
Diffstat (limited to 'src/api/logs.js')
| -rw-r--r-- | src/api/logs.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/api/logs.js b/src/api/logs.js index 61aae7e..caabd04 100644 --- a/src/api/logs.js +++ b/src/api/logs.js @@ -63,7 +63,7 @@ function getWsUrl(apiConfig) { const { hostname, port, secret, logLevel } = apiConfig; let qs = '?level=' + logLevel; if (typeof secret === 'string' && secret !== '') { - qs += '&token=' + secret; + qs += '&token=' + encodeURIComponent(secret); } return `ws://${hostname}:${port}${endpoint}${qs}`; } @@ -78,14 +78,14 @@ function fetchLogs(apiConfig, appendLog) { wsState = 1; const url = getWsUrl(apiConfig); const ws = new WebSocket(url); - ws.addEventListener('error', function(_ev) { + ws.addEventListener('error', function (_ev) { wsState = 3; }); - ws.addEventListener('close', function(_ev) { + ws.addEventListener('close', function (_ev) { wsState = 3; fetchLogsWithFetch(apiConfig, appendLog); }); - ws.addEventListener('message', function(event) { + ws.addEventListener('message', function (event) { appendData(event.data, appendLog); }); } @@ -116,13 +116,13 @@ function fetchLogsWithFetch(apiConfig, appendLog) { const { url, init } = getURLAndInit(apiConfig); fetch(url + endpoint + '?level=' + apiConfig.logLevel, { ...init, - signal + signal, }).then( - response => { + (response) => { const reader = response.body.getReader(); pump(reader, appendLog); }, - err => { + (err) => { fetched = false; if (signal.aborted) return; |
