Merge branch 'hotfix/1.6.1' to move to debuglogs.org for logs

.eslintignore

@@ -16,9 +16,11 @@ test/views/*.js
 
 # ES2015+ files
 !js/background.js
+!js/logging.js
 !js/models/conversations.js
 !js/views/attachment_view.js
 !js/views/conversation_search_view.js
+!js/views/debug_log_view.js
 !js/views/file_input_view.js
 !js/views/inbox_view.js
 !main.js

Gruntfile.js

@@ -103,7 +103,9 @@ module.exports = function(grunt) {
         '!js/Mp3LameEncoder.min.js',
         '!js/libsignal-protocol-worker.js',
         '!js/components.js',
+        '!js/logging.js',
         '!js/modules/**/*.js',
+        '!js/views/debug_log_view.js',
         '!js/signal_protocol_store.js',
         '_locales/**/*'
       ],

_locales/en/messages.json

@@ -367,8 +367,8 @@
       }
     },
     "submitDebugLog": {
-      "message": "Submit debug log",
-      "description": "Menu item and header text for debug log modal, title case."
+      "message": "Debug log",
+      "description": "Menu item and header text for debug log modal (sentence case)"
     },
     "debugLog": {
       "message": "Debug Log",
@@ -386,9 +386,9 @@
       "message": "Go to Support Page",
       "description": "Item under the Help menu, takes you to the support page"
     },
-    "fileABug": {
-      "message": "File a Bug",
-      "description": "Item under the Help menu, takes you to GitHub new issue form"
+    "menuReportIssue": {
+      "message": "Report an Issue",
+      "description": "Item under the Help menu, takes you to GitHub new issue form (title case)"
     },
     "aboutSignalDesktop": {
       "message": "About Signal Desktop",

app/menu.js

@@ -130,7 +130,7 @@ exports.createTemplate = (options, messages) => {
         click: openSupportPage,
       },
       {
-        label: messages.fileABug.message,
+        label: messages.menuReportIssue.message,
         click: openNewBugForm,
       },
       {

js/background.js

@@ -1,7 +1,5 @@
 /* eslint-disable */
 
-/* eslint-env browser */
-
 /* global Backbone: false */
 /* global $: false */
 

js/focus_listener.js

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
 
-  var windowFocused;
+  var windowFocused = false;
   window.addEventListener('blur', function() {
     windowFocused = false;
   });
@@ -12,5 +12,4 @@
   window.isFocused = function() {
     return windowFocused;
   };
-
 })();

js/logging.js

@@ -1,7 +1,13 @@
+/* eslint-env node */
+
+/* eslint strict: ['error', 'never'] */
+
 const electron = require('electron');
 const bunyan = require('bunyan');
 const _ = require('lodash');
 
+const debuglogs = require('./modules/debuglogs');
+
 
 const ipc = electron.ipcRenderer;
 const PHONE_REGEX = /\+\d{7,12}(\d{3})/g;
@@ -23,33 +29,31 @@ const LEVELS = {
 // Backwards-compatible logging, simple strings and no level (defaulted to INFO)
 
 function redactPhone(text) {
-  return text.replace(PHONE_REGEX, "+[REDACTED]$1");
+  return text.replace(PHONE_REGEX, '+[REDACTED]$1');
 }
 
 function redactGroup(text) {
-  return text.replace(GROUP_REGEX, function(match, before, id, after) {
-    return before + '[REDACTED]' + id.slice(-3) + after;
-  });
+  return text.replace(
+    GROUP_REGEX,
+    (match, before, id, after) => `${before}[REDACTED]${id.slice(-3)}${after}`
+  );
 }
 
 function now() {
   const date = new Date();
   return date.toJSON();
 }
 
-function log() {
-  const args = Array.prototype.slice.call(arguments, 0);
-
+function log(...args) {
   const consoleArgs = ['INFO ', now()].concat(args);
-  console._log.apply(console, consoleArgs);
+  console._log(...consoleArgs);
 
   // To avoid [Object object] in our log since console.log handles non-strings smoothly
-  const str = args.map(function(item) {
+  const str = args.map((item) => {
     if (typeof item !== 'string') {
       try {
         return JSON.stringify(item);
-      }
-      catch (e) {
+      } catch (error) {
         return item;
       }
     }
@@ -71,14 +75,14 @@ if (window.console) {
 function getHeader() {
   let header = window.navigator.userAgent;
 
-  header += ' node/' + window.config.node_version;
-  header += ' env/' + window.config.environment;
+  header += ` node/${window.config.node_version}`;
+  header += ` env/${window.config.environment}`;
 
   return header;
 }
 
 function getLevel(level) {
-  var text = LEVELS[level];
+  const text = LEVELS[level];
   if (!text) {
     return BLANK_LEVEL;
   }
@@ -87,45 +91,25 @@ function getLevel(level) {
 }
 
 function formatLine(entry) {
-  return getLevel(entry.level) + ' ' + entry.time + ' ' + entry.msg;
+  return `${getLevel(entry.level)} ${entry.time} ${entry.msg}`;
 }
 
 function format(entries) {
   return redactGroup(redactPhone(entries.map(formatLine).join('\n')));
 }
 
 function fetch() {
-  return new Promise(function(resolve) {
+  return new Promise((resolve) => {
     ipc.send('fetch-log');
 
-    ipc.on('fetched-log', function(event, text) {
-      var result = getHeader() + '\n' + format(text);
+    ipc.on('fetched-log', (event, text) => {
+      const result = `${getHeader()}\n${format(text)}`;
       resolve(result);
     });
   });
 }
 
-function publish(log) {
-  log = log || fetch();
-
-  return new Promise(function(resolve) {
-    const payload = textsecure.utils.jsonThing({
-      files: {
-        'debugLog.txt': {
-          content: log
-        }
-      }
-    });
-
-    $.post('https://api.github.com/gists', payload)
-      .then(function(response) {
-        console._log('Posted debug log to ', response.html_url);
-        resolve(response.html_url);
-      })
-      .fail(resolve);
-  });
-}
-
+const publish = debuglogs.upload;
 
 // A modern logging interface for the browser
 
@@ -136,22 +120,19 @@ const logger = bunyan.createLogger({
   streams: [{
     level: 'debug',
     stream: {
-      write: function(entry) {
+      write(entry) {
         console._log(formatLine(JSON.parse(entry)));
-      }
-    }
-  }]
+      },
+    },
+  }],
 });
 
 // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
-function logAtLevel() {
-  const level = arguments[0];
-  const args = Array.prototype.slice.call(arguments, 1);
-
-  const ipcArgs = ['log-' + level].concat(args);
-  ipc.send.apply(ipc, ipcArgs);
+function logAtLevel(level, ...args) {
+  const ipcArgs = [`log-${level}`].concat(args);
+  ipc.send(...ipcArgs);
 
-  logger[level].apply(logger, args);
+  logger[level](...args);
 }
 
 window.log = {
@@ -165,11 +146,11 @@ window.log = {
   publish,
 };
 
-window.onerror = function(message, script, line, col, error) {
+window.onerror = (message, script, line, col, error) => {
   const errorInfo = error && error.stack ? error.stack : JSON.stringify(error);
-  window.log.error('Top-level unhandled error: ' + errorInfo);
+  window.log.error(`Top-level unhandled error: ${errorInfo}`);
 };
 
-window.addEventListener('unhandledrejection', function(rejectionEvent) {
-  window.log.error('Top-level unhandled promise rejection: ' + rejectionEvent.reason);
+window.addEventListener('unhandledrejection', (rejectionEvent) => {
+  window.log.error(`Top-level unhandled promise rejection: ${rejectionEvent.reason}`);
 });

js/modules/debuglogs.js

@@ -0,0 +1,51 @@
+/* eslint-env node */
+
+const FormData = require('form-data');
+const got = require('got');
+
+
+const BASE_URL = 'https://debuglogs.org';
+
+// Workaround: Submitting `FormData` using native `FormData::submit` procedure
+// as integration with `got` results in S3 error saying we haven’t set the
+// `Content-Length` header:
+// https://github.com/sindresorhus/got/pull/466
+const submitFormData = (form, url) =>
+  new Promise((resolve, reject) => {
+    form.submit(url, (error) => {
+      if (error) {
+        return reject(error);
+      }
+
+      return resolve();
+    });
+  });
+
+//      upload :: String -> Promise URL
+exports.upload = async (content) => {
+  const signedForm = await got.get(BASE_URL, { json: true });
+  const { fields, url } = signedForm.body;
+
+  const form = new FormData();
+  // The API expects `key` to be the first field:
+  form.append('key', fields.key);
+  Object.entries(fields)
+    .filter(([key]) => key !== 'key')
+    .forEach(([key, value]) => {
+      form.append(key, value);
+    });
+
+  const contentBuffer = Buffer.from(content, 'utf8');
+  const contentType = 'text/plain';
+  form.append('Content-Type', contentType);
+  form.append('file', contentBuffer, {
+    contentType,
+    filename: 'signal-desktop-debug-log.txt',
+  });
+
+  // WORKAROUND: See comment on `submitFormData`:
+  // await got.post(url, { body: form });
+  await submitFormData(form, url);
+
+  return `${BASE_URL}/${fields.key}`;
+};

js/views/attachment_view.js

@@ -1,5 +1,3 @@
-/* eslint-env browser */
-
 /* global $: false */
 /* global _: false */
 /* global Backbone: false */