Merge pull request #137 from ente-io/release

v1.6.18

.github/workflows/build.yml

@@ -15,14 +15,14 @@ jobs:
 
         steps:
             - name: Check out Git repository
-        uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   submodules: recursive
 
             - name: Install Node.js, NPM and Yarn
-        uses: actions/setup-node@v2.1.5
+              uses: actions/setup-node@v3
               with:
-          node-version: 14
+                  node-version: 16
 
             - name: Prepare for app notarization
               if: startsWith(matrix.os, 'macos')
@@ -35,8 +35,8 @@ jobs:
               if: startsWith(matrix.os, 'ubuntu')
               run: sudo apt-get install libarchive-tools
 
-      - name: Electron Builder Action
-        uses: samuelmeuli/action-electron-builder@v1.6.0
+            - name: Ente Electron Builder Action
+              uses: ente-io/action-electron-builder@v1.0.0
               with:
                   # GitHub token, automatically provided to the action
                   # (No need to define this secret in the repo settings)
@@ -55,4 +55,3 @@ jobs:
                   # setry crash reporting token
                   SENTRY_AUTH_TOKEN: ${{secrets.sentry_auth_token}}
                   USE_HARD_LINKS: false
-

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ente",
   "productName": "ente",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "private": true,
   "description": "Desktop client for ente.io",
   "main": "app/main.js",

src/utils/createWindow.ts

@@ -6,6 +6,8 @@ import { PROD_HOST_URL } from '../config';
 import { isPlatform } from './common/platform';
 import { getHideDockIconPreference } from '../services/userPreference';
 import autoLauncher from '../services/autoLauncher';
+import ElectronLog from 'electron-log';
+import { logErrorSentry } from '../services/sentry';
 
 export async function createWindow(): Promise<BrowserWindow> {
     const appImgPath = isDev
@@ -64,6 +66,20 @@ export async function createWindow(): Promise<BrowserWindow> {
             // ignore
         }
     });
+    mainWindow.webContents.on('render-process-gone', (event, details) => {
+        mainWindow.webContents.reload();
+        logErrorSentry(
+            Error('render-process-gone'),
+            'webContents event render-process-gone',
+            { details }
+        );
+        ElectronLog.log('webContents event render-process-gone', details);
+    });
+    mainWindow.webContents.on('unresponsive', () => {
+        mainWindow.webContents.forcefullyCrashRenderer();
+        ElectronLog.log('webContents event unresponsive');
+    });
+
     setTimeout(() => {
         try {
             splash.destroy();

ui

@@ -1 +1 @@
-Subproject commit 197b5f35f3588e142558636ccc1854f44b725861
+Subproject commit a698d7cba07fcc42b86401c5a843d4a038fa22af