New eslint fixes

packages/backend/classic_level.cjs

@@ -22,7 +22,9 @@ if (!exists && process.platform === 'android') {
 }
 
 if (!exists) {
-  throw new Error(`Unfortunately we do not support this platform! There is no classic_level bindings binary for ${process.platform}-${process.arch}`)
+  throw new Error(
+    `Unfortunately we do not support this platform! There is no classic_level bindings binary for ${process.platform}-${process.arch}`
+  )
 }
 
 bindings = require(binaryPath)

packages/backend/src/backendManager.ts

@@ -8,16 +8,16 @@ const log = logger('backendManager')
 const program = new Command()
 
 program
-.option('-p, --platform <platform>', 'platform')
-.option('-dpth, --dataPath <dataPath>', 'data directory path')
-.option('-dprt, --dataPort <dataPort>', 'data port')
-.option('-t, --torBinary <torBinary>', 'tor binary path')
-.option('-ac, --authCookie <authCookie>', 'tor authentication cookie')
-.option('-cp, --controlPort <controlPort>', 'tor control port')
-.option('-htp, --httpTunnelPort <httpTunnelPort>', 'http tunnel port')
-.option('-a, --appDataPath <string>', 'Path of application data directory')
-.option('-d, --socketIOPort <number>', 'Socket io data server port')
-.option('-r, --resourcesPath <string>', 'Application resources path')
+  .option('-p, --platform <platform>', 'platform')
+  .option('-dpth, --dataPath <dataPath>', 'data directory path')
+  .option('-dprt, --dataPort <dataPort>', 'data port')
+  .option('-t, --torBinary <torBinary>', 'tor binary path')
+  .option('-ac, --authCookie <authCookie>', 'tor authentication cookie')
+  .option('-cp, --controlPort <controlPort>', 'tor control port')
+  .option('-htp, --httpTunnelPort <httpTunnelPort>', 'http tunnel port')
+  .option('-a, --appDataPath <string>', 'Path of application data directory')
+  .option('-d, --socketIOPort <number>', 'Socket io data server port')
+  .option('-r, --resourcesPath <string>', 'Application resources path')
 
 program.parse(process.argv)
 const options = program.opts()
@@ -40,12 +40,12 @@ export const runBackendDesktop = async () => {
     torResourcesPath: torDirForPlatform(resourcesPath),
     options: {
       env: {
-        appDataPath: path.join(options.appDataPath.trim(), 'Quiet')
-      }
-    }
+        appDataPath: path.join(options.appDataPath.trim(), 'Quiet'),
+      },
+    },
   })
 
-  process.on('message', async (message) => {
+  process.on('message', async message => {
     if (message === 'close') {
       try {
         await connectionsManager.closeAllServices()
@@ -80,10 +80,10 @@ export const runBackendMobile = async (): Promise<any> => {
     torBinaryPath: options.torBinary ? options.torBinary : null,
     options: {
       env: {
-        appDataPath: options.dataPath
+        appDataPath: options.dataPath,
       },
-      createPaths: false
-    }
+      createPaths: false,
+    },
   })
 
   await connectionsManager.init()
@@ -97,11 +97,13 @@ if (platform === 'desktop') {
     throw error
   })
 } else if (platform === 'mobile') {
-  runBackendMobile().catch(async (error) => {
+  runBackendMobile().catch(async error => {
     log.error('Error occurred while initializing backend', error)
     // Prevent stopping process before getting output
-    await new Promise<void>((resolve) => {
-      setTimeout(() => { resolve() }, 10000)
+    await new Promise<void>(resolve => {
+      setTimeout(() => {
+        resolve()
+      }, 10000)
     })
     throw error
   })

packages/backend/src/common/testUtils.ts

@@ -15,7 +15,7 @@ import {
   getPorts,
   type Ports,
   torBinForPlatform,
-  torDirForPlatform
+  torDirForPlatform,
 } from './utils'
 import crypto from 'crypto'
 import logger from '../logger'
@@ -27,16 +27,21 @@ export const rootPermsData: PermsData = {
   certificate:
     'MIIBNjCB3AIBATAKBggqhkjOPQQDAjASMRAwDgYDVQQDEwdaYmF5IENBMCYYEzIwMjEwNjIyMDkzMDEwLjAyNVoYDzIwMzAwMTMxMjMwMDAwWjASMRAwDgYDVQQDEwdaYmF5IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV5a3Czy+L7IfVX0FpJtSF5mi0GWGrtPqv5+CFSDPrHXijsxWdPTobR1wk8uCLP4sAgUbs/bIleCxQy41kSSyOaMgMB4wDwYDVR0TBAgwBgEB/wIBAzALBgNVHQ8EBAMCAAYwCgYIKoZIzj0EAwIDSQAwRgIhAPOzksuipKyBALt/o8O/XwsrVSzfSHXdAR4dOWThQ1lbAiEAmKqjhsmf50kxWX0ekhbAeCTjcRApXhjnslmJkIFGF2o=+lmBImw3BMNjA0FTlK5iRmVC+w/T6M04Es+yiYL608vOhx2slnoyAwHjAPBgNVHRMECDAGAQH/AgEDMAsGA1UdDwQEAwIABjAKBggqhkjOPQQDAgNIADBFAiEA+0kIz0ny/PLVERTcL0+KCpsztyA6Zuwzj05VW5NMdx0CICgdzf0lg0/2Ksl1AjSPYsy2w+Hn09PGlBnD7TiExBpx',
   privKey:
-    'MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgTvNuJL0blaYq6zmFS53WmmOfHshlqn+8wNHDzo4df5WgCgYIKoZIzj0DAQehRANCAARXlrcLPL4vsh9VfQWkm1IXmaLQZYau0+q/n4IVIM+sdeKOzFZ09OhtHXCTy4Is/iwCBRuz9siV4LFDLjWRJLI5+lmBImw3BMNjA0FTlK5iRmVC+w/T6M04Es+yiYL608vOhx2sln'
+    'MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgTvNuJL0blaYq6zmFS53WmmOfHshlqn+8wNHDzo4df5WgCgYIKoZIzj0DAQehRANCAARXlrcLPL4vsh9VfQWkm1IXmaLQZYau0+q/n4IVIM+sdeKOzFZ09OhtHXCTy4Is/iwCBRuz9siV4LFDLjWRJLI5+lmBImw3BMNjA0FTlK5iRmVC+w/T6M04Es+yiYL608vOhx2sln',
 }
 
 tmp.setGracefulCleanup()
 
 export const testBootstrapMultiaddrs = [
-  createLibp2pAddress('abcd.onion', 'QmfLUJcDSLVYnNqSPSRK4mKG8MGw51m9K2v59k3yq1C8s4')
+  createLibp2pAddress('abcd.onion', 'QmfLUJcDSLVYnNqSPSRK4mKG8MGw51m9K2v59k3yq1C8s4'),
 ]
 
-export const spawnTorProcess = async (quietDirPath: string, ports?: Ports, extraTorProcessParams?: TorParams, binName?: string): Promise<Tor> => {
+export const spawnTorProcess = async (
+  quietDirPath: string,
+  ports?: Ports,
+  extraTorProcessParams?: TorParams,
+  binName?: string
+): Promise<Tor> => {
   const _ports = ports || (await getPorts())
   const torPath = torBinForPlatform(undefined, binName)
   const libPath = torDirForPlatform()
@@ -47,11 +52,11 @@ export const spawnTorProcess = async (quietDirPath: string, ports?: Ports, extra
     options: {
       env: {
         LD_LIBRARY_PATH: libPath,
-        HOME: quietDirPath
+        HOME: quietDirPath,
       },
-      detached: true
+      detached: true,
     },
-    extraTorProcessParams
+    extraTorProcessParams,
   })
   return tor
 }
@@ -69,11 +74,11 @@ export const createLibp2p = async (peerId: PeerId): Promise<Libp2p> => {
     cert: pems.userCert,
     key: pems.userKey,
     ca: [pems.ca],
-    targetPort: port
+    targetPort: port,
   })
 }
 
-export const createTmpDir = (prefix: string = 'quietTestTmp_'): tmp.DirResult => {
+export const createTmpDir = (prefix = 'quietTestTmp_'): tmp.DirResult => {
   return tmp.dirSync({ mode: 0o750, prefix, unsafeCleanup: true })
 }
 

packages/backend/src/common/types.ts

@@ -16,7 +16,7 @@ export type ChannelInfoResponse = Record<string, PublicChannel>
 export class StorageOptions {
   orbitDbDir?: string
   ipfsDir?: string
-  createPaths: boolean = true
+  createPaths = true
 }
 
 export interface IPublicKey {

packages/backend/src/common/utils.test.ts

@@ -1,23 +1,31 @@
 import mock from 'mock-fs'
 import path from 'path'
 import { beforeEach, describe, it, expect, afterEach } from '@jest/globals'
-const { getFilesRecursively, removeFiles, getDirsRecursively, removeDirs, compare, getUsersAddresses, createLibp2pAddress } = await import ('./utils')
+const {
+  getFilesRecursively,
+  removeFiles,
+  getDirsRecursively,
+  removeDirs,
+  compare,
+  getUsersAddresses,
+  createLibp2pAddress,
+} = await import('./utils')
 
 beforeEach(() => {
   mock({
     Quiet: {
       'some-file.txt': 'file content here',
       IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn: {
         pins: {
-          LOCK: 'some data'
+          LOCK: 'some data',
         },
-        'repo.lock': {}
+        'repo.lock': {},
       },
       OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn: {
-        LOCK: 'some data'
-      }
+        LOCK: 'some data',
+      },
     },
-    'some/empty/dir': {}
+    'some/empty/dir': {},
   })
 })
 
@@ -33,7 +41,7 @@ describe('Get files and dirs', () => {
     expect(arr).toEqual([
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/pins/LOCK',
       'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/LOCK',
-      'Quiet/some-file.txt'
+      'Quiet/some-file.txt',
     ])
   })
 
@@ -45,7 +53,7 @@ describe('Get files and dirs', () => {
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/pins',
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/repo.lock',
-      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn'
+      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
     ])
   })
 
@@ -64,15 +72,13 @@ describe('Remove files and dirs', () => {
     expect(arr).toEqual([
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/pins/LOCK',
       'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/LOCK',
-      'Quiet/some-file.txt'
+      'Quiet/some-file.txt',
     ])
     removeFiles('Quiet', 'LOCK')
     arr = []
     getFilesRecursively('Quiet', arr)
     arr = arr.map(e => e.split(path.sep).join(path.posix.sep))
-    expect(arr).toEqual([
-      'Quiet/some-file.txt'
-    ])
+    expect(arr).toEqual(['Quiet/some-file.txt'])
   })
 
   it('Remove directories by name', () => {
@@ -83,7 +89,7 @@ describe('Remove files and dirs', () => {
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/pins',
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/repo.lock',
-      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn'
+      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
     ])
     removeDirs('Quiet', 'repo.lock')
     arr = []
@@ -92,11 +98,13 @@ describe('Remove files and dirs', () => {
     expect(arr).toEqual([
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
       'Quiet/IpfsQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn/pins',
-      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn'
+      'Quiet/OrbitDBQmQ18tV1dfGsEH8sCnbnzaYpMpb1QyCEjJ2KW96YtZ2MUn',
     ])
   })
   it("No error if directory doesn't exist", () => {
-    expect(() => { removeFiles('LOCK', 'non/existent/dir') }).not.toThrow()
+    expect(() => {
+      removeFiles('LOCK', 'non/existent/dir')
+    }).not.toThrow()
   })
 })
 
@@ -120,11 +128,11 @@ describe('Compare actual and reported file size', () => {
 it('Gets users addresses based on user data', async () => {
   const userData = [
     { onionAddress: '12345.onion', peerId: '54321', dmPublicKey: '324530833893', username: 'Bob' },
-    { onionAddress: '67890.onion', peerId: '09876', dmPublicKey: '098830987898', username: 'Alice' }
+    { onionAddress: '67890.onion', peerId: '09876', dmPublicKey: '098830987898', username: 'Alice' },
   ]
   const addresses = await getUsersAddresses(userData)
   expect(addresses).toStrictEqual([
     createLibp2pAddress(userData[0].onionAddress, userData[0].peerId),
-    createLibp2pAddress(userData[1].onionAddress, userData[1].peerId)
+    createLibp2pAddress(userData[1].onionAddress, userData[1].peerId),
   ])
 })

packages/backend/src/common/utils.ts

@@ -47,7 +47,7 @@ export const removeFiles = (appPath: string, filename: string) => {
   if (!fs.existsSync(appPath)) return
   const IpfsAndOrbitDb = fs.readdirSync(appPath).filter(i => i.startsWith('Ipfs') || i.startsWith('OrbitDB'))
   const files: string[] = []
-  IpfsAndOrbitDb.forEach((e) => {
+  IpfsAndOrbitDb.forEach(e => {
     const directory = path.resolve(appPath, e)
     getFilesRecursively(directory, files)
   })
@@ -74,7 +74,7 @@ export const removeDirs = (appPath: string, filename: string) => {
   if (!fs.existsSync(appPath)) return
   const IpfsAndOrbitDb = fs.readdirSync(appPath).filter(i => i.startsWith('Ipfs'))
   const dirs: string[] = []
-  IpfsAndOrbitDb.forEach((e) => {
+  IpfsAndOrbitDb.forEach(e => {
     const directory = path.resolve(appPath, e)
     getDirsRecursively(directory, dirs)
   })
@@ -96,7 +96,7 @@ export const getPorts = async (): Promise<Ports> => {
     libp2pHiddenService,
     controlPort,
     dataServer,
-    httpTunnelPort
+    httpTunnelPort,
   }
 }
 
@@ -111,7 +111,7 @@ export class DummyIOServer extends Server {
   }
 }
 
-export const torBinForPlatform = (basePath: string = '', binName: string = 'tor'): string => {
+export const torBinForPlatform = (basePath = '', binName = 'tor'): string => {
   if (process.env.BACKEND === 'mobile') {
     return basePath
   }
@@ -156,7 +156,7 @@ export const getUsersAddresses = async (users: User[]): Promise<string[]> => {
  *
  * @param tolerance In percentage (0.0 - 1.0)
  */
-export const compare = (given: number, base: number, tolerance: number = 0) => {
+export const compare = (given: number, base: number, tolerance = 0) => {
   const margin = base * tolerance
   const min = base - margin
   const max = base + margin

packages/backend/src/constants.ts

@@ -5,7 +5,7 @@ export enum Config {
   QUIET_DIR = '.quiet',
   PEER_ID_FILENAME = 'peerIdKey',
   ORBIT_DB_DIR = 'OrbitDB',
-  IPFS_REPO_PATH = 'QuietChannels'
+  IPFS_REPO_PATH = 'QuietChannels',
 }
 
 export const QUIET_DIR_PATH = path.join(os.homedir(), Config.QUIET_DIR)

packages/backend/src/index.ts

@@ -12,7 +12,7 @@ export default {
   Tor,
   DataServer,
   ConnectionsManager,
-  version
+  version,
 }
 
 export * from './common/utils'