2.3.3 Release (#2666)

* generate random device name instead of using mac * update snapshot and changelog * add link color contrast to changelog * Publish - @quiet/[email protected] - @quiet/[email protected] * Update packages CHANGELOG.md * deinit chain when closing * Publish - @quiet/[email protected] - @quiet/[email protected] * Update packages CHANGELOG.md * add error handling to dev tools installer * Publish - @quiet/[email protected] - @quiet/[email protected] * Update packages CHANGELOG.md
TryQuiet · Dec 20, 2024 · 5668f86 · 5668f86
1 parent f50dc56
commit 5668f86
Show file tree

Hide file tree

Showing 19 changed files with 110 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,19 @@
 
 ## [unreleased]
 
+## [2.3.3]
+
 ### New features
 
 * Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
 * Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
 * Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
 
 ### Fixes
-* Changed company name in app to "A Quiet LLC" ([#2642] (https://github.com/TryQuiet/quiet/issues/2642))
-* Fixed copyright statement in Electron app ([#2589] (https://github.com/TryQuiet/quiet/issues/2589))
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
 
 ## [2.3.2]
 

diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -94,6 +94,7 @@
     "@nestjs/common": "^10.2.10",
     "@nestjs/core": "^10.2.10",
     "@nestjs/platform-express": "^10.2.10",
+    "@paralleldrive/cuid2": "^2.2.2",
     "@peculiar/webcrypto": "1.4.3",
     "@quiet/common": "^2.0.2-alpha.1",
     "@quiet/identity": "^2.0.2-alpha.2",
@@ -114,7 +115,6 @@
     "fastq": "^1.17.1",
     "fetch-retry": "^6.0.0",
     "get-port": "^5.1.1",
-    "getmac": "^6.6.0",
     "go-ipfs": "npm:[email protected]",
     "http-server": "^0.12.3",
     "https-proxy-agent": "^5.0.0",

diff --git a/packages/backend/src/nest/auth/services/members/device.service.spec.ts b/packages/backend/src/nest/auth/services/members/device.service.spec.ts
@@ -20,7 +20,7 @@ describe('invites', () => {
     expect(adminSigChain.roles.amIMemberOfRole(adminSigChain.context, RoleName.MEMBER)).toBe(true)
   })
   it('sigchain should contain admin device', () => {
-    const adminDeviceName = DeviceService.determineDeviceName()
+    const adminDeviceName = DeviceService.generateDeviceName()
     adminSigChain.team.hasDevice(adminSigChain.context.device.deviceId)
   })
   it('should generate a new device', () => {

diff --git a/packages/backend/src/nest/auth/services/members/device.service.ts b/packages/backend/src/nest/auth/services/members/device.service.ts
@@ -2,7 +2,7 @@
  * Handles device-related chain operations
  */
 
-import getMAC from 'getmac'
+import { createId } from '@paralleldrive/cuid2'
 import { ChainServiceBase } from '../chainServiceBase'
 import { Device, DeviceWithSecrets, redactDevice } from '@localfirst/auth'
 import { SigChain } from '../../sigchain'
@@ -23,7 +23,7 @@ class DeviceService extends ChainServiceBase {
   public static generateDeviceForUser(userId: string): DeviceWithSecrets {
     const params = {
       userId,
-      deviceName: DeviceService.determineDeviceName(),
+      deviceName: DeviceService.generateDeviceName(),
     }
 
     return SigChain.lfa.createDevice(params)
@@ -32,11 +32,11 @@ class DeviceService extends ChainServiceBase {
   /**
    * Get an identifier for the current device
    *
-   * @returns Formatted MAC address of the current device
+   * @returns collision-resistant device identifier
    */
-  public static determineDeviceName(): string {
-    const mac = getMAC()
-    return mac.replace(/:/g, '')
+  public static generateDeviceName(): string {
+    // TODO: let users set their own device name in a GUI
+    return createId()
   }
 
   public static redactDevice(device: DeviceWithSecrets): Device {

diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -249,6 +249,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
   public async closeAllServices(options: { saveTor: boolean } = { saveTor: false }) {
     this.logger.info('Saving active sigchain')
     await this.saveActiveChain()
+    await this.sigChainService.deleteChain(this.sigChainService.activeChainTeamName!, false)
 
     this.logger.info('Closing services')
 

diff --git a/packages/backend/src/nest/ipfs-file-manager/testUtils/storageSnapshot.ts b/packages/backend/src/nest/ipfs-file-manager/testUtils/storageSnapshot.ts
@@ -39,7 +39,7 @@ export class StorageTestSnapshot extends Storage {
   public useSnapshot: boolean
   public name: string
   public replicationTime: number
-  public declare options: StorageTestSnapshotOptions
+  declare public options: StorageTestSnapshotOptions
   protected snapshotSaved: boolean
   protected msgReplCount: number
 
@@ -133,9 +133,7 @@ export class StorageTestSnapshot extends Storage {
     })
 
     // eslint-disable-next-line
-    this.messages.events.on(
-      'replicate.progress',
-      async (_address, _hash, _entry, progress, _total) => {
+    this.messages.events.on('replicate.progress', async (_address, _hash, _entry, progress, _total) => {
       if (!this.replicationStartTime) {
         logger.time(`${this.name}; Replication time`)
         this.replicationStartTime = new Date()

diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+
+## [2.3.3]
+
+### New features
+
+* Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
+* Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
+* Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
+
+### Fixes
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
+
 ## [2.3.2]
 
 ### Chores

diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -80,7 +80,7 @@
   },
   "homepage": "https://github.com/TryQuiet",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {

diff --git a/packages/desktop/src/main/main.test.ts b/packages/desktop/src/main/main.test.ts
@@ -20,7 +20,6 @@ const mockWindowOnce = jest.fn()
 const mockSetMovable = jest.fn()
 const mockSetAlwaysOnTop = jest.fn()
 
-const spyApplyDevTools = jest.spyOn(main, 'applyDevTools')
 const spyCreateWindow = jest.spyOn(main, 'createWindow')
 const spyGetPorts = jest.spyOn(backendHelpers, 'getPorts')
 
@@ -137,11 +136,6 @@ describe('electron app ready event', () => {
     expect(setApplicationMenu).toHaveBeenCalledWith(null)
   })
 
-  // todo
-  // it('apply devtools logic will trigger one time and ... todo', async () => {
-  //   expect(spyApplyDevTools).toHaveBeenCalledTimes(1)
-  // })
-
   it('get ports logic will trigger and will return propper ports', async () => {
     expect(spyGetPorts).toHaveBeenCalledTimes(1)
     const getPortsResult = async (): Promise<any> => spyGetPorts.mock.results[0].value

diff --git a/packages/desktop/src/main/main.ts b/packages/desktop/src/main/main.ts
@@ -132,12 +132,21 @@ export const applyDevTools = async () => {
   ]
   await Promise.all(
     extensionsData.map(async extension => {
-      await installer.default(extension.name)
+      try {
+        await installer.default(extension.name)
+      } catch (error) {
+        logger.error(`Failed to install ${extension.name}:${extension.path}:`, error)
+      }
     })
   )
+
   await Promise.all(
     extensionsData.map(async extension => {
-      await session.defaultSession.loadExtension(extension.path, { allowFileAccess: true })
+      try {
+        await session.defaultSession.loadExtension(extension.path, { allowFileAccess: true })
+      } catch (error) {
+        logger.error(`Failed to load extension from ${extension.path}:`, error)
+      }
     })
   )
 }

diff --git a/packages/desktop/src/renderer/components/ui/OpenlinkModal/OpenlinkModal.test.tsx b/packages/desktop/src/renderer/components/ui/OpenlinkModal/OpenlinkModal.test.tsx
@@ -173,7 +173,7 @@ describe('OpenlinkModal', () => {
                               <span
                                 class="OpenlinkModalbold"
                               >
-                                www.tryquiet.org
+                                tryquiet.org
                               </span>
                               - I trust them with my data and I'm not using Quiet for anonymity protection. 
                             </div>
@@ -215,7 +215,7 @@ describe('OpenlinkModal', () => {
                               <span
                                 class="OpenlinkModalbold"
                               >
-                                www.tryquiet.org
+                                tryquiet.org
                               </span>
                                
                               again, but don't auto-load images.
@@ -281,7 +281,7 @@ describe('OpenlinkModal', () => {
                                 href=""
                                 style="color: rgb(103, 191, 211); text-decoration: none; word-break: break-all;"
                               >
-                                Load image from site www.tryquiet.org
+                                Load image from site tryquiet.org
                               </a>
                             </div>
                           </div>

diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased]
+
+## [2.3.3]
+
+### New features
+
+* Adds basic sigchain functions ([#2625](https://github.com/TryQuiet/quiet/issues/2625))
+* Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
+* Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
+
+### Fixes
+
+* Changed company name in app to "A Quiet LLC" ([#2642](https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589](https://github.com/TryQuiet/quiet/issues/2589))
+* Improved clickable link contrast ([#2593](https://github.com/TryQuiet/quiet/issues/2593))
+
 ## [2.3.2]
 
 ### Chores

diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -192,8 +192,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 433
-        versionName "2.3.2"
+        versionCode 436
+        versionName "2.3.3"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>393</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>

diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.2</string>
+	<string>2.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>393</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json