Compare commits
623 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4a1a04f86e | |||
| 8702638cf3 | |||
| f88c0307ea | |||
| e7f15b50ff | |||
| 75ba2ff146 | |||
| bbe2a32efc | |||
| 86fff16eed | |||
| 195d2b5006 | |||
| 30cf264276 | |||
| 945d779b45 | |||
| d43b335546 | |||
| e6f0ff5112 | |||
| 224d6ce358 | |||
| 20718f2d5a | |||
| 8edcb6e973 | |||
| b00c4e5d6d | |||
| 3c0ba03976 | |||
| 7fa172d100 | |||
| ecf8f0fe3f | |||
| 27da57aff5 | |||
| e327a5e35f | |||
| c3abd0441f | |||
| 79245389ce | |||
| 3b3f992834 | |||
| a98dc1484a | |||
| dca24a1b25 | |||
| 74b791e207 | |||
| df1495c97b | |||
| c95e1c67bd | |||
| f115c83752 | |||
| ebfcb42a7d | |||
| c86a47f736 | |||
| dd6b4512c8 | |||
| f82fd4bece | |||
| edab18d94a | |||
| 636c2168be | |||
| d54e9c2ad0 | |||
| 657712d7cb | |||
| d2bfbee389 | |||
| 9ba97fd14f | |||
| be0d0927d4 | |||
| 27dce44d40 | |||
| 78acaf395e | |||
| 4e5e648730 | |||
| 924fe95d94 | |||
| e3e33c7d0a | |||
| 16ee575ff8 | |||
| e42b083f20 | |||
| 6d2c31eb0a | |||
| e9bdf173de | |||
| dd23ce817a | |||
| 1ca8f6e5ea | |||
| f98e884067 | |||
| b498926353 | |||
| 3d4dc2d631 | |||
| 1523e6aec9 | |||
| 99510c9c6a | |||
| 9f003e95f3 | |||
| 46c30b6fcd | |||
| 1533ae8a3c | |||
| 526e96797e | |||
| 8903a55008 | |||
| 2a60b49086 | |||
| aee1847303 | |||
| 6b7cd8ab2e | |||
| cc2a0ad322 | |||
| 3300226bbe | |||
| 8efb11b3ae | |||
| 8cf15cabaf | |||
| 9b7c449ca5 | |||
| 5c27aba00f | |||
| 7256b87511 | |||
| 7b7951a0e0 | |||
| 5c15140783 | |||
| 898bc9a0f8 | |||
| fd1715bacf | |||
| c9de7d049f | |||
| 6368b676a6 | |||
| 65789ef706 | |||
| c0feb1ee82 | |||
| 135b99aee7 | |||
| 040df0e15a | |||
| 00e197b216 | |||
| eae1a382d5 | |||
| d4a7cf279c | |||
| 70a296eea6 | |||
| ac85a20271 | |||
| 13036f6ab7 | |||
| 64819b3696 | |||
| 53722ad1bc | |||
| dcfdd35c82 | |||
| 16f465432d | |||
| 90f95ab2a9 | |||
| 61f7ad05e9 | |||
| 69a6dd1463 | |||
| 6d06aee92d | |||
| 54908b9caa | |||
| 08af6e77bb | |||
| 4525c9c255 | |||
| 44d3ed8f2e | |||
| 9522dc72ac | |||
| 09dbb250a7 | |||
| 321cb99f82 | |||
| 52bad6faaf | |||
| 0065527a5e | |||
| 818d20888e | |||
| f1fce4431f | |||
| 491866e584 | |||
| f777f2fdeb | |||
| e5184695bb | |||
| 71d59dd9f1 | |||
| 3537fdf648 | |||
| 7b485377cf | |||
| f5a5fa93af | |||
| aca3261a9a | |||
| 8c3d1bdd95 | |||
| a01f0256a1 | |||
| 27ebc2f2e3 | |||
| 553df5070e | |||
| c79984a883 | |||
| 22b2e6bd1e | |||
| be35c1d6e0 | |||
| 8d653b30e5 | |||
| 5602d256d8 | |||
| d9804172e7 | |||
| 61d0043790 | |||
| 6ccc9ef0bf | |||
| 73a7841b96 | |||
| 6c25d0a525 | |||
| d13e3a8a5d | |||
| a82d7f885a | |||
| 5ef6e8b5ea | |||
| 913d4f91ae | |||
| 1f437089ad | |||
| 85eff8afaf | |||
| 29b0a6fcb4 | |||
| 3554b2eb53 | |||
| e25aa6ce05 | |||
| a8b79740e9 | |||
| 28f652e035 | |||
| a4997e7431 | |||
| 13c7b9ad40 | |||
| ec688e728d | |||
| bf69cbc14e | |||
| 6378c1e384 | |||
| 09b7a23f51 | |||
| c1d30f6923 | |||
| 04ec967a99 | |||
| 7390673bfc | |||
| 8984d863df | |||
| 995e6fa41d | |||
| 426e6258a8 | |||
| ac520d8b34 | |||
| 33ac849d3b | |||
| 07a1425fee | |||
| 233bdce408 | |||
| 1b35e3acd9 | |||
| f8f2ce145b | |||
| bf6f7430e7 | |||
| 7c4f66f91e | |||
| 4d27f217fc | |||
| 88b722e741 | |||
| 5ea5460b17 | |||
| 1eefc49f8d | |||
| 6cbb3520ee | |||
| b2d6d33cc8 | |||
| cd19dea09e | |||
| 0ecc25bc74 | |||
| 7f817e2c0a | |||
| fc17c410ae | |||
| f490b095d8 | |||
| 04dfb9922f | |||
| 7d9f282c2e | |||
| ba8b3bda30 | |||
| ee85768940 | |||
| a9ef134210 | |||
| dee1e46173 | |||
| 60828ed895 | |||
| 4830ea5673 | |||
| e21da647a0 | |||
| 38c131e02c | |||
| 8b8f9eae92 | |||
| 4456137948 | |||
| faa86b8293 | |||
| ae9cda463e | |||
| e9e4b360a0 | |||
| 4911a7cda0 | |||
| eb74feaa0d | |||
| 318447f2b3 | |||
| 224707f4c7 | |||
| d47d13f041 | |||
| b4ced74b1f | |||
| ecf5d443d6 | |||
| 0737974f6d | |||
| 71f76a81e9 | |||
| 385da86759 | |||
| 81e3483f28 | |||
| 5e030c2a07 | |||
| 32fbedd358 | |||
| aab90650f1 | |||
| 534cf000b2 | |||
| 5bac1668fe | |||
| 5a7a0da923 | |||
| c20daafd81 | |||
| 9846a61bd0 | |||
| 388b7d172d | |||
| 288562cc0e | |||
| 79400188d8 | |||
| dcaa45ccfe | |||
| 35951ba2a6 | |||
| 72184e1370 | |||
| 1b4a8fbac2 | |||
| 1e2fad5444 | |||
| 96f97ed2d0 | |||
| 02d16cb55c | |||
| 7268ff6777 | |||
| cca5bc2186 | |||
| ec67a12fe4 | |||
| 05f32d008a | |||
| 964b3cd452 | |||
| c7ca5a621f | |||
| 90ebe231ef | |||
| 04f2a9ebdc | |||
| 6a8eb79b41 | |||
| bc35046b3a | |||
| 1612d8b2d4 | |||
| f8937fc0a1 | |||
| 97b5e3e65c | |||
| b917d82f7e | |||
| 82d146cdf5 | |||
| cbfeea0a4e | |||
| a695758da4 | |||
| 4c5b6de8f3 | |||
| cf4e347589 | |||
| fc260b2686 | |||
| cd7799997e | |||
| a2bccf4f4f | |||
| 6830250f2c | |||
| 0c0ce87947 | |||
| 597eba6e8a | |||
| 47dbc271ba | |||
| c3adcc8ff3 | |||
| 07698ddced | |||
| cce0a45fbc | |||
| da1767c261 | |||
| dd3d47afe6 | |||
| ac2eddc10f | |||
| 35863ec3b6 | |||
| 3d125e940f | |||
| 6f38d60a27 | |||
| 012857f8c6 | |||
| e5a804f748 | |||
| 6bb8084aa0 | |||
| 4548f69de8 | |||
| 1a3a92f901 | |||
| 181b97b310 | |||
| bb816eb2e5 | |||
| 6ee89b201e | |||
| ecb710688d | |||
| 5e1e05b001 | |||
| 211e97edfa | |||
| c4fc46727c | |||
| 28acbb5459 | |||
| 5a81e2b92c | |||
| df24aaab71 | |||
| 3b474ba1c0 | |||
| fc4b6d679a | |||
| 73dd684c8d | |||
| 8507cdd2b6 | |||
| aaf21e97e8 | |||
| bd3a26a2af | |||
| 4d222e4ab4 | |||
| b80c46da54 | |||
| 451be40bb7 | |||
| 45c5a443fb | |||
| 34f9dea73f | |||
| f0fda145d9 | |||
| d12ced352a | |||
| 497b45f2ca | |||
| 52fbd56666 | |||
| 170763a1f7 | |||
| 037166fb21 | |||
| 6374e136d8 | |||
| 3ccb2d4dd8 | |||
| 5d7a54e809 | |||
| 07af7a85ff | |||
| 6180ac4e4f | |||
| a30b573d36 | |||
| 83b95c5520 | |||
| 0c9b83c793 | |||
| 812d80c4f2 | |||
| 34212be6e2 | |||
| d8ccd02bb2 | |||
| 08aa63ecb2 | |||
| bbc8f61221 | |||
| 6b656eefd7 | |||
| 264f267ac3 | |||
| 4bf3ba4c48 | |||
| 4fdc2eee11 | |||
| 19c2a378e7 | |||
| 5a70604f01 | |||
| 7e422e5846 | |||
| d915b93caa | |||
| 9d9ec794aa | |||
| 570d57d5f5 | |||
| 7469ccfdf1 | |||
| 0d3bd2727e | |||
| 660b022eb1 | |||
| a28b611ecc | |||
| dfa6092c72 | |||
| 7d8c166c7f | |||
| f7dd1f8fd7 | |||
| 416411b843 | |||
| 45e0665cf0 | |||
| a3eabf8f66 | |||
| 7c81947681 | |||
| 2424817523 | |||
| 15133f9d6b | |||
| bea1f18ab8 | |||
| d5a614d2b5 | |||
| 108db2e3e5 | |||
| 73496406e8 | |||
| c5c96369c8 | |||
| e9f90e95b1 | |||
| f57fbf2d35 | |||
| 920f4558fc | |||
| 9df901b9d6 | |||
| c09c440631 | |||
| cd7ce77074 | |||
| 6d3c26419d | |||
| 9dbc38984e | |||
| 1bd5a294e4 | |||
| 4d98ed4977 | |||
| bf32c073c6 | |||
| 4f2c4bfaf9 | |||
| dacf705329 | |||
| 8296738347 | |||
| 04be495351 | |||
| 43185605eb | |||
| cf3fb208e2 | |||
| 4ca230eb12 | |||
| 4b5e0cb2a3 | |||
| 45f374610f | |||
| b419a2bfd2 | |||
| ee8d96bee7 | |||
| c65ff2d75d | |||
| ea1c90d8ca | |||
| 3e963e3e6d | |||
| 82769128a1 | |||
| 05f4ce6b2e | |||
| 508984ecfa | |||
| a05507f73d | |||
| a27def119c | |||
| fce94f38ce | |||
| 83bd9c5ce3 | |||
| bfbfade99a | |||
| 16daf7b8d3 | |||
| fcad79d662 | |||
| 2424ce17ec | |||
| 4715905334 | |||
| 7c05aedcfe | |||
| 7347fc7c86 | |||
| ada7d9a666 | |||
| 0cb3fb8e3c | |||
| dcb788b57b | |||
| 73bcb9d598 | |||
| f3e90c3999 | |||
| cb4ed3c9d7 | |||
| f8b0746e73 | |||
| d8ad7a743e | |||
| 0ba445895c | |||
| 3b719ab9ba | |||
| 8887e811d3 | |||
| cb9e994749 | |||
| 1841533d2c | |||
| 7da99f2116 | |||
| b0af5e7f35 | |||
| dd6bb0ed3e | |||
| 1306f0bcfe | |||
| ca4494c09e | |||
| f57db0acc8 | |||
| 342f992556 | |||
| d0cf3974ad | |||
| 0f3eb35c83 | |||
| d15fb37932 | |||
| 051f33bb1e | |||
| 566eacc8fe | |||
| d19023a1ba | |||
| a6e36f02a7 | |||
| c3fd1a89ef | |||
| 8b1ff536b3 | |||
| 6b08b8da1b | |||
| c4ff42f181 | |||
| ee0aa0fe5b | |||
| 09c871fc29 | |||
| 8496959188 | |||
| 77105001e0 | |||
| 2d57d38644 | |||
| c9d13619a6 | |||
| b99ec9bb50 | |||
| b3f26469c8 | |||
| d5c53c7dd4 | |||
| f43ac2e4eb | |||
| ea5dd5bc0e | |||
| 86427fa2b7 | |||
| 3959c3657c | |||
| 191f8abbcc | |||
| d91f8bb6e1 | |||
| d612f9b26b | |||
| 042be17cfa | |||
| d00f4fa695 | |||
| fd36469fc2 | |||
| dc278a6064 | |||
| 047da94494 | |||
| 124a8bf8d9 | |||
| c72c5cae1a | |||
| b564044e70 | |||
| 4717143251 | |||
| 805e983749 | |||
| 6dfafb7f67 | |||
| e56c0f997e | |||
| 61afd94e3a | |||
| 3d7aec2b4a | |||
| 9c009839f0 | |||
| ec63ddcd47 | |||
| fcde8757e6 | |||
| 9610e606eb | |||
| 8362ac0e24 | |||
| f1ddd7fa2f | |||
| 487340efca | |||
| 7ebc928dd3 | |||
| 85de214ca7 | |||
| e3e34dbf31 | |||
| 555afe4abd | |||
| 78ddb121e3 | |||
| ca9c7fc152 | |||
| 6e3845d0c1 | |||
| 41b171da68 | |||
| 4ad897e756 | |||
| 42647d6d25 | |||
| 14526808ab | |||
| 25167495cc | |||
| 720eb6a93e | |||
| bfbf253033 | |||
| 692e0e359e | |||
| 1d23cb889a | |||
| b2ad423886 | |||
| 2c7b4bea04 | |||
| 1eda18ea6e | |||
| 8d5488c333 | |||
| 5c0e6b6479 | |||
| 077cf59082 | |||
| 4881fa20f5 | |||
| 116db1e697 | |||
| 4b76e9571f | |||
| e8739d7e70 | |||
| 602bcf3185 | |||
| f5e0ddf692 | |||
| cd0cec78ba | |||
| e647787170 | |||
| d76b4c9b9f | |||
| 09c7edecb8 | |||
| f625df6508 | |||
| ac87980a27 | |||
| 7cab46dc29 | |||
| 259b739160 | |||
| 6f77559633 | |||
| 2cdf19de77 | |||
| fcf08a6dbd | |||
| 7bf623f654 | |||
| 1c1d1938d9 | |||
| ddb81765f3 | |||
| 8ca52737cd | |||
| 87b9ca2314 | |||
| 8a6419da44 | |||
| 127d4e1d5a | |||
| 99cbc1f784 | |||
| 246312c51c | |||
| 1b09683938 | |||
| db3d3d61ef | |||
| c1a797c2c1 | |||
| 4d6a7573c4 | |||
| 0b73fd8f06 | |||
| e362765b21 | |||
| be79fdac80 | |||
| 75a15a0004 | |||
| 3087dfe486 | |||
| 9916ab7d7e | |||
| bd2ad3bb99 | |||
| f02fbc85a3 | |||
| 4fd4e074e0 | |||
| ec3d4f7462 | |||
| 4507325331 | |||
| dac4a72838 | |||
| 5048005fc1 | |||
| 002c7c0e42 | |||
| e18b732776 | |||
| ce9f812a7e | |||
| b02591170f | |||
| e58181f846 | |||
| d37f47e82c | |||
| db80c09c10 | |||
| fd9f2a81ca | |||
| d865db5f1b | |||
| 7cc5b2b961 | |||
| c85977cb68 | |||
| 3c3b4a32e3 | |||
| 9b033c55b2 | |||
| a2c7becaf4 | |||
| 89031abb63 | |||
| fc92fa4eb4 | |||
| 2c65cc061e | |||
| bfadeae6ee | |||
| 117677bd14 | |||
| 69c6e58017 | |||
| 6742f5d19d | |||
| 23de7e52bc | |||
| 3887255e9c | |||
| 5d6ad3f3f6 | |||
| 44d68a9c80 | |||
| ed5c1bbd84 | |||
| f8c6da8021 | |||
| 5ba1657e00 | |||
| c28b8ba902 | |||
| 6962367e18 | |||
| 0bd57e8623 | |||
| 27f2023104 | |||
| 44362eca23 | |||
| c34a85699b | |||
| 12d8c4a9db | |||
| 42a05da5c0 | |||
| 4344dd6e35 | |||
| fe28902b2e | |||
| 1e1e1a2657 | |||
| f4e48dafac | |||
| 9f58efb851 | |||
| 716e11b5b3 | |||
| 88a1136dfd | |||
| 90633928a8 | |||
| fd894eb61f | |||
| bb64532cff | |||
| 692c55ed1b | |||
| df616ae711 | |||
| 021d7a7e06 | |||
| f2a3e7c8de | |||
| cf07ceb67e | |||
| ea7fb5fc27 | |||
| 6e8a6ce82a | |||
| ce960ae330 | |||
| f9dd2e1909 | |||
| 9023e54352 | |||
| 8295574616 | |||
| db15c8b6cc | |||
| e1aeec6053 | |||
| c5aa762e11 | |||
| 8f710a4626 | |||
| 60d1338eff | |||
| f8436d9ae2 | |||
| 39fb273201 | |||
| d101459115 | |||
| 88696a23fd | |||
| 13d26a76b3 | |||
| b675517a60 | |||
| a5254ffd59 | |||
| ff82bca9ec | |||
| 99a18b6e90 | |||
| 250e599465 | |||
| 144a4e1b85 | |||
| 78ab3cdbdf | |||
| a815d6c00d | |||
| dfbc3a9d17 | |||
| 086db3d089 | |||
| 014ef3d804 | |||
| de3e1a56a8 | |||
| 459749b992 | |||
| e1450329f2 | |||
| c7e3194331 | |||
| 902b005f32 | |||
| 51d22783b2 | |||
| 76f80a0f2f | |||
| 82eb930200 | |||
| eeeb950e08 | |||
| cb77688572 | |||
| f9524b2f0a | |||
| a50aabeaf8 | |||
| 594bd5a692 | |||
| 69d92e6f30 | |||
| c47e830b40 | |||
| d7f1b7b94c | |||
| 8072d2c950 | |||
| 726f9097f9 | |||
| bbc7fa8012 | |||
| 41db3e766b | |||
| 1ab3ce6d47 | |||
| 3cd5c77f42 | |||
| 3ddb075c6b | |||
| 9ed2500565 | |||
| 1001783d3c | |||
| 97b5e8780c | |||
| 7c7074aa99 | |||
| 35b3bcad63 | |||
| 137a2c7f6f | |||
| d681e25bcc | |||
| 1f1a6371b4 | |||
| bbfbb23be5 | |||
| 6e20bc1f43 | |||
| fed05f2396 | |||
| 865acf2838 | |||
| 6ae68013af | |||
| 394a1be322 | |||
| a71a1fd968 | |||
| 40af264562 | |||
| 8b2d06976e | |||
| 58313666ed | |||
| f3c8aec189 | |||
| 0a0c7ba618 | |||
| d7ad5aed05 | |||
| 4acc9cf40d | |||
| 13d0d3d801 | |||
| 47cd3eff74 | |||
| 5769203705 | |||
| cadc186c62 | |||
| 5be7595533 |
@@ -4,7 +4,7 @@ __pycache__
|
|||||||
**/__pycache__
|
**/__pycache__
|
||||||
**/*.pyc
|
**/*.pyc
|
||||||
venv
|
venv
|
||||||
.venv
|
**/.venv
|
||||||
|
|
||||||
# System-specific files
|
# System-specific files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
@@ -24,13 +24,15 @@ data
|
|||||||
.cache
|
.cache
|
||||||
.circleci
|
.circleci
|
||||||
.git
|
.git
|
||||||
.vscode
|
|
||||||
.iml
|
.iml
|
||||||
.idea
|
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
.mypy_cache
|
|
||||||
.pylint.d
|
.pylint.d
|
||||||
.pytest_cache
|
|
||||||
|
**/.idea
|
||||||
|
**/.vscode
|
||||||
|
**/.pytest_cache
|
||||||
|
**/.mypy_cache
|
||||||
|
**/.ruff_cache
|
||||||
|
|
||||||
# Frontend
|
# Frontend
|
||||||
node_modules
|
**/node_modules
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Download Crowdin files
|
- name: Download Crowdin files
|
||||||
uses: crowdin/github-action@v2
|
uses: crowdin/github-action@v2
|
||||||
|
|||||||
@@ -12,18 +12,32 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- 'main'
|
- 'main'
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DOCKER_USER: 1001:127
|
DOCKER_USER: 1001:127
|
||||||
DOCKER_CONTAINER_REGISTRY_HOSTNAME: docker.io
|
DOCKER_CONTAINER_REGISTRY_HOSTNAME: docker.io
|
||||||
DOCKER_CONTAINER_REGISTRY_NAMESPACE: lasuite
|
DOCKER_CONTAINER_REGISTRY_NAMESPACE: lasuite
|
||||||
|
IS_MULTI_PLATFORM_BUILD: ${{ startsWith(github.ref, 'refs/tags/v') }}
|
||||||
|
BUILD_PLATFORMS: ${{ startsWith(github.ref, 'refs/tags/v') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-backend:
|
build-and-push-backend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
if: env.IS_MULTI_PLATFORM_BUILD == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -32,7 +46,7 @@ jobs:
|
|||||||
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-backend'
|
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-backend'
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||||
@@ -49,17 +63,27 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
target: backend-production
|
target: backend-production
|
||||||
|
platforms: ${{ env.BUILD_PLATFORMS }}
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
build-and-push-frontend-generic:
|
build-and-push-frontend-generic:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
if: env.IS_MULTI_PLATFORM_BUILD == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -68,7 +92,7 @@ jobs:
|
|||||||
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend'
|
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend'
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||||
@@ -86,17 +110,27 @@ jobs:
|
|||||||
context: .
|
context: .
|
||||||
file: ./src/frontend/Dockerfile
|
file: ./src/frontend/Dockerfile
|
||||||
target: frontend-production
|
target: frontend-production
|
||||||
|
platforms: ${{ env.BUILD_PLATFORMS }}
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
build-and-push-frontend-dinum:
|
build-and-push-frontend-dinum:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
if: env.IS_MULTI_PLATFORM_BUILD == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -105,7 +139,7 @@ jobs:
|
|||||||
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend-dinum'
|
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-frontend-dinum'
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||||
@@ -123,17 +157,27 @@ jobs:
|
|||||||
context: .
|
context: .
|
||||||
file: ./docker/dinum-frontend/Dockerfile
|
file: ./docker/dinum-frontend/Dockerfile
|
||||||
target: frontend-production
|
target: frontend-production
|
||||||
|
platforms: ${{ env.BUILD_PLATFORMS }}
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
build-and-push-summary:
|
build-and-push-summary:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
if: env.IS_MULTI_PLATFORM_BUILD == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -142,11 +186,19 @@ jobs:
|
|||||||
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-summary'
|
images: '${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-summary'
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||||
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
|
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
|
||||||
|
-
|
||||||
|
name: Run trivy scan
|
||||||
|
uses: numerique-gouv/action-trivy-cache@main
|
||||||
|
continue-on-error: true
|
||||||
|
with:
|
||||||
|
docker-build-args: '-f src/summary/Dockerfile --target production'
|
||||||
|
docker-image-name: '${{ env.DOCKER_CONTAINER_REGISTRY_HOSTNAME }}/${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-summary:${{ github.sha }}'
|
||||||
|
docker-context: './src/summary'
|
||||||
-
|
-
|
||||||
name: Build and push
|
name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -154,17 +206,27 @@ jobs:
|
|||||||
context: ./src/summary
|
context: ./src/summary
|
||||||
file: ./src/summary/Dockerfile
|
file: ./src/summary/Dockerfile
|
||||||
target: production
|
target: production
|
||||||
|
platforms: ${{ env.BUILD_PLATFORMS }}
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
build-and-push-agents:
|
build-and-push-agents:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout repository
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
if: env.IS_MULTI_PLATFORM_BUILD == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -173,11 +235,19 @@ jobs:
|
|||||||
images: lasuite/meet-agents
|
images: lasuite/meet-agents
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/')
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||||
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
|
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
|
||||||
|
-
|
||||||
|
name: Run trivy scan
|
||||||
|
uses: numerique-gouv/action-trivy-cache@main
|
||||||
|
continue-on-error: true
|
||||||
|
with:
|
||||||
|
docker-build-args: '-f src/agents/Dockerfile --target production'
|
||||||
|
docker-image-name: '${{ env.DOCKER_CONTAINER_REGISTRY_HOSTNAME }}/${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-agents:${{ github.sha }}'
|
||||||
|
docker-context: './src/agents'
|
||||||
-
|
-
|
||||||
name: Build and push
|
name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -185,12 +255,15 @@ jobs:
|
|||||||
context: ./src/agents
|
context: ./src/agents
|
||||||
file: ./src/agents/Dockerfile
|
file: ./src/agents/Dockerfile
|
||||||
target: production
|
target: production
|
||||||
|
platforms: ${{ env.BUILD_PLATFORMS }}
|
||||||
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' || startsWith(github.head_ref, 'integration/') }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
notify-argocd:
|
notify-argocd:
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
needs:
|
needs:
|
||||||
- build-and-push-frontend-generic
|
- build-and-push-frontend-generic
|
||||||
- build-and-push-frontend-dinum
|
- build-and-push-frontend-dinum
|
||||||
|
|||||||
@@ -7,14 +7,18 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- "*"
|
- "*"
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint-git:
|
lint-git:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name == 'pull_request' # Makes sense only for pull requests
|
if: github.event_name == 'pull_request' # Makes sense only for pull requests
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: show
|
- name: show
|
||||||
@@ -39,9 +43,11 @@ jobs:
|
|||||||
if: |
|
if: |
|
||||||
contains(github.event.pull_request.labels.*.name, 'noChangeLog') == false &&
|
contains(github.event.pull_request.labels.*.name, 'noChangeLog') == false &&
|
||||||
github.event_name == 'pull_request'
|
github.event_name == 'pull_request'
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 50
|
fetch-depth: 50
|
||||||
- name: Check that the CHANGELOG has been modified in the current branch
|
- name: Check that the CHANGELOG has been modified in the current branch
|
||||||
@@ -49,9 +55,11 @@ jobs:
|
|||||||
|
|
||||||
lint-changelog:
|
lint-changelog:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Check CHANGELOG max line length
|
- name: Check CHANGELOG max line length
|
||||||
run: |
|
run: |
|
||||||
max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
|
max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
|
||||||
@@ -62,20 +70,22 @@ jobs:
|
|||||||
|
|
||||||
build-mails:
|
build-mails:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/mail
|
working-directory: src/mail
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install Node.js
|
- name: Install Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v6
|
||||||
with:
|
with:
|
||||||
node-version: "18"
|
node-version: "18"
|
||||||
|
|
||||||
- name: Restore the mail templates
|
- name: Restore the mail templates
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
id: mail-templates
|
id: mail-templates
|
||||||
with:
|
with:
|
||||||
path: "src/backend/core/templates/mail"
|
path: "src/backend/core/templates/mail"
|
||||||
@@ -95,63 +105,72 @@ jobs:
|
|||||||
|
|
||||||
- name: Cache mail templates
|
- name: Cache mail templates
|
||||||
if: steps.mail-templates.outputs.cache-hit != 'true'
|
if: steps.mail-templates.outputs.cache-hit != 'true'
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: "src/backend/core/templates/mail"
|
path: "src/backend/core/templates/mail"
|
||||||
key: mail-templates-${{ hashFiles('src/mail/mjml') }}
|
key: mail-templates-${{ hashFiles('src/mail/mjml') }}
|
||||||
|
|
||||||
lint-back:
|
lint-back:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/backend
|
working-directory: src/backend
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Install Python
|
- name: Install Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: "3.13"
|
python-version: "3.13"
|
||||||
cache: "pip"
|
- name: Install uv
|
||||||
- name: Install development dependencies
|
uses: astral-sh/setup-uv@v7
|
||||||
run: pip install --user .[dev]
|
- name: Install the project
|
||||||
|
run: uv sync --locked --all-extras
|
||||||
|
|
||||||
- name: Check code formatting with ruff
|
- name: Check code formatting with ruff
|
||||||
run: ~/.local/bin/ruff format . --diff
|
run: uv run ruff format . --diff
|
||||||
- name: Lint code with ruff
|
- name: Lint code with ruff
|
||||||
run: ~/.local/bin/ruff check .
|
run: uv run ruff check .
|
||||||
- name: Lint code with pylint
|
- name: Lint code with pylint
|
||||||
run: ~/.local/bin/pylint meet demo core
|
run: uv run pylint meet demo core
|
||||||
|
|
||||||
lint-agents:
|
lint-agents:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/agents
|
working-directory: src/agents
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Install Python
|
- name: Install Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: "3.13"
|
python-version: "3.13"
|
||||||
cache: "pip"
|
- name: Install uv
|
||||||
- name: Install development dependencies
|
uses: astral-sh/setup-uv@v7
|
||||||
run: pip install --user .[dev]
|
- name: Install the project
|
||||||
|
run: uv sync --locked --all-extras
|
||||||
- name: Check code formatting with ruff
|
- name: Check code formatting with ruff
|
||||||
run: ~/.local/bin/ruff format . --diff
|
run: uv run ruff format . --diff
|
||||||
- name: Lint code with ruff
|
- name: Lint code with ruff
|
||||||
run: ~/.local/bin/ruff check .
|
run: uv run ruff check .
|
||||||
|
|
||||||
lint-summary:
|
lint-summary:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/summary
|
working-directory: src/summary
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Install Python
|
- name: Install Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: "3.13"
|
python-version: "3.13"
|
||||||
cache: "pip"
|
cache: "pip"
|
||||||
@@ -165,7 +184,8 @@ jobs:
|
|||||||
test-back:
|
test-back:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build-mails
|
needs: build-mails
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/backend
|
working-directory: src/backend
|
||||||
@@ -204,8 +224,6 @@ jobs:
|
|||||||
DB_PORT: 5432
|
DB_PORT: 5432
|
||||||
REDIS_URL: redis://localhost:6379/1
|
REDIS_URL: redis://localhost:6379/1
|
||||||
STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
|
STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
|
||||||
LIVEKIT_API_SECRET: secret
|
|
||||||
LIVEKIT_API_KEY: devkey
|
|
||||||
AWS_S3_ENDPOINT_URL: http://localhost:9000
|
AWS_S3_ENDPOINT_URL: http://localhost:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
@@ -213,10 +231,11 @@ jobs:
|
|||||||
OIDC_RS_CLIENT_SECRET: ThisIsAnExampleKeyForDevPurposeOnly
|
OIDC_RS_CLIENT_SECRET: ThisIsAnExampleKeyForDevPurposeOnly
|
||||||
OIDC_OP_INTROSPECTION_ENDPOINT: https://oidc.example.com/introspect
|
OIDC_OP_INTROSPECTION_ENDPOINT: https://oidc.example.com/introspect
|
||||||
OIDC_OP_URL: https://oidc.example.com
|
OIDC_OP_URL: https://oidc.example.com
|
||||||
|
MEDIA_BASE_URL: http://localhost:8083
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Create writable /data
|
- name: Create writable /data
|
||||||
run: |
|
run: |
|
||||||
@@ -224,7 +243,7 @@ jobs:
|
|||||||
sudo mkdir -p /data/static
|
sudo mkdir -p /data/static
|
||||||
|
|
||||||
- name: Restore the mail templates
|
- name: Restore the mail templates
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
id: mail-templates
|
id: mail-templates
|
||||||
with:
|
with:
|
||||||
path: "src/backend/core/templates/mail"
|
path: "src/backend/core/templates/mail"
|
||||||
@@ -258,13 +277,13 @@ jobs:
|
|||||||
mc mb meet/meet-media-storage"
|
mc mb meet/meet-media-storage"
|
||||||
|
|
||||||
- name: Install Python
|
- name: Install Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: "3.13"
|
python-version: "3.13"
|
||||||
cache: "pip"
|
- name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v7
|
||||||
- name: Install development dependencies
|
- name: Install the dependencies
|
||||||
run: pip install --user .[dev]
|
run: uv sync --locked --all-extras
|
||||||
|
|
||||||
- name: Install gettext (required to compile messages)
|
- name: Install gettext (required to compile messages)
|
||||||
run: |
|
run: |
|
||||||
@@ -272,16 +291,61 @@ jobs:
|
|||||||
sudo apt-get install -y gettext
|
sudo apt-get install -y gettext
|
||||||
|
|
||||||
- name: Generate a MO file from strings extracted from the project
|
- name: Generate a MO file from strings extracted from the project
|
||||||
run: python manage.py compilemessages
|
run: uv run python manage.py compilemessages
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: ~/.local/bin/pytest -n 2
|
run: uv run pytest -n 2
|
||||||
|
|
||||||
|
test-summary:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
working-directory: src/summary
|
||||||
|
|
||||||
|
env:
|
||||||
|
AUTHORIZED_TENANTS: '[{"id": "test-tenant", "api_key": "test-api-token", "webhook_url": "https://example.com/webhook", "webhook_api_key": "test-webhook-api-key"}]'
|
||||||
|
AWS_STORAGE_BUCKET_NAME: "http://meet-media-storage"
|
||||||
|
AWS_S3_ENDPOINT_URL: "minio:9000"
|
||||||
|
AWS_S3_ACCESS_KEY_ID: "meet"
|
||||||
|
AWS_S3_SECRET_ACCESS_KEY: "password"
|
||||||
|
WHISPERX_BASE_URL: "https://configure-your-url.com"
|
||||||
|
WHISPERX_ASR_MODEL: "large-v2"
|
||||||
|
WHISPERX_API_KEY: "test-whisperx-secret"
|
||||||
|
WHISPERX_DEFAULT_LANGUAGE: "fr"
|
||||||
|
LLM_BASE_URL: "https://configure-your-url.com"
|
||||||
|
LLM_API_KEY: "test-llm-secret"
|
||||||
|
LLM_MODEL: "test-llm-model"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install ffmpeg
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y ffmpeg
|
||||||
|
|
||||||
|
- name: Install Python
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: "3.13"
|
||||||
|
cache: "pip"
|
||||||
|
|
||||||
|
- name: Install development dependencies
|
||||||
|
run: pip install --user .[dev]
|
||||||
|
|
||||||
|
- name: Run summary tests
|
||||||
|
run: ~/.local/bin/pytest
|
||||||
|
|
||||||
lint-front:
|
lint-front:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: cd src/frontend/ && npm ci
|
run: cd src/frontend/ && npm ci
|
||||||
@@ -294,12 +358,14 @@ jobs:
|
|||||||
|
|
||||||
lint-sdk:
|
lint-sdk:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/sdk/library
|
working-directory: src/sdk/library
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
@@ -312,13 +378,15 @@ jobs:
|
|||||||
|
|
||||||
build-sdk:
|
build-sdk:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
needs: lint-sdk
|
needs: lint-sdk
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: src/sdk/library
|
working-directory: src/sdk/library
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# /!\
|
||||||
|
# Security Note: This action is not hardened against prompt injection attacks and should only be used
|
||||||
|
# to review trusted PRs. Configure your repository with "Require approval for all external contributors"
|
||||||
|
# to ensure workflows only run after a maintainer has reviewed the PR.
|
||||||
|
name: Security Review
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write # Needed for leaving PR comments
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- 'main'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
security:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.event.pull_request.head.sha || github.sha }}
|
||||||
|
fetch-depth: 2
|
||||||
|
|
||||||
|
- uses: anthropics/claude-code-security-review@0c6a49f1fa56a1d472575da86a94dbc1edb78eda
|
||||||
|
with:
|
||||||
|
comment-pr: true
|
||||||
|
exclude-directories: docs,gitlint,LICENSES,bin
|
||||||
|
claude-api-key: ${{ secrets.CLAUDE_API_KEY }}
|
||||||
@@ -31,6 +31,7 @@ MANIFEST
|
|||||||
|
|
||||||
# Translations # Translations
|
# Translations # Translations
|
||||||
*.pot
|
*.pot
|
||||||
|
*.mo
|
||||||
|
|
||||||
# Environments
|
# Environments
|
||||||
.env
|
.env
|
||||||
@@ -82,3 +83,6 @@ docker/livekit/out
|
|||||||
|
|
||||||
# LiveKit CA configuration
|
# LiveKit CA configuration
|
||||||
docker/livekit/rootCA.pem
|
docker/livekit/rootCA.pem
|
||||||
|
|
||||||
|
# Frontend rollup-plugin-visualizer
|
||||||
|
/src/frontend/rollup-plugin-visualizer/*
|
||||||
|
|||||||
@@ -8,19 +8,478 @@ and this project adheres to
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.23.0] - 2026-07-08
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(backend) extend analytics module to support feature flags
|
||||||
|
- ✨(backend) implement feature flags in Posthog analytics backend
|
||||||
|
- ✨(agents) report errors to Sentry for all LiveKit agents
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ⬆️(agents) upgrade to python 3.14 slim
|
||||||
|
- ⬆️(dependencies) update python dependencies
|
||||||
|
- 💥(summary) remove v1 related code #1362
|
||||||
|
- ✨(meet) use compatible with summary v2 #1362
|
||||||
|
- ♻️(backend) refactor analytics backend from Protocol to abstract class
|
||||||
|
- 🔥(summary) remove call to summary enabled feature flag
|
||||||
|
- ♻️(frontend) wrap MuteEveryoneButton with AdminOrOwnerOnly
|
||||||
|
- ⬆️(frontend) upgrade livekit-client from 2.19.0 to 2.19.2
|
||||||
|
- ⬆️(frontend) upgrade posthog-js from 1.386.5 to 1.387.0
|
||||||
|
- ⬆️(frontend) upgrade @tanstack/react-query from 5.100.14 to 5.101.0
|
||||||
|
- ⬆️(frontend) update the frontend build image to Node 22
|
||||||
|
- 🔒️(frontend) update docker image to nginx-unprivileged:1.30.3-alpine3.23
|
||||||
|
- ✨(summary) more precise analytics events
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🚀(front) fix frontend build failure
|
||||||
|
- 🐛(makefile) fix args in make test
|
||||||
|
- 🩹(backend) fix case-insensitive email deduplication in merge command
|
||||||
|
- 🐛(summary) support media files with bad streams #1478
|
||||||
|
|
||||||
|
## [1.22.0] - 2026-07-03
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(frontend) cap and paginate tiles in picture-in-picture #1383
|
||||||
|
- 📝(docs) document rebranding the favicon via a volume mount #1443
|
||||||
|
- ✨(backend) add command to clean pending and deleted files
|
||||||
|
- 🧱(helm) run clean files command as cronjob
|
||||||
|
- ✨(backend) add fallback to save recordings without S3/MinIO webhooks
|
||||||
|
- 🩹(frontend) enable screen share button in PiP #1458
|
||||||
|
- 🐛(backend) support unencoded S3 notification object keys #1455
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ✨(summary) generalized stt api call #1420
|
||||||
|
- ♻️(env) refactor env variables handling
|
||||||
|
- 🚸(frontend) use "Advanced" instead of "Premium" in the sidepanel
|
||||||
|
- ♿️(frontend) make fullscreen share warning keyboard accessible #1459
|
||||||
|
- ⬆️(summary) update docker alpine to 3.24 & ffmpeg to 8.1.2 #1471
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🛂(backend) reject user access tokens on the API
|
||||||
|
- 🩹(helm) fix Helm ingress rendering when passing multiple hosts
|
||||||
|
|
||||||
|
## [1.21.0] - 2026-06-15
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(frontend) allow disabling silent login via a URL parameter
|
||||||
|
- ✨(frontend) allow hiding the login button via a URL parameter
|
||||||
|
- ✨(summary) add optional satisfaction survey footer
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ✨(frontend) enhance noise reduction with BBBA audio processing pipeline
|
||||||
|
- 🚸(frontend) mute join notification sound in larger rooms
|
||||||
|
- 🚸(frontend) mute participants by default when joining a large meeting
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(frontend) fix metadata agent collector enabled check
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- ♿️(frontend) improve accessibilty of the Effects panel #1401
|
||||||
|
|
||||||
|
## [1.20.0] - 2026-06-12
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♻️(addon) improve Outlook add-on: i18n support, feedback link, smarter link
|
||||||
|
- ⬆️(frontend) upgrade react-i18next from 15.1.1 to 17.0.8
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(frontend) fix noise reduction left-channel-only audio
|
||||||
|
|
||||||
|
## [1.19.0] - 2026-06-04
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(backend) add file specific admin #1387
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 🐛(agents) fix bug when closing metadata-collector
|
||||||
|
- ⬆️(dependencies) update python dependencies
|
||||||
|
- ⬆️(frontend) update js dependencies
|
||||||
|
- ♻️(agents) replace deprecated room options API
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔇(summary) make ffmpeg quiet #1404
|
||||||
|
- 🔒️(backend) prevent accessing files if they are not ready #1395
|
||||||
|
- # ⬆️(backend) upgrade idna to >=3.15 to address CVE-2026-45409
|
||||||
|
|
||||||
|
## [1.18.0] - 2026-06-03
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- 🔧(backend) backport logging configuration from docs
|
||||||
|
- 🧑💻(backend) add management command to merge duplicate users
|
||||||
|
- 👷(helm) add Kubernetes job for duplicate user merge command
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(backend) prevent duplicate pending users on concurrent requests
|
||||||
|
- 🔒️(backend) prevent file change post checks #1377
|
||||||
|
|
||||||
|
## [1.17.0] - 2026-05-31
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(fullstack) allow participants to mute others based on room configuration
|
||||||
|
- ✨(frontend) add synchronizer for room metadata updates
|
||||||
|
- ✨(frontend) make reaction toolbar responsive on small viewports
|
||||||
|
- ✨(frontend) enable reactions on mobile devices
|
||||||
|
- ✨(frontend) introduce picture-in-picture meeting
|
||||||
|
- ✨(backend) add core.recording.event.parsers.S3Parser
|
||||||
|
- ✨(summary) extended support for all video / audio files #1358
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♻️(fullstack) simplify source serialization
|
||||||
|
- ✨(backend) expose room configuration to all API consumers
|
||||||
|
- 🩹(frontend) improve reaction toolbar centering with dynamic positioning
|
||||||
|
- 🚀 (paas) remove buildpack requirements.txt to use the new uv.lock #1349
|
||||||
|
- ✨(backend) allow room configuration and access level via external api #1260
|
||||||
|
- ♻️(backend) prefix Swagger routes with /api
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🩹(backend) fix swagger and redoc documentation URLs
|
||||||
|
|
||||||
|
## [1.16.0] - 2026-05-13
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- 🔒️(backend) add validation of Room.configuration
|
||||||
|
- ✨(helm) add support multiple transcribe worker / endpoint #1247
|
||||||
|
- ✨(backend) make LiveKit Egress recording encoding configurable #1288
|
||||||
|
- ✨(summary) add speaker-to-participant assignment
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♻️(summary) change tasks endpoint signature
|
||||||
|
- ⬆️(dependencies) update urllib3 to v2.7.0 [SECURITY]
|
||||||
|
- 🧑💻(agents) use `uv` for package management
|
||||||
|
- ✨(summary) improve speaker-to-participant assignment
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- ♻(frontend) standardize role terminology across localizations
|
||||||
|
- 🐛(backend) make start-recording atomic and fault-tolerant
|
||||||
|
- 🔒️(frontend) room ids are generated with non-cryptographic rand
|
||||||
|
- ⬆️(mail) fix dependencies not having resolved or integrity field #1321
|
||||||
|
- 🐛(summary) complete webm support #1328
|
||||||
|
- 🐛(backend) add link to "Open" text in recording email
|
||||||
|
- 🩹(frontend) fix spacing regression in mobile control bar
|
||||||
|
|
||||||
|
## [1.15.0] - 2026-04-30
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(backend) add metadata collection of VAD, connection and chat events
|
||||||
|
- ✨(backend) introduce add-ons authentication backend
|
||||||
|
- 💬(backend) clarify french transcription audio download link text #1299
|
||||||
|
- 🚧(addons) introduce initial Microsoft Outlook add-in support (alpha)
|
||||||
|
- 🔧(backend) add setting to toggle application token exchange mechanism
|
||||||
|
- ✨(backend) support add-ons authentication in external viewset
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(summary) support webm #1290
|
||||||
|
- ⬆️(backend) bump django-lasuite to v0.0.26
|
||||||
|
- 🩹(frontend) use a more standard (quality) rating scale
|
||||||
|
- 🩹(frontend) fix access control for screen recording feature flag
|
||||||
|
- 🩹(frontend) fix reconnect loop caused by connectionObserverStore updates
|
||||||
|
|
||||||
|
## [1.14.0] - 2026-04-16
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- 🔒️(helm) Add pod and container securityContext #1197
|
||||||
|
- ✨(summary) add routes v2 for async STT and summary tasks #1171
|
||||||
|
- ✅(backend) add unit tests for JwtTokenService #1232
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ⬆️(backend) bump lodash from 4.17.23 to 4.18.1 in /src/mail
|
||||||
|
- ⬆️(frontend) bump hono from 4.12.8 to 4.12.12 in /src/frontend
|
||||||
|
- ⬆️(backend) bump pygments from 2.19.2 to 2.20.0 in /src/backend
|
||||||
|
- ♻️(backend) use Authorization header for LiveKit token authentication
|
||||||
|
- 🥅(backend) refine Twirp error handling for participant operations
|
||||||
|
- ✨(summary) allow more file extensions #1265
|
||||||
|
- ♿️(frontend) refocus reactions toolbar with ctrl+shift+e is activated #1262
|
||||||
|
- ♿️(frontend) set an explicit document title on recording download page #1261
|
||||||
|
- ♿️(frontend) add customizable accessibility fonts #1270
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- ⬆️(dependencies) update aiohttp to v3.13.4 [SECURITY]
|
||||||
|
- ⬆️(dependencies) update vite to v7.3.2 [SECURITY]
|
||||||
|
- ⬆️(dependencies) update django to v5.2.13 [SECURITY]
|
||||||
|
- 🔒(backend) rely on backend to allow participant update their metadata
|
||||||
|
- 🐛(summary) fix failure webhook notification #1233
|
||||||
|
- 🐛(summary) relax whisperX payload format #1233
|
||||||
|
- ⬆️(backend) upgrade dependencies to fix Pillow CVE-2026-40192
|
||||||
|
- ⬆️(frontend) upgrade frontend image to Alpine 3.23 to address CVEs
|
||||||
|
|
||||||
|
## [1.13.0] - 2026-03-31
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ⬆️(dependencies) update python dependencies
|
||||||
|
- ♿️(frontend) add explicit region for call controls #1216
|
||||||
|
- ♿️(frontend) improve accessibility of the reaction toolbar #1216
|
||||||
|
- ♿️(frontend) enhance sidepanel navigation accessibility #1216
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔒️(backend) fix email disclosure in room invitation endpoint #1200
|
||||||
|
- 🐛(backend) fix regression in update-participant endpoint #1204
|
||||||
|
|
||||||
|
## [1.12.0] - 2026-03-24
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♻️(backend) configurable SESSION_ENGINE #1038 #1154
|
||||||
|
- ♿️(frontend) fix sidepanel accessibility aria-label #1182
|
||||||
|
- ♿️(frontend) fix more tools heading hierarchy #1181
|
||||||
|
- ♿️(fronted) improve button descriptions for More tools actions #1184
|
||||||
|
- 💄(spinner) enforce spinner height #1183
|
||||||
|
- 💄(custom-background) add upload indicator with preview #1183
|
||||||
|
- ♿️(backend) improve logo accessibility in recording email notification #1092
|
||||||
|
- ♿️(summary) improve accessibility of transcription download link #1187
|
||||||
|
- 💄(frontend) show OS-specific shortcut in participant tile hint #1193
|
||||||
|
- ⬆️(frontend) bump flatted from 3.3.1 to 3.4.2 in /src/frontend #1188
|
||||||
|
- ⬆️️️(frontend) bump undici from 6.23.0 to 6.24.1 in /src/frontend
|
||||||
|
- ⬆️️️(frontend) bump hono from 4.12.2 to 4.12.7 in /src/frontend
|
||||||
|
- ⬆️️️(frontend) bump dompurify from 3.3.1 to 3.3.2 in /src/frontend
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(frontend) disable personal custom background while deleting #1183
|
||||||
|
- 🐛(frontend) auto-select new custom background when not logged in #1183
|
||||||
|
- 🐛(frontend) fix device selection not applying during conference #1156
|
||||||
|
|
||||||
|
## [1.11.0] - 2026-03-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(helm) support celery with our Django backend #1124
|
||||||
|
- ✨(helm) support ingress for custom background image #1124
|
||||||
|
- ✨(backend) add authenticated user rate throttling on request-entry #1129
|
||||||
|
- ✨(backend) expose `is_active` field for Application in Django admin #1133
|
||||||
|
- ✨(file-upload) disable by default & limit count by user #1141
|
||||||
|
- ✨(frontend) custom background #1067
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♿️(frontend) Caption text size setting for accessibility #1062
|
||||||
|
- ♿️(frontend) sync html lang attribute with i18n for screen readers #1111
|
||||||
|
- ♿️(frontend) improve MoreLink a11y and UX on home page #1112
|
||||||
|
- ♿️(frontend) improve chat toast a11y for screen readers #1109
|
||||||
|
- ♿️(frontend) improve ui and aria labels for help article links #1108
|
||||||
|
- 🌐(frontend) improve German translation #1125
|
||||||
|
- 🔨(python-env) migrate meet main app to UV #1120
|
||||||
|
- ♻️(backend) align Application model field with `is_active` convention #1133
|
||||||
|
- 🔐(backend) avoids revealing the inactive status of an application #1135
|
||||||
|
- ⚡️(helm) reduce initialDelaySeconds and add periods seconds #1139
|
||||||
|
- 🔒️(backend) avoid information exposure through exception messages #1144
|
||||||
|
- ⬆️(dependencies) update PyJWT to v2.12.0 [SECURITY] #1151
|
||||||
|
- 📌(agents) unpin OpenSSL and related dependencies #1167
|
||||||
|
- ♿️(frontend) add caption font and background color customization #1122
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(frontend) fix hand icon and queue position alignment and position #1119
|
||||||
|
- 🩹(backend) add page_size to pagination for room endpoints #1131
|
||||||
|
- 🐛(backend) refactor lobby throttling to use participant id #1129
|
||||||
|
- 🩹(backend) ignore non-recording uploads in storage webhook handler #1142
|
||||||
|
- 🐛(frontend) fix dimension mismatch in BackgroundCustomProcessor #1116
|
||||||
|
|
||||||
|
## [1.10.0] - 2026-03-05
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 🔒️(backend) enhance API input validation to strengthen security #1053
|
||||||
|
- 🦺(backend) strengthen API validation for recording options #1063
|
||||||
|
- ⚡️(frontend) optimize few performance caveats #1073
|
||||||
|
- 🔒️(helm) introduce a dedicated Kubernetes Ingress for webhook-livekit #1066
|
||||||
|
- ⬆️(deps) bump rollup from 4.44.2 to 4.59.0 in /src/frontend #1088
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(migrations) use settings in migrations #1058
|
||||||
|
- 💄(frontend) truncate pinned participant name with ellipsis on overflow #1056
|
||||||
|
- ♿(frontend) prevent focus ring clipping on invite dialog #1078
|
||||||
|
- ♿(frontend) dynamic tab title when connected to meeting #1060
|
||||||
|
- 🩹(frontend) remove incorrect reference to ProConnect on the prejoin #1080
|
||||||
|
- ✨(frontend) add Ctrl+Shift+/ to open shortcuts settings #1050
|
||||||
|
- ♿(frontend) announce selected state to screen readers #1081
|
||||||
|
- 💄(frontend) truncate long names with ellipsis in reaction overlay #1099
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(backend) add file upload feature #1030
|
||||||
|
|
||||||
|
## [1.9.0] - 2026-03-02
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- 👷(docker) add arm64 platform support for image builds
|
||||||
|
- ✨(summary) add localization support for transcription context text
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♻️(frontend) replace custom reactions toolbar with react aria popover #985
|
||||||
|
- 🔒️(frontend) uninstall curl from the frontend production image #987
|
||||||
|
- 💄(frontend) add focus ring to reaction emoji buttons
|
||||||
|
- ✨(frontend) introduce a shortcut settings tab #975
|
||||||
|
- 🚚(frontend) rename "wellknown" directory to "well-known" #1009
|
||||||
|
- 🌐(frontend) localize SR modifier labels #1010
|
||||||
|
- ⬆️(backend) update python dependencies #1011
|
||||||
|
- ♿️(frontend) fix focus ring on tab container components #1012
|
||||||
|
- ♿️(frontend) upgrade join meeting modal accessibility #1027
|
||||||
|
- ⬆️(python) bump minimal required python version to 3.13 #1033
|
||||||
|
- ♿️(frontend) improve accessibility of the IntroSlider carousel #1026
|
||||||
|
- ♿️(frontend) add skip link component for keyboard navigation #1019
|
||||||
|
- ♿️(frontend) announce mic/camera state to SR on shortcut toggle #1052
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🩹(frontend) fix German language preference update #1021
|
||||||
|
|
||||||
|
## [1.8.0] - 2026-02-20
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 🔒️(agents) uninstall pip from the agents image
|
||||||
|
- 🔒️(summary) switch to Alpine base image
|
||||||
|
- 🔒️(backend) uninstall pip in the production image
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔒️(agents) upgrade OpenSSL to address CVE-2025-15467
|
||||||
|
- 📌(agents) pin protobuf to 6.33.5 to fix CVE-2026-0994
|
||||||
|
|
||||||
|
## [1.7.0] - 2026-02-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(frontend) expose Windows app web link #976
|
||||||
|
- ✨(frontend) support additional shortcuts to broaden accessibility
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ✨(frontend) add clickable settings general link in idle modal #974
|
||||||
|
- ♻️(backend) refactor external API token-related items #1006
|
||||||
|
|
||||||
|
## [1.6.0] - 2026-02-10
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(backend) monitor throttling rate failure through sentry #964
|
||||||
|
- 🚀(paas) add PaaS deployment scripts, tested on Scalingo #957
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♿️(frontend) improve spinner reduced‑motion fallback #931
|
||||||
|
- ♿️(frontend) fix form labels and autocomplete wiring #932
|
||||||
|
- 🥅(summary) catch file-related exceptions when handling recording #944
|
||||||
|
- 📝(frontend) update legal terms #956
|
||||||
|
- ⚡️(backend) enhance django admin's loading performance #954
|
||||||
|
- 🌐(frontend) add missing DE translation for accessibility settings
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔐(backend) enforce object-level permission checks on room endpoint #959
|
||||||
|
- 🔒️(backend) add application validation when consuming external JWT #963
|
||||||
|
|
||||||
|
## [1.5.0] - 2026-01-28
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♿️(frontend) adjust visual-only tooltip a11y labels #910
|
||||||
|
- ♿️(frontend) sr pin/unpin announcements with dedicated messages #898
|
||||||
|
- ♿(frontend) adjust sr announcements for idle disconnect timer #908
|
||||||
|
- ♿️(frontend) add global screen reader announcer#922
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔒️(frontend) fix an XSS vulnerability on the recording page #911
|
||||||
|
|
||||||
|
## [1.4.0] - 2026-01-25
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(frontend) add configurable redirect for unauthenticated users #904
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- ♿️(frontend) add accessible back button in side panel #881
|
||||||
|
- ♿️(frontend) improve participants toggle a11y label #880
|
||||||
|
- ♿️(frontend) make carousel image decorative #871
|
||||||
|
- ♿️(frontend) reactions are now vocalized and configurable #849
|
||||||
|
- ♿️(frontend) improve background effect announcements #879
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🔒(backend) prevent automatic upgrade setuptools
|
||||||
|
- ♿(frontend) improve contrast for selected options #863
|
||||||
|
- ♿️(frontend) announce copy state in invite dialog #877
|
||||||
|
- 📝(frontend) align close dialog label in rooms locale #878
|
||||||
|
- 🩹(backend) use case-insensitive email matching in the external api #887
|
||||||
|
- 🐛(frontend) ensure transcript segments are sorted by their timestamp #899
|
||||||
|
- 🐛(frontend) scope scrollbar gutter override to video rooms #882
|
||||||
|
|
||||||
|
## [1.3.0] - 2026-01-13
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ✨(summary) add dutch and german languages
|
||||||
|
- 🔧(agents) make Silero VAD optional
|
||||||
|
- 🚸(frontend) explain to a user they were ejected
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 📈(frontend) track new recording's modes
|
||||||
|
- ♿️(frontend) improve accessibility of the background and effects menu
|
||||||
|
- ♿️(frontend) improve SR and focus for transcript and recording #810
|
||||||
|
- 💄(frontend) adjust spacing in the recording side panels
|
||||||
|
- 🚸(frontend) remove the default comma delimiter in humanized durations
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- 🐛(frontend) remove unexpected F2 tooltip when clicking video screen
|
||||||
|
- 🩹(frontend) icon font loading to avoid text/icon flickering
|
||||||
|
|
||||||
|
## [1.2.0] - 2026-01-05
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
- ✨(agent) support Kyutai client for subtitle
|
- ✨(agent) support Kyutai client for subtitle
|
||||||
- ✨(frontend) remove the beta badge
|
|
||||||
- ✨(all) support starting transcription and recording simultaneously
|
- ✨(all) support starting transcription and recording simultaneously
|
||||||
- ✨(backend) persist options on a recording
|
- ✨(backend) persist options on a recording
|
||||||
- ✨(all) support choosing the transcription language
|
- ✨(all) support choosing the transcription language
|
||||||
- ✨(summary) add a download link to the audio/video file
|
- ✨(summary) add a download link to the audio/video file
|
||||||
- ✨(frontend) allow unprivileged users to request a recording
|
- ✨(frontend) allow unprivileged users to request a recording
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 🚸(frontend) remove the beta badge
|
||||||
- ♻️(summary) extract file handling in a robust service
|
- ♻️(summary) extract file handling in a robust service
|
||||||
- ♻️(all) manage recording state on the backend side
|
- ♻️(all) manage recording state on the backend side
|
||||||
|
|
||||||
## [1.1.0] - 2025-12-22
|
## [1.1.0] - 2025-12-22
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- ✨(backend) enable user creation via email for external integrations
|
- ✨(backend) enable user creation via email for external integrations
|
||||||
- ✨(summary) add Langfuse observability for LLM API calls
|
- ✨(summary) add Langfuse observability for LLM API calls
|
||||||
@@ -32,6 +491,6 @@ and this project adheres to
|
|||||||
- ♿(frontend) improve accessibility:
|
- ♿(frontend) improve accessibility:
|
||||||
- ♿️(frontend) hover controls, focus, SR #803
|
- ♿️(frontend) hover controls, focus, SR #803
|
||||||
- ♿️(frontend) change ptt keybinding from space to v #813
|
- ♿️(frontend) change ptt keybinding from space to v #813
|
||||||
- ♿(frontend) indicate external link opens in new window on feedback #816
|
- ♿(frontend) indicate external link opens in new window on feedback #816
|
||||||
- ♿(frontend) fix heading level in modal to maintain semantic hierarchy #815
|
- ♿(frontend) fix heading level in modal to maintain semantic hierarchy #815
|
||||||
- ♿️(frontend) Improve focus management when opening and closing chat #807
|
- ♿️(frontend) Improve focus management when opening and closing chat #807
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
FROM python:3.13.5-alpine3.21 AS base
|
FROM python:3.13.5-alpine3.21 AS base
|
||||||
|
|
||||||
# Upgrade pip to its latest release to speed up dependencies installation
|
# Upgrade pip to its latest release to speed up dependencies installation
|
||||||
RUN python -m pip install --upgrade pip setuptools
|
RUN python -m pip install --upgrade pip
|
||||||
|
|
||||||
# Upgrade system packages to install security updates
|
# Upgrade system packages to install security updates
|
||||||
RUN apk update && \
|
RUN apk update && \
|
||||||
@@ -13,14 +13,28 @@ RUN apk update && \
|
|||||||
# ---- Back-end builder image ----
|
# ---- Back-end builder image ----
|
||||||
FROM base AS back-builder
|
FROM base AS back-builder
|
||||||
|
|
||||||
WORKDIR /builder
|
|
||||||
|
|
||||||
# Copy required python dependencies
|
ENV UV_COMPILE_BYTECODE=1
|
||||||
COPY ./src/backend /builder
|
ENV UV_LINK_MODE=copy
|
||||||
|
|
||||||
RUN mkdir /install && \
|
# Disable Python downloads, because we want to use the system interpreter
|
||||||
pip install --prefix=/install .
|
# across both images. If using a managed Python version, it needs to be
|
||||||
|
# copied from the build image into the final image;
|
||||||
|
ENV UV_PYTHON_DOWNLOADS=0
|
||||||
|
|
||||||
|
# install uv
|
||||||
|
COPY --from=ghcr.io/astral-sh/uv:0.10.9 /uv /uvx /bin/
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
--mount=type=bind,source=src/backend/uv.lock,target=uv.lock \
|
||||||
|
--mount=type=bind,source=src/backend/pyproject.toml,target=pyproject.toml \
|
||||||
|
uv sync --locked --no-install-project --no-dev
|
||||||
|
COPY src/backend /app
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
uv sync --locked --no-dev
|
||||||
|
|
||||||
# ---- mails ----
|
# ---- mails ----
|
||||||
FROM node:20 AS mail-builder
|
FROM node:20 AS mail-builder
|
||||||
@@ -30,7 +44,7 @@ COPY ./src/mail /mail/app
|
|||||||
WORKDIR /mail/app
|
WORKDIR /mail/app
|
||||||
|
|
||||||
RUN yarn install --frozen-lockfile && \
|
RUN yarn install --frozen-lockfile && \
|
||||||
yarn build
|
yarn build
|
||||||
|
|
||||||
|
|
||||||
# ---- static link collector ----
|
# ---- static link collector ----
|
||||||
@@ -39,19 +53,20 @@ ARG MEET_STATIC_ROOT=/data/static
|
|||||||
|
|
||||||
RUN apk add \
|
RUN apk add \
|
||||||
pango \
|
pango \
|
||||||
|
libmagic \
|
||||||
rdfind
|
rdfind
|
||||||
|
|
||||||
# Copy installed python dependencies
|
|
||||||
COPY --from=back-builder /install /usr/local
|
|
||||||
|
|
||||||
# Copy Meet application (see .dockerignore)
|
|
||||||
COPY ./src/backend /app/
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy the application from the builder
|
||||||
|
COPY --from=back-builder /app /app
|
||||||
|
|
||||||
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
|
|
||||||
|
|
||||||
# collectstatic
|
# collectstatic
|
||||||
RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
|
RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
|
||||||
python manage.py collectstatic --noinput
|
python manage.py collectstatic --noinput
|
||||||
|
|
||||||
# Replace duplicated file by a symlink to decrease the overall size of the
|
# Replace duplicated file by a symlink to decrease the overall size of the
|
||||||
# final image
|
# final image
|
||||||
@@ -68,6 +83,7 @@ RUN apk --no-cache add \
|
|||||||
gettext \
|
gettext \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
pango \
|
pango \
|
||||||
|
libmagic \
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
|
|
||||||
|
|
||||||
@@ -79,14 +95,17 @@ COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
|
|||||||
# docker user (see entrypoint).
|
# docker user (see entrypoint).
|
||||||
RUN chmod g=u /etc/passwd
|
RUN chmod g=u /etc/passwd
|
||||||
|
|
||||||
# Copy installed python dependencies
|
# Copy the application from the builder
|
||||||
COPY --from=back-builder /install /usr/local
|
COPY --from=back-builder /app /app
|
||||||
|
|
||||||
# Copy Meet application (see .dockerignore)
|
|
||||||
COPY ./src/backend /app/
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
|
|
||||||
|
# Generate compiled translation messages
|
||||||
|
RUN DJANGO_CONFIGURATION=Build \
|
||||||
|
python manage.py compilemessages --ignore=".venv/**/*"
|
||||||
|
|
||||||
# We wrap commands run in this container by the following entrypoint that
|
# We wrap commands run in this container by the following entrypoint that
|
||||||
# creates a user on-the-fly with the container user ID (see USER) and root group
|
# creates a user on-the-fly with the container user ID (see USER) and root group
|
||||||
# ID.
|
# ID.
|
||||||
@@ -101,10 +120,9 @@ USER root:root
|
|||||||
# Install psql
|
# Install psql
|
||||||
RUN apk add postgresql-client
|
RUN apk add postgresql-client
|
||||||
|
|
||||||
# Uninstall Meet and re-install it in editable mode along with development
|
# Install development dependencies
|
||||||
# dependencies
|
RUN --mount=from=ghcr.io/astral-sh/uv:0.10.9,source=/uv,target=/bin/uv \
|
||||||
RUN pip uninstall -y meet
|
uv sync --all-extras --locked
|
||||||
RUN pip install -e .[dev]
|
|
||||||
|
|
||||||
# Restore the un-privileged user running the application
|
# Restore the un-privileged user running the application
|
||||||
ARG DOCKER_USER
|
ARG DOCKER_USER
|
||||||
@@ -113,7 +131,7 @@ USER ${DOCKER_USER}
|
|||||||
# Target database host (e.g. database engine following docker compose services
|
# Target database host (e.g. database engine following docker compose services
|
||||||
# name) & port
|
# name) & port
|
||||||
ENV DB_HOST=postgresql \
|
ENV DB_HOST=postgresql \
|
||||||
DB_PORT=5432
|
DB_PORT=5432
|
||||||
|
|
||||||
# Run django development server
|
# Run django development server
|
||||||
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
|
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
|
||||||
@@ -127,6 +145,9 @@ ARG MEET_STATIC_ROOT=/data/static
|
|||||||
RUN mkdir -p /usr/local/etc/gunicorn
|
RUN mkdir -p /usr/local/etc/gunicorn
|
||||||
COPY docker/files/usr/local/etc/gunicorn/meet.py /usr/local/etc/gunicorn/meet.py
|
COPY docker/files/usr/local/etc/gunicorn/meet.py /usr/local/etc/gunicorn/meet.py
|
||||||
|
|
||||||
|
# Remove pip to reduce attack surface in production
|
||||||
|
RUN pip uninstall -y pip
|
||||||
|
|
||||||
# Un-privileged user running the application
|
# Un-privileged user running the application
|
||||||
ARG DOCKER_USER
|
ARG DOCKER_USER
|
||||||
USER ${DOCKER_USER}
|
USER ${DOCKER_USER}
|
||||||
|
|||||||
@@ -23,9 +23,10 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# VARIABLES
|
# VARIABLES
|
||||||
|
|
||||||
BOLD := \033[1m
|
ESC := $(shell printf '\033')
|
||||||
RESET := \033[0m
|
BOLD := $(ESC)[1m
|
||||||
GREEN := \033[1;32m
|
RESET := $(ESC)[0m
|
||||||
|
GREEN := $(ESC)[1;32m
|
||||||
|
|
||||||
|
|
||||||
# -- Database
|
# -- Database
|
||||||
@@ -72,7 +73,10 @@ create-env-files: \
|
|||||||
env.d/development/crowdin \
|
env.d/development/crowdin \
|
||||||
env.d/development/postgresql \
|
env.d/development/postgresql \
|
||||||
env.d/development/kc_postgresql \
|
env.d/development/kc_postgresql \
|
||||||
env.d/development/summary
|
env.d/development/summary \
|
||||||
|
env.d/development/kube-secret \
|
||||||
|
env.d/development/multi_user_transcriber \
|
||||||
|
env.d/development/metadata_collector
|
||||||
.PHONY: create-env-files
|
.PHONY: create-env-files
|
||||||
|
|
||||||
bootstrap: ## Prepare Docker images for the project
|
bootstrap: ## Prepare Docker images for the project
|
||||||
@@ -85,13 +89,15 @@ bootstrap: \
|
|||||||
demo \
|
demo \
|
||||||
back-i18n-compile \
|
back-i18n-compile \
|
||||||
mails-install \
|
mails-install \
|
||||||
mails-build
|
mails-build \
|
||||||
|
run
|
||||||
.PHONY: bootstrap
|
.PHONY: bootstrap
|
||||||
|
|
||||||
# -- Docker/compose
|
# -- Docker/compose
|
||||||
build: ## build the project containers
|
build: ## build the project containers
|
||||||
@$(MAKE) build-backend
|
@$(MAKE) build-backend
|
||||||
@$(MAKE) build-frontend
|
@$(MAKE) build-frontend
|
||||||
|
@$(MAKE) build-agents
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
|
|
||||||
build-backend: ## build the app-dev container
|
build-backend: ## build the app-dev container
|
||||||
@@ -103,6 +109,10 @@ build-frontend: ## build the frontend container
|
|||||||
@$(COMPOSE) build frontend
|
@$(COMPOSE) build frontend
|
||||||
.PHONY: build-frontend
|
.PHONY: build-frontend
|
||||||
|
|
||||||
|
build-agents: ## build the multi-user-transcriber agent container
|
||||||
|
@$(COMPOSE) build multi-user-transcriber-dev
|
||||||
|
.PHONY: build-agents
|
||||||
|
|
||||||
down: ## stop and remove containers, networks, images, and volumes
|
down: ## stop and remove containers, networks, images, and volumes
|
||||||
@$(COMPOSE) down
|
@$(COMPOSE) down
|
||||||
.PHONY: down
|
.PHONY: down
|
||||||
@@ -112,7 +122,8 @@ logs: ## display app-dev logs (follow mode)
|
|||||||
.PHONY: logs
|
.PHONY: logs
|
||||||
|
|
||||||
run-backend: ## start only the backend application and all needed services
|
run-backend: ## start only the backend application and all needed services
|
||||||
@$(COMPOSE) up --force-recreate -d celery-dev
|
@$(COMPOSE) up --force-recreate -d celery-dev --remove-orphans
|
||||||
|
@$(COMPOSE) up --force-recreate -d nginx
|
||||||
@echo "Wait for postgresql to be up..."
|
@echo "Wait for postgresql to be up..."
|
||||||
@$(WAIT_DB)
|
@$(WAIT_DB)
|
||||||
.PHONY: run-backend
|
.PHONY: run-backend
|
||||||
@@ -122,10 +133,24 @@ run-summary: ## start only the summary application and all needed services
|
|||||||
@$(COMPOSE) up --force-recreate -d celery-summary-summarize
|
@$(COMPOSE) up --force-recreate -d celery-summary-summarize
|
||||||
.PHONY: run-summary
|
.PHONY: run-summary
|
||||||
|
|
||||||
|
run-agents: ## start the multi-user-transcriber agent
|
||||||
|
@$(MAKE) run-agent-multi-user-transcriber
|
||||||
|
@$(MAKE) run-agent-metadata-collector
|
||||||
|
.PHONY: run-agents
|
||||||
|
|
||||||
|
run-agent-multi-user-transcriber: ## start the LiveKit agents (multi users transcriber)
|
||||||
|
@$(COMPOSE) up --force-recreate -d multi-user-transcriber-dev
|
||||||
|
.PHONY: run-agent-multi-user-transcriber
|
||||||
|
|
||||||
|
run-agent-metadata-collector: ## start the LiveKit agents (metadata collector)
|
||||||
|
@$(COMPOSE) up --force-recreate -d metadata-collector-dev
|
||||||
|
.PHONY: run-agent-metadata-collector
|
||||||
|
|
||||||
run:
|
run:
|
||||||
run: ## start the wsgi (production) and development server
|
run: ## start the wsgi (production) and development server
|
||||||
@$(MAKE) run-backend
|
@$(MAKE) run-backend
|
||||||
@$(MAKE) run-summary
|
@$(MAKE) run-summary
|
||||||
|
@$(MAKE) run-agents
|
||||||
@$(COMPOSE) up --force-recreate -d frontend
|
@$(COMPOSE) up --force-recreate -d frontend
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
|
|
||||||
@@ -186,20 +211,27 @@ lint-pylint: ## lint back-end python sources with pylint only on changed files f
|
|||||||
@$(COMPOSE_RUN_APP) pylint meet demo core
|
@$(COMPOSE_RUN_APP) pylint meet demo core
|
||||||
.PHONY: lint-pylint
|
.PHONY: lint-pylint
|
||||||
|
|
||||||
test: ## run project tests
|
test: ## run project tests; pass extra pytest args via ARGS, e.g. `make test ARGS="-vv"`
|
||||||
@$(MAKE) test-back-parallel
|
@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
|
||||||
|
$(MAKE) test-back-parallel ARGS="$${args}" && \
|
||||||
|
$(MAKE) test-summary ARGS="$${args}"
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|
||||||
test-back: ## run back-end tests
|
test-back: ## run back-end tests (pass extra pytest args via ARGS)
|
||||||
@args="$(filter-out $@,$(MAKECMDGOALS))" && \
|
@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
|
||||||
bin/pytest $${args:-${1}}
|
bin/pytest $${args}
|
||||||
.PHONY: test-back
|
.PHONY: test-back
|
||||||
|
|
||||||
test-back-parallel: ## run all back-end tests in parallel
|
test-back-parallel: ## run all back-end tests in parallel (pass extra pytest args via ARGS)
|
||||||
@args="$(filter-out $@,$(MAKECMDGOALS))" && \
|
@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
|
||||||
bin/pytest -n auto $${args:-${1}}
|
bin/pytest -n auto $${args}
|
||||||
.PHONY: test-back-parallel
|
.PHONY: test-back-parallel
|
||||||
|
|
||||||
|
test-summary: ## run summary tests (pass extra pytest args via ARGS)
|
||||||
|
@args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \
|
||||||
|
bin/pytest-summary $${args}
|
||||||
|
.PHONY: test-summary
|
||||||
|
|
||||||
makemigrations: ## run django makemigrations for the Meet project.
|
makemigrations: ## run django makemigrations for the Meet project.
|
||||||
@echo "$(BOLD)Running makemigrations$(RESET)"
|
@echo "$(BOLD)Running makemigrations$(RESET)"
|
||||||
@$(COMPOSE) up -d postgresql
|
@$(COMPOSE) up -d postgresql
|
||||||
@@ -220,7 +252,7 @@ superuser: ## Create an admin superuser with password "admin"
|
|||||||
.PHONY: superuser
|
.PHONY: superuser
|
||||||
|
|
||||||
back-i18n-compile: ## compile the gettext files
|
back-i18n-compile: ## compile the gettext files
|
||||||
@$(MANAGE) compilemessages --ignore="venv/**/*"
|
@$(MANAGE) compilemessages --ignore=".venv/**/*"
|
||||||
.PHONY: back-i18n-compile
|
.PHONY: back-i18n-compile
|
||||||
|
|
||||||
back-i18n-generate: ## create the .pot files used for i18n
|
back-i18n-generate: ## create the .pot files used for i18n
|
||||||
@@ -256,6 +288,15 @@ env.d/development/kc_postgresql:
|
|||||||
env.d/development/summary:
|
env.d/development/summary:
|
||||||
cp -n env.d/development/summary.dist env.d/development/summary
|
cp -n env.d/development/summary.dist env.d/development/summary
|
||||||
|
|
||||||
|
env.d/development/kube-secret:
|
||||||
|
cp -n env.d/development/kube-secret.dist env.d/development/kube-secret
|
||||||
|
|
||||||
|
env.d/development/multi_user_transcriber:
|
||||||
|
cp -n env.d/development/multi_user_transcriber.dist env.d/development/multi_user_transcriber
|
||||||
|
|
||||||
|
env.d/development/metadata_collector:
|
||||||
|
cp -n env.d/development/metadata_collector.dist env.d/development/metadata_collector
|
||||||
|
|
||||||
# -- Internationalization
|
# -- Internationalization
|
||||||
|
|
||||||
env.d/development/crowdin:
|
env.d/development/crowdin:
|
||||||
@@ -343,21 +384,15 @@ frontend-i18n-generate: \
|
|||||||
|
|
||||||
# -- K8S
|
# -- K8S
|
||||||
build-k8s-cluster: ## build the kubernetes cluster using kind
|
build-k8s-cluster: ## build the kubernetes cluster using kind
|
||||||
./bin/start-kind.sh
|
build-k8s-cluster: \
|
||||||
.PHONY: build-k8s-cluster
|
env.d/development/kube-secret \
|
||||||
|
./bin/start-kind.sh
|
||||||
install-external-secrets: ## install the kubernetes secrets from Vaultwarden
|
|
||||||
./bin/install-external-secrets.sh
|
|
||||||
.PHONY: build-k8s-cluster
|
|
||||||
|
|
||||||
start-tilt: ## start the kubernetes cluster using kind
|
|
||||||
tilt up -f ./bin/Tiltfile
|
|
||||||
.PHONY: build-k8s-cluster
|
.PHONY: build-k8s-cluster
|
||||||
|
|
||||||
start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak
|
start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak
|
||||||
DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile
|
DEV_ENV=dev-keycloak tilt up --namespace=meet -f ./bin/Tiltfile
|
||||||
.PHONY: build-k8s-cluster
|
.PHONY: build-k8s-cluster
|
||||||
|
|
||||||
start-tilt-dinum: ## start the kubernetes cluster using kind, without Pro Connect for authentication, but with DINUM styles
|
start-tilt-dinum: ## start the kubernetes cluster using kind, without Pro Connect for authentication, but with DINUM styles
|
||||||
DEV_ENV=dev-dinum tilt up -f ./bin/Tiltfile
|
DEV_ENV=dev-dinum tilt up --namespace=meet -f ./bin/Tiltfile
|
||||||
.PHONY: build-k8s-cluster
|
.PHONY: build-k8s-cluster
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
web: bin/buildpack_start.sh
|
||||||
|
postdeploy: python manage.py migrate
|
||||||
@@ -12,7 +12,10 @@
|
|||||||
<img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/suitenumerique/meet"/>
|
<img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/suitenumerique/meet"/>
|
||||||
<a href="https://github.com/suitenumerique/meet/blob/main/LICENSE">
|
<a href="https://github.com/suitenumerique/meet/blob/main/LICENSE">
|
||||||
<img alt="GitHub closed issues" src="https://img.shields.io/github/license/suitenumerique/meet"/>
|
<img alt="GitHub closed issues" src="https://img.shields.io/github/license/suitenumerique/meet"/>
|
||||||
</a>
|
</a>
|
||||||
|
<a href="https://digitalpublicgoods.net/r/la-suite-meet-simple-video-conferencing">
|
||||||
|
<img src="https://img.shields.io/badge/Verified-DPG-3333AB?logo=data:image/svg%2bxml;base64,PHN2ZyB3aWR0aD0iMzEiIGhlaWdodD0iMzMiIHZpZXdCb3g9IjAgMCAzMSAzMyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE0LjIwMDggMjEuMzY3OEwxMC4xNzM2IDE4LjAxMjRMMTEuNTIxOSAxNi40MDAzTDEzLjk5MjggMTguNDU5TDE5LjYyNjkgMTIuMjExMUwyMS4xOTA5IDEzLjYxNkwxNC4yMDA4IDIxLjM2NzhaTTI0LjYyNDEgOS4zNTEyN0wyNC44MDcxIDMuMDcyOTdMMTguODgxIDUuMTg2NjJMMTUuMzMxNCAtMi4zMzA4MmUtMDVMMTEuNzgyMSA1LjE4NjYyTDUuODU2MDEgMy4wNzI5N0w2LjAzOTA2IDkuMzUxMjdMMCAxMS4xMTc3TDMuODQ1MjEgMTYuMDg5NUwwIDIxLjA2MTJMNi4wMzkwNiAyMi44Mjc3TDUuODU2MDEgMjkuMTA2TDExLjc4MjEgMjYuOTkyM0wxNS4zMzE0IDMyLjE3OUwxOC44ODEgMjYuOTkyM0wyNC44MDcxIDI5LjEwNkwyNC42MjQxIDIyLjgyNzdMMzAuNjYzMSAyMS4wNjEyTDI2LjgxNzYgMTYuMDg5NUwzMC42NjMxIDExLjExNzdMMjQuNjI0MSA5LjM1MTI3WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==" alt="DPG Badge"/>
|
||||||
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@@ -28,6 +31,14 @@
|
|||||||
## La Suite Meet: Simple Video Conferencing
|
## La Suite Meet: Simple Video Conferencing
|
||||||
|
|
||||||
Powered by [LiveKit](https://livekit.io/), La Suite Meet offers Zoom-level performance with high-quality video and audio. No installation required—simply join calls directly from your browser. Check out LiveKit's impressive optimizations in their [blog post](https://blog.livekit.io/livekit-one-dot-zero/).
|
Powered by [LiveKit](https://livekit.io/), La Suite Meet offers Zoom-level performance with high-quality video and audio. No installation required—simply join calls directly from your browser. Check out LiveKit's impressive optimizations in their [blog post](https://blog.livekit.io/livekit-one-dot-zero/).
|
||||||
|
|
||||||
|
> [!TIP]
|
||||||
|
> New here? Start by introducing yourself in our Matrix channel:
|
||||||
|
> **https://matrix.to/#/#meet-official:matrix.org**
|
||||||
|
>
|
||||||
|
> We’re happy to discuss ideas, answer questions, and help to deploy LaSuite Meet.
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
- Optimized for stability in large meetings (+100 p.)
|
- Optimized for stability in large meetings (+100 p.)
|
||||||
- Support for multiple screen sharing streams
|
- Support for multiple screen sharing streams
|
||||||
@@ -50,6 +61,9 @@ La Suite Meet is fully self-hostable and released under the MIT License, ensurin
|
|||||||
|
|
||||||
We’re continuously adding new features to enhance your experience, with the latest updates coming soon!
|
We’re continuously adding new features to enhance your experience, with the latest updates coming soon!
|
||||||
|
|
||||||
|
### 🚀 Major roll out to all French public servants
|
||||||
|
|
||||||
|
On the 29th of January 2026, Prime Minister Sébastien Lecornu, announced the full deployment of Visio—the French government’s dedicated Meet platform—to all public servants. ([Source in English](https://www.nytimes.com/2026/01/29/world/europe/france-zoom-alternative-visio.html))
|
||||||
|
|
||||||
## Table of Contents
|
## Table of Contents
|
||||||
|
|
||||||
@@ -81,22 +95,57 @@ We use Kubernetes for our [production instance](https://visio.numerique.gouv.fr/
|
|||||||
#### Known instances
|
#### Known instances
|
||||||
We hope to see many more, here is an incomplete list of public La Suite Meet instances. Feel free to make a PR to add ones that are not listed below🙏
|
We hope to see many more, here is an incomplete list of public La Suite Meet instances. Feel free to make a PR to add ones that are not listed below🙏
|
||||||
|
|
||||||
| Url | Org | Access |
|
| Url | Org | Access |
|
||||||
|---------------------------------------------------------------| --- | ------- |
|
|---------------------------------------------------------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
| [visio.numerique.gouv.fr](https://visio.numerique.gouv.fr/) | DINUM | French public agents working for the central administration and the extended public sphere. ProConnect is required to login in or sign up|
|
| [visio.numerique.gouv.fr](https://visio.numerique.gouv.fr/) | DINUM | French public agents working for the central administration and the extended public sphere. ProConnect is required to login in or sign up |
|
||||||
| [visio.suite.anct.gouv.fr](https://visio.suite.anct.gouv.fr/) | ANCT | French public agents working for the territorial administration and the extended public sphere. ProConnect is required to login in or sign up|
|
| [visio.suite.anct.gouv.fr](https://visio.suite.anct.gouv.fr/) | ANCT | French public agents working for the territorial administration and the extended public sphere. ProConnect is required to login in or sign up |
|
||||||
| [visio.lasuite.coop](https://visio.lasuite.coop/) | lasuite.coop | Free and open demo to all. Content and accounts are reset after one month |
|
| [visio.lasuite.coop](https://visio.lasuite.coop/) | lasuite.coop | Free and open demo to all. Content and accounts are reset after one month |
|
||||||
| [meet.demo.mosacloud.eu](https://meet.demo.mosacloud.eu/) | mosa.cloud | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps. |
|
| [mosacloud.cloud](https://mosa.cloud/) | mosa.cloud | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps. |
|
||||||
|
| [Clever Cloud](https://www.clever.cloud/product/visio/) | clever cloud | Openvisio is a sovereign video conferencing solution based on LaSuite Meet offered by [Clever Cloud](https://www.clever.cloud/). |
|
||||||
|
| [Email.eu](https://email.eu/) | Email.eu | Sovereign business workspace. |
|
||||||
|
|
||||||
|
|
||||||
## Contributing
|
# Contributing
|
||||||
|
|
||||||
We <3 contributions of any kind, big and small:
|
We <3 contributions of all kinds **big or small** and we’re genuinely glad you’re here. 🌱
|
||||||
|
|
||||||
- Vote on features or get early access to beta functionality in our [roadmap](https://github.com/orgs/suitenumerique/projects/11/views/4)
|
### Start by saying hi
|
||||||
- Open a PR (see our instructions on [developing La Suite Meet locally](https://github.com/suitenumerique/meet/blob/main/docs/developping_locally.md))
|
|
||||||
- Submit a [feature request](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=enhancement&template=Feature_request.md) or [bug report](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md)
|
|
||||||
|
|
||||||
|
**The best first contribution is simply to come say hi.**
|
||||||
|
|
||||||
|
Before opening a PR, especially a larger one, or one written with the help of AI, we encourage you to reach out to a maintainer on our [Matrix channel](https://matrix.to/#/#meet-official:matrix.org) (@antoine.lebaud:matrix.org).
|
||||||
|
|
||||||
|
Getting in touch early helps us align on goals, avoid duplicated or wasted effort, and build a community that stays active, welcoming, and fun to be part of. There are no silly questions here: whether you’ve shipped hundreds of PRs or you’re just getting started, you’re welcome.
|
||||||
|
|
||||||
|
### AI contributions
|
||||||
|
|
||||||
|
AI-assisted contributions are welcome. But code is never the end goal. What matters most is building relationships, sharing knowledge, and growing a sustainable community over time.
|
||||||
|
|
||||||
|
If your contribution has been heavily generated with AI, please be transparent about it. This helps maintainers review it with the right context and respects the time they invest in the project.
|
||||||
|
|
||||||
|
Using AI does not transfer ownership of the contribution: you should still fully understand the code, the problem it solves, and the reasoning behind the approach you propose. In short, even if AI helped write it, the why should still be yours.
|
||||||
|
|
||||||
|
### Contributions beyond code
|
||||||
|
|
||||||
|
**Not technical? We need you too.**
|
||||||
|
Open source is much more than code. Writing documentation, improving onboarding, translating content, answering questions, reporting bugs, or simply helping others feel welcome all make a huge difference.
|
||||||
|
|
||||||
|
### Ways to contribute
|
||||||
|
|
||||||
|
When you’re ready, here are a few ways to get involved:
|
||||||
|
|
||||||
|
* 👋 **Say hello** and share your ideas with the community and maintainers on our [Matrix channel](https://matrix.to/#/#meet-official:matrix.org)
|
||||||
|
* 🛠️ **Open a PR** by following our guide to [develop La Suite Meet locally](https://github.com/suitenumerique/meet/blob/main/docs/developping_locally.md)
|
||||||
|
* 💡 **Suggest an idea** by opening a [feature request](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=enhancement&template=Feature_request.md)
|
||||||
|
* 🐛 **Report a bug** by opening a [bug report](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md)
|
||||||
|
|
||||||
|
Thank you for helping build something open, useful, and human. 💙
|
||||||
|
|
||||||
|
### Community call
|
||||||
|
|
||||||
|
We host a community call on the first Friday of every month to share updates, discuss ideas, and connect with contributors.
|
||||||
|
|
||||||
|
Whether you’re actively contributing or just curious about the project, you’re welcome to join. More details are shared on the [Matrix channel](https://matrix.to/#/#meet-official:matrix.org).
|
||||||
|
|
||||||
## Philosophy
|
## Philosophy
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ load('ext://uibutton', 'cmd_button', 'bool_input', 'location')
|
|||||||
load('ext://namespace', 'namespace_create', 'namespace_inject')
|
load('ext://namespace', 'namespace_create', 'namespace_inject')
|
||||||
namespace_create('meet')
|
namespace_create('meet')
|
||||||
|
|
||||||
DEV_ENV = os.getenv('DEV_ENV', 'dev')
|
DEV_ENV = os.getenv('DEV_ENV', 'dev-keycloak')
|
||||||
|
|
||||||
if DEV_ENV == 'dev-dinum':
|
if DEV_ENV == 'dev-dinum':
|
||||||
update_settings(suppress_unused_image_warnings=["localhost:5001/meet-frontend-generic:latest"])
|
update_settings(suppress_unused_image_warnings=["localhost:5001/meet-frontend-generic:latest"])
|
||||||
@@ -23,8 +23,8 @@ docker_build(
|
|||||||
live_update=[
|
live_update=[
|
||||||
sync('../src/backend', '/app'),
|
sync('../src/backend', '/app'),
|
||||||
run(
|
run(
|
||||||
'pip install -r /app/requirements.txt',
|
'uv sync --locked --no-dev',
|
||||||
trigger=['./api/requirements.txt']
|
trigger=['../src/backend/uv.lock', '../src/backend/pyproject.toml']
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@@ -34,10 +34,11 @@ docker_build(
|
|||||||
'localhost:5001/meet-frontend-dinum:latest',
|
'localhost:5001/meet-frontend-dinum:latest',
|
||||||
context='..',
|
context='..',
|
||||||
dockerfile='../docker/dinum-frontend/Dockerfile',
|
dockerfile='../docker/dinum-frontend/Dockerfile',
|
||||||
only=['./src/frontend', './docker', './.dockerignore'],
|
only=['./src/frontend', './src/addons', './docker', './.dockerignore'],
|
||||||
target = 'frontend-production',
|
target = 'frontend-production',
|
||||||
live_update=[
|
live_update=[
|
||||||
sync('../src/frontend', '/home/frontend'),
|
sync('../src/frontend', '/home/frontend'),
|
||||||
|
sync('../src/addons', '/home/addons'),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
clean_old_images('localhost:5001/meet-frontend-dinum')
|
clean_old_images('localhost:5001/meet-frontend-dinum')
|
||||||
@@ -70,7 +71,7 @@ docker_build(
|
|||||||
'localhost:5001/meet-agents:latest',
|
'localhost:5001/meet-agents:latest',
|
||||||
context='../src/agents',
|
context='../src/agents',
|
||||||
dockerfile='../src/agents/Dockerfile',
|
dockerfile='../src/agents/Dockerfile',
|
||||||
only=['.'],
|
only=['.'],
|
||||||
target = 'production',
|
target = 'production',
|
||||||
live_update=[
|
live_update=[
|
||||||
sync('../src/agents', '/app'),
|
sync('../src/agents', '/app'),
|
||||||
@@ -95,14 +96,34 @@ docker_build(
|
|||||||
)
|
)
|
||||||
clean_old_images('localhost:5001/meet-livekit')
|
clean_old_images('localhost:5001/meet-livekit')
|
||||||
|
|
||||||
k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev} template .'))
|
load('ext://secret', 'secret_yaml_generic')
|
||||||
|
k8s_yaml(secret_yaml_generic(
|
||||||
|
name="secret-dev",
|
||||||
|
from_env_file="../env.d/development/kube-secret"
|
||||||
|
))
|
||||||
|
|
||||||
|
k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev-keycloak} template .'))
|
||||||
|
|
||||||
k8s_resource('minio-bucket', resource_deps=['minio'])
|
k8s_resource('minio-bucket', resource_deps=['minio'])
|
||||||
k8s_resource('meet-backend', resource_deps=['postgresql', 'minio', 'redis', 'livekit-livekit-server'])
|
k8s_resource('meet-backend', resource_deps=['postgresql', 'minio', 'redis', 'livekit-livekit-server'])
|
||||||
k8s_resource('meet-backend-migrate', resource_deps=['meet-backend'])
|
k8s_resource('meet-celery-backend', resource_deps=['redis'])
|
||||||
|
k8s_resource('meet-celery-summarize', resource_deps=['redis'])
|
||||||
|
k8s_resource('meet-celery-summary-backend', resource_deps=['redis'])
|
||||||
|
k8s_resource('meet-celery-transcribe-default', resource_deps=['redis'])
|
||||||
|
k8s_resource('livekit-livekit-server', resource_deps=['redis'])
|
||||||
k8s_resource('livekit-livekit-server-test-connection', resource_deps=['livekit-livekit-server'])
|
k8s_resource('livekit-livekit-server-test-connection', resource_deps=['livekit-livekit-server'])
|
||||||
k8s_resource('keycloak', resource_deps=['kc-postgresql'])
|
k8s_resource('keycloak', resource_deps=['kc-postgresql'])
|
||||||
k8s_resource('meet-backend-createsuperuser', resource_deps=['meet-backend-migrate'])
|
# Trigger once on launch
|
||||||
|
k8s_resource(
|
||||||
|
'meet-backend-createsuperuser',
|
||||||
|
resource_deps=['meet-backend-migrate'],
|
||||||
|
trigger_mode=TRIGGER_MODE_MANUAL,
|
||||||
|
)
|
||||||
|
k8s_resource(
|
||||||
|
'meet-backend-migrate',
|
||||||
|
resource_deps=['meet-backend'],
|
||||||
|
trigger_mode=TRIGGER_MODE_MANUAL,
|
||||||
|
)
|
||||||
|
|
||||||
migration = '''
|
migration = '''
|
||||||
set -eu
|
set -eu
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -o errexit # always exit on error
|
||||||
|
set -o pipefail # don't ignore exit codes when piping output
|
||||||
|
|
||||||
|
echo "-----> Running post-compile script"
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
rm -rf docker docs env.d gitlint
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -o errexit # always exit on error
|
||||||
|
set -o pipefail # don't ignore exit codes when piping output
|
||||||
|
|
||||||
|
echo "-----> Running post-frontend script"
|
||||||
|
|
||||||
|
# Move the frontend build to the nginx root and clean up
|
||||||
|
mkdir -p build/
|
||||||
|
mv src/frontend/dist build/frontend-out
|
||||||
|
|
||||||
|
ASSETS_DIR=build/frontend-out/assets
|
||||||
|
if [ -n "$CUSTOM_LOGO_URL" ]; then
|
||||||
|
# Ensure https
|
||||||
|
[[ ! "$CUSTOM_LOGO_URL" =~ ^https:// ]] && echo "[custom-logo] ERROR: URL must use HTTPS" >&2 && exit 1
|
||||||
|
|
||||||
|
# Prevent SSRF
|
||||||
|
HOSTNAME=$(echo "$CUSTOM_LOGO_URL" | sed -E 's|^https://([^/:]+).*|\1|')
|
||||||
|
[[ "$HOSTNAME" =~ ^(localhost|127\.|10\.|172\.(1[6-9]|2[0-9]|3[01])\.|192\.168\.|0\.0\.0\.0|\[::1\]) ]] && echo "[custom-logo] ERROR: SSRF blocked: $HOSTNAME" >&2 && exit 1
|
||||||
|
|
||||||
|
LOGO_FILE="${ASSETS_DIR}/logo.svg"
|
||||||
|
TMP_FILE=$(mktemp "${LOGO_FILE}.XXXXXX.tmp")
|
||||||
|
|
||||||
|
# Actual download
|
||||||
|
echo "[custom-logo] INFO: Downloading custom logo from: $CUSTOM_LOGO_URL"
|
||||||
|
curl -fsSL --tlsv1.2 -o "$TMP_FILE" "$CUSTOM_LOGO_URL"
|
||||||
|
|
||||||
|
# Validate filesize
|
||||||
|
FILESIZE=$(stat -c%s "$TMP_FILE" 2>/dev/null || stat -f%z "$TMP_FILE")
|
||||||
|
[[ "$FILESIZE" -eq 0 ]] && echo "[custom-logo] ERROR: empty file" >&2 && exit 1
|
||||||
|
[[ "$FILESIZE" -gt 5242880 ]] && echo "[custom-logo] ERROR: file too large (${FILESIZE}B > 5MB)" >&2 && exit 1
|
||||||
|
|
||||||
|
# Validate file type
|
||||||
|
IS_SVG=false
|
||||||
|
|
||||||
|
HEADER=$(head -c 100 "$TMP_FILE" | tr -d '\0' | tr '[:upper:]' '[:lower:]')
|
||||||
|
[[ "$HEADER" =~ ^.*"<svg".*$ ]] && IS_SVG=true
|
||||||
|
[[ "$HEADER" =~ ^.*"<?xml".*"<svg".*$ ]] && IS_SVG=true
|
||||||
|
|
||||||
|
[[ "$IS_SVG" == false ]] && echo "[custom-logo] ERROR: not a valid SVG file" >&2 && exit 1
|
||||||
|
|
||||||
|
mv -f "$TMP_FILE" "$LOGO_FILE"
|
||||||
|
echo "[custom-logo] INFO: Custom logo downloaded successfuly"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv src/backend/* ./
|
||||||
|
mv deploy/paas/* ./
|
||||||
|
|
||||||
|
echo "3.13" > .python-version
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Start the Django backend server
|
||||||
|
gunicorn -b 0.0.0.0:8000 meet.wsgi:application --log-file - &
|
||||||
|
|
||||||
|
# Start the Nginx server
|
||||||
|
bin/run &
|
||||||
|
|
||||||
|
# if the current shell is killed, also terminate all its children
|
||||||
|
trap "pkill SIGTERM -P $$" SIGTERM
|
||||||
|
|
||||||
|
# wait for a single child to finish,
|
||||||
|
wait -n
|
||||||
|
# then kill all the other tasks
|
||||||
|
pkill -P $$
|
||||||
@@ -101,12 +101,24 @@ update_npm_version "mail"
|
|||||||
# Update backend pyproject.toml
|
# Update backend pyproject.toml
|
||||||
update_python_version "backend"
|
update_python_version "backend"
|
||||||
|
|
||||||
|
# Run uv lock in backend
|
||||||
|
print_info "Running uv lock in backend..."
|
||||||
|
cd "src/backend"
|
||||||
|
uv lock
|
||||||
|
cd -
|
||||||
|
|
||||||
# Update summary pyproject.toml
|
# Update summary pyproject.toml
|
||||||
update_python_version "summary"
|
update_python_version "summary"
|
||||||
|
|
||||||
# Update agents pyproject.toml
|
# Update agents pyproject.toml
|
||||||
update_python_version "agents"
|
update_python_version "agents"
|
||||||
|
|
||||||
|
# Run uv lock in agents
|
||||||
|
print_info "Running uv lock in agents..."
|
||||||
|
cd "src/agents"
|
||||||
|
uv lock
|
||||||
|
cd -
|
||||||
|
|
||||||
# Update CHANGELOG
|
# Update CHANGELOG
|
||||||
print_info "Updating CHANGELOG..."
|
print_info "Updating CHANGELOG..."
|
||||||
|
|
||||||
@@ -149,6 +161,7 @@ echo " - src/frontend/package.json"
|
|||||||
echo " - src/sdk/package.json"
|
echo " - src/sdk/package.json"
|
||||||
echo " - src/mail/package.json"
|
echo " - src/mail/package.json"
|
||||||
echo " - src/backend/pyproject.toml"
|
echo " - src/backend/pyproject.toml"
|
||||||
|
echo " - src/backend/uv.lock"
|
||||||
echo " - src/summary/pyproject.toml"
|
echo " - src/summary/pyproject.toml"
|
||||||
echo " - src/agents/pyproject.toml"
|
echo " - src/agents/pyproject.toml"
|
||||||
echo " - CHANGELOG.md"
|
echo " - CHANGELOG.md"
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
|
||||||
|
|
||||||
|
_dc_run \
|
||||||
|
app-summary-dev \
|
||||||
|
python -m pytest "$@"
|
||||||
@@ -58,7 +58,7 @@ services:
|
|||||||
/usr/bin/mc admin config set meet notify_webhook:meet-webhook endpoint='http://app-dev:8000/api/v1.0/recordings/storage-hook/' auth_token='Bearer password' &&
|
/usr/bin/mc admin config set meet notify_webhook:meet-webhook endpoint='http://app-dev:8000/api/v1.0/recordings/storage-hook/' auth_token='Bearer password' &&
|
||||||
/usr/bin/mc admin service restart meet --wait --json &&
|
/usr/bin/mc admin service restart meet --wait --json &&
|
||||||
sleep 15 &&
|
sleep 15 &&
|
||||||
/usr/bin/mc event add meet/meet-media-storage arn:minio:sqs::meet-webhook:webhook --event put &&
|
/usr/bin/mc event add meet/meet-media-storage arn:minio:sqs::meet-webhook:webhook --event put --prefix "recordings" &&
|
||||||
exit 0;"
|
exit 0;"
|
||||||
|
|
||||||
app-dev:
|
app-dev:
|
||||||
@@ -80,11 +80,11 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./src/backend:/app
|
- ./src/backend:/app
|
||||||
- ./data/static:/data/static
|
- ./data/static:/data/static
|
||||||
|
- /app/.venv
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgresql
|
- postgresql
|
||||||
- mailcatcher
|
- mailcatcher
|
||||||
- redis
|
- redis
|
||||||
- nginx
|
|
||||||
- livekit
|
- livekit
|
||||||
- createbuckets
|
- createbuckets
|
||||||
- createwebhook
|
- createwebhook
|
||||||
@@ -93,7 +93,7 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- resource-server
|
- resource-server
|
||||||
- default
|
- default
|
||||||
|
|
||||||
celery-dev:
|
celery-dev:
|
||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
image: meet:backend-development
|
image: meet:backend-development
|
||||||
@@ -106,6 +106,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./src/backend:/app
|
- ./src/backend:/app
|
||||||
- ./data/static:/data/static
|
- ./data/static:/data/static
|
||||||
|
- /app/.venv
|
||||||
depends_on:
|
depends_on:
|
||||||
- app-dev
|
- app-dev
|
||||||
|
|
||||||
@@ -148,6 +149,7 @@ services:
|
|||||||
- ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro
|
- ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro
|
||||||
depends_on:
|
depends_on:
|
||||||
- keycloak
|
- keycloak
|
||||||
|
- app-dev
|
||||||
networks:
|
networks:
|
||||||
- resource-server
|
- resource-server
|
||||||
- default
|
- default
|
||||||
@@ -235,14 +237,42 @@ services:
|
|||||||
- livekit-egress
|
- livekit-egress
|
||||||
|
|
||||||
livekit-egress:
|
livekit-egress:
|
||||||
image: livekit/egress:v1.11.0
|
image: livekit/egress:v1.11.0
|
||||||
environment:
|
environment:
|
||||||
EGRESS_CONFIG_FILE: ./livekit-egress.yaml
|
EGRESS_CONFIG_FILE: ./livekit-egress.yaml
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
|
- ./docker/livekit/config/livekit-egress.yaml:/livekit-egress.yaml
|
||||||
- ./docker/livekit/out:/out
|
- ./docker/livekit/out:/out
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
|
metadata-collector-dev:
|
||||||
|
build:
|
||||||
|
context: ./src/agents
|
||||||
|
target: development
|
||||||
|
command: ["python", "metadata_collector.py", "dev"]
|
||||||
|
env_file:
|
||||||
|
- env.d/development/metadata_collector
|
||||||
|
volumes:
|
||||||
|
- ./src/agents:/app
|
||||||
|
- /app/.venv
|
||||||
|
depends_on:
|
||||||
|
- livekit
|
||||||
|
- minio
|
||||||
|
develop:
|
||||||
|
watch:
|
||||||
|
- action: rebuild
|
||||||
|
path: ./src/agents
|
||||||
|
|
||||||
|
multi-user-transcriber-dev:
|
||||||
|
build:
|
||||||
|
context: ./src/agents
|
||||||
|
target: development
|
||||||
|
env_file:
|
||||||
|
- env.d/development/multi_user_transcriber
|
||||||
|
volumes:
|
||||||
|
- ./src/agents:/app
|
||||||
|
- /app/.venv
|
||||||
|
|
||||||
redis-summary:
|
redis-summary:
|
||||||
image: redis
|
image: redis
|
||||||
@@ -271,7 +301,7 @@ services:
|
|||||||
context: ./src/summary
|
context: ./src/summary
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
target: production
|
target: production
|
||||||
command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q transcribe-queue
|
command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q transcribe-queue-v2
|
||||||
env_file:
|
env_file:
|
||||||
- env.d/development/summary
|
- env.d/development/summary
|
||||||
volumes:
|
volumes:
|
||||||
@@ -291,7 +321,7 @@ services:
|
|||||||
context: ./src/summary
|
context: ./src/summary
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
target: production
|
target: production
|
||||||
command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q summarize-queue
|
command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q summarize-queue-v2
|
||||||
env_file:
|
env_file:
|
||||||
- env.d/development/summary
|
- env.d/development/summary
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
# ERB templated nginx configuration
|
||||||
|
# see https://doc.scalingo.com/platform/deployment/buildpacks/nginx
|
||||||
|
|
||||||
|
upstream backend_server {
|
||||||
|
server localhost:8000 fail_timeout=0;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen <%= ENV["PORT"] %>;
|
||||||
|
server_name _;
|
||||||
|
server_tokens off;
|
||||||
|
|
||||||
|
root /app/build/frontend-out;
|
||||||
|
|
||||||
|
# Django rest framework
|
||||||
|
location ^~ /api/ {
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_pass http://backend_server;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Django admin
|
||||||
|
location ^~ /admin/ {
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_pass http://backend_server;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Serve static files with caching
|
||||||
|
location ~* ^/assets/.*\.(css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
|
||||||
|
expires 30d;
|
||||||
|
add_header Cache-Control "public, max-age=2592000";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Serve static files
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
# Add no-cache headers
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate";
|
||||||
|
add_header Pragma "no-cache"; # HTTP 1.0 header for backward compatibility
|
||||||
|
add_header Expires 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Optionally, handle 404 errors by redirecting to index.html
|
||||||
|
error_page 404 =200 /index.html;
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# ---- Front-end image ----
|
# ---- Front-end image ----
|
||||||
FROM node:20-alpine AS frontend-deps
|
FROM node:22-alpine AS frontend-deps
|
||||||
|
|
||||||
WORKDIR /home/frontend/
|
WORKDIR /home/frontend/
|
||||||
|
|
||||||
@@ -38,16 +38,34 @@ COPY ./docker/dinum-frontend/assets/ \
|
|||||||
COPY ./docker/dinum-frontend/fonts/ \
|
COPY ./docker/dinum-frontend/fonts/ \
|
||||||
./dist/assets/fonts/
|
./dist/assets/fonts/
|
||||||
|
|
||||||
|
# ---- Addons builder image ----
|
||||||
|
FROM node:20-alpine AS addons-builder
|
||||||
|
|
||||||
|
WORKDIR /home/addons/outlook
|
||||||
|
|
||||||
|
COPY ./src/addons/outlook/package.json ./package.json
|
||||||
|
COPY ./src/addons/outlook/package-lock.json ./package-lock.json
|
||||||
|
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
|
COPY ./src/addons/outlook/ .
|
||||||
|
|
||||||
|
RUN npx webpack --mode production
|
||||||
|
|
||||||
|
|
||||||
# ---- Front-end image ----
|
# ---- Front-end image ----
|
||||||
FROM nginxinc/nginx-unprivileged:alpine3.21 AS frontend-production
|
FROM nginxinc/nginx-unprivileged:1.30.3-alpine3.23 AS frontend-production
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
RUN apk update && apk upgrade libssl3 \
|
|
||||||
libcrypto3 \
|
# Security patches for known CVEs
|
||||||
libxml2>=2.12.7-r2 \
|
RUN apk update && apk upgrade \
|
||||||
libxslt>=1.1.39-r2 \
|
libcrypto3>=3.5.7-r0 \
|
||||||
libexpat>=2.7.2-r0 \
|
libssl3>=3.5.7-r0 \
|
||||||
libpng>=1.6.53-r0
|
musl \
|
||||||
|
musl-utils \
|
||||||
|
zlib>=1.3.2-r0 \
|
||||||
|
&& apk del curl
|
||||||
|
|
||||||
USER nginx
|
USER nginx
|
||||||
|
|
||||||
@@ -59,7 +77,11 @@ COPY --from=meet-builder \
|
|||||||
/home/frontend/dist \
|
/home/frontend/dist \
|
||||||
/usr/share/nginx/html
|
/usr/share/nginx/html
|
||||||
|
|
||||||
COPY ./src/frontend/default.conf /etc/nginx/conf.d
|
COPY --from=addons-builder \
|
||||||
|
/home/addons/outlook/dist \
|
||||||
|
/usr/share/nginx/html/addons/outlook
|
||||||
|
|
||||||
|
COPY ./docker/dinum-frontend/nginx/default.conf /etc/nginx/conf.d
|
||||||
COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
|
COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
|
ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
server {
|
||||||
|
listen 8080;
|
||||||
|
server_name localhost;
|
||||||
|
server_tokens off;
|
||||||
|
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
|
||||||
|
location = /.well-known/windows-app-web-link {
|
||||||
|
default_type application/json;
|
||||||
|
alias /usr/share/nginx/html/.well-known/windows-app-web-link;
|
||||||
|
add_header Content-Disposition "attachment; filename=windows-app-web-link";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Manifest — fetched, never iframed
|
||||||
|
location = /addons/outlook/manifest.xml {
|
||||||
|
alias /usr/share/nginx/html/addons/outlook/manifest.xml;
|
||||||
|
|
||||||
|
add_header Access-Control-Allow-Origin "*";
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate";
|
||||||
|
add_header X-Frame-Options "DENY";
|
||||||
|
add_header Content-Security-Policy "frame-ancestors 'none'";
|
||||||
|
}
|
||||||
|
|
||||||
|
location = /addons/outlook/assets/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~* ^/addons/outlook/assets/(.+\.(?:css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot))/?$ {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
expires 30d;
|
||||||
|
add_header Cache-Control "public, max-age=2592000, immutable" always;
|
||||||
|
add_header Access-Control-Allow-Origin "*";
|
||||||
|
add_header Vary "Origin" always;
|
||||||
|
}
|
||||||
|
|
||||||
|
location = /addons/outlook/ {
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ ^/addons/outlook(/.*)?$ {
|
||||||
|
alias /usr/share/nginx/html/addons/outlook$1;
|
||||||
|
error_page 404 =200 /index.html;
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate";
|
||||||
|
add_header Pragma "no-cache" always;
|
||||||
|
add_header Expires 0 always;
|
||||||
|
|
||||||
|
set $ms_domains "https://*.live.com https://*.office.com https://*.microsoft.com https://*.office365.com https://*.sharepoint.com";
|
||||||
|
|
||||||
|
set $nonce $request_id;
|
||||||
|
|
||||||
|
set $csp "default-src 'self'; upgrade-insecure-requests; ";
|
||||||
|
set $csp "${csp}frame-ancestors ${ms_domains}; ";
|
||||||
|
set $csp "${csp}script-src 'nonce-${nonce}' 'strict-dynamic'; ";
|
||||||
|
set $csp "${csp}style-src 'self' 'unsafe-inline'; ";
|
||||||
|
set $csp "${csp}img-src 'self' data:; ";
|
||||||
|
set $csp "${csp}font-src 'self' data:; ";
|
||||||
|
set $csp "${csp}connect-src 'self' ${ms_domains}; ";
|
||||||
|
set $csp "${csp}frame-src 'none'; ";
|
||||||
|
set $csp "${csp}object-src 'none'; ";
|
||||||
|
set $csp "${csp}base-uri 'none'; ";
|
||||||
|
|
||||||
|
add_header Content-Security-Policy $csp;
|
||||||
|
|
||||||
|
sub_filter 'NONCE_PLACEHOLDER' $nonce;
|
||||||
|
sub_filter_once off;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Serve static files with caching
|
||||||
|
location ~* ^/assets/.*\.(css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
|
||||||
|
expires 30d;
|
||||||
|
add_header Cache-Control "public, max-age=2592000";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Serve static files
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
# Add no-cache headers
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate";
|
||||||
|
add_header Pragma "no-cache"; # HTTP 1.0 header for backward compatibility
|
||||||
|
add_header Expires 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Optionally, handle 404 errors by redirecting to index.html
|
||||||
|
error_page 404 =200 /index.html;
|
||||||
|
}
|
||||||
@@ -4,10 +4,47 @@ server {
|
|||||||
server_name localhost;
|
server_name localhost;
|
||||||
charset utf-8;
|
charset utf-8;
|
||||||
|
|
||||||
|
# Proxy auth for media
|
||||||
|
location /media/ {
|
||||||
|
# Auth request configuration
|
||||||
|
auth_request /media-auth;
|
||||||
|
auth_request_set $authHeader $upstream_http_authorization;
|
||||||
|
auth_request_set $authDate $upstream_http_x_amz_date;
|
||||||
|
auth_request_set $authContentSha256 $upstream_http_x_amz_content_sha256;
|
||||||
|
|
||||||
|
# Pass specific headers from the auth response
|
||||||
|
proxy_set_header Authorization $authHeader;
|
||||||
|
proxy_set_header X-Amz-Date $authDate;
|
||||||
|
proxy_set_header X-Amz-Content-SHA256 $authContentSha256;
|
||||||
|
|
||||||
|
# Get resource from Minio
|
||||||
|
proxy_pass http://minio:9000/meet-media-storage/;
|
||||||
|
proxy_set_header Host minio:9000;
|
||||||
|
# To use with ds_proxy
|
||||||
|
# proxy_pass http://ds-proxy:4444/upstream/meet-media-storage/;
|
||||||
|
# proxy_set_header Host ds-proxy:4444;
|
||||||
|
add_header Content-Disposition "attachment";
|
||||||
|
}
|
||||||
|
|
||||||
|
location /media-auth {
|
||||||
|
proxy_pass http://app-dev:8000/api/v1.0/files/media-auth/;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Original-URL $request_uri;
|
||||||
|
|
||||||
|
# Prevent the body from being passed
|
||||||
|
proxy_pass_request_body off;
|
||||||
|
proxy_set_header Content-Length "";
|
||||||
|
proxy_set_header X-Original-Method $request_method;
|
||||||
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://keycloak:8080;
|
proxy_pass http://keycloak:8080;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Port $server_port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
upstream meet_backend {
|
upstream meet_backend {
|
||||||
server ${BACKEND_HOST}:8000 fail_timeout=0;
|
server ${BACKEND_INTERNAL_HOST}:8000 fail_timeout=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
upstream meet_frontend {
|
upstream meet_frontend {
|
||||||
server ${FRONTEND_HOST}:8080 fail_timeout=0;
|
server ${FRONTEND_INTERNAL_HOST}:8080 fail_timeout=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM livekit/livekit-server:v1.9.0
|
FROM livekit/livekit-server:v1.9.4
|
||||||
|
|
||||||
# We inject the nip.io certificate manually because the livekit chart doesn't support volume mounting
|
# We inject the nip.io certificate manually because the livekit chart doesn't support volume mounting
|
||||||
COPY rootCA.pem /etc/ssl/certs/
|
COPY rootCA.pem /etc/ssl/certs/
|
||||||
|
|||||||
@@ -3,3 +3,8 @@ redis:
|
|||||||
address: redis:6379
|
address: redis:6379
|
||||||
keys:
|
keys:
|
||||||
devkey: secret
|
devkey: secret
|
||||||
|
|
||||||
|
webhook:
|
||||||
|
api_key: devkey
|
||||||
|
urls:
|
||||||
|
- http://app-dev:8000/api/v1.0/rooms/webhooks-livekit/
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ services:
|
|||||||
- env.d/postgresql
|
- env.d/postgresql
|
||||||
- env.d/common
|
- env.d/common
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/databases/backend:/var/lib/postgresql/data/pgdata
|
- ./data/databases/backend:/var/lib/postgresql/data
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:5
|
image: redis:5
|
||||||
@@ -20,8 +20,8 @@ services:
|
|||||||
user: ${DOCKER_USER:-1000}
|
user: ${DOCKER_USER:-1000}
|
||||||
restart: always
|
restart: always
|
||||||
env_file:
|
env_file:
|
||||||
|
- .env
|
||||||
- env.d/common
|
- env.d/common
|
||||||
- env.d/backend
|
|
||||||
- env.d/postgresql
|
- env.d/postgresql
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "python", "manage.py", "check"]
|
test: ["CMD", "python", "manage.py", "check"]
|
||||||
@@ -45,6 +45,7 @@ services:
|
|||||||
- /docker-entrypoint.sh
|
- /docker-entrypoint.sh
|
||||||
command: ["nginx", "-g", "daemon off;"]
|
command: ["nginx", "-g", "daemon off;"]
|
||||||
env_file:
|
env_file:
|
||||||
|
- .env
|
||||||
- env.d/common
|
- env.d/common
|
||||||
# Uncomment and set your values if using our nginx proxy example
|
# Uncomment and set your values if using our nginx proxy example
|
||||||
# environment:
|
# environment:
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
### Step 1: Prepare your working environment:
|
### Step 1: Prepare your working environment:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
mkdir keycloak/env.d && cd keycloak
|
mkdir -p keycloak/env.d && cd keycloak
|
||||||
curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/docs/examples/compose/keycloak/compose.yaml
|
curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/docs/examples/compose/keycloak/compose.yaml
|
||||||
curl -o env.d/kc_postgresql https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/kc_postgresql
|
curl -o env.d/kc_postgresql https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/kc_postgresql
|
||||||
curl -o env.d/keycloak https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/keycloak
|
curl -o env.d/keycloak https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/keycloak
|
||||||
@@ -61,11 +61,10 @@ services:
|
|||||||
`docker compose up -d`
|
`docker compose up -d`
|
||||||
```
|
```
|
||||||
|
|
||||||
Your keycloak instance is now available on https://doc.yourdomain.tld
|
Your keycloak instance is now available on https://id.yourdomain.tld
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> Version of the images are set to latest, you should pin it to the desired version to avoid unwanted upgrades when pulling latest image. You can find available versions on [Keycloak registry](https://quay.io/repository/keycloak/keycloak?tab=tags).
|
> Version of the images are set to latest, you should pin it to the desired version to avoid unwanted upgrades when pulling latest image. You can find available versions on [Keycloak registry](https://quay.io/repository/keycloak/keycloak?tab=tags).
|
||||||
```
|
|
||||||
|
|
||||||
## Creating an OIDC Client for Meet Application
|
## Creating an OIDC Client for Meet Application
|
||||||
|
|
||||||
@@ -76,7 +75,7 @@ Your keycloak instance is now available on https://doc.yourdomain.tld
|
|||||||
3. Enter the name of the realm - `meet`.
|
3. Enter the name of the realm - `meet`.
|
||||||
4. Click "Create".
|
4. Click "Create".
|
||||||
|
|
||||||
#### Step 2: Create a New Client
|
### Step 2: Create a New Client
|
||||||
|
|
||||||
1. Navigate to the "Clients" tab.
|
1. Navigate to the "Clients" tab.
|
||||||
2. Click on the "Create client" button.
|
2. Click on the "Create client" button.
|
||||||
@@ -86,7 +85,7 @@ Your keycloak instance is now available on https://doc.yourdomain.tld
|
|||||||
1. Set the "Web Origins" to the URL of your meet application - e.g. `https://meet.example.com`.
|
1. Set the "Web Origins" to the URL of your meet application - e.g. `https://meet.example.com`.
|
||||||
1. Click "Save".
|
1. Click "Save".
|
||||||
|
|
||||||
#### Step 3: Get Client Credentials
|
### Step 3: Get Client Credentials
|
||||||
|
|
||||||
1. Go to the "Credentials" tab.
|
1. Go to the "Credentials" tab.
|
||||||
2. Copy the client ID (`meet` in this example) and the client secret.
|
2. Copy the client ID (`meet` in this example) and the client secret.
|
||||||
|
|||||||
@@ -68,13 +68,13 @@ backend:
|
|||||||
python manage.py createsuperuser --email admin@example.com --password admin
|
python manage.py createsuperuser --email admin@example.com --password admin
|
||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
|
|
||||||
# Exra volume to manage our local custom CA and avoid to set ssl_verify: false
|
# Extra volume to manage our local custom CA and avoid to set ssl_verify: false
|
||||||
extraVolumeMounts:
|
extraVolumeMounts:
|
||||||
- name: certs
|
- name: certs
|
||||||
mountPath: /usr/local/lib/python3.12/site-packages/certifi/cacert.pem
|
mountPath: /app/.venv/lib/python3.13/site-packages/certifi/cacert.pem
|
||||||
subPath: cacert.pem
|
subPath: cacert.pem
|
||||||
|
|
||||||
# Exra volume to manage our local custom CA and avoid to set ssl_verify: false
|
# Extra volume to manage our local custom CA and avoid to set ssl_verify: false
|
||||||
extraVolumes:
|
extraVolumes:
|
||||||
- name: certs
|
- name: certs
|
||||||
configMap:
|
configMap:
|
||||||
|
|||||||
@@ -96,10 +96,17 @@ sequenceDiagram
|
|||||||
| **RECORDING_WORKER_CLASSES** | Dict | `{ "screen_recording": "core.recording.worker.services.VideoCompositeEgressService", "transcript": "core.recording.worker.services.AudioCompositeEgressService" }` | Maps recording types to their worker service classes. |
|
| **RECORDING_WORKER_CLASSES** | Dict | `{ "screen_recording": "core.recording.worker.services.VideoCompositeEgressService", "transcript": "core.recording.worker.services.AudioCompositeEgressService" }` | Maps recording types to their worker service classes. |
|
||||||
| **RECORDING_EVENT_PARSER_CLASS** | String | `"core.recording.event.parsers.MinioParser"` | Class responsible for parsing storage events and updating the backend. |
|
| **RECORDING_EVENT_PARSER_CLASS** | String | `"core.recording.event.parsers.MinioParser"` | Class responsible for parsing storage events and updating the backend. |
|
||||||
| **RECORDING_ENABLE_STORAGE_EVENT_AUTH** | Boolean | `True` | Enable authentication for storage event webhook requests. |
|
| **RECORDING_ENABLE_STORAGE_EVENT_AUTH** | Boolean | `True` | Enable authentication for storage event webhook requests. |
|
||||||
| **RECORDING_STORAGE_EVENT_ENABLE** | Boolean | `False` | Enable handling of storage events (must configure webhook in storage). |
|
| **RECORDING_STORAGE_EVENT_ENABLE** | Boolean | `False` | Enable handling of storage events (must configure webhook in storage). If `False`, fallback to LiveKit egress complete webhook. |
|
||||||
| **RECORDING_STORAGE_EVENT_TOKEN** | Secret/File | `None` | Token used to authenticate storage webhook requests, if `RECORDING_ENABLE_STORAGE_EVENT_AUTH` is enabled. |
|
| **RECORDING_STORAGE_EVENT_TOKEN** | Secret/File | `None` | Token used to authenticate storage webhook requests, if `RECORDING_ENABLE_STORAGE_EVENT_AUTH` is enabled. |
|
||||||
| **RECORDING_EXPIRATION_DAYS** | Integer | `None` | Number of days before recordings expire. Should match bucket lifecycle policy. Set to `None` for no expiration. |
|
| **RECORDING_EXPIRATION_DAYS** | Integer | `None` | Number of days before recordings expire. Should match bucket lifecycle policy. Set to `None` for no expiration. |
|
||||||
| **RECORDING_MAX_DURATION** | Integer | `None` | Maximum duration of a recording in milliseconds. Must be synced with the LiveKit Egress configuration. Set to None for unlimited duration. When the maximum duration is reached, the recording is automatically stopped and saved, and the user is prompted in the frontend with an alert message. |
|
| **RECORDING_MAX_DURATION** | Integer | `None` | Maximum duration of a recording in milliseconds. Must be synced with the LiveKit Egress configuration. Set to None for unlimited duration. When the maximum duration is reached, the recording is automatically stopped and saved, and the user is prompted in the frontend with an alert message. |
|
||||||
|
| **RECORDING_ENCODING_ENABLED** | Boolean | `False` | When `False`, LiveKit Egress uses its built-in `H264_720P_30` preset. When `True`, the `RECORDING_ENCODING_*` values below are sent to LiveKit as advanced `EncodingOptions`. See [Tuning recording encoding](#tuning-recording-encoding). |
|
||||||
|
| **RECORDING_ENCODING_WIDTH** | Integer | `1280` | Recording video width in pixels. Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
| **RECORDING_ENCODING_HEIGHT** | Integer | `720` | Recording video height in pixels. Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
| **RECORDING_ENCODING_FRAMERATE** | Integer | `30` | Recording video framerate (fps). Directly impacts egress worker CPU (roughly linear). Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
| **RECORDING_ENCODING_VIDEO_BITRATE_KBPS** | Integer | `3000` | H.264 MAIN video bitrate in kbps. Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
| **RECORDING_ENCODING_AUDIO_BITRATE_KBPS** | Integer | `128` | AAC audio bitrate in kbps. Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
| **RECORDING_ENCODING_KEY_FRAME_INTERVAL_S** | Float | `4.0` | Keyframe interval in seconds. Drives seek granularity in the recorded MP4 (a player can only seek to keyframe boundaries). Larger values give the encoder slightly more bits for non-keyframe content at a fixed bitrate. `4.0` is a standard VOD value. Only applied when `RECORDING_ENCODING_ENABLED` is `True`. |
|
||||||
|
|
||||||
|
|
||||||
### Manual Storage Webhook
|
### Manual Storage Webhook
|
||||||
@@ -141,3 +148,54 @@ Using default project meet
|
|||||||
|
|
||||||
This allows you to verify which recordings are in progress, troubleshoot egress issues, and confirm that recordings are being processed correctly.
|
This allows you to verify which recordings are in progress, troubleshoot egress issues, and confirm that recordings are being processed correctly.
|
||||||
|
|
||||||
|
## Tuning recording encoding
|
||||||
|
|
||||||
|
By default, LiveKit Egress records with the built-in `H264_720P_30` preset: 1280×720 at 30 fps, 3000 kbps H.264 MAIN video and 128 kbps AAC audio. For a one-hour meeting this produces a file of roughly **1.4 GB**, which is often heavier than necessary for talking-head content and screen sharing.
|
||||||
|
|
||||||
|
The `RECORDING_ENCODING_*` settings let operators override this preset without modifying the source. Values are passed straight through LiveKit's `EncodingOptions.advanced` to the GStreamer pipeline (`x264enc` for video, `faac` for audio), so there are no hidden conversions — what you set is what the encoder receives.
|
||||||
|
|
||||||
|
### How values map to GStreamer
|
||||||
|
|
||||||
|
| Setting | GStreamer element | Property |
|
||||||
|
| ------------------------------------- | ----------------- | ---------------------------------- |
|
||||||
|
| `RECORDING_ENCODING_WIDTH/HEIGHT` | capsfilter | `video/x-raw,width=W,height=H` |
|
||||||
|
| `RECORDING_ENCODING_FRAMERATE` | capsfilter | `framerate=F/1` |
|
||||||
|
| `RECORDING_ENCODING_VIDEO_BITRATE_KBPS` | `x264enc` | `bitrate=kbps` (kilobits) |
|
||||||
|
| `RECORDING_ENCODING_KEY_FRAME_INTERVAL_S` | `x264enc` | `key-int-max = interval × fps` |
|
||||||
|
| `RECORDING_ENCODING_AUDIO_BITRATE_KBPS` | `faac` | `bitrate = kbps × 1000` (bits) |
|
||||||
|
|
||||||
|
The H.264 profile is fixed to MAIN and the x264 `speed-preset` to `veryfast` by LiveKit (real-time constraint) — lowering the framerate is therefore the main lever to save CPU, while lowering the bitrate is the main lever to shrink the output file.
|
||||||
|
|
||||||
|
### Reference profiles
|
||||||
|
|
||||||
|
Rough 30-minute file-size estimates assume video + audio bitrate multiplied by duration. Actual sizes vary with content (static talking heads compress better than heavy screen motion). Egress CPU figures are indicative, measured on a single Ryzen laptop core saturated by the default preset (= 100 %); scaling is roughly linear with `framerate × bitrate` but the absolute numbers depend on the host hardware.
|
||||||
|
|
||||||
|
| Profile | Resolution | FPS | Video (kbps) | Audio (kbps) | Keyframe (s) | ~ size / 30 min | Egress CPU (vs. default) | Suitable for |
|
||||||
|
| ---------------------- | ---------- | --- | ------------ | ------------ | ------------ | --------------- | ------------------------ | --------------------------------------------------- |
|
||||||
|
| Default (preset) | 1280×720 | 30 | 3000 | 128 | 4 | **~690 MB** | 100 % | Unchanged LiveKit behaviour |
|
||||||
|
| Balanced | 1280×720 | 20 | 1000 | 96 | 4 | ~240 MB | ~67 % | Mixed content, moderate motion |
|
||||||
|
| **Low CPU / small file** | 1280×720 | 15 | 600 | 64 | 4 | **~150 MB** | ~50 % | Talking-head dominant meetings + occasional slides ★ |
|
||||||
|
| Slide-heavy | 1280×720 | 15 | 900 | 64 | 4 | ~210 MB | ~55 % | Frequent dense screen sharing (decks, IDE, docs) |
|
||||||
|
| Minimum CPU | 960×540 | 15 | 500 | 64 | 4 | ~125 MB | ~30 % | Voice-first meetings, readable text not required |
|
||||||
|
| Audio-heavy fallback | 1280×720 | 10 | 400 | 96 | 4 | ~110 MB | ~35 % | Long webinars, low motion |
|
||||||
|
|
||||||
|
★ Recommended starting point for typical LaSuite Meet usage.
|
||||||
|
|
||||||
|
Environment variables for the **Low CPU / small file** profile:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
RECORDING_ENCODING_ENABLED=True
|
||||||
|
RECORDING_ENCODING_WIDTH=1280
|
||||||
|
RECORDING_ENCODING_HEIGHT=720
|
||||||
|
RECORDING_ENCODING_FRAMERATE=15
|
||||||
|
RECORDING_ENCODING_VIDEO_BITRATE_KBPS=600
|
||||||
|
RECORDING_ENCODING_AUDIO_BITRATE_KBPS=64
|
||||||
|
RECORDING_ENCODING_KEY_FRAME_INTERVAL_S=4.0
|
||||||
|
```
|
||||||
|
|
||||||
|
### Caveats
|
||||||
|
|
||||||
|
- **Screen-share readability — think bits/frame, not bitrate**: at 720p, text legibility starts to break down below ~40 kbits/frame (= `bitrate ÷ framerate`). The recommended preset (600 kbps × 15 fps) sits at exactly that threshold, comfortable for talking heads with occasional slide sharing. The same 600 kbps at 30 fps would only deliver 20 kbits/frame and visibly blur dense slides — which is why **lowering framerate is a more screen-share-friendly lever than lowering bitrate**. For deck-heavy or IDE-share meetings, prefer the **Slide-heavy** profile (900 kbps × 15 fps ≈ 60 kbits/frame).
|
||||||
|
- **Motion handling**: the `veryfast` x264 preset is set by LiveKit and cannot be overridden here. Low-bitrate settings will therefore show more artefacts on fast motion than an offline re-encode with a slower preset would. This is the other reason FPS reduction is the safer tuning lever for meeting recordings.
|
||||||
|
- **Audio**: AAC at 64 kbps stereo is transparent for voice but starts to compress music noticeably. Keep 128 kbps if you expect music playback in meetings.
|
||||||
|
- **Codec choice**: H.264 MAIN is hardcoded on purpose. Switching to HEVC or VP9 would increase egress CPU cost 2×–5×, defeating the goal of this tuning.
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ sequenceDiagram
|
|||||||
| whisperx_api_key | Secret | — | API key for accessing WhisperX. |
|
| whisperx_api_key | Secret | — | API key for accessing WhisperX. |
|
||||||
| whisperx_base_url | String | `"https://api.whisperx.com/v1"` | Base URL for the WhisperX API. |
|
| whisperx_base_url | String | `"https://api.whisperx.com/v1"` | Base URL for the WhisperX API. |
|
||||||
| whisperx_asr_model | String | `"whisper-1"` | ASR model used for transcription. |
|
| whisperx_asr_model | String | `"whisper-1"` | ASR model used for transcription. |
|
||||||
| whisperx_max_retries | Integer | `0` | Maximum number of retries for WhisperX API requests. |
|
|
||||||
| webhook_max_retries | Integer | `2` | Maximum retries for webhook requests. |
|
| webhook_max_retries | Integer | `2` | Maximum retries for webhook requests. |
|
||||||
| webhook_status_forcelist | List[Int] | `[502, 503, 504]` | HTTP status codes triggering webhook retry. |
|
| webhook_status_forcelist | List[Int] | `[502, 503, 504]` | HTTP status codes triggering webhook retry. |
|
||||||
| webhook_backoff_factor | Float | `0.1` | Exponential backoff factor for webhook retries. |
|
| webhook_backoff_factor | Float | `0.1` | Exponential backoff factor for webhook retries. |
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ La Suite Meet maintainers use only the Kubernetes deployment method in productio
|
|||||||
We understand that not everyone has a Kubernetes cluster available, please follow the instructions provided [here](/docs/installation/compose.md) to set up a docker compose instance.
|
We understand that not everyone has a Kubernetes cluster available, please follow the instructions provided [here](/docs/installation/compose.md) to set up a docker compose instance.
|
||||||
We also provide [Docker images](https://hub.docker.com/u/lasuite?page=1&search=meet) that can be deployed using Compose.
|
We also provide [Docker images](https://hub.docker.com/u/lasuite?page=1&search=meet) that can be deployed using Compose.
|
||||||
|
|
||||||
|
## Scalingo
|
||||||
|
|
||||||
|
La Suite Meet can be deployed on Scalingo PaaS using the Suite Numérique buildpack. See the [Scalingo deployment guide](./scalingo.md) for detailed instructions.
|
||||||
|
|
||||||
## Other ways to install La Suite Meet
|
## Other ways to install La Suite Meet
|
||||||
Community members have contributed alternative ways to install La Suite Meet 🙏. While maintainers may not provide direct support, we help keep these instructions up to date, and you can reach out to contributors or the community for assistance.
|
Community members have contributed alternative ways to install La Suite Meet 🙏. While maintainers may not provide direct support, we help keep these instructions up to date, and you can reach out to contributors or the community for assistance.
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Installation with docker compose
|
# Installation with docker compose
|
||||||
|
|
||||||
We provide a sample configuration for running Meet using Docker Compose. Please note that this configuration is experimental, and the official way to deploy Meet in production is to use [k8s](../installation/k8s.md)
|
We provide a sample configuration for running Meet using Docker Compose. Please note that this configuration is experimental, and the official way to deploy Meet in production is to use [k8s](../installation/kubernetes.md).
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ curl -o default.conf.template https://raw.githubusercontent.com/suitenumerique/m
|
|||||||
|
|
||||||
## Step 2: Configuration
|
## Step 2: Configuration
|
||||||
|
|
||||||
Meet configuration is achieved through environment variables. We provide a [detailed description of all variables](../env.md).
|
Meet configuration is achieved through environment variables. We provide a [detailed description of all variables](../../src/helm/meet/README.md).
|
||||||
|
|
||||||
In this example, we assume the following services:
|
In this example, we assume the following services:
|
||||||
|
|
||||||
@@ -87,12 +87,12 @@ If you are using an external service, you need to set `REDIS_URL` environment va
|
|||||||
|
|
||||||
Generate a secure key for `LIVEKIT_API_SECRET` in `env.d/common`.
|
Generate a secure key for `LIVEKIT_API_SECRET` in `env.d/common`.
|
||||||
|
|
||||||
We provide a minimal recommanded config for production environment in `livekit-server.yaml`. Set the previously generated API secret key in the config file.
|
We provide a minimal recommended config for production environment in `livekit-server.yaml`. Set the previously generated API secret key in the config file.
|
||||||
|
|
||||||
To view other customization options, see [config-sample.yaml](https://github.com/livekit/livekit/blob/master/config-sample.yaml)
|
To view other customization options, see [config-sample.yaml](https://github.com/livekit/livekit/blob/master/config-sample.yaml)
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
> In this example, we configured multiplexing on a single UDP port. For better performances, you can configure a range of UDP ports.
|
> In this example, we configured multiplexing on a single UDP port. For better performance, you can configure a range of UDP ports.
|
||||||
|
|
||||||
### Meet
|
### Meet
|
||||||
|
|
||||||
@@ -129,7 +129,7 @@ The following ports will need to be opened:
|
|||||||
- 7881/tcp - WebRTC ICE over TCP
|
- 7881/tcp - WebRTC ICE over TCP
|
||||||
- 7882/udp - for WebRTC multiplexing over UDP
|
- 7882/udp - for WebRTC multiplexing over UDP
|
||||||
|
|
||||||
If you are using ufw, enter the follwoing:
|
If you are using ufw, enter the following:
|
||||||
```
|
```
|
||||||
ufw allow 80/tcp
|
ufw allow 80/tcp
|
||||||
ufw allow 443/tcp
|
ufw allow 443/tcp
|
||||||
@@ -177,6 +177,15 @@ You will need to uncomment the environment and network sections in compose file
|
|||||||
# external: true
|
# external: true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### Caddy Reverse Proxy
|
||||||
|
Expose the Frontend port to the host
|
||||||
|
```yaml
|
||||||
|
frontend:
|
||||||
|
…
|
||||||
|
ports:
|
||||||
|
- "8086:8086"
|
||||||
|
```
|
||||||
|
|
||||||
## Step 5: Start Meet
|
## Step 5: Start Meet
|
||||||
|
|
||||||
You are ready to start your Meet application !
|
You are ready to start your Meet application !
|
||||||
@@ -198,7 +207,7 @@ Replace `<admin email>` with the email of your admin user and generate a secure
|
|||||||
|
|
||||||
Your Meet instance is now available on the domain you defined, https://meet.yourdomain.tld.
|
Your Meet instance is now available on the domain you defined, https://meet.yourdomain.tld.
|
||||||
|
|
||||||
THe admin interface is available on https://meet.yourdomain.tld/admin with the admin user you just created.
|
The admin interface is available on https://meet.yourdomain.tld/admin with the admin user you just created.
|
||||||
|
|
||||||
## How to upgrade your Meet application
|
## How to upgrade your Meet application
|
||||||
|
|
||||||
|
|||||||
@@ -122,11 +122,11 @@ If you haven't run the script **bin/start-kind.sh**, you'll need to manually cre
|
|||||||
$ kubectl create namespace meet
|
$ kubectl create namespace meet
|
||||||
```
|
```
|
||||||
|
|
||||||
If you have already run the script, you can skip this step and proceed to the next instruction. NOTE: Before you proceed, and is using the kind method, make sure you download this repo examples/ directory and its contents to the location where you will be executing the helm command. Helm will look for "examples/<name>values.yaml" from based on the path it is being executed.
|
If you have already run the script, you can skip this step and proceed to the next instruction. NOTE: Before you proceed, and is using the kind method, make sure you download this repo examples/helm directory and its contents to the location where you will be executing the helm command. Helm will look for "examples/helm/<name>values.yaml" from based on the path it is being executed.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ kubectl config set-context --current --namespace=meet
|
$ kubectl config set-context --current --namespace=meet
|
||||||
$ helm install keycloak oci://registry-1.docker.io/bitnamicharts/keycloak -f examples/keycloak.values.yaml
|
$ helm install keycloak oci://registry-1.docker.io/bitnamicharts/keycloak -f examples/helm/keycloak.values.yaml
|
||||||
$ #wait until
|
$ #wait until
|
||||||
$ kubectl get po
|
$ kubectl get po
|
||||||
NAME READY STATUS RESTARTS AGE
|
NAME READY STATUS RESTARTS AGE
|
||||||
@@ -150,7 +150,7 @@ OIDC_RP_SIGN_ALGO: RS256
|
|||||||
OIDC_RP_SCOPES: "openid email"
|
OIDC_RP_SCOPES: "openid email"
|
||||||
```
|
```
|
||||||
|
|
||||||
You can find these values in **examples/keycloak.values.yaml**
|
You can find these values in **examples/helm/keycloak.values.yaml**
|
||||||
|
|
||||||
### Find livekit server connexion values
|
### Find livekit server connexion values
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ LaSuite Meet use livekit for streaming part so if you have a livekit provider, o
|
|||||||
Livekit need a redis (and meet too) so we will start by deploying a redis :
|
Livekit need a redis (and meet too) so we will start by deploying a redis :
|
||||||
|
|
||||||
```
|
```
|
||||||
$ helm install redis oci://registry-1.docker.io/bitnamicharts/redis -f examples/redis.values.yaml
|
$ helm install redis oci://registry-1.docker.io/bitnamicharts/redis -f examples/helm/redis.values.yaml
|
||||||
$ kubectl get po
|
$ kubectl get po
|
||||||
NAME READY STATUS RESTARTS AGE
|
NAME READY STATUS RESTARTS AGE
|
||||||
keycloak-0 1/1 Running 0 26m
|
keycloak-0 1/1 Running 0 26m
|
||||||
@@ -172,7 +172,7 @@ When the redis is ready we can deploy livekit-server.
|
|||||||
```
|
```
|
||||||
$ helm repo add livekit https://helm.livekit.io
|
$ helm repo add livekit https://helm.livekit.io
|
||||||
$ helm repo update
|
$ helm repo update
|
||||||
$ helm install livekit livekit/livekit-server -f examples/livekit.values.yaml
|
$ helm install livekit livekit/livekit-server -f examples/helm/livekit.values.yaml
|
||||||
$ kubectl get po
|
$ kubectl get po
|
||||||
NAME READY STATUS RESTARTS AGE
|
NAME READY STATUS RESTARTS AGE
|
||||||
keycloak-0 1/1 Running 0 30m
|
keycloak-0 1/1 Running 0 30m
|
||||||
@@ -199,7 +199,7 @@ CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1
|
|||||||
LaSuite Meet uses a postgresql db as backend so if you have a provider, obtain the necessary information to use it. If you do not have, you can install a postgresql testing environment as follows:
|
LaSuite Meet uses a postgresql db as backend so if you have a provider, obtain the necessary information to use it. If you do not have, you can install a postgresql testing environment as follows:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql -f examples/postgresql.values.yaml
|
$ helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql -f examples/helm/postgresql.values.yaml
|
||||||
$ kubectl get po
|
$ kubectl get po
|
||||||
NAME READY STATUS RESTARTS AGE
|
NAME READY STATUS RESTARTS AGE
|
||||||
keycloak-0 1/1 Running 0 45m
|
keycloak-0 1/1 Running 0 45m
|
||||||
@@ -226,7 +226,7 @@ Now you are ready to deploy LaSuite Meet without AI. AI required more dependenci
|
|||||||
```
|
```
|
||||||
$ helm repo add meet https://suitenumerique.github.io/meet/
|
$ helm repo add meet https://suitenumerique.github.io/meet/
|
||||||
$ helm repo update
|
$ helm repo update
|
||||||
$ helm install meet meet/meet -f examples/meet.values.yaml
|
$ helm install meet meet/meet -f examples/helm/meet.values.yaml
|
||||||
```
|
```
|
||||||
|
|
||||||
## Test your deployment
|
## Test your deployment
|
||||||
@@ -244,6 +244,69 @@ meet-admin <none> meet.127.0.0.1.nip.io localhost 80, 44
|
|||||||
|
|
||||||
You can use LaSuite Meet on https://meet.127.0.0.1.nip.io from the local device. The provisioning user in keycloak is meet/meet.
|
You can use LaSuite Meet on https://meet.127.0.0.1.nip.io from the local device. The provisioning user in keycloak is meet/meet.
|
||||||
|
|
||||||
|
## Rebranding the favicon
|
||||||
|
|
||||||
|
The favicon is bundled into the frontend image and served as a set of static
|
||||||
|
files from `/usr/share/nginx/html` (`favicon.ico`, `favicon-16x16.png`,
|
||||||
|
`favicon-32x32.png`, `apple-touch-icon.png`, `android-chrome-192x192.png`,
|
||||||
|
`android-chrome-512x512.png`, `icon.png`). To rebrand without forking and
|
||||||
|
rebuilding the image, overlay your own icons onto those paths with a volume —
|
||||||
|
this serves the right icon from the first byte (no rebuild, no flash) and
|
||||||
|
covers every variant, including the iOS home-screen and Android/PWA icons.
|
||||||
|
|
||||||
|
Put your icons in a `ConfigMap` (`binaryData` keeps the PNGs intact)…
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: meet-favicon
|
||||||
|
binaryData:
|
||||||
|
# base64 of each replacement icon
|
||||||
|
favicon.ico: <base64…>
|
||||||
|
favicon-16x16.png: <base64…>
|
||||||
|
favicon-32x32.png: <base64…>
|
||||||
|
apple-touch-icon.png: <base64…>
|
||||||
|
android-chrome-192x192.png: <base64…>
|
||||||
|
android-chrome-512x512.png: <base64…>
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# e.g. build the ConfigMap straight from a directory of icons
|
||||||
|
$ kubectl create configmap meet-favicon --from-file=./my-icons/
|
||||||
|
```
|
||||||
|
|
||||||
|
…then mount each file over the bundled one via the chart's
|
||||||
|
`frontend.extraVolumes` / `frontend.extraVolumeMounts` (the `subPath` mounts
|
||||||
|
the single file without hiding the rest of `html/`):
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
frontend:
|
||||||
|
extraVolumes:
|
||||||
|
- name: favicon
|
||||||
|
configMap:
|
||||||
|
name: meet-favicon
|
||||||
|
extraVolumeMounts:
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/favicon.ico
|
||||||
|
subPath: favicon.ico
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/favicon-16x16.png
|
||||||
|
subPath: favicon-16x16.png
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/favicon-32x32.png
|
||||||
|
subPath: favicon-32x32.png
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/apple-touch-icon.png
|
||||||
|
subPath: apple-touch-icon.png
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/android-chrome-192x192.png
|
||||||
|
subPath: android-chrome-192x192.png
|
||||||
|
- name: favicon
|
||||||
|
mountPath: /usr/share/nginx/html/android-chrome-512x512.png
|
||||||
|
subPath: android-chrome-512x512.png
|
||||||
|
```
|
||||||
|
|
||||||
## All options
|
## All options
|
||||||
|
|
||||||
These are the environmental options available on meet backend.
|
These are the environmental options available on meet backend.
|
||||||
@@ -344,7 +407,7 @@ These are the environmental options available on meet backend.
|
|||||||
| RECORDING_WORKER_CLASSES | Worker classes for recording | {"screen_recording": "core.recording.worker.services.VideoCompositeEgressService","transcript": "core.recording.worker.services.AudioCompositeEgressService"} |
|
| RECORDING_WORKER_CLASSES | Worker classes for recording | {"screen_recording": "core.recording.worker.services.VideoCompositeEgressService","transcript": "core.recording.worker.services.AudioCompositeEgressService"} |
|
||||||
| RECORDING_EVENT_PARSER_CLASS | Storage event engine for recording | core.recording.event.parsers.MinioParser |
|
| RECORDING_EVENT_PARSER_CLASS | Storage event engine for recording | core.recording.event.parsers.MinioParser |
|
||||||
| RECORDING_ENABLE_STORAGE_EVENT_AUTH | Enable storage event authorization | true |
|
| RECORDING_ENABLE_STORAGE_EVENT_AUTH | Enable storage event authorization | true |
|
||||||
| RECORDING_STORAGE_EVENT_ENABLE | Enable recording storage events | false |
|
| RECORDING_STORAGE_EVENT_ENABLE | Enable recording storage events. If false, fallback to egress webhook. | false |
|
||||||
| RECORDING_STORAGE_EVENT_TOKEN | Recording storage event token | |
|
| RECORDING_STORAGE_EVENT_TOKEN | Recording storage event token | |
|
||||||
| RECORDING_EXPIRATION_DAYS | Recording expiration in days | |
|
| RECORDING_EXPIRATION_DAYS | Recording expiration in days | |
|
||||||
| RECORDING_MAX_DURATION | Maximum recording duration in milliseconds. Must match LiveKit Egress configuration exactly. | |
|
| RECORDING_MAX_DURATION | Maximum recording duration in milliseconds. Must match LiveKit Egress configuration exactly. | |
|
||||||
|
|||||||
@@ -0,0 +1,185 @@
|
|||||||
|
# Deployment on Scalingo
|
||||||
|
|
||||||
|
This guide explains how to deploy La Suite Meet on [Scalingo](https://scalingo.com/) using the [Suite Numérique buildpack](https://github.com/suitenumerique/buildpack).
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Scalingo is a Platform-as-a-Service (PaaS) that simplifies application deployment. This setup uses a custom buildpack to handle both the frontend (Vite) and backend (Django) builds, serving them through Nginx.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- A Scalingo account
|
||||||
|
- Scalingo CLI installed (optional but recommended)
|
||||||
|
- A PostgreSQL database addon
|
||||||
|
- A Redis addon (for caching and sessions)
|
||||||
|
|
||||||
|
## Step 1: Create Your App
|
||||||
|
|
||||||
|
Create a new app on Scalingo using `scalingo` cli or using the [Scalingo dashboard](https://dashboard.scalingo.com/).
|
||||||
|
|
||||||
|
## Step 2: Provision Addons
|
||||||
|
|
||||||
|
Add the required PostgreSQL and Redis services.
|
||||||
|
|
||||||
|
This will set the following environment variables automatically:
|
||||||
|
- `SCALINGO_POSTGRESQL_URL` - Database connection string
|
||||||
|
- `SCALINGO_REDIS_URL` - Redis connection string
|
||||||
|
|
||||||
|
## Step 3: Configure Environment Variables
|
||||||
|
|
||||||
|
Set the following environment variables in your Scalingo app:
|
||||||
|
|
||||||
|
### Buildpack Configuration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set BUILDPACK_URL="https://github.com/suitenumerique/buildpack#main"
|
||||||
|
scalingo env-set LASUITE_APP_NAME="meet"
|
||||||
|
scalingo env-set LASUITE_BACKEND_DIR="."
|
||||||
|
scalingo env-set LASUITE_FRONTEND_DIR="src/frontend/"
|
||||||
|
scalingo env-set LASUITE_NGINX_DIR="."
|
||||||
|
scalingo env-set LASUITE_SCRIPT_POSTCOMPILE="bin/buildpack_postcompile.sh"
|
||||||
|
scalingo env-set LASUITE_SCRIPT_POSTFRONTEND="bin/buildpack_postfrontend.sh"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Database and Cache
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set DATABASE_URL="\$SCALINGO_POSTGRESQL_URL"
|
||||||
|
scalingo env-set REDIS_URL="\$SCALINGO_REDIS_URL"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Django Settings
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set DJANGO_SETTINGS_MODULE="meet.settings"
|
||||||
|
scalingo env-set DJANGO_CONFIGURATION="Production"
|
||||||
|
scalingo env-set DJANGO_SECRET_KEY="<generate-a-secure-secret-key>"
|
||||||
|
scalingo env-set DJANGO_ALLOWED_HOSTS="my-meet-app.osc-fr1.scalingo.io"
|
||||||
|
```
|
||||||
|
|
||||||
|
### OIDC Authentication
|
||||||
|
|
||||||
|
Configure your OIDC provider (e.g., Keycloak, Authentik):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set OIDC_OP_BASE_URL="https://auth.yourdomain.com/realms/meet"
|
||||||
|
scalingo env-set OIDC_RP_CLIENT_ID="meet-client-id"
|
||||||
|
scalingo env-set OIDC_RP_CLIENT_SECRET="<your-client-secret>"
|
||||||
|
scalingo env-set OIDC_RP_SIGN_ALGO="RS256"
|
||||||
|
```
|
||||||
|
|
||||||
|
### LiveKit Configuration
|
||||||
|
|
||||||
|
Meet requires a LiveKit server for video conferencing:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set LIVEKIT_API_URL="wss://livekit.yourdomain.com"
|
||||||
|
scalingo env-set LIVEKIT_API_KEY="<your-livekit-api-key>"
|
||||||
|
scalingo env-set LIVEKIT_API_SECRET="<your-livekit-api-secret>"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Email Configuration (Optional)
|
||||||
|
|
||||||
|
For email notifications see https://doc.scalingo.com/platform/app/sending-emails:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set DJANGO_EMAIL_HOST="smtp.example.org"
|
||||||
|
scalingo env-set DJANGO_EMAIL_PORT="587"
|
||||||
|
scalingo env-set DJANGO_EMAIL_HOST_USER="<smtp-user>"
|
||||||
|
scalingo env-set DJANGO_EMAIL_HOST_PASSWORD="<smtp-password>"
|
||||||
|
scalingo env-set DJANGO_EMAIL_USE_TLS="True"
|
||||||
|
scalingo env-set DJANGO_EMAIL_FROM="meet@yourdomain.com"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Step 4: Deploy
|
||||||
|
|
||||||
|
Deploy your application:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git push scalingo main
|
||||||
|
```
|
||||||
|
|
||||||
|
The Procfile will automatically:
|
||||||
|
1. Build the frontend (Vite)
|
||||||
|
2. Build the backend (Django)
|
||||||
|
3. Run the post-compile script (cleanup)
|
||||||
|
4. Run the post-frontend script (move assets and prepare for deployment)
|
||||||
|
5. Start Nginx and Gunicorn
|
||||||
|
6. Run django migrations
|
||||||
|
|
||||||
|
## Step 5: Create superuser
|
||||||
|
|
||||||
|
After the first deployment, create an admin user:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo run python manage.py createsuperuser
|
||||||
|
```
|
||||||
|
|
||||||
|
## Custom Domain (Optional)
|
||||||
|
|
||||||
|
To use a custom domain:
|
||||||
|
|
||||||
|
1. Add the domain in Scalingo dashboard
|
||||||
|
2. Update `DJANGO_ALLOWED_HOSTS` with your custom domain
|
||||||
|
3. Configure your DNS to point to Scalingo
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo domains-add meet.yourdomain.com
|
||||||
|
scalingo env-set DJANGO_ALLOWED_HOSTS="meet.yourdomain.com,my-meet-app.osc-fr1.scalingo.io"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Custom Logo (Optional)
|
||||||
|
|
||||||
|
To use a custom logo, set the `CUSTOM_LOGO_URL` environment variable with an HTTPS URL pointing to an SVG item (max 5MB):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo env-set CUSTOM_LOGO_URL="https://cdn.yourdomain.com/logo.svg"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Check Logs
|
||||||
|
|
||||||
|
```bash
|
||||||
|
scalingo logs --tail
|
||||||
|
```
|
||||||
|
|
||||||
|
### Common Issues
|
||||||
|
|
||||||
|
1. **Build fails**: Check that all required environment variables are set
|
||||||
|
2. **Database connection error**: Verify `DATABASE_URL` is correctly set to `$SCALINGO_POSTGRESQL_URL`
|
||||||
|
3. **Static files not served**: Ensure the buildpack post-frontend script ran successfully
|
||||||
|
4. **OIDC errors**: Verify your OIDC provider configuration and callback URLs
|
||||||
|
|
||||||
|
### Useful Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Open a console
|
||||||
|
scalingo run bash
|
||||||
|
|
||||||
|
# Restart the app
|
||||||
|
scalingo restart
|
||||||
|
|
||||||
|
# Scale containers
|
||||||
|
scalingo scale web:2
|
||||||
|
|
||||||
|
# One-off command
|
||||||
|
scalingo run python manage.py shell
|
||||||
|
```
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
On Scalingo, the application runs as follows:
|
||||||
|
|
||||||
|
1. **Build Phase**: The buildpack compiles both frontend and backend
|
||||||
|
2. **Runtime**:
|
||||||
|
- Nginx serves static files and proxies to the backend
|
||||||
|
- Gunicorn runs the Django WSGI application
|
||||||
|
- Both processes are managed by the `bin/buildpack_start.sh` script
|
||||||
|
|
||||||
|
## Additional Resources
|
||||||
|
|
||||||
|
- [Scalingo Documentation](https://doc.scalingo.com/)
|
||||||
|
- [Suite Numérique Buildpack](https://github.com/suitenumerique/buildpack)
|
||||||
|
- [Meet Environment Variables](../../src/helm/meet/README.md)
|
||||||
|
- [Django Configurations Documentation](https://django-configurations.readthedocs.io/)
|
||||||
@@ -185,11 +185,13 @@ paths:
|
|||||||
pin_code: "123456"
|
pin_code: "123456"
|
||||||
phone_number: "+1-555-0100"
|
phone_number: "+1-555-0100"
|
||||||
default_country: "US"
|
default_country: "US"
|
||||||
|
configuration: {}
|
||||||
'401':
|
'401':
|
||||||
$ref: '#/components/responses/UnauthorizedError'
|
$ref: '#/components/responses/UnauthorizedError'
|
||||||
'403':
|
'403':
|
||||||
$ref: '#/components/responses/ForbiddenError'
|
$ref: '#/components/responses/ForbiddenError'
|
||||||
|
|
||||||
|
/rooms/:
|
||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
- Rooms
|
- Rooms
|
||||||
@@ -197,10 +199,6 @@ paths:
|
|||||||
description: |
|
description: |
|
||||||
Creates a new room with secure defaults for external API usage.
|
Creates a new room with secure defaults for external API usage.
|
||||||
|
|
||||||
**Restrictions:**
|
|
||||||
- Rooms are always created with `trusted` access (no public rooms via API)
|
|
||||||
- Room access_level can be updated from the webapp interface.
|
|
||||||
|
|
||||||
**Defaults:**
|
**Defaults:**
|
||||||
- Delegated user is set as owner
|
- Delegated user is set as owner
|
||||||
- Room slug auto-generated for uniqueness
|
- Room slug auto-generated for uniqueness
|
||||||
@@ -217,8 +215,17 @@ paths:
|
|||||||
$ref: '#/components/schemas/RoomCreate'
|
$ref: '#/components/schemas/RoomCreate'
|
||||||
examples:
|
examples:
|
||||||
emptyBody:
|
emptyBody:
|
||||||
summary: No parameters (default)
|
summary: No parameters (use all defaults)
|
||||||
value: {}
|
value: { }
|
||||||
|
withAccessLevel:
|
||||||
|
summary: Specify access level
|
||||||
|
value:
|
||||||
|
access_level: "trusted"
|
||||||
|
withConfiguration:
|
||||||
|
summary: Provide room configuration
|
||||||
|
value:
|
||||||
|
configuration:
|
||||||
|
everyone_can_mute: true
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
description: Room created successfully
|
description: Room created successfully
|
||||||
@@ -268,6 +275,7 @@ paths:
|
|||||||
pin_code: "123456"
|
pin_code: "123456"
|
||||||
phone_number: "+1-555-0100"
|
phone_number: "+1-555-0100"
|
||||||
default_country: "US"
|
default_country: "US"
|
||||||
|
configuration: {}
|
||||||
'401':
|
'401':
|
||||||
$ref: '#/components/responses/UnauthorizedError'
|
$ref: '#/components/responses/UnauthorizedError'
|
||||||
'403':
|
'403':
|
||||||
@@ -343,8 +351,56 @@ components:
|
|||||||
|
|
||||||
RoomCreate:
|
RoomCreate:
|
||||||
type: object
|
type: object
|
||||||
description: Empty object - all room properties are auto-generated
|
description: |
|
||||||
properties: {}
|
Optional fields for room creation. All fields have secure defaults if omitted.
|
||||||
|
properties:
|
||||||
|
access_level:
|
||||||
|
$ref: '#/components/schemas/RoomAccessLevel'
|
||||||
|
configuration:
|
||||||
|
$ref: '#/components/schemas/RoomConfiguration'
|
||||||
|
|
||||||
|
RoomConfiguration:
|
||||||
|
type: object
|
||||||
|
description: |
|
||||||
|
Optional room behaviour settings. Unknown fields are rejected.
|
||||||
|
All fields are optional and default to `null` (server-side defaults apply).
|
||||||
|
properties:
|
||||||
|
can_publish_sources:
|
||||||
|
type: array
|
||||||
|
nullable: true
|
||||||
|
description: |
|
||||||
|
Restricts which media tracks participants are allowed to publish.
|
||||||
|
If `null`, all sources are permitted.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- camera
|
||||||
|
- microphone
|
||||||
|
- screen_share
|
||||||
|
- screen_share_audio
|
||||||
|
example: [ "camera", "microphone" ]
|
||||||
|
everyone_can_mute:
|
||||||
|
type: boolean
|
||||||
|
nullable: true
|
||||||
|
description: |
|
||||||
|
Whether any participant can mute others, or only the room owner/moderator.
|
||||||
|
If `null`, the server default applies.
|
||||||
|
example: true
|
||||||
|
additionalProperties: false
|
||||||
|
|
||||||
|
RoomAccessLevel:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- public
|
||||||
|
- trusted
|
||||||
|
- restricted
|
||||||
|
description: |
|
||||||
|
Controls who can join the room without going through the lobby.
|
||||||
|
|
||||||
|
- `public`: Anyone with the room link can join directly, no authentication required.
|
||||||
|
- `trusted`: Authenticated users join directly. Unauthenticated users wait in the lobby for approval.
|
||||||
|
- `restricted`: Only participants explicitly trusted by the owner bypass the lobby. Everyone else waits for approval regardless of authentication.
|
||||||
|
example: "trusted"
|
||||||
|
|
||||||
Room:
|
Room:
|
||||||
type: object
|
type: object
|
||||||
@@ -361,10 +417,7 @@ components:
|
|||||||
description: URL-friendly room identifier (auto-generated)
|
description: URL-friendly room identifier (auto-generated)
|
||||||
example: "aze-eere-zer"
|
example: "aze-eere-zer"
|
||||||
access_level:
|
access_level:
|
||||||
type: string
|
$ref: '#/components/schemas/RoomAccessLevel'
|
||||||
readOnly: true
|
|
||||||
description: Room access level (always 'trusted' for API-created rooms)
|
|
||||||
example: "trusted"
|
|
||||||
url:
|
url:
|
||||||
type: string
|
type: string
|
||||||
format: uri
|
format: uri
|
||||||
@@ -392,6 +445,8 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
description: Default country code
|
description: Default country code
|
||||||
example: "US"
|
example: "US"
|
||||||
|
configuration:
|
||||||
|
$ref: '#/components/schemas/RoomConfiguration'
|
||||||
|
|
||||||
OAuthError:
|
OAuthError:
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ paths:
|
|||||||
summary: List rooms
|
summary: List rooms
|
||||||
description: |
|
description: |
|
||||||
Returns a list of rooms accessible to the authenticated user.
|
Returns a list of rooms accessible to the authenticated user.
|
||||||
Only rooms where the delegated user has access will be returned.
|
Only rooms where the user has access will be returned.
|
||||||
operationId: listRooms
|
operationId: listRooms
|
||||||
security:
|
security:
|
||||||
- BearerAuth: [rooms:list]
|
- BearerAuth: [rooms:list]
|
||||||
@@ -108,24 +108,22 @@ paths:
|
|||||||
pin_code: "123456"
|
pin_code: "123456"
|
||||||
phone_number: "+1-555-0100"
|
phone_number: "+1-555-0100"
|
||||||
default_country: "US"
|
default_country: "US"
|
||||||
|
configuration: { }
|
||||||
'401':
|
'401':
|
||||||
$ref: '#/components/responses/UnauthorizedError'
|
$ref: '#/components/responses/UnauthorizedError'
|
||||||
'403':
|
'403':
|
||||||
$ref: '#/components/responses/ForbiddenError'
|
$ref: '#/components/responses/ForbiddenError'
|
||||||
|
|
||||||
|
/rooms/:
|
||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
- Rooms
|
- Rooms
|
||||||
summary: Create a room
|
summary: Create a room
|
||||||
description: |
|
description: |
|
||||||
Creates a new room with secure defaults for external API usage.
|
Creates a new room with secure defaults for external API usage.
|
||||||
|
|
||||||
**Restrictions:**
|
|
||||||
- Rooms are always created with `trusted` access (no public rooms via API)
|
|
||||||
- Room access_level can be updated from the webapp interface.
|
|
||||||
|
|
||||||
**Defaults:**
|
**Defaults:**
|
||||||
- Delegated user is set as owner
|
- user is set as owner
|
||||||
- Room slug auto-generated for uniqueness
|
- Room slug auto-generated for uniqueness
|
||||||
- Telephony PIN auto-generated when enabled
|
- Telephony PIN auto-generated when enabled
|
||||||
- Creation tracked with application client_id for auditing
|
- Creation tracked with application client_id for auditing
|
||||||
@@ -140,8 +138,17 @@ paths:
|
|||||||
$ref: '#/components/schemas/RoomCreate'
|
$ref: '#/components/schemas/RoomCreate'
|
||||||
examples:
|
examples:
|
||||||
emptyBody:
|
emptyBody:
|
||||||
summary: No parameters (default)
|
summary: No parameters (use all defaults)
|
||||||
value: {}
|
value: { }
|
||||||
|
withAccessLevel:
|
||||||
|
summary: Specify access level
|
||||||
|
value:
|
||||||
|
access_level: "trusted"
|
||||||
|
withConfiguration:
|
||||||
|
summary: Provide room configuration
|
||||||
|
value:
|
||||||
|
configuration:
|
||||||
|
everyone_can_mute: true
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
description: Room created successfully
|
description: Room created successfully
|
||||||
@@ -191,6 +198,7 @@ paths:
|
|||||||
pin_code: "123456"
|
pin_code: "123456"
|
||||||
phone_number: "+1-555-0100"
|
phone_number: "+1-555-0100"
|
||||||
default_country: "US"
|
default_country: "US"
|
||||||
|
configuration: { }
|
||||||
'401':
|
'401':
|
||||||
$ref: '#/components/responses/UnauthorizedError'
|
$ref: '#/components/responses/UnauthorizedError'
|
||||||
'403':
|
'403':
|
||||||
@@ -209,65 +217,58 @@ components:
|
|||||||
Include in requests as: `Authorization: Bearer <token>`
|
Include in requests as: `Authorization: Bearer <token>`
|
||||||
|
|
||||||
schemas:
|
schemas:
|
||||||
TokenRequest:
|
|
||||||
type: object
|
|
||||||
required:
|
|
||||||
- client_id
|
|
||||||
- client_secret
|
|
||||||
- grant_type
|
|
||||||
- scope
|
|
||||||
properties:
|
|
||||||
client_id:
|
|
||||||
type: string
|
|
||||||
description: Application client identifier
|
|
||||||
example: "550e8400-e29b-41d4-a716-446655440000"
|
|
||||||
client_secret:
|
|
||||||
type: string
|
|
||||||
format: password
|
|
||||||
writeOnly: true
|
|
||||||
description: Application secret key
|
|
||||||
example: "1234567890abcdefghijklmnopqrstuvwxyz"
|
|
||||||
grant_type:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- client_credentials
|
|
||||||
description: OAuth2 grant type (must be 'client_credentials')
|
|
||||||
example: "client_credentials"
|
|
||||||
scope:
|
|
||||||
type: string
|
|
||||||
format: email
|
|
||||||
description: |
|
|
||||||
Email address of the user to delegate.
|
|
||||||
The application will act on behalf of this user.
|
|
||||||
Note: This parameter is named 'scope' to align with OAuth2 conventions,
|
|
||||||
but accepts an email address to identify the user. This design allows
|
|
||||||
for future extensibility.
|
|
||||||
example: "user@example.com"
|
|
||||||
|
|
||||||
TokenResponse:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
access_token:
|
|
||||||
type: string
|
|
||||||
description: JWT access token
|
|
||||||
example: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJtZWV0LWFwaSIsImF1ZCI6Im1lZXQtY2xpZW50cyIsImlhdCI6MTcwOTQ5MTIwMCwiZXhwIjoxNzA5NDk0ODAwLCJjbGllbnRfaWQiOiI1NTBlODQwMC1lMjliLTQxZDQtYTcxNi00NDY2NTU0NDAwMDAiLCJzY29wZSI6InJvb21zOmxpc3Qgcm9vbXM6cmV0cmlldmUgcm9vbXM6Y3JlYXRlIiwidXNlcl9pZCI6IjdiOGQ5YzQwLTNhMmItNGVkZi04NzFjLTJmM2Q0ZTVmNmE3YiIsImRlbGVnYXRlZCI6dHJ1ZX0.signature"
|
|
||||||
token_type:
|
|
||||||
type: string
|
|
||||||
description: Token type (always 'Bearer')
|
|
||||||
example: "Bearer"
|
|
||||||
expires_in:
|
|
||||||
type: integer
|
|
||||||
description: Token lifetime in seconds
|
|
||||||
example: 3600
|
|
||||||
scope:
|
|
||||||
type: string
|
|
||||||
description: Space-separated list of granted permission scopes
|
|
||||||
example: "rooms:list rooms:retrieve rooms:create"
|
|
||||||
|
|
||||||
RoomCreate:
|
RoomCreate:
|
||||||
type: object
|
type: object
|
||||||
description: Empty object - all room properties are auto-generated
|
description: |
|
||||||
properties: {}
|
Optional fields for room creation. All fields have secure defaults if omitted.
|
||||||
|
properties:
|
||||||
|
access_level:
|
||||||
|
$ref: '#/components/schemas/RoomAccessLevel'
|
||||||
|
configuration:
|
||||||
|
$ref: '#/components/schemas/RoomConfiguration'
|
||||||
|
|
||||||
|
RoomConfiguration:
|
||||||
|
type: object
|
||||||
|
description: |
|
||||||
|
Optional room behaviour settings. Unknown fields are rejected.
|
||||||
|
All fields are optional and default to `null` (server-side defaults apply).
|
||||||
|
properties:
|
||||||
|
can_publish_sources:
|
||||||
|
type: array
|
||||||
|
nullable: true
|
||||||
|
description: |
|
||||||
|
Restricts which media tracks participants are allowed to publish.
|
||||||
|
If `null`, all sources are permitted.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- camera
|
||||||
|
- microphone
|
||||||
|
- screen_share
|
||||||
|
- screen_share_audio
|
||||||
|
example: [ "camera", "microphone" ]
|
||||||
|
everyone_can_mute:
|
||||||
|
type: boolean
|
||||||
|
nullable: true
|
||||||
|
description: |
|
||||||
|
Whether any participant can mute others, or only the room owner/moderator.
|
||||||
|
If `null`, the server default applies.
|
||||||
|
example: true
|
||||||
|
additionalProperties: false
|
||||||
|
|
||||||
|
RoomAccessLevel:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- public
|
||||||
|
- trusted
|
||||||
|
- restricted
|
||||||
|
description: |
|
||||||
|
Controls who can join the room without going through the lobby.
|
||||||
|
|
||||||
|
- `public`: Anyone with the room link can join directly, no authentication required.
|
||||||
|
- `trusted`: Authenticated users join directly. Unauthenticated users wait in the lobby for approval.
|
||||||
|
- `restricted`: Only participants explicitly trusted by the owner bypass the lobby. Everyone else waits for approval regardless of authentication.
|
||||||
|
example: "trusted"
|
||||||
|
|
||||||
Room:
|
Room:
|
||||||
type: object
|
type: object
|
||||||
@@ -284,10 +285,7 @@ components:
|
|||||||
description: URL-friendly room identifier (auto-generated)
|
description: URL-friendly room identifier (auto-generated)
|
||||||
example: "aze-eere-zer"
|
example: "aze-eere-zer"
|
||||||
access_level:
|
access_level:
|
||||||
type: string
|
$ref: '#/components/schemas/RoomAccessLevel'
|
||||||
readOnly: true
|
|
||||||
description: Room access level (always 'trusted' for API-created rooms)
|
|
||||||
example: "trusted"
|
|
||||||
url:
|
url:
|
||||||
type: string
|
type: string
|
||||||
format: uri
|
format: uri
|
||||||
@@ -315,6 +313,8 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
description: Default country code
|
description: Default country code
|
||||||
example: "US"
|
example: "US"
|
||||||
|
configuration:
|
||||||
|
$ref: '#/components/schemas/RoomConfiguration'
|
||||||
|
|
||||||
OAuthError:
|
OAuthError:
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -23,9 +23,12 @@ MEET_BASE_URL="http://localhost:8072"
|
|||||||
|
|
||||||
# Media
|
# Media
|
||||||
STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
|
STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
|
||||||
|
AWS_S3_DOMAIN_REPLACE=http://localhost:9000
|
||||||
AWS_S3_ENDPOINT_URL=http://minio:9000
|
AWS_S3_ENDPOINT_URL=http://minio:9000
|
||||||
AWS_S3_ACCESS_KEY_ID=meet
|
AWS_S3_ACCESS_KEY_ID=meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY=password
|
AWS_S3_SECRET_ACCESS_KEY=password
|
||||||
|
MEDIA_BASE_URL=http://localhost:3000
|
||||||
|
FILE_UPLOAD_ENABLED=True
|
||||||
|
|
||||||
# OIDC
|
# OIDC
|
||||||
OIDC_OP_JWKS_ENDPOINT=http://nginx:8083/realms/meet/protocol/openid-connect/certs
|
OIDC_OP_JWKS_ENDPOINT=http://nginx:8083/realms/meet/protocol/openid-connect/certs
|
||||||
@@ -54,6 +57,7 @@ OIDC_RS_CLIENT_SECRET=ThisIsAnExampleKeyForDevPurposeOnly
|
|||||||
LIVEKIT_API_SECRET=secret
|
LIVEKIT_API_SECRET=secret
|
||||||
LIVEKIT_API_KEY=devkey
|
LIVEKIT_API_KEY=devkey
|
||||||
LIVEKIT_API_URL=http://127.0.0.1.nip.io:7880
|
LIVEKIT_API_URL=http://127.0.0.1.nip.io:7880
|
||||||
|
LIVEKIT_INTERNAL_URL=http://livekit:7880
|
||||||
LIVEKIT_VERIFY_SSL=False
|
LIVEKIT_VERIFY_SSL=False
|
||||||
ALLOW_UNREGISTERED_ROOMS=False
|
ALLOW_UNREGISTERED_ROOMS=False
|
||||||
|
|
||||||
@@ -61,13 +65,32 @@ ALLOW_UNREGISTERED_ROOMS=False
|
|||||||
RECORDING_ENABLE=True
|
RECORDING_ENABLE=True
|
||||||
RECORDING_STORAGE_EVENT_ENABLE=True
|
RECORDING_STORAGE_EVENT_ENABLE=True
|
||||||
RECORDING_STORAGE_EVENT_TOKEN=password
|
RECORDING_STORAGE_EVENT_TOKEN=password
|
||||||
SUMMARY_SERVICE_ENDPOINT=http://app-summary-dev:8000/api/v1/tasks/
|
SUMMARY_SERVICE_ENDPOINT=http://app-summary-dev:8000/api/v2/async-jobs/transcribe/
|
||||||
SUMMARY_SERVICE_API_TOKEN=password
|
SUMMARY_SERVICE_API_TOKEN=password
|
||||||
|
SUMMARY_SERVICE_WEBHOOK_API_TOKEN=webhook-password
|
||||||
RECORDING_DOWNLOAD_BASE_URL=http://localhost:3000/recording
|
RECORDING_DOWNLOAD_BASE_URL=http://localhost:3000/recording
|
||||||
|
|
||||||
|
# Recording encoding (LiveKit Egress advanced options).
|
||||||
|
# When RECORDING_ENCODING_ENABLED is False (default), LiveKit uses its built-in
|
||||||
|
# H264_720P_30 preset (1280x720, 30fps, 3000 kbps). Enable and tune to reduce
|
||||||
|
# file size and CPU load on the egress worker.
|
||||||
|
# RECORDING_ENCODING_ENABLED=False
|
||||||
|
# RECORDING_ENCODING_WIDTH=1280
|
||||||
|
# RECORDING_ENCODING_HEIGHT=720
|
||||||
|
# RECORDING_ENCODING_FRAMERATE=30
|
||||||
|
# RECORDING_ENCODING_VIDEO_BITRATE_KBPS=3000
|
||||||
|
# RECORDING_ENCODING_AUDIO_BITRATE_KBPS=128
|
||||||
|
# RECORDING_ENCODING_KEY_FRAME_INTERVAL_S=4.0
|
||||||
|
|
||||||
# Telephony
|
# Telephony
|
||||||
ROOM_TELEPHONY_ENABLED=True
|
ROOM_TELEPHONY_ENABLED=True
|
||||||
|
|
||||||
|
# Metadata
|
||||||
|
METADATA_COLLECTOR_ENABLED=True
|
||||||
|
|
||||||
|
# Subtitle
|
||||||
|
ROOM_SUBTITLE_ENABLED=False
|
||||||
|
|
||||||
FRONTEND_USE_FRENCH_GOV_FOOTER=False
|
FRONTEND_USE_FRENCH_GOV_FOOTER=False
|
||||||
FRONTEND_USE_PROCONNECT_BUTTON=False
|
FRONTEND_USE_PROCONNECT_BUTTON=False
|
||||||
|
|
||||||
@@ -76,3 +99,4 @@ EXTERNAL_API_ENABLED=True
|
|||||||
APPLICATION_JWT_AUDIENCE=http://localhost:8071/external-api/v1.0/
|
APPLICATION_JWT_AUDIENCE=http://localhost:8071/external-api/v1.0/
|
||||||
APPLICATION_JWT_SECRET_KEY=devKey
|
APPLICATION_JWT_SECRET_KEY=devKey
|
||||||
APPLICATION_BASE_URL=http://localhost:3000
|
APPLICATION_BASE_URL=http://localhost:3000
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
WHISPERX_BASE_URL=https://configure-your-url.com
|
||||||
|
WHISPERX_API_KEY=<key>
|
||||||
|
LLM_BASE_URL=https://configure-your-url.com
|
||||||
|
LLM_API_KEY=<key>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
LIVEKIT_URL=ws://livekit:7880
|
||||||
|
LIVEKIT_API_KEY=devkey
|
||||||
|
LIVEKIT_API_SECRET=secret
|
||||||
|
|
||||||
|
AWS_S3_ENDPOINT_URL=minio:9000
|
||||||
|
AWS_S3_ACCESS_KEY_ID=meet
|
||||||
|
AWS_S3_SECRET_ACCESS_KEY=password
|
||||||
|
AWS_STORAGE_BUCKET_NAME=meet-media-storage
|
||||||
|
AWS_S3_SECURE_ACCESS=False
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
LIVEKIT_URL=ws://livekit:7880
|
||||||
|
LIVEKIT_API_KEY=devkey
|
||||||
|
LIVEKIT_API_SECRET=secret
|
||||||
|
|
||||||
|
STT_PROVIDER=kyutai # kyutai, deepgram
|
||||||
|
ENABLE_SILERO_VAD=False
|
||||||
|
|
||||||
|
DEEPGRAM_API_KEY=
|
||||||
|
|
||||||
|
KYUTAI_STT_BASE_URL=
|
||||||
|
KYUTAI_API_KEY=
|
||||||
|
|
||||||
|
SENTRY_DSN=
|
||||||
|
SENTRY_ENVIRONMENT=
|
||||||
@@ -20,5 +20,14 @@ LLM_MODEL="albert-large"
|
|||||||
WEBHOOK_API_TOKEN="secret"
|
WEBHOOK_API_TOKEN="secret"
|
||||||
WEBHOOK_URL="https://configure-your-url.com"
|
WEBHOOK_URL="https://configure-your-url.com"
|
||||||
|
|
||||||
|
IS_RESOLVE_SPEAKER_IDENTITIES_ENABLED=true
|
||||||
|
RESOLVE_SPEAKER_IDENTITIES_DEFAULT_OVERLAP=0.5
|
||||||
|
RESOLVE_SPEAKER_ENABLE_SPLIT_ON_WORDS=true
|
||||||
|
RESOLVE_SPEAKER_MAX_WORD_DURATION=1
|
||||||
|
|
||||||
POSTHOG_API_KEY="your-posthog-key"
|
POSTHOG_API_KEY="your-posthog-key"
|
||||||
POSTHOG_ENABLED="False"
|
POSTHOG_ENABLED="False"
|
||||||
|
|
||||||
|
# Transcription
|
||||||
|
TRANSCRIPTION_SATISFACTION_FORM_BASE_URL=
|
||||||
|
AUTHORIZED_TENANTS='[{"id": "meet","api_key": "password","webhook_url": "https://configure-your-url.com/api/v1.0/recordings/external-process-hook/","webhook_api_key": "webhook-password","allowed_push_to_docs": true}]'
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ DJANGO_EMAIL_FROM=<your email address>
|
|||||||
#DJANGO_EMAIL_USE_SSL=true # A flag to enable or disable SSL for email sending.
|
#DJANGO_EMAIL_USE_SSL=true # A flag to enable or disable SSL for email sending.
|
||||||
|
|
||||||
DJANGO_EMAIL_BRAND_NAME="La Suite Numérique"
|
DJANGO_EMAIL_BRAND_NAME="La Suite Numérique"
|
||||||
DJANGO_EMAIL_LOGO_IMG="https://${meet_HOST}/assets/logo-suite-numerique.png"
|
DJANGO_EMAIL_LOGO_IMG="https://${MEET_HOST}/assets/logo-suite-numerique.png"
|
||||||
|
|
||||||
# Backend url
|
# Backend url
|
||||||
MEET_BASE_URL="https://${MEET_HOST}"
|
MEET_BASE_URL="https://${MEET_HOST}"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
Gitlint extra rule to validate that the message title is of the form
|
Gitlint extra rule to validate that the message title is of the form
|
||||||
"<gitmoji>(<scope>) <subject>"
|
"<gitmoji>(<scope>) <subject>"
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|||||||
@@ -3,6 +3,21 @@
|
|||||||
"dependencyDashboard": true,
|
"dependencyDashboard": true,
|
||||||
"labels": ["dependencies", "noChangeLog"],
|
"labels": ["dependencies", "noChangeLog"],
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"groupName": "js dependencies",
|
||||||
|
"matchManagers": ["npm"],
|
||||||
|
"schedule": ["on the first day of the month"],
|
||||||
|
"matchPackagePatterns": ["*"],
|
||||||
|
"minimumReleaseAge": "7 days",
|
||||||
|
"internalChecksFilter": "strict"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"groupName": "python dependencies",
|
||||||
|
"matchManagers": ["setup-cfg", "pep621"],
|
||||||
|
"schedule": ["on the first day of the month"],
|
||||||
|
"matchPackagePatterns": ["*"],
|
||||||
|
"minimumReleaseAge": "7 days"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
"groupName": "ignored python dependencies",
|
"groupName": "ignored python dependencies",
|
||||||
@@ -15,6 +30,18 @@
|
|||||||
"matchPackageNames": ["pylint"],
|
"matchPackageNames": ["pylint"],
|
||||||
"allowedVersions": "<4.0.0"
|
"allowedVersions": "<4.0.0"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"groupName": "allowed django versions",
|
||||||
|
"matchManagers": ["pep621"],
|
||||||
|
"matchPackageNames": ["django"],
|
||||||
|
"allowedVersions": "<6.0.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"groupName": "allowed brevo versions",
|
||||||
|
"matchManagers": ["pep621"],
|
||||||
|
"matchPackageNames": ["brevo-python"],
|
||||||
|
"allowedVersions": "<3.0.0"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
"groupName": "ignored js dependencies",
|
"groupName": "ignored js dependencies",
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"plugins": [
|
||||||
|
"office-addins"
|
||||||
|
],
|
||||||
|
"extends": [
|
||||||
|
"plugin:office-addins/recommended"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 678 B |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 307 B |
|
After Width: | Height: | Size: 544 B |
|
After Width: | Height: | Size: 927 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 353 B |
|
After Width: | Height: | Size: 756 B |
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"presets": [
|
||||||
|
[
|
||||||
|
"@babel/preset-env",
|
||||||
|
{
|
||||||
|
"targets": {
|
||||||
|
"esmodules": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:mailappor="http://schemas.microsoft.com/office/mailappversionoverrides/1.0" xsi:type="MailApp">
|
||||||
|
<Id>a025f0f6-757a-4790-97f3-99c66c4a5795</Id>
|
||||||
|
<Version>0.0.2.0</Version>
|
||||||
|
<ProviderName>__APP_NAME__</ProviderName>
|
||||||
|
<DefaultLocale>fr-FR</DefaultLocale>
|
||||||
|
<DisplayName DefaultValue="__APP_NAME__"/>
|
||||||
|
<Description DefaultValue="Ajoutez facilement un lien de réunion __APP_NAME__ à vos emails et événements Outlook."/>
|
||||||
|
<IconUrl DefaultValue="https://localhost:3000/assets/icon-64.png"/>
|
||||||
|
<HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-128.png"/>
|
||||||
|
<SupportUrl DefaultValue="https://lasuite.crisp.help/fr/category/visio-15sakkg/"/>
|
||||||
|
<AppDomains>
|
||||||
|
<AppDomain>https://localhost:3000/</AppDomain>
|
||||||
|
</AppDomains>
|
||||||
|
<Hosts>
|
||||||
|
<Host Name="Mailbox"/>
|
||||||
|
</Hosts>
|
||||||
|
<Requirements>
|
||||||
|
<Sets>
|
||||||
|
<Set Name="Mailbox" MinVersion="1.1"/>
|
||||||
|
</Sets>
|
||||||
|
</Requirements>
|
||||||
|
<FormSettings>
|
||||||
|
<Form xsi:type="ItemRead">
|
||||||
|
<DesktopSettings>
|
||||||
|
<SourceLocation DefaultValue="https://localhost:3000/taskpane.html"/>
|
||||||
|
<RequestedHeight>250</RequestedHeight>
|
||||||
|
</DesktopSettings>
|
||||||
|
</Form>
|
||||||
|
<Form xsi:type="ItemEdit">
|
||||||
|
<DesktopSettings>
|
||||||
|
<SourceLocation DefaultValue="https://localhost:3000/taskpane.html"/>
|
||||||
|
</DesktopSettings>
|
||||||
|
</Form>
|
||||||
|
</FormSettings>
|
||||||
|
<Permissions>ReadWriteItem</Permissions>
|
||||||
|
<Rule xsi:type="RuleCollection" Mode="Or">
|
||||||
|
<Rule xsi:type="ItemIs" ItemType="Message" FormType="Read"/>
|
||||||
|
<Rule xsi:type="ItemIs" ItemType="Message" FormType="Edit"/>
|
||||||
|
<Rule xsi:type="ItemIs" ItemType="Appointment" FormType="Edit"/>
|
||||||
|
</Rule>
|
||||||
|
<DisableEntityHighlighting>false</DisableEntityHighlighting>
|
||||||
|
<VersionOverrides xmlns="http://schemas.microsoft.com/office/mailappversionoverrides" xsi:type="VersionOverridesV1_0">
|
||||||
|
<Requirements>
|
||||||
|
<bt:Sets DefaultMinVersion="1.3">
|
||||||
|
<bt:Set Name="Mailbox"/>
|
||||||
|
</bt:Sets>
|
||||||
|
</Requirements>
|
||||||
|
<Hosts>
|
||||||
|
<Host xsi:type="MailHost">
|
||||||
|
<DesktopFormFactor>
|
||||||
|
<FunctionFile resid="Commands.Url"/>
|
||||||
|
|
||||||
|
<!-- ─── Mail: Read ─────────────────────────────────────────── -->
|
||||||
|
<ExtensionPoint xsi:type="MessageReadCommandSurface">
|
||||||
|
<OfficeTab id="TabDefault">
|
||||||
|
<Group id="msgReadGroup">
|
||||||
|
<Label resid="GroupLabel"/>
|
||||||
|
<Control xsi:type="Button" id="msgReadOpenPaneButton">
|
||||||
|
<Label resid="TaskpaneButton.Label"/>
|
||||||
|
<Supertip>
|
||||||
|
<Title resid="TaskpaneButton.Label"/>
|
||||||
|
<Description resid="TaskpaneButton.Tooltip"/>
|
||||||
|
</Supertip>
|
||||||
|
<Icon>
|
||||||
|
<bt:Image size="16" resid="Icon.16x16"/>
|
||||||
|
<bt:Image size="32" resid="Icon.32x32"/>
|
||||||
|
<bt:Image size="80" resid="Icon.80x80"/>
|
||||||
|
</Icon>
|
||||||
|
<Action xsi:type="ShowTaskpane">
|
||||||
|
<SourceLocation resid="Taskpane.Url"/>
|
||||||
|
</Action>
|
||||||
|
</Control>
|
||||||
|
</Group>
|
||||||
|
</OfficeTab>
|
||||||
|
</ExtensionPoint>
|
||||||
|
|
||||||
|
<!-- ─── Mail: Compose ─────────────────────────────────────── -->
|
||||||
|
<ExtensionPoint xsi:type="MessageComposeCommandSurface">
|
||||||
|
<OfficeTab id="TabDefault">
|
||||||
|
<Group id="msgComposeGroup">
|
||||||
|
<Label resid="GroupLabel"/>
|
||||||
|
<Control xsi:type="Button" id="msgComposeGenerateLinkButton">
|
||||||
|
<Label resid="GenerateLink.Label"/>
|
||||||
|
<Supertip>
|
||||||
|
<Title resid="GenerateLink.Label"/>
|
||||||
|
<Description resid="GenerateLink.Tooltip"/>
|
||||||
|
</Supertip>
|
||||||
|
<Icon>
|
||||||
|
<bt:Image size="16" resid="Icon.16x16"/>
|
||||||
|
<bt:Image size="32" resid="Icon.32x32"/>
|
||||||
|
<bt:Image size="80" resid="Icon.80x80"/>
|
||||||
|
</Icon>
|
||||||
|
<Action xsi:type="ExecuteFunction">
|
||||||
|
<FunctionName>generateMeetingLinkFromMail</FunctionName>
|
||||||
|
</Action>
|
||||||
|
</Control>
|
||||||
|
<Control xsi:type="Button" id="msgComposeOpenPaneButton">
|
||||||
|
<Label resid="TaskpaneButton.Label"/>
|
||||||
|
<Supertip>
|
||||||
|
<Title resid="TaskpaneButton.Label"/>
|
||||||
|
<Description resid="TaskpaneButton.Tooltip"/>
|
||||||
|
</Supertip>
|
||||||
|
<Icon>
|
||||||
|
<bt:Image size="16" resid="Settings.16x16"/>
|
||||||
|
<bt:Image size="32" resid="Settings.32x32"/>
|
||||||
|
<bt:Image size="80" resid="Settings.80x80"/>
|
||||||
|
</Icon>
|
||||||
|
<Action xsi:type="ShowTaskpane">
|
||||||
|
<SourceLocation resid="Taskpane.Url"/>
|
||||||
|
</Action>
|
||||||
|
</Control>
|
||||||
|
</Group>
|
||||||
|
</OfficeTab>
|
||||||
|
</ExtensionPoint>
|
||||||
|
|
||||||
|
<!-- ─── Calendar: Compose (New/Edit appointment) ──────────── -->
|
||||||
|
<ExtensionPoint xsi:type="AppointmentOrganizerCommandSurface">
|
||||||
|
<OfficeTab id="TabDefault">
|
||||||
|
<Group id="apptComposeGroup">
|
||||||
|
<Label resid="GroupLabel"/>
|
||||||
|
<Control xsi:type="Button" id="apptGenerateLinkButton">
|
||||||
|
<Label resid="GenerateLink.Label"/>
|
||||||
|
<Supertip>
|
||||||
|
<Title resid="GenerateLink.Label"/>
|
||||||
|
<Description resid="GenerateLink.Tooltip"/>
|
||||||
|
</Supertip>
|
||||||
|
<Icon>
|
||||||
|
<bt:Image size="16" resid="Icon.16x16"/>
|
||||||
|
<bt:Image size="32" resid="Icon.32x32"/>
|
||||||
|
<bt:Image size="80" resid="Icon.80x80"/>
|
||||||
|
</Icon>
|
||||||
|
<Action xsi:type="ExecuteFunction">
|
||||||
|
<FunctionName>generateMeetingLinkFromCalendar</FunctionName>
|
||||||
|
</Action>
|
||||||
|
</Control>
|
||||||
|
|
||||||
|
<Control xsi:type="Button" id="apptOpenSettingsButton">
|
||||||
|
<Label resid="OpenSettings.Label"/>
|
||||||
|
<Supertip>
|
||||||
|
<Title resid="OpenSettings.Label"/>
|
||||||
|
<Description resid="OpenSettings.Tooltip"/>
|
||||||
|
</Supertip>
|
||||||
|
<Icon>
|
||||||
|
<bt:Image size="16" resid="Settings.16x16"/>
|
||||||
|
<bt:Image size="32" resid="Settings.32x32"/>
|
||||||
|
<bt:Image size="80" resid="Settings.80x80"/>
|
||||||
|
</Icon>
|
||||||
|
<Action xsi:type="ShowTaskpane">
|
||||||
|
<SourceLocation resid="Taskpane.Url"/>
|
||||||
|
</Action>
|
||||||
|
</Control>
|
||||||
|
|
||||||
|
</Group>
|
||||||
|
</OfficeTab>
|
||||||
|
</ExtensionPoint>
|
||||||
|
|
||||||
|
</DesktopFormFactor>
|
||||||
|
</Host>
|
||||||
|
</Hosts>
|
||||||
|
<Resources>
|
||||||
|
<bt:Images>
|
||||||
|
<bt:Image id="Settings.16x16" DefaultValue="https://localhost:3000/assets/settings-16.png"/>
|
||||||
|
<bt:Image id="Settings.32x32" DefaultValue="https://localhost:3000/assets/settings-32.png"/>
|
||||||
|
<bt:Image id="Settings.80x80" DefaultValue="https://localhost:3000/assets/settings-80.png"/>
|
||||||
|
<bt:Image id="Add.16x16" DefaultValue="https://localhost:3000/assets/add-16.png"/>
|
||||||
|
<bt:Image id="Add.32x32" DefaultValue="https://localhost:3000/assets/add-32.png"/>
|
||||||
|
<bt:Image id="Add.80x80" DefaultValue="https://localhost:3000/assets/add-80.png"/>
|
||||||
|
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
|
||||||
|
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
|
||||||
|
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
|
||||||
|
</bt:Images>
|
||||||
|
<bt:Urls>
|
||||||
|
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html"/>
|
||||||
|
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html"/>
|
||||||
|
</bt:Urls>
|
||||||
|
<bt:ShortStrings>
|
||||||
|
<!-- Default (French) -->
|
||||||
|
<bt:String id="GroupLabel" DefaultValue="__APP_NAME__"/>
|
||||||
|
<bt:String id="GenerateLink.Label" DefaultValue="Ajouter un lien __APP_NAME__">
|
||||||
|
<bt:Override Locale="en-US" Value="Add a __APP_NAME__ link"/>
|
||||||
|
<bt:Override Locale="de-DE" Value="__APP_NAME__-Link hinzufügen"/>
|
||||||
|
</bt:String>
|
||||||
|
<bt:String id="TaskpaneButton.Label" DefaultValue="Ouvrir les paramètres">
|
||||||
|
<bt:Override Locale="en-US" Value="Open settings"/>
|
||||||
|
<bt:Override Locale="de-DE" Value="Einstellungen öffnen"/>
|
||||||
|
</bt:String>
|
||||||
|
<bt:String id="OpenSettings.Label" DefaultValue="Paramètres">
|
||||||
|
<bt:Override Locale="en-US" Value="Settings"/>
|
||||||
|
<bt:Override Locale="de-DE" Value="Einstellungen"/>
|
||||||
|
</bt:String>
|
||||||
|
</bt:ShortStrings>
|
||||||
|
<bt:LongStrings>
|
||||||
|
<bt:String id="GenerateLink.Tooltip" DefaultValue="Génère un lien de réunion __APP_NAME__ et l'insère dans l'événement.">
|
||||||
|
<bt:Override Locale="de-DE" Value="Generiert einen __APP_NAME__-Besprechungslink und fügt ihn in den Termin ein."/>
|
||||||
|
<bt:Override Locale="en-US" Value="Generates a __APP_NAME__ meeting link and inserts it into the item."/>
|
||||||
|
</bt:String>
|
||||||
|
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
|
||||||
|
<bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
|
||||||
|
<bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
|
||||||
|
</bt:String>
|
||||||
|
<bt:String id="OpenSettings.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
|
||||||
|
<bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
|
||||||
|
<bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
|
||||||
|
</bt:String>
|
||||||
|
</bt:LongStrings>
|
||||||
|
</Resources>
|
||||||
|
</VersionOverrides>
|
||||||
|
</OfficeApp>
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
{
|
||||||
|
"name": "office-addin-taskpane-js",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/suitenumerique/meet.git"
|
||||||
|
},
|
||||||
|
"license": "MIT",
|
||||||
|
"config": {
|
||||||
|
"app_to_debug": "outlook",
|
||||||
|
"app_type_to_debug": "desktop",
|
||||||
|
"dev_server_port": 3000
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "webpack --mode production",
|
||||||
|
"build:dev": "webpack --mode development",
|
||||||
|
"dev-server": "webpack serve --mode development",
|
||||||
|
"lint": "office-addin-lint check",
|
||||||
|
"lint:fix": "office-addin-lint fix",
|
||||||
|
"prettier": "office-addin-lint prettier",
|
||||||
|
"signin": "office-addin-dev-settings m365-account login",
|
||||||
|
"signout": "office-addin-dev-settings m365-account logout",
|
||||||
|
"start": "office-addin-debugging start manifest.xml",
|
||||||
|
"stop": "office-addin-debugging stop manifest.xml",
|
||||||
|
"validate": "office-addin-manifest validate manifest.xml",
|
||||||
|
"watch": "webpack --mode development --watch"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"core-js": "3.49.0",
|
||||||
|
"i18next": "26.3.1",
|
||||||
|
"i18next-browser-languagedetector": "8.2.1",
|
||||||
|
"regenerator-runtime": "0.14.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@babel/core": "7.29.0",
|
||||||
|
"@babel/preset-env": "7.29.0",
|
||||||
|
"@types/office-js": "1.0.582",
|
||||||
|
"@types/office-runtime": "1.0.36",
|
||||||
|
"acorn": "8.16.0",
|
||||||
|
"babel-loader": "9.2.1",
|
||||||
|
"copy-webpack-plugin": "14.0.0",
|
||||||
|
"eslint-plugin-office-addins": "4.0.6",
|
||||||
|
"file-loader": "6.2.0",
|
||||||
|
"html-loader": "5.1.0",
|
||||||
|
"html-webpack-inject-attributes-plugin": "1.0.6",
|
||||||
|
"html-webpack-plugin": "5.6.6",
|
||||||
|
"office-addin-cli": "2.0.6",
|
||||||
|
"office-addin-debugging": "6.0.6",
|
||||||
|
"office-addin-dev-certs": "2.0.6",
|
||||||
|
"office-addin-lint": "3.0.6",
|
||||||
|
"office-addin-manifest": "2.1.2",
|
||||||
|
"office-addin-prettier-config": "2.0.1",
|
||||||
|
"os-browserify": "0.3.0",
|
||||||
|
"process": "0.11.10",
|
||||||
|
"source-map-loader": "5.0.0",
|
||||||
|
"webpack": "5.105.4",
|
||||||
|
"webpack-cli": "5.1.4",
|
||||||
|
"webpack-dev-server": "5.2.4"
|
||||||
|
},
|
||||||
|
"prettier": "office-addin-prettier-config",
|
||||||
|
"browserslist": [
|
||||||
|
"last 2 versions",
|
||||||
|
"ie 11"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<title data-app-name></title>
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="https://appsforoffice.microsoft.com/lib/1/hosted/office.js"></script>
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="/addons/outlook/config.js"></script>
|
||||||
|
</head>
|
||||||
|
<body></body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
/* global Office */
|
||||||
|
const { APP_NAME } = require("../common/index");
|
||||||
|
const { createRoom, initSession } = require("../common/api");
|
||||||
|
const { startPolling } = require("../common/polling");
|
||||||
|
const { saveSession, loadSession } = require("../common/session");
|
||||||
|
const { openTransitDialog } = require("../common/transitDialog");
|
||||||
|
const { buildMeetingMessage } = require("../common/messageBuilder");
|
||||||
|
const { applyAppName } = require("../common/helpers");
|
||||||
|
const { initI18n, t } = require("../common/i18n");
|
||||||
|
const { isMeetingAlreadyAdded } = require("../common/meetingDetector");
|
||||||
|
|
||||||
|
Office.onReady(async function (info) {
|
||||||
|
|
||||||
|
await initI18n()
|
||||||
|
|
||||||
|
if (info.host === Office.HostType.Outlook) {
|
||||||
|
applyAppName();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function notify(message) {
|
||||||
|
Office.context.mailbox.item.notificationMessages.replaceAsync("meetNotif", {
|
||||||
|
type: Office.MailboxEnums.ItemNotificationMessageType.InformationalMessage,
|
||||||
|
message,
|
||||||
|
persistent: false,
|
||||||
|
icon: "Icon.16x16",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function insertMeetingLink(event, session) {
|
||||||
|
const item = Office.context.mailbox.item;
|
||||||
|
|
||||||
|
isMeetingAlreadyAdded(item)
|
||||||
|
.then((alreadyAdded) => {
|
||||||
|
if (alreadyAdded) {
|
||||||
|
notify(t("meeting.already_added", { app_name: APP_NAME }));
|
||||||
|
event.completed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return _doInsertMeetingLink(event, session);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
notify(t("meeting.error.details", { message: err.message }));
|
||||||
|
event.completed();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function _doInsertMeetingLink(event, session) {
|
||||||
|
createRoom(session)
|
||||||
|
.then((data) => {
|
||||||
|
const isWeb = Office.context.diagnostics.platform === "OfficeOnline";
|
||||||
|
const { url, text } = buildMeetingMessage(data, isWeb);
|
||||||
|
const item = Office.context.mailbox.item;
|
||||||
|
const coercionType = isWeb ? Office.CoercionType.Html : Office.CoercionType.Text;
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
item.body.setSelectedDataAsync(text, { coercionType }, (setResult) => {
|
||||||
|
if (setResult.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
notify(t("meeting.error.details", { message: setResult.error.message }));
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.itemType !== Office.MailboxEnums.ItemType.Appointment) {
|
||||||
|
notify(t("meeting.link_inserted"));
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
item.location.setAsync(url, (locationResult) => {
|
||||||
|
if (locationResult.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
notify(t("meeting.error.details", { message: locationResult.error.message }));
|
||||||
|
} else {
|
||||||
|
notify(t("meeting.link_inserted"));
|
||||||
|
}
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
notify(`Erreur : ${err.message}`);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
event.completed();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function connect(event) {
|
||||||
|
initSession()
|
||||||
|
.then((data) => {
|
||||||
|
const stopPolling = startPolling(data.csrf_token, {
|
||||||
|
onSuccess: (sessionData) => {
|
||||||
|
saveSession(sessionData).then(() => {
|
||||||
|
insertMeetingLink(event, sessionData);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onTimeout: () => {
|
||||||
|
notify(t("meeting.error.auth"));
|
||||||
|
event.completed();
|
||||||
|
},
|
||||||
|
onError: (err) => {
|
||||||
|
notify(t("meeting.error.retry"));
|
||||||
|
event.completed();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
openTransitDialog(data.transit_token, {
|
||||||
|
onCancel: () => {
|
||||||
|
stopPolling();
|
||||||
|
event.completed();
|
||||||
|
},
|
||||||
|
onError: (err) => {
|
||||||
|
stopPolling();
|
||||||
|
event.completed();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
notify(t("meeting.error.details", { message: err.message }));
|
||||||
|
event.completed();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function generateMeetingLink(event) {
|
||||||
|
const session = loadSession();
|
||||||
|
if (session?.access_token) {
|
||||||
|
insertMeetingLink(event, session);
|
||||||
|
} else {
|
||||||
|
connect(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Office.actions.associate("generateMeetingLinkFromCalendar", generateMeetingLink);
|
||||||
|
Office.actions.associate("generateMeetingLinkFromMail", generateMeetingLink);
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
const { URLS } = require("./urls");
|
||||||
|
|
||||||
|
function getCsrfToken() {
|
||||||
|
return document.cookie
|
||||||
|
.split(";")
|
||||||
|
.filter((cookie) => cookie.trim().startsWith("csrftoken="))
|
||||||
|
.map((cookie) => cookie.split("=")[1])
|
||||||
|
.pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
function authHeaders(session) {
|
||||||
|
return {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${session.access_token}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds headers for CSRF-protected requests.
|
||||||
|
*
|
||||||
|
* Two CSRF flows coexist in this addon:
|
||||||
|
*
|
||||||
|
* 1. Cookie-based (Django default): used by `exchange`, called from the
|
||||||
|
* OAuth success page in a normal browser context. Django's CSRF
|
||||||
|
* middleware has already set the `csrftoken` cookie via the auth
|
||||||
|
* redirect, so we read it from `document.cookie` and echo it back
|
||||||
|
* as `X-CSRFToken`. The middleware verifies the header matches the
|
||||||
|
* cookie. No `csrfToken` argument needed — `getCsrfToken()` handles it.
|
||||||
|
*
|
||||||
|
* 2. Body-passed token: used by `poll`, called from the Office dialog /
|
||||||
|
* taskpane iframe. Cookie access inside Office iframes is unreliable
|
||||||
|
* across Outlook clients, so we can't depend on `document.cookie`
|
||||||
|
* being populated. Instead, `init` returns the CSRF token in its JSON
|
||||||
|
* response body, and callers pass it explicitly to subsequent calls.
|
||||||
|
* The token still travels as `X-CSRFToken` — only its source differs.
|
||||||
|
*
|
||||||
|
* The `csrfToken` parameter takes precedence when provided; falls back
|
||||||
|
* to the cookie when omitted.
|
||||||
|
*/
|
||||||
|
function csrfHeaders(csrfToken) {
|
||||||
|
const token = csrfToken || getCsrfToken();
|
||||||
|
return {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
...(token && { "X-CSRFToken": token }),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function request(path, { session, csrf, csrfToken, ...opts } = {}) {
|
||||||
|
const headers = {
|
||||||
|
...(session && authHeaders(session)),
|
||||||
|
...(csrf && csrfHeaders(csrfToken)),
|
||||||
|
...opts.headers,
|
||||||
|
};
|
||||||
|
const res = await fetch(path, {
|
||||||
|
...opts,
|
||||||
|
headers,
|
||||||
|
credentials: csrf ? "include" : opts.credentials,
|
||||||
|
});
|
||||||
|
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||||
|
return res.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
initSession: () => request(URLS.init, { method: "POST" }),
|
||||||
|
pollSession: (csrfToken) =>
|
||||||
|
request(URLS.poll, {
|
||||||
|
method: "POST",
|
||||||
|
csrf: true,
|
||||||
|
csrfToken,
|
||||||
|
}),
|
||||||
|
exchangeSession: (transitToken) =>
|
||||||
|
request(URLS.exchange, {
|
||||||
|
method: "POST",
|
||||||
|
csrf: true,
|
||||||
|
body: JSON.stringify({ transit_token: transitToken }),
|
||||||
|
}),
|
||||||
|
createRoom: (session) =>
|
||||||
|
request(URLS.rooms, {
|
||||||
|
method: "POST",
|
||||||
|
session,
|
||||||
|
}),
|
||||||
|
};
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
const { APP_NAME } = require("./index");
|
||||||
|
|
||||||
|
function isOfficeReady() {
|
||||||
|
return typeof Office !== "undefined" && Office?.context?.roamingSettings != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyAppName() {
|
||||||
|
document.querySelectorAll("[data-app-name]").forEach((el) => {
|
||||||
|
el.textContent = APP_NAME;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
isOfficeReady,
|
||||||
|
applyAppName,
|
||||||
|
};
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
const { APP_NAME } = require("../common");
|
||||||
|
|
||||||
|
const i18nextModule = require("i18next");
|
||||||
|
const i18next = i18nextModule.default || i18nextModule;
|
||||||
|
|
||||||
|
const fr = require("../locales/fr/translation.json");
|
||||||
|
const en = require("../locales/en/translation.json");
|
||||||
|
const de = require("../locales/de/translation.json");
|
||||||
|
|
||||||
|
async function initI18n() {
|
||||||
|
const lng = typeof Office !== "undefined" ? Office.context.displayLanguage : navigator.language;
|
||||||
|
|
||||||
|
await i18next.init({
|
||||||
|
lng,
|
||||||
|
fallbackLng: "fr",
|
||||||
|
interpolation: { escapeValue: false },
|
||||||
|
resources: {
|
||||||
|
fr: { translation: fr },
|
||||||
|
en: { translation: en },
|
||||||
|
de: { translation: de },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function t(key, vars) {
|
||||||
|
return i18next.t(key, vars);
|
||||||
|
}
|
||||||
|
|
||||||
|
function translateUI() {
|
||||||
|
document.querySelectorAll("[data-i18n]").forEach((el) => {
|
||||||
|
const key = el.getAttribute("data-i18n");
|
||||||
|
el.textContent = t(key, { app_name: APP_NAME });
|
||||||
|
});
|
||||||
|
|
||||||
|
document.querySelectorAll("[data-i18n-attr]").forEach((el) => {
|
||||||
|
const pairs = el.getAttribute("data-i18n-attr").split(",");
|
||||||
|
pairs.forEach((pair) => {
|
||||||
|
const [attr, key] = pair.split(":");
|
||||||
|
el.setAttribute(attr, t(key, { app_name: APP_NAME }));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
document.querySelectorAll("[data-i18n-aria]").forEach((el) => {
|
||||||
|
el.setAttribute("aria-label", t(el.getAttribute("data-i18n-aria")));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { initI18n, t, translateUI };
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
const BASE_URL = window.__APP_CONFIG__?.BASE_URL || "https://meet.127.0.0.1.nip.io";
|
||||||
|
const APP_NAME = window.__APP_CONFIG__?.APP_NAME || "LaSuite Meet";
|
||||||
|
const ENABLE_SOURCE_TRACKING = window.__APP_CONFIG__?.ENABLE_SOURCE_TRACKING === "true";
|
||||||
|
const FEEDBACK_FORM = window.__APP_CONFIG__?.FEEDBACK_FORM || null;
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
BASE_URL,
|
||||||
|
APP_NAME,
|
||||||
|
ENABLE_SOURCE_TRACKING,
|
||||||
|
FEEDBACK_FORM
|
||||||
|
};
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
const { BASE_URL } = require("./index");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a promise that resolves to true if a meeting link is already present
|
||||||
|
*/
|
||||||
|
function isMeetingAlreadyAdded(item) {
|
||||||
|
return Promise.all([_checkBody(item), _checkLocation(item)]).then(
|
||||||
|
([inBody, inLocation]) => inBody || inLocation
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function _checkBody(item) {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
item.body.getAsync(Office.CoercionType.Text, (result) => {
|
||||||
|
if (result.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
resolve(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resolve(_containsMeetingUrl(result.value));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function _checkLocation(item) {
|
||||||
|
// Location only exists on appointments
|
||||||
|
if (item.itemType !== Office.MailboxEnums.ItemType.Appointment) {
|
||||||
|
return Promise.resolve(false);
|
||||||
|
}
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
item.location.getAsync((result) => {
|
||||||
|
if (result.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
resolve(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resolve(_containsMeetingUrl(result.value));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function _containsMeetingUrl(text) {
|
||||||
|
if (!text) return false;
|
||||||
|
return text.includes(BASE_URL);
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeMeetingLink(item) {
|
||||||
|
return Promise.all([_removeFromBody(item), _removeFromLocation(item)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function _removeFromBody(item) {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
item.body.getAsync(Office.CoercionType.Html, (result) => {
|
||||||
|
if (result.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const cleaned = _cleanBody(result.value || "");
|
||||||
|
if (cleaned === null) {
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
item.body.setAsync(cleaned, { coercionType: Office.CoercionType.Html }, () => resolve());
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function _removeFromLocation(item) {
|
||||||
|
if (item.itemType !== Office.MailboxEnums.ItemType.Appointment) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
item.location.getAsync((result) => {
|
||||||
|
if (
|
||||||
|
result.status === Office.AsyncResultStatus.Succeeded &&
|
||||||
|
_containsMeetingUrl(result.value)
|
||||||
|
) {
|
||||||
|
item.location.setAsync("", () => resolve());
|
||||||
|
} else {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const SEPARATOR = /─{10,}/;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns cleaned HTML, or null if no meeting block was found.
|
||||||
|
*/
|
||||||
|
function _cleanBody(html) {
|
||||||
|
const doc = new DOMParser().parseFromString(html, "text/html");
|
||||||
|
|
||||||
|
const hits = [];
|
||||||
|
const walker = doc.createTreeWalker(doc.body, NodeFilter.SHOW_TEXT);
|
||||||
|
while (walker.nextNode()) {
|
||||||
|
if (SEPARATOR.test(walker.currentNode.nodeValue)) hits.push(walker.currentNode);
|
||||||
|
}
|
||||||
|
if (hits.length < 2) return null;
|
||||||
|
|
||||||
|
const range = doc.createRange();
|
||||||
|
range.setStartBefore(hits[0]);
|
||||||
|
range.setEndAfter(hits[hits.length - 1]);
|
||||||
|
range.deleteContents();
|
||||||
|
|
||||||
|
return doc.documentElement.outerHTML;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { isMeetingAlreadyAdded, removeMeetingLink };
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
const { APP_NAME, ENABLE_SOURCE_TRACKING } = require("./index");
|
||||||
|
const { t } = require("./i18n");
|
||||||
|
|
||||||
|
function _formatPin(pin) {
|
||||||
|
if (!pin) return "";
|
||||||
|
const clean = String(pin).replace(/\s+/g, "");
|
||||||
|
if (!clean) return "";
|
||||||
|
if (/^\d{10}$/.test(clean)) {
|
||||||
|
return clean.replace(/(\d{3})(\d{3})(\d{4})/, "$1 $2 $3") + "#";
|
||||||
|
}
|
||||||
|
return clean + "#";
|
||||||
|
}
|
||||||
|
|
||||||
|
// todo - support international format
|
||||||
|
function _formatPhone(phone) {
|
||||||
|
if (!phone) return "";
|
||||||
|
const clean = String(phone).replace(/\s+/g, "");
|
||||||
|
if (/^\+33\d{9}$/.test(clean)) {
|
||||||
|
return clean.replace(/^\+33(\d)(\d{2})(\d{2})(\d{2})(\d{2})$/, "+33 $1 $2 $3 $4 $5");
|
||||||
|
}
|
||||||
|
return clean;
|
||||||
|
}
|
||||||
|
|
||||||
|
function _appendTrackingParams(url) {
|
||||||
|
if (!ENABLE_SOURCE_TRACKING) return url;
|
||||||
|
const u = new URL(url);
|
||||||
|
u.searchParams.set("from", "outlook-addin");
|
||||||
|
return u.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// todo - escape html / link
|
||||||
|
function buildMeetingMessage(data, isWeb) {
|
||||||
|
if (!data?.url) {
|
||||||
|
throw new Error("buildMeetingMessage: missing url in data");
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = _appendTrackingParams(data.url);
|
||||||
|
const phone = _formatPhone(data.telephony?.phone_number);
|
||||||
|
const pin = _formatPin(data.telephony?.pin_code);
|
||||||
|
|
||||||
|
let textLines = "";
|
||||||
|
let phoneLines = [];
|
||||||
|
|
||||||
|
const join = t("meeting_message.join", { app_name: APP_NAME });
|
||||||
|
const phoneOnly = t("meeting_message.phone_only");
|
||||||
|
const phoneFr = t("meeting_message.phone_fr", { phone });
|
||||||
|
const pinCode = t("meeting_message.pin_code", { pin });
|
||||||
|
|
||||||
|
if (isWeb) {
|
||||||
|
phoneLines = phone && pin ? [`<br><br>${phoneOnly}`, `<br>${phoneFr}`, `<br>${pinCode}`] : [];
|
||||||
|
|
||||||
|
textLines = [
|
||||||
|
"<br><br>────────────────────────────────────────",
|
||||||
|
`<br>${join}`,
|
||||||
|
`<br><br><a href="${url}" target="_blank">${url}</a>`,
|
||||||
|
...phoneLines,
|
||||||
|
"<br>────────────────────────────────────────<br>",
|
||||||
|
];
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
phoneLines = phone && pin ? [`\n\n${phoneOnly}`, `\n${phoneFr}`, `\n${pinCode}`] : [];
|
||||||
|
|
||||||
|
textLines = [
|
||||||
|
"\n\n────────────────────────────────────────",
|
||||||
|
`\n${join}`,
|
||||||
|
`\n\n${url}`,
|
||||||
|
...phoneLines,
|
||||||
|
"\n────────────────────────────────────────\n",
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
const text = textLines.join("");
|
||||||
|
|
||||||
|
return { url, text };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { buildMeetingMessage };
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
const { pollSession } = require("./api");
|
||||||
|
|
||||||
|
const POLLING_INTERVAL_MS = 1000;
|
||||||
|
const POLLING_TIMEOUT_MS = 3 * 60 * 1000;
|
||||||
|
const POLLING_MAX_ATTEMPTS = POLLING_TIMEOUT_MS / POLLING_INTERVAL_MS;
|
||||||
|
|
||||||
|
function isPollAuthenticated(sessionData) {
|
||||||
|
return sessionData.state === "authenticated" && sessionData.access_token;
|
||||||
|
}
|
||||||
|
|
||||||
|
function startPolling(csrfToken, { onSuccess, onTimeout, onError }) {
|
||||||
|
let pollCount = 0;
|
||||||
|
let timeoutId = null;
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const poll = () => {
|
||||||
|
if (pollCount++ >= POLLING_MAX_ATTEMPTS) {
|
||||||
|
onTimeout?.();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
pollSession(csrfToken)
|
||||||
|
.then((sessionData) => {
|
||||||
|
if (cancelled) return;
|
||||||
|
if (isPollAuthenticated(sessionData)) {
|
||||||
|
onSuccess?.(sessionData);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
timeoutId = setTimeout(poll, POLLING_INTERVAL_MS);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
if (cancelled) return;
|
||||||
|
onError?.(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
poll();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
if (timeoutId) clearTimeout(timeoutId);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
startPolling,
|
||||||
|
};
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
const { isOfficeReady } = require("./helpers");
|
||||||
|
|
||||||
|
const SESSION_KEY = "meetSession";
|
||||||
|
|
||||||
|
// DEV NOTE:
|
||||||
|
// Office.context.roamingSettings persists data in the user's mailbox and
|
||||||
|
// synchronizes it via Exchange across all Outlook clients (desktop, web, mobile)
|
||||||
|
// where the user signs in. This means anything stored here (including tokens)
|
||||||
|
// leaves the local device boundary and is replicated across environments.
|
||||||
|
//
|
||||||
|
// Microsoft guidance explicitly advises NOT storing secrets (e.g., OAuth access
|
||||||
|
// tokens, refresh tokens, or other sensitive credentials) in roamingSettings,
|
||||||
|
// as it is not a secure storage mechanism and lacks OS-level protections.
|
||||||
|
//
|
||||||
|
// That said, for the current alpha version we accept this trade-off for simplicity,
|
||||||
|
// with the expectation that a more secure approach (e.g., in-memory tokens) will replace this.
|
||||||
|
function saveSession(data) {
|
||||||
|
if (!isOfficeReady()) {
|
||||||
|
return Promise.reject(new Error("Office not ready"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!data || !data.access_token) {
|
||||||
|
return Promise.reject(new Error("Missing access_token"));
|
||||||
|
}
|
||||||
|
|
||||||
|
const expiresInSeconds = Number(data.expires_in);
|
||||||
|
const expiresAt =
|
||||||
|
Number.isFinite(expiresInSeconds) && expiresInSeconds > 0
|
||||||
|
? new Date(Date.now() + expiresInSeconds * 1000).toISOString()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const payload = JSON.stringify({
|
||||||
|
...data,
|
||||||
|
expiresAt,
|
||||||
|
savedAt: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const rs = Office.context.roamingSettings;
|
||||||
|
rs.set(SESSION_KEY, payload);
|
||||||
|
rs.saveAsync((result) => {
|
||||||
|
if (result.status === Office.AsyncResultStatus.Succeeded) {
|
||||||
|
resolve();
|
||||||
|
} else {
|
||||||
|
reject(new Error(result.error?.message || "saveAsync failed"));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadSession() {
|
||||||
|
if (!isOfficeReady()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let session = null;
|
||||||
|
try {
|
||||||
|
const stored = Office.context.roamingSettings.get(SESSION_KEY);
|
||||||
|
if (stored) session = JSON.parse(stored);
|
||||||
|
} catch (e) {
|
||||||
|
clearSession();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!session) return null;
|
||||||
|
|
||||||
|
// Fail closed if expiry is missing — backend is expected to send expires_in.
|
||||||
|
if (!session.expiresAt) {
|
||||||
|
clearSession();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const expiresTs = Date.parse(session.expiresAt);
|
||||||
|
if (!Number.isFinite(expiresTs) || Date.now() >= expiresTs) {
|
||||||
|
clearSession();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearSession() {
|
||||||
|
if (!isOfficeReady()) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
try {
|
||||||
|
const rs = Office.context.roamingSettings;
|
||||||
|
rs.remove(SESSION_KEY);
|
||||||
|
rs.saveAsync((result) => {
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
saveSession,
|
||||||
|
loadSession,
|
||||||
|
clearSession,
|
||||||
|
};
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
const { URLS } = require("./urls");
|
||||||
|
|
||||||
|
const DIALOG_SIGNALS = {
|
||||||
|
ready: "ready",
|
||||||
|
done: "done",
|
||||||
|
};
|
||||||
|
|
||||||
|
const DIALOG_HEIGHT = 60;
|
||||||
|
const DIALOG_WIDTH = 50;
|
||||||
|
|
||||||
|
function openTransitDialog(transitToken, { onCancel, onError }) {
|
||||||
|
Office.context.ui.displayDialogAsync(
|
||||||
|
URLS.transitDialog,
|
||||||
|
{ height: DIALOG_HEIGHT, width: DIALOG_WIDTH, displayInIframe: false },
|
||||||
|
(asyncResult) => {
|
||||||
|
if (asyncResult.status === Office.AsyncResultStatus.Failed) {
|
||||||
|
onError?.(asyncResult.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const dialog = asyncResult.value;
|
||||||
|
|
||||||
|
dialog.addEventHandler(Office.EventType.DialogMessageReceived, (arg) => {
|
||||||
|
if (arg.message === DIALOG_SIGNALS.ready) {
|
||||||
|
dialog.messageChild(transitToken);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (arg.message === DIALOG_SIGNALS.done) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
onCancel?.();
|
||||||
|
dialog.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
return dialog;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
openTransitDialog,
|
||||||
|
DIALOG_SIGNALS,
|
||||||
|
};
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
const TRANSIT_TOKEN_KEY = "transitToken";
|
||||||
|
|
||||||
|
function save(token) {
|
||||||
|
sessionStorage.setItem(TRANSIT_TOKEN_KEY, token);
|
||||||
|
}
|
||||||
|
|
||||||
|
function consume() {
|
||||||
|
try {
|
||||||
|
const token = sessionStorage.getItem(TRANSIT_TOKEN_KEY);
|
||||||
|
sessionStorage.removeItem(TRANSIT_TOKEN_KEY);
|
||||||
|
return token;
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to read transit token:", err);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { save, consume };
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
const { BASE_URL } = require("./index");
|
||||||
|
|
||||||
|
const ADDONS_BASE_URL = `${BASE_URL}/api/v1.0/addons/sessions`;
|
||||||
|
|
||||||
|
const URLS = {
|
||||||
|
authenticate: `${BASE_URL}/api/v1.0/authenticate/`,
|
||||||
|
successPage: `${BASE_URL}/addons/outlook/success.html`,
|
||||||
|
transitDialog: `${BASE_URL}/addons/outlook/transit.html`,
|
||||||
|
init: `${ADDONS_BASE_URL}/init/`,
|
||||||
|
poll: `${ADDONS_BASE_URL}/poll/`,
|
||||||
|
exchange: `${ADDONS_BASE_URL}/exchange/`,
|
||||||
|
rooms: `${BASE_URL}/external-api/v1.0/rooms/`,
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { URLS };
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"app": {
|
||||||
|
"sideload": "Laden Sie das Add-In.",
|
||||||
|
"loading": "Wird geladen..."
|
||||||
|
},
|
||||||
|
"unauth": {
|
||||||
|
"intro": "Fügen Sie Ihren Outlook-Terminen ganz einfach einen {{app_name}}-Besprechungslink hinzu.",
|
||||||
|
"proconnect_btn": "Aanmelden met ProConnect",
|
||||||
|
"proconnect_link": "Wat is ProConnect?",
|
||||||
|
"proconnect_link_title": "Wat is ProConnect? - nieuw venster"
|
||||||
|
},
|
||||||
|
"success": {
|
||||||
|
"close_window": "Falls sich dieses Fenster nicht automatisch schließt, schließen Sie es bitte manuell."
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"disconnect": "Abmelden"
|
||||||
|
},
|
||||||
|
"meeting": {
|
||||||
|
"already_added": "Es wurde bereits ein {{app_name}}-Meeting hinzugefügt.",
|
||||||
|
"link_inserted": "Besprechungslink erfolgreich eingefügt",
|
||||||
|
"generating": "Wird erstellt...",
|
||||||
|
"add_meeting": "{{app_name}}-Besprechung hinzufügen",
|
||||||
|
"remove_meeting": "{{app_name}}-Besprechung entfernen",
|
||||||
|
"removing": "Wird entfernt...",
|
||||||
|
"error": {
|
||||||
|
"auth": "Ihre Sitzung ist abgelaufen. Bitte versuchen Sie es erneut.",
|
||||||
|
"retry": "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.",
|
||||||
|
"details": "Fehler: {{message}}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meeting_message": {
|
||||||
|
"join": "An der {{app_name}}-Besprechung teilnehmen",
|
||||||
|
"phone_only": "Oder per Telefon teilnehmen (nur Audio)",
|
||||||
|
"phone_fr": "(FR) {{phone}}",
|
||||||
|
"pin_code": "Code {{pin}}"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"feedback": "Teilen Sie uns Ihr Feedback mit"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"app": {
|
||||||
|
"sideload": "Please load the add-in.",
|
||||||
|
"loading": "Loading..."
|
||||||
|
},
|
||||||
|
"unauth": {
|
||||||
|
"intro": "Easily add a {{app_name}} meeting link to your Outlook events.",
|
||||||
|
"proconnect_btn": "Sign in with ProConnect",
|
||||||
|
"proconnect_link": "What is ProConnect?",
|
||||||
|
"proconnect_link_title": "What is ProConnect? - new window"
|
||||||
|
},
|
||||||
|
"success": {
|
||||||
|
"close_window": "If this window does not close automatically, please close it manually."
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"disconnect": "Sign out"
|
||||||
|
},
|
||||||
|
"meeting": {
|
||||||
|
"already_added": "A {{app_name}} meeting has already been added.",
|
||||||
|
"link_inserted": "Meeting link inserted successfully",
|
||||||
|
"generating": "Generating...",
|
||||||
|
"add_meeting": "Add a {{app_name}} meeting",
|
||||||
|
"remove_meeting": "Remove the {{app_name}} meeting",
|
||||||
|
"removing": "Removing...",
|
||||||
|
"error": {
|
||||||
|
"auth": "Your session has expired. Please try again.",
|
||||||
|
"retry": "An error occurred. Please try again.",
|
||||||
|
"details": "Error: {{message}}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meeting_message": {
|
||||||
|
"join": "Join the {{app_name}} meeting",
|
||||||
|
"phone_only": "Or call in (audio only)",
|
||||||
|
"phone_fr": "(FR) {{phone}}",
|
||||||
|
"pin_code": "Code {{pin}}"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"feedback": "Share your feedback"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"app": {
|
||||||
|
"sideload": "Veuillez charger le complément.",
|
||||||
|
"loading": "Chargement..."
|
||||||
|
},
|
||||||
|
"unauth": {
|
||||||
|
"intro": "Ajoutez facilement un lien de réunion {{app_name}} à vos événements Outlook.",
|
||||||
|
"proconnect_btn": "S'identifier avec ProConnect",
|
||||||
|
"proconnect_link": "Qu'est-ce que ProConnect ?",
|
||||||
|
"proconnect_link_title": "Qu'est-ce que ProConnect ? - nouvelle fenêtre"
|
||||||
|
},
|
||||||
|
"success": {
|
||||||
|
"close_window": "Si cette fenêtre ne se ferme pas toute seule, veuillez la fermer manuellement."
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"disconnect": "Se déconnecter"
|
||||||
|
},
|
||||||
|
"meeting": {
|
||||||
|
"already_added": "Une réunion {{app_name}} a déjà été ajoutée.",
|
||||||
|
"link_inserted": "Lien de réunion inséré avec succès",
|
||||||
|
"generating": "Génération...",
|
||||||
|
"add_meeting": "Ajouter une réunion {{app_name}}",
|
||||||
|
"remove_meeting": "Supprimer la réunion {{app_name}}",
|
||||||
|
"removing": "Suppression en cours...",
|
||||||
|
"error": {
|
||||||
|
"auth": "Connexion expirée, veuillez réessayer.",
|
||||||
|
"retry": "Une erreur est survenue, veuillez ré-essayer",
|
||||||
|
"details": "Erreur : {{message}}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meeting_message": {
|
||||||
|
"join": "Rejoindre la réunion {{app_name}}",
|
||||||
|
"phone_only": "Ou appelez (audio uniquement)",
|
||||||
|
"phone_fr": "(FR) {{phone}}",
|
||||||
|
"pin_code": "Code {{pin}}"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"feedback": "Partagez-nous vos retours"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
html, body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
#sideload-msg {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#status {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-container {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 56px;
|
||||||
|
height: 56px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-svg {
|
||||||
|
width: 56px;
|
||||||
|
height: 56px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Background arc (light gray ring) */
|
||||||
|
.spinner-track {
|
||||||
|
stroke: #E5E7EB; /* primary.100 equivalent */
|
||||||
|
fill: none;
|
||||||
|
stroke-width: 3;
|
||||||
|
stroke-linecap: round;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Foreground rotating arc */
|
||||||
|
.spinner-arc {
|
||||||
|
stroke: #000091; /* primary.800 equivalent */
|
||||||
|
fill: none;
|
||||||
|
stroke-width: 3;
|
||||||
|
stroke-linecap: round;
|
||||||
|
/* circumference = 2 * PI * r where r = 11 -> ~69.115 */
|
||||||
|
/* show 30% -> dashoffset = c - 0.3 * c = ~48.38 */
|
||||||
|
stroke-dasharray: 69.115 69.115;
|
||||||
|
stroke-dashoffset: 48.38;
|
||||||
|
transform-origin: center;
|
||||||
|
animation: spinner-rotate 1s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spinner-rotate {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hourglass fallback for reduced motion */
|
||||||
|
.spinner-fallback {
|
||||||
|
display: none;
|
||||||
|
color: #000091;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.spinner-svg {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.spinner-fallback {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title data-app-name></title>
|
||||||
|
<link rel="stylesheet" href="../styles/spinner.css" />
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="/addons/outlook/config.js"></script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="sideload-msg" data-i18n="app.sideload"></div>
|
||||||
|
<div class="spinner-container"
|
||||||
|
role="progressbar"
|
||||||
|
data-i18n-aria="app.loading"
|
||||||
|
>
|
||||||
|
<svg class="spinner-svg"
|
||||||
|
viewBox="0 0 28 28"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<!-- Background track -->
|
||||||
|
<circle class="spinner-track" cx="14" cy="14" r="11"
|
||||||
|
/>
|
||||||
|
<!-- Rotating arc -->
|
||||||
|
<circle class="spinner-arc" cx="14" cy="14" r="11"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<!-- Fallback hourglass icon (Remix Icon RiHourglassFill SVG path) -->
|
||||||
|
<span class="spinner-fallback" aria-hidden="true">
|
||||||
|
<svg width="22"
|
||||||
|
height="22"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="currentColor"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
style="display: block; transform: translateY(1px);"
|
||||||
|
>
|
||||||
|
<path d="M6 2H18V4L13 12L18 20V22H6V20L11 12L6 4V2ZM8.535 4L13 11.143L17.465 4H8.535Z"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p id="close-msg" style="display: none; text-align: center; font-size: 13px; color: #666; margin-top: 16px;" data-i18n="success.close_window"></p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
const { applyAppName } = require("../common/helpers");
|
||||||
|
const { exchangeSession } = require("../common/api");
|
||||||
|
const { consume } = require("../common/transitToken");
|
||||||
|
const { initI18n, translateUI } = require("../common/i18n");
|
||||||
|
|
||||||
|
(async () => {
|
||||||
|
await initI18n();
|
||||||
|
|
||||||
|
applyAppName();
|
||||||
|
translateUI();
|
||||||
|
|
||||||
|
const transitToken = consume();
|
||||||
|
|
||||||
|
if (!transitToken) {
|
||||||
|
console.error("Transit token not found in sessionStorage");
|
||||||
|
window.close();
|
||||||
|
} else {
|
||||||
|
exchangeSession(transitToken)
|
||||||
|
.then(() => {
|
||||||
|
document.querySelector(".spinner-container").style.display = "none";
|
||||||
|
document.querySelector("#close-msg").style.display = "block";
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
console.error(`Error occured: ${e}`);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
// NOTE: doesn't work with the desktop client — the browser considers
|
||||||
|
// this window wasn't opened by this script (it was opened externally),
|
||||||
|
// so it blocks window.close() for security reasons. The "#close-msg"
|
||||||
|
// shown above is the fallback for that case.g
|
||||||
|
|
||||||
|
window.close();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})();
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title data-app-name></title>
|
||||||
|
<link rel="stylesheet" href="taskpane.css" />
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="/addons/outlook/config.js"></script>
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="https://appsforoffice.microsoft.com/lib/1/hosted/office.js"></script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="sideload-msg" data-i18n="app.sideload"></div>
|
||||||
|
|
||||||
|
<div id="app-body">
|
||||||
|
|
||||||
|
<!-- Loading -->
|
||||||
|
<div id="view-loading">
|
||||||
|
<p class="intro-text" data-i18n="app.loading"></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Unauthenticated -->
|
||||||
|
<div id="view-unauth" style="display:none;">
|
||||||
|
<p class="intro-text">
|
||||||
|
<span data-i18n="unauth.intro"></span>
|
||||||
|
</p>
|
||||||
|
<hr class="divider" />
|
||||||
|
<button class="proconnect-button" id="btn-connect">
|
||||||
|
<span class="proconnect-sr-only" data-i18n="unauth.proconnect_btn"></span>
|
||||||
|
</button>
|
||||||
|
<p>
|
||||||
|
<a href="https://www.proconnect.gouv.fr/"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
data-i18n-attr="title:unauth.proconnect_link_title"
|
||||||
|
data-i18n="unauth.proconnect_link"
|
||||||
|
></a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Authenticated -->
|
||||||
|
<div id="view-auth" style="display:none;">
|
||||||
|
<div id="btn-container">
|
||||||
|
<!-- shown when no meeting is present -->
|
||||||
|
<button id="btn-generate" data-i18n="meeting.add_meeting"></button>
|
||||||
|
<!-- shown when a meeting is already present -->
|
||||||
|
<button id="btn-remove" style="display:none;" data-i18n="meeting.remove_meeting"></button>
|
||||||
|
<button id="btn-disconnect" data-i18n="auth.disconnect"></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<footer id="version-tag">
|
||||||
|
<a id="feedback-link"
|
||||||
|
style="display:none;"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
data-i18n="footer.feedback"
|
||||||
|
></a>
|
||||||
|
<div id="footer-right">
|
||||||
|
<span class="version-badge">beta</span>
|
||||||
|
<span class="version-number">0.0.2</span>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,199 @@
|
|||||||
|
/* global Office */
|
||||||
|
const { APP_NAME, FEEDBACK_FORM } = require("../common");
|
||||||
|
const { applyAppName } = require("../common/helpers");
|
||||||
|
const { initSession, createRoom } = require("../common/api");
|
||||||
|
const { startPolling } = require("../common/polling");
|
||||||
|
const { openTransitDialog } = require("../common/transitDialog");
|
||||||
|
const { loadSession, saveSession, clearSession } = require("../common/session");
|
||||||
|
const { buildMeetingMessage } = require("../common/messageBuilder");
|
||||||
|
const { initI18n, t, translateUI } = require("../common/i18n");
|
||||||
|
const { isMeetingAlreadyAdded, removeMeetingLink } = require("../common/meetingDetector");
|
||||||
|
|
||||||
|
// ── Views ────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function showView(name) {
|
||||||
|
document.getElementById("view-loading").style.display = "none";
|
||||||
|
document.getElementById("view-unauth").style.display = "none";
|
||||||
|
document.getElementById("view-auth").style.display = "none";
|
||||||
|
document.getElementById(`view-${name}`).style.display = "block";
|
||||||
|
|
||||||
|
if (name === "auth") {
|
||||||
|
_refreshMeetingButtonState();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Button state ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
function _showAddButton() {
|
||||||
|
document.getElementById("btn-generate").style.display = "block";
|
||||||
|
document.getElementById("btn-remove").style.display = "none";
|
||||||
|
}
|
||||||
|
|
||||||
|
function _showRemoveButton() {
|
||||||
|
document.getElementById("btn-generate").style.display = "none";
|
||||||
|
document.getElementById("btn-remove").style.display = "block";
|
||||||
|
}
|
||||||
|
|
||||||
|
function _setButtonLoading() {
|
||||||
|
const btn = document.getElementById("btn-generate");
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.textContent = t("meeting.generating");
|
||||||
|
}
|
||||||
|
|
||||||
|
function _setButtonIdle() {
|
||||||
|
const btn = document.getElementById("btn-generate");
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.textContent = t("meeting.add_meeting", { app_name: APP_NAME });
|
||||||
|
}
|
||||||
|
|
||||||
|
function _setRemoveLoading() {
|
||||||
|
const btn = document.getElementById("btn-remove");
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.textContent = t("meeting.removing");
|
||||||
|
}
|
||||||
|
|
||||||
|
function _setRemoveIdle() {
|
||||||
|
const btn = document.getElementById("btn-remove");
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.textContent = t("meeting.remove_meeting", { app_name: APP_NAME });
|
||||||
|
}
|
||||||
|
|
||||||
|
function _refreshMeetingButtonState() {
|
||||||
|
const item = Office.context.mailbox.item;
|
||||||
|
if (!item) return;
|
||||||
|
isMeetingAlreadyAdded(item).then((alreadyAdded) => {
|
||||||
|
if (alreadyAdded) {
|
||||||
|
_showRemoveButton();
|
||||||
|
} else {
|
||||||
|
_showAddButton();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Auth ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function connect() {
|
||||||
|
initSession()
|
||||||
|
.then((data) => {
|
||||||
|
const stopPolling = startPolling(data.csrf_token, {
|
||||||
|
onSuccess: (sessionData) => {
|
||||||
|
saveSession(sessionData).then(() => showView("auth"));
|
||||||
|
},
|
||||||
|
onTimeout: () => {
|
||||||
|
showView("unauth");
|
||||||
|
},
|
||||||
|
onError: (err) => {
|
||||||
|
console.error(err);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
openTransitDialog(data.transit_token, {
|
||||||
|
onCancel: () => stopPolling(),
|
||||||
|
onError: (err) => {
|
||||||
|
stopPolling();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function disconnect() {
|
||||||
|
clearSession().finally(() => showView("unauth"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Meeting ──────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function generateMeetingLink() {
|
||||||
|
const session = loadSession();
|
||||||
|
if (!session?.access_token) {
|
||||||
|
showView("unauth");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_setButtonLoading();
|
||||||
|
|
||||||
|
createRoom(session)
|
||||||
|
.then((data) => {
|
||||||
|
const isWeb = Office.context.diagnostics.platform === "OfficeOnline";
|
||||||
|
const { url, text } = buildMeetingMessage(data, isWeb);
|
||||||
|
const item = Office.context.mailbox.item;
|
||||||
|
const coercionType = isWeb ? Office.CoercionType.Html : Office.CoercionType.Text;
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
item.body.setSelectedDataAsync(text, { coercionType }, (setResult) => {
|
||||||
|
if (setResult.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
reject(setResult.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (item.itemType === Office.MailboxEnums.ItemType.Appointment) {
|
||||||
|
item.location.setAsync(url, () => resolve());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
_showRemoveButton();
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
_setButtonIdle();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeMeetingLinkFromItem() {
|
||||||
|
const session = loadSession();
|
||||||
|
if (!session?.access_token) {
|
||||||
|
showView("unauth");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_setRemoveLoading();
|
||||||
|
|
||||||
|
const item = Office.context.mailbox.item;
|
||||||
|
|
||||||
|
removeMeetingLink(item)
|
||||||
|
.then(() => {
|
||||||
|
_showAddButton();
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
_setRemoveIdle();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Init ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
Office.onReady(async (info) => {
|
||||||
|
await initI18n();
|
||||||
|
translateUI();
|
||||||
|
|
||||||
|
if (FEEDBACK_FORM) {
|
||||||
|
const link = document.getElementById("feedback-link");
|
||||||
|
link.href = FEEDBACK_FORM;
|
||||||
|
link.style.display = "inline";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (info.host === Office.HostType.Outlook) {
|
||||||
|
applyAppName();
|
||||||
|
document.getElementById("sideload-msg").style.display = "none";
|
||||||
|
document.getElementById("app-body").style.display = "flex";
|
||||||
|
document.getElementById("btn-connect").onclick = connect;
|
||||||
|
document.getElementById("btn-disconnect").onclick = disconnect;
|
||||||
|
document.getElementById("btn-generate").onclick = generateMeetingLink;
|
||||||
|
document.getElementById("btn-remove").onclick = removeMeetingLinkFromItem;
|
||||||
|
|
||||||
|
const session = loadSession();
|
||||||
|
if (session?.state === "authenticated" && session?.access_token) {
|
||||||
|
showView("auth"); // this already calls _refreshMeetingButtonState internally
|
||||||
|
} else {
|
||||||
|
showView("unauth");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title data-app-name></title>
|
||||||
|
<link rel="stylesheet" href="../styles/spinner.css" />
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="/addons/outlook/config.js"></script>
|
||||||
|
<script nonce="NONCE_PLACEHOLDER" src="https://appsforoffice.microsoft.com/lib/1/hosted/office.js"></script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="sideload-msg" data-i18n="app.sideload"></div>
|
||||||
|
<div
|
||||||
|
class="spinner-container"
|
||||||
|
role="progressbar"
|
||||||
|
data-i18n-aria="app.loading"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="spinner-svg"
|
||||||
|
viewBox="0 0 28 28"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<!-- Background track -->
|
||||||
|
<circle class="spinner-track" cx="14" cy="14" r="11"
|
||||||
|
/>
|
||||||
|
<!-- Rotating arc -->
|
||||||
|
<circle class="spinner-arc" cx="14" cy="14" r="11"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<!-- Fallback hourglass icon (Remix Icon RiHourglassFill SVG path) -->
|
||||||
|
<span class="spinner-fallback" aria-hidden="true">
|
||||||
|
<svg
|
||||||
|
width="22"
|
||||||
|
height="22"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="currentColor"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
style="display: block; transform: translateY(1px);"
|
||||||
|
>
|
||||||
|
<path d="M6 2H18V4L13 12L18 20V22H6V20L11 12L6 4V2ZM8.535 4L13 11.143L17.465 4H8.535Z"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
const { applyAppName } = require("../common/helpers");
|
||||||
|
const { URLS } = require("../common/urls");
|
||||||
|
const { save } = require("../common/transitToken");
|
||||||
|
const { DIALOG_SIGNALS } = require("../common/transitDialog");
|
||||||
|
const { initI18n, translateUI } = require("../common/i18n");
|
||||||
|
|
||||||
|
// Initiate the authentication flow, then return to the success page
|
||||||
|
function getAuthenticateUrl() {
|
||||||
|
const url = new URL(URLS.authenticate);
|
||||||
|
url.searchParams.set("returnTo", URLS.successPage);
|
||||||
|
return url.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
Office.onReady(async function (info) {
|
||||||
|
|
||||||
|
await initI18n();
|
||||||
|
translateUI();
|
||||||
|
|
||||||
|
if (info.host === Office.HostType.Outlook) {
|
||||||
|
applyAppName();
|
||||||
|
}
|
||||||
|
|
||||||
|
Office.context.ui.addHandlerAsync(
|
||||||
|
Office.EventType.DialogParentMessageReceived,
|
||||||
|
function (arg) {
|
||||||
|
const transitToken = arg.message;
|
||||||
|
|
||||||
|
if (typeof transitToken !== "string" || transitToken.trim() === "") {
|
||||||
|
console.error("Invalid transit token received from parent dialog.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Runs inside the dialog window.
|
||||||
|
// Flow:
|
||||||
|
// transit.html saves token → navigates to /authenticate → OAuth redirect →
|
||||||
|
// success.html. sessionStorage survives because it's per-window-per-origin
|
||||||
|
// and the dialog window persists across same-origin navigations.
|
||||||
|
// Fragile: if the IdP opens the redirect in a new tab/window, this breaks
|
||||||
|
// silently.
|
||||||
|
// An alternative could be to pass the token via the OAuth `state` param
|
||||||
|
// and read it back from the redirect URL.
|
||||||
|
try {
|
||||||
|
save(transitToken);
|
||||||
|
Office.context.ui.messageParent(DIALOG_SIGNALS.done);
|
||||||
|
window.location.href = getAuthenticateUrl();
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to store transit token:", err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
function (result) {
|
||||||
|
if (result.status !== Office.AsyncResultStatus.Succeeded) {
|
||||||
|
console.error("Failed to register DialogParentMessageReceived handler.", result.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Office.context.ui.messageParent(DIALOG_SIGNALS.ready);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
/* eslint-disable no-undef */
|
||||||
|
|
||||||
|
const devCerts = require("office-addin-dev-certs");
|
||||||
|
const CopyWebpackPlugin = require("copy-webpack-plugin");
|
||||||
|
const HtmlWebpackPlugin = require("html-webpack-plugin");
|
||||||
|
const htmlWebpackInjectAttributesPlugin = require("html-webpack-inject-attributes-plugin");
|
||||||
|
|
||||||
|
async function getHttpsOptions() {
|
||||||
|
const httpsOptions = await devCerts.getHttpsServerOptions();
|
||||||
|
return { ca: httpsOptions.ca, key: httpsOptions.key, cert: httpsOptions.cert };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = async (env, options) => {
|
||||||
|
const config = {
|
||||||
|
devtool: "source-map",
|
||||||
|
entry: {
|
||||||
|
polyfill: ["core-js/stable", "regenerator-runtime/runtime"],
|
||||||
|
taskpane: ["./src/taskpane/taskpane.js", "./src/taskpane/taskpane.html"],
|
||||||
|
commands: "./src/commands/commands.js",
|
||||||
|
transit: ["./src/transit/transit.js", "./src/transit/transit.html"],
|
||||||
|
success: ["./src/success/success.js", "./src/success/success.html"],
|
||||||
|
},
|
||||||
|
output: {
|
||||||
|
clean: true,
|
||||||
|
},
|
||||||
|
resolve: {
|
||||||
|
extensions: [".html", ".js"],
|
||||||
|
},
|
||||||
|
module: {
|
||||||
|
rules: [
|
||||||
|
{
|
||||||
|
test: /\.js$/,
|
||||||
|
exclude: /node_modules/,
|
||||||
|
use: {
|
||||||
|
loader: "babel-loader",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.html$/,
|
||||||
|
exclude: /node_modules/,
|
||||||
|
use: {
|
||||||
|
loader: "html-loader",
|
||||||
|
options: {
|
||||||
|
sources: {
|
||||||
|
urlFilter: (attribute, value) => {
|
||||||
|
// Don't try to resolve the runtime-injected config
|
||||||
|
if (value.includes("config.js")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.(png|jpg|jpeg|gif|ico)$/,
|
||||||
|
type: "asset/resource",
|
||||||
|
generator: {
|
||||||
|
filename: "assets/[name][ext][query]",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
new HtmlWebpackPlugin({
|
||||||
|
filename: "taskpane.html",
|
||||||
|
template: "./src/taskpane/taskpane.html",
|
||||||
|
chunks: ["polyfill", "taskpane"],
|
||||||
|
scriptLoading: "defer",
|
||||||
|
attributes: {
|
||||||
|
nonce: "NONCE_PLACEHOLDER",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
new CopyWebpackPlugin({
|
||||||
|
patterns: [
|
||||||
|
{
|
||||||
|
from: "assets/*",
|
||||||
|
to: "assets/[name][ext][query]",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
new HtmlWebpackPlugin({
|
||||||
|
filename: "commands.html",
|
||||||
|
template: "./src/commands/commands.html",
|
||||||
|
chunks: ["polyfill", "commands"],
|
||||||
|
scriptLoading: "defer",
|
||||||
|
attributes: {
|
||||||
|
nonce: "NONCE_PLACEHOLDER",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
new HtmlWebpackPlugin({
|
||||||
|
filename: "transit.html",
|
||||||
|
template: "./src/transit/transit.html",
|
||||||
|
chunks: ["polyfill", "transit"],
|
||||||
|
scriptLoading: "defer",
|
||||||
|
attributes: {
|
||||||
|
nonce: "NONCE_PLACEHOLDER",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
new HtmlWebpackPlugin({
|
||||||
|
filename: "success.html",
|
||||||
|
template: "./src/success/success.html",
|
||||||
|
chunks: ["polyfill", "success"],
|
||||||
|
scriptLoading: "defer",
|
||||||
|
attributes: {
|
||||||
|
nonce: "NONCE_PLACEHOLDER",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
new htmlWebpackInjectAttributesPlugin(),
|
||||||
|
],
|
||||||
|
devServer: {
|
||||||
|
headers: {
|
||||||
|
"Access-Control-Allow-Origin": "*",
|
||||||
|
},
|
||||||
|
server: {
|
||||||
|
type: "https",
|
||||||
|
options:
|
||||||
|
env.WEBPACK_BUILD || options.https !== undefined
|
||||||
|
? options.https
|
||||||
|
: await getHttpsOptions(),
|
||||||
|
},
|
||||||
|
port: process.env.npm_package_config_dev_server_port || 3000,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return config;
|
||||||
|
};
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# Python
|
||||||
|
__pycache__
|
||||||
|
*.pyc
|
||||||
|
**/__pycache__
|
||||||
|
**/*.pyc
|
||||||
|
venv
|
||||||
|
**/.venv
|
||||||
|
|
||||||
|
# System-specific files
|
||||||
|
.DS_Store
|
||||||
|
**/.DS_Store
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
compose.*
|
||||||
|
env.d
|
||||||
|
|
||||||
|
# Docs
|
||||||
|
docs
|
||||||
|
*.md
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# Development/test cache & configurations
|
||||||
|
data
|
||||||
|
.cache
|
||||||
|
.circleci
|
||||||
|
.git
|
||||||
|
.iml
|
||||||
|
db.sqlite3
|
||||||
|
.pylint.d
|
||||||
|
|
||||||
|
**/.idea
|
||||||
|
**/.vscode
|
||||||
|
**/.pytest_cache
|
||||||
|
**/.mypy_cache
|
||||||
|
**/.ruff_cache
|
||||||
|
|
||||||
|
# Env
|
||||||
|
.env
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM python:3.13-slim AS base
|
FROM python:3.14.6-slim AS base
|
||||||
|
|
||||||
# Install system dependencies required by LiveKit
|
# Install system dependencies required by LiveKit
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
@@ -6,25 +6,67 @@ RUN apt-get update && apt-get install -y \
|
|||||||
libgobject-2.0-0 \
|
libgobject-2.0-0 \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
|
# ---- Builder image ----
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
|
|
||||||
WORKDIR /builder
|
ENV UV_COMPILE_BYTECODE=1 \
|
||||||
|
UV_LINK_MODE=copy \
|
||||||
|
UV_PYTHON_DOWNLOADS=0
|
||||||
|
|
||||||
COPY pyproject.toml .
|
# Install uv
|
||||||
|
COPY --from=ghcr.io/astral-sh/uv:0.10.9 /uv /uvx /bin/
|
||||||
|
|
||||||
RUN mkdir /install && \
|
WORKDIR /app
|
||||||
pip install --prefix=/install .
|
|
||||||
|
|
||||||
|
# Install production dependencies without the project itself (cacheable layer)
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
--mount=type=bind,source=uv.lock,target=uv.lock \
|
||||||
|
--mount=type=bind,source=pyproject.toml,target=pyproject.toml \
|
||||||
|
uv sync --locked --no-install-project --no-dev
|
||||||
|
|
||||||
|
# Install the project
|
||||||
|
COPY . /app
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
uv sync --locked --no-dev
|
||||||
|
|
||||||
|
|
||||||
|
# ---- Development image ----
|
||||||
|
FROM base AS development
|
||||||
|
|
||||||
|
ENV UV_COMPILE_BYTECODE=1 \
|
||||||
|
UV_LINK_MODE=copy \
|
||||||
|
UV_PYTHON_DOWNLOADS=0
|
||||||
|
|
||||||
|
COPY --from=ghcr.io/astral-sh/uv:0.10.9 /uv /uvx /bin/
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . /app
|
||||||
|
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
uv sync --locked --all-extras
|
||||||
|
|
||||||
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
|
|
||||||
|
CMD ["python", "multi_user_transcriber.py", "dev"]
|
||||||
|
|
||||||
|
|
||||||
|
# ---- Production image ----
|
||||||
FROM base AS production
|
FROM base AS production
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy the pre-built virtualenv and application source
|
||||||
|
COPY --from=builder /app /app
|
||||||
|
|
||||||
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
|
|
||||||
|
# Remove pip to reduce attack surface in production
|
||||||
|
RUN pip uninstall -y pip
|
||||||
|
|
||||||
|
# Un-privileged user running the application
|
||||||
ARG DOCKER_USER
|
ARG DOCKER_USER
|
||||||
USER ${DOCKER_USER}
|
USER ${DOCKER_USER}
|
||||||
|
|
||||||
# Un-privileged user running the application
|
CMD ["python", "multi_user_transcriber.py", "start"]
|
||||||
COPY --from=builder /install /usr/local
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
CMD ["python", "multi-user-transcriber.py", "start"]
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
"""Storage parsers specific exceptions."""
|
||||||
|
|
||||||
|
|
||||||
|
class MissingConfigError(Exception):
|
||||||
|
"""Raised when a variable is not set in configuration."""
|
||||||
@@ -0,0 +1,396 @@
|
|||||||
|
"""Metadata agent that extracts metadata from active room."""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
from dataclasses import asdict, dataclass
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from io import BytesIO
|
||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
from livekit import api, rtc
|
||||||
|
from livekit.agents import (
|
||||||
|
Agent,
|
||||||
|
AgentServer,
|
||||||
|
AgentSession,
|
||||||
|
AutoSubscribe,
|
||||||
|
JobContext,
|
||||||
|
JobProcess,
|
||||||
|
JobRequest,
|
||||||
|
RoomIO,
|
||||||
|
WorkerPermissions,
|
||||||
|
cli,
|
||||||
|
utils,
|
||||||
|
)
|
||||||
|
from livekit.agents import (
|
||||||
|
room_io as lk_room_io,
|
||||||
|
)
|
||||||
|
from livekit.plugins import silero
|
||||||
|
from minio import Minio
|
||||||
|
from minio.error import S3Error
|
||||||
|
|
||||||
|
from exceptions import MissingConfigError
|
||||||
|
from observability import configure_sentry, set_job_context
|
||||||
|
from tasks import done_callback
|
||||||
|
|
||||||
|
load_dotenv()
|
||||||
|
|
||||||
|
logger = logging.getLogger("metadata-collector")
|
||||||
|
|
||||||
|
AGENT_NAME = os.getenv("METADATA_COLLECTOR_AGENT_NAME", "metadata-collector")
|
||||||
|
|
||||||
|
|
||||||
|
def prewarm(proc: JobProcess):
|
||||||
|
"""Preload voice activity detection model."""
|
||||||
|
configure_sentry(AGENT_NAME)
|
||||||
|
proc.userdata["vad"] = silero.VAD.load()
|
||||||
|
|
||||||
|
|
||||||
|
server = AgentServer(
|
||||||
|
permissions=WorkerPermissions(
|
||||||
|
can_publish=False,
|
||||||
|
can_publish_data=False,
|
||||||
|
can_subscribe=True,
|
||||||
|
hidden=True,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
server.setup_fnc = prewarm
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class MetadataEvent:
|
||||||
|
"""A single timestamped event recorded during a meeting."""
|
||||||
|
|
||||||
|
participant_id: str
|
||||||
|
type: str
|
||||||
|
timestamp: datetime
|
||||||
|
data: Optional[str] = None
|
||||||
|
|
||||||
|
def serialize(self) -> dict:
|
||||||
|
"""Return a JSON-serializable dictionary representation of the event."""
|
||||||
|
data = asdict(self)
|
||||||
|
data["timestamp"] = self.timestamp.isoformat()
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
class VADAgent(Agent):
|
||||||
|
"""Agent that monitors voice activity for a specific participant."""
|
||||||
|
|
||||||
|
def __init__(self, participant_identity: str, events: List):
|
||||||
|
"""Initialize with a participant identity and shared events list."""
|
||||||
|
super().__init__(
|
||||||
|
instructions="not-needed",
|
||||||
|
)
|
||||||
|
self.participant_identity = participant_identity
|
||||||
|
self.events = events
|
||||||
|
|
||||||
|
async def on_enter(self) -> None:
|
||||||
|
"""Initialize VAD monitoring for this participant."""
|
||||||
|
|
||||||
|
@self.session.on("user_state_changed")
|
||||||
|
def on_user_state(event):
|
||||||
|
timestamp = datetime.now(timezone.utc)
|
||||||
|
|
||||||
|
if event.new_state == "speaking":
|
||||||
|
event = MetadataEvent(
|
||||||
|
participant_id=self.participant_identity,
|
||||||
|
type="speech_start",
|
||||||
|
timestamp=timestamp,
|
||||||
|
)
|
||||||
|
self.events.append(event)
|
||||||
|
|
||||||
|
elif event.old_state == "speaking":
|
||||||
|
event = MetadataEvent(
|
||||||
|
participant_id=self.participant_identity,
|
||||||
|
type="speech_end",
|
||||||
|
timestamp=timestamp,
|
||||||
|
)
|
||||||
|
self.events.append(event)
|
||||||
|
|
||||||
|
|
||||||
|
class MetadataCollector:
|
||||||
|
"""Collect meeting events across all participants in a room.
|
||||||
|
|
||||||
|
Creates one AgentSession per participant to capture VAD events
|
||||||
|
(speech start/end), and listens for connection, disconnection,
|
||||||
|
and chat events. Persists all collected events as JSON to S3
|
||||||
|
on shutdown.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, ctx: JobContext, recording_id: str):
|
||||||
|
"""Initialize metadata agent."""
|
||||||
|
self.minio_client = Minio(
|
||||||
|
endpoint=os.getenv("AWS_S3_ENDPOINT_URL"),
|
||||||
|
access_key=os.getenv("AWS_S3_ACCESS_KEY_ID"),
|
||||||
|
secret_key=os.getenv("AWS_S3_SECRET_ACCESS_KEY"),
|
||||||
|
secure=os.getenv("AWS_S3_SECURE_ACCESS", "False").lower() == "true",
|
||||||
|
)
|
||||||
|
|
||||||
|
if (bucket_name := os.getenv("AWS_STORAGE_BUCKET_NAME")) is not None:
|
||||||
|
self.bucket_name = bucket_name
|
||||||
|
else:
|
||||||
|
raise MissingConfigError
|
||||||
|
|
||||||
|
self.ctx = ctx
|
||||||
|
self._sessions: dict[str, AgentSession] = {}
|
||||||
|
self._tasks: set[asyncio.Task] = set()
|
||||||
|
|
||||||
|
output_folder = os.getenv("AWS_S3_OUTPUT_FOLDER", "metadata")
|
||||||
|
self.output_filename = f"{output_folder}/{recording_id}-metadata.json"
|
||||||
|
|
||||||
|
# Storage for events
|
||||||
|
self.events = []
|
||||||
|
self.participants = {}
|
||||||
|
|
||||||
|
logger.info("MetadataCollector initialized")
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
"""Start listening for room-level events."""
|
||||||
|
self.ctx.room.on("participant_disconnected", self.on_participant_disconnected)
|
||||||
|
self.ctx.room.on("participant_name_changed", self.on_participant_name_changed)
|
||||||
|
|
||||||
|
self.ctx.room.register_text_stream_handler("lk.chat", self.handle_chat_stream)
|
||||||
|
|
||||||
|
logger.info("Started listening for participant events")
|
||||||
|
|
||||||
|
async def on_chat_message_received(
|
||||||
|
self, reader: rtc.TextStreamReader, participant_identity: str
|
||||||
|
):
|
||||||
|
"""Read a complete chat message and record it as an event."""
|
||||||
|
full_text = await reader.read_all()
|
||||||
|
logger.info("Received chat message from %s", participant_identity)
|
||||||
|
|
||||||
|
self.events.append(
|
||||||
|
MetadataEvent(
|
||||||
|
participant_id=participant_identity,
|
||||||
|
type="chat_received",
|
||||||
|
timestamp=datetime.now(timezone.utc),
|
||||||
|
data=full_text,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def handle_chat_stream(self, reader, participant_identity):
|
||||||
|
"""Schedule async processing of an incoming chat stream."""
|
||||||
|
task = asyncio.create_task(
|
||||||
|
self.on_chat_message_received(reader, participant_identity)
|
||||||
|
)
|
||||||
|
self._tasks.add(task)
|
||||||
|
task.add_done_callback(
|
||||||
|
done_callback(
|
||||||
|
logger,
|
||||||
|
self._tasks,
|
||||||
|
f"process chat stream from {participant_identity}",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def save(self):
|
||||||
|
"""Serialize collected events and upload as JSON to S3."""
|
||||||
|
logger.info("Persisting metadata...")
|
||||||
|
|
||||||
|
participants = []
|
||||||
|
for k, v in self.participants.items():
|
||||||
|
participants.append({"participantId": k, "name": v})
|
||||||
|
|
||||||
|
sorted_events = sorted(self.events, key=lambda e: e.timestamp)
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"events": [event.serialize() for event in sorted_events],
|
||||||
|
"participants": participants,
|
||||||
|
}
|
||||||
|
|
||||||
|
data = json.dumps(payload, indent=2).encode("utf-8")
|
||||||
|
stream = BytesIO(data)
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.minio_client.put_object(
|
||||||
|
self.bucket_name,
|
||||||
|
self.output_filename,
|
||||||
|
stream,
|
||||||
|
length=len(data),
|
||||||
|
content_type="application/json",
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
"Uploaded speaker meeting metadata",
|
||||||
|
)
|
||||||
|
except S3Error:
|
||||||
|
logger.exception(
|
||||||
|
"Failed to upload meeting metadata",
|
||||||
|
)
|
||||||
|
|
||||||
|
async def aclose(self):
|
||||||
|
"""Close all sessions and cleanup resources."""
|
||||||
|
logger.info("Closing all VAD monitoring sessions…")
|
||||||
|
|
||||||
|
await utils.aio.cancel_and_wait(*self._tasks)
|
||||||
|
|
||||||
|
await asyncio.gather(
|
||||||
|
*[self._close_session(session) for session in self._sessions.values()],
|
||||||
|
return_exceptions=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.ctx.room.off("participant_disconnected", self.on_participant_disconnected)
|
||||||
|
self.ctx.room.off("participant_name_changed", self.on_participant_name_changed)
|
||||||
|
|
||||||
|
logger.info("All VAD sessions closed")
|
||||||
|
self.save()
|
||||||
|
|
||||||
|
async def on_participant_entrypoint(
|
||||||
|
self, ctx: JobContext, participant: rtc.RemoteParticipant
|
||||||
|
):
|
||||||
|
"""Handle new participant by starting a VAD monitoring session."""
|
||||||
|
if participant.identity in self._sessions:
|
||||||
|
logger.debug("Session already exists for %s", participant.identity)
|
||||||
|
return
|
||||||
|
|
||||||
|
self.events.append(
|
||||||
|
MetadataEvent(
|
||||||
|
participant_id=participant.identity,
|
||||||
|
type="participant_connected",
|
||||||
|
timestamp=datetime.now(timezone.utc),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.participants[participant.identity] = participant.name
|
||||||
|
|
||||||
|
logger.info("New participant connected: %s", participant.identity)
|
||||||
|
try:
|
||||||
|
session = await self._start_session(participant)
|
||||||
|
self._sessions[participant.identity] = session
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Failed to start session for %s", participant.identity)
|
||||||
|
|
||||||
|
def on_participant_disconnected(self, participant: rtc.RemoteParticipant):
|
||||||
|
"""Handle participant disconnection by closing VAD monitoring."""
|
||||||
|
self.events.append(
|
||||||
|
MetadataEvent(
|
||||||
|
participant_id=participant.identity,
|
||||||
|
type="participant_disconnected",
|
||||||
|
timestamp=datetime.now(timezone.utc),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
session = self._sessions.pop(participant.identity, None)
|
||||||
|
if session is None:
|
||||||
|
logger.debug("No session found for %s", participant.identity)
|
||||||
|
return
|
||||||
|
|
||||||
|
logger.info("Participant disconnected: %s", participant.identity)
|
||||||
|
task = asyncio.create_task(self._close_session(session))
|
||||||
|
self._tasks.add(task)
|
||||||
|
task.add_done_callback(
|
||||||
|
done_callback(
|
||||||
|
logger,
|
||||||
|
self._tasks,
|
||||||
|
f"close VAD session for {participant.identity}",
|
||||||
|
on_success=lambda _: logger.info(
|
||||||
|
"VAD session closed for %s (remaining sessions: %d)",
|
||||||
|
participant.identity,
|
||||||
|
len(self._sessions),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def on_participant_name_changed(self, participant: rtc.RemoteParticipant):
|
||||||
|
"""Update stored participant name when it changes."""
|
||||||
|
logger.info("Participant's name changed: %s", participant.identity)
|
||||||
|
self.participants[participant.identity] = participant.name
|
||||||
|
|
||||||
|
async def _start_session(self, participant: rtc.RemoteParticipant) -> AgentSession:
|
||||||
|
"""Create and start VAD monitoring session for participant."""
|
||||||
|
if participant.identity in self._sessions:
|
||||||
|
return self._sessions[participant.identity]
|
||||||
|
|
||||||
|
# Create session with VAD only - no STT, LLM, or TTS
|
||||||
|
session = AgentSession(
|
||||||
|
vad=self.ctx.proc.userdata["vad"],
|
||||||
|
turn_detection="vad",
|
||||||
|
user_away_timeout=30.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Set up room IO to receive audio from this specific participant
|
||||||
|
room_io = RoomIO(
|
||||||
|
agent_session=session,
|
||||||
|
room=self.ctx.room,
|
||||||
|
participant=participant,
|
||||||
|
options=lk_room_io.RoomOptions(
|
||||||
|
audio_input=lk_room_io.AudioInputOptions(),
|
||||||
|
text_input=False,
|
||||||
|
audio_output=False,
|
||||||
|
text_output=False,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
await room_io.start()
|
||||||
|
await session.start(
|
||||||
|
agent=VADAgent(
|
||||||
|
participant_identity=participant.identity, events=self.events
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
return session
|
||||||
|
|
||||||
|
async def _close_session(self, session: AgentSession) -> None:
|
||||||
|
"""Close and cleanup VAD monitoring session."""
|
||||||
|
try:
|
||||||
|
await session.aclose()
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Error closing session")
|
||||||
|
|
||||||
|
|
||||||
|
async def handle_job_request(job_req: JobRequest) -> None:
|
||||||
|
"""Accept or reject the job request based on agent presence in the room."""
|
||||||
|
room_name = job_req.room.name
|
||||||
|
recording_id = job_req.job.metadata
|
||||||
|
agent_identity = f"{AGENT_NAME}-{room_name}"
|
||||||
|
|
||||||
|
async with api.LiveKitAPI() as lk:
|
||||||
|
try:
|
||||||
|
resp = await lk.room.list_participants(
|
||||||
|
list=api.ListParticipantsRequest(room=room_name)
|
||||||
|
)
|
||||||
|
already_present = any(
|
||||||
|
p.kind == rtc.ParticipantKind.PARTICIPANT_KIND_AGENT
|
||||||
|
and p.identity == agent_identity
|
||||||
|
for p in resp.participants
|
||||||
|
)
|
||||||
|
if already_present:
|
||||||
|
logger.info("Agent already in the room '%s' — reject", room_name)
|
||||||
|
await job_req.reject()
|
||||||
|
else:
|
||||||
|
logger.info(
|
||||||
|
"Accept job for '%s' — identity=%s", room_name, agent_identity
|
||||||
|
)
|
||||||
|
await job_req.accept(identity=agent_identity, metadata=recording_id)
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Error treating the job for '%s'", room_name)
|
||||||
|
await job_req.reject()
|
||||||
|
|
||||||
|
|
||||||
|
@server.rtc_session(agent_name=AGENT_NAME, on_request=handle_job_request)
|
||||||
|
async def entrypoint(ctx: JobContext):
|
||||||
|
"""Initialize and run the metadata collector."""
|
||||||
|
set_job_context(room=ctx.room.name, job_id=ctx.job.id)
|
||||||
|
|
||||||
|
logger.info("Starting metadata agent in room: %s", ctx.room.name)
|
||||||
|
recording_id = ctx.job.metadata
|
||||||
|
metadata_collector = MetadataCollector(ctx, recording_id)
|
||||||
|
metadata_collector.start()
|
||||||
|
|
||||||
|
ctx.add_participant_entrypoint(metadata_collector.on_participant_entrypoint)
|
||||||
|
|
||||||
|
await ctx.connect(auto_subscribe=AutoSubscribe.AUDIO_ONLY)
|
||||||
|
|
||||||
|
async def cleanup():
|
||||||
|
logger.info("Shutting down metadata collector...")
|
||||||
|
await metadata_collector.aclose()
|
||||||
|
|
||||||
|
ctx.add_shutdown_callback(cleanup)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# Initialize Sentry for the worker process. Each job runs in its own
|
||||||
|
# (forked) process and re-initializes Sentry via prewarm().
|
||||||
|
configure_sentry(AGENT_NAME)
|
||||||
|
cli.run_app(server)
|
||||||
@@ -25,12 +25,16 @@ from livekit.agents import (
|
|||||||
)
|
)
|
||||||
from livekit.plugins import deepgram, silero
|
from livekit.plugins import deepgram, silero
|
||||||
|
|
||||||
|
from observability import configure_sentry, set_job_context
|
||||||
|
from tasks import done_callback
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
logger = logging.getLogger("transcriber")
|
logger = logging.getLogger("transcriber")
|
||||||
|
|
||||||
TRANSCRIBER_AGENT_NAME = os.getenv("TRANSCRIBER_AGENT_NAME", "multi-user-transcriber")
|
TRANSCRIBER_AGENT_NAME = os.getenv("TRANSCRIBER_AGENT_NAME", "multi-user-transcriber")
|
||||||
STT_PROVIDER = os.getenv("STT_PROVIDER", "deepgram")
|
STT_PROVIDER = os.getenv("STT_PROVIDER", "deepgram")
|
||||||
|
ENABLE_SILERO_VAD = os.getenv("ENABLE_SILERO_VAD", "true").lower() == "true"
|
||||||
|
|
||||||
|
|
||||||
def create_stt_provider():
|
def create_stt_provider():
|
||||||
@@ -98,33 +102,37 @@ class MultiUserTranscriber:
|
|||||||
logger.info(f"starting session for {participant.identity}")
|
logger.info(f"starting session for {participant.identity}")
|
||||||
task = asyncio.create_task(self._start_session(participant))
|
task = asyncio.create_task(self._start_session(participant))
|
||||||
self._tasks.add(task)
|
self._tasks.add(task)
|
||||||
|
task.add_done_callback(
|
||||||
def on_task_done(task: asyncio.Task):
|
done_callback(
|
||||||
try:
|
logger,
|
||||||
self._sessions[participant.identity] = task.result()
|
self._tasks,
|
||||||
finally:
|
f"start transcription session for {participant.identity}",
|
||||||
self._tasks.discard(task)
|
)
|
||||||
|
)
|
||||||
task.add_done_callback(on_task_done)
|
|
||||||
|
|
||||||
def on_participant_disconnected(self, participant: rtc.RemoteParticipant):
|
def on_participant_disconnected(self, participant: rtc.RemoteParticipant):
|
||||||
"""Handle participant disconnection by closing transcription session."""
|
"""Handle participant disconnection by closing transcription session."""
|
||||||
if (session := self._sessions.pop(participant.identity)) is None:
|
if (session := self._sessions.pop(participant.identity, None)) is None:
|
||||||
return
|
return
|
||||||
|
|
||||||
logger.info(f"closing session for {participant.identity}")
|
logger.info(f"closing session for {participant.identity}")
|
||||||
task = asyncio.create_task(self._close_session(session))
|
task = asyncio.create_task(self._close_session(session))
|
||||||
self._tasks.add(task)
|
self._tasks.add(task)
|
||||||
task.add_done_callback(lambda _: self._tasks.discard(task))
|
task.add_done_callback(
|
||||||
|
done_callback(
|
||||||
|
logger,
|
||||||
|
self._tasks,
|
||||||
|
f"close transcription session for {participant.identity}",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
async def _start_session(self, participant: rtc.RemoteParticipant) -> AgentSession:
|
async def _start_session(self, participant: rtc.RemoteParticipant) -> AgentSession:
|
||||||
"""Create and start transcription session for participant."""
|
"""Create and start transcription session for participant."""
|
||||||
if participant.identity in self._sessions:
|
if participant.identity in self._sessions:
|
||||||
return self._sessions[participant.identity]
|
return self._sessions[participant.identity]
|
||||||
|
|
||||||
session = AgentSession(
|
vad = self.ctx.proc.userdata.get("vad", None)
|
||||||
vad=self.ctx.proc.userdata["vad"],
|
session = AgentSession(vad=vad)
|
||||||
)
|
|
||||||
room_io = RoomIO(
|
room_io = RoomIO(
|
||||||
agent_session=session,
|
agent_session=session,
|
||||||
room=self.ctx.room,
|
room=self.ctx.room,
|
||||||
@@ -139,6 +147,7 @@ class MultiUserTranscriber:
|
|||||||
participant_identity=participant.identity,
|
participant_identity=participant.identity,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
self._sessions[participant.identity] = session
|
||||||
return session
|
return session
|
||||||
|
|
||||||
async def _close_session(self, sess: AgentSession) -> None:
|
async def _close_session(self, sess: AgentSession) -> None:
|
||||||
@@ -149,6 +158,8 @@ class MultiUserTranscriber:
|
|||||||
|
|
||||||
async def entrypoint(ctx: JobContext):
|
async def entrypoint(ctx: JobContext):
|
||||||
"""Initialize and run the multi-user transcriber."""
|
"""Initialize and run the multi-user transcriber."""
|
||||||
|
set_job_context(room=ctx.room.name, job_id=ctx.job.id)
|
||||||
|
|
||||||
transcriber = MultiUserTranscriber(ctx)
|
transcriber = MultiUserTranscriber(ctx)
|
||||||
transcriber.start()
|
transcriber.start()
|
||||||
|
|
||||||
@@ -193,10 +204,15 @@ async def handle_transcriber_job_request(job_req: JobRequest) -> None:
|
|||||||
|
|
||||||
def prewarm(proc: JobProcess):
|
def prewarm(proc: JobProcess):
|
||||||
"""Preload voice activity detection model."""
|
"""Preload voice activity detection model."""
|
||||||
proc.userdata["vad"] = silero.VAD.load()
|
configure_sentry(TRANSCRIBER_AGENT_NAME)
|
||||||
|
if ENABLE_SILERO_VAD:
|
||||||
|
proc.userdata["vad"] = silero.VAD.load()
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
# Initialize Sentry for the worker process. Each job runs in its own
|
||||||
|
# (forked) process and re-initializes Sentry via prewarm().
|
||||||
|
configure_sentry(TRANSCRIBER_AGENT_NAME)
|
||||||
cli.run_app(
|
cli.run_app(
|
||||||
WorkerOptions(
|
WorkerOptions(
|
||||||
entrypoint_fnc=entrypoint,
|
entrypoint_fnc=entrypoint,
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
"""Sentry helpers for the LiveKit agents."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import tomllib
|
||||||
|
from os import path
|
||||||
|
|
||||||
|
import sentry_sdk
|
||||||
|
from sentry_sdk.integrations.logging import LoggingIntegration
|
||||||
|
|
||||||
|
logger = logging.getLogger("observability")
|
||||||
|
|
||||||
|
BASE_DIR = path.dirname(path.abspath(__file__))
|
||||||
|
|
||||||
|
|
||||||
|
def get_release():
|
||||||
|
"""Get the current release of the application.
|
||||||
|
|
||||||
|
By release, we mean the ``version`` declared in ``pyproject.toml``.
|
||||||
|
If the file cannot be read or declares no version, it defaults to "NA".
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
with open(path.join(BASE_DIR, "pyproject.toml"), "rb") as pyproject:
|
||||||
|
return tomllib.load(pyproject)["project"]["version"]
|
||||||
|
except (FileNotFoundError, KeyError, tomllib.TOMLDecodeError):
|
||||||
|
return "NA" # Default: not available
|
||||||
|
|
||||||
|
|
||||||
|
def configure_sentry(agent_name: str) -> None:
|
||||||
|
"""Initialize Sentry for the current agent process.
|
||||||
|
|
||||||
|
No-op if ``SENTRY_DSN`` is not configured. Otherwise (re)initializes Sentry
|
||||||
|
unconditionally so the calling process gets its own live transport.
|
||||||
|
|
||||||
|
Must be called once per process: in the worker entrypoint and again in the
|
||||||
|
per-job ``prewarm``/``setup_fnc`` hook, because LiveKit runs each job in a
|
||||||
|
forked process. A forked child inherits the parent's initialized Sentry
|
||||||
|
client but not its background transport thread (threads do not survive
|
||||||
|
``fork()``), so it must re-init to get a working transport. For that reason,
|
||||||
|
do NOT guard this with ``sentry_sdk.is_initialized()``: the child inherits it
|
||||||
|
as ``True`` and would skip init, silently dropping every event.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
agent_name: Identifier of the agent, attached as a tag to Sentry issues
|
||||||
|
"""
|
||||||
|
# Read the DSN at call time so it picks up variables that load_dotenv()
|
||||||
|
# populated after this module was first imported.
|
||||||
|
sentry_dsn = os.getenv("SENTRY_DSN")
|
||||||
|
if not sentry_dsn:
|
||||||
|
logger.debug("SENTRY_DSN not defined for agent '%s'", agent_name)
|
||||||
|
return
|
||||||
|
|
||||||
|
sentry_sdk.init(
|
||||||
|
dsn=sentry_dsn,
|
||||||
|
environment=os.getenv("SENTRY_ENVIRONMENT"),
|
||||||
|
release=get_release(),
|
||||||
|
debug=False,
|
||||||
|
integrations=[
|
||||||
|
# Capture log records emitted at ERROR and above as Sentry events.
|
||||||
|
# This covers the agents' explicit logger.exception(...) calls as
|
||||||
|
# well as asyncio's "Exception in callback" / "Task exception was
|
||||||
|
# never retrieved" records, so unhandled task failures surface too.
|
||||||
|
LoggingIntegration(level=logging.INFO, event_level=logging.ERROR),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
sentry_sdk.set_tag("application", "agents")
|
||||||
|
sentry_sdk.set_tag("agent", agent_name)
|
||||||
|
|
||||||
|
logger.info("Sentry initialized for agent '%s' (pid %d)", agent_name, os.getpid())
|
||||||
|
|
||||||
|
|
||||||
|
def set_job_context(*, room: str | None = None, job_id: str | None = None) -> None:
|
||||||
|
"""Tag the current Sentry scope with the LiveKit job being handled.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room: Name of the room the job is serving.
|
||||||
|
job_id: LiveKit job identifier.
|
||||||
|
"""
|
||||||
|
scope = sentry_sdk.get_current_scope()
|
||||||
|
if room is not None:
|
||||||
|
scope.set_tag("room", room)
|
||||||
|
if job_id is not None:
|
||||||
|
scope.set_tag("job_id", job_id)
|
||||||
@@ -1,24 +1,26 @@
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "agents"
|
name = "agents"
|
||||||
version = "1.1.0"
|
version = "1.23.0"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"livekit-agents==1.3.10",
|
"livekit-agents==1.6.4",
|
||||||
"livekit-plugins-deepgram==1.3.10",
|
"livekit-plugins-deepgram==1.6.4",
|
||||||
"livekit-plugins-silero==1.3.10",
|
"livekit-plugins-silero==1.6.4",
|
||||||
"livekit-plugins-kyutai-lasuite==0.0.6",
|
"livekit-plugins-kyutai-lasuite==0.0.6",
|
||||||
"python-dotenv==1.2.1"
|
"python-dotenv==1.2.2",
|
||||||
|
"protobuf==6.33.6",
|
||||||
|
"minio==7.2.20",
|
||||||
|
"sentry-sdk==2.60.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
dev = [
|
dev = [
|
||||||
"ruff==0.14.4",
|
"ruff==0.15.19",
|
||||||
]
|
]
|
||||||
|
|
||||||
[build-system]
|
[tool.uv]
|
||||||
requires = ["setuptools>=61.0"]
|
package = false
|
||||||
build-backend = "setuptools.build_meta"
|
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
target-version = "py313"
|
target-version = "py313"
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
"""Helpers for managing asyncio tasks."""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
from collections.abc import Callable
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
def done_callback(
|
||||||
|
logger: logging.Logger,
|
||||||
|
tasks: set[asyncio.Task],
|
||||||
|
description: str,
|
||||||
|
*,
|
||||||
|
on_success: Callable[[Any], None] | None = None,
|
||||||
|
) -> Callable[[asyncio.Task], None]:
|
||||||
|
"""Build a done-callback for a background task.
|
||||||
|
|
||||||
|
Meant to be passed to `asyncio.Task.add_done_callback`.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
logger: Logger used to report failures, so records keep the caller's
|
||||||
|
logger name.
|
||||||
|
tasks: Set the task was registered in; the task is discarded from it.
|
||||||
|
description: Human-readable intended action
|
||||||
|
on_success: Optional callback invoked with the task's result when it
|
||||||
|
completes without error.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
A callback suitable for ``task.add_done_callback(...)``.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def _finalize(task: asyncio.Task) -> None:
|
||||||
|
tasks.discard(task)
|
||||||
|
if task.cancelled():
|
||||||
|
return
|
||||||
|
if (exc := task.exception()) is not None:
|
||||||
|
logger.exception("failed to %s", description, exc_info=exc)
|
||||||
|
return
|
||||||
|
if on_success is not None:
|
||||||
|
on_success(task.result())
|
||||||
|
|
||||||
|
return _finalize
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
"""Meet core add-ons module."""
|
||||||
@@ -0,0 +1,344 @@
|
|||||||
|
"""Authentication session management for add-ons using temporary cache-based sessions."""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import hmac
|
||||||
|
import secrets
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from enum import Enum
|
||||||
|
from logging import getLogger
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.core.cache import cache
|
||||||
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
|
|
||||||
|
from core.models import User
|
||||||
|
from core.services.jwt_token import JwtTokenService
|
||||||
|
|
||||||
|
logger = getLogger(__name__)
|
||||||
|
|
||||||
|
_PUBLIC_SESSION_FIELDS = frozenset(
|
||||||
|
{"state", "access_token", "token_type", "expires_in", "scope"}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class SessionDataError(Exception):
|
||||||
|
"""Raised when session data is invalid or malformed."""
|
||||||
|
|
||||||
|
|
||||||
|
class CSRFTokenError(Exception):
|
||||||
|
"""Raised when CSRF token verification fails."""
|
||||||
|
|
||||||
|
|
||||||
|
class TransitTokenError(Exception):
|
||||||
|
"""Raised when a transit token is invalid or expired."""
|
||||||
|
|
||||||
|
|
||||||
|
class SessionExpiredError(Exception):
|
||||||
|
"""Raised when a session has expired."""
|
||||||
|
|
||||||
|
|
||||||
|
class SessionNotFoundError(Exception):
|
||||||
|
"""Raised when a session is not found."""
|
||||||
|
|
||||||
|
|
||||||
|
class SuspiciousSessionError(Exception):
|
||||||
|
"""Raised when session state indicates a possible attack or bug."""
|
||||||
|
|
||||||
|
|
||||||
|
class SessionState(str, Enum):
|
||||||
|
"""Add-on authentication session lifecycle states."""
|
||||||
|
|
||||||
|
PENDING = "pending"
|
||||||
|
AUTHENTICATED = "authenticated"
|
||||||
|
|
||||||
|
|
||||||
|
class TransitTokenState(str, Enum):
|
||||||
|
"""Transit token lifecycle states; CONSUMED is retained to detect replay."""
|
||||||
|
|
||||||
|
PENDING = "pending"
|
||||||
|
CONSUMED = "consumed"
|
||||||
|
|
||||||
|
|
||||||
|
class TokenExchangeService:
|
||||||
|
"""Manage temporary authentication sessions for add-on JWT token exchange."""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
"""Build the underlying JWT service and validate required settings."""
|
||||||
|
|
||||||
|
if not settings.ADDONS_CSRF_SECRET:
|
||||||
|
raise ImproperlyConfigured("CSRF Secret is required.")
|
||||||
|
|
||||||
|
if not settings.ADDONS_TOKEN_SCOPE:
|
||||||
|
raise ImproperlyConfigured("Token scope must be defined.")
|
||||||
|
|
||||||
|
self._token_service = JwtTokenService(
|
||||||
|
secret_key=settings.ADDONS_TOKEN_SECRET_KEY,
|
||||||
|
algorithm=settings.ADDONS_TOKEN_ALG,
|
||||||
|
issuer=settings.ADDONS_TOKEN_ISSUER,
|
||||||
|
audience=settings.ADDONS_TOKEN_AUDIENCE,
|
||||||
|
expiration_seconds=settings.ADDONS_TOKEN_TTL,
|
||||||
|
token_type=settings.ADDONS_TOKEN_TYPE,
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _cache_key(prefix: str, token: str) -> str:
|
||||||
|
"""Build a namespaced cache key: ``addons_{prefix}_{token}``."""
|
||||||
|
return f"addons_{prefix}_{token}"
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _derive_csrf_token(session_id: str) -> str:
|
||||||
|
"""Derive the CSRF token as HMAC-SHA256(session_id) under ADDONS_CSRF_SECRET."""
|
||||||
|
return hmac.new(
|
||||||
|
settings.ADDONS_CSRF_SECRET.encode("utf-8"),
|
||||||
|
session_id.encode("utf-8"),
|
||||||
|
hashlib.sha256,
|
||||||
|
).hexdigest()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _validate_session_not_expired(session_data: dict) -> int:
|
||||||
|
"""Return remaining seconds until expiry, or raise if missing/malformed/expired."""
|
||||||
|
expires_at_str = session_data.get("expires_at")
|
||||||
|
if expires_at_str is None:
|
||||||
|
raise SessionDataError("Invalid session data: missing expiration.")
|
||||||
|
|
||||||
|
try:
|
||||||
|
expires_at = datetime.fromisoformat(expires_at_str)
|
||||||
|
except ValueError as e:
|
||||||
|
raise SessionDataError("Invalid session data: malformed expiration.") from e
|
||||||
|
|
||||||
|
remaining_seconds = int(
|
||||||
|
(expires_at - datetime.now(timezone.utc)).total_seconds()
|
||||||
|
)
|
||||||
|
|
||||||
|
if remaining_seconds <= 0:
|
||||||
|
raise SessionExpiredError("Session expired.")
|
||||||
|
|
||||||
|
return remaining_seconds
|
||||||
|
|
||||||
|
def _generate_session_id(self) -> str:
|
||||||
|
"""Generate a high-entropy URL-safe session_id."""
|
||||||
|
return secrets.token_urlsafe(settings.ADDONS_RANDOM_TOKEN_BYTE_LENGTH)
|
||||||
|
|
||||||
|
def _generate_transit_token(self) -> str:
|
||||||
|
"""Generate a high-entropy URL-safe transit token."""
|
||||||
|
return secrets.token_urlsafe(settings.ADDONS_RANDOM_TOKEN_BYTE_LENGTH)
|
||||||
|
|
||||||
|
def init_session(self) -> tuple[str, str, str]:
|
||||||
|
"""Create a new pending session and its transit binding.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
(transit_token, session_id, csrf_token)
|
||||||
|
"""
|
||||||
|
session_id = self._generate_session_id()
|
||||||
|
transit_token = self._generate_transit_token()
|
||||||
|
csrf_token = self._derive_csrf_token(session_id)
|
||||||
|
|
||||||
|
expires_at = (
|
||||||
|
datetime.now(timezone.utc) + timedelta(seconds=settings.ADDONS_SESSION_TTL)
|
||||||
|
).isoformat()
|
||||||
|
|
||||||
|
session_data = {
|
||||||
|
"state": SessionState.PENDING,
|
||||||
|
"expires_at": expires_at,
|
||||||
|
"transit_token": transit_token,
|
||||||
|
}
|
||||||
|
|
||||||
|
cache.set(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id),
|
||||||
|
session_data,
|
||||||
|
settings.ADDONS_SESSION_TTL,
|
||||||
|
)
|
||||||
|
|
||||||
|
transit_token_data = {
|
||||||
|
"session_id": session_id,
|
||||||
|
"state": TransitTokenState.PENDING,
|
||||||
|
}
|
||||||
|
|
||||||
|
cache.set(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_TRANSIT, transit_token),
|
||||||
|
transit_token_data,
|
||||||
|
settings.ADDONS_TRANSIT_TOKEN_TTL,
|
||||||
|
)
|
||||||
|
|
||||||
|
return transit_token, session_id, csrf_token
|
||||||
|
|
||||||
|
def verify_csrf(self, session_id: str, submitted_csrf: str) -> None:
|
||||||
|
"""Constant-time verify submitted_csrf against HMAC(session_id). Raise on mismatch."""
|
||||||
|
expected_csrf = self._derive_csrf_token(session_id)
|
||||||
|
if not hmac.compare_digest(expected_csrf, submitted_csrf):
|
||||||
|
raise CSRFTokenError("Invalid CSRF token.")
|
||||||
|
|
||||||
|
def consume_transit_token(self, transit_token: str) -> str:
|
||||||
|
"""Mark transit token consumed and return its session_id.
|
||||||
|
|
||||||
|
A replay (second consume) evicts the session as a security cleanup and raises.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
TransitTokenError: If token is unknown, expired, or already consumed.
|
||||||
|
"""
|
||||||
|
cache_key = self._cache_key(settings.ADDONS_CACHE_PREFIX_TRANSIT, transit_token)
|
||||||
|
|
||||||
|
transit_token_data = cache.get(cache_key)
|
||||||
|
|
||||||
|
if transit_token_data is None:
|
||||||
|
# Indistinguishable from here: either the token was never issued (attacker
|
||||||
|
# probing or client bug) or it was issued but expired before consumption.
|
||||||
|
logger.warning(
|
||||||
|
"Transit token not found in cache (unknown or expired).",
|
||||||
|
)
|
||||||
|
raise TransitTokenError("Invalid or expired transit token.")
|
||||||
|
|
||||||
|
state = transit_token_data.get("state", None)
|
||||||
|
session_id = transit_token_data.get("session_id", None)
|
||||||
|
|
||||||
|
if not session_id:
|
||||||
|
logger.warning("Transit token data missing session_id.")
|
||||||
|
raise TransitTokenError("Invalid transit token.")
|
||||||
|
|
||||||
|
if state == TransitTokenState.CONSUMED:
|
||||||
|
logger.warning(
|
||||||
|
"Replay on session %s",
|
||||||
|
session_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Security cleanup: a replay attempt means the transit token leaked
|
||||||
|
# (or an attacker is probing). Evict the session so the authenticated
|
||||||
|
# tokens — if they exist — can no longer be polled.
|
||||||
|
cache.delete(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id)
|
||||||
|
)
|
||||||
|
|
||||||
|
raise TransitTokenError("Transit token already consumed.")
|
||||||
|
|
||||||
|
new_transit_token_data = {
|
||||||
|
"state": TransitTokenState.CONSUMED,
|
||||||
|
"session_id": session_id,
|
||||||
|
}
|
||||||
|
|
||||||
|
cache.set(
|
||||||
|
cache_key,
|
||||||
|
new_transit_token_data,
|
||||||
|
settings.ADDONS_SESSION_TTL,
|
||||||
|
)
|
||||||
|
|
||||||
|
return session_id
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_session_pending(session_data: dict) -> bool:
|
||||||
|
"""Return True if the public session dict is still in the pending state."""
|
||||||
|
return session_data.get("state") == SessionState.PENDING
|
||||||
|
|
||||||
|
def _get_session_data(self, session_id: str) -> dict:
|
||||||
|
"""Fetch raw session data from cache, or raise SessionNotFoundError."""
|
||||||
|
|
||||||
|
if not session_id:
|
||||||
|
raise SessionNotFoundError("Session not found.")
|
||||||
|
|
||||||
|
data = cache.get(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id)
|
||||||
|
)
|
||||||
|
if data is None:
|
||||||
|
raise SessionNotFoundError("Session not found.")
|
||||||
|
return data
|
||||||
|
|
||||||
|
def get_session(self, session_id: str) -> dict:
|
||||||
|
"""Return the public session view; evict the session on authenticated read.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SessionNotFoundError: If session is not found.
|
||||||
|
SessionDataError: If session data is missing the state field.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# raises if session is not found
|
||||||
|
session_data = self._get_session_data(session_id)
|
||||||
|
|
||||||
|
if "state" not in session_data:
|
||||||
|
raise SessionDataError("Invalid session data: missing state field.")
|
||||||
|
|
||||||
|
# One-time read: clear both bindings for authenticated sessions
|
||||||
|
if session_data["state"] == SessionState.AUTHENTICATED:
|
||||||
|
cache.delete(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Return public fields only
|
||||||
|
return {k: v for k, v in session_data.items() if k in _PUBLIC_SESSION_FIELDS}
|
||||||
|
|
||||||
|
def _validate_transit_token_state(self, session_data: dict) -> None:
|
||||||
|
"""Assert the session's transit token exists in cache and is in CONSUMED state.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SessionDataError: session_data is missing the transit_token field.
|
||||||
|
SuspiciousSessionError: transit entry is missing, or still pending (flow skipped).
|
||||||
|
"""
|
||||||
|
|
||||||
|
transit_token = session_data.get("transit_token", None)
|
||||||
|
if transit_token is None:
|
||||||
|
raise SessionDataError("Invalid session data: missing transit_token field.")
|
||||||
|
|
||||||
|
transit_token_data = cache.get(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_TRANSIT, transit_token)
|
||||||
|
)
|
||||||
|
|
||||||
|
if transit_token_data is None:
|
||||||
|
logger.warning("Transit token missing when setting access token.")
|
||||||
|
raise SuspiciousSessionError("Transit token not found.")
|
||||||
|
|
||||||
|
if transit_token_data.get("state") != TransitTokenState.CONSUMED:
|
||||||
|
logger.warning("Access token requested without completing transit flow.")
|
||||||
|
raise SuspiciousSessionError("Transit token not consumed.")
|
||||||
|
|
||||||
|
def set_access_token(self, user: User, session_id: str) -> None:
|
||||||
|
"""Authenticate a pending session by minting a JWT and storing it on the session.
|
||||||
|
|
||||||
|
Non-pending sessions are evicted as a security cleanup before raising.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SessionNotFoundError: If session doesn't exist.
|
||||||
|
SessionDataError: If session data is malformed.
|
||||||
|
SessionExpiredError: If session has expired.
|
||||||
|
SuspiciousSessionError: If session is not pending or transit wasn't consumed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# raises if session is not found
|
||||||
|
session_data = self._get_session_data(session_id)
|
||||||
|
|
||||||
|
if session_data.get("state") != SessionState.PENDING:
|
||||||
|
logger.warning(
|
||||||
|
"Session's state is not pending. Suspicious.",
|
||||||
|
)
|
||||||
|
# Security cleanup: evict the session so any cached tokens cannot be polled.
|
||||||
|
cache.delete(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id)
|
||||||
|
)
|
||||||
|
raise SuspiciousSessionError("Session is not in pending state.")
|
||||||
|
|
||||||
|
# raises if transit_token is invalid
|
||||||
|
try:
|
||||||
|
self._validate_transit_token_state(session_data)
|
||||||
|
except SuspiciousSessionError:
|
||||||
|
# Security cleanup: evict the session.
|
||||||
|
cache.delete(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id)
|
||||||
|
)
|
||||||
|
raise
|
||||||
|
|
||||||
|
# raises if session is expired
|
||||||
|
remaining_seconds = self._validate_session_not_expired(session_data)
|
||||||
|
|
||||||
|
response = self._token_service.generate_jwt(user, settings.ADDONS_TOKEN_SCOPE)
|
||||||
|
|
||||||
|
new_data = {
|
||||||
|
"access_token": response["access_token"],
|
||||||
|
"token_type": response["token_type"],
|
||||||
|
"expires_in": response["expires_in"],
|
||||||
|
"scope": response["scope"],
|
||||||
|
"expires_at": session_data["expires_at"],
|
||||||
|
"state": SessionState.AUTHENTICATED,
|
||||||
|
}
|
||||||
|
|
||||||
|
cache.set(
|
||||||
|
self._cache_key(settings.ADDONS_CACHE_PREFIX_SESSION, session_id),
|
||||||
|
new_data,
|
||||||
|
remaining_seconds,
|
||||||
|
)
|
||||||
@@ -0,0 +1,229 @@
|
|||||||
|
"""Add-ons API endpoints"""
|
||||||
|
|
||||||
|
from logging import getLogger
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.core.exceptions import SuspiciousOperation
|
||||||
|
|
||||||
|
from rest_framework import decorators, viewsets
|
||||||
|
from rest_framework import (
|
||||||
|
response as drf_response,
|
||||||
|
)
|
||||||
|
from rest_framework import status as drf_status
|
||||||
|
|
||||||
|
from core.addons.service import (
|
||||||
|
CSRFTokenError,
|
||||||
|
SessionDataError,
|
||||||
|
SessionExpiredError,
|
||||||
|
SessionNotFoundError,
|
||||||
|
SuspiciousSessionError,
|
||||||
|
TokenExchangeService,
|
||||||
|
TransitTokenError,
|
||||||
|
)
|
||||||
|
from core.api.feature_flag import FeatureFlag
|
||||||
|
from core.api.permissions import IsAuthenticated
|
||||||
|
|
||||||
|
logger = getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class SessionViewSet(viewsets.ViewSet):
|
||||||
|
"""ViewSet for managing add-on authentication sessions via token exchange.
|
||||||
|
|
||||||
|
Implements a three-step flow that lets a third-party add-on (running in an
|
||||||
|
embedded iframe) obtain an access token without exposing it to client-side
|
||||||
|
JavaScript:
|
||||||
|
|
||||||
|
1. /init: the add-on opens a session and receives a short-lived transit
|
||||||
|
token (used to bootstrap the OAuth-style exchange in a dialog) and a
|
||||||
|
CSRF token. The opaque session id is stored in an HttpOnly, Secure,
|
||||||
|
SameSite=None cookie so it can accompany cross-origin polls.
|
||||||
|
2. /poll: the add-on polls until the session transitions from pending to
|
||||||
|
authenticated. On the terminal read, the session payload (access
|
||||||
|
token, token type, expiry, etc.) is returned, the session is evicted
|
||||||
|
server-side, and the session cookie is cleared so the tokens can be
|
||||||
|
retrieved exactly once.
|
||||||
|
3. /exchange: called from the post-login callback page on our own domain,
|
||||||
|
after the user has authenticated in a dialog opened by the addon. The
|
||||||
|
transit token (carried client-side via postMessage + sessionStorage)
|
||||||
|
is redeemed here for the authenticated user's access token, which is
|
||||||
|
stored server-side against the session. Requires an authenticated
|
||||||
|
user — that user is whose access token gets bound to the session.
|
||||||
|
|
||||||
|
/init and /poll authenticate the caller through the session cookie +
|
||||||
|
CSRF token pair alone — no user login is required, since the whole point
|
||||||
|
of the flow is to bootstrap one. /exchange, by contrast, requires an
|
||||||
|
authenticated user and does not use the addonsSid cookie.
|
||||||
|
"""
|
||||||
|
|
||||||
|
throttle_classes = []
|
||||||
|
|
||||||
|
@decorators.action(
|
||||||
|
detail=False,
|
||||||
|
methods=["POST"],
|
||||||
|
url_path="init",
|
||||||
|
authentication_classes=[],
|
||||||
|
permission_classes=[],
|
||||||
|
)
|
||||||
|
@FeatureFlag.require("addons")
|
||||||
|
def init(self, request):
|
||||||
|
"""Open a new add-on authentication session.
|
||||||
|
|
||||||
|
Creates a fresh session server-side and returns the credentials the
|
||||||
|
add-on needs to drive the rest of the flow.
|
||||||
|
"""
|
||||||
|
|
||||||
|
transit_token, session_id, csrf_token = TokenExchangeService().init_session()
|
||||||
|
|
||||||
|
response = drf_response.Response(
|
||||||
|
{"transit_token": transit_token, "csrf_token": csrf_token},
|
||||||
|
status=drf_status.HTTP_201_CREATED,
|
||||||
|
)
|
||||||
|
|
||||||
|
# SameSite=None allows the cookie to be sent on cross-origin requests,
|
||||||
|
# which is required because the /poll endpoint is called from an iframe
|
||||||
|
# embedded in a third-party site. Secure=True is mandatory when SameSite=None.
|
||||||
|
# HttpOnly prevents JS access, so the cookie can only be read by the server.
|
||||||
|
response.set_cookie(
|
||||||
|
key=settings.ADDONS_SESSION_ID_COOKIE,
|
||||||
|
value=session_id,
|
||||||
|
max_age=settings.ADDONS_SESSION_TTL,
|
||||||
|
httponly=True,
|
||||||
|
secure=True,
|
||||||
|
samesite="None",
|
||||||
|
)
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
|
@decorators.action(
|
||||||
|
detail=False,
|
||||||
|
methods=["POST"],
|
||||||
|
url_path="poll",
|
||||||
|
authentication_classes=[],
|
||||||
|
permission_classes=[],
|
||||||
|
)
|
||||||
|
@FeatureFlag.require("addons")
|
||||||
|
def poll(self, request):
|
||||||
|
"""Poll a session for its current state and, if terminal, consume it.
|
||||||
|
|
||||||
|
Authenticates the caller using the addonsSid cookie (set by
|
||||||
|
/init) together with the X-CSRFToken header, which must match
|
||||||
|
the CSRF token issued for that session. The session id alone is not
|
||||||
|
sufficient — both must be presented and must correspond.
|
||||||
|
|
||||||
|
Behavior depends on the session's current state:
|
||||||
|
|
||||||
|
- **Pending**: the token exchange has not yet completed. Returns
|
||||||
|
202 Accepted with `{"state": "pending"}`. The cookie is preserved
|
||||||
|
so the add-on can keep polling.
|
||||||
|
- **Authenticated** (or any other terminal state): returns 200 OK
|
||||||
|
with the session payload (access token, token type, expiry, etc.)
|
||||||
|
and clears the `addonsSid` cookie. The session is also evicted
|
||||||
|
server-side on this terminal read, so the tokens can be retrieved
|
||||||
|
exactly once.
|
||||||
|
|
||||||
|
A CSRF mismatch is treated as a `SuspiciousOperation` rather than a
|
||||||
|
normal 4xx, so it is logged by Django's security middleware and
|
||||||
|
surfaced as a 400 without leaking which check failed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
session_id = request.COOKIES.get(settings.ADDONS_SESSION_ID_COOKIE)
|
||||||
|
submitted_csrf = request.headers.get("X-CSRFToken")
|
||||||
|
|
||||||
|
if not session_id:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Missing credentials."},
|
||||||
|
status=drf_status.HTTP_401_UNAUTHORIZED,
|
||||||
|
)
|
||||||
|
|
||||||
|
if not submitted_csrf:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Missing CSRF token."},
|
||||||
|
status=drf_status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
service = TokenExchangeService()
|
||||||
|
|
||||||
|
try:
|
||||||
|
service.verify_csrf(session_id, submitted_csrf)
|
||||||
|
except CSRFTokenError as e:
|
||||||
|
raise SuspiciousOperation(str(e)) from e
|
||||||
|
|
||||||
|
try:
|
||||||
|
session = service.get_session(session_id)
|
||||||
|
except SessionNotFoundError:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Session not found."},
|
||||||
|
status=drf_status.HTTP_404_NOT_FOUND,
|
||||||
|
)
|
||||||
|
except SessionDataError:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Invalid or expired session."},
|
||||||
|
status=drf_status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
if service.is_session_pending(session):
|
||||||
|
return drf_response.Response(
|
||||||
|
{"state": "pending"}, status=drf_status.HTTP_202_ACCEPTED
|
||||||
|
)
|
||||||
|
|
||||||
|
response = drf_response.Response(session, status=drf_status.HTTP_200_OK)
|
||||||
|
response.delete_cookie(
|
||||||
|
key=settings.ADDONS_SESSION_ID_COOKIE,
|
||||||
|
samesite="None",
|
||||||
|
)
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
|
@decorators.action(
|
||||||
|
detail=False,
|
||||||
|
methods=["POST"],
|
||||||
|
url_path="exchange",
|
||||||
|
permission_classes=[IsAuthenticated],
|
||||||
|
)
|
||||||
|
@FeatureFlag.require("addons")
|
||||||
|
def exchange(self, request):
|
||||||
|
"""Redeem a transit token for an access token bound to the current user.
|
||||||
|
|
||||||
|
Called from the post-OIDC callback page on our own domain. The transit
|
||||||
|
token was issued by /init, passed to the authentication dialog via
|
||||||
|
postMessage, stashed in sessionStorage, and read back by this page
|
||||||
|
after login completes.
|
||||||
|
|
||||||
|
The authenticated user (request.user) is whose access token gets stored
|
||||||
|
against the session. On success, the addon's next /poll will transition
|
||||||
|
from pending to authenticated and receive the token payload.
|
||||||
|
|
||||||
|
Transit tokens are single-use: a replayed token is rejected with 400.
|
||||||
|
"""
|
||||||
|
|
||||||
|
transit_token = request.data.get("transit_token")
|
||||||
|
if not transit_token:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Missing transit_token."},
|
||||||
|
status=drf_status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
service = TokenExchangeService()
|
||||||
|
|
||||||
|
try:
|
||||||
|
session_id = service.consume_transit_token(transit_token)
|
||||||
|
except TransitTokenError:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Invalid or expired transit token."},
|
||||||
|
status=drf_status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
service.set_access_token(request.user, session_id)
|
||||||
|
except SessionNotFoundError:
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Session not found."},
|
||||||
|
status=drf_status.HTTP_404_NOT_FOUND,
|
||||||
|
)
|
||||||
|
except (SessionDataError, SessionExpiredError, SuspiciousSessionError):
|
||||||
|
return drf_response.Response(
|
||||||
|
{"detail": "Invalid or expired session."},
|
||||||
|
status=drf_status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
return drf_response.Response({"status": "ok"}, status=drf_status.HTTP_200_OK)
|
||||||
@@ -3,17 +3,55 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib import admin, messages
|
from django.contrib import admin, messages
|
||||||
from django.contrib.auth import admin as auth_admin
|
from django.contrib.auth import admin as auth_admin
|
||||||
|
from django.db import transaction
|
||||||
|
from django.utils.html import format_html
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from core.recording.event import notification
|
from core.recording.event import notification
|
||||||
|
|
||||||
from . import models
|
from . import models
|
||||||
|
from .tasks.file import process_file_deletion
|
||||||
|
from .utils import generate_download_s3_url
|
||||||
|
|
||||||
|
|
||||||
|
def hard_delete_file(file):
|
||||||
|
"""Hard delete a file, soft deleting it first when needed."""
|
||||||
|
if file.deleted_at is None:
|
||||||
|
file.soft_delete()
|
||||||
|
file.hard_delete()
|
||||||
|
transaction.on_commit(lambda: process_file_deletion.delay(file.id))
|
||||||
|
|
||||||
|
|
||||||
|
class FileInlineFormSet(forms.BaseInlineFormSet):
|
||||||
|
"""Inline formset overriding delete behavior for files."""
|
||||||
|
|
||||||
|
def delete_existing(self, obj, commit=True):
|
||||||
|
"""Hard delete files instead of calling model.delete()."""
|
||||||
|
hard_delete_file(obj)
|
||||||
|
|
||||||
|
|
||||||
|
class FileInline(admin.TabularInline):
|
||||||
|
"""Inline class for the File model."""
|
||||||
|
|
||||||
|
model = models.File
|
||||||
|
formset = FileInlineFormSet
|
||||||
|
fk_name = "creator"
|
||||||
|
extra = 0
|
||||||
|
fields = ("id", "title", "type", "upload_state", "created_at")
|
||||||
|
readonly_fields = ("id", "created_at", "upload_state", "type")
|
||||||
|
show_change_link = True
|
||||||
|
|
||||||
|
def get_queryset(self, request):
|
||||||
|
"""Hide hard deleted files in the inline."""
|
||||||
|
return super().get_queryset(request).filter(hard_deleted_at__isnull=True)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.User)
|
@admin.register(models.User)
|
||||||
class UserAdmin(auth_admin.UserAdmin):
|
class UserAdmin(auth_admin.UserAdmin):
|
||||||
"""Admin class for the User model"""
|
"""Admin class for the User model"""
|
||||||
|
|
||||||
|
inlines = (FileInline,)
|
||||||
|
|
||||||
fieldsets = (
|
fieldsets = (
|
||||||
(
|
(
|
||||||
None,
|
None,
|
||||||
@@ -97,6 +135,136 @@ class UserAdmin(auth_admin.UserAdmin):
|
|||||||
search_fields = ("id", "sub", "admin_email", "email", "full_name")
|
search_fields = ("id", "sub", "admin_email", "email", "full_name")
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(models.File)
|
||||||
|
class FileAdmin(admin.ModelAdmin):
|
||||||
|
"""Admin class for the File model."""
|
||||||
|
|
||||||
|
list_display = (
|
||||||
|
"id",
|
||||||
|
"title",
|
||||||
|
"type",
|
||||||
|
"creator",
|
||||||
|
"upload_state",
|
||||||
|
"deleted_at",
|
||||||
|
"hard_deleted_at",
|
||||||
|
"created_at",
|
||||||
|
"updated_at",
|
||||||
|
)
|
||||||
|
list_filter = (
|
||||||
|
"type",
|
||||||
|
"upload_state",
|
||||||
|
"created_at",
|
||||||
|
"updated_at",
|
||||||
|
"deleted_at",
|
||||||
|
"hard_deleted_at",
|
||||||
|
)
|
||||||
|
search_fields = (
|
||||||
|
"id",
|
||||||
|
"title",
|
||||||
|
"filename",
|
||||||
|
"mimetype",
|
||||||
|
"description",
|
||||||
|
"creator__email",
|
||||||
|
"creator__admin_email",
|
||||||
|
"creator__full_name",
|
||||||
|
)
|
||||||
|
ordering = ("-created_at",)
|
||||||
|
readonly_fields = (
|
||||||
|
"id",
|
||||||
|
"created_at",
|
||||||
|
"updated_at",
|
||||||
|
"deleted_at",
|
||||||
|
"hard_deleted_at",
|
||||||
|
"description",
|
||||||
|
"malware_detection_info",
|
||||||
|
"is_ready",
|
||||||
|
"preview_url",
|
||||||
|
"extension",
|
||||||
|
"key_base",
|
||||||
|
"file_key",
|
||||||
|
"upload_state",
|
||||||
|
"type",
|
||||||
|
"mimetype",
|
||||||
|
"size",
|
||||||
|
)
|
||||||
|
autocomplete_fields = ("creator",)
|
||||||
|
fieldsets = (
|
||||||
|
(
|
||||||
|
None,
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"id",
|
||||||
|
"title",
|
||||||
|
"type",
|
||||||
|
"creator",
|
||||||
|
"filename",
|
||||||
|
"upload_state",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
_("Content"),
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"mimetype",
|
||||||
|
"size",
|
||||||
|
"description",
|
||||||
|
"malware_detection_info",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
_("Deletion"),
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"deleted_at",
|
||||||
|
"hard_deleted_at",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
_("Derived info"),
|
||||||
|
{
|
||||||
|
"fields": (
|
||||||
|
"is_ready",
|
||||||
|
"extension",
|
||||||
|
"key_base",
|
||||||
|
"file_key",
|
||||||
|
"preview_url",
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(_("Timestamps"), {"fields": ("created_at", "updated_at")}),
|
||||||
|
)
|
||||||
|
|
||||||
|
@admin.display(description=_("File preview"))
|
||||||
|
def preview_url(self, obj):
|
||||||
|
"""Return a clickable preview URL for the file."""
|
||||||
|
if not obj.is_ready:
|
||||||
|
return "-"
|
||||||
|
url = generate_download_s3_url(obj.key, expires_in=60 * 60)
|
||||||
|
|
||||||
|
return format_html(
|
||||||
|
'<a href="{}" target="_blank" rel="noopener noreferrer">Open File</a>', url
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_queryset(self, request):
|
||||||
|
"""Hide hard deleted files in admin listing and lookups."""
|
||||||
|
return super().get_queryset(request).filter(hard_deleted_at__isnull=True)
|
||||||
|
|
||||||
|
def delete_model(self, request, obj):
|
||||||
|
"""Hard delete instead of calling model.delete()."""
|
||||||
|
hard_delete_file(obj)
|
||||||
|
|
||||||
|
def delete_queryset(self, request, queryset):
|
||||||
|
"""Hard delete all selected files."""
|
||||||
|
for file in queryset:
|
||||||
|
hard_delete_file(file)
|
||||||
|
|
||||||
|
def has_add_permission(self, request):
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class ResourceAccessInline(admin.TabularInline):
|
class ResourceAccessInline(admin.TabularInline):
|
||||||
"""Admin class for the room user access model"""
|
"""Admin class for the room user access model"""
|
||||||
|
|
||||||
@@ -115,6 +283,10 @@ class RoomAdmin(admin.ModelAdmin):
|
|||||||
list_filter = ["access_level", "created_at"]
|
list_filter = ["access_level", "created_at"]
|
||||||
readonly_fields = ["id", "created_at", "updated_at"]
|
readonly_fields = ["id", "created_at", "updated_at"]
|
||||||
|
|
||||||
|
def get_queryset(self, request):
|
||||||
|
"""Optimize queries by prefetching related access and user data to avoid N+1 queries."""
|
||||||
|
return super().get_queryset(request).prefetch_related("accesses__user")
|
||||||
|
|
||||||
def get_owner(self, obj):
|
def get_owner(self, obj):
|
||||||
"""Return the owner of the room for display in the admin list."""
|
"""Return the owner of the room for display in the admin list."""
|
||||||
|
|
||||||
@@ -138,6 +310,7 @@ class RecordingAccessInline(admin.TabularInline):
|
|||||||
|
|
||||||
model = models.RecordingAccess
|
model = models.RecordingAccess
|
||||||
extra = 0
|
extra = 0
|
||||||
|
autocomplete_fields = ["user"]
|
||||||
|
|
||||||
|
|
||||||
@admin.action(description=_("Resend notification to external service"))
|
@admin.action(description=_("Resend notification to external service"))
|
||||||
@@ -192,6 +365,38 @@ def resend_notification(modeladmin, request, queryset): # pylint: disable=unuse
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@admin.action(description=_("Mark selected recordings as 'Failed to Stop'"))
|
||||||
|
def mark_as_failed_to_stop(modeladmin, request, queryset):
|
||||||
|
"""Force selected recordings status to failed_to_stop."""
|
||||||
|
|
||||||
|
eligible_statuses = [
|
||||||
|
models.RecordingStatusChoices.ACTIVE,
|
||||||
|
models.RecordingStatusChoices.INITIATED,
|
||||||
|
models.RecordingStatusChoices.STOPPED,
|
||||||
|
]
|
||||||
|
|
||||||
|
eligible = queryset.filter(status__in=eligible_statuses)
|
||||||
|
skipped = queryset.exclude(status__in=eligible_statuses).count()
|
||||||
|
|
||||||
|
updated = eligible.update(status=models.RecordingStatusChoices.FAILED_TO_STOP)
|
||||||
|
|
||||||
|
if updated > 0:
|
||||||
|
modeladmin.message_user(
|
||||||
|
request,
|
||||||
|
_("%(count)s recording(s) successfully marked as 'Failed to Stop'.")
|
||||||
|
% {"count": updated},
|
||||||
|
level=messages.SUCCESS,
|
||||||
|
)
|
||||||
|
|
||||||
|
if skipped > 0:
|
||||||
|
modeladmin.message_user(
|
||||||
|
request,
|
||||||
|
_("Skipped %(count)s recording(s) with an ineligible status.")
|
||||||
|
% {"count": skipped},
|
||||||
|
level=messages.WARNING,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Recording)
|
@admin.register(models.Recording)
|
||||||
class RecordingAdmin(admin.ModelAdmin):
|
class RecordingAdmin(admin.ModelAdmin):
|
||||||
"""Recording admin interface declaration."""
|
"""Recording admin interface declaration."""
|
||||||
@@ -207,9 +412,19 @@ class RecordingAdmin(admin.ModelAdmin):
|
|||||||
"created_at",
|
"created_at",
|
||||||
"worker_id",
|
"worker_id",
|
||||||
)
|
)
|
||||||
list_filter = ["status", "room", "created_at"]
|
list_filter = ["created_at"]
|
||||||
readonly_fields = ["id", "created_at", "updated_at"]
|
list_select_related = ("room",)
|
||||||
actions = [resend_notification]
|
readonly_fields = (
|
||||||
|
"id",
|
||||||
|
"created_at",
|
||||||
|
"options",
|
||||||
|
"mode",
|
||||||
|
"room",
|
||||||
|
"status",
|
||||||
|
"updated_at",
|
||||||
|
"worker_id",
|
||||||
|
)
|
||||||
|
actions = [resend_notification, mark_as_failed_to_stop]
|
||||||
|
|
||||||
def get_queryset(self, request):
|
def get_queryset(self, request):
|
||||||
"""Optimize queries by prefetching related access and user data to avoid N+1 queries."""
|
"""Optimize queries by prefetching related access and user data to avoid N+1 queries."""
|
||||||
@@ -261,7 +476,7 @@ class ApplicationAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
form = ApplicationAdminForm
|
form = ApplicationAdminForm
|
||||||
|
|
||||||
list_display = ("id", "name", "client_id", "get_scopes_display")
|
list_display = ("id", "name", "client_id", "get_scopes_display", "is_active")
|
||||||
fields = [
|
fields = [
|
||||||
"name",
|
"name",
|
||||||
"id",
|
"id",
|
||||||
@@ -270,6 +485,7 @@ class ApplicationAdmin(admin.ModelAdmin):
|
|||||||
"scopes",
|
"scopes",
|
||||||
"client_id",
|
"client_id",
|
||||||
"client_secret",
|
"client_secret",
|
||||||
|
"is_active",
|
||||||
]
|
]
|
||||||
readonly_fields = ["id", "created_at", "updated_at"]
|
readonly_fields = ["id", "created_at", "updated_at"]
|
||||||
inlines = [ApplicationDomainInline]
|
inlines = [ApplicationDomainInline]
|
||||||
|
|||||||