Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:TryQuiet/quiet into chore/remove…
Browse files Browse the repository at this point in the history
…-registration-attempts-selector
  • Loading branch information
vinkabuki committed Oct 10, 2023
2 parents ca97df8 + f6b1f19 commit 7af8c09
Show file tree
Hide file tree
Showing 32 changed files with 721 additions and 497 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@ on:
[released, prereleased]

jobs:

run-e2e-tests-linux:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-linux.yml

run-e2e-tests-mac:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-mac.yml

run-e2e-tests-win:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-win.yml

build-linux:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-deploy-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest-m]

steps:
- name: "Print OS"
Expand Down
25 changes: 20 additions & 5 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/[email protected]@2.0.1-alpha.1) (2023-09-25)
## [2.0.1-alpha.1](https://github.com/TryQuiet/quiet/compare/[email protected]@2.0.1-alpha.1) (2023-09-25)

**Note:** Version bump only for package backend-bundle





## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/[email protected]@2.0.1-alpha.0) (2023-09-25)
## [2.0.1-alpha.0](https://github.com/TryQuiet/quiet/compare/[email protected]@2.0.1-alpha.0) (2023-09-25)

**Note:** Version bump only for package backend-bundle





# [2.0.0-alpha.18](https://github.com/TryQuiet/quiet/compare/[email protected]@2.0.0-alpha.18) (2023-10-04)

**Note:** Version bump only for package backend-bundle

Expand All @@ -28,6 +36,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


# [1.7.0-alpha.0](/compare/[email protected]@1.7.0-alpha.0) (2023-08-29)

**Note:** Version bump only for package backend-bundle





## [1.6.1](https://github.com/TryQuiet/quiet/compare/[email protected]@1.6.1) (2023-09-25)

**Note:** Version bump only for package backend-bundle
Expand Down Expand Up @@ -60,7 +75,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0](https://github.com/ZbayApp/monorepo/compare/[email protected]@1.4.0) (2023-07-28)
# [1.4.0](https://github.com/TryQuiet/quiet/compare/[email protected]@1.4.0) (2023-07-28)

**Note:** Version bump only for package backend-bundle

Expand All @@ -76,7 +91,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/[email protected]@1.4.0-alpha.0) (2023-06-19)
# [1.4.0-alpha.0](https://github.com/TryQuiet/quiet/compare/[email protected]@1.4.0-alpha.0) (2023-06-19)

**Note:** Version bump only for package backend-bundle

Expand Down Expand Up @@ -252,7 +267,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [0.19.0-alpha.1](https://github.com/ZbayApp/monorepo/compare/[email protected]@0.19.0-alpha.1) (2023-01-27)
# [0.19.0-alpha.1](https://github.com/TryQuiet/quiet/compare/[email protected]@0.19.0-alpha.1) (2023-01-27)

**Note:** Version bump only for package backend-bundle

Expand Down
59 changes: 55 additions & 4 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


## [2.0.1-alpha.1](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)
## [1.9.4](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-03)

**Note:** Version bump only for package @quiet/backend

Expand All @@ -21,7 +20,30 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


## [2.0.1-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)
## [1.9.3](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.20](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-09)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.19](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-04)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.18](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-04)

**Note:** Version bump only for package @quiet/backend

Expand All @@ -30,7 +52,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


# [2.0.0-alpha.5](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-19)
## [1.9.2](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

**Note:** Version bump only for package @quiet/backend

Expand Down Expand Up @@ -77,8 +98,38 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline




# [1.10.0-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-08-29)

**Note:** Version bump only for package @quiet/backend





## [1.9.4](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





## [1.9.3](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





## [1.9.2](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

**Note:** Version bump only for package @quiet/backend





## [1.9.1](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-15)

**Note:** Version bump only for package @quiet/backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
this.serverIoProvider.io.close()
}

// This method is only used on iOS through rn-bridge for reacting on lifecycle changes
public async openSocket() {
await this.socketService.init()
}
Expand Down
10 changes: 6 additions & 4 deletions packages/backend/src/nest/socket/socket.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ export class SocketService extends EventEmitter implements OnModuleInit {
@Inject(CONFIG_OPTIONS) public readonly configOptions: ConfigOptions
) {
super()

this.readyness = new Promise<void>(resolve => {
this.resolveReadyness = resolve
})
}

async onModuleInit() {
this.logger('init:started')

this.attachListeners()
await this.init()

this.logger('init:finished')
}

public async init() {
this.readyness = new Promise<void>(resolve => {
this.resolveReadyness = resolve
})

const connection = new Promise<void>(resolve => {
this.serverIoProvider.io.on(SocketActionTypes.CONNECTION, socket => {
this.logger('init: connection')
Expand Down
22 changes: 15 additions & 7 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)
## [2.0.1-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

**Note:** Version bump only for package @quiet/common





## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)
## [2.0.1-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

**Note:** Version bump only for package @quiet/common





# [2.0.0-alpha.18](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-04)

**Note:** Version bump only for package @quiet/common

Expand Down Expand Up @@ -102,23 +110,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.6.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-28)
# [1.6.0](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-28)

**Note:** Version bump only for package @quiet/common





## [1.5.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-28)
## [1.5.1-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-28)

**Note:** Version bump only for package @quiet/common





# [1.5.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-26)
# [1.5.0-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-07-26)

**Note:** Version bump only for package @quiet/common

Expand All @@ -134,7 +142,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-19)
# [1.4.0-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-19)

**Note:** Version bump only for package @quiet/common

Expand Down Expand Up @@ -230,7 +238,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.2.0-alpha.21](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-04-07)
# [1.2.0-alpha.21](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-04-07)

**Note:** Version bump only for package @quiet/common

Expand Down
Loading

0 comments on commit 7af8c09

Please sign in to comment.