Bug/Deleting general channel does't work consistently

packages/backend/src/libp2p/connectionsManager.ts

@@ -566,7 +566,7 @@ export class ConnectionsManager extends EventEmitter {
  await this.storage?.sendMessage(args.message)
  })
  this.dataServer.on(SocketActionTypes.ASK_FOR_MESSAGES, async (args: AskForMessagesPayload) => {
- await this.storage?.askForMessages(args.channelAddress, args.ids)
+ await this.storage?.askForMessages(args.channelId, args.ids)
  })
 
  // Files
@@ -595,8 +595,8 @@ export class ConnectionsManager extends EventEmitter {
  })
  this.dataServer.on(
  SocketActionTypes.SEND_DIRECT_MESSAGE,
- async (channelAddress: string, messagePayload) => {
- await this.storage?.sendDirectMessage(channelAddress, messagePayload)
+ async (channelId: string, messagePayload) => {
+ await this.storage?.sendDirectMessage(channelId, messagePayload)
  }
  )
  this.dataServer.on(
@@ -615,14 +615,14 @@ export class ConnectionsManager extends EventEmitter {
  this.dataServer.on(SocketActionTypes.CLOSE, async () => {
  await this.closeAllServices()
  })
- this.dataServer.on(SocketActionTypes.DELETE_CHANNEL, async (payload: {channel: string}) => {
+ this.dataServer.on(SocketActionTypes.DELETE_CHANNEL, async (payload: {channelId: string}) => {
  await this.storage?.deleteChannel(payload)
  })
 
  this.dataServer.on(SocketActionTypes.DELETE_FILES_FROM_CHANNEL, async (payload: DeleteFilesFromChannelSocketPayload) => {
  log('DELETE_FILES_FROM_CHANNEL : payload', payload)
  await this.deleteFilesFromChannel(payload)
- await this.deleteFilesFromTemporaryDir()
+ // await this.deleteFilesFromTemporaryDir() //crashes on mobile, will be fixes in next versions
  })
  }
 
@@ -712,7 +712,7 @@ export class ConnectionsManager extends EventEmitter {
  this.storage.on(StorageEvents.CHECK_FOR_MISSING_FILES, (payload: CommunityId) => {
  this.io.emit(SocketActionTypes.CHECK_FOR_MISSING_FILES, payload)
  })
- this.storage.on(StorageEvents.CHANNEL_DELETION_RESPONSE, (payload: any) => {
+ this.storage.on(StorageEvents.CHANNEL_DELETION_RESPONSE, (payload: {channelId: string}) => {
  console.log('emitting deleted channel event back to state manager')
  this.io.emit(SocketActionTypes.CHANNEL_DELETION_RESPONSE, payload)
  })

packages/backend/src/socket/DataServer.ts

@@ -90,15 +90,15 @@ export class DataServer extends EventEmitter {
  SocketActionTypes.SEND_DIRECT_MESSAGE,
  async (
  peerId: string,
- { channelAddress, message }: { channelAddress: string; message: string }
+ { channelId, message }: { channelId: string; message: string }
  ) => {
- this.emit(SocketActionTypes.SEND_DIRECT_MESSAGE, { channelAddress, message })
+ this.emit(SocketActionTypes.SEND_DIRECT_MESSAGE, { channelId, message })
  }
  )
  socket.on(
  SocketActionTypes.SUBSCRIBE_FOR_DIRECT_MESSAGE_THREAD,
- async (peerId: string, channelAddress: string) => {
- this.emit(SocketActionTypes.SUBSCRIBE_FOR_DIRECT_MESSAGE_THREAD, { peerId, channelAddress })
+ async (peerId: string, channelId: string) => {
+ this.emit(SocketActionTypes.SUBSCRIBE_FOR_DIRECT_MESSAGE_THREAD, { peerId, channelId })
  }
  )
  socket.on(
@@ -156,8 +156,8 @@ export class DataServer extends EventEmitter {
  log('leaving community')
  this.emit(SocketActionTypes.LEAVE_COMMUNITY)
  })
- socket.on(SocketActionTypes.DELETE_CHANNEL, async (payload: {channel: string}) => {
- log('deleting channel ', payload.channel)
+ socket.on(SocketActionTypes.DELETE_CHANNEL, async (payload: {channelId: string}) => {
+ log('deleting channel ', payload.channelId)
  this.emit(SocketActionTypes.DELETE_CHANNEL, payload)
  })
  socket.on(SocketActionTypes.DELETE_FILES_FROM_CHANNEL, async (payload: DeleteFilesFromChannelSocketPayload) => {

packages/backend/src/storage/ipfsFileManager.test.ts

@@ -56,7 +56,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -70,7 +70,7 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(1, StorageEvents.REMOVE_DOWNLOAD_STATUS, { cid: 'uploading_id' })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
+ expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelId: 'channelId', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
  )
  })
  await waitForExpect(() => {
@@ -93,7 +93,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -103,15 +103,15 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(1, StorageEvents.REMOVE_DOWNLOAD_STATUS, { cid: 'uploading_id' })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761991, width: undefined }
+ expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761991, width: undefined }
  )
  )
  })
  await waitForExpect(() => {
  expect(eventSpy).toHaveBeenNthCalledWith(3, StorageEvents.UPDATE_DOWNLOAD_PROGRESS, { cid: cid, downloadProgress: undefined, downloadState: 'hosted', mid: 'id' })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761991, width: undefined })
+ expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761991, width: undefined })
  )
  })
  })
@@ -130,7 +130,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -157,7 +157,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -167,13 +167,13 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(1, StorageEvents.REMOVE_DOWNLOAD_STATUS, { cid: 'uploading_id' })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761991, width: undefined }))
+ expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761991, width: undefined }))
  })
  await waitForExpect(() => {
  expect(eventSpy).toHaveBeenNthCalledWith(3, StorageEvents.UPDATE_DOWNLOAD_PROGRESS, { cid: cid, downloadProgress: undefined, downloadState: 'hosted', mid: 'id' })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761991, width: undefined }))
+ expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761991, width: undefined }))
  })
 
  // Downloading
@@ -212,7 +212,7 @@ describe('Ipfs file manager', () => {
  cid,
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -223,15 +223,15 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(1, StorageEvents.REMOVE_DOWNLOAD_STATUS, { cid })
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761797, width: undefined })
+ expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761797, width: undefined })
  )
  })
  await waitForExpect(() => {
  expect(eventSpy).toHaveBeenNthCalledWith(3, StorageEvents.UPDATE_DOWNLOAD_PROGRESS, { cid: cid, downloadProgress: undefined, downloadState: 'hosted', mid: 'id' }
  )
  })
  await waitForExpect(() => {
- expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-file', size: 761797, width: undefined })
+ expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.pdf', height: undefined, message: { channelId: 'channelId', id: 'id' }, name: 'test-file', size: 761797, width: undefined })
  )
  })
 
@@ -272,7 +272,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -281,13 +281,13 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(1, StorageEvents.REMOVE_DOWNLOAD_STATUS, { cid: 'uploading_id' }
  )
 
- expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
+ expect(eventSpy).toHaveBeenNthCalledWith(2, StorageEvents.UPLOADED_FILE, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelId: 'channelId', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
  )
 
  expect(eventSpy).toHaveBeenNthCalledWith(3, StorageEvents.UPDATE_DOWNLOAD_PROGRESS, { cid: cid, downloadProgress: undefined, downloadState: 'hosted', mid: 'id' }
  )
 
- expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
+ expect(eventSpy).toHaveBeenNthCalledWith(4, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelId: 'channelId', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
  )
 
  // Downloading
@@ -308,7 +308,7 @@ describe('Ipfs file manager', () => {
  expect(eventSpy).toHaveBeenNthCalledWith(7, StorageEvents.UPDATE_DOWNLOAD_PROGRESS, { cid: cid, downloadProgress: { downloaded: 15855, size: 15858, transferSpeed: 0 }, downloadState: 'completed', mid: 'id' }
  )
  }, 20000)
- expect(eventSpy).toHaveBeenNthCalledWith(8, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelAddress: 'channelAddress', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
+ expect(eventSpy).toHaveBeenNthCalledWith(8, StorageEvents.UPDATE_MESSAGE_MEDIA, expect.objectContaining({ cid: cid, ext: '.png', height: 44, message: { channelId: 'channelId', id: 'id' }, name: 'test-image', size: 15858, width: 824 })
  )
  })
  it('downloaded file matches uploaded file', async () => {
@@ -326,7 +326,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 
@@ -370,7 +370,7 @@ describe('Ipfs file manager', () => {
  cid: 'uploading_id',
  message: {
  id: 'id',
- channelAddress: 'channelAddress'
+ channelId: 'channelId'
  }
  }
 

packages/backend/src/storage/storage.test.ts

@@ -14,8 +14,9 @@ import { jest, beforeEach, describe, it, expect, afterEach, beforeAll } from '@j
 import { sleep } from '../sleep'
 import { StorageEvents } from './types'
 import type { Storage as StorageType } from './storage'
-import { ChannelMessage, Community, Identity, PublicChannel, TestMessage } from '@quiet/types'
+import { ChannelMessage, Community, Identity, MessageType, PublicChannel, TestMessage } from '@quiet/types'
 import { Store, getFactory, prepareStore, publicChannels } from '@quiet/state-manager'
+import { DateTime } from 'luxon'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -57,6 +58,23 @@ let utils: ComonUtilsModuleType
 
 jest.setTimeout(50000)
 
+const generateMessageFactoryContent = () => {
+ const obj = {
+ message: {
+ id: (Math.random() * 10 ** 18).toString(36),
+ type: MessageType.Basic,
+ message: (Math.random() * 10 ** 18).toString(36),
+ createdAt: DateTime.utc().valueOf(),
+ channelId: channel.id,
+ signature: '',
+ pubKey: ''
+ },
+ verifyAutomatically: false
+ }
+
+ return obj
+}
+
 beforeAll(async () => {
  store = prepareStore().store
  factory = await getFactory(store)
@@ -70,7 +88,7 @@ beforeAll(async () => {
  description: channel.description,
  owner: channel.owner,
  timestamp: channel.timestamp,
- address: channel.address
+ id: channel.id
  }
 
  alice = await factory.create<Identity>(
@@ -87,7 +105,8 @@ beforeAll(async () => {
  await factory.create<TestMessage>(
  'Message',
  {
- identity: alice
+ identity: alice,
+ ...generateMessageFactoryContent()
  }
  )
  ).message
@@ -170,10 +189,10 @@ describe('Channels', () => {
 
  const eventSpy = jest.spyOn(storage, 'emit')
 
- await storage.deleteChannel({ channel: channelio.address })
+ await storage.deleteChannel({ channelId: channelio.id })
 
  expect(eventSpy).toBeCalledWith('channelDeletionResponse', {
- channel: channelio.address
+ channelId: channelio.id
  })
  })
 })
@@ -312,7 +331,8 @@ describe('Certificate', () => {
  const aliceMessage = await factory.create<
  ReturnType<typeof publicChannels.actions.test_message>['payload']
  >('Message', {
- identity: alice
+ identity: alice,
+ ...generateMessageFactoryContent()
  })
 
  storage = new Storage(tmpAppDataPath, community.id, { createPaths: false })
@@ -326,7 +346,8 @@ describe('Certificate', () => {
  await storage.subscribeToChannel(channelio)
 
  const eventSpy = jest.spyOn(storage, 'emit')
- const publicChannelRepo = storage.publicChannelsRepos.get(message.channelAddress)
+ console.log('storage.publicChannelsRepos.get(message.channelId)', storage.publicChannelsRepos.get(message.channelId))
+ const publicChannelRepo = storage.publicChannelsRepos.get(message.channelId)
  expect(publicChannelRepo).not.toBeUndefined()
  // @ts-expect-error
  const db = publicChannelRepo.db
@@ -358,13 +379,16 @@ describe('Certificate', () => {
  const aliceMessage = await factory.create<
  ReturnType<typeof publicChannels.actions.test_message>['payload']
  >('Message', {
- identity: alice
+ identity: alice,
+ ...generateMessageFactoryContent()
  })
 
  const johnMessage = await factory.create<
  ReturnType<typeof publicChannels.actions.test_message>['payload']
  >('Message', {
- identity: john
+ identity: john,
+ ...generateMessageFactoryContent()
+
  })
 
  const aliceMessageWithJohnsPublicKey: ChannelMessage = {
@@ -382,7 +406,7 @@ describe('Certificate', () => {
  await storage.subscribeToChannel(channelio)
 
  const spyOnEmit = jest.spyOn(storage, 'emit')
- const publicChannelRepo = storage.publicChannelsRepos.get(message.channelAddress)
+ const publicChannelRepo = storage.publicChannelsRepos.get(message.channelId)
  expect(publicChannelRepo).not.toBeUndefined()
  // @ts-expect-error
  const db = publicChannelRepo.db
@@ -443,7 +467,7 @@ describe('Message access controller', () => {
 
  await storage.subscribeToChannel(channelio)
 
- const publicChannelRepo = storage.publicChannelsRepos.get(message.channelAddress)
+ const publicChannelRepo = storage.publicChannelsRepos.get(message.channelId)
  expect(publicChannelRepo).not.toBeUndefined()
  // @ts-expect-error
  const db = publicChannelRepo.db
@@ -468,15 +492,16 @@ describe('Message access controller', () => {
  const aliceMessage = await factory.create<
  ReturnType<typeof publicChannels.actions.test_message>['payload']
  >('Message', {
- identity: alice
+ identity: alice,
+ ...generateMessageFactoryContent()
  })
  // @ts-expect-error userCertificate can be undefined
  const johnCertificate: string = john.userCertificate
  const johnPublicKey = keyFromCertificate(parseCertificate(johnCertificate))
 
  const spoofedMessage = {
  ...aliceMessage.message,
- channelAddress: channelio.address,
+ channelId: channelio.id,
  pubKey: johnPublicKey
  }
  delete spoofedMessage.media // Media 'undefined' is not accepted by db.add
@@ -492,7 +517,7 @@ describe('Message access controller', () => {
 
  await storage.subscribeToChannel(channelio)
 
- const publicChannelRepo = storage.publicChannelsRepos.get(message.channelAddress)
+ const publicChannelRepo = storage.publicChannelsRepos.get(message.channelId)
  expect(publicChannelRepo).not.toBeUndefined()
  // @ts-expect-error
  const db = publicChannelRepo.db