Merge remote-tracking branch 'upstream/master' into dev

Author: Bilb

_locales/en/messages.json

@@ -1076,6 +1076,7 @@
   "unavailable": "Unavailable",
   "undo": "Undo",
   "unknown": "Unknown",
+  "unsupportedCpu": "Unsupported CPU",
   "updateApp": "App updates",
   "updateCommunityInformation": "Update Community Information",
   "updateCommunityInformationDescription": "Community name and description are visible to all community members",
@@ -1124,6 +1125,7 @@
   "you": "You",
   "yourRecoveryPassword": "Your Recovery Password",
   "zoomFactor": "Zoom Factor",
-  "zoomFactorDescription": "Adjust the size of text and visual elements."
+  "zoomFactorDescription": "Adjust the size of text and visual elements.",
+  "yourCpuIsUnsupportedSSE42": "Your CPU does not support SSE 4.2 instructions, which are required by Session on Linux x64 operating systems to process images. Please upgrade to a compatible CPU or use a different operating system."
 }
 

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.16.6",
+  "version": "1.16.10",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",
@@ -110,7 +110,7 @@
     "rimraf": "6.0.1",
     "sanitize.css": "^12.0.1",
     "semver": "^7.7.1",
-    "sharp": "^0.34.3",
+    "sharp": "^0.34.4",
     "styled-components": "^6.1.15",
     "uuid": "11.1.0",
     "viem": "^2.26.0",

ts/mains/main_node.ts

@@ -7,6 +7,8 @@
 import {
   app,
   BrowserWindow,
+  crashReporter,
+  dialog,
   protocol as electronProtocol,
   ipcMain as ipc,
   ipcMain,
@@ -152,6 +154,27 @@ if (!process.mas) {
   }
 }
 
+/**
+ * Starts the crash reporter, which saves crashes to disk.
+ * The dumps will be saved in the `userData/CrashPad/pending` directory.
+ *
+ *  The minidumps can be read using the `minidump_stackwalk` tool.
+ * If you do not have cargo installed, you can do those steps:
+ * ```bash
+ * git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+ * cd depot_tools
+ * mkdir breakpad && cd breakpad
+ * ../fetch breakpad && cd src
+ * ./configure && make
+ * file src/processor/minidump_stackwalk
+ * ./src/processor/minidump_stackwalk <path_to.dmp> <any_symbols_you_have_optional>
+ */
+crashReporter.start({
+  submitURL: '', // leave empty as we don't want to upload them, but only save them locally
+  uploadToServer: false,
+  compress: true,
+});
+
 const windowFromUserConfig = userConfig.get('window');
 const windowFromEphemeral = ephemeralConfig.get('window');
 let windowConfig = windowFromEphemeral || windowFromUserConfig;
@@ -177,6 +200,9 @@ import { initializeMainProcessLogger } from '../util/logger/main_process_logging
 import * as log from '../util/logger/log';
 import { DURATION } from '../session/constants';
 import { tr } from '../localization/localeTools';
+import { isSharpSupported } from '../node/sharp_support/sharpSupport';
+
+import { logCrash } from '../node/crash/log_crash';
 
 function prepareURL(pathSegments: Array<string>, moreKeys?: { theme: any }) {
   const urlObject: url.UrlObject = {
@@ -200,6 +226,11 @@ function prepareURL(pathSegments: Array<string>, moreKeys?: { theme: any }) {
   return url.format(urlObject);
 }
 
+async function showUnsupportedCpuDialog() {
+  dialog.showErrorBox(tr('unsupportedCpu'), tr('yourCpuIsUnsupportedSSE42'));
+  app.quit();
+}
+
 function handleUrl(event: any, target: string) {
   event?.preventDefault();
   const { protocol } = url.parse(target);
@@ -360,6 +391,12 @@ async function createWindow() {
   mainWindow.on('focus', setWindowFocus);
   mainWindow.on('blur', setWindowFocus);
   mainWindow.once('ready-to-show', setWindowFocus);
+
+  mainWindow.webContents.on('render-process-gone', (_event, details) => {
+    // details.reason can be: 'crashed', 'killed', 'oom', etc.
+    logCrash('renderer', details);
+  });
+
   // This is a fallback in case we drop an event for some reason.
   global.setInterval(setWindowFocus, 5000);
 
@@ -739,6 +776,11 @@ app.on('ready', async () => {
     console.log(`crowdin locale is ${loadedLocale.crowdinLocale}`);
   }
 
+  if (!isSharpSupported()) {
+    await showUnsupportedCpuDialog();
+    return;
+  }
+
   const key = getDefaultSQLKey();
   // Try to show the main window with the default key
   // If that fails then show the password window

ts/node/crash/log_crash.ts

@@ -0,0 +1,13 @@
+import { app } from 'electron';
+import { appendFileSync } from 'fs-extra';
+import path from 'node:path';
+
+/**
+ * Logs a crash of the renderer/main process to the userData directory, file `crash-log.txt`.
+ * Also, see the crashReporter for dumps of the crash itself
+ */
+export function logCrash(type: string, details: any) {
+  const crashLogPath = path.join(app.getPath('userData'), 'crash-log.txt');
+  const logLine = `[${new Date().toISOString()}] ${type} crash: ${JSON.stringify(details)}\n`;
+  appendFileSync(crashLogPath, logLine, 'utf8');
+}

ts/node/global_errors.ts

@@ -3,6 +3,7 @@ import os from 'node:os';
 import { reallyJsonStringify } from '../util/reallyJsonStringify';
 import { Errors } from '../types/Errors';
 import { redactAll } from '../util/privacy';
+import { logCrash } from './crash/log_crash';
 
 // TODO: use localised strings
 const quitText = 'Quit';
@@ -53,10 +54,14 @@ export const addHandler = (): void => {
   // Note: we could maybe add a handler for when the renderer process died here?
   // (but also ignore the valid death like on restart/quit)
   process.on('uncaughtException', (reason: unknown) => {
+    logCrash('main', { reason: 'uncaughtException', error: reason });
+
     handleError('Unhandled Error', _getError(reason));
   });
 
   process.on('unhandledRejection', (reason: unknown) => {
+    logCrash('main', { reason: 'unhandledRejection', error: reason });
+
     handleError('Unhandled Promise Rejection', _getError(reason));
   });
 };

ts/node/sharp_support/sharpSupport.ts

@@ -0,0 +1,61 @@
+import { readFileSync } from 'fs';
+import { isLinux } from '../../OS';
+
+/**
+ * The return of this function should be used as override of `sse42FromCPUInfo` if different than null.
+ * Used for testing purposes.
+ * @returns true when process.env.SESSION_SSE42_OVERRIDE === '1', false when process.env.SESSION_SSE42_OVERRIDE === '0', null otherwise
+ */
+function overrideSSE42IsSupported() {
+  if (process.env.SESSION_SSE42_OVERRIDE === '1') {
+    return true;
+  }
+
+  if (process.env.SESSION_SSE42_OVERRIDE === '0') {
+    return false;
+  }
+  return null;
+}
+
+/**
+ * Checks from /proc/cpuinfo if the CPU supports SSE 4.2 instructions.
+ */
+function sse42FromCPUInfo() {
+  try {
+    const cpuinfo = readFileSync('/proc/cpuinfo', 'utf8');
+    const flagsMatch = cpuinfo.match(/flags\s*:\s*(.+)/m);
+
+    if (flagsMatch) {
+      const flags = flagsMatch[1].split(/\s+/);
+
+      const sseFlagFound = flags.includes('sse4_2');
+      console.info('SSE 4.2 flag found:', sseFlagFound);
+      return sseFlagFound;
+    }
+    return false;
+  } catch (error) {
+    console.warn('Could not read /proc/cpuinfo:', error);
+    return false;
+  }
+}
+
+function isLinuxX64() {
+  return isLinux() && process.arch === 'x64';
+}
+
+/**
+ * Returns true if sharp is supported on the current platform.
+ * On linux x64, the CPU needs to support SSE 4.2 instructions to process images.
+ * This function checks if we are on linux x64 and if yes, checks `/proc/cpuinfo` for the SSE 4.2 flag.
+ */
+export function isSharpSupported() {
+  const sse42Override = overrideSSE42IsSupported();
+  if (sse42Override !== null) {
+    return sse42Override;
+  }
+  if (isLinuxX64()) {
+    return sse42FromCPUInfo();
+  }
+  // sharp doesn't need sse42 on other platforms than linux x64 as of 18/09/2025
+  return true;
+}

ts/session/utils/job_runners/JobDeserialization.ts

@@ -6,25 +6,50 @@ import {
 import { AvatarDownload } from './jobs/AvatarDownloadJob';
 import { UserSync } from './jobs/UserSyncJob';
 import { PersistedJob, TypeOfPersistedData } from './PersistedJob';
+import { assertUnreachable } from '../../../types/sqlSharedTypes';
+import { AvatarMigrate } from './jobs/AvatarMigrateJob';
+import { FetchMsgExpirySwarm } from './jobs/FetchMsgExpirySwarmJob';
+import { GroupInvite } from './jobs/GroupInviteJob';
+import { GroupPendingRemovals } from './jobs/GroupPendingRemovalsJob';
+import { GroupSync } from './jobs/GroupSyncJob';
+import { UpdateMsgExpirySwarm } from './jobs/UpdateMsgExpirySwarmJob';
 
 export function persistedJobFromData<T extends TypeOfPersistedData>(
   data: T
 ): PersistedJob<T> | null {
   if (!data || isEmpty(data.jobType) || !isString(data?.jobType)) {
     return null;
   }
+  const { jobType } = data;
 
-  switch (data.jobType) {
+  switch (jobType) {
     case 'UserSyncJobType':
       return new UserSync.UserSyncJob(data) as unknown as PersistedJob<T>;
     case 'AvatarDownloadJobType':
       return new AvatarDownload.AvatarDownloadJob(data) as unknown as PersistedJob<T>;
+    case 'AvatarMigrateJobType':
+      return new AvatarMigrate.AvatarMigrateJob(data) as unknown as PersistedJob<T>;
+    case 'FetchMsgExpirySwarmJobType':
+      return new FetchMsgExpirySwarm.FetchMsgExpirySwarmJob(data) as unknown as PersistedJob<T>;
+    case 'GroupInviteJobType':
+      return new GroupInvite.GroupInviteJob(data) as unknown as PersistedJob<T>;
+    case 'GroupPendingRemovalJobType':
+      return new GroupPendingRemovals.GroupPendingRemovalsJob(data) as unknown as PersistedJob<T>;
+    case 'GroupSyncJobType':
+      return new GroupSync.GroupSyncJob(data) as unknown as PersistedJob<T>;
+    case 'UpdateMsgExpirySwarmJobType':
+      return new UpdateMsgExpirySwarm.UpdateMsgExpirySwarmJob(data) as unknown as PersistedJob<T>;
+
     case 'FakeSleepForJobType':
       return new FakeSleepForJob(data) as unknown as PersistedJob<T>;
     case 'FakeSleepForJobMultiType':
       return new FakeSleepForMultiJob(data) as unknown as PersistedJob<T>;
     default:
-      window?.log?.error('unknown persisted job type:', (data as any).jobType);
+      try {
+        assertUnreachable(jobType, `persistedJobFromData unknown job type: "${jobType}"`);
+      } catch (e) {
+        window?.log?.warn('assertUnreachable failed:', e.message);
+      }
       return null;
   }
 }

ts/session/utils/job_runners/JobRunner.ts

@@ -8,7 +8,6 @@ import {
   FetchMsgExpirySwarmPersistedData,
   GroupInvitePersistedData,
   GroupPendingRemovalsPersistedData,
-  GroupPromotePersistedData,
   GroupSyncPersistedData,
   PersistedJob,
   RunJobResult,
@@ -390,11 +389,6 @@ const avatarMigrateRunner = new PersistedJobRunner<AvatarMigratePersistedData>('
 
 const groupInviteJobRunner = new PersistedJobRunner<GroupInvitePersistedData>('GroupInviteJob', 4);
 
-const groupPromoteJobRunner = new PersistedJobRunner<GroupPromotePersistedData>(
-  'GroupPromoteJob',
-  4
-);
-
 const groupPendingRemovalJobRunner = new PersistedJobRunner<GroupPendingRemovalsPersistedData>(
   'GroupPendingRemovalJob',
   4
@@ -416,6 +410,5 @@ export const runners = {
   avatarDownloadRunner,
   avatarMigrateRunner,
   groupInviteJobRunner,
-  groupPromoteJobRunner,
   groupPendingRemovalJobRunner,
 };

ts/session/utils/job_runners/PersistedJob.ts

@@ -7,7 +7,6 @@ export type PersistedJobType =
   | 'AvatarDownloadJobType'
   | 'AvatarMigrateJobType'
   | 'GroupInviteJobType'
-  | 'GroupPromoteJobType'
   | 'GroupPendingRemovalJobType'
   | 'FetchMsgExpirySwarmJobType'
   | 'UpdateMsgExpirySwarmJobType'
@@ -51,12 +50,6 @@ export interface GroupInvitePersistedData extends PersistedJobData {
   inviteAsAdmin: boolean;
 }
 
-export interface GroupPromotePersistedData extends PersistedJobData {
-  jobType: 'GroupPromoteJobType';
-  groupPk: GroupPubkeyType;
-  member: PubkeyType;
-}
-
 export interface GroupPendingRemovalsPersistedData extends PersistedJobData {
   jobType: 'GroupPendingRemovalJobType';
   groupPk: GroupPubkeyType;
@@ -90,7 +83,6 @@ export type TypeOfPersistedData =
   | FakeSleepForMultiJobData
   | GroupSyncPersistedData
   | GroupInvitePersistedData
-  | GroupPromotePersistedData
   | GroupPendingRemovalsPersistedData;
 
 export type AddJobCheckReturn = 'skipAddSameJobPresent' | null;

ts/session/utils/job_runners/jobs/AvatarMigrateJob.ts

@@ -234,4 +234,5 @@ async function scheduleAllAvatarMigrateJobs() {
 
 export const AvatarMigrate = {
   scheduleAllAvatarMigrateJobs,
+  AvatarMigrateJob,
 };