if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-24 09:50:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Upgrade master to 6.x (#795)

Browse Source 
* Upgrade Electron version to 6.x

* fix: SDA-1347 (Group multiple processes into a single task bar icon) (#778)

* update mac build script

* update mac packager

* feat: ELECTRON-1462 (Combine more information into about app window) (#777)

* ELECTRON-1462 - Merge more info window in to about app window

* ELECTRON-1462 - Adjust window size

* ELECTRON-1462 - Add line space

* ELECTRON-1462 - Resize for windows

* ELECTRON-1462 - Add translation for swift search

* ELECTRON-1462 - Adjust width for Windows OS

* ELECTRON-1462 - Add about app snapshots file

* SDA-1347 - Group multiple processes into single task bar icon

* Change dependency from gulp-tsc to gulp-typescript

* 6.x Update activity detection api

* 6.x Update aip file to remove unwanted spellchecker files

* 6.x Update electron version to 6.1.2

* 6.x Update SDA version and change spellchecker base

* 6.x Update electron-builder version to support 6.x

* 6.x fix escape char for window build command

* 6.x Optimize log path set and get methods

* 6.x Change yml to json

* 6.x Make Window local path as default user data path
This commit is contained in:
Kiran Niranjan 2019-10-30 20:58:25 +05:30 committed by Vishwas Shashidhar
parent 4dab0d66d5
commit 0431a9f5ad
16 changed files with 153 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
electron-builder.yml
View File

@ -1,52 +0,0 @@
productName: "Symphony"
appId: "com.symphony.electron-desktop"
# Package electron code into a asar archive. Set to false to debug issues.
asar: true
# Unpack these files from asar to have them signed
asarUnpack:
- 'node_modules/@nornagon/cld/build/Release/cld.node'
- 'node_modules/@nornagon/spellchecker/build/Release/spellchecker.node'
- 'node_modules/keyboard-layout/build/Release/keyboard-layout-manager.node'
# Don't package these files
files:
- '!coverage/*'
- '!installer/*'
- '!tests/*'
- '!node_modules/@nornagon/cld/deps/cld${/*}'
- '!node_modules/@nornagon/cld/build/deps${/*}'
- '!node_modules/@nornagon/spellchecker/vendor${/*}'
# Extra files to package
extraFiles:
- 'config/Symphony.config'
- 'config/titleBarStyles.css'
- 'dictionaries/**'
- 'library/libsymphonysearch.dylib'
- 'library/indexvalidator.exec'
- 'library/cryptoLib.dylib'
- 'library/dictionary'
- 'library/lz4.exec'
# Mac OS configuration
mac:
category: 'public.app-category.business'
icon: 'images/icon.icns'
# Windows configuration
win:
icon: 'images/icon.ico'
target:
- 'squirrel'
# Linux configuration
linux:
category: 'Network;InstantMessaging;Chat'
desktop:
StartupWMClass: 'Symphony'
target:
- 'deb'
- 'rpm'
icon: 'images/linux'

12
gulpfile.js
View File

@ -2,11 +2,11 @@ const fs = require('fs');
const gulp = require('gulp');
const less = require('gulp-less');
const sourcemaps = require('gulp-sourcemaps');
const tsc = require('gulp-tsc');
const tsc = require('gulp-typescript');
const del = require('del');
const path = require('path');
// TODO: Add gulp watch tasks
const tsProject = tsc.createProject('./tsconfig.json');
gulp.task('clean', function() {
return del('lib');
@ -17,8 +17,9 @@ gulp.task('clean', function() {
* and copy to the destination
*/
gulp.task('compile', function() {
return gulp.src(['src/**/*.ts', 'src/**/*.tsx'])
.pipe(tsc({ project: './tsconfig.json' }))
return tsProject.src()
.pipe(tsProject())
.on('error', (err) => console.log(err))
.pipe(gulp.dest('lib/'))
});
@ -37,7 +38,8 @@ gulp.task('copy', function () {
return gulp.src([
'./src/renderer/assets/*',
'./src/renderer/*.html',
'./src/locale/*'
'./src/locale/*',
'./package.json'
], {
"base": "./src"
}).pipe(gulp.dest('lib/src'))

15
installer/win/Symphony-x64.aip
View File

@ -71,16 +71,11 @@
<ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
<ROW Directory="DesktopFolder" Directory_Parent="TARGETDIR" DefaultDir="DESKTO~1|DesktopFolder" IsPseudoRoot="1"/>
<ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~1|ProgramMenuFolder" IsPseudoRoot="1"/>
<ROW Directory="Release_1_Dir" Directory_Parent="build_1_Dir" DefaultDir="Release"/>
<ROW Directory="Release_2_Dir" Directory_Parent="build_2_Dir" DefaultDir="Release"/>
<ROW Directory="Release_Dir" Directory_Parent="build_Dir" DefaultDir="Release"/>
<ROW Directory="Symphony_Dir" Directory_Parent="ProgramMenuFolder" DefaultDir="Symphony"/>
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
<ROW Directory="app.asar.unpacked_Dir" Directory_Parent="resources_Dir" DefaultDir="APPASA~1.UNP|app.asar.unpacked"/>
<ROW Directory="build_1_Dir" Directory_Parent="spellchecker_Dir" DefaultDir="build"/>
<ROW Directory="build_2_Dir" Directory_Parent="keyboardlayout_Dir" DefaultDir="build"/>
<ROW Directory="build_Dir" Directory_Parent="cld_Dir" DefaultDir="build"/>
<ROW Directory="cld_Dir" Directory_Parent="nornagon_Dir" DefaultDir="cld"/>
<ROW Directory="config_Dir" Directory_Parent="APPDIR" DefaultDir="config"/>
<ROW Directory="dictionaries_Dir" Directory_Parent="APPDIR" DefaultDir="DICTIO~1|dictionaries"/>
<ROW Directory="enUS_Dir" Directory_Parent="APPDIR" DefaultDir="en-US"/>
@ -92,10 +87,8 @@
<ROW Directory="library_Dir" Directory_Parent="APPDIR" DefaultDir="library"/>
<ROW Directory="locales_Dir" Directory_Parent="APPDIR" DefaultDir="locales"/>
<ROW Directory="node_modules_Dir" Directory_Parent="app.asar.unpacked_Dir" DefaultDir="NODE_M~1|node_modules"/>
<ROW Directory="nornagon_Dir" Directory_Parent="node_modules_Dir" DefaultDir="@NORNA~1|@nornagon"/>
<ROW Directory="resources_Dir" Directory_Parent="APPDIR" DefaultDir="RESOUR~1|resources"/>
<ROW Directory="spawnrx_Dir" Directory_Parent="node_modules_Dir" DefaultDir="spawn-rx"/>
<ROW Directory="spellchecker_Dir" Directory_Parent="nornagon_Dir" DefaultDir="SPELLC~1|spellchecker"/>
<ROW Directory="src_1_Dir" Directory_Parent="spawnrx_Dir" DefaultDir="src"/>
<ROW Directory="src_Dir" Directory_Parent="lib_Dir" DefaultDir="src"/>
<ROW Directory="vendor_Dir" Directory_Parent="spawnrx_Dir" DefaultDir="vendor"/>
@ -119,7 +112,6 @@
<ROW Component="appupdate.yml" ComponentId="{F7586760-660A-4C38-8937-138DBEC18D34}" Directory_="resources_Dir" Attributes="0" KeyPath="app.asar" Type="0"/>
<ROW Component="blink_image_resources_200_percent.pak" ComponentId="{56AB17A5-B690-4CBE-A39D-512381AAAFE1}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSES.chromium.html" Type="0"/>
<ROW Component="build.cmd" ComponentId="{2892AEA1-7773-46FE-8F4C-56E7EAC3BDC3}" Directory_="spawnrx_Dir" Attributes="0" KeyPath="build.cmd" Type="0"/>
<ROW Component="cld.node" ComponentId="{2598E57C-15B4-4B21-9DDA-EBD760F45C79}" Directory_="Release_Dir" Attributes="256" KeyPath="cld.node" Type="0"/>
<ROW Component="d3dcompiler_47.dll" ComponentId="{C7B87C02-3116-43A8-A70B-3592B70E6AC8}" Directory_="APPDIR" Attributes="256" KeyPath="d3dcompiler_47.dll"/>
<ROW Component="dictionary" ComponentId="{0337D363-6EC5-4283-98AC-0E2931979F53}" Directory_="library_Dir" Attributes="0" KeyPath="dictionary" Type="0"/>
<ROW Component="enAU.bdic" ComponentId="{13F10BB0-1A04-4A5E-8B6D-33CA73C97AEB}" Directory_="dictionaries_Dir" Attributes="0" KeyPath="enAU.bdic" Type="0"/>
@ -133,18 +125,17 @@
<ROW Component="libGLESv2.dll" ComponentId="{0E8B8B21-B4C0-45C9-95D3-637FD93A4EC0}" Directory_="APPDIR" Attributes="256" KeyPath="libGLESv2.dll"/>
<ROW Component="libsymphonysearchx64.dll" ComponentId="{A8C99D17-FA62-4996-8FAE-52D1DCF9BF26}" Directory_="library_Dir" Attributes="256" KeyPath="libsymphonysearchx64.dll"/>
<ROW Component="lz4winx64.exe" ComponentId="{8B78B313-EAE9-4533-AFEB-56F9E0CA73A1}" Directory_="library_Dir" Attributes="256" KeyPath="lz4winx64.exe"/>
<ROW Component="spellchecker.node" ComponentId="{C3444491-74ED-4F80-8F8A-76363B0DF5E5}" Directory_="Release_1_Dir" Attributes="256" KeyPath="spellchecker.node" Type="0"/>
<ROW Component="tarwin.exe" ComponentId="{4C98F3B1-1A73-4761-86C0-DE0FC18A8800}" Directory_="library_Dir" Attributes="0" KeyPath="tarwin.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="D564007E3BBE4F85950A09B470A7CA65" Title="Visual C++ Redistributable for Visual Studio 2013 x86" Description="Visual C++ Redistributable for Visual Studio 2013 x86" Display="3" Level="1" Attributes="0"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml blink_image_resources_200_percent.pak build.cmd cld.node d3dcompiler_47.dll dictionary enAU.bdic ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx64.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx64.dll lz4winx64.exe spellchecker.node tarwin.exe"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml blink_image_resources_200_percent.pak build.cmd d3dcompiler_47.dll dictionary enAU.bdic ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx64.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx64.dll lz4winx64.exe tarwin.exe"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
<ROW File="CODE_OF_CONDUCT.md" Component_="build.cmd" FileName="CODE_O~1.MD|CODE_OF_CONDUCT.md" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\CODE_OF_CONDUCT.md" SelfReg="false" NextFile="COPYING"/>
<ROW File="COPYING" Component_="build.cmd" FileName="COPYING" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\COPYING" SelfReg="false" NextFile="esdoc.json"/>
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="cld.node" DigSign="true"/>
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="keyboardlayoutmanager.node" DigSign="true"/>
<ROW File="LICENSE.electron.txt" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.TXT|LICENSE.electron.txt" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSE.electron.txt" SelfReg="false" NextFile="LICENSES.chromium.html"/>
<ROW File="LICENSES.chromium.html" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.HTM|LICENSES.chromium.html" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSES.chromium.html" SelfReg="false" NextFile="natives_blob.bin"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe" SelfReg="false" NextFile="indexvalidatorx64.exe" DigSign="true"/>
@ -164,7 +155,6 @@
<ROW File="ca.pak" Component_="am.pak" FileName="ca.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\ca.pak" SelfReg="false" NextFile="cs.pak"/>
<ROW File="chrome_100_percent.pak" Component_="blink_image_resources_200_percent.pak" FileName="CHROME~1.PAK|chrome_100_percent.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\chrome_100_percent.pak" SelfReg="false" NextFile="chrome_200_percent.pak"/>
<ROW File="chrome_200_percent.pak" Component_="blink_image_resources_200_percent.pak" FileName="CHROME~2.PAK|chrome_200_percent.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\chrome_200_percent.pak" SelfReg="false" NextFile="resources.pak"/>
<ROW File="cld.node" Component_="cld.node" FileName="CLD~1.NOD|cld.node" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\@nornagon\cld\build\Release\cld.node" SelfReg="false" NextFile="spellchecker.node"/>
<ROW File="cs.pak" Component_="am.pak" FileName="cs.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\cs.pak" SelfReg="false" NextFile="da.pak"/>
<ROW File="d3dcompiler_47.dll" Component_="d3dcompiler_47.dll" FileName="D3DCOM~1.DLL|d3dcompiler_47.dll" Attributes="0" SourcePath="..\..\dist\win-unpacked\d3dcompiler_47.dll" SelfReg="false" NextFile="ffmpeg.dll"/>
<ROW File="da.pak" Component_="am.pak" FileName="da.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\da.pak" SelfReg="false" NextFile="de.pak"/>
@ -227,7 +217,6 @@
<ROW File="sk.pak" Component_="am.pak" FileName="sk.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sk.pak" SelfReg="false" NextFile="sl.pak"/>
<ROW File="sl.pak" Component_="am.pak" FileName="sl.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sl.pak" SelfReg="false" NextFile="sr.pak"/>
<ROW File="snapshot_blob.bin" Component_="blink_image_resources_200_percent.pak" FileName="SNAPSH~1.BIN|snapshot_blob.bin" Attributes="0" SourcePath="..\..\dist\win-unpacked\snapshot_blob.bin" SelfReg="false"/>
<ROW File="spellchecker.node" Component_="spellchecker.node" FileName="SPELLC~1.NOD|spellchecker.node" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\@nornagon\spellchecker\build\Release\spellchecker.node" SelfReg="false" NextFile="keyboardlayoutmanager.node"/>
<ROW File="sr.pak" Component_="am.pak" FileName="sr.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sr.pak" SelfReg="false" NextFile="sv.pak"/>
<ROW File="sv.pak" Component_="am.pak" FileName="sv.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sv.pak" SelfReg="false" NextFile="sw.pak"/>
<ROW File="sw.pak" Component_="am.pak" FileName="sw.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sw.pak" SelfReg="false" NextFile="ta.pak"/>

15
installer/win/Symphony-x86.aip
View File

@ -70,16 +70,11 @@
<ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
<ROW Directory="DesktopFolder" Directory_Parent="TARGETDIR" DefaultDir="DESKTO~1|DesktopFolder" IsPseudoRoot="1"/>
<ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~1|ProgramMenuFolder" IsPseudoRoot="1"/>
<ROW Directory="Release_1_Dir" Directory_Parent="build_1_Dir" DefaultDir="Release"/>
<ROW Directory="Release_2_Dir" Directory_Parent="build_2_Dir" DefaultDir="Release"/>
<ROW Directory="Release_Dir" Directory_Parent="build_Dir" DefaultDir="Release"/>
<ROW Directory="Symphony_Dir" Directory_Parent="ProgramMenuFolder" DefaultDir="Symphony"/>
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
<ROW Directory="app.asar.unpacked_Dir" Directory_Parent="resources_Dir" DefaultDir="APPASA~1.UNP|app.asar.unpacked"/>
<ROW Directory="build_1_Dir" Directory_Parent="spellchecker_Dir" DefaultDir="build"/>
<ROW Directory="build_2_Dir" Directory_Parent="keyboardlayout_Dir" DefaultDir="build"/>
<ROW Directory="build_Dir" Directory_Parent="cld_Dir" DefaultDir="build"/>
<ROW Directory="cld_Dir" Directory_Parent="nornagon_Dir" DefaultDir="cld"/>
<ROW Directory="config_Dir" Directory_Parent="APPDIR" DefaultDir="config"/>
<ROW Directory="dictionaries_Dir" Directory_Parent="APPDIR" DefaultDir="DICTIO~1|dictionaries"/>
<ROW Directory="enUS_Dir" Directory_Parent="APPDIR" DefaultDir="en-US"/>
@ -91,10 +86,8 @@
<ROW Directory="library_Dir" Directory_Parent="APPDIR" DefaultDir="library"/>
<ROW Directory="locales_Dir" Directory_Parent="APPDIR" DefaultDir="locales"/>
<ROW Directory="node_modules_Dir" Directory_Parent="app.asar.unpacked_Dir" DefaultDir="NODE_M~1|node_modules"/>
<ROW Directory="nornagon_Dir" Directory_Parent="node_modules_Dir" DefaultDir="@NORNA~1|@nornagon"/>
<ROW Directory="resources_Dir" Directory_Parent="APPDIR" DefaultDir="RESOUR~1|resources"/>
<ROW Directory="spawnrx_Dir" Directory_Parent="node_modules_Dir" DefaultDir="spawn-rx"/>
<ROW Directory="spellchecker_Dir" Directory_Parent="nornagon_Dir" DefaultDir="SPELLC~1|spellchecker"/>
<ROW Directory="src_1_Dir" Directory_Parent="spawnrx_Dir" DefaultDir="src"/>
<ROW Directory="src_Dir" Directory_Parent="lib_Dir" DefaultDir="src"/>
<ROW Directory="vendor_Dir" Directory_Parent="spawnrx_Dir" DefaultDir="vendor"/>
@ -118,7 +111,6 @@
<ROW Component="appupdate.yml" ComponentId="{0C70DAF7-B9A5-42E8-8EAD-986872DA450E}" Directory_="resources_Dir" Attributes="0" KeyPath="app.asar" Type="0"/>
<ROW Component="blink_image_resources_200_percent.pak" ComponentId="{19811F96-6FFC-4970-A103-9D0F5A1A402D}" Directory_="APPDIR" Attributes="0" KeyPath="LICENSES.chromium.html" Type="0"/>
<ROW Component="build.cmd" ComponentId="{0B1FF3EE-4E08-405F-817D-CB331FA79B71}" Directory_="spawnrx_Dir" Attributes="0" KeyPath="build.cmd" Type="0"/>
<ROW Component="cld.node" ComponentId="{020FE13E-4FB0-47FF-A5B9-37BB11E493E6}" Directory_="Release_Dir" Attributes="0" KeyPath="cld.node" Type="0"/>
<ROW Component="d3dcompiler_47.dll" ComponentId="{86265353-5735-4FB2-85EB-26947BE73061}" Directory_="APPDIR" Attributes="0" KeyPath="d3dcompiler_47.dll"/>
<ROW Component="dictionary" ComponentId="{931163B6-551B-469E-8AFB-25AA3CBC4A02}" Directory_="library_Dir" Attributes="0" KeyPath="dictionary" Type="0"/>
<ROW Component="enAU.bdic" ComponentId="{D150D8CE-8674-41D5-BDDA-3524275B8B22}" Directory_="dictionaries_Dir" Attributes="0" KeyPath="enAU.bdic" Type="0"/>
@ -132,18 +124,17 @@
<ROW Component="libGLESv2.dll" ComponentId="{06513829-1D3E-4286-BB01-112BF26E6684}" Directory_="APPDIR" Attributes="0" KeyPath="libGLESv2.dll"/>
<ROW Component="libsymphonysearchx86.dll" ComponentId="{0FE8E551-95CE-4936-8553-217ED411CAD5}" Directory_="library_Dir" Attributes="0" KeyPath="libsymphonysearchx86.dll"/>
<ROW Component="lz4winx86.exe" ComponentId="{C71364D8-6FE2-4BA1-8D89-12B075FFAEFD}" Directory_="library_Dir" Attributes="0" KeyPath="lz4winx86.exe"/>
<ROW Component="spellchecker.node" ComponentId="{92E61C9F-EA4D-4EE6-8AC8-5E4BAB91E98B}" Directory_="Release_1_Dir" Attributes="0" KeyPath="spellchecker.node" Type="0"/>
<ROW Component="tarwin.exe" ComponentId="{B7E57E12-8788-49D4-A31C-23E821D36B2F}" Directory_="library_Dir" Attributes="0" KeyPath="tarwin.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="D564007E3BBE4F85950A09B470A7CA65" Title="Visual C++ Redistributable for Visual Studio 2013 x86" Description="Visual C++ Redistributable for Visual Studio 2013 x86" Display="3" Level="1" Attributes="0"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml blink_image_resources_200_percent.pak build.cmd cld.node d3dcompiler_47.dll dictionary enAU.bdic ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx86.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx86.dll lz4winx86.exe spellchecker.node tarwin.exe"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml blink_image_resources_200_percent.pak build.cmd d3dcompiler_47.dll dictionary enAU.bdic ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx86.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx86.dll lz4winx86.exe tarwin.exe"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
<ROW File="CODE_OF_CONDUCT.md" Component_="build.cmd" FileName="CODE_O~1.MD|CODE_OF_CONDUCT.md" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\CODE_OF_CONDUCT.md" SelfReg="false" NextFile="COPYING"/>
<ROW File="COPYING" Component_="build.cmd" FileName="COPYING" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\COPYING" SelfReg="false" NextFile="esdoc.json"/>
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="cld.node" DigSign="true"/>
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="keyboardlayoutmanager.node" DigSign="true"/>
<ROW File="LICENSE.electron.txt" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.TXT|LICENSE.electron.txt" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\LICENSE.electron.txt" SelfReg="false" NextFile="LICENSES.chromium.html"/>
<ROW File="LICENSES.chromium.html" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.HTM|LICENSES.chromium.html" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\LICENSES.chromium.html" SelfReg="false" NextFile="natives_blob.bin"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe" SelfReg="false" NextFile="ScreenSnippet.resources.dll" DigSign="true"/>
@ -163,7 +154,6 @@
<ROW File="ca.pak" Component_="am.pak" FileName="ca.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\ca.pak" SelfReg="false" NextFile="cs.pak"/>
<ROW File="chrome_100_percent.pak" Component_="blink_image_resources_200_percent.pak" FileName="CHROME~1.PAK|chrome_100_percent.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\chrome_100_percent.pak" SelfReg="false" NextFile="chrome_200_percent.pak"/>
<ROW File="chrome_200_percent.pak" Component_="blink_image_resources_200_percent.pak" FileName="CHROME~2.PAK|chrome_200_percent.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\chrome_200_percent.pak" SelfReg="false" NextFile="resources.pak"/>
<ROW File="cld.node" Component_="cld.node" FileName="CLD~1.NOD|cld.node" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\@nornagon\cld\build\Release\cld.node" SelfReg="false" NextFile="spellchecker.node"/>
<ROW File="cs.pak" Component_="am.pak" FileName="cs.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\cs.pak" SelfReg="false" NextFile="da.pak"/>
<ROW File="d3dcompiler_47.dll" Component_="d3dcompiler_47.dll" FileName="D3DCOM~1.DLL|d3dcompiler_47.dll" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\d3dcompiler_47.dll" SelfReg="false" NextFile="ffmpeg.dll"/>
<ROW File="da.pak" Component_="am.pak" FileName="da.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\da.pak" SelfReg="false" NextFile="de.pak"/>
@ -226,7 +216,6 @@
<ROW File="sk.pak" Component_="am.pak" FileName="sk.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\sk.pak" SelfReg="false" NextFile="sl.pak"/>
<ROW File="sl.pak" Component_="am.pak" FileName="sl.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\sl.pak" SelfReg="false" NextFile="sr.pak"/>
<ROW File="snapshot_blob.bin" Component_="blink_image_resources_200_percent.pak" FileName="SNAPSH~1.BIN|snapshot_blob.bin" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\snapshot_blob.bin" SelfReg="false"/>
<ROW File="spellchecker.node" Component_="spellchecker.node" FileName="SPELLC~1.NOD|spellchecker.node" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\@nornagon\spellchecker\build\Release\spellchecker.node" SelfReg="false" NextFile="keyboardlayoutmanager.node"/>
<ROW File="sr.pak" Component_="am.pak" FileName="sr.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\sr.pak" SelfReg="false" NextFile="sv.pak"/>
<ROW File="sv.pak" Component_="am.pak" FileName="sv.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\sv.pak" SelfReg="false" NextFile="sw.pak"/>
<ROW File="sw.pak" Component_="am.pak" FileName="sw.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\sw.pak" SelfReg="false" NextFile="ta.pak"/>

67
package.json
View File

@ -1,7 +1,7 @@
{
"name": "symphony",
"productName": "Symphony",
"version": "5.0.0",
"version": "6.0.0",
"clientVersion": "2.0.1",
"buildNumber": "0",
"searchAPIVersion": "1.55.3",
@ -16,15 +16,63 @@
"demo-win": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file:///src/demo/index.html",
"demo-mac": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file://$(pwd)/src/demo/index.html",
"lint": "tslint --project tsconfig.json",
"packed-linux": "npm run prebuild && npm run test && build --linux",
"packed-linux": "npm run prebuild && npm run test && ./node_modules/.bin/electron-builder build --linux",
"packed-mac": "npm run unpacked-mac && packagesbuild -v installer/mac/symphony-mac-packager.pkgproj",
"prebuild": "npm run compile && npm run rebuild && npm run browserify-preload",
"rebuild": "electron-rebuild -f",
"start": "npm run compile && npm run browserify-preload && cross-env ELECTRON_DEV=true electron .",
"test": "npm run lint && cross-env ELECTRON_QA=true jest --config jest-config.json --runInBand --detectOpenHandles",
"unpacked-mac": "npm run prebuild && npm run test && build --mac --dir",
"unpacked-win": "npm run prebuild && npm run test && build --win --x64 --dir",
"unpacked-win-x86": "npm run prebuild && npm run test && build --win --ia32 --dir"
"unpacked-mac": "npm run prebuild && npm run test && ./node_modules/.bin/electron-builder build --mac --dir",
"unpacked-win": "npm run prebuild && npm run test && node_modules\\.bin\\electron-builder build --win --x64 --dir",
"unpacked-win-x86": "npm run prebuild && npm run test && node_modules\\.bin\\electron-builder build --win --ia32 --dir"
},
"build": {
"appId": "com.symphony.electron-desktop",
"asar": true,
"asarUnpack": [
"node_modules/@nornagon/cld/build/Release/cld.node",
"node_modules/@nornagon/spellchecker/build/Release/spellchecker.node",
"node_modules/keyboard-layout/build/Release/keyboard-layout-manager.node"
],
"files": [
"!coverage/*",
"!installer/*",
"!tests/*",
"!node_modules/@nornagon/cld/deps/cld${/*}",
"!node_modules/@nornagon/cld/build/deps${/*}",
"!node_modules/@nornagon/spellchecker/vendor${/*}"
],
"extraFiles": [
"config/Symphony.config",
"config/titleBarStyles.css",
"dictionaries/**",
"library/libsymphonysearch.dylib",
"library/indexvalidator.exec",
"library/cryptoLib.dylib",
"library/dictionary",
"library/lz4.exec"
],
"mac": {
"category": "public.app-category.business",
"icon": "images/icon.icns"
},
"win": {
"icon": "images/icon.ico",
"target": [
"squirrel"
]
},
"linux": {
"category": "Network;InstantMessaging;Chat",
"desktop": {
"StartupWMClass": "Symphony"
},
"target": [
"deb",
"rpm"
],
"icon": "images/linux"
}
},
"repository": {
"type": "git",
@ -49,8 +97,8 @@
"browserify": "16.2.3",
"cross-env": "5.2.0",
"del": "3.0.0",
"electron": "5.0.10",
"electron-builder": "20.38.4",
"electron": "6.1.2",
"electron-builder": "21.2.0",
"electron-builder-squirrel-windows": "20.38.3",
"electron-icon-maker": "0.0.4",
"electron-rebuild": "1.8.2",
@ -60,10 +108,11 @@
"gulp": "4.0.0",
"gulp-less": "4.0.1",
"gulp-sourcemaps": "2.6.4",
"gulp-tsc": "1.3.2",
"gulp-typescript": "5.0.1",
"jest": "23.6.0",
"jest-html-reporter": "2.4.2",
"less": "3.8.1",
"node-abi": "^2.12.0",
"ts-jest": "23.10.5",
"tslint": "5.11.0",
"typescript": "3.1.1"
@ -76,7 +125,7 @@
"electron-dl": "1.14.0",
"electron-fetch": "1.3.0",
"electron-log": "3.0.7",
"electron-spellchecker": "git+https://github.com/symphonyoss/electron-spellchecker.git#v2.0.3",
"electron-spellchecker": "git+https://github.com/symphonyoss/electron-spellchecker.git#v2.3.0",
"ffi-napi": "2.4.5",
"filesize": "4.1.2",
"react": "16.9.0",

8
spec/__mocks__/electron.ts
View File

@ -21,6 +21,7 @@ interface IApp {
setPath(value: string, path: string): void;
setLoginItemSettings(settings: { openAtLogin: boolean, path: string }): void;
getLoginItemSettings(options?: { path: string, args: string[] }): ILoginItemSettings;
setAppLogsPath(): void;
}
interface ILoginItemSettings {
openAtLogin: boolean;
@ -37,7 +38,7 @@ interface IIpcRenderer {
once(eventName: any, cb: any): void;
}
interface IPowerMonitor {
querySystemIdleTime(): void;
getSystemIdleTime(): void;
}
const pathToConfigDir = (): string => {
@ -77,6 +78,9 @@ export const app: IApp = {
getLoginItemSettings: (): ILoginItemSettings => {
return { openAtLogin: true };
},
setAppLogsPath: (): void => {
return;
},
};
// simple ipc mocks for render and main process ipc using
@ -98,7 +102,7 @@ export const ipcMain: IIpcMain = {
};
export const powerMonitor: IPowerMonitor = {
querySystemIdleTime: jest.fn().mockImplementation((cb) => cb(mockIdleTime)),
getSystemIdleTime: jest.fn().mockReturnValue(mockIdleTime),
};
export const ipcRenderer: IIpcRenderer = {

22
spec/dialogHandler.spec.ts
View File

@ -44,18 +44,20 @@ describe('dialog handler', () => {
const errorMocked = 'check for server certificate revocation';
const certificate = null;
it('should return false when buttonId is 1', () => {
dialog.showMessageBox = jest.fn(() => 1);
ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
expect(callbackMocked).toBeCalledWith(false);
it('should return false when buttonId is 1', async (done) => {
dialog.showMessageBox = jest.fn(() => {
return { response: 1 };
});
await ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
done(expect(callbackMocked).toBeCalledWith(false));
});
it('should return true when buttonId is not 1', () => {
it('should return true when buttonId is not 1', async (done) => {
dialog.showMessageBox = jest.fn(() => 2);
ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
expect(callbackMocked).toBeCalledWith(true);
ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
await ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
expect(callbackMocked).toBeCalledWith(true);
await ipcRenderer.send('certificate-error', webContentsMocked, urlMocked, errorMocked, certificate, callbackMocked);
done(expect(callbackMocked).toBeCalledWith(true));
});
});
});
@ -78,7 +80,7 @@ describe('dialog handler', () => {
message: `Error loading URL:\n${urlMocked}\n\n${errorDescMocked}\n\nError Code: ${errorCodeMocked}`,
};
showLoadFailure(browserWindowMocked, urlMocked, errorDescMocked, errorCodeMocked, callbackMocked, showDialogMocked);
expect(spy).toBeCalledWith({ id: 123 }, expectedValue, expect.any(Function));
expect(spy).toBeCalledWith({ id: 123 }, expectedValue);
});
it('should call `showNetworkConnectivityError` correctly', () => {
@ -97,6 +99,6 @@ describe('dialog handler', () => {
message: `Error loading URL:\n${urlMocked}\n\n${errorDescMocked}`,
};
showNetworkConnectivityError(browserWindowMocked, urlMocked, callbackMocked);
expect(spy).toBeCalledWith({ id: 123 }, expectedValue, expect.any(Function));
expect(spy).toBeCalledWith({ id: 123 }, expectedValue);
});
});

8
src/app/activity-detection.ts
View File

@ -38,7 +38,10 @@ class ActivityDetection {
private startActivityMonitor(): void {
if (app.isReady()) {
logger.info(`activity-detection: Starting activity monitor`);
this.queryInterval = setInterval(() => (electron.powerMonitor as any).querySystemIdleTime(this.activity.bind(this)), this.idleThreshold);
this.queryInterval = setInterval(() => {
const idleTime = electron.powerMonitor.getSystemIdleTime();
this.activity(idleTime);
}, this.idleThreshold);
}
}
@ -69,7 +72,8 @@ class ActivityDetection {
// when user goes inactive
this.timer = setInterval(() => {
if (app.isReady()) {
(electron.powerMonitor as any).querySystemIdleTime(this.activity.bind(this));
const activeTime = electron.powerMonitor.getSystemIdleTime();
this.activity(activeTime);
}
}, 1000);
}

16
src/app/app-menu.ts
View File

@ -188,7 +188,7 @@ export class AppMenu {
{ label: i18n.t('Services')(), role: 'services' },
this.buildSeparator(),
{ label: i18n.t('Hide Symphony')(), role: 'hide' },
{ label: i18n.t('Hide Others')(), role: 'hideothers' },
{ label: i18n.t('Hide Others')(), role: 'hideOthers' },
{ label: i18n.t('Show All')(), role: 'unhide' },
this.buildSeparator(),
{ label: i18n.t('Quit Symphony')(), role: 'quit' },
@ -211,9 +211,9 @@ export class AppMenu {
this.assignRoleOrLabel({ role: 'cut', label: i18n.t('Cut')() }),
this.assignRoleOrLabel({ role: 'copy', label: i18n.t('Copy')() }),
this.assignRoleOrLabel({ role: 'paste', label: i18n.t('Paste')() }),
this.assignRoleOrLabel({ role: 'pasteandmatchstyle', label: i18n.t('Paste and Match Style')() }),
this.assignRoleOrLabel({ role: 'pasteAndMatchStyle', label: i18n.t('Paste and Match Style')() }),
this.assignRoleOrLabel({ role: 'delete', label: i18n.t('Delete')() }),
this.assignRoleOrLabel({ role: 'selectall', label: i18n.t('Select All')() }),
this.assignRoleOrLabel({ role: 'selectAll', label: i18n.t('Select All')() }),
],
};
@ -221,8 +221,8 @@ export class AppMenu {
menu.submenu.push(this.buildSeparator(), {
label: i18n.t('Speech')(),
submenu: [
{ label: i18n.t('Start Speaking')(), role: 'startspeaking' },
{ label: i18n.t('Stop Speaking')(), role: 'stopspeaking' },
{ label: i18n.t('Start Speaking')(), role: 'startSpeaking' },
{ label: i18n.t('Stop Speaking')(), role: 'stopSpeaking' },
],
});
}
@ -242,9 +242,9 @@ export class AppMenu {
label: i18n.t('Reload')(),
},
this.buildSeparator(),
this.assignRoleOrLabel({ role: 'resetzoom', label: i18n.t('Actual Size')() }),
this.assignRoleOrLabel({ role: 'zoomin', label: i18n.t('Zoom In')() }),
this.assignRoleOrLabel({ role: 'zoomout', label: i18n.t('Zoom Out')() }),
this.assignRoleOrLabel({ role: 'resetZoom', label: i18n.t('Actual Size')() }),
this.assignRoleOrLabel({ role: 'zoomIn', label: i18n.t('Zoom In')() }),
this.assignRoleOrLabel({ role: 'zoomOut', label: i18n.t('Zoom Out')() }),
this.buildSeparator(),
this.assignRoleOrLabel({ role: 'togglefullscreen', label: i18n.t('Toggle Full Screen')() }),
],

43
src/app/dialog-handler.ts
View File

@ -53,7 +53,7 @@ let ignoreAllCertErrors = false;
* Note: the dialog is synchronous so further processing is blocked until
* user provides a response.
*/
electron.app.on('certificate-error', (event, webContents, url, error, _certificate, callback) => {
electron.app.on('certificate-error', async (event, webContents, url, error, _certificate, callback) => {
// TODO: Add logic verify custom certificate
if (ignoreAllCertErrors) {
@ -65,7 +65,7 @@ electron.app.on('certificate-error', (event, webContents, url, error, _certifica
logger.warn(`Certificate error: ${error} for url: ${url}`);
const browserWin = electron.BrowserWindow.fromWebContents(webContents);
const buttonId = electron.dialog.showMessageBox(browserWin, {
const { response } = await electron.dialog.showMessageBox(browserWin, {
type: 'warning',
buttons: [
i18n.t('Allow')(),
@ -81,11 +81,11 @@ electron.app.on('certificate-error', (event, webContents, url, error, _certifica
event.preventDefault();
if (buttonId === 2) {
if (response === 2) {
ignoreAllCertErrors = true;
}
callback(buttonId !== 1);
callback(response !== 1);
});
/**
@ -98,7 +98,7 @@ electron.app.on('certificate-error', (event, webContents, url, error, _certifica
* @param retryCallback {function} Callback when user clicks reload
* @param showDialog {Boolean} Indicates if a dialog need to be show to a user
*/
export const showLoadFailure = (browserWindow: Electron.BrowserWindow, url: string, errorDesc: string, errorCode: number, retryCallback: () => void, showDialog: boolean): void => {
export const showLoadFailure = async (browserWindow: Electron.BrowserWindow, url: string, errorDesc: string, errorCode: number, retryCallback: () => void, showDialog: boolean): Promise<void> => {
let message = url ? `${i18n.t('Error loading URL')()}:\n${url}` : i18n.t('Error loading window')();
if (errorDesc) {
message += `\n\n${errorDesc}`;
@ -107,16 +107,8 @@ export const showLoadFailure = (browserWindow: Electron.BrowserWindow, url: stri
message += `\n\nError Code: ${errorCode}`;
}
// async handle of user input
const response = (buttonId: number): void => {
// retry if hitting button index 0 (i.e., reload)
if (buttonId === 0 && typeof retryCallback === 'function') {
retryCallback();
}
};
if (showDialog) {
electron.dialog.showMessageBox(browserWindow, {
const { response } = await electron.dialog.showMessageBox(browserWindow, {
type: 'error',
buttons: [ i18n.t('Reload')(), i18n.t('Ignore')() ],
defaultId: 0,
@ -124,7 +116,13 @@ export const showLoadFailure = (browserWindow: Electron.BrowserWindow, url: stri
noLink: true,
title: i18n.t('Loading Error')(),
message,
}, response);
});
// async handle of user input
// retry if hitting button index 0 (i.e., reload)
if (response === 0 && typeof retryCallback === 'function') {
retryCallback();
}
}
logger.warn(`Load failure msg: ${errorDesc} errorCode: ${errorCode} for url: ${url}`);
@ -148,7 +146,7 @@ export const showNetworkConnectivityError = (browserWindow: Electron.BrowserWind
*
* @param isNativeStyle {boolean}
*/
export const titleBarChangeDialog = (isNativeStyle: boolean) => {
export const titleBarChangeDialog = async (isNativeStyle: boolean) => {
const focusedWindow = electron.BrowserWindow.getFocusedWindow();
if (!focusedWindow || !windowExists(focusedWindow)) {
return;
@ -161,11 +159,10 @@ export const titleBarChangeDialog = (isNativeStyle: boolean) => {
buttons: [ i18n.t('Relaunch')(), i18n.t('Cancel')() ],
cancelId: 1,
};
electron.dialog.showMessageBox(focusedWindow, options, async (index) => {
if (index === 0) {
await config.updateUserConfig({ isCustomTitleBar: isNativeStyle });
app.relaunch();
app.exit();
}
});
const { response } = await electron.dialog.showMessageBox(focusedWindow, options);
if (response === 0) {
await config.updateUserConfig({ isCustomTitleBar: isNativeStyle });
app.relaunch();
app.exit();
}
};

2
src/app/main-api-handler.ts
View File

@ -26,7 +26,7 @@ import {
* Handle API related ipc messages from renderers. Only messages from windows
* we have created are allowed.
*/
ipcMain.on(apiName.symphonyApi, (event: Electron.Event, arg: IApiArgs) => {
ipcMain.on(apiName.symphonyApi, (event: Electron.IpcMainEvent, arg: IApiArgs) => {
if (!isValidWindow(BrowserWindow.fromWebContents(event.sender))) {
logger.error(`main-api-handler: invalid window try to perform action, ignoring action`, arg.cmd);
return;

2
src/app/reports-handler.ts
View File

@ -67,7 +67,7 @@ export const exportLogs = (): void => {
const FILE_EXTENSIONS = [ '.log' ];
const MAC_LOGS_PATH = '/Library/Logs/Symphony/';
const LINUX_LOGS_PATH = '/.config/Symphony/';
const WINDOWS_LOGS_PATH = '\\AppData\\Roaming\\Symphony\\logs';
const WINDOWS_LOGS_PATH = '\\AppData\\Local\\Symphony\\Symphony\\logs';
const logsPath = isMac ? MAC_LOGS_PATH : isLinux ? LINUX_LOGS_PATH : WINDOWS_LOGS_PATH;
const source = app.getPath('home') + logsPath;

31
src/app/window-handler.ts
View File

@ -240,23 +240,22 @@ export class WindowHandler {
}
});
this.mainWindow.webContents.on('crashed', (_event: Event, killed: boolean) => {
this.mainWindow.webContents.on('crashed', async (_event: Event, killed: boolean) => {
if (killed) {
logger.info(`window-handler: main window crashed (killed)!`);
return;
}
logger.info(`window-handler: main window crashed!`);
electron.dialog.showMessageBox({
const { response } = await electron.dialog.showMessageBox({
type: 'error',
title: i18n.t('Renderer Process Crashed')(),
message: i18n.t('Oops! Looks like we have had a crash. Please reload or close this window.')(),
buttons: ['Reload', 'Close'],
}, (index: number) => {
if (!this.mainWindow || !windowExists(this.mainWindow)) {
return;
}
index === 0 ? this.mainWindow.reload() : this.mainWindow.close();
});
if (!this.mainWindow || !windowExists(this.mainWindow)) {
return;
}
response === 0 ? this.mainWindow.reload() : this.mainWindow.close();
});
// Handle main window close
@ -551,7 +550,7 @@ export class WindowHandler {
}
this.basicAuthWindow.webContents.send('basic-auth-data', {hostname, isValidCredentials: isMultipleTries});
});
const closeBasicAuth = (shouldClearSettings = true) => {
const closeBasicAuth = (_event, shouldClearSettings = true) => {
if (shouldClearSettings) {
clearSettings();
}
@ -564,7 +563,7 @@ export class WindowHandler {
const login = (_event, arg) => {
const {username, password} = arg;
callback(username, password);
closeBasicAuth(false);
closeBasicAuth(null, false);
};
this.basicAuthWindow.once('close', () => {
@ -822,7 +821,7 @@ export class WindowHandler {
* Check if build is expired and show an error message
* @param browserWindow Focused window instance
*/
private checkExpiry(browserWindow: BrowserWindow) {
private async checkExpiry(browserWindow: BrowserWindow) {
logger.info(`window handler: calling ttl handler to check for build expiry!`);
const buildExpired = checkIfBuildExpired();
if (!buildExpired) {
@ -830,21 +829,19 @@ export class WindowHandler {
return;
}
logger.info(`window handler: build expired, will inform the user and quit the app!`);
const response = (resp: number) => {
if (resp === 0) {
electron.app.exit();
}
};
const options = {
type: 'error',
title: i18n.t('Build expired')(),
message: i18n.t('Sorry, this is a test build and it has expired. Please contact your administrator to get a production build.')(),
buttons: [i18n.t('Quit')()],
buttons: [ i18n.t('Quit')() ],
cancelId: 0,
};
electron.dialog.showMessageBox(browserWindow, options, response);
const { response } = await electron.dialog.showMessageBox(browserWindow, options);
if (response === 0) {
electron.app.exit();
}
}
/**

8
src/app/window-utils.ts
View File

@ -71,7 +71,7 @@ export const preventWindowNavigation = (browserWindow: BrowserWindow, isPopOutWi
electron.dialog.showMessageBox(browserWindow, {
type: 'warning',
buttons: [ 'OK' ],
title: i18n.t('Not Allowed'),
title: i18n.t('Not Allowed')(),
message: `${i18n.t(`Sorry, you are not allowed to access this website`)} (${winUrl}), ${i18n.t('please contact your administrator for more details')}`,
});
}
@ -341,9 +341,9 @@ export const downloadManagerAction = (type, filePath): void => {
}
return;
}
const showResponse = electron.shell.showItemInFolder(filePath);
if (!showResponse) {
if (fs.existsSync(filePath)) {
electron.shell.showItemInFolder(filePath);
} else {
electron.dialog.showMessageBox(focusedWindow, {
message,
title,

12
src/common/logger.ts
View File

@ -4,7 +4,7 @@ import * as fs from 'fs';
import * as path from 'path';
import * as util from 'util';
import { isElectronQA, isLinux } from './env';
import { isElectronQA, isLinux, isWindowsOS } from './env';
import { getCommandLineArgs } from './utils';
export interface ILogMsg {
@ -22,6 +22,16 @@ interface IClientLogMsg {
const MAX_LOG_QUEUE_LENGTH = 100;
// Force log path to local path in Windows rather than roaming
if (isWindowsOS && process.env.LOCALAPPDATA) {
app.setPath('appData', process.env.LOCALAPPDATA);
app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
}
// Electron wants this to be called initially before calling
// app.getPath('logs')
app.setAppLogsPath();
class Logger {
private readonly showInConsole: boolean = false;
private readonly desiredLogLevel?: LogLevel;

1
tsconfig.json
View File

@ -6,6 +6,7 @@
"resolveJsonModule": true,
"jsx": "react",
"outDir": "lib",
"rootDir": ".",
"lib": [
"es2016",
"dom"