Merge pull request #87 from bitfinexcom/beta

Release v 3.4.0

.dockerignore

@@ -17,3 +17,4 @@ Dockerfile.mac-builder
 dist
 .env.example
 lastCommit.json
+.vscode

Dockerfile.linux-builder

@@ -1,13 +1,14 @@
 FROM electronuserland/builder
 
-ENV NODE_VERSION 12.13.0
+ENV NODE_VERSION 12.18.3
 
 COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
 
 RUN ./scripts/install-nodejs.sh $NODE_VERSION \
   && apt-get update -y \
   && apt-get install -y --no-install-recommends \
     p7zip-full \
+    bc \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

Dockerfile.mac-builder

@@ -1,13 +1,14 @@
 FROM electronuserland/builder
 
-ENV NODE_VERSION 12.13.0
+ENV NODE_VERSION 12.18.3
 
 COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
 
 RUN ./scripts/install-nodejs.sh $NODE_VERSION \
   && apt-get update -y \
   && apt-get install -y --no-install-recommends \
     p7zip-full \
+    bc \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

Dockerfile.ui-builder

@@ -1,6 +1,6 @@
 FROM electronuserland/builder
 
-ENV NODE_VERSION 12.13.0
+ENV NODE_VERSION 12.18.3
 
 COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
 

Dockerfile.win-builder

@@ -1,6 +1,6 @@
 FROM electronuserland/builder:wine
 
-ENV NODE_VERSION 12.13.0
+ENV NODE_VERSION 12.18.3
 
 COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
 
@@ -10,6 +10,7 @@ RUN  ./scripts/install-nodejs.sh $NODE_VERSION \
   && apt-get update -y \
   && apt-get install -y --no-install-recommends \
     p7zip-full \
+    bc \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

build/entitlements.mac.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.executable</key>
+    <true/>
+    <key>com.apple.security.device.audio-video-bridging</key>
+    <true/>
+    <key>com.apple.security.personal-information.location</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>

build/entitlements.mas.inherit.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.executable</key>
+    <true/>
+    <key>com.apple.security.device.audio-video-bridging</key>
+    <true/>
+    <key>com.apple.security.personal-information.location</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>

build/installer.nsh

@@ -0,0 +1,3 @@
+!macro customInit
+  nsExec::Exec '"$LOCALAPPDATA\bfx-report-electron\Update.exe" --uninstall -s'
+!macroend

build/linux-launcher/launcher.sh

@@ -10,7 +10,7 @@ appFilePath="$ROOT/app"
 logFilePath="$ROOT/error.log"
 
 output=$("$appFilePath" 2>&1)
-mess=$(echo "$output" | grep -v WARNING)
+mess=$(echo "$output" | grep -v WARNING | grep -v electron\/issues\/23506 | grep -v Cannot\ download\ differentially)
 
 if [ "$mess" != "" ]; then
   echo $mess>>"$logFilePath"

index.js

@@ -12,8 +12,11 @@ const shouldQuit = makeSingleInstance()
 if (shouldQuit) {
   app.quit()
 } else {
-  initializeApp()
-    .catch((err) => {
+  ;(async () => {
+    try {
+      await initializeApp()
+    } catch (err) {
       console.error(err)
-    })
+    }
+  })()
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-electron",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "repository": "https://github.com/bitfinexcom/bfx-report-electron",
   "description": "Reporting tool",
   "author": "bitfinex.com",
@@ -14,15 +14,21 @@
     "cron-validate": "^1.4.2",
     "ed25519-supercop": "^2.0.1",
     "electron-alert": "^0.1.11",
+    "electron-log": "^4.3.2",
+    "electron-root-path": "^1.0.16",
     "electron-serve": "^1.0.0",
+    "electron-updater": "^4.3.8",
+    "extract-zip": "^2.0.1",
     "find-free-port": "^2.0.0",
     "grenache-grape": "^0.9.8",
     "lodash": "^4.17.15",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {
-    "electron": "8.5.5",
-    "electron-builder": "22.9.1",
+    "app-builder-bin": "^3.5.13",
+    "electron": "11.4.5",
+    "electron-builder": "22.11.1",
+    "js-yaml": "^4.0.0",
     "node-gyp": "7.1.2",
     "node-pre-gyp": "^0.11.0",
     "standard": "^14.3.1"
@@ -47,12 +53,20 @@
     "test": "standard"
   },
   "build": {
+    "publish": {
+      "provider": "github",
+      "repo": "bfx-report-electron",
+      "owner": "bitfinexcom",
+      "channel": "latest",
+      "useMultipleRangeRequest": false,
+      "updaterCacheDirName": "bfx-report-electron-updater"
+    },
     "npmRebuild": false,
     "extends": null,
     "asar": false,
     "productName": "Bitfinex Report",
-    "artifactName": "${productName}-${version}-${arch}-${os}.${ext}",
-    "appId": "com.report.bitfinex",
+    "artifactName": "BitfinexReport-${version}-x64-${os}.${ext}",
+    "appId": "com.bitfinex.report",
     "files": [
       "**/*",
       "build/icons",
@@ -137,6 +151,32 @@
           "!**/test"
         ]
       },
+      {
+        "from": "bfx-reports-framework/node_modules/request/node_modules",
+        "to": "bfx-reports-framework/node_modules/request/node_modules",
+        "filter": [
+          "**/*",
+          "!.bin",
+          "!**/node_modules/.bin",
+          "!**/*.md",
+          "!**/LICENSE",
+          "!**/CHANGELOG",
+          "!**/test"
+        ]
+      },
+      {
+        "from": "bfx-reports-framework/node_modules/lokue/node_modules",
+        "to": "bfx-reports-framework/node_modules/lokue/node_modules",
+        "filter": [
+          "**/*",
+          "!.bin",
+          "!**/node_modules/.bin",
+          "!**/*.md",
+          "!**/LICENSE",
+          "!**/CHANGELOG",
+          "!**/test"
+        ]
+      },
       {
         "from": "bfx-report-ui/bfx-report-express/node_modules",
         "to": "bfx-report-ui/bfx-report-express/node_modules",
@@ -153,24 +193,32 @@
     ],
     "linux": {
       "executableName": "app",
-      "description": "Reporting tool",
+      "description": "Bitfinex Report",
       "maintainer": "<bitfinex.com>",
       "category": "Network",
       "target": [
-        "dir"
+        "dir",
+        "AppImage"
       ]
     },
     "win": {
       "target": [
-        "dir"
+        "dir",
+        "nsis"
       ],
-      "publisherName": "Reporting tool"
+      "publisherName": "Bitfinex Report",
+      "verifyUpdateCodeSignature": false
     },
     "mac": {
+      "type": "development",
       "hardenedRuntime": true,
-      "category": "public.app-category.productivity",
+      "gatekeeperAssess": false,
+      "entitlements": "build/entitlements.mac.plist",
+      "entitlementsInherit": "build/entitlements.mas.inherit.plist",
+      "category": "public.app-category.finance",
       "target": [
-        "dir"
+        "dir",
+        "zip"
       ]
     }
   }

scripts/build-ui.sh

@@ -7,6 +7,7 @@ export CI_ENVIRONMENT_NAME=production
 ROOT="$PWD"
 frontendFolder="$ROOT/bfx-report-ui"
 pathToTriggerElectronLoad="$frontendFolder/src/utils/triggerElectronLoad.js"
+pathToFonts="$frontendFolder/src/styles/fonts"
 uiBuildFolder=/ui-build
 uiReadyFile="$uiBuildFolder/READY"
 branch=master
@@ -99,4 +100,5 @@ fi
 
 mv -f $frontendFolder/build/* $uiBuildFolder
 cp $pathToTriggerElectronLoad $uiBuildFolder/triggerElectronLoad.js
+cp -avrf $pathToFonts $uiBuildFolder
 touch $uiReadyFile

scripts/generate-zipand-blockmap.js

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const path = require('path')
+const {
+  execSync
+} = require('child_process')
+const fs = require('fs')
+const yaml = require('js-yaml')
+const {
+  appBuilderPath
+} = require('app-builder-bin')
+
+const cwd = process.cwd()
+const packageJsonPath = path.join(cwd, 'package.json')
+
+const {
+  version: APP_VERSION,
+  build: { productName }
+} = require(packageJsonPath)
+
+const ARCH = 'x64'
+const APP_NAME = productName.replace(/\s/g, '')
+const APP_DIST_PATH = path.join(cwd, 'dist')
+const appReleaseFileName = `${APP_NAME}-${APP_VERSION}-${ARCH}-mac.zip`
+const APP_GENERATED_BINARY_PATH = path.join(
+  APP_DIST_PATH,
+  appReleaseFileName
+)
+const ymlPath = path.join(APP_DIST_PATH, 'latest-mac.yml')
+
+try {
+  const output = execSync(`${appBuilderPath} blockmap --input=${APP_GENERATED_BINARY_PATH} --output=${APP_GENERATED_BINARY_PATH}.blockmap --compression=gzip`)
+  const { sha512, size } = JSON.parse(output)
+  const ymlData = yaml.load(fs.readFileSync(ymlPath, 'utf8'))
+
+  console.log(ymlData)
+
+  ymlData.version = APP_VERSION
+  ymlData.path = appReleaseFileName
+  ymlData.sha512 = sha512
+  ymlData.releaseDate = new Date().toISOString()
+  ymlData.files[0].url = appReleaseFileName
+  ymlData.files[0].sha512 = sha512
+  ymlData.files[0].size = size
+
+  const yamlStr = yaml.dump(ymlData)
+
+  console.log(yamlStr)
+
+  fs.writeFileSync(ymlPath, yamlStr, 'utf8')
+  console.log('Successfully updated YAML file and configurations with blockmap')
+} catch (e) {
+  console.log('Error in updating YAML file and configurations with blockmap', e)
+}