if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disabling auto-update service and helper (#1342)

Browse Source
This commit is contained in:
Salah Benmoussati 2022-02-08 13:18:34 +01:00 committed by GitHub
parent 2c3a7c21d5
commit 52ca40cec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
installer/win/WixSharpInstaller/Symphony.cs
View File

@ -29,29 +29,31 @@ class Script
var userDataPathArgument = "--userDataPath=\"[USER_DATA_PATH]\""; var userDataPathArgument = "--userDataPath=\"[USER_DATA_PATH]\"";
File updateService = new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_service.exe"); //Disabling auto-update service
updateService.ServiceInstaller = new ServiceInstaller
{ // File updateService = new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_service.exe");
Name = "auto_update_service", // updateService.ServiceInstaller = new ServiceInstaller
DisplayName = "SDA Auto Update Service", // {
Description = "Symphony Desktop Application Auto Update Service", // Name = "auto_update_service",
FirstFailureActionType = FailureActionType.restart, // DisplayName = "SDA Auto Update Service",
SecondFailureActionType = FailureActionType.restart, // Description = "Symphony Desktop Application Auto Update Service",
ThirdFailureActionType = FailureActionType.restart, // FirstFailureActionType = FailureActionType.restart,
RestartServiceDelayInSeconds = 60, // SecondFailureActionType = FailureActionType.restart,
ResetPeriodInDays = 1, // ThirdFailureActionType = FailureActionType.restart,
ServiceSid = ServiceSid.none, // RestartServiceDelayInSeconds = 60,
ConfigureServiceTrigger = ConfigureServiceTrigger.Install, // ResetPeriodInDays = 1,
Type = SvcType.ownProcess, // ServiceSid = ServiceSid.none,
Vital = true, // ConfigureServiceTrigger = ConfigureServiceTrigger.Install,
ErrorControl = SvcErrorControl.normal, // Type = SvcType.ownProcess,
Start = SvcStartType.auto, // Vital = true,
EraseDescription = false, // ErrorControl = SvcErrorControl.normal,
Interactive = false, // Start = SvcStartType.auto,
StartOn = SvcEvent.Install, // EraseDescription = false,
StopOn = SvcEvent.InstallUninstall_Wait, // Interactive = false,
RemoveOn = SvcEvent.Uninstall_Wait, // StartOn = SvcEvent.Install,
}; // StopOn = SvcEvent.InstallUninstall_Wait,
// RemoveOn = SvcEvent.Uninstall_Wait,
// };
// Create a wixsharp project instance and assign the project name to it, and a hierarchy of all files to include // Create a wixsharp project instance and assign the project name to it, and a hierarchy of all files to include
// Files are taken from multiple locations, and not all files in each location should be included, which is why // Files are taken from multiple locations, and not all files in each location should be included, which is why
@ -72,8 +74,8 @@ class Script
Arguments = userDataPathArgument Arguments = userDataPathArgument
} }
), ),
updateService, // updateService,
new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_helper.exe"), // new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_helper.exe"),
new File(@"..\..\..\dist\win-unpacked\chrome_100_percent.pak"), new File(@"..\..\..\dist\win-unpacked\chrome_100_percent.pak"),
new File(@"..\..\..\dist\win-unpacked\chrome_200_percent.pak"), new File(@"..\..\..\dist\win-unpacked\chrome_200_percent.pak"),
new File(@"..\..\..\dist\win-unpacked\d3dcompiler_47.dll"), new File(@"..\..\..\dist\win-unpacked\d3dcompiler_47.dll"),

20
scripts/build-win64.bat
View File

@ -124,17 +124,17 @@ IF %errorlevel% neq 0 (
exit /b -1 exit /b -1
) )
call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_service.exe @REM call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_service.exe
IF %errorlevel% neq 0 ( @REM IF %errorlevel% neq 0 (
echo "Signing failed" @REM echo "Signing failed"
exit /b -1 @REM exit /b -1
) @REM )
call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_helper.exe @REM call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_helper.exe
IF %errorlevel% neq 0 ( @REM IF %errorlevel% neq 0 (
echo "Signing failed" @REM echo "Signing failed"
exit /b -1 @REM exit /b -1
) @REM )
call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\Symphony.exe call %SIGNING_FILE_PATH% ..\..\dist\win-unpacked\Symphony.exe
IF %errorlevel% neq 0 ( IF %errorlevel% neq 0 (

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

@ -17,7 +17,6 @@ import { logger } from '../common/logger';
import { activityDetection } from './activity-detection'; import { activityDetection } from './activity-detection';
import { analytics } from './analytics-handler'; import { analytics } from './analytics-handler';
import appStateHandler from './app-state-handler'; import appStateHandler from './app-state-handler';
import { autoUpdate } from './auto-update-handler';
import { getCitrixMediaRedirectionStatus } from './citrix-handler'; import { getCitrixMediaRedirectionStatus } from './citrix-handler';
import { CloudConfigDataTypes, config, ICloudConfig } from './config-handler'; import { CloudConfigDataTypes, config, ICloudConfig } from './config-handler';
import { downloadHandler } from './download-handler'; import { downloadHandler } from './download-handler';
@ -326,9 +325,9 @@ ipcMain.on(
} }
} }
break; break;
case apiCmds.autoUpdate: // case apiCmds.autoUpdate:
autoUpdate.update(arg.filename); // autoUpdate.update(arg.filename);
break; // break;
case apiCmds.aboutAppClipBoardData: case apiCmds.aboutAppClipBoardData:
if (arg.clipboard && arg.clipboardType) { if (arg.clipboard && arg.clipboardType) {
clipboard.write( clipboard.write(

2
src/common/api-interface.ts
View File

@ -47,7 +47,7 @@ export enum apiCmds {
showNotification = 'show-notification', showNotification = 'show-notification',
closeAllWrapperWindows = 'close-all-windows', closeAllWrapperWindows = 'close-all-windows',
setZoomLevel = 'set-zoom-level', setZoomLevel = 'set-zoom-level',
autoUpdate = 'auto-update', // autoUpdate = 'auto-update',
aboutAppClipBoardData = 'about-app-clip-board-data', aboutAppClipBoardData = 'about-app-clip-board-data',
closeMainWindow = 'close-main-window', closeMainWindow = 'close-main-window',
minimizeMainWindow = 'minimize-main-window', minimizeMainWindow = 'minimize-main-window',

26
src/demo/index.html
View File

@ -271,11 +271,11 @@
</table> </table>
<input type="button" id="restart-app" value="Restart App" /> <input type="button" id="restart-app" value="Restart App" />
<hr /> <!-- <hr />
<h1>Auto-update Test</h1> <h1>Auto-update Test</h1>
Full path to MSI <input type="text" id="update-file" /> Full path to MSI <input type="text" id="update-file" />
<br /> <br />
<button id="run-update">Update</button> <button id="run-update">Update</button> -->
<hr /> <hr />
<p>Native Window Handle:</p> <p>Native Window Handle:</p>
@ -334,7 +334,7 @@
getCPUUsage: 'get-cpu-usage', getCPUUsage: 'get-cpu-usage',
checkMediaPermission: 'check-media-permission', checkMediaPermission: 'check-media-permission',
restartApp: 'restart-app', restartApp: 'restart-app',
autoUpdate: 'auto-update', // autoUpdate: 'auto-update',
getNativeWindowHandle: 'get-native-window-handle', getNativeWindowHandle: 'get-native-window-handle',
getCitrixMediaRedirectionStatus: 'get-citrix-media-redirection-status', getCitrixMediaRedirectionStatus: 'get-citrix-media-redirection-status',
}; };
@ -502,16 +502,16 @@
} }
}); });
const runUpdateButton = document.getElementById('run-update'); // const runUpdateButton = document.getElementById('run-update');
runUpdateButton.addEventListener('click', () => { // runUpdateButton.addEventListener('click', () => {
const filename = document.getElementById('update-file').value; // const filename = document.getElementById('update-file').value;
if (window.ssf) { // if (window.ssf) {
const autoUpdate = new window.ssf.AutoUpdate(); // const autoUpdate = new window.ssf.AutoUpdate();
autoUpdate.update(filename); // autoUpdate.update(filename);
} else { // } else {
postMessage(apiCmds.autoUpdate, { filename: filename }); // postMessage(apiCmds.autoUpdate, { filename: filename });
} // }
}); // });
let win; let win;

6
src/renderer/app-bridge.ts
View File

@ -244,9 +244,9 @@ export class AppBridge {
response: mediaPermission, response: mediaPermission,
}); });
break; break;
case apiCmds.autoUpdate: // case apiCmds.autoUpdate:
ssf.autoUpdate(data.filename); // ssf.autoUpdate(data.filename);
break; // break;
} }
} }

12
src/renderer/ssf-api.ts
View File

@ -441,12 +441,12 @@ export class SSFApi {
/** /**
* Auto update * Auto update
*/ */
public autoUpdate(filename: string): void { // public autoUpdate(filename: string): void {
local.ipcRenderer.send(apiName.symphonyApi, { // local.ipcRenderer.send(apiName.symphonyApi, {
cmd: apiCmds.autoUpdate, // cmd: apiCmds.autoUpdate,
filename, // filename,
}); // });
} // }
/** /**
* Sets the count on the tray icon to the given number. * Sets the count on the tray icon to the given number.