diff --git a/Makefile b/Makefile index 50c1bc789a30..20f547a9550f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CLEANCSS = ./node_modules/.bin/cleancss DEPLOY_DIR = libs DIST_DIR = dist ONNX_DIR= node_modules/onnxruntime-web -LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet +LIBJITSIMEET_DIR = node_modules/lib-meet TF_WASM_DIR = node_modules/@tensorflow/tfjs-backend-wasm/dist/ RNNOISE_WASM_DIR = node_modules/@jitsi/rnnoise-wasm/dist EXCALIDRAW_DIR = node_modules/@jitsi/excalidraw/dist/prod @@ -35,7 +35,7 @@ clean: rm -fr $(BUILD_DIR) .NOTPARALLEL: -deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-excalidraw deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks +deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-excalidraw deploy-tflite deploy-meet-models deploy-lib-meet deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks deploy-init: rm -fr $(DEPLOY_DIR) @@ -50,9 +50,9 @@ deploy-appbundle: cp $(BUILD_DIR)/*.min.js $(DEPLOY_DIR) -cp $(BUILD_DIR)/*.min.js.map $(DEPLOY_DIR) -deploy-lib-jitsi-meet: +deploy-lib-meet: cp \ - $(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.* \ + $(LIBJITSIMEET_DIR)/dist/umd/lib-meet.* \ $(LIBJITSIMEET_DIR)/dist/umd/vodozemac.wasm \ $(DEPLOY_DIR) @@ -101,7 +101,7 @@ deploy-local: ([ ! -x deploy-local.sh ] || ./deploy-local.sh) .NOTPARALLEL: -dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks +dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-meet deploy-tf-wasm deploy-excalidraw-dev deploy-face-landmarks $(WEBPACK_DEV_SERVER) source-package: diff --git a/index.html b/index.html index 7d501f4555b6..b4fb9d33ceef 100644 --- a/index.html +++ b/index.html @@ -82,7 +82,7 @@ "utils.js", "do_external_connect.js", "interface_config.js", - "lib-jitsi-meet.min.js", + "lib-meet.min.js", "app.bundle.min.js", "all.css" ]; @@ -197,7 +197,7 @@ - + diff --git a/package.json b/package.json index 7513288ce1d0..841221ca17f9 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/internxt/lib-jitsi-meet/releases/download/v.0.0.21/lib-jitsi-meet-0.0.21.tgz", + "lib-meet": "https://github.com/internxt/lib-meet/releases/download/v.1.0.0/lib-meet-1.0.0.tgz", "lodash-es": "4.18.1", "moment": "2.29.4", "moment-duration-format": "2.2.2", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index 21f2432fa160..2c8e7d197052 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -32,7 +32,7 @@ "i18next-http-backend": "0.0.0", "js-sha512": "0.0.0", "jwt-decode": "0.0.0", - "lib-jitsi-meet": "0.0.0", + "lib-meet": "0.0.0", "lodash-es": "0.0.0", "optional-require": "0.0.0", "promise.allsettled": "0.0.0", diff --git a/react/features/base/lib-jitsi-meet/_.native.ts b/react/features/base/lib-jitsi-meet/_.native.ts index 1934eb94d23b..0a1af2c86ace 100644 --- a/react/features/base/lib-jitsi-meet/_.native.ts +++ b/react/features/base/lib-jitsi-meet/_.native.ts @@ -3,5 +3,5 @@ // // @ts-ignore -import JitsiMeetJS from 'lib-jitsi-meet'; +import JitsiMeetJS from 'lib-meet'; export { JitsiMeetJS as default }; diff --git a/resources/update-ljm.sh b/resources/update-ljm.sh index c0834b7aca69..b141a1eb40df 100755 --- a/resources/update-ljm.sh +++ b/resources/update-ljm.sh @@ -16,12 +16,12 @@ fi THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) pushd ${THIS_DIR}/.. -CURRENT_LJM_DEP=$(jq -r '.dependencies."lib-jitsi-meet"' package.json) +CURRENT_LJM_DEP=$(jq -r '.dependencies."lib-meet"' package.json) popd -NEW_LJM_RELEASE=$(gh release list --limit 1 --repo jitsi/lib-jitsi-meet | awk {'print $1'}) -GH_LINK="https://github.com/jitsi/lib-jitsi-meet/releases/tag/${NEW_LJM_RELEASE}" -LATEST_LJM_DEP="https://github.com/jitsi/lib-jitsi-meet/releases/download/${NEW_LJM_RELEASE}/lib-jitsi-meet.tgz" +NEW_LJM_RELEASE=$(gh release list --limit 1 --repo jitsi/lib-meet | awk {'print $1'}) +GH_LINK="https://github.com/internxt/lib-meet/releases/tag/${NEW_LJM_RELEASE}" +LATEST_LJM_DEP="https://github.com/internxt/lib-meet/releases/download/${NEW_LJM_RELEASE}/lib-meet.tgz" if [[ "${CURRENT_LJM_DEP}" == "${LATEST_LJM_DEP}" ]]; then echo "No need to update, already on the latest commit!" diff --git a/yarn.lock b/yarn.lock index 1c5f38d6c71e..13c6fb979e4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2916,10 +2916,10 @@ resolved "https://registry.yarnpkg.com/@jitsi/rnnoise-wasm/-/rnnoise-wasm-0.2.1.tgz#55b1991e5b66de57e730eeaf91a7b1846e005eda" integrity sha512-iEj77www43pS2Yq+cfLZb+hFuI7L5ccisBzzPMcOjjLsG4/LAlkD1CY58/8gc84nHdLBGmD/OPIWGnvYnXvB0A== -"@jitsi/rtcstats@9.7.0": - version "9.7.0" - resolved "https://registry.yarnpkg.com/@jitsi/rtcstats/-/rtcstats-9.7.0.tgz#4ded1f83660badf8d50c297a9cf09c3dc58105ff" - integrity sha512-OPURb3GO7zciPYoF/5IWLl2VVd90GD9KFlOnLQPalI2gUQDfxYNqn7JqeKAug1peTgml6I2o55lWYINuzPETWQ== +"@jitsi/rtcstats@9.7.1": + version "9.7.1" + resolved "https://registry.yarnpkg.com/@jitsi/rtcstats/-/rtcstats-9.7.1.tgz#0b66f343fe31ea5994219987217f43f5663c22c4" + integrity sha512-a8LVqzlBNh/fLnDfE4HcnutQ8Dpki31wmHw2pMS5Qu+shhzfZKUSb2NimPXT0l7WwkFqVflYGiQhfsavXPcMog== dependencies: "@jitsi/js-utils" "^2.2.0" "@jitsi/logger" "2.0.2" @@ -12461,6 +12461,11 @@ jwt-decode@2.2.0: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79" integrity sha512-86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ== +jwt-decode@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b" + integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA== + katex@^0.16.9: version "0.16.45" resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.45.tgz#ba60d39c54746b6b8d39ce0e7f6eace07143149c" @@ -12543,15 +12548,15 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -"lib-jitsi-meet@https://github.com/internxt/lib-jitsi-meet/releases/download/v.0.0.21/lib-jitsi-meet-0.0.21.tgz": - version "0.0.21" - resolved "https://github.com/internxt/lib-jitsi-meet/releases/download/v.0.0.21/lib-jitsi-meet-0.0.21.tgz#dae342382a2c8447bef59cacbf3b1d0a858520b9" +"lib-meet@https://github.com/internxt/lib-meet/releases/download/v.1.0.0/lib-meet-1.0.0.tgz": + version "1.0.0" + resolved "https://github.com/internxt/lib-meet/releases/download/v.1.0.0/lib-meet-1.0.0.tgz#c93f97512cc5e3dcf19af4b8c7b3f815869e82dd" dependencies: "@hexagon/base64" "^2.0.4" "@jitsi/js-utils" "^2.6.7" "@jitsi/logger" "2.1.1" "@jitsi/precall-test" "1.0.6" - "@jitsi/rtcstats" "9.7.0" + "@jitsi/rtcstats" "9.7.1" "@noble/ciphers" "^2.0.1" "@noble/hashes" "^2.0.1" "@noble/post-quantum" "^0.5.2" @@ -12560,11 +12565,12 @@ levn@^0.4.1: base64-js "1.5.1" current-executing-script "0.1.3" emoji-regex "10.4.0" - lodash-es "4.17.21" + jwt-decode "4.0.0" + lodash-es "4.18.1" onnxruntime-web "=1.23.0" sdp-transform "2.3.0" strophe.js "https://github.com/jitsi/strophejs/releases/download/v1.5-jitsi-3/strophe.js-1.5.0.tgz" - uuid "8.3.2" + uuid "14.0.0" vodozemac-wasm "git+https://github.com/internxt/vodozemac-wasm" webrtc-adapter "8.1.1" @@ -12728,11 +12734,6 @@ locate-path@^7.1.0: dependencies: p-locate "^6.0.0" -lodash-es@4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - lodash-es@4.18.1, lodash-es@^4.17.21: version "4.18.1" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.18.1.tgz#b962eeb80d9d983a900bf342961fb7418ca10b1d" @@ -14236,20 +14237,20 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -onnxruntime-common@1.24.3: - version "1.24.3" - resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.24.3.tgz#fb93319a2d041fc9fe2a209167ba6ef2f1a47fee" - integrity sha512-GeuPZO6U/LBJXvwdaqHbuUmoXiEdeCjWi/EG7Y1HNnDwJYuk6WUbNXpF6luSUY8yASul3cmUlLGrCCL1ZgVXqA== +onnxruntime-common@1.23.0: + version "1.23.0" + resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.23.0.tgz#ab254b0725fc837597000e705f885db523d6c37e" + integrity sha512-Auz8S9D7vpF8ok7fzTobvD1XdQDftRf/S7pHmjeCr3Xdymi4z1C7zx4vnT6nnUjbpelZdGwda0BmWHCCTMKUTg== -onnxruntime-web@^1.23.0: - version "1.24.3" - resolved "https://registry.yarnpkg.com/onnxruntime-web/-/onnxruntime-web-1.24.3.tgz#83e4e60d07ba97b9db89ea3a6795555c9d258fea" - integrity sha512-41dDq7fxtTm0XzGE7N0d6m8FcOY8EWtUA65GkOixJPB/G7DGzBmiDAnVVXHznRw9bgUZpb+4/1lQK/PNxGpbrQ== +onnxruntime-web@=1.23.0: + version "1.23.0" + resolved "https://registry.yarnpkg.com/onnxruntime-web/-/onnxruntime-web-1.23.0.tgz#7e3dd04df7e6d659f7acf1cab6caa706898344e0" + integrity sha512-w0bvC2RwDxphOUFF8jFGZ/dYw+duaX20jM6V4BIZJPCfK4QuCpB/pVREV+hjYbT3x4hyfa2ZbTaWx4e1Vot0fQ== dependencies: flatbuffers "^25.1.24" guid-typescript "^1.0.9" long "^5.2.3" - onnxruntime-common "1.24.3" + onnxruntime-common "1.23.0" platform "^1.3.6" protobufjs "^7.2.4" @@ -17734,11 +17735,6 @@ uuid@14.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-14.0.0.tgz#0af883220163d264ffe0c084f6b8a89b9666966d" integrity sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg== -uuid@8.3.2, uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - uuid@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912" @@ -17749,6 +17745,11 @@ uuid@^13.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-13.0.0.tgz#263dc341b19b4d755eb8fe36b78d95a6b65707e8" integrity sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"