Merge branch 'develop' into feature/friendly-json-viewer

.eslintrc

@@ -15,7 +15,8 @@
     "fail": true,
     "HTMLDivElement": true,
     "HTMLElement": true,
-    "HTMLInputElement": true
+    "HTMLInputElement": true,
+    "HTMLSelectElement": true
   },
   "env": {
     "jest/globals": true

.gitattributes

@@ -0,0 +1,7 @@
+* text eol=lf
+
+*.gif   binary
+*.icns  binary
+*.ico   binary
+*.png   binary
+*.woff2 binary

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 .idea
+.vscode
 dist/*
 build/*
 .DS_Store

app/__jest__/setup.js

@@ -17,4 +17,5 @@ const localStorageMock = (function () {
 })();
 
 global.localStorage = localStorageMock;
+global.requestAnimationFrame = cb => process.nextTick(cb);
 global.require = require;

app/__mocks__/insomnia-node-libcurl.js

@@ -4,6 +4,7 @@ class Curl extends EventEmitter {
   constructor () {
     super();
     this._options = {};
+    this._meta = {};
   }
   setOpt (name, value) {
     if (!name) {
@@ -15,6 +16,12 @@ class Curl extends EventEmitter {
       return;
     }
 
+    if (name === Curl.option.READFUNCTION) {
+      const buffer = new Buffer(10000);
+      const bytes = value(buffer);
+      this._meta[`${name}_VALUE`] = buffer.slice(0, bytes).toString('utf8');
+    }
+
     if (name === Curl.option.COOKIELIST) {
       // This can be set multiple times
       this._options[name] = this._options[name] || [];
@@ -42,7 +49,8 @@ class Curl extends EventEmitter {
   perform () {
     process.nextTick(() => {
       const data = Buffer.from(JSON.stringify({
-        options: this._options
+        options: this._options,
+        meta: this._meta
       }));
 
       this.emit('data', data);
@@ -110,6 +118,7 @@ Curl.option = {
   PROXY: 'PROXY',
   PROXYAUTH: 'PROXYAUTH',
   READDATA: 'READDATA',
+  READFUNCTION: 'READFUNCTION',
   SSLCERT: 'SSLCERT',
   SSLCERTTYPE: 'SSLCERTTYPE',
   SSLKEY: 'SSLKEY',

app/__tests__/package.test.js

@@ -11,8 +11,4 @@ describe('package.json', () => {
       expect(`${name}::${actual}`).toBe(`${name}::${expected}`);
     }
   });
-
-  it('pdfjs should not be in deps', () => {
-    expect(appPackage.dependencies['simple-react-pdf']).toBeUndefined();
-  });
 });

app/analytics/index.js

@@ -1,7 +1,7 @@
 import * as google from './google';
 import * as models from '../models';
 import {ipcRenderer} from 'electron';
-import {getAppVersion, getAppPlatform} from '../common/constants';
+import {getAppVersion, getAppPlatform, isDevelopment} from '../common/constants';
 
 let initialized = false;
 export async function init (accountId) {
@@ -24,7 +24,7 @@ export async function init (accountId) {
     trackEvent(...args);
   });
 
-  if (window) {
+  if (window && !isDevelopment()) {
     window.addEventListener('error', e => {
       trackEvent('Error', 'Uncaught Error');
       console.error('Uncaught Error', e);

app/common/misc.js

@@ -321,7 +321,19 @@ export function escapeRegex (str: string): string {
 }
 
 export function fuzzyMatch (searchString: string, text: string): boolean {
-  const regexSearchString = escapeRegex(searchString.toLowerCase()).split('').join('.*');
-  const toMatch = new RegExp(regexSearchString);
+  const lowercase = searchString.toLowerCase();
+
+  // Split into individual chars, then escape the ones that need it.
+  const regexSearchString = lowercase.split('').map(v => escapeRegex(v)).join('.*');
+
+  let toMatch;
+  try {
+    toMatch = new RegExp(regexSearchString);
+  } catch (err) {
+    console.warn('Invalid regex', searchString, regexSearchString);
+    // Invalid regex somehow
+    return false;
+  }
+
   return toMatch.test(text.toLowerCase());
 }

app/main/window-utils.js

@@ -258,6 +258,14 @@ export function createWindow () {
           trackEvent('App Menu', 'Shortcuts');
         }
       },
+      {
+        label: 'Show App Data Folder',
+        click: (menuItem, window, e) => {
+          const directory = app.getPath('userData');
+          shell.showItemInFolder(directory);
+          trackEvent('App Menu', 'Open App Data');
+        }
+      },
       {
         label: 'Insomnia Help',
         accelerator: 'CmdOrCtrl+/',

app/models/settings.js

@@ -21,7 +21,8 @@ type BaseSettings = {
   theme: string,
   maxRedirects: number,
   disableAnalyticsTracking: boolean,
-  pluginPath: string
+  pluginPath: string,
+  nunjucksPowerUserMode: boolean
 };
 
 export type Settings = BaseModel & Settings;
@@ -51,7 +52,8 @@ export function init (): BaseSettings {
     autoHideMenuBar: false,
     theme: 'default',
     disableAnalyticsTracking: false,
-    pluginPath: ''
+    pluginPath: '',
+    nunjucksPowerUserMode: false
   };
 }
 

app/network/__tests__/multipart.test.js

@@ -0,0 +1,79 @@
+import {globalBeforeEach} from '../../__jest__/before-each';
+import {buildMultipart} from '../multipart';
+import path from 'path';
+
+describe('buildMultipart()', () => {
+  beforeEach(globalBeforeEach);
+
+  it('builds a simple request', async () => {
+    const {body, boundary} = buildMultipart([
+      {name: 'foo', value: 'bar'},
+      {name: 'multi-line', value: 'Hello\nWorld!'}
+    ]);
+
+    expect(boundary).toBe('------------------------X-INSOMNIA-BOUNDARY');
+    expect(body.toString()).toBe([
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="foo"',
+      '',
+      'bar',
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="multi-line"',
+      '',
+      'Hello\nWorld!',
+      `--${boundary}--`,
+      ''
+    ].join('\r\n'));
+  });
+
+  it('builds with file', async () => {
+    const fileName = path.resolve(path.join(__dirname, './testfile.txt'));
+    const {body, boundary} = buildMultipart([
+      {name: 'foo', value: 'bar'},
+      {name: 'file', type: 'file', fileName: fileName},
+      {name: 'baz', value: 'qux'}
+    ]);
+
+    expect(boundary).toBe('------------------------X-INSOMNIA-BOUNDARY');
+    expect(body.toString()).toBe([
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="foo"',
+      '',
+      'bar',
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="file"; filename="testfile.txt"',
+      'Content-Type: text/plain',
+      '',
+      'Hello World!\n\nHow are you?',
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="baz"',
+      '',
+      'qux',
+      `--${boundary}--`,
+      ''
+    ].join('\r\n'));
+  });
+
+  it('skips entries with no name or value', async () => {
+    const {body, boundary} = buildMultipart([
+      {value: 'bar'},
+      {name: 'foo'},
+      {name: '', value: ''},
+      {name: '', type: 'file', fileName: ''}
+    ]);
+
+    expect(boundary).toBe('------------------------X-INSOMNIA-BOUNDARY');
+    expect(body.toString()).toBe([
+      `--${boundary}`,
+      'Content-Disposition: form-data; name=""',
+      '',
+      'bar',
+      `--${boundary}`,
+      'Content-Disposition: form-data; name="foo"',
+      '',
+      '',
+      `--${boundary}--`,
+      ''
+    ].join('\r\n'));
+  });
+});