Merge pull request #1582 from session-foundation/fix-jobs-restore-crash

fix: make sure we restore pending jobs if not processed

Author: Bilb

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.16.6",
+  "version": "1.16.7",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",

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

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

ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts

@@ -287,4 +287,5 @@ class GroupPendingRemovalsJob extends PersistedJob<GroupPendingRemovalsPersisted
 export const GroupPendingRemovals = {
   addJob,
   getPendingRevokeParams,
+  GroupPendingRemovalsJob,
 };