Skip to content

Commit cb49949

Browse files
Merge pull request #19 from getCompass/release_v5.1.0
Release v5.1.0
2 parents 0786ff6 + 81be941 commit cb49949

File tree

839 files changed

+47583
-35595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

839 files changed

+47583
-35595
lines changed

jitsi_custom/Dockerfile

+14-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@ FROM alpine:3.20
22

33
RUN apk add --no-cache --virtual .build-deps npm build-base git
44

5-
# Устанавливаем зависимости и собираем проект
5+
# устанавливаем зависимости и собираем проект
66
COPY . .
7-
RUN cd jitsi-meet-source && npm install && make all && make source-package
7+
RUN \
8+
--mount=type=cache,target=/tmp/v8-compile-cache-0,sharing=locked \
9+
--mount=type=cache,target=/root/.npm,sharing=locked \
10+
cd jitsi-meet-source \
11+
&& npm install \
12+
&& make all \
13+
&& make source-package
814

9-
# Копируем исходники
10-
RUN tar -xvf jitsi-meet-source/jitsi-meet.tar.bz2 -C jitsi-meet-dist/
11-
12-
# Сносим исходники
13-
RUN rm -rf jitsi-meet-source/
14-
15-
# Удаляем зависимости билда
16-
RUN apk del .build-deps
15+
# копируем исходники и удаляем зависимости билда
16+
RUN tar -xvf jitsi-meet-source/jitsi-meet.tar.bz2 -C jitsi-meet-dist/ \
17+
&& rm -rf /jitsi-meet-source \
18+
&& apk del .build-deps \
19+
&& rm -rf /lib-jitsi-meet-3.4.0.tgz \
20+
&& rm -rf /.git

jitsi_custom/jitsi-meet-source/.devcontainer/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"image": "mcr.microsoft.com/devcontainers/universal:2",
44
"features": {
55
"ghcr.io/devcontainers/features/node:1": {
6-
"version": "16"
6+
"version": "20"
77
}
88
},
99
"hostRequirements": {
1010
"cpus": 4,
1111
"memory": "8gb",
12-
"storage": "32gb"
12+
"storage": "32gb"
1313
},
1414
"postCreateCommand": "bash -i -c 'nvm use && npm install && cp tsconfig.web.json tsconfig.json'"
1515
}

jitsi_custom/jitsi-meet-source/.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
20
+8-165
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,14 @@
1-
# How to contribute
2-
We would love to have your help. Before you start working however, please read
3-
and follow this short guide.
1+
# Follow Our Updated Guide to See How You Can Contribute
42

5-
# Reporting Issues
6-
Provide as much information as possible. Mention the version of Jitsi Meet,
7-
Jicofo and JVB you are using, and explain (as detailed as you can) how the
8-
problem can be reproduced.
3+
Hello there! 👋
94

10-
# Code contributions
11-
Found a bug and know how to fix it? Great! Please read on.
5+
We're thrilled that you're eager to contribute to Jitsi Meet! ❤️
126

13-
## Contributor License Agreement
14-
While the Jitsi projects are released under the
15-
[Apache License 2.0](https://github.com/jitsi/jitsi-meet/blob/master/LICENSE), the copyright
16-
holder and principal creator is [8x8](https://www.8x8.com/). To
17-
ensure that we can continue making these projects available under an Open Source license,
18-
we need you to sign our Apache-based contributor
19-
license agreement as either a [corporation](https://jitsi.org/ccla) or an
20-
[individual](https://jitsi.org/icla). If you cannot accept the terms laid out
21-
in the agreement, unfortunately, we cannot accept your contribution.
7+
Your interest in improving our platform means a lot to us. To ensure your contributions align seamlessly with our goals and processes, we've recently updated our guide. This guide will provide you with clear instructions on how to get involved effectively.
228

23-
## Creating Pull Requests
24-
- Make sure your code passes the linter rules beforehand. The linter is executed
25-
automatically when committing code.
26-
- Perform **one** logical change per pull request.
27-
- Maintain a clean list of commits, squash them if necessary.
28-
- Rebase your topic branch on top of the master branch before creating the pull
29-
request.
9+
Ready to get started? Head over to our [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-contributing/) and let's make Jitsi Meet even better together!
3010

31-
## Coding style
11+
### ❗️Additional Note
12+
Before sending us your code, double-check that it meets our coding standards. You can do this by running a command: `npm run lint`. If there are any issues, don't worry! You can fix them by running: `npm run lint-fix`. Once your code passes these checks, feel free to submit your pull request.
3213

33-
### Comments
34-
35-
* Comments documenting the source code are required.
36-
37-
* Comments from which documentation is automatically generated are **not**
38-
subject to case-by-case decisions. Such comments are used, for example, on
39-
types and their members. Examples of tools which automatically generate
40-
documentation from such comments include JSDoc, Javadoc, Doxygen.
41-
42-
* Comments which are not automatically processed are strongly encouraged. They
43-
are subject to case-by-case decisions. Such comments are often observed in
44-
function bodies.
45-
46-
* Comments should be formatted as proper English sentences. Such formatting pays
47-
attention to, for example, capitalization and punctuation.
48-
49-
### Duplication
50-
51-
* Don't copy-paste source code. Reuse it.
52-
53-
### Formatting
54-
55-
* Line length is limited to 120 characters.
56-
57-
* Sort by alphabetical order in order to make the addition of new entities as
58-
easy as looking a word up in a dictionary. Otherwise, one risks duplicate
59-
entries (with conflicting values in the cases of key-value pairs). For
60-
example:
61-
62-
* Within an `import` of multiple names from a module, sort the names in
63-
alphabetical order. (Of course, the default name stays first as required by
64-
the `import` syntax.)
65-
66-
````javascript
67-
import {
68-
DOMINANT_SPEAKER_CHANGED,
69-
JITSI_CLIENT_CONNECTED,
70-
JITSI_CLIENT_CREATED,
71-
JITSI_CLIENT_DISCONNECTED,
72-
JITSI_CLIENT_ERROR,
73-
JITSI_CONFERENCE_JOINED,
74-
MODERATOR_CHANGED,
75-
PEER_JOINED,
76-
PEER_LEFT,
77-
RTC_ERROR
78-
} from './actionTypes';
79-
````
80-
81-
* Within a group of imports (e.g. groups of imports delimited by an empty line
82-
may be: third-party modules, then project modules, and eventually the
83-
private files of a module), sort the module names in alphabetical order.
84-
85-
````javascript
86-
import React, { Component } from 'react';
87-
import { connect } from 'react-redux';
88-
````
89-
90-
### Indentation
91-
92-
* Align `switch` and `case`/`default`. Don't indent the `case`/`default` more
93-
than its `switch`.
94-
95-
````javascript
96-
switch (i) {
97-
case 0:
98-
...
99-
break;
100-
default:
101-
...
102-
}
103-
````
104-
105-
### Naming
106-
107-
* An abstraction should have one name within the project and across multiple
108-
projects. For example:
109-
110-
* The instance of lib-jitsi-meet's `JitsiConnection` type should be named
111-
`connection` or `jitsiConnection` in jitsi-meet, not `client`.
112-
113-
* The class `ReducerRegistry` should be defined in ReducerRegistry.js and its
114-
imports in other files should use the same name. Don't define the class
115-
`Registry` in ReducerRegistry.js and then import it as `Reducers` in other
116-
files.
117-
118-
* The names of global constants (including ES6 module-global constants) should
119-
be written in uppercase with underscores to separate words. For example,
120-
`BACKGROUND_COLOR`.
121-
122-
* The underscore character at the beginning of a name signals that the
123-
respective variable, function, property is non-public i.e. private, protected,
124-
or internal. In contrast, the lack of an underscore at the beginning of a name
125-
signals public API.
126-
127-
### Feature layout
128-
129-
When adding a new feature, this would be the usual layout.
130-
131-
```
132-
react/features/sample/
133-
├── actionTypes.ts
134-
├── actions.js
135-
├── components
136-
│   ├── AnotherComponent.js
137-
│   ├── OneComponent.js
138-
│   └── index.js
139-
├── middleware.js
140-
└── reducer.js
141-
```
142-
143-
The middleware must be imported in `react/features/app/` specifically
144-
in `middlewares.any.ts`, `middlewares.native.ts` or `middlewares.web.ts` where appropriate.
145-
Likewise for the reducer.
146-
147-
An `index.js` file must not be provided for exporting actions, action types and
148-
component. Features / files requiring those must import them explicitly.
149-
150-
This has not always been the case and the entire codebase hasn't been migrated to
151-
this model but new features should follow this new layout.
152-
153-
When working on an old feature, adding the necessary changes to migrate to the new
154-
model is encouraged.
155-
156-
157-
### Avoiding bundle bloat
158-
159-
When adding a new feature it's possible that it triggers a build failure due to the increased bundle size. We have safeguards inplace to avoid bundles growing disproportionatelly. While there are legit reasons for increasing the limits, please analyze the bundle first to make sure no unintended dependencies have been included, causing the increase in size.
160-
161-
First, make a production build with bundle-analysis enabled:
162-
163-
```
164-
npx webpack -p --analyze-bundle
165-
```
166-
167-
Then open the interactive bundle analyzer tool:
168-
169-
```
170-
npx webpack-bundle-analyzer build/app-stats.json
171-
```
14+
Happy coding!

jitsi_custom/jitsi-meet-source/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endif
3939

4040
all: compile deploy clean sentry
4141

42-
compile:
42+
compile: clean
4343
NODE_OPTIONS=--max-old-space-size=8192 \
4444
$(WEBPACK)
4545

@@ -128,7 +128,7 @@ deploy-local:
128128
dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-face-landmarks
129129
$(WEBPACK_DEV_SERVER)
130130

131-
source-package:
131+
source-package: compile deploy
132132
mkdir -p source_package/jitsi-meet/css && \
133133
cp -r *.js *.html resources/*.txt fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
134134
cp css/all.css source_package/jitsi-meet/css && \

jitsi_custom/jitsi-meet-source/SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
We take security very seriously and develop all Jitsi projects to be secure and safe.
66

7-
If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8) or send us an email to security@jitsi.org.
7+
If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8-bounty) or send us an email to security@jitsi.org.
88

99
**We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**

jitsi_custom/jitsi-meet-source/android/app/src/main/java/org/jitsi/meet/MainActivity.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.lang.reflect.Method;
3838
import java.net.URL;
3939
import java.util.Collection;
40-
import java.util.HashMap;
4140

4241
/**
4342
* The one and only Activity that the Jitsi Meet app needs. The
@@ -74,7 +73,6 @@ public class MainActivity extends JitsiMeetActivity {
7473
*/
7574
private String defaultURL;
7675

77-
7876
// JitsiMeetActivity overrides
7977
//
8078

@@ -146,12 +144,12 @@ public void onDestroy() {
146144
}
147145

148146
private void setJitsiMeetConferenceDefaultOptions() {
147+
149148
// Set default options
150149
JitsiMeetConferenceOptions defaultOptions
151150
= new JitsiMeetConferenceOptions.Builder()
152151
.setServerURL(buildURL(defaultURL))
153152
.setFeatureFlag("welcomepage.enabled", true)
154-
.setFeatureFlag("resolution", 360)
155153
.setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
156154
.build();
157155
JitsiMeet.setDefaultConferenceOptions(defaultOptions);
@@ -213,11 +211,6 @@ public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
213211
super.onPictureInPictureModeChanged(isInPictureInPictureMode);
214212

215213
Log.d(TAG, "Is in picture-in-picture mode: " + isInPictureInPictureMode);
216-
217-
if (!isInPictureInPictureMode) {
218-
this.startActivity(new Intent(this, getClass())
219-
.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
220-
}
221214
}
222215

223216
// Helper methods

jitsi_custom/jitsi-meet-source/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ext {
4444
googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
4545

4646
//React Native Version
47-
rnVersion = "0.72.9"
47+
rnVersion = "0.73.8"
4848
}
4949

5050
allprojects {

jitsi_custom/jitsi-meet-source/android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx1024m -XX:MaxPermSize=256m
1313

14-
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1515

1616
# When configured, Gradle will run in incubating parallel mode.
1717
# This option should only be used with decoupled projects. More details, visit
Binary file not shown.

jitsi_custom/jitsi-meet-source/android/scripts/release-sdk.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ MVN_HTTP=0
1010
DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
1111
SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
1212
JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
13-
DO_GIT_TAG=${GIT_TAG:-0}
1413

1514
if [[ $THE_MVN_REPO == http* ]]; then
1615
MVN_HTTP=1
@@ -67,15 +66,12 @@ pushd ${THIS_DIR}/../
6766
./gradlew publish
6867
popd
6968

70-
if [[ $DO_GIT_TAG == 1 ]]; then
71-
# The artifacts are now on the Maven repo, commit them
69+
# The artifacts are now on the Maven repo, commit them
70+
if [[ $MVN_HTTP == 0 ]]; then
7271
pushd ${MVN_REPO_PATH}
7372
git add -A .
7473
git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
7574
popd
76-
77-
# Tag the release
78-
git tag android-sdk-${SDK_VERSION}
7975
fi
8076

8177
# Done!

jitsi_custom/jitsi-meet-source/android/scripts/run-packager-helper.command

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
44

5-
exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache
5+
exec ${THIS_DIR}/../../node_modules/react-native/scripts/packager.sh --reset-cache

jitsi_custom/jitsi-meet-source/android/sdk/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747

4848
implementation 'com.facebook.fresco:animated-gif:2.5.0'
4949
implementation 'com.dropbox.core:dropbox-core-sdk:4.0.1'
50-
implementation 'com.jakewharton.timber:timber:4.7.1'
50+
implementation 'com.jakewharton.timber:timber:5.0.1'
5151
implementation 'com.squareup.duktape:duktape-android:1.3.0'
5252
implementation 'com.google.code.gson:gson:2.8.6'
5353
implementation 'androidx.startup:startup-runtime:1.1.0'

jitsi_custom/jitsi-meet-source/android/sdk/src/main/AndroidManifest.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<uses-permission android:name="android.permission.WAKE_LOCK" />
1313
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
1414
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
15+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
1516
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
17+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
18+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
1619

1720
<uses-feature
1821
android:glEsVersion="0x00020000"
@@ -48,7 +51,7 @@
4851

4952
<service
5053
android:name="org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService"
51-
android:foregroundServiceType="mediaPlayback" />
54+
android:foregroundServiceType="mediaPlayback|microphone" />
5255

5356
<provider
5457
android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"

0 commit comments

Comments
 (0)