Merge branch 'master' into docker-release

Author: antoinerg

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://plot.ly/products/consulting-and-oem/

CONTRIBUTING.md

@@ -203,7 +203,7 @@ which in turn is callback heavy. To help us stay out of _callback hell_, we use
 the following terms to designates callbacks:
 
 - At the end of the data-parse callback, we call the component module `parse`
-  method as `parse(body, componentOpts, sendToRenderer)` where `sendToRenderer`
+  method as `parse(body, request, componentOpts, sendToRenderer)` where `sendToRenderer`
   is a callback.
 - `sendToRenderer` transfers info from the main to the
   renderer process as `sendToRenderer(errorCode, parseInfo)`.

bin/orca.js

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const { spawn } = require('child_process')
-const electronPath = require('electron')
+const electronPath = process.env['ELECTRON_PATH'] ? process.env['ELECTRON_PATH'] : require('electron')
 
 const args = process.argv.slice(2)
 const pathToMain = path.join(__dirname, 'orca_electron.js')

deployment/run_server

@@ -14,7 +14,10 @@ BUILD_DIR=/var/www/image-exporter/build
 if [[ -n "${PLOTLY_JS_SRC}" ]]; then
   # Fetch plotly js bundle and save it locally:
   mkdir -p $BUILD_DIR
-  wget --retry-connrefused --no-check-certificate -O $BUILD_DIR/plotly-bundle.js "$PLOTLY_JS_SRC"
+  while true; do
+    wget --tries=1 --no-check-certificate -O $BUILD_DIR/plotly-bundle.js "$PLOTLY_JS_SRC" && break
+    sleep 1
+  done
   PLOTLYJS_ARG="--plotlyJS $BUILD_DIR/plotly-bundle.js"
 fi
 

src/app/runner/run.js

@@ -121,7 +121,7 @@ function run (app, win, ipcMain, opts) {
         body = _body
       }
 
-      comp._module.parse(body, compOpts, sendToRenderer)
+      comp._module.parse(body, {}, compOpts, sendToRenderer)
     })
   })
 

src/app/server/create-server.js

@@ -157,7 +157,7 @@ function createServer (app, BrowserWindow, ipcMain, opts) {
       }
 
       pending++
-      comp._module.parse(body, compOpts, sendToRenderer)
+      comp._module.parse(body, req, compOpts, sendToRenderer)
     })
   })
 

src/component/plotly-dash-preview/parse.js

@@ -7,12 +7,13 @@ const isNonEmptyString = require('../../util/is-non-empty-string')
  * @param {object} body : JSON-parsed request body
  *  - url
  *  - pdfOptions
+ * @param {object} req: HTTP request
  * @param {object} opts : component options
  * @param {function} sendToRenderer
  * - errorCode
  * - result
  */
-function parse (body, opts, sendToRenderer) {
+function parse (body, req, opts, sendToRenderer) {
   const result = {}
 
   const errorOut = (code, msg) => {

src/component/plotly-dashboard-preview/parse.js

@@ -11,12 +11,13 @@ const isNonEmptyString = require('../../util/is-non-empty-string')
  *      - figure
  *  - settings:
  *    - backgroundColor
+ * @param {object} req: HTTP request
  * @param {object} opts : component options
  * @param {function} sendToRenderer
  * - errorCode
  * - result
  */
-function parse (body, opts, sendToRenderer) {
+function parse (body, req, opts, sendToRenderer) {
   const result = {}
 
   const errorOut = code => {

src/component/plotly-dashboard-thumbnail/parse.js

@@ -12,12 +12,13 @@ const overrideFigure = require('../plotly-thumbnail/parse').overrideFigure
  *      - figure
  *  - settings:
  *    - backgroundColor
+ * @param {object} req: HTTP request
  * @param {object} opts : component options
  * @param {function} sendToRenderer
  * - errorCode
  * - result
  */
-function parse (body, opts, sendToRenderer) {
+function parse (body, req, opts, sendToRenderer) {
   const result = {}
 
   const errorOut = (code) => {

src/component/plotly-dashboard/parse.js

@@ -6,12 +6,13 @@ const isNonEmptyString = require('../../util/is-non-empty-string')
  *  - width
  *  - height
  *  - fid
+ * @param {object} req: HTTP request
  * @param {object} opts : component options
  * @param {function} sendToRenderer
  *  - errorCode
  *  - result
  */
-function parse (body, opts, sendToRenderer) {
+function parse (body, req, opts, sendToRenderer) {
   const result = {}
 
   const errorOut = (code) => {