From 206ee3c70cbdd148a7c4fac50694638ec7986f92 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Tue, 5 Mar 2024 14:33:51 -0500
Subject: [PATCH 01/36] Version bump and disabled automatic action for JOSS
 paper draft

---
 .github/workflows/draft-joss-paper-pdf.yml | 2 --
 docs/conf.py                               | 2 +-
 teraserver/CMakeLists.txt                  | 2 +-
 teraserver/python/setup.py                 | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/draft-joss-paper-pdf.yml b/.github/workflows/draft-joss-paper-pdf.yml
index 29ca38a9..91ffdc70 100644
--- a/.github/workflows/draft-joss-paper-pdf.yml
+++ b/.github/workflows/draft-joss-paper-pdf.yml
@@ -1,8 +1,6 @@
 name: JOSS Paper Draft PDF
 
 on:
-  push:
-    branches: [main, joss-paper-review]
   workflow_dispatch:
     branches: [main, joss-paper-review]
 
diff --git a/docs/conf.py b/docs/conf.py
index 92e18e08..c2f7e4b2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'OpenTera'
 copyright = '2023, Simon Brière, Dominic Létourneau'
 author = 'Simon Brière, Dominic Létourneau'
-release = '1.2.4'
+release = '1.2.5'
 version = release
 
 html_logo = 'images/LogoOpenTera200px.png'
diff --git a/teraserver/CMakeLists.txt b/teraserver/CMakeLists.txt
index 6df8d0a0..2f180e7f 100755
--- a/teraserver/CMakeLists.txt
+++ b/teraserver/CMakeLists.txt
@@ -10,7 +10,7 @@ endif(NOT CMAKE_BUILD_TYPE)
 # Software version
 SET(OPENTERA_VERSION_MAJOR "1")
 SET(OPENTERA_VERSION_MINOR "2")
-SET(OPENTERA_VERSION_PATCH "5")
+SET(OPENTERA_VERSION_PATCH "6")
 
 SET(OPENTERA_SERVER_VERSION OpenTera_v${OPENTERA_VERSION_MAJOR}.${OPENTERA_VERSION_MINOR}.${OPENTERA_VERSION_PATCH})
 
diff --git a/teraserver/python/setup.py b/teraserver/python/setup.py
index 0ac132c2..800f9e3c 100644
--- a/teraserver/python/setup.py
+++ b/teraserver/python/setup.py
@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="opentera",
-    version="1.2.5",
+    version="1.2.6",
     author="Dominic Létourneau, Simon Brière",
     author_email="dominic.letourneau@usherbrooke.ca, simon.briere@usherbrooke.ca",
     description="OpenTera base package",

From e69cd12f5c5c4106f276f2f4fa3e45ec3562df54 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Tue, 5 Mar 2024 14:34:56 -0500
Subject: [PATCH 02/36] Merged conf.py version bump

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3f2a6a88..30aabf21 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'OpenTera'
 copyright = '2024, Simon Brière, Dominic Létourneau'
 author = 'Simon Brière, Dominic Létourneau'
-release = '1.2.5'
+release = '1.2.6'
 version = release
 
 html_logo = 'images/LogoOpenTera200px.png'

From 4b38dded20936d2290585f77fa382061dd82861f Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Tue, 2 Apr 2024 12:56:31 -0400
Subject: [PATCH 03/36] Refs #244. VideoRehab - Added "play", "pause" and
 "stop" features to chronometers / countdowns.

---
 .../easyrtc/protected/index_participants.html |   6 +-
 teraserver/easyrtc/protected/index_users.html |  17 +-
 teraserver/easyrtc/static/css/teraplus.css    | 129 ++++++------
 teraserver/easyrtc/static/images/minus.png    | Bin 0 -> 1551 bytes
 teraserver/easyrtc/static/images/pause.png    | Bin 0 -> 1640 bytes
 teraserver/easyrtc/static/images/play.png     | Bin 0 -> 1755 bytes
 teraserver/easyrtc/static/images/plus.png     | Bin 0 -> 1715 bytes
 teraserver/easyrtc/static/images/stop.png     | Bin 0 -> 1512 bytes
 .../includes/video_user_remote_view.html      |   9 +-
 teraserver/easyrtc/static/js/tera_tools.js    | 185 +++++++++++-------
 teraserver/easyrtc/static/js/tera_ui.js       |  31 ++-
 teraserver/easyrtc/static/js/tera_webrtc.js   |  31 +--
 .../API/user/UserQueryParticipants.py         |   1 -
 13 files changed, 242 insertions(+), 167 deletions(-)
 create mode 100644 teraserver/easyrtc/static/images/minus.png
 create mode 100644 teraserver/easyrtc/static/images/pause.png
 create mode 100644 teraserver/easyrtc/static/images/play.png
 create mode 100644 teraserver/easyrtc/static/images/plus.png
 create mode 100644 teraserver/easyrtc/static/images/stop.png

diff --git a/teraserver/easyrtc/protected/index_participants.html b/teraserver/easyrtc/protected/index_participants.html
index 0b62ef0e..b4ca2cf7 100644
--- a/teraserver/easyrtc/protected/index_participants.html
+++ b/teraserver/easyrtc/protected/index_participants.html
@@ -235,9 +235,9 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
             </div>
         </div>
         <div class="col-8 h-100" id="largeView">
-            <!-- Text display -->
-            <div id="localDisplay1" class="overlay-top-center" style="display:none">
-                <label class="chrono-large" id="localText1">Temps restant: xx:xx</label>
+            <!-- Chrono display -->
+            <div id="localChrono1" class="overlay-top-center" style="display:none">
+                <label class="chrono-large" id="localChronoText1">Temps restant: xx:xx</label>
             </div>
         </div>
         <div class="col-2 h-100" id="remoteViews">
diff --git a/teraserver/easyrtc/protected/index_users.html b/teraserver/easyrtc/protected/index_users.html
index 7b0a4268..e2bb069e 100644
--- a/teraserver/easyrtc/protected/index_users.html
+++ b/teraserver/easyrtc/protected/index_users.html
@@ -121,14 +121,14 @@ <h5 class="modal-title" id="chronosDialogLongTitle" data-i18n="chronosDialog.tit
                         <label for="chronosPartSelect" class="col-form-label col-4" data-i18n="chronosDialog.participants">Participant(s): </label>
                         <select id="chronosPartSelect" class="col combobox"></select>
                     </div>
-                    <div class="form-group row pr-2">
+                    <!--<div class="form-group row pr-2">
                         <label for="chronosTitleSelect" class="col-form-label col-4" data-i18n="chronosDialog.chrono-label">Libellé: </label>
                         <select id="chronosTitleSelect" class="col combobox">
                             <option value="" data-i18n="chronosDialog.label-none" selected>(Aucun)</option>
                             <option value="Exercices" data-i18n="chronosDialog.label-exercices">Exercices</option>
                             <option value="Repos" data-i18n="chronosDialog.label-rest">Repos</option>
                         </select>
-                    </div>
+                    </div>-->
                     <div class="form-group row pr-2">
                         <label class="col-form-label col-4" data-i18n="chronosDialog.chrono-type">Type: </label>
                         <div id="chronosTypeRadio" class="col col-form-label pl-0">
@@ -147,9 +147,9 @@ <h5 class="modal-title" id="chronosDialogLongTitle" data-i18n="chronosDialog.tit
                             <option value="600">10:00</option>
                             <option value="900">15:00</option>
                         </select>-->
-                        <input id="chronosDurationMinutes" class="col-2" type="number" min="0" max="55" step="1" value="0" />
+                        <input id="chronosDurationMinutes" class="col-2" type="number" min="0" max="55" step="1" value="2" />
                         <label class="col-form-label col-2" data-i18n="chronosDialog.minutes">minutes</label>
-                        <input id="chronosDurationSeconds" class="col-2" type="number" min="0" max="55" step="5" value="30" />
+                        <input id="chronosDurationSeconds" class="col-2" type="number" min="0" max="55" step="5" value="0" />
                         <label class="col-form-label col-2" data-i18n="chronosDialog.seconds">secondes</label>
                     </div>
                 </form>
@@ -250,9 +250,12 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
                         <input id="localBtnSwapVideo1" class="image-icon" type="image" alt="image" src="images/swap.png" onclick="enlargeView(true,1);event.stopPropagation();" style="display: none;"/>
                     </div>
 
-                    <!-- Text display -->
-                    <div id="localDisplay1" class="overlay-top-center" style="display:none">
-                        <label class="chrono" id="localText1" onclick="stopChrono(true, 1);">Temps restant: xx:xx</label>
+                    <!-- Chrono display -->
+                    <div id="localChrono1" class="overlay-top-center" style="display:none">
+                        <label class="chrono" id="localChronoText1">Temps restant: xx:xx</label>
+                        <input class="image-icon chrono-button" id="localChronoPlay1" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
+                        <input class="image-icon chrono-button" id="localChronoPause1" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(true,1);"/>
+                        <input class="image-icon chrono-button" id="localChronoStop1" type="image" alt="image" src="images/stop.png" onclick="stopChrono(true, 1);"/>
                     </div>
 
                     <!-- Micro, video, sensors, ... controls -->
diff --git a/teraserver/easyrtc/static/css/teraplus.css b/teraserver/easyrtc/static/css/teraplus.css
index 6ebf93f1..33175378 100644
--- a/teraserver/easyrtc/static/css/teraplus.css
+++ b/teraserver/easyrtc/static/css/teraplus.css
@@ -179,6 +179,8 @@ video {
 	padding-left: 10px;
 	padding-right: 10px;
 	border-radius: 10px;
+	vertical-align: middle;
+	margin: 0;
 }
 
 .chrono-large{
@@ -190,52 +192,49 @@ video {
 	border-radius: 10px;
 }
 
+.chrono-button{
+	vertical-align: middle;
+}
+
+.overlay {
+	height: 0;
+	width: 100%;
+	position: absolute;
+	z-index: 2;
+	top: 0;
+	left: 0;
+	margin: 0;
+	background-color: rgba(0,0,0,0);
+	overflow-x: hidden;
+	display: block;
+	/*transition: height 0.5s;*/
+}
+
+.overlay-right {
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 10%;
+	max-width: 48px;
+	height: 95%;
+	padding: 5px;
+	background-color: rgba(0,0,0,0.5);
+	transform: translate(0%, 50%);
+}
+
+
+
+.overlay-middle-left {
+	position: relative;
+	height: 100px;
+	width: 50px;
+	padding: 5px;
+	background-color: rgba(0,0,0,0);
+	float: left;
+	margin-left:10px;
+	top: 50%;
+}
 
-		.overlay {
-			height: 0;
-			width: 100%;
-			position: absolute;
-			z-index: 2;
-			top: 0;
-			left: 0;
-			margin: 0;
-			background-color: rgba(0,0,0,0);
-			overflow-x: hidden;
-			display: block;
-			/*transition: height 0.5s;*/
-		}
-
-
-
-
-		
-		.overlay-right {
-			position: absolute;
-			right: 0;
-			top: 0;
-			width: 10%;
-			max-width: 48px;
-			height: 95%;
-			padding: 5px;
-			background-color: rgba(0,0,0,0.5);
-			transform: translate(0%, 50%);
-		}
-		
-
-		
-		.overlay-middle-left {
-			position: relative;
-			height: 100px;
-			width: 50px;
-			padding: 5px;
-			background-color: rgba(0,0,0,0);
-			float: left;
-			margin-left:10px;
-			top: 50%;
-		}
-		
-
-		
 .overlay-bottom-center {
 	position: absolute;
 	left: 50%;
@@ -248,26 +247,26 @@ video {
 	text-align: center;
 	z-index: 3;
 }
-		
-		.overlay a {
-			padding: 8px;
-			text-decoration: none;
-			font-size: 36px;
-			color: #818181;
-			display: block;
-			/*transition: 0.3s;*/
-		}
-
-		.overlay a:hover, .overlay a:focus {
-			color: #f1f1f1;
-		}
-
-		.overlay .closebtn {
-			position: absolute;
-			top: 20px;
-			right: 45px;
-			font-size: 60px;
-		}
+
+.overlay a {
+	padding: 8px;
+	text-decoration: none;
+	font-size: 36px;
+	color: #818181;
+	display: block;
+	/*transition: 0.3s;*/
+}
+
+.overlay a:hover, .overlay a:focus {
+	color: #f1f1f1;
+}
+
+.overlay .closebtn {
+	position: absolute;
+	top: 20px;
+	right: 45px;
+	font-size: 60px;
+}
 
 .videoMirror {
 	-webkit-transform: scaleX(-1);
diff --git a/teraserver/easyrtc/static/images/minus.png b/teraserver/easyrtc/static/images/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e41baa08db588d5d5029a4c2ac8f91449c8f15d5
GIT binary patch
literal 1551
zcmZ`(Yfw{X5Z!xkAiP3?K|l})k%x+C2q;d}5Re$rMv;dCB1D5g)D*3NPy{~}-?oH^
zk6J`56{Ubij5b=7D2380HBc2FSWt9^hll~S<q|^U^oP?Q-Pzr<XJ^mspPfAru}nm>
za<&2hTKM9yNC4ba;((blbP&C(Oh8Eu5r+U=DzrANH8XLRbaA8@;7cz6v>RY#+=RUV
znH+#V2>|Z|fMdEcsd15M7SD)W76p)Xq-E|$wr;5?46tVhncth3<>tk4TLG+@9|MDv
zB~GR$H6vUsr1ns78`=bKQPq0W`gh@BA<@}S22O>1?&5DFlqNqHW3C~h*4CHhBUAai
zjwL#kX01@akM#^5OJz5D6|K=y=_6jt*}eVUQ`n#E#nI+F7d6Teiicl)`Hf>cVvRrd
zdI?6XH8+&w*9^?mH$>e#J2$@8*WDu+H`FAoeBKg#0duS<m{qJ-&2K!Aiw_1Ar=r10
z$CfFUcjfNwAhOlbxoBSLj@av4UM%UF7W#&G%f8QtnY$wJIt!5{a`0FRYKs^g2^mX~
z!}BQf5)XkAqv7_GP>W@ZxgaKb!~Ph36v2x5%o!@zJ%s%ZRpx>pH0MJeGAduJpeAU%
zS@Nkot;5y_SeA>!lxo9nv$<Qus;7z>=)vAiSaoZJsSx>gZrJ^pQbjvGr|WKJYhU?e
zVO3#@V-5f08Z{X!M|`(|?Q1NMO@;?>b$g&$;20VTCmCE^R}jHK-USCC(1SH{lEIpk
z7K)O~EHULy?}7p>*(2G8Wqn2haTXJaj=u=WNUc)f`s)%r)6>`Teo?ijvmyd{HXg=3
zr#aZO!Y_S?MiU`0Ny(lO7Jg90@S4^JvHO+wOxv_k;M(?Vyw-)D^3g$pjBgq?^Scbc
zMD)<j_bEr?E3mK6=-h1rSvhdymSO?wcSA3*jt>w`@489V9_e%y&(O|x%55kz*O*Jw
z=e9w+<TXv?tk{mOE?|v9`vBHR)yV1R`P#f(G^;+KbRSXj$F1Q4!N0(9>nd4ZnriQ?
zs6%sHS-DtyFEm<f#MJYN+B_Z#8ka>*w%vTMvOn%U4c>(3Ebyzxv}0FP#&y|*V2Fr^
zmFP7!fl%T0!CelfJAXje)CYALy32=;NRY~WE5d5%vG3!t1d3oK(Cc}Y=t28&8^%!k
zAg~1qkqZ#y#5hr!``acGfp!rbt&s9^7G5G0+y)=J&4!uazvJwy9PGD6#}@+rHWTTk
zJE<jM+8@7Z`<=~Niw;>dCsESaWfCC!Pvze#OWM+Ne1>uM@;>PzEYkfDo}I=Rs}<M3
zk=mgatdV|Vpl}fGzCB$X1fIcVW)d@}@y;<l(pSyz#=2LHHW5u1$syF&ayngqGaDP0
zpJ`6iZg+`OI_fHj!<|QF=O;PSoa*OoHrR%{MdXdldmZJ+*V^W0UZ$%W@?X6q)B{-e
zUp0lDKLr~NxBm{9%q)>kbJNaD&8elT?&MUw#MHJDLuIYrr@yCRXZO9JAyJ^U?W5je
zSraz4r>uZ@!Us|_^f$Bp-I*=qBa-4XXl<o%un(|O91CPxrQwn~Dn%|0agpg(x-m6H
z_BO1Gn^H}w#>Yk%2J(#yUHWwo`RZ$o^z>*3N>LTtp%i^FLl6b(mWgt;aCKg5inQ)o
z+$HS#^Z2XS^;fHFF|nEM>Nd6BO+F_2mOk`hUy8dQvFLJP3+TLy)iiJU&%dtT>71u-
zS^U+USn(sR;^@_avtn7!>W*rRAx*qO%VN&q_*4uO$#$pw$&RmNM>fzl)ym30e=@x!
z$oJepo2()03AZ$;=A3+3)}2rGfpG{YNeYQmjaHWA1Z&cnMzZO~>2@TSY2-~LLmkN_
zlZ=rrWW1|!ojbX~!}!G%<Ckamf3k62K0Z@g)nu_kwAAzxy)uNc8Odui*7KxatTzF0
zIov=$j>);v{#>4a0MDQ6%i-`ioZ9II-hTx0^ki8|&i@M<wuS9A2_Rg!EbKz4WY<60
C>~?Yh

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/images/pause.png b/teraserver/easyrtc/static/images/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1f11a35c575b9ca129d7413846db8cd3d6b9d2
GIT binary patch
literal 1640
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

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/images/play.png b/teraserver/easyrtc/static/images/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c01a3a39708f492e271a8f3f0e5e3ba57646516
GIT binary patch
literal 1755
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
O;Osl-diP8IKmPzw$LUD`

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/images/plus.png b/teraserver/easyrtc/static/images/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a9588e5e746d08119b0c05b9d43f711a8738ab
GIT binary patch
literal 1715
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
XpZ@;^%AXTwjRGJD2=Q<76=(eyUp&Gw

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/images/stop.png b/teraserver/easyrtc/static/images/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..23031176d877baf134aac16a37175bc17f6f24c7
GIT binary patch
literal 1512
zcmZ`(dpML?7(Zub%;!38k-Hg97a`NE(B$&X7>u=YO{6Dd&`lWARIVB6N;FuqQB8!9
zP-8spQ}!!c#M(wl)}Xd_%jFT>6|MdHXZP7Z_I=*-{(isroZs{QbIv&tw9!{b(@YZp
zpyS8mh5$goDFHydf)V1xW*kU6*a2(+T2E;$#Hit#8p{g_03dxi0Fqn)J}u%n0l+>6
z0F!(GSmgjLO)ieU<Aa|ih(k7p0<gcN&-JSk`1^7J9L+Plh${^tFLEycT83X21ZOHu
z@FpVm3-Ct9Nd#>TC+Ui*N_>2uAD11LIy`+g;OaAm_TdW=E${R*mss~%6jTdIj*&rs
z^a*xv7w)MqE$p@R8Gf@+#7ngD6itcW%>Elg1}UG60!8j@_1>9Ps=@Q8JyTR9UN&rY
zm~!m(OnJG6|8RNcR;<kb_<4|FdwTWdspfT0Z(S66nceSQoit(@F+*#Dii`*|_E^re
zl|YN%ACd&e=03lDaMJuV!QVh&E?G%yhe89EEmk6&hD!R+Rv>`$3Sx9|sAR?O50DWW
zI!@Fi@v^{&GtzmmDxX7Xwckbu#doMsYVV^V*}2vq(DU<6;wVM-+v2fYJ3`1&I#IlK
zhpFszOfV-Zdl0x>QBOBLL{|3bt&=Fsi^<B#OHGe^WX5c}PH$x7`s&^L!Wu6<3T~<j
z_ifADVtI`s{aD?x&6q$XMygA+<7j{>J));4p&vdD=rlTsszF-@{M5VC{nVw}bQ;Q(
z9tQVN0}ckVXk2aOQqFCh#A(l3A=u!@Qqtt5W_pls*76+Iq}>TJX^FB#z=iI%E4~sR
zI1>!SS%G;idKn>yj|`RA=t%G?z+k*K^_fIbW=KgbfN>VeL1srsb-XcuNOQW6A0&$E
zb;4SVhAVQ&BrRE+X_eZn1>_lH2_$M1n9&ElpI;;iU~S*faG?_>H;qyik;|Q96E-}M
z@QL4lf&JvvSGqiBEFl|Jz_EGao+<PBG#3AhXtwpqV8;7e*f1)31RCp<Nw2SfaE_l3
zS`XQ9;NzUD>EhD{w_B42324?4yR!q4_DtF9pB#0`+?u>bmPb7L+~GSX*kh&_hh8OY
zV?J#qZ$*d=HlvRv-{#G9LJ#Z2ESvi1YlUQ26>Lu?4m79M`GjSQ7M-z2l+;Xf>JYpG
zji|#g5DAmSAvY|9uBd`IMw#=#1c*IFC?Q%r1&AvKDMBn2-zogCT?IFQVoRZ1_X)-I
zwo7C*P~VTHplaod(|=`R3(;vWh%Xk0U91_4o1?9yH8$-RMK`Qx9=_~6wT>@FxN55s
zP$}%!G#Tv{B-hlh5prCD)LLAe`W-fjLzj+*D>7m$uD2B?y{cAey*$8sBiR$>DGOZp
z8z83dtJY!2qSp_B_-t&U<Nc?b^Kb7v{^Hr0BH3$yk6<DyTe$^z{rZiXmdpvf4J_^R
zjP$jpRAzS+c~<=(#AKnh`iNY&hinma7mPpec^kO(;jz0Du~Ud^+W8>#z8kelaxROF
z!Wv@v3}mY!ls;zi(k?i{Ga!$fH{iFdU94du6GM5EPU2;+sCnfJ&W)SF98i2Kgp0q8
zP!xCrrSoQazj5Mw?}~!g`*-*u-A5CGk?yi&HnKz?RgLxE&5*yhPW0$jSvTw(&^CF*
zGFC$?f*v@R%k@_#t2GP+yDZz(BQuIYyuybK%A9NdOiZaJp(oSsFvq=zZdH~md~0>i
zq~-6V<?|>9TJF^r{J5)8ICi;G;a{ht+SQvnCO@a>t1FnF=!Xllg!D{;JC<WjW9zoc
zx^^ma-R6RA-Z2ahR%*H{k677u>b70znw-te8t>;U2$vnaQGD#5=*qVAwA>IH{X8@9
zApX}a7kfvD<6^||tXNSz4uHvEIyo@#WQMI}vKZ@GPV4O$3>Jg2CT61PKZeBQxLw=R
V{@)Po7OamOfS>n9?iCLI(BGP7W3T`K

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/includes/video_user_remote_view.html b/teraserver/easyrtc/static/includes/video_user_remote_view.html
index 53910eb4..c500f1e1 100644
--- a/teraserver/easyrtc/static/includes/video_user_remote_view.html
+++ b/teraserver/easyrtc/static/includes/video_user_remote_view.html
@@ -11,9 +11,12 @@
         <input id="remoteBtnSwapVideo{##view_id##}" class="image-icon" type="image" alt="image" src="images/swap.png" onclick="enlargeView(false, {##view_id##});event.stopPropagation();" style="display: none;"/>
     </div>
 
-    <!-- Text display -->
-    <div id="remoteDisplay{##view_id##}" class="overlay-top-center" style="display:none">
-        <label class="chrono" id="remoteText{##view_id##}" onclick="stopChrono(false, {##view_id##});">Temps restant: xx:xx</label>
+    <!-- Chrono display -->
+    <div id="remoteChrono{##view_id##}" class="overlay-top-center" style="display:none">
+        <label class="chrono" id="remoteChronoText{##view_id##}">Temps restant: xx:xx</label>
+        <input class="image-icon chrono-button" id="remoteChronoPlay{##view_id##}" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
+        <input class="image-icon chrono-button" id="remoteChronoPause{##view_id##}" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(false, {##view_id##});"/>
+        <input class="image-icon chrono-button" id="remoteChronoStop{##view_id##}" type="image" alt="image" src="images/stop.png" onclick="stopChrono(false, {##view_id##});"/>
     </div>
 
     <!-- Micro, video, sensors, ... controls -->
diff --git a/teraserver/easyrtc/static/js/tera_tools.js b/teraserver/easyrtc/static/js/tera_tools.js
index 0cbe25dc..c7a08077 100644
--- a/teraserver/easyrtc/static/js/tera_tools.js
+++ b/teraserver/easyrtc/static/js/tera_tools.js
@@ -2,77 +2,107 @@
 // CHRONOS TOOLS
 ///////////////////////////////////////////
 let localChronoTimerHandle = 0;
-let chronoValues = [0, 0, 0, 0];
-let localChronoValue = 0;
-let chronoValuesIncrement = [-1, -1, -1, -1];
-let localChronoIncrement = -1;
+let chronoInfos = {}; // List of dict by key (peer id) - increment, duration, message
 
 function startChronosFromDialog(){
     // Build list of participants to send
-    let target_ids = [];
     let partSelect = Number($('#chronosPartSelect').children("option:selected").val());
-    let msgSelect = $('#chronosTitleSelect').children("option:selected")[0].text;
+    /*let message = $('#chronosTitleSelect').children("option:selected")[0].text;
     if ($('#chronosTitleSelect').children("option:selected").val() === "")
-        msgSelect = "";
+        message = "";*/
     //let durationSelect = Number($('#chronosDurationSelect').children("option:selected").val());
-    let durationSelect = Number($('#chronosDurationMinutes')[0].value) * 60
-        + Number($('#chronosDurationSeconds')[0].value);
+    let duration = Number($('#chronosDurationMinutes')[0].value) * 60 + Number($('#chronosDurationSeconds')[0].value);
     let chronoType = Number($('input[name="optChronoType"]:checked').val());
     let increment = -1;
+    let message = "";
+
+    // Reset values
+    chronoInfos = {};
+    showChrono(true, 1, false);
+    for (let i=0; i<remoteStreams.length; i++){
+        showChrono(false, i+1, false);
+    }
 
     if (chronoType === 2){
         // Chronometer
         increment = 1;
-        durationSelect = 0; // Always start chronometer at 0
+        duration = 0; // Always start chronometer at 0
     }
 
-
     if (partSelect === -1) {
         // Self only
-        startChrono(true, 1, increment, durationSelect, msgSelect);
+        setupChrono(true, 1, increment, duration, message);
         return;
     }
 
     if (partSelect === 0){
         // All participants
         for (let i=0; i<remoteStreams.length; i++){
-            target_ids.push(remoteStreams[i].peerid);
+            //target_ids.push(remoteStreams[i].peerid);
+            setupChrono(false, i, increment, duration, message);
+            //chronoTargetsIds.push(remoteStreams[i].peerid);
         }
     }else{
         // One participant... for now!
-        target_ids = [remoteStreams[partSelect-1].peerid];
+        //target_ids = [remoteStreams[partSelect-1].peerid];
+        //chronoTargetsIds.push(remoteStreams[partSelect-1].peerid);
+        setupChrono(false, partSelect-1, increment, duration, message);
     }
+}
 
-    // Send message
-    sendChronoMessage(target_ids, true, msgSelect, durationSelect, increment);
+function startChrono(){
+    let target_peers = Object.keys(chronoInfos);
+    if (target_peers.includes(local_peerid)){
+        showChronoButtons(true, 1, true, false);
+    }else{
+        target_peers.forEach( function(target){
+                if (!isParticipant){
+                    sendChronoMessage([target], 1, chronoInfos[target].message, chronoInfos[target].duration,
+                        chronoInfos[target].increment, chronoInfos[target].value);
+                }
+                showChronoButtons(false, getStreamIndexForPeerId(target)+1, true, false);
+            }
 
-    // Start chronos
-    for (let i=0; i<target_ids.length; i++){
-        let stream_index = getStreamIndexForPeerId(target_ids[i]);
-        if (stream_index !== undefined){
-            startChrono(false, stream_index+1, increment, durationSelect, msgSelect);
-        }
+        )
     }
-}
 
-function startChrono(local, index, increment=-1, duration = undefined, title=undefined){
+    // Start timer
+    if (localChronoTimerHandle === 0){
+        localChronoTimerHandle = setInterval(chronoTimerTimeout, 1000);
+    }
+}
 
+function setupChrono(local, index, increment=-1, duration = undefined, title=undefined, initial_value = -1){
     // Start chrono
+    let peer_id;
     if (local === false){
-        chronoValues[index-1] = duration;
-        chronoValuesIncrement[index-1] = increment;
+        // Get peer id for index
+        peer_id = remoteContacts[index].peerid;
     }else{
-        localChronoValue = duration;
-        localChronoIncrement = increment;
+        peer_id = local_peerid;
+        index = 0;
     }
-    updateChronoDisplay(local, index, duration, increment, title);
-    showTextDisplay(local, index, true);
 
-    // Start timer
-    if (localChronoTimerHandle === 0){
-        localChronoTimerHandle = setInterval(chronoTimerTimeout, 1000);
+    let value = 0;
+    if (initial_value >= 0){
+        value = initial_value;
+    }else{
+        if (increment < 0){
+            value = duration;
+        }
+    }
+
+    chronoInfos[peer_id] = {"increment": increment, "duration": duration, "value": value, "message": title};
+
+    // Stop current local Chrono if needed
+    if (localChronoTimerHandle > 0){
+        // Stop current timer if needed
+        clearTimeout(localChronoTimerHandle);
+        localChronoTimerHandle = 0;
     }
 
+    updateChronoDisplay(local, index+1, value, increment, title);
+    showChrono(local, index+1, true);
 }
 
 function updateChronoDisplay(local, index, duration, increment, title=undefined){
@@ -85,21 +115,21 @@ function updateChronoDisplay(local, index, duration, increment, title=undefined)
         if (title !== "")
             full_title += ": ";
         full_title += count_str;
-        setTextDisplay(local, index, full_title)
+        setChronoText(local, index, full_title)
     }else{
         // Only update time
-        let displayed = getTextDisplay(local, index);
-        let prev_count_str = chronoSecondsToText(duration-1);
-        displayed = displayed.substr(0, displayed.length-prev_count_str.length) + count_str;
-        setTextDisplay(local, index, displayed);
+        let displayed = getChronoTextDisplay(local, index);
+        let prev_count_str = chronoSecondsToText(duration-increment);
+        displayed = displayed.substring(0, displayed.length-prev_count_str.length) + count_str;
+        setChronoText(local, index, displayed);
     }
 }
 
 function chronoSecondsToText(duration){
     if (duration < 3600) // No hours
-        return new Date(duration * 1000).toISOString().substr(14, 5);
+        return new Date(duration * 1000).toISOString().substring(14, 19);
     else
-        return new Date(duration * 1000).toISOString().substr(11, 8);
+        return new Date(duration * 1000).toISOString().substring(11, 19);
 }
 
 function chronoShowCompleted(local, index, duration){
@@ -107,38 +137,30 @@ function chronoShowCompleted(local, index, duration){
             "</font>";
     if (duration > 0) // Display chrono value if > 0
         display_text += " - " + chronoSecondsToText(duration);
-    setTextDisplay(local, index, display_text);
+    setChronoText(local, index, display_text);
 
     // Start hide chrono timer in 5 seconds
-    setTimeout(showTextDisplay, 5000, local, index, false);
+    setTimeout(showChrono, 5000, local, index, false);
 }
 
 function chronoTimerTimeout(){
     // Update all active chronos
-    let active = false;
-    for (let i=0; i<chronoValues.length; i++){
-        if (chronoValues[i] > 0 || chronoValuesIncrement[i] > 0){
-            active = true;
-            chronoValues[i] += chronoValuesIncrement[i];
-            if (chronoValues[i] <= 0 && chronoValuesIncrement[i] < 0){
-                // Countdown completed!
-                chronoShowCompleted(false, i+1, chronoValues[i]);
-            }else{
-                updateChronoDisplay(false, i+1, chronoValues[i], chronoValuesIncrement[i]);
-            }
+    let active = true;
+    Object.keys(chronoInfos).forEach(function(peer_id) {
+        chronoInfos[peer_id].value += chronoInfos[peer_id].increment;
+        let index = 0;
+        if (peer_id !== local_peerid){
+            index = getStreamIndexForPeerId(peer_id);
         }
-    }
-
-    if (localChronoValue > 0 || localChronoIncrement > 0){
-        active = true;
-        localChronoValue += localChronoIncrement;
-        if (localChronoValue <= 0 && localChronoIncrement < 0){
-            // Start hide chrono timer in 5 seconds
-            chronoShowCompleted(true, 1, localChronoValue);
+        if (chronoInfos[peer_id].value <= 0 && chronoInfos[peer_id].increment < 0){
+            // Countdown completed!
+            chronoShowCompleted(peer_id === local_peerid, index+1, chronoInfos[peer_id].value);
+            active = false;
         }else{
-            updateChronoDisplay(true, 1, localChronoValue, localChronoIncrement);
+            updateChronoDisplay(peer_id === local_peerid, index+1,chronoInfos[peer_id].value,
+                chronoInfos[peer_id].increment);
         }
-    }
+    });
 
     if (active === false){
         clearTimeout(localChronoTimerHandle);
@@ -147,22 +169,43 @@ function chronoTimerTimeout(){
 }
 
 function stopChrono(local, index, no_msg=false){
+    let final_value = 0;
     if (local === false){
-        chronoShowCompleted(local, index, chronoValues[index-1]);
-        chronoValues[index-1] = 0;
-        chronoValuesIncrement[index-1] = -1;
-        let target_peer = remoteStreams[index-1].peerid;
+        let peer_id = remoteStreams[index-1].peerid;
+        if (!Object.keys(chronoInfos).includes(peer_id))
+            return; // Nothing to stop!
+        final_value = chronoInfos[peer_id].value;
         if (!no_msg)
-            sendChronoMessage([target_peer], false);
+            sendChronoMessage([peer_id], 0);
+        delete chronoInfos[peer_id];
     }else{
-        chronoShowCompleted(local, index, localChronoValue);
-        localChronoValue = 0;
-        localChronoIncrement = -1;
+        if (!Object.keys(chronoInfos).includes(local_peerid))
+            return; // Nothing to stop!
+        final_value = chronoInfos[local_peerid].value;
+        delete chronoInfos[local_peerid];
     }
+    chronoShowCompleted(local, index, final_value);
+
+    showChronoButtons(local, index, false, true);
 
     //showTextDisplay(local,index,false);
 }
 
+function pauseChrono(local, index){
+    if (local === false){
+        let peer_id = remoteStreams[index-1].peerid;
+        if (!Object.keys(chronoInfos).includes(peer_id))
+            return; // Nothing to pause!
+        sendChronoMessage([peer_id], 2);
+    }else{
+        if (!Object.keys(chronoInfos).includes(local_peerid))
+            return; // Nothing to pause!
+    }
+    clearTimeout(localChronoTimerHandle);
+    showChronoButtons(local, index, false, false);
+    localChronoTimerHandle = 0;
+}
+
 ///////////////////////////////////////////
 // MEASUREMENTS TOOLS
 ///////////////////////////////////////////
diff --git a/teraserver/easyrtc/static/js/tera_ui.js b/teraserver/easyrtc/static/js/tera_ui.js
index 4220111e..addae8f1 100644
--- a/teraserver/easyrtc/static/js/tera_ui.js
+++ b/teraserver/easyrtc/static/js/tera_ui.js
@@ -745,25 +745,44 @@ function showMeasuresDialog(){
     $('#measureDialog').modal('show');
 }
 
-function showTextDisplay(local, index, show){
+function showChrono(local, index, show){
     let view_prefix = ((local === true) ? 'local' : 'remote');
-    let display = $('#' + view_prefix + 'Display' + index);
+    let display = $('#' + view_prefix + 'Chrono' + index);
     if (display.length){
         (show) ? display.show() : display.hide();
     }
+
+    showChronoButtons(local, index, !show, false);
+
+}
+
+function showChronoButtons(local, index, playing, stopped){
+    let view_prefix = ((local === true) ? 'local' : 'remote');
+    let play = $('#' + view_prefix + 'ChronoPlay' + index);
+    if (play.length){
+        (!playing && !stopped) ? play.show() : play.hide();
+    }
+    let pause = $('#' + view_prefix + 'ChronoPause' + index);
+    if (pause.length){
+        (playing) ? pause.show() : pause.hide();
+    }
+    let stop = $('#' + view_prefix + 'ChronoStop' + index);
+    if (stop.length){
+        (playing) ? stop.show() : stop.hide();
+    }
 }
 
-function setTextDisplay(local, index, text){
+function setChronoText(local, index, text){
     let view_prefix = ((local === true) ? 'local' : 'remote');
-    let display = $('#' + view_prefix + 'Text' + index);
+    let display = $('#' + view_prefix + 'ChronoText' + index);
     if (display.length){
         display[0].innerHTML = text;
     }
 }
 
-function getTextDisplay(local, index){
+function getChronoTextDisplay(local, index){
     let view_prefix = ((local === true) ? 'local' : 'remote');
-    let display = $('#' + view_prefix + 'Text' + index);
+    let display = $('#' + view_prefix + 'ChronoText' + index);
     if (display.length){
         return display[0].innerHTML;
     }
diff --git a/teraserver/easyrtc/static/js/tera_webrtc.js b/teraserver/easyrtc/static/js/tera_webrtc.js
index a38b5d1f..bd8f367d 100644
--- a/teraserver/easyrtc/static/js/tera_webrtc.js
+++ b/teraserver/easyrtc/static/js/tera_webrtc.js
@@ -82,7 +82,7 @@ function preloadCamera(devices, current_index){
     }
 
     navigator.mediaDevices.getUserMedia({video: {deviceId: { exact: devices[current_index].deviceId }},
-        audio: false}).then(function(stream){
+        audio: false}).then(async function(stream){
             console.log("Preloaded camera " + devices[current_index].label + "(" + devices[current_index].deviceId + ")");
             stream.getTracks().forEach(track => track.stop());
             // Did we get at least the first stream? If so, start everything!
@@ -94,10 +94,10 @@ function preloadCamera(devices, current_index){
                 showLayout(true);
             }
             preloadCamera(devices, current_index + 1);
-    }).catch(async function() {
-        console.log("Can't preload camera: " + devices[current_index].label);
-        /*await new Promise(resolve => setTimeout(resolve, 1000))*/
-        preloadCamera(devices, current_index + 1);
+    }).catch(async function(err) {
+        console.log("Can't preload camera: " + devices[current_index].label + "(" + devices[current_index].deviceId + ") - " + err);
+        //await new Promise(resolve => setTimeout(resolve, 5000));
+        preloadCamera(devices, current_index+1);
     });
 }
 
@@ -1083,19 +1083,22 @@ function dataReception(sendercid, msgType, msgData, targeting) {
                 //setPrimaryView(msgData.peerid, "default");
                 setLargeView(getVideoViewId(false, index+1));
             }
-
             setTitle(false, index+1, remoteContacts[contact_index].name, msgData.isUser);
         }
-
     }
 
     if (msgType === "Chrono"){
         // Start - stop local chrono
-        if (msgData.state === true){
-            startChrono(true, 1, msgData.increment, msgData.duration, msgData.title);
-        }else{
+        if (msgData.state === 1){
+            setupChrono(true, 1, msgData.increment, msgData.duration, msgData.title, msgData.value);
+            startChrono();
+        }
+        if (msgData.state === 0){
             stopChrono(true, 1);
         }
+        if (msgData.state === 2){
+            pauseChrono(true, 1);
+        }
     }
 
     if (msgType === "queryConfig"){
@@ -1382,7 +1385,8 @@ function enableAllTracks(stream, enable){
         audioTracks[i].enabled = enable;
 }
 
-function sendChronoMessage(target_peerids, state, msg = undefined, duration=undefined, increment=-1){
+// States: 0 = Stop, 1 = Start, 2 = Pause
+function sendChronoMessage(target_peerids, state, msg = undefined, duration=undefined, increment=-1, value= undefined){
 
     let request = {"state": state};
     if (msg !== undefined)
@@ -1393,6 +1397,11 @@ function sendChronoMessage(target_peerids, state, msg = undefined, duration=unde
 
     request.increment = increment;
 
+    if (value !== undefined)
+        request.value = value;
+    else
+        request.value = -1;
+
     if (easyrtc.webSocketConnected){
         for (let i=0; i<target_peerids.length; i++){
             easyrtc.sendDataWS( target_peerids[i], 'Chrono', request,
diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryParticipants.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryParticipants.py
index 9198e310..04e556b2 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryParticipants.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryParticipants.py
@@ -150,7 +150,6 @@ def get(self):
                         # List
                         participant_json = participant.to_json(minimal=args['list'])
                         if args['list'] is None:
-
                             if args['id_participant']:
                                 # Adds project information to participant
                                 # participant_json['id_project'] = participant.participant_project.id_project

From f9ad6ee95fd998d8ec8d7d7b5d9db2adabed45ba Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Tue, 2 Apr 2024 15:08:08 -0400
Subject: [PATCH 04/36] Refs #233. VideoRehab - Added first implementation of
 manual counter tool.

---
 .../easyrtc/protected/index_participants.html |  15 ++-
 teraserver/easyrtc/protected/index_users.html |  54 ++++++++-
 teraserver/easyrtc/static/css/teraplus.css    |   8 ++
 teraserver/easyrtc/static/i18n/en.json        |   9 ++
 teraserver/easyrtc/static/i18n/fr.json        |   9 ++
 teraserver/easyrtc/static/images/counter.png  | Bin 0 -> 5299 bytes
 .../includes/video_user_remote_view.html      |  24 +++-
 teraserver/easyrtc/static/js/tera_tools.js    | 114 ++++++++++++++++--
 teraserver/easyrtc/static/js/tera_ui.js       |  35 +++++-
 teraserver/easyrtc/static/js/tera_webrtc.js   |  25 ++++
 10 files changed, 269 insertions(+), 24 deletions(-)
 create mode 100644 teraserver/easyrtc/static/images/counter.png

diff --git a/teraserver/easyrtc/protected/index_participants.html b/teraserver/easyrtc/protected/index_participants.html
index b4ca2cf7..6f5e6948 100644
--- a/teraserver/easyrtc/protected/index_participants.html
+++ b/teraserver/easyrtc/protected/index_participants.html
@@ -235,9 +235,18 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
             </div>
         </div>
         <div class="col-8 h-100" id="largeView">
-            <!-- Chrono display -->
-            <div id="localChrono1" class="overlay-top-center" style="display:none">
-                <label class="chrono-large" id="localChronoText1">Temps restant: xx:xx</label>
+            <div>
+                <div class="overlay-top-center d-flex">
+                    <!-- Chrono display -->
+                    <div id="localChrono1" class="mr-2" style="display:none">
+                        <label class="chrono-large" id="localChronoText1">Temps restant: xx:xx</label>
+                    </div>
+
+                    <!-- Counter display -->
+                    <div id="localCounter1" style="display:none">
+                        <label class="chrono-large counter-large" id="localCounterText1">0</label>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="col-2 h-100" id="remoteViews">
diff --git a/teraserver/easyrtc/protected/index_users.html b/teraserver/easyrtc/protected/index_users.html
index e2bb069e..d21d273f 100644
--- a/teraserver/easyrtc/protected/index_users.html
+++ b/teraserver/easyrtc/protected/index_users.html
@@ -167,7 +167,7 @@ <h5 class="modal-title" id="chronosDialogLongTitle" data-i18n="chronosDialog.tit
 <!-- Measurement dialog -->
 <div class="modal fade" id="measureDialog" tabindex="-1" role="dialog" aria-labelledby="measureDialogCenterTitle"
      aria-hidden="true">
-    <div class="modal-dialog large-modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-dialog draggable large-modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="measureDialogLongTitle" data-i18n="measureDialog.title">Mesures</h5>
@@ -203,6 +203,33 @@ <h5 class="modal-title" id="measureDialogLongTitle" data-i18n="measureDialog.tit
     </div>
 </div>
 
+<!-- CounterDialog -->
+<div class="modal fade" id="counterDialog" tabindex="-1" role="dialog" aria-labelledby="counterDialogCenterTitle"
+     aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="counterDialogLongTitle" data-i18n="counterDialog.title"></h5>
+
+            </div>
+            <div class="modal-body">
+                <form id="counterForm">
+                    <div class="form-group row pr-2">
+                        <label for="counterPartSelect" class="col-form-label col-4" data-i18n="counterDialog.participants">Participant(s): </label>
+                        <select id="counterPartSelect" class="col combobox"></select>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" id="counterStart" class="btn btn-success" data-dismiss="modal"
+                        onclick="startCountersFromDialog();" data-i18n="counterDialog.start">
+                    Activer</button>
+                <button type="button" id="counterCancel" class="btn btn-primary" data-dismiss="modal" data-i18n="counterDialog.cancel">Annuler</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <!-- ErrorDialog -->
 <div class="modal fade" id="errorDialog" tabindex="-1" role="dialog" aria-labelledby="errorDialogCenterTitle"
      aria-hidden="true">
@@ -251,13 +278,24 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
                     </div>
 
                     <!-- Chrono display -->
-                    <div id="localChrono1" class="overlay-top-center" style="display:none">
-                        <label class="chrono" id="localChronoText1">Temps restant: xx:xx</label>
-                        <input class="image-icon chrono-button" id="localChronoPlay1" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
-                        <input class="image-icon chrono-button" id="localChronoPause1" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(true,1);"/>
-                        <input class="image-icon chrono-button" id="localChronoStop1" type="image" alt="image" src="images/stop.png" onclick="stopChrono(true, 1);"/>
+                    <div id="localTools" class="overlay-top-center">
+                        <div id="localChrono1" style="display:none">
+                            <label class="chrono" id="localChronoText1">xx:xx</label>
+                            <input class="image-icon chrono-button" id="localChronoPlay1" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
+                            <input class="image-icon chrono-button" id="localChronoPause1" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(true,1);"/>
+                            <input class="image-icon chrono-button" id="localChronoStop1" type="image" alt="image" src="images/stop.png" onclick="stopChrono(true, 1);"/>
+                        </div>
+
+                        <!-- Counter display -->
+                        <div id="localCounter1" style="display:none">
+                            <input class="image-icon chrono-button" id="localCounterMinus1" type="image" alt="image" src="images/minus.png" onclick="counterMinus(true, 1);"/>
+                            <label class="chrono counter" id="localCounterText1">00</label>
+                            <input class="image-icon chrono-button" id="localCounterPlus1" type="image" alt="image" src="images/plus.png" onclick="counterPlus(true, 1);"/>
+                            <input class="image-icon chrono-button" id="localCounterStop1" type="image" alt="image" src="images/stop.png" onclick="stopCounter(true, 1);"/>
+                        </div>
                     </div>
 
+
                     <!-- Micro, video, sensors, ... controls -->
                     <div id="localViewControls1" class="overlay-bottom-center">
                         <input id="localConfig1" class="image-icon" type="image" alt="image" src="images/config.png" onclick="btnConfigClicked(true, 1);event.stopPropagation();" style="display: none;"/>
@@ -383,6 +421,10 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
                                 <input class="tool-icon" id="btnChronos" type="image" alt="image" src="images/timer.png"/>
                                 <label data-i18n="ui.chronos">Chronos</label>
                             </div>
+                            <div class="dropdown-item" onclick="showCounterDialog();">
+                                <input class="tool-icon" id="btnCounter" type="image" alt="image" src="images/counter.png"/>
+                                <label data-i18n="ui.counter">Chronos</label>
+                            </div>
                             <div class="dropdown-item" onclick="showMeasuresDialog();">
                                 <input class="tool-icon" id="btnAngles" type="image" alt="image" src="images/angles.png"/>
                                 <label data-i18n="ui.measures">Mesures</label>
diff --git a/teraserver/easyrtc/static/css/teraplus.css b/teraserver/easyrtc/static/css/teraplus.css
index 33175378..f73874aa 100644
--- a/teraserver/easyrtc/static/css/teraplus.css
+++ b/teraserver/easyrtc/static/css/teraplus.css
@@ -196,6 +196,14 @@ video {
 	vertical-align: middle;
 }
 
+.counter{
+	background-color: rgba(100,100,200,0.75);
+}
+
+.counter-large{
+	background-color: rgba(100,100,200,0.75);
+}
+
 .overlay {
 	height: 0;
 	width: 100%;
diff --git a/teraserver/easyrtc/static/i18n/en.json b/teraserver/easyrtc/static/i18n/en.json
index e2f911dd..c6dd4e8d 100644
--- a/teraserver/easyrtc/static/i18n/en.json
+++ b/teraserver/easyrtc/static/i18n/en.json
@@ -33,6 +33,14 @@
 		"all": "All",
 		"self": "Myself only"
 	},
+	"counterDialog": {
+		"title": "Counters",
+		"participants": "Participant(s)",
+		"start": "Start",
+		"cancel": "Cancel",
+		"all": "All",
+		"self": "Myself only"
+	},
 	"measureDialog": {
 		"title": "Measurements",
 		"close": "Close",
@@ -73,6 +81,7 @@
 		"speaker-all": "Sound - All",
 		"tools": "Tools",
 		"chronos": "Timers",
+		"counter": "Counters",
 		"measures": "Measurements",
 		"zoom": "Zoom",
 		"zoom-max": "Max",
diff --git a/teraserver/easyrtc/static/i18n/fr.json b/teraserver/easyrtc/static/i18n/fr.json
index b4086817..86b80f40 100644
--- a/teraserver/easyrtc/static/i18n/fr.json
+++ b/teraserver/easyrtc/static/i18n/fr.json
@@ -33,6 +33,14 @@
 		"all": "Tous",
 		"self": "Seulement moi"
 	},
+	"counterDialog": {
+		"title": "Décomptes",
+		"participants": "Participant(s)",
+		"start": "Démarrer",
+		"cancel": "Annuler",
+		"all": "Tous",
+		"self": "Seulement moi"
+	},
 	"measureDialog": {
 		"title": "Mesures",
 		"close": "Fermer",
@@ -73,6 +81,7 @@
 		"speaker-all": "Son - Tous",
 		"tools": "Outils",
 		"chronos": "Chronos",
+		"counter": "Compteurs",
 		"measures": "Mesures",
 		"zoom": "Zoom",
 		"zoom-max": "Max",
diff --git a/teraserver/easyrtc/static/images/counter.png b/teraserver/easyrtc/static/images/counter.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cab96442489fd09919bb46d82aadba16ac171bb
GIT binary patch
literal 5299
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

literal 0
HcmV?d00001

diff --git a/teraserver/easyrtc/static/includes/video_user_remote_view.html b/teraserver/easyrtc/static/includes/video_user_remote_view.html
index c500f1e1..d1d29c75 100644
--- a/teraserver/easyrtc/static/includes/video_user_remote_view.html
+++ b/teraserver/easyrtc/static/includes/video_user_remote_view.html
@@ -11,14 +11,26 @@
         <input id="remoteBtnSwapVideo{##view_id##}" class="image-icon" type="image" alt="image" src="images/swap.png" onclick="enlargeView(false, {##view_id##});event.stopPropagation();" style="display: none;"/>
     </div>
 
-    <!-- Chrono display -->
-    <div id="remoteChrono{##view_id##}" class="overlay-top-center" style="display:none">
-        <label class="chrono" id="remoteChronoText{##view_id##}">Temps restant: xx:xx</label>
-        <input class="image-icon chrono-button" id="remoteChronoPlay{##view_id##}" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
-        <input class="image-icon chrono-button" id="remoteChronoPause{##view_id##}" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(false, {##view_id##});"/>
-        <input class="image-icon chrono-button" id="remoteChronoStop{##view_id##}" type="image" alt="image" src="images/stop.png" onclick="stopChrono(false, {##view_id##});"/>
+
+    <div class="overlay-top-center" >
+        <!-- Chrono display -->
+        <div id="remoteChrono{##view_id##}" style="display:none">
+            <label class="chrono" id="remoteChronoText{##view_id##}">Temps restant: xx:xx</label>
+            <input class="image-icon chrono-button" id="remoteChronoPlay{##view_id##}" type="image" alt="image" src="images/play.png" onclick="startChrono();"/>
+            <input class="image-icon chrono-button" id="remoteChronoPause{##view_id##}" type="image" alt="image" src="images/pause.png" onclick="pauseChrono(false, {##view_id##});"/>
+            <input class="image-icon chrono-button" id="remoteChronoStop{##view_id##}" type="image" alt="image" src="images/stop.png" onclick="stopChrono(false, {##view_id##});"/>
+        </div>
+
+        <!-- Counter display -->
+        <div id="remoteCounter{##view_id##}" style="display:none">
+            <input class="image-icon chrono-button" id="remoteCounterMinus{##view_id##}" type="image" alt="image" src="images/minus.png" onclick="counterMinus(false, {##view_id##});"/>
+            <label class="chrono counter" id="remoteCounterText{##view_id##}">00</label>
+            <input class="image-icon chrono-button" id="remoteCounterPlus{##view_id##}" type="image" alt="image" src="images/plus.png" onclick="counterPlus(false, {##view_id##});"/>
+            <input class="image-icon chrono-button" id="remoteCounterStop{##view_id##}" type="image" alt="image" src="images/stop.png" onclick="stopCounter(false, {##view_id##});"/>
+        </div>
     </div>
 
+
     <!-- Micro, video, sensors, ... controls -->
     <div id="remoteViewControls{##view_id##}" class="overlay-bottom-center" >
         <input id="remoteConfig{##view_id##}" class="image-icon" type="image" alt="image" src="images/config.png" onclick="btnConfigClicked(false, {##view_id##});event.stopPropagation();" style="display: none;"/>
diff --git a/teraserver/easyrtc/static/js/tera_tools.js b/teraserver/easyrtc/static/js/tera_tools.js
index c7a08077..5f7d3935 100644
--- a/teraserver/easyrtc/static/js/tera_tools.js
+++ b/teraserver/easyrtc/static/js/tera_tools.js
@@ -38,14 +38,11 @@ function startChronosFromDialog(){
     if (partSelect === 0){
         // All participants
         for (let i=0; i<remoteStreams.length; i++){
-            //target_ids.push(remoteStreams[i].peerid);
-            setupChrono(false, i, increment, duration, message);
-            //chronoTargetsIds.push(remoteStreams[i].peerid);
+            if (remoteStreams[i].streamname === 'default')
+                setupChrono(false, i, increment, duration, message);
         }
     }else{
         // One participant... for now!
-        //target_ids = [remoteStreams[partSelect-1].peerid];
-        //chronoTargetsIds.push(remoteStreams[partSelect-1].peerid);
         setupChrono(false, partSelect-1, increment, duration, message);
     }
 }
@@ -73,11 +70,11 @@ function startChrono(){
 }
 
 function setupChrono(local, index, increment=-1, duration = undefined, title=undefined, initial_value = -1){
-    // Start chrono
+    // Setup chrono
     let peer_id;
     if (local === false){
         // Get peer id for index
-        peer_id = remoteContacts[index].peerid;
+        peer_id = remoteStreams[index].peerid;
     }else{
         peer_id = local_peerid;
         index = 0;
@@ -371,3 +368,106 @@ $(document).on('mousemove', '#measureVideoCanvas', function(evt) {
     measureCurrentAngle(x,y);
 
 });
+
+///////////////////////////////////////////
+// COUNTER TOOLS
+///////////////////////////////////////////
+let counterInfos = {};
+function startCountersFromDialog(){
+    // Build list of participants to send
+    let partSelect = Number($('#counterPartSelect').children("option:selected").val());
+
+    // Reset values
+    counterInfos = {};
+    showCounter(true, 1, false);
+    for (let i=0; i<remoteStreams.length; i++){
+        showCounter(false, i+1, false);
+    }
+
+    if (partSelect === -1) {
+        // Self only
+        setupCounter(true, 1);
+        return;
+    }
+
+    if (partSelect === 0){
+        // All participants
+        for (let i=0; i<remoteStreams.length; i++){
+            if (remoteStreams[i].streamname === 'default'){
+                setupCounter(false, i);
+                sendCounterMessage([remoteStreams[i].peerid], true, counterInfos[remoteStreams[i].peerid].value);
+            }
+        }
+
+    }else{
+        // One participant... for now!
+        setupCounter(false, partSelect-1);
+        sendCounterMessage([remoteStreams[partSelect-1].peerid], true, counterInfos[remoteStreams[partSelect-1].peerid].value);
+    }
+}
+
+function setupCounter(local, index, initial_value=0){
+    let peer_id;
+    if (local === false){
+        // Get peer id for index
+        peer_id = remoteStreams[index].peerid;
+    }else{
+        peer_id = local_peerid;
+        index = 0;
+    }
+
+    counterInfos[peer_id] = {"value": initial_value};
+
+    setCounterText(local, index+1, initial_value);
+    showCounter(local, index+1, true);
+}
+
+function counterPlus(local, index){
+    let peer_id;
+    if (local === false){
+        // Get peer id for index
+        peer_id = remoteStreams[index-1].peerid;
+    }else{
+        peer_id = local_peerid;
+    }
+
+    counterInfos[peer_id].value = counterInfos[peer_id].value + 1;
+    setCounterText(local, index, counterInfos[peer_id].value);
+    if (local === false){
+        sendCounterMessage([peer_id], true, counterInfos[peer_id].value);
+    }
+
+}
+
+function counterMinus(local, index){
+    let peer_id;
+    if (local === false){
+        // Get peer id for index
+        peer_id = remoteStreams[index-1].peerid;
+    }else{
+        peer_id = local_peerid;
+    }
+
+    counterInfos[peer_id].value = counterInfos[peer_id].value - 1;
+    if (counterInfos[peer_id].value < 0)
+        counterInfos[peer_id].value = 0;
+    setCounterText(local, index, counterInfos[peer_id].value);
+    if (local === false){
+        sendCounterMessage([peer_id], true, counterInfos[peer_id].value);
+    }
+}
+
+function stopCounter(local, index){
+    let peer_id;
+    if (local === false){
+        // Get peer id for index
+        peer_id = remoteStreams[index-1].peerid;
+    }else{
+        peer_id = local_peerid;
+    }
+    delete counterInfos[peer_id];
+    showCounter(local, index, false);
+    if (!local){
+        sendCounterMessage([peer_id], false, 0);
+    }
+}
diff --git a/teraserver/easyrtc/static/js/tera_ui.js b/teraserver/easyrtc/static/js/tera_ui.js
index addae8f1..6167f109 100644
--- a/teraserver/easyrtc/static/js/tera_ui.js
+++ b/teraserver/easyrtc/static/js/tera_ui.js
@@ -745,15 +745,30 @@ function showMeasuresDialog(){
     $('#measureDialog').modal('show');
 }
 
+function showCounterDialog(){
+    let partSelect = $('#counterPartSelect')[0];
+    partSelect.options.length = 0;
+    partSelect.options[partSelect.options.length] = new Option(translator.translateForKey("counterDialog.all", currentLang), "0");
+
+    for (let i=0; i<remoteContacts.length; i++){
+        let index = getStreamIndexForPeerId(remoteContacts[i].peerid, 'default');
+        if (index !== undefined){
+            partSelect.options[partSelect.options.length] = new Option(getTitle(false, index+1), index+1);
+        }
+    }
+    partSelect.options[partSelect.options.length] = new Option(translator.translateForKey("counterDialog.self", currentLang), "-1");
+
+    $('#counterDialog').modal('show');
+
+}
+
 function showChrono(local, index, show){
     let view_prefix = ((local === true) ? 'local' : 'remote');
     let display = $('#' + view_prefix + 'Chrono' + index);
     if (display.length){
         (show) ? display.show() : display.hide();
     }
-
     showChronoButtons(local, index, !show, false);
-
 }
 
 function showChronoButtons(local, index, playing, stopped){
@@ -788,6 +803,22 @@ function getChronoTextDisplay(local, index){
     }
 }
 
+function setCounterText(local, index, text){
+    let view_prefix = ((local === true) ? 'local' : 'remote');
+    let display = $('#' + view_prefix + 'CounterText' + index);
+    if (display.length){
+        display[0].innerHTML = text;
+    }
+}
+
+function showCounter(local, index, show) {
+    let view_prefix = ((local === true) ? 'local' : 'remote');
+    let display = $('#' + view_prefix + 'Counter' + index);
+    if (display.length) {
+        (show) ? display.show() : display.hide();
+    }
+}
+
 function selectPrimaryView(local, index){
     // Get stream name
     let streamName = 'default';
diff --git a/teraserver/easyrtc/static/js/tera_webrtc.js b/teraserver/easyrtc/static/js/tera_webrtc.js
index bd8f367d..5e496dfb 100644
--- a/teraserver/easyrtc/static/js/tera_webrtc.js
+++ b/teraserver/easyrtc/static/js/tera_webrtc.js
@@ -733,6 +733,7 @@ function streamDisconnected(callerid, mediaStream, streamName){
     // Stop chronos if it's the default stream that was stopped
     if (streamName === 'default'){
         stopChrono(isParticipant, slot+1, true);
+        showCounter(isParticipant, slot+1, false);
         playSound("audioDisconnected");
     }
 
@@ -1101,6 +1102,14 @@ function dataReception(sendercid, msgType, msgData, targeting) {
         }
     }
 
+    if (msgType === "Counter"){
+        if (msgData.state === true){
+            setupCounter(true, 1, msgData.value);
+        }else{
+            showCounter(true, 1, false);
+        }
+    }
+
     if (msgType === "queryConfig"){
         // Send audio & video sources, and current config
         // Check if querying peer is a user, otherwise ignore.
@@ -1415,6 +1424,22 @@ function sendChronoMessage(target_peerids, state, msg = undefined, duration=unde
     }
 }
 
+function sendCounterMessage(target_peerids, state, value){
+    let request = {"state": state, "value": value};
+
+    if (easyrtc.webSocketConnected){
+        for (let i=0; i<target_peerids.length; i++){
+            easyrtc.sendDataWS( target_peerids[i], 'Counter', request,
+                function(ackMesg) {
+                    //console.error("ackMsg:",ackMesg);
+                    if( ackMesg.msgType === 'error' ) {
+                        console.error(ackMesg.msgData.errorText);
+                    }
+                });
+        }
+    }
+}
+
 function sendQueryConfig(peerid_target){
     console.log("Sending config query to :", peerid_target);
     // Query for the remote configuration

From ebf5ad234ecb662abfe1a3f0f1c2248653b57292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 3 Apr 2024 17:16:25 -0400
Subject: [PATCH 05/36] Refs #248. Upgrade script to add
 asset_expiration_datetime to t_assets.

---
 .../09764faa2d57_add_expiration_date.py       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 teraserver/python/alembic/versions/09764faa2d57_add_expiration_date.py

diff --git a/teraserver/python/alembic/versions/09764faa2d57_add_expiration_date.py b/teraserver/python/alembic/versions/09764faa2d57_add_expiration_date.py
new file mode 100644
index 00000000..63cd21e4
--- /dev/null
+++ b/teraserver/python/alembic/versions/09764faa2d57_add_expiration_date.py
@@ -0,0 +1,27 @@
+"""add expiration date
+
+Revision ID: 09764faa2d57
+Revises: e6ee93ef205b
+Create Date: 2024-04-03 17:06:05.108297
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '09764faa2d57'
+down_revision = 'e6ee93ef205b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Add asset_expiration_datetime column to t_assets table
+    op.add_column(table_name='t_assets', column=sa.Column('asset_expiration_datetime',
+                                                          sa.TIMESTAMP(timezone=True), nullable=True))
+
+
+def downgrade():
+    # No downgrade possible from that dark path...
+    pass

From c9eceba7794b86ce7c617dc0fca3dbe06ea802c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 3 Apr 2024 17:31:49 -0400
Subject: [PATCH 06/36] Updated test for asset_expiration_datetime

---
 teraserver/python/tests/opentera/db/models/test_TeraAsset.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/teraserver/python/tests/opentera/db/models/test_TeraAsset.py b/teraserver/python/tests/opentera/db/models/test_TeraAsset.py
index fd15e8ff..4928760e 100644
--- a/teraserver/python/tests/opentera/db/models/test_TeraAsset.py
+++ b/teraserver/python/tests/opentera/db/models/test_TeraAsset.py
@@ -55,6 +55,7 @@ def test_json_full_and_minimal(self):
                     self.assertTrue('asset_service_uuid' in json)
                     self.assertTrue('asset_type' in json)
                     self.assertTrue('asset_datetime' in json)
+                    self.assertTrue('asset_expiration_datetime' in json)
 
                     # Make sure deleted at field not there
                     self.assertFalse('deleted_at' in json)
@@ -72,6 +73,8 @@ def test_from_json(self):
                 self.assertEqual(new_asset.id_asset, asset.id_asset)
                 self.assertEqual(new_asset.id_device, asset.id_device)
                 self.assertEqual(new_asset.id_session, asset.id_session)
+                self.assertEqual(new_asset.asset_datetime, asset.asset_datetime)
+                self.assertEqual(new_asset.asset_expiration_datetime, asset.asset_expiration_datetime)
 
     def test_ids_uuids_get_methods(self):
         with self._flask_app.app_context():
@@ -238,6 +241,7 @@ def test_insert_with_minimal_config(self):
             self.assertIsNone(asset.id_user)
             self.assertIsNone(asset.id_service)
             self.assertIsNone(asset.asset_datetime)
+            self.assertIsNone(asset.asset_expiration_datetime)
 
             # Destroy asset
             TeraAsset.delete(asset.id_asset)

From 69402931d45d41e67b95014dfd59316c4a11adc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Thu, 4 Apr 2024 15:39:37 -0400
Subject: [PATCH 07/36] Refs #248 First attempt, unfinished.

---
 .../API/user/UserQueryAssetsArchive.py        | 119 ++++++++++++++++++
 .../python/modules/FlaskModule/FlaskModule.py |   2 +
 2 files changed, 121 insertions(+)
 create mode 100644 teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
new file mode 100644
index 00000000..74261b0b
--- /dev/null
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -0,0 +1,119 @@
+from flask import session, request, Response
+from flask_restx import Resource, inputs
+from flask_babel import gettext
+from modules.LoginModule.LoginModule import user_multi_auth, current_user
+from modules.FlaskModule.FlaskModule import user_api_ns as api
+from opentera.db.models.TeraUser import TeraUser
+from opentera.db.models.TeraAsset import TeraAsset
+from opentera.db.models.TeraService import TeraService
+from opentera.db.models.TeraProject import TeraProject
+from opentera.db.models.TeraSession import TeraSession
+from opentera.db.models.TeraParticipant import TeraParticipant
+import zipfile
+from io import BytesIO
+import requests
+
+from modules.DatabaseModule.DBManager import DBManager
+from opentera.redis.RedisVars import RedisVars
+
+# Parser definition(s)
+# GET
+get_parser = api.parser()
+
+
+class UserQueryAssetsArchive(Resource):
+
+    def __init__(self, _api, *args, **kwargs):
+        Resource.__init__(self, _api, *args, **kwargs)
+        self.module = kwargs.get('flaskModule', None)
+        self.test = kwargs.get('test', False)
+
+    @api.doc(description='Get asset information. Only one of the ID parameter is supported at once',
+             responses={200: 'Success - returns list of assets',
+                        400: 'Required parameter is missing',
+                        403: 'Logged user doesn\'t have permission to access the requested data'},
+             params={'token': 'Secret token'})
+    @api.expect(get_parser)
+    @user_multi_auth.login_required
+    def get(self):
+        user_access = DBManager.userAccess(current_user)
+
+        service_key = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
+        servername = self.module.config.server_config['hostname']
+        port = self.module.config.server_config['port']
+        if 'X_EXTERNALSERVER' in request.headers:
+            servername = request.headers['X_EXTERNALSERVER']
+
+        if 'X_EXTERNALPORT' in request.headers:
+            port = request.headers['X_EXTERNALPORT']
+
+        # Load all enabled services
+        services_infos = {service.service_uuid: service.service_clientendpoint
+                          for service in TeraService.query_with_filters({'service_enabled': True})}
+
+        # Create an in-memory binary stream to store the zip file
+        zip_buffer = BytesIO()
+
+        # Create a ZipFile object to write to the in-memory stream
+        with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
+
+            project: TeraProject = TeraProject.get_project_by_id(1)
+            site = project.project_site
+
+            # Already filtered with accessible participants
+            participants: list[TeraParticipant] = user_access.query_all_participants_for_project(project.id_project)
+
+            for participant in participants:
+                # Get all assets from participant
+                sessions: list[TeraSession] = TeraSession.get_sessions_for_participant(participant.id_participant)
+
+                for sess in sessions:
+                    assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
+                    for asset in assets:
+
+                        # Verify if service is enabled
+                        if asset.asset_service_uuid in services_infos and asset.asset_service_owner:
+
+                            # Get the file (from the service that created the file)
+                            service = asset.asset_service_owner
+                            service_token = service.get_token(service_key)
+
+                            # Generate access token
+                            access_token = asset.get_access_token([asset.asset_uuid], service_key,
+                                                                  service.service_uuid)
+
+                            # What to do with duplicated names ?
+                            filepath = site.site_name + '/' + project.project_name + '/' + participant.participant_name \
+                                       + '/' + sess.session_name + '/' + asset.asset_name
+
+                            # Generate URL to fetch asset
+                            params = {'access_token': access_token, 'asset_uuid': asset.asset_uuid}
+                            url = 'https://' + servername + ':' + str(port) \
+                                  + services_infos[asset.asset_service_uuid] + '/api/assets'
+
+                            headers = {'Authorization': 'OpenTera ' + service_token}
+                            response = requests.get(url=url, params=params, headers=headers, verify=False)
+
+                            if response.status_code == 200:
+                                zip_file.writestr(filepath, response.content)
+
+        # Set the BytesIO object's position to the beginning
+        zip_buffer.seek(0)
+
+        # Create a Flask response with the zip file as the data
+        response = Response(zip_buffer.getvalue(), mimetype='application/zip')
+
+        # Set appropriate content-disposition headers
+        response.headers['Content-Disposition'] = 'attachment; filename=data.zip'
+
+        return response
+
+    @api.doc(description='Create asset archive.',
+             responses={501: 'Unable to create asset information from here'},
+             params={'token': 'Secret token'})
+    @user_multi_auth.login_required
+    def post(self):
+        pass
+
+
+
diff --git a/teraserver/python/modules/FlaskModule/FlaskModule.py b/teraserver/python/modules/FlaskModule/FlaskModule.py
index c957a9fc..9b2d8465 100755
--- a/teraserver/python/modules/FlaskModule/FlaskModule.py
+++ b/teraserver/python/modules/FlaskModule/FlaskModule.py
@@ -164,6 +164,7 @@ def init_user_api(module: object, namespace: Namespace, additional_args: dict =
         from modules.FlaskModule.API.user.UserQueryDeviceTypes import UserQueryDeviceTypes
         from modules.FlaskModule.API.user.UserQueryDeviceSubTypes import UserQueryDeviceSubTypes
         from modules.FlaskModule.API.user.UserQueryAssets import UserQueryAssets
+        from modules.FlaskModule.API.user.UserQueryAssetsArchive import UserQueryAssetsArchive
         from modules.FlaskModule.API.user.UserQueryServices import UserQueryServices
         from modules.FlaskModule.API.user.UserQueryServiceProjects import UserQueryServiceProjects
         from modules.FlaskModule.API.user.UserQueryServiceSites import UserQueryServiceSites
@@ -185,6 +186,7 @@ def init_user_api(module: object, namespace: Namespace, additional_args: dict =
 
         # Resources
         namespace.add_resource(UserQueryAssets,               '/assets', resource_class_kwargs=kwargs)
+        namespace.add_resource(UserQueryAssetsArchive,        '/assets/archive', resource_class_kwargs=kwargs)
         namespace.add_resource(UserQueryDevices,              '/devices', resource_class_kwargs=kwargs)
         namespace.add_resource(UserQueryOnlineDevices,        '/devices/online', resource_class_kwargs=kwargs)
         # namespace.add_resource(UserQueryDeviceSites,          '/devicesites', resource_class_kwargs=kwargs)

From 5b8816b087547e87aed60d2761dd48d924c27bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 10 Apr 2024 11:20:50 -0400
Subject: [PATCH 08/36] Refs #248, Starting worker, not usable yet.

---
 .../API/user/UserQueryAssetsArchive.py        | 209 +++++++++++++-----
 .../python/workers/AssetsArchiveWorker.py     |  91 ++++++++
 teraserver/python/workers/__init__.py         |   0
 3 files changed, 240 insertions(+), 60 deletions(-)
 create mode 100644 teraserver/python/workers/AssetsArchiveWorker.py
 create mode 100644 teraserver/python/workers/__init__.py

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 74261b0b..617bdda7 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -3,6 +3,7 @@
 from flask_babel import gettext
 from modules.LoginModule.LoginModule import user_multi_auth, current_user
 from modules.FlaskModule.FlaskModule import user_api_ns as api
+from modules.FlaskModule import FlaskModule
 from opentera.db.models.TeraUser import TeraUser
 from opentera.db.models.TeraAsset import TeraAsset
 from opentera.db.models.TeraService import TeraService
@@ -12,23 +13,31 @@
 import zipfile
 from io import BytesIO
 import requests
-
+import sys
+import subprocess
+import json
 from modules.DatabaseModule.DBManager import DBManager
 from opentera.redis.RedisVars import RedisVars
 
 # Parser definition(s)
 # GET
 get_parser = api.parser()
+get_parser.add_argument('id_participant', type=int, help='ID of the participant from which to request all associated '
+                                                         'assets', default=None)
+get_parser.add_argument('id_project', type=int, help='ID of the project from which to request all associated assets',
+                        default=None)
+get_parser.add_argument('id_session', type=int, help='ID of the session from which to request all associated assets',
+                        default=None)
 
 
 class UserQueryAssetsArchive(Resource):
 
     def __init__(self, _api, *args, **kwargs):
         Resource.__init__(self, _api, *args, **kwargs)
-        self.module = kwargs.get('flaskModule', None)
+        self.module: FlaskModule = kwargs.get('flaskModule', None)
         self.test = kwargs.get('test', False)
 
-    @api.doc(description='Get asset information. Only one of the ID parameter is supported at once',
+    @api.doc(description='Get asset archive. Only one of the ID parameter is supported at once.',
              responses={200: 'Success - returns list of assets',
                         400: 'Required parameter is missing',
                         403: 'Logged user doesn\'t have permission to access the requested data'},
@@ -36,77 +45,157 @@ def __init__(self, _api, *args, **kwargs):
     @api.expect(get_parser)
     @user_multi_auth.login_required
     def get(self):
+        # Get parameters
+        args = get_parser.parse_args()
         user_access = DBManager.userAccess(current_user)
 
-        service_key = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
-        servername = self.module.config.server_config['hostname']
+        assets_list = []
+
+        # Base server information
+        service_key: bytes = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
+        server_name = self.module.config.server_config['hostname']
         port = self.module.config.server_config['port']
+
         if 'X_EXTERNALSERVER' in request.headers:
-            servername = request.headers['X_EXTERNALSERVER']
+            server_name = request.headers['X_EXTERNALSERVER']
 
         if 'X_EXTERNALPORT' in request.headers:
             port = request.headers['X_EXTERNALPORT']
 
-        # Load all enabled services
-        services_infos = {service.service_uuid: service.service_clientendpoint
-                          for service in TeraService.query_with_filters({'service_enabled': True})}
+        # Verify if only one arg is set
+        if sum(x is not None for x in [args['id_project'], args['id_participant'], args['id_session']]) != 1:
+            return gettext('Only one of the ID parameter is supported at once'), 400
 
-        # Create an in-memory binary stream to store the zip file
-        zip_buffer = BytesIO()
+        def add_asset_to_list(asset: TeraAsset, path: str = ''):
+            value = asset.to_json(minimal=False)
+            value['path'] = f"{path}/{asset.asset_name}"
+            assets_list.append(value)
 
-        # Create a ZipFile object to write to the in-memory stream
-        with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
+        def get_assets_for_session(sess: TeraSession, path: str = ''):
+            assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
+            for asset in assets:
+                add_asset_to_list(asset, path + f"/{sess.id_session}_{sess.session_name}")
 
-            project: TeraProject = TeraProject.get_project_by_id(1)
-            site = project.project_site
+        def get_assets_for_participant(participant: TeraParticipant, path: str = ''):
+            sessions: list[TeraSession] = TeraSession.get_sessions_for_participant(participant.id_participant)
+            for sess in sessions:
+                get_assets_for_session(sess, path = path + f"/{participant.participant_name}")
 
-            # Already filtered with accessible participants
+        def get_assets_for_project(project: TeraProject, path: str = ''):
             participants: list[TeraParticipant] = user_access.query_all_participants_for_project(project.id_project)
-
             for participant in participants:
-                # Get all assets from participant
-                sessions: list[TeraSession] = TeraSession.get_sessions_for_participant(participant.id_participant)
-
-                for sess in sessions:
-                    assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
-                    for asset in assets:
-
-                        # Verify if service is enabled
-                        if asset.asset_service_uuid in services_infos and asset.asset_service_owner:
-
-                            # Get the file (from the service that created the file)
-                            service = asset.asset_service_owner
-                            service_token = service.get_token(service_key)
-
-                            # Generate access token
-                            access_token = asset.get_access_token([asset.asset_uuid], service_key,
-                                                                  service.service_uuid)
-
-                            # What to do with duplicated names ?
-                            filepath = site.site_name + '/' + project.project_name + '/' + participant.participant_name \
-                                       + '/' + sess.session_name + '/' + asset.asset_name
-
-                            # Generate URL to fetch asset
-                            params = {'access_token': access_token, 'asset_uuid': asset.asset_uuid}
-                            url = 'https://' + servername + ':' + str(port) \
-                                  + services_infos[asset.asset_service_uuid] + '/api/assets'
-
-                            headers = {'Authorization': 'OpenTera ' + service_token}
-                            response = requests.get(url=url, params=params, headers=headers, verify=False)
-
-                            if response.status_code == 200:
-                                zip_file.writestr(filepath, response.content)
-
-        # Set the BytesIO object's position to the beginning
-        zip_buffer.seek(0)
-
-        # Create a Flask response with the zip file as the data
-        response = Response(zip_buffer.getvalue(), mimetype='application/zip')
-
-        # Set appropriate content-disposition headers
-        response.headers['Content-Disposition'] = 'attachment; filename=data.zip'
-
-        return response
+                get_assets_for_participant(participant, path + f"/{project.project_name}")
+
+        # Check if we have a participant, project or session
+        if args['id_project'] is not None:
+            # Verify access to project
+            if args['id_project'] not in user_access.get_accessible_projects_ids():
+                return gettext('Forbidden'), 403
+
+            p = TeraProject.get_project_by_id(args['id_project'])
+            site = p.project_site
+            get_assets_for_project(p, site.site_name)
+
+        elif args['id_participant'] is not None:
+            # Get all assets for participant
+            pass
+        elif args['id_session'] is not None:
+            # Get all assets for session
+            pass
+        else:
+            return gettext('Missing required parameter'), 400
+
+        # Create a job ID (will need a better way to generate ids)
+        job_id = 'job.id.1'
+
+        job_info = {'job_id': job_id,
+                    'server_name': server_name,
+                    'port': port,
+                    'service_key': service_key.decode('utf-8'),
+                    'status': 'running',
+                    'assets': assets_list}
+
+        # TODO set job information with expiration
+        self.module.redisSet(job_id, json.dumps(job_info), ex=60)
+
+        # Launch subprocess
+        command = [sys.executable, 'workers/AssetsArchiveWorker.py', '--config', 'config/TeraServerConfig.ini',
+                   '--job_id', job_id]
+        process = subprocess.Popen(command)
+
+        return assets_list
+
+        # user_access = DBManager.userAccess(current_user)
+        #
+        # service_key = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
+        # servername = self.module.config.server_config['hostname']
+        # port = self.module.config.server_config['port']
+        # if 'X_EXTERNALSERVER' in request.headers:
+        #     servername = request.headers['X_EXTERNALSERVER']
+        #
+        # if 'X_EXTERNALPORT' in request.headers:
+        #     port = request.headers['X_EXTERNALPORT']
+        #
+        # # Load all enabled services
+        # services_infos = {service.service_uuid: service.service_clientendpoint
+        #                   for service in TeraService.query_with_filters({'service_enabled': True})}
+        #
+        # # Create an in-memory binary stream to store the zip file
+        # zip_buffer = BytesIO()
+        #
+        # # Create a ZipFile object to write to the in-memory stream
+        # with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
+        #
+        #     project: TeraProject = TeraProject.get_project_by_id(1)
+        #     site = project.project_site
+        #
+        #     # Already filtered with accessible participants
+        #     participants: list[TeraParticipant] = user_access.query_all_participants_for_project(project.id_project)
+        #
+        #     for participant in participants:
+        #         # Get all assets from participant
+        #         sessions: list[TeraSession] = TeraSession.get_sessions_for_participant(participant.id_participant)
+        #
+        #         for sess in sessions:
+        #             assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
+        #             for asset in assets:
+        #
+        #                 # Verify if service is enabled
+        #                 if asset.asset_service_uuid in services_infos and asset.asset_service_owner:
+        #
+        #                     # Get the file (from the service that created the file)
+        #                     service = asset.asset_service_owner
+        #                     service_token = service.get_token(service_key)
+        #
+        #                     # Generate access token
+        #                     access_token = asset.get_access_token([asset.asset_uuid], service_key,
+        #                                                           service.service_uuid)
+        #
+        #                     # What to do with duplicated names ?
+        #                     filepath = site.site_name + '/' + project.project_name + '/' + participant.participant_name \
+        #                                + '/' + sess.session_name + '/' + asset.asset_name
+        #
+        #                     # Generate URL to fetch asset
+        #                     params = {'access_token': access_token, 'asset_uuid': asset.asset_uuid}
+        #                     url = 'https://' + servername + ':' + str(port) \
+        #                           + services_infos[asset.asset_service_uuid] + '/api/assets'
+        #
+        #                     headers = {'Authorization': 'OpenTera ' + service_token}
+        #                     response = requests.get(url=url, params=params, headers=headers, verify=False)
+        #
+        #                     if response.status_code == 200:
+        #                         zip_file.writestr(filepath, response.content)
+        #
+        # # Set the BytesIO object's position to the beginning
+        # zip_buffer.seek(0)
+        #
+        # # Create a Flask response with the zip file as the data
+        # response = Response(zip_buffer.getvalue(), mimetype='application/zip')
+        #
+        # # Set appropriate content-disposition headers
+        # response.headers['Content-Disposition'] = 'attachment; filename=data.zip'
+        #
+        # return response
 
     @api.doc(description='Create asset archive.',
              responses={501: 'Unable to create asset information from here'},
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
new file mode 100644
index 00000000..caf19109
--- /dev/null
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -0,0 +1,91 @@
+import pathlib
+import sys
+import os
+import json
+import argparse
+from opentera.config.ConfigManager import ConfigManager
+from opentera.redis.RedisClient import RedisClient
+from opentera.db.models.TeraAsset import TeraAsset
+from opentera.db.models.TeraService import TeraService
+from opentera.db.models.TeraSession import TeraSession
+from opentera.db.models.TeraParticipant import TeraParticipant
+
+import requests
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='AssetsArchiveWorker')
+    parser.add_argument('--config', help='Configuration file.', default='config/TeraServerConfig.ini')
+    parser.add_argument('--job_id', help='Unique job id to execute, fetched from redis')
+    parser.add_argument('--verify', help='Verify certificate', default=False)
+    args = parser.parse_args()
+
+    # Load configuration
+    config = ConfigManager()
+    config.load_config(args.config)
+
+    # Setup DB
+    db_url = 'postgresql://%(username)s:%(password)s@%(url)s:%(port)s/%(name)s' % config.db_config
+    db_engine = create_engine(db_url, echo=False)
+
+    # Create a sessionmaker
+    SessionMaker = sessionmaker(bind=db_engine)
+
+    # Load redis job info
+    redis_client = RedisClient(config.redis_config)
+    job_info = json.loads(redis_client.redisGet(args.job_id))
+
+    if 'service_key' not in job_info:
+        print('Service key not found in job info')
+        sys.exit(1)
+
+    if 'server_name' not in job_info:
+        print('Server name not found in job info')
+        sys.exit(1)
+
+    if 'port' not in job_info:
+        print('Port not found in job info')
+        sys.exit(1)
+
+    if 'assets' not in job_info:
+        print('Assets not found in job info')
+        sys.exit(1)
+
+    server_name = job_info['server_name']
+    port = job_info['port']
+    service_key = job_info['service_key'].encode('utf-8')
+
+    for asset in job_info['assets']:
+        with (SessionMaker() as db_session):
+            path = asset['path'] if 'path' in asset else ''
+
+            # Query service from database
+            service: TeraService = db_session.query(TeraService) \
+                .filter(TeraService.service_uuid == asset['asset_service_uuid']).first()
+
+            if service is None:
+                continue
+
+            service_token = service.get_token(service_key)
+
+            # Generate key for asset, request by service
+            access_token = TeraAsset.get_access_token([asset['asset_uuid']], service_key,
+                                                      asset['asset_service_uuid'])
+
+            # Generate headers to request file
+            headers = {'Authorization': 'OpenTera ' + service_token}
+            params = {'access_token': access_token, 'asset_uuid': asset['asset_uuid']}
+
+            # Request file from service
+            url = 'https://' + server_name + ':' + str(port) + service.service_clientendpoint + '/api/assets'
+
+            # Certificate will be verified if verify arg is True
+            response = requests.get(url=url, params=params, headers=headers, verify=args.verify)
+
+            if response.status_code == 200:
+                # Save file
+                file_size = len(response.content)
+
+
+    print(config, job_info)
\ No newline at end of file
diff --git a/teraserver/python/workers/__init__.py b/teraserver/python/workers/__init__.py
new file mode 100644
index 00000000..e69de29b

From c19f983aabed5adf3d51117bebf1009a9d7757f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 10 Apr 2024 12:34:53 -0400
Subject: [PATCH 09/36] Refs #248 Avoid having database access in worker.

---
 .../API/user/UserQueryAssetsArchive.py        | 57 ++++++++++++++++---
 .../python/workers/AssetsArchiveWorker.py     | 29 +++-------
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 617bdda7..527267aa 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -49,7 +49,21 @@ def get(self):
         args = get_parser.parse_args()
         user_access = DBManager.userAccess(current_user)
 
-        assets_list = []
+        asset_map_per_service = {}
+
+        service_key = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
+
+        # Load all enabled services and store information
+        for service in TeraService.query_with_filters({'service_enabled': True}):
+            if service.service_key == 'OpenTeraServer':
+                continue
+
+            service_token = service.get_token(service_key)
+            # Fill all required info for service
+            asset_map_per_service[service.service_key] = {'service_uuid': service.service_uuid,
+                                                          'service_assets': [],
+                                                          'service_endpoint': service.service_clientendpoint,
+                                                          'service_token': service_token}
 
         # Base server information
         service_key: bytes = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
@@ -68,8 +82,10 @@ def get(self):
 
         def add_asset_to_list(asset: TeraAsset, path: str = ''):
             value = asset.to_json(minimal=False)
-            value['path'] = f"{path}/{asset.asset_name}"
-            assets_list.append(value)
+            value['path'] = f"{path}"
+            current_service = TeraService.get_service_by_uuid(asset.asset_service_uuid)
+            if current_service.service_key in asset_map_per_service:
+                asset_map_per_service[current_service.service_key]['service_assets'].append(value)
 
         def get_assets_for_session(sess: TeraSession, path: str = ''):
             assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
@@ -94,26 +110,51 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
 
             p = TeraProject.get_project_by_id(args['id_project'])
             site = p.project_site
-            get_assets_for_project(p, site.site_name)
+            get_assets_for_project(p, f"/{site.site_name}")
 
         elif args['id_participant'] is not None:
             # Get all assets for participant
-            pass
+            if args['id_participant'] not in user_access.get_accessible_participants_ids():
+                return gettext('Forbidden'), 403
+
+            participant = TeraParticipant.get_participant_by_id(args['id_participant'])
+            project = participant.participant_project
+            site = project.project_site
+            get_assets_for_participant(participant,
+                                       f"/{site.site_name}/{project.projet_name}")
+
         elif args['id_session'] is not None:
             # Get all assets for session
-            pass
+            if args['id_session'] not in user_access.get_accessible_sessions_ids():
+                return gettext('Forbidden'), 403
+
+            sess = TeraSession.get_session_by_id(args['id_session'])
+
+            # Session is not related to a participant, get all assets with no path
+            if len(sess.session_participants) == 0:
+                get_assets_for_session(sess)
+            else:
+                for participant in sess.session_participants:
+                    project = participant.participant_project
+                    site = project.project_site
+                    get_assets_for_session(sess,
+                                           f"/{site.site_name}/{project.project_name}/{participant.participant_name}")
+
         else:
             return gettext('Missing required parameter'), 400
 
         # Create a job ID (will need a better way to generate ids)
         job_id = 'job.id.1'
 
+        # Clean up unused service in asset map
+        asset_map_per_service = {k: v for k, v in asset_map_per_service.items() if len(v['service_assets']) > 0}
+
         job_info = {'job_id': job_id,
                     'server_name': server_name,
                     'port': port,
                     'service_key': service_key.decode('utf-8'),
                     'status': 'running',
-                    'assets': assets_list}
+                    'assets_map': asset_map_per_service}
 
         # TODO set job information with expiration
         self.module.redisSet(job_id, json.dumps(job_info), ex=60)
@@ -123,7 +164,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
                    '--job_id', job_id]
         process = subprocess.Popen(command)
 
-        return assets_list
+        return asset_map_per_service
 
         # user_access = DBManager.userAccess(current_user)
         #
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index caf19109..3284bf2f 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -11,8 +11,7 @@
 from opentera.db.models.TeraParticipant import TeraParticipant
 
 import requests
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='AssetsArchiveWorker')
@@ -25,13 +24,6 @@
     config = ConfigManager()
     config.load_config(args.config)
 
-    # Setup DB
-    db_url = 'postgresql://%(username)s:%(password)s@%(url)s:%(port)s/%(name)s' % config.db_config
-    db_engine = create_engine(db_url, echo=False)
-
-    # Create a sessionmaker
-    SessionMaker = sessionmaker(bind=db_engine)
-
     # Load redis job info
     redis_client = RedisClient(config.redis_config)
     job_info = json.loads(redis_client.redisGet(args.job_id))
@@ -48,7 +40,7 @@
         print('Port not found in job info')
         sys.exit(1)
 
-    if 'assets' not in job_info:
+    if 'assets_map' not in job_info:
         print('Assets not found in job info')
         sys.exit(1)
 
@@ -56,18 +48,11 @@
     port = job_info['port']
     service_key = job_info['service_key'].encode('utf-8')
 
-    for asset in job_info['assets']:
-        with (SessionMaker() as db_session):
-            path = asset['path'] if 'path' in asset else ''
+    for _, service_data in job_info['assets_map'].items():
+        for asset in service_data['service_assets']:
 
-            # Query service from database
-            service: TeraService = db_session.query(TeraService) \
-                .filter(TeraService.service_uuid == asset['asset_service_uuid']).first()
-
-            if service is None:
-                continue
-
-            service_token = service.get_token(service_key)
+            path = asset['path'] if 'path' in asset else ''
+            service_token = service_data['service_token']
 
             # Generate key for asset, request by service
             access_token = TeraAsset.get_access_token([asset['asset_uuid']], service_key,
@@ -78,7 +63,7 @@
             params = {'access_token': access_token, 'asset_uuid': asset['asset_uuid']}
 
             # Request file from service
-            url = 'https://' + server_name + ':' + str(port) + service.service_clientendpoint + '/api/assets'
+            url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
 
             # Certificate will be verified if verify arg is True
             response = requests.get(url=url, params=params, headers=headers, verify=args.verify)

From 78139fe5ee6e65b45148121942c6e2ff2dc6fc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 10 Apr 2024 16:47:30 -0400
Subject: [PATCH 10/36] Refs #248 First version of archives in DB. Not working
 yet.

---
 .../API/user/UserQueryAssetsArchive.py        | 81 ++--------------
 .../API/QueryArchiveFile.py                   | 92 +++++++++++++++++++
 .../API/QueryArchiveFileInfos.py              | 70 ++++++++++++++
 .../FileTransferService/FlaskModule.py        |  4 +
 .../db/models/ArchiveFileData.py              | 56 +++++++++++
 .../db/models/__init__.py                     |  3 +-
 .../python/workers/AssetsArchiveWorker.py     | 68 +++++++++-----
 7 files changed, 279 insertions(+), 95 deletions(-)
 create mode 100644 teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
 create mode 100644 teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
 create mode 100644 teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 527267aa..6e31b01e 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -18,6 +18,7 @@
 import json
 from modules.DatabaseModule.DBManager import DBManager
 from opentera.redis.RedisVars import RedisVars
+import datetime
 
 # Parser definition(s)
 # GET
@@ -149,12 +150,18 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
         # Clean up unused service in asset map
         asset_map_per_service = {k: v for k, v in asset_map_per_service.items() if len(v['service_assets']) > 0}
 
+        # Generate archive file name with current time
+        # create a string with the current date and time
+        archive_name = f"{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}_archive.zip"
+
         job_info = {'job_id': job_id,
                     'server_name': server_name,
                     'port': port,
                     'service_key': service_key.decode('utf-8'),
                     'status': 'running',
-                    'assets_map': asset_map_per_service}
+                    'assets_map': asset_map_per_service,
+                    'owner_uuid': current_user.user_uuid,
+                    'archive_name': archive_name}
 
         # TODO set job information with expiration
         self.module.redisSet(job_id, json.dumps(job_info), ex=60)
@@ -166,78 +173,6 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
 
         return asset_map_per_service
 
-        # user_access = DBManager.userAccess(current_user)
-        #
-        # service_key = self.module.redisGet(RedisVars.RedisVar_ServiceTokenAPIKey)
-        # servername = self.module.config.server_config['hostname']
-        # port = self.module.config.server_config['port']
-        # if 'X_EXTERNALSERVER' in request.headers:
-        #     servername = request.headers['X_EXTERNALSERVER']
-        #
-        # if 'X_EXTERNALPORT' in request.headers:
-        #     port = request.headers['X_EXTERNALPORT']
-        #
-        # # Load all enabled services
-        # services_infos = {service.service_uuid: service.service_clientendpoint
-        #                   for service in TeraService.query_with_filters({'service_enabled': True})}
-        #
-        # # Create an in-memory binary stream to store the zip file
-        # zip_buffer = BytesIO()
-        #
-        # # Create a ZipFile object to write to the in-memory stream
-        # with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
-        #
-        #     project: TeraProject = TeraProject.get_project_by_id(1)
-        #     site = project.project_site
-        #
-        #     # Already filtered with accessible participants
-        #     participants: list[TeraParticipant] = user_access.query_all_participants_for_project(project.id_project)
-        #
-        #     for participant in participants:
-        #         # Get all assets from participant
-        #         sessions: list[TeraSession] = TeraSession.get_sessions_for_participant(participant.id_participant)
-        #
-        #         for sess in sessions:
-        #             assets: list[TeraAsset] = TeraAsset.get_assets_for_session(sess.id_session)
-        #             for asset in assets:
-        #
-        #                 # Verify if service is enabled
-        #                 if asset.asset_service_uuid in services_infos and asset.asset_service_owner:
-        #
-        #                     # Get the file (from the service that created the file)
-        #                     service = asset.asset_service_owner
-        #                     service_token = service.get_token(service_key)
-        #
-        #                     # Generate access token
-        #                     access_token = asset.get_access_token([asset.asset_uuid], service_key,
-        #                                                           service.service_uuid)
-        #
-        #                     # What to do with duplicated names ?
-        #                     filepath = site.site_name + '/' + project.project_name + '/' + participant.participant_name \
-        #                                + '/' + sess.session_name + '/' + asset.asset_name
-        #
-        #                     # Generate URL to fetch asset
-        #                     params = {'access_token': access_token, 'asset_uuid': asset.asset_uuid}
-        #                     url = 'https://' + servername + ':' + str(port) \
-        #                           + services_infos[asset.asset_service_uuid] + '/api/assets'
-        #
-        #                     headers = {'Authorization': 'OpenTera ' + service_token}
-        #                     response = requests.get(url=url, params=params, headers=headers, verify=False)
-        #
-        #                     if response.status_code == 200:
-        #                         zip_file.writestr(filepath, response.content)
-        #
-        # # Set the BytesIO object's position to the beginning
-        # zip_buffer.seek(0)
-        #
-        # # Create a Flask response with the zip file as the data
-        # response = Response(zip_buffer.getvalue(), mimetype='application/zip')
-        #
-        # # Set appropriate content-disposition headers
-        # response.headers['Content-Disposition'] = 'attachment; filename=data.zip'
-        #
-        # return response
-
     @api.doc(description='Create asset archive.',
              responses={501: 'Unable to create asset information from here'},
              params={'token': 'Secret token'})
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
new file mode 100644
index 00000000..91c9b718
--- /dev/null
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -0,0 +1,92 @@
+import os
+from datetime import datetime
+import json
+from werkzeug.utils import secure_filename
+from flask import request, send_file
+from flask_babel import gettext
+from flask_restx import Resource
+from services.FileTransferService.FlaskModule import file_api_ns as api
+from opentera.services.ServiceAccessManager import ServiceAccessManager, current_service_client, \
+    current_login_type, current_user_client, current_device_client, current_participant_client, LoginType
+from services.FileTransferService.FlaskModule import flask_app
+from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
+import services.FileTransferService.Globals as Globals
+
+# Parser definition(s)
+get_parser = api.parser()
+
+get_parser.add_argument('archive_uuid', type=str, required=True, help='UUID of the asset to download')
+
+delete_parser = api.parser()
+delete_parser.add_argument('uuid', type=str, required=True, help='UUID of the archive do delete')
+
+
+class QueryArchiveFile(Resource):
+
+    def __init__(self, _api, *args, **kwargs):
+        Resource.__init__(self, _api, *args, **kwargs)
+        self.module = kwargs.get('flaskModule', None)
+        self.test = kwargs.get('test', False)
+
+    @api.expect(get_parser, validate=True)
+    @api.doc(description='Download archive',
+             responses={200: 'Success - start download!',
+                        400: 'Bad request',
+                        403: 'Access denied to the requested asset'})
+    @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
+    def get(self):
+        args = get_parser.parse_args()
+
+        # TODO verify permissions
+        archive = ArchiveFileData.get_archive_by_uuid(args['archive_uuid'])
+        if archive is None:
+            return gettext('No asset found'), 404
+
+        src_dir = flask_app.config['UPLOAD_FOLDER']
+
+        filename = archive.archive_original_filename
+        return send_file(src_dir + '/' + str(archive.archive_uuid), as_attachment=True, download_name=filename)
+
+    @api.doc(description='Upload a new file archive to the service',
+             responses={200: 'Success - Return information about archive',
+                        400: 'Required parameter is missing',
+                        403: 'Access denied to the requested asset'})
+    @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=True)
+    def post(self):
+        if not request.content_type.__contains__('multipart/form-data'):
+            return gettext('Wrong content type'), 400
+
+        if 'file_archive' not in request.form:
+            return gettext('Missing file asset information'), 400
+
+        if 'file' not in request.files:
+            return gettext('Missing uploaded file'), 400
+
+        file = request.files['file']
+
+        if not file.filename:
+            return gettext('Missing filename'), 400
+
+        return gettext("Not implemented"), 501
+
+    @api.expect(delete_parser, validate=True)
+    @api.doc(description='Delete archive',
+             responses={200: 'Success - archive deleted',
+                        400: 'Bad request',
+                        403: 'Access denied to the requested archive'})
+    @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
+    def delete(self):
+        parser = delete_parser
+
+        args = parser.parse_args()
+        uuid_todel = args['uuid']
+
+        # TODO Verify permissions
+
+        # Delete from OpenTera Server
+        archive = ArchiveFileData.get_archive_by_uuid(uuid_todel)
+        if archive is None:
+            return gettext('No archive found'), 404
+
+        archive.delete_file_archive(flask_app.config['UPLOAD_FOLDER'])
+        return 'Archive deleted', 200
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
new file mode 100644
index 00000000..7ce6cfec
--- /dev/null
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -0,0 +1,70 @@
+from flask import request
+from flask_babel import gettext
+from flask_restx import Resource
+from services.FileTransferService.FlaskModule import file_api_ns as api
+from opentera.services.ServiceAccessManager import ServiceAccessManager
+from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
+import services.FileTransferService.Globals as Globals
+
+# Parser definition(s)
+get_parser = api.parser()
+
+get_parser.add_argument('archive_uuid', type=str, required=True, help='UUID of the archive to get info')
+
+post_schema = api.schema_model('archive',
+                               {'properties':
+                                   {
+                                       'archive_uuid':
+                                           {
+                                               'type': 'string',
+                                               'location': 'json'
+                                           }
+                                   }
+                                })
+
+
+class QueryArchiveFileInfos(Resource):
+    def __init__(self, _api, *args, **kwargs):
+        Resource.__init__(self, _api, *args, **kwargs)
+        self.module = kwargs.get('flaskModule', None)
+        self.test = kwargs.get('test', False)
+
+    @api.expect(get_parser, validate=True)
+    @api.doc(description='Query information about stored archive',
+             responses={200: 'Success - Return information about archive',
+                        400: 'Bad request',
+                        403: 'Access denied to the requested archive'})
+    @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
+    def get(self):
+        args = get_parser.parse_args()
+
+        # TODO verify archive access
+        archive = ArchiveFileData.get_archive_by_uuid(uuid_archive=args['archive_uuid'])
+
+        if not archive:
+            return gettext('No archive found'), 404
+
+        return archive.to_json()
+
+    @api.expect(post_schema)
+    @api.doc(description='Update information about stored archive',
+             responses={200: 'Success - Return information about file archive',
+                        400: 'Required parameter is missing',
+                        403: 'Access denied to the requested archive'})
+    @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=True)
+    def post(self):
+        if 'archive' not in request.json:
+            return gettext('Badly formatted request'), 400
+
+        archive_info = request.json['archive']
+        # if 'id_archive_file_data' not in archive_info:
+        #     return gettext('Badly formatted request'), 400
+        #
+        # if archive_info['id_archive_file_data'] == 0:
+        #     # Create new archive
+        #     archive = ArchiveFileData()
+        #     ArchiveFileData.insert(archive)
+
+        return gettext('Not implemented yet'), 501
+
+
diff --git a/teraserver/python/services/FileTransferService/FlaskModule.py b/teraserver/python/services/FileTransferService/FlaskModule.py
index 09726a19..d651619c 100644
--- a/teraserver/python/services/FileTransferService/FlaskModule.py
+++ b/teraserver/python/services/FileTransferService/FlaskModule.py
@@ -233,9 +233,13 @@ def init_api(module: object, namespace: Namespace, additional_args: dict = dict(
 
         from services.FileTransferService.API.QueryAssetFileInfos import QueryAssetFileInfos
         from services.FileTransferService.API.QueryAssetFile import QueryAssetFile
+        from services.FileTransferService.API.QueryArchiveFileInfos import QueryArchiveFileInfos
+        from services.FileTransferService.API.QueryArchiveFile import QueryArchiveFile
 
         namespace.add_resource(QueryAssetFileInfos, '/assets/infos', resource_class_kwargs=kwargs)
         namespace.add_resource(QueryAssetFile,      '/assets', resource_class_kwargs=kwargs)
+        namespace.add_resource(QueryArchiveFileInfos, '/archives/infos', resource_class_kwargs=kwargs)
+        namespace.add_resource(QueryArchiveFile,      '/archives', resource_class_kwargs=kwargs)
 
     def init_views(self):
         # Default arguments
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
new file mode 100644
index 00000000..5601d87e
--- /dev/null
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
@@ -0,0 +1,56 @@
+
+from opentera.db.Base import BaseModel
+from sqlalchemy import exc
+from sqlalchemy import Column, ForeignKey, Sequence, Integer, String, BigInteger, TIMESTAMP
+import os
+from enum import Enum
+from datetime import datetime
+
+
+class TeraArchiveStatus(Enum):
+    STATUS_PENDING = 0
+    STATUS_INPROGRESS = 1
+    STATUS_COMPLETED = 2
+    STATUS_CANCELLED = 3
+    STATUS_TERMINATED = 4
+
+
+class ArchiveFileData(BaseModel):
+    __tablename__ = "t_archive_file_data"
+    id_archive_file_data = Column(Integer, Sequence('id_archive_file_data_sequence'), primary_key=True,
+                                  autoincrement=True)
+    archive_uuid = Column(String(36), nullable=False, unique=True)
+    archive_original_filename = Column(String, nullable=False)
+    archive_file_size = Column(BigInteger, nullable=False, default=0)
+
+    archive_datetime = Column(TIMESTAMP(timezone=True), nullable=False, default=lambda: str(datetime.now()))
+    archive_expiration_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
+    archive_status = Column(Integer, nullable=False, default=TeraArchiveStatus.STATUS_PENDING.value)
+    archive_owner_uuid = Column(String(36), nullable=False)
+
+    @staticmethod
+    def get_archive_by_uuid(uuid_archive: str):
+        return ArchiveFileData.query.filter_by(archive_uuid=uuid_archive).first()
+
+    @staticmethod
+    def get_archive_by_id(id_archive: int):
+        return ArchiveFileData.query.filter_by(id_archive_file_data=id_archive).first()
+
+    # Delete this archive. file_folder is required to delete the file too.
+    def delete_file_archive(self, file_folder: str) -> bool:
+        # Delete related file from system
+        file_name = os.path.join(file_folder, self.archive_uuid)
+        if os.path.exists(file_name):
+            os.remove(file_name)
+        else:
+            return False
+
+        # Delete self from database
+        try:
+            self.db().session.delete(self)
+            self.commit()
+        except exc.SQLAlchemyError:
+            return False
+
+        return True
+
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/__init__.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/__init__.py
index 4dd05a2c..469342cd 100644
--- a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/__init__.py
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/__init__.py
@@ -1,3 +1,4 @@
 # All exported symbols
 from .AssetFileData import AssetFileData
-__all__ = ['AssetFileData']
+from .ArchiveFileData import ArchiveFileData
+__all__ = ['AssetFileData', 'ArchiveFileData']
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 3284bf2f..8ae57ebd 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -3,14 +3,14 @@
 import os
 import json
 import argparse
+from datetime import datetime
 from opentera.config.ConfigManager import ConfigManager
 from opentera.redis.RedisClient import RedisClient
 from opentera.db.models.TeraAsset import TeraAsset
-from opentera.db.models.TeraService import TeraService
-from opentera.db.models.TeraSession import TeraSession
-from opentera.db.models.TeraParticipant import TeraParticipant
-
+import zipfile
+from io import BytesIO
 import requests
+import tempfile
 
 
 if __name__ == '__main__':
@@ -20,6 +20,8 @@
     parser.add_argument('--verify', help='Verify certificate', default=False)
     args = parser.parse_args()
 
+    start_time = datetime.now()
+
     # Load configuration
     config = ConfigManager()
     config.load_config(args.config)
@@ -48,29 +50,53 @@
     port = job_info['port']
     service_key = job_info['service_key'].encode('utf-8')
 
-    for _, service_data in job_info['assets_map'].items():
-        for asset in service_data['service_assets']:
+    # Create an in-memory binary stream to store the zip file
+    # zip_buffer = BytesIO()
+
+    # Create a temporary file to store the zip file, deleted when closed
+    zip_buffer = tempfile.NamedTemporaryFile(delete=True)
+
+    # Create a ZipFile object to write to the in-memory stream
+    with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
+
+        for _, service_data in job_info['assets_map'].items():
+            for asset in service_data['service_assets']:
+
+                path = asset['path'] if 'path' in asset else ''
+                service_token = service_data['service_token']
+
+                # Generate key for asset, request by service
+                access_token = TeraAsset.get_access_token([asset['asset_uuid']], service_key,
+                                                          asset['asset_service_uuid'])
+
+                # Generate headers to request file
+                headers = {'Authorization': 'OpenTera ' + service_token}
+                params = {'access_token': access_token, 'asset_uuid': asset['asset_uuid']}
+
+                # Request file from service
+                url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
+
+                # Certificate will be verified if verify arg is True
+                response = requests.get(url=url, params=params, headers=headers, verify=args.verify)
 
-            path = asset['path'] if 'path' in asset else ''
-            service_token = service_data['service_token']
+                if response.status_code == 200:
+                    # Add to zip file
+                    file_path = pathlib.Path(path) / pathlib.Path(f"[{asset['asset_uuid']}]_{asset['asset_name']}")
+                    # Compress
+                    zip_file.writestr(str(file_path), response.content)
 
-            # Generate key for asset, request by service
-            access_token = TeraAsset.get_access_token([asset['asset_uuid']], service_key,
-                                                      asset['asset_service_uuid'])
+    # Set the BytesIO object's position to the beginning
+    zip_buffer.seek(0)
 
-            # Generate headers to request file
-            headers = {'Authorization': 'OpenTera ' + service_token}
-            params = {'access_token': access_token, 'asset_uuid': asset['asset_uuid']}
+    # Transfer file to file transfer service
 
-            # Request file from service
-            url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
 
-            # Certificate will be verified if verify arg is True
-            response = requests.get(url=url, params=params, headers=headers, verify=args.verify)
+    # Close will automatically delete file
+    zip_buffer.close()
+    end_time = datetime.now()
+    duration_s = (end_time - start_time).total_seconds()
+    print(f"Duration: {duration_s}")
 
-            if response.status_code == 200:
-                # Save file
-                file_size = len(response.content)
 
 
     print(config, job_info)
\ No newline at end of file

From bf73b974a19f7ff4640dbd4e1e084131e571282b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Thu, 11 Apr 2024 12:11:31 -0400
Subject: [PATCH 11/36] Refs #248 Creating archive info, need to upload next.

---
 .../API/user/UserQueryAssetsArchive.py        | 34 +++++++--
 .../API/QueryArchiveFile.py                   |  6 +-
 .../API/QueryArchiveFileInfos.py              | 76 +++++++++++++++----
 .../db/models/ArchiveFileData.py              |  3 +-
 .../python/workers/AssetsArchiveWorker.py     | 35 +++++++--
 5 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 6e31b01e..a25ca7d0 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -145,7 +145,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
             return gettext('Missing required parameter'), 400
 
         # Create a job ID (will need a better way to generate ids)
-        job_id = 'job.id.1'
+        job_id = f"worker.id.user.{current_user.user_uuid}.{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}"
 
         # Clean up unused service in asset map
         asset_map_per_service = {k: v for k, v in asset_map_per_service.items() if len(v['service_assets']) > 0}
@@ -154,14 +154,38 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
         # create a string with the current date and time
         archive_name = f"{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}_archive.zip"
 
+        # Create archive basic entry in file transfer service
+        archive_info = {
+                            'archive':
+                            {
+                                'id_archive_file_data': 0,
+                                'archive_original_filename': archive_name,
+                                'archive_owner_uuid': current_user.user_uuid
+                            }
+                       }
+
+        # Send archive information to file transfer service
+        # TODO TLS verification
+        file_transfer_service_token = TeraService.get_service_by_key('FileTransferService').get_token(service_key)
+        archive_file_infos_url = f"https://{server_name}:{port}/file/api/archives/infos"
+        archive_file_upload_url = f"https://{server_name}:{port}/file/api/archives"
+
+        response = requests.post(archive_file_infos_url, json=archive_info,
+                                 headers={'Authorization': 'OpenTera ' + file_transfer_service_token}, verify=False)
+
+        if response.status_code != 200:
+            return gettext('Unable to create archive information from FileTransferService'), 501
+
         job_info = {'job_id': job_id,
                     'server_name': server_name,
                     'port': port,
                     'service_key': service_key.decode('utf-8'),
-                    'status': 'running',
+                    'archive_file_infos_url': archive_file_infos_url,
+                    'archive_file_upload_url': archive_file_upload_url,
+                    'service_token': file_transfer_service_token,
                     'assets_map': asset_map_per_service,
-                    'owner_uuid': current_user.user_uuid,
-                    'archive_name': archive_name}
+                    'archive_info': response.json()
+                    }
 
         # TODO set job information with expiration
         self.module.redisSet(job_id, json.dumps(job_info), ex=60)
@@ -171,7 +195,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
                    '--job_id', job_id]
         process = subprocess.Popen(command)
 
-        return asset_map_per_service
+        return response.json()
 
     @api.doc(description='Create asset archive.',
              responses={501: 'Unable to create asset information from here'},
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 91c9b718..bc0d1674 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -40,7 +40,7 @@ def get(self):
         # TODO verify permissions
         archive = ArchiveFileData.get_archive_by_uuid(args['archive_uuid'])
         if archive is None:
-            return gettext('No asset found'), 404
+            return gettext('No archive found'), 404
 
         src_dir = flask_app.config['UPLOAD_FOLDER']
 
@@ -57,7 +57,7 @@ def post(self):
             return gettext('Wrong content type'), 400
 
         if 'file_archive' not in request.form:
-            return gettext('Missing file asset information'), 400
+            return gettext('Missing file archive information'), 400
 
         if 'file' not in request.files:
             return gettext('Missing uploaded file'), 400
@@ -89,4 +89,4 @@ def delete(self):
             return gettext('No archive found'), 404
 
         archive.delete_file_archive(flask_app.config['UPLOAD_FOLDER'])
-        return 'Archive deleted', 200
+        return gettext('Archive deleted'), 200
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
index 7ce6cfec..1ebb0694 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -2,7 +2,7 @@
 from flask_babel import gettext
 from flask_restx import Resource
 from services.FileTransferService.FlaskModule import file_api_ns as api
-from opentera.services.ServiceAccessManager import ServiceAccessManager
+from opentera.services.ServiceAccessManager import ServiceAccessManager, current_service_client, current_user_client
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
 import services.FileTransferService.Globals as Globals
 
@@ -14,13 +14,29 @@
 post_schema = api.schema_model('archive',
                                {'properties':
                                    {
-                                       'archive_uuid':
-                                           {
-                                               'type': 'string',
-                                               'location': 'json'
-                                           }
+                                        'id_archive_file_data':
+                                        {
+                                           'type': 'integer',
+                                           'location': 'json'
+                                        },
+                                        'archive_original_filename':
+                                        {
+                                           'type': 'string',
+                                           'location': 'json'
+                                        },
+                                        'archive_owner_uuid':
+                                        {
+                                              'type': 'string',
+                                              'location': 'json'
+                                        },
+                                        'archive_status':
+                                        {
+                                              'type': 'integer',
+                                              'location': 'json'
+                                        }
                                    }
-                                })
+                                }
+                               )
 
 
 class QueryArchiveFileInfos(Resource):
@@ -46,7 +62,7 @@ def get(self):
 
         return archive.to_json()
 
-    @api.expect(post_schema)
+    @api.expect(post_schema, validate=False)
     @api.doc(description='Update information about stored archive',
              responses={200: 'Success - Return information about file archive',
                         400: 'Required parameter is missing',
@@ -57,14 +73,42 @@ def post(self):
             return gettext('Badly formatted request'), 400
 
         archive_info = request.json['archive']
-        # if 'id_archive_file_data' not in archive_info:
-        #     return gettext('Badly formatted request'), 400
-        #
-        # if archive_info['id_archive_file_data'] == 0:
-        #     # Create new archive
-        #     archive = ArchiveFileData()
-        #     ArchiveFileData.insert(archive)
 
-        return gettext('Not implemented yet'), 501
+        if 'id_archive_file_data' not in archive_info:
+            return gettext('Badly formatted request'), 400
+
+        if 'archive_original_filename' not in archive_info:
+            return gettext('Missing original filename'), 400
+
+        if 'archive_owner_uuid' not in archive_info:
+            return gettext('Missing owner UUID'), 400
+
+        if archive_info['id_archive_file_data'] == 0:
+            archive = ArchiveFileData()
+            try:
+                archive.from_json(archive_info)
+                ArchiveFileData.insert(archive)
+            except Exception as e:
+                return gettext('Error parsing archive information'), 400
+
+            return archive.to_json()
 
+        else:
+            # Only allow status update for now
+            archive = ArchiveFileData.get_archive_by_id(archive_info['id_archive_file_data'])
+            if archive is None:
+                return gettext('No archive found'), 404
+
+            if 'archive_status' not in archive_info:
+                return gettext('Missing archive status'), 400
+            else:
+                try:
+                    archive.archive_status = archive_info['archive_status']
+                    archive.commit()
+                except Exception as e:
+                    return gettext('Error parsing archive information'), 400
+
+                return archive.to_json()
+
+            return gettext('Badly formatted request'), 400
 
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
index 5601d87e..a11b1c05 100644
--- a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
@@ -5,6 +5,7 @@
 import os
 from enum import Enum
 from datetime import datetime
+import uuid
 
 
 class TeraArchiveStatus(Enum):
@@ -19,7 +20,7 @@ class ArchiveFileData(BaseModel):
     __tablename__ = "t_archive_file_data"
     id_archive_file_data = Column(Integer, Sequence('id_archive_file_data_sequence'), primary_key=True,
                                   autoincrement=True)
-    archive_uuid = Column(String(36), nullable=False, unique=True)
+    archive_uuid = Column(String(36), nullable=False, unique=True, default=lambda: str(uuid.uuid4()))
     archive_original_filename = Column(String, nullable=False)
     archive_file_size = Column(BigInteger, nullable=False, default=0)
 
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 8ae57ebd..e1d8921d 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -30,29 +30,54 @@
     redis_client = RedisClient(config.redis_config)
     job_info = json.loads(redis_client.redisGet(args.job_id))
 
+    if 'server_name' not in job_info:
+        print('server_name not found in job info')
+        sys.exit(1)
+
     if 'service_key' not in job_info:
-        print('Service key not found in job info')
+        print('service_key not found in job info')
         sys.exit(1)
 
-    if 'server_name' not in job_info:
-        print('Server name not found in job info')
+    if 'service_token' not in job_info:
+        print('service_token not found in job info')
         sys.exit(1)
 
     if 'port' not in job_info:
-        print('Port not found in job info')
+        print('port not found in job info')
+        sys.exit(1)
+
+    if 'archive_file_infos_url' not in job_info:
+        print('archive_file_infos_url not found in job info')
+        sys.exit(1)
+
+    if 'archive_file_upload_url' not in job_info:
+        print('archive_file_upload_url not found in job info')
         sys.exit(1)
 
     if 'assets_map' not in job_info:
         print('Assets not found in job info')
         sys.exit(1)
 
+    if 'archive_info' not in job_info:
+        print('Archive info not found in job info')
+        sys.exit(1)
+
     server_name = job_info['server_name']
+    service_key = job_info['service_key']
+    service_token = job_info['service_token']
     port = job_info['port']
-    service_key = job_info['service_key'].encode('utf-8')
+    archive_file_infos_url = job_info['archive_file_infos_url']
+    archive_file_upload_url = job_info['archive_file_upload_url']
+    archive_info = job_info['archive_info']
 
     # Create an in-memory binary stream to store the zip file
     # zip_buffer = BytesIO()
 
+    # Change status of the file transfer to 'in progress'
+    archive_info['archive_status'] = 1 # STATUS_INPROGRESS
+    response = requests.post(archive_file_infos_url, json={'archive': archive_info},
+                             headers={'Authorization': 'OpenTera ' + job_info['service_token']}, verify=args.verify)
+
     # Create a temporary file to store the zip file, deleted when closed
     zip_buffer = tempfile.NamedTemporaryFile(delete=True)
 

From 75a7bac749d5ef098cb45b73dab1e1428d6ca20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Thu, 11 Apr 2024 15:22:02 -0400
Subject: [PATCH 12/36] Refs #248, working file archive upload from worker.

---
 .../API/user/UserQueryAssetsArchive.py        |   6 -
 .../API/QueryArchiveFile.py                   | 112 +++++++++++++++---
 .../API/QueryArchiveFileInfos.py              |  24 +++-
 .../API/QueryAssetFileInfos.py                |   8 +-
 .../db/models/ArchiveFileData.py              |   4 +-
 .../python/workers/AssetsArchiveWorker.py     |   9 +-
 6 files changed, 131 insertions(+), 32 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index a25ca7d0..1da9cbe0 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -197,12 +197,6 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
 
         return response.json()
 
-    @api.doc(description='Create asset archive.',
-             responses={501: 'Unable to create asset information from here'},
-             params={'token': 'Secret token'})
-    @user_multi_auth.login_required
-    def post(self):
-        pass
 
 
 
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index bc0d1674..9464582a 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -1,7 +1,6 @@
 import os
 from datetime import datetime
 import json
-from werkzeug.utils import secure_filename
 from flask import request, send_file
 from flask_babel import gettext
 from flask_restx import Resource
@@ -10,12 +9,11 @@
     current_login_type, current_user_client, current_device_client, current_participant_client, LoginType
 from services.FileTransferService.FlaskModule import flask_app
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
-import services.FileTransferService.Globals as Globals
+from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import TeraArchiveStatus
 
 # Parser definition(s)
 get_parser = api.parser()
-
-get_parser.add_argument('archive_uuid', type=str, required=True, help='UUID of the asset to download')
+get_parser.add_argument('archive_uuid', type=str, required=True, help='UUID of the archive to download')
 
 delete_parser = api.parser()
 delete_parser.add_argument('uuid', type=str, required=True, help='UUID of the archive do delete')
@@ -32,32 +30,59 @@ def __init__(self, _api, *args, **kwargs):
     @api.doc(description='Download archive',
              responses={200: 'Success - start download!',
                         400: 'Bad request',
-                        403: 'Access denied to the requested asset'})
+                        403: 'Access denied to the requested archive'})
     @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
     def get(self):
         args = get_parser.parse_args()
 
-        # TODO verify permissions
+        if current_login_type == LoginType.USER_LOGIN:
+            requester_uuid = current_user_client.user_uuid
+        elif current_login_type == LoginType.DEVICE_LOGIN:
+            requester_uuid = current_device_client.device_uuid
+        elif current_login_type == LoginType.PARTICIPANT_LOGIN:
+            requester_uuid = current_participant_client.participant_uuid
+        elif current_login_type == LoginType.SERVICE_LOGIN:
+            requester_uuid = current_service_client.service_uuid
+        else:
+            requester_uuid = None
+
+        # Verify if the archive exists
         archive = ArchiveFileData.get_archive_by_uuid(args['archive_uuid'])
         if archive is None:
             return gettext('No archive found'), 404
 
+        # Verify ownership
+        if archive.owner_uuid != requester_uuid:
+            return gettext('Access denied to the requested archive'), 403
+
         src_dir = flask_app.config['UPLOAD_FOLDER']
 
+        # Send file
         filename = archive.archive_original_filename
         return send_file(src_dir + '/' + str(archive.archive_uuid), as_attachment=True, download_name=filename)
 
     @api.doc(description='Upload a new file archive to the service',
              responses={200: 'Success - Return information about archive',
                         400: 'Required parameter is missing',
-                        403: 'Access denied to the requested asset'})
+                        403: 'Access denied to the requested archive'})
     @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=True)
     def post(self):
+        if current_login_type == LoginType.USER_LOGIN:
+            uploader_uuid = current_user_client.user_uuid
+        elif current_login_type == LoginType.DEVICE_LOGIN:
+            uploader_uuid = current_device_client.device_uuid
+        elif current_login_type == LoginType.PARTICIPANT_LOGIN:
+            uploader_uuid = current_participant_client.participant_uuid
+        elif current_login_type == LoginType.SERVICE_LOGIN:
+            uploader_uuid = current_service_client.service_uuid
+        else:
+            uploader_uuid = None
+
         if not request.content_type.__contains__('multipart/form-data'):
             return gettext('Wrong content type'), 400
 
-        if 'file_archive' not in request.form:
-            return gettext('Missing file archive information'), 400
+        if 'archive' not in request.form:
+            return gettext('Missing archive information'), 400
 
         if 'file' not in request.files:
             return gettext('Missing uploaded file'), 400
@@ -67,6 +92,52 @@ def post(self):
         if not file.filename:
             return gettext('Missing filename'), 400
 
+        # Get the archive information
+        try:
+            archive_info = json.loads(request.form['archive'])
+
+            if 'id_archive_file_data' not in archive_info:
+                return gettext('Missing archive ID'), 400
+
+            archive = ArchiveFileData.get_archive_by_id(archive_info['id_archive_file_data'])
+            if archive is None:
+                return gettext('No archive found'), 404
+
+            if archive.archive_status == TeraArchiveStatus.STATUS_COMPLETED.value:
+                return gettext('Archive has already been uploaded.'), 404
+
+            if archive.archive_original_filename != file.filename:
+                return gettext('Filename does not match the archive information'), 400
+
+            # Get the data from the post
+            archive.archive_upload_datetime = datetime.now()
+            archive.archive_uploader_uuid = uploader_uuid
+
+            # Save the file
+            file_size = file.content_length
+            if file_size == 0:
+                # No specified content length - find the file size manually
+                file_size = file.seek(0, os.SEEK_END)
+                file.seek(0)
+
+            # Update file size
+            archive.archive_file_size = file_size
+
+            # Save filename = uuid
+            filename = os.path.join(flask_app.config['UPLOAD_FOLDER'], archive.archive_uuid)
+            # Save
+            file.save(filename)
+
+            # Update status
+            archive.archive_status = TeraArchiveStatus.STATUS_COMPLETED.value
+
+            # Update DB
+            archive.commit()
+
+            return archive.to_json()
+        except Exception as e:
+            return gettext('Error parsing archive information : ') + str(e), 400
+
         return gettext("Not implemented"), 501
 
     @api.expect(delete_parser, validate=True)
@@ -76,17 +147,28 @@ def post(self):
                         403: 'Access denied to the requested archive'})
     @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
     def delete(self):
-        parser = delete_parser
-
-        args = parser.parse_args()
+        args = delete_parser.parse_args()
         uuid_todel = args['uuid']
 
-        # TODO Verify permissions
-
-        # Delete from OpenTera Server
+        if current_login_type == LoginType.USER_LOGIN:
+            deleter_uuid = current_user_client.user_uuid
+        elif current_login_type == LoginType.DEVICE_LOGIN:
+            deleter_uuid = current_device_client.device_uuid
+        elif current_login_type == LoginType.PARTICIPANT_LOGIN:
+            deleter_uuid = current_participant_client.participant_uuid
+        elif current_login_type == LoginType.SERVICE_LOGIN:
+            deleter_uuid = current_service_client.service_uuid
+        else:
+            deleter_uuid = None
+
+        # Get archive
         archive = ArchiveFileData.get_archive_by_uuid(uuid_todel)
         if archive is None:
             return gettext('No archive found'), 404
 
+        if deleter_uuid != archive.archive_owner_uuid and deleter_uuid != archive.archive_uploader_uuid:
+            return gettext('Access denied to the requested archive'), 403
+
+        # Delete archive
         archive.delete_file_archive(flask_app.config['UPLOAD_FOLDER'])
         return gettext('Archive deleted'), 200
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
index 1ebb0694..92d0bd9b 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -3,8 +3,10 @@
 from flask_restx import Resource
 from services.FileTransferService.FlaskModule import file_api_ns as api
 from opentera.services.ServiceAccessManager import ServiceAccessManager, current_service_client, current_user_client
+from opentera.services.ServiceAccessManager import current_login_type, LoginType
+from opentera.services.ServiceAccessManager import current_device_client, current_participant_client
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
-import services.FileTransferService.Globals as Globals
+from werkzeug.utils import secure_filename
 
 # Parser definition(s)
 get_parser = api.parser()
@@ -54,13 +56,27 @@ def __init__(self, _api, *args, **kwargs):
     def get(self):
         args = get_parser.parse_args()
 
-        # TODO verify archive access
         archive = ArchiveFileData.get_archive_by_uuid(uuid_archive=args['archive_uuid'])
 
         if not archive:
             return gettext('No archive found'), 404
 
-        return archive.to_json()
+        if current_login_type == LoginType.USER_LOGIN:
+            if archive.archive_owner_uuid != current_user_client.user_uuid:
+                return gettext('Access denied for that archive'), 403
+            return archive.to_json()
+        elif current_login_type == LoginType.PARTICIPANT_LOGIN:
+            if archive.archive_owner_uuid != current_participant_client.participant_uuid:
+                return gettext('Access denied for that archive'), 403
+            return archive.to_json()
+        elif current_login_type == LoginType.DEVICE_LOGIN:
+            if archive.archive_owner_uuid != current_device_client.device_uuid:
+                return gettext('Access denied for that archive'), 403
+            return archive.to_json()
+        elif current_login_type == LoginType.SERVICE_LOGIN:
+            return archive.to_json()
+
+        return gettext('Access denied for that archive'), 403
 
     @api.expect(post_schema, validate=False)
     @api.doc(description='Update information about stored archive',
@@ -87,6 +103,8 @@ def post(self):
             archive = ArchiveFileData()
             try:
                 archive.from_json(archive_info)
+                # Make sure file name is secure
+                archive.archive_original_filename = secure_filename(archive.archive_original_filename)
                 ArchiveFileData.insert(archive)
             except Exception as e:
                 return gettext('Error parsing archive information'), 400
diff --git a/teraserver/python/services/FileTransferService/API/QueryAssetFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryAssetFileInfos.py
index 62d0fb53..ec8b45e3 100644
--- a/teraserver/python/services/FileTransferService/API/QueryAssetFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryAssetFileInfos.py
@@ -37,8 +37,8 @@ def __init__(self, _api, *args, **kwargs):
         self.test = kwargs.get('test', False)
 
     @api.expect(get_parser, validate=True)
-    @api.doc(description='Query informations about stored file',
-             responses={200: 'Success - Return informations about file',
+    @api.doc(description='Query information about stored file',
+             responses={200: 'Success - Return information about file',
                         400: 'Bad request',
                         403: 'Access denied to the requested asset'})
     @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=False)
@@ -59,8 +59,8 @@ def get(self):
     @api.expect(post_schema)
     @api.doc(description='Query information about multiple assets at the same time or update an existing asset '
                          'information. If the \'asset_uuids\' list is present in the data, return assets. Otherwise, '
-                         'uses the \'file_asset\' informations to update the data',
-             responses={200: 'Success - Return informations about file assets',
+                         'uses the \'file_asset\' information to update the data',
+             responses={200: 'Success - Return information about file assets',
                         400: 'Required parameter is missing',
                         403: 'Access denied to the requested asset'})
     @ServiceAccessManager.service_or_others_token_required(allow_dynamic_tokens=True, allow_static_tokens=True)
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
index a11b1c05..dd665bc2 100644
--- a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
@@ -24,10 +24,12 @@ class ArchiveFileData(BaseModel):
     archive_original_filename = Column(String, nullable=False)
     archive_file_size = Column(BigInteger, nullable=False, default=0)
 
-    archive_datetime = Column(TIMESTAMP(timezone=True), nullable=False, default=lambda: str(datetime.now()))
+    archive_creation_datetime = Column(TIMESTAMP(timezone=True), nullable=False, default=lambda: str(datetime.now()))
+    archive_upload_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
     archive_expiration_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
     archive_status = Column(Integer, nullable=False, default=TeraArchiveStatus.STATUS_PENDING.value)
     archive_owner_uuid = Column(String(36), nullable=False)
+    archive_uploader_uuid = Column(String(36), nullable=True)
 
     @staticmethod
     def get_archive_by_uuid(uuid_archive: str):
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index e1d8921d..7074088c 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -113,8 +113,11 @@
     # Set the BytesIO object's position to the beginning
     zip_buffer.seek(0)
 
-    # Transfer file to file transfer service
-
+    # Upload file to file transfer service
+    response = requests.post(archive_file_upload_url,
+                             files={'file': (archive_info['archive_original_filename'], zip_buffer)},
+                             data={'archive': json.dumps(archive_info)},
+                             headers={'Authorization': 'OpenTera ' + job_info['service_token']}, verify=args.verify)
 
     # Close will automatically delete file
     zip_buffer.close()
@@ -124,4 +127,4 @@
 
 
 
-    print(config, job_info)
\ No newline at end of file
+    print(response.json())
\ No newline at end of file

From b55cde4a27ea99fe82bbeb2b2dfc33167e589c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Thu, 11 Apr 2024 15:27:42 -0400
Subject: [PATCH 13/36] Refs #248 Return code.

---
 teraserver/python/workers/AssetsArchiveWorker.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 7074088c..3a982942 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -123,8 +123,5 @@
     zip_buffer.close()
     end_time = datetime.now()
     duration_s = (end_time - start_time).total_seconds()
-    print(f"Duration: {duration_s}")
-
-
-
-    print(response.json())
\ No newline at end of file
+    print(f"Duration: {duration_s}, return code: {response.status_code}")
+    sys.exit(0)

From 440d11dce7c9c1bca2f3f0c5225fdfd244099216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Thu, 11 Apr 2024 15:44:33 -0400
Subject: [PATCH 14/36] Refs #248, Fix typo in project name

---
 .../modules/FlaskModule/API/user/UserQueryAssetsArchive.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 1da9cbe0..691474eb 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -122,7 +122,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
             project = participant.participant_project
             site = project.project_site
             get_assets_for_participant(participant,
-                                       f"/{site.site_name}/{project.projet_name}")
+                                       f"/{site.site_name}/{project.project_name}")
 
         elif args['id_session'] is not None:
             # Get all assets for session

From 44ba95d9cb43784aa9ab2f193c3a4e79d13e168e Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Mon, 15 Apr 2024 09:44:52 -0400
Subject: [PATCH 15/36] Refs #232. Removed camera preinit as it was causing
 issues on iOS devices.

---
 teraserver/easyrtc/static/js/tera_webrtc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teraserver/easyrtc/static/js/tera_webrtc.js b/teraserver/easyrtc/static/js/tera_webrtc.js
index 5e496dfb..3b9d45fa 100644
--- a/teraserver/easyrtc/static/js/tera_webrtc.js
+++ b/teraserver/easyrtc/static/js/tera_webrtc.js
@@ -12,7 +12,7 @@ let localStreams = []; // {peerid, streamname, stream: MediaStream}, order is im
 var connected = false;
 var needToCallOtherUsers = false;
 
-let preinitCameras = true;
+let preinitCameras = false;
 
 function connect() {
 

From 2642ec223ae02172c397cf344e2fd3f2d62a259e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Tue, 16 Apr 2024 09:18:45 -0400
Subject: [PATCH 16/36] Refs #248 managing archive events.

---
 teraserver/python/modules/DeviceEventManager.py |  6 ++++++
 teraserver/python/modules/EventManager.py       | 17 +++++++++--------
 .../python/modules/ParticipantEventManager.py   |  6 ++++++
 teraserver/python/modules/UserEventManager.py   |  6 ++++++
 .../python/opentera/db/models/TeraAsset.py      |  1 +
 teraserver/python/opentera/messages             |  2 +-
 .../db/models/ArchiveFileData.py                |  2 +-
 7 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/teraserver/python/modules/DeviceEventManager.py b/teraserver/python/modules/DeviceEventManager.py
index 6d33344d..06562027 100644
--- a/teraserver/python/modules/DeviceEventManager.py
+++ b/teraserver/python/modules/DeviceEventManager.py
@@ -61,3 +61,9 @@ def filter_user_event(self, event: messages.UserEvent):
     def filter_database_event(self, event: messages.DatabaseEvent):
         # Default = no access
         return False
+
+    def filter_archive_event(self, event: messages.ArchiveEvent):
+        if event.owner_uuid == self.device.device_uuid:
+            return True
+        # Default = no access
+        return False
diff --git a/teraserver/python/modules/EventManager.py b/teraserver/python/modules/EventManager.py
index 15aa0a1b..fc52380b 100644
--- a/teraserver/python/modules/EventManager.py
+++ b/teraserver/python/modules/EventManager.py
@@ -44,6 +44,10 @@ def filter_database_event(self, event: messages.DatabaseEvent):
         # Default = no access
         return False
 
+    def filter_archive_event(self, event: messages.ArchiveEvent):
+        # Default = no access
+        return False
+
     def filter_events(self, message: messages.TeraEvent) -> messages.TeraEvent:
         # Will receive message containing events
         # Let's try to unpack the messages first and call the adequate method
@@ -70,38 +74,35 @@ def filter_events(self, message: messages.TeraEvent) -> messages.TeraEvent:
             leave_session_event = messages.LeaveSessionEvent()
             # Test for JoinSessionReply
             join_session_reply = messages.JoinSessionReplyEvent()
+            # Test for ArchiveEvent
+            archive_event = messages.ArchiveEvent()
 
             if any_msg.Unpack(device_event):
                 if not self.filter_device_event(device_event):
-                    print('removing:', device_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(join_session_event):
                 if not self.filter_join_session_event(join_session_event):
-                    print('removing:', join_session_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(participant_event):
                 if not self.filter_participant_event(participant_event):
-                    print('removing:', participant_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(stop_session_event):
                 if not self.filter_stop_session_event(stop_session_event):
-                    print('removing:', stop_session_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(leave_session_event):
                 if not self.filter_leave_session_event(leave_session_event):
-                    print('removing:', leave_session_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(user_event):
                 if not self.filter_user_event(user_event):
-                    print('removing:', user_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(database_event):
                 if not self.filter_database_event(database_event):
-                    print('removing', database_event)
                     filtered_message.events.remove(any_msg)
             elif any_msg.Unpack(join_session_reply):
                 if not self.filter_join_session_reply_event(join_session_reply):
-                    print('removing', join_session_reply)
+                    filtered_message.events.remove(any_msg)
+            elif any_msg.Unpack(archive_event):
+                if not self.filter_archive_event(archive_event):
                     filtered_message.events.remove(any_msg)
             else:
                 print('Unknown event, removing: ', any_msg)
diff --git a/teraserver/python/modules/ParticipantEventManager.py b/teraserver/python/modules/ParticipantEventManager.py
index 96d678ef..396fd899 100644
--- a/teraserver/python/modules/ParticipantEventManager.py
+++ b/teraserver/python/modules/ParticipantEventManager.py
@@ -65,3 +65,9 @@ def filter_user_event(self, event: messages.UserEvent):
     def filter_database_event(self, event: messages.DatabaseEvent):
         # Default = no access
         return False
+
+    def filter_archive_event(self, event: messages.ArchiveEvent):
+        if event.owner_uuid == self.participant.participant_uuid:
+            return True
+        # Default = no access
+        return False
diff --git a/teraserver/python/modules/UserEventManager.py b/teraserver/python/modules/UserEventManager.py
index 70a87632..7b3f2ff3 100644
--- a/teraserver/python/modules/UserEventManager.py
+++ b/teraserver/python/modules/UserEventManager.py
@@ -111,3 +111,9 @@ def filter_database_event(self, event: messages.DatabaseEvent):
         #
         # # Default = no access
         # return False
+
+    def filter_archive_event(self, event: messages.ArchiveEvent):
+        if event.owner_uuid == self.user.user_uuid:
+            return True
+        # Default = no access
+        return False
diff --git a/teraserver/python/opentera/db/models/TeraAsset.py b/teraserver/python/opentera/db/models/TeraAsset.py
index f5283d2f..758314f7 100644
--- a/teraserver/python/opentera/db/models/TeraAsset.py
+++ b/teraserver/python/opentera/db/models/TeraAsset.py
@@ -23,6 +23,7 @@ class TeraAsset(BaseModel, SoftDeleteMixin):
     asset_service_uuid = Column(String(36), ForeignKey("t_services.service_uuid", ondelete='cascade'), nullable=False)
     asset_type = Column(String, nullable=False)  # MIME Type
     asset_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
+    asset_expiration_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
 
     asset_session = relationship("TeraSession", back_populates='session_assets')
     asset_device = relationship("TeraDevice", back_populates='device_assets')
diff --git a/teraserver/python/opentera/messages b/teraserver/python/opentera/messages
index 0dd93f60..9fcb8568 160000
--- a/teraserver/python/opentera/messages
+++ b/teraserver/python/opentera/messages
@@ -1 +1 @@
-Subproject commit 0dd93f60037cad2e4a0f453a323e1ceafa98fbd8
+Subproject commit 9fcb856811032d1436f716af705760878ade30b1
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
index dd665bc2..c1a397da 100644
--- a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
@@ -13,7 +13,7 @@ class TeraArchiveStatus(Enum):
     STATUS_INPROGRESS = 1
     STATUS_COMPLETED = 2
     STATUS_CANCELLED = 3
-    STATUS_TERMINATED = 4
+    STATUS_DELETED = 4
 
 
 class ArchiveFileData(BaseModel):

From 68b8343ace860e8fb60a518d5f467964cd32c43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Tue, 16 Apr 2024 11:16:19 -0400
Subject: [PATCH 17/36] Refs #248 Archive events sent to users, participants
 and devices. Will be filtered with uuids.

---
 .../TeraWebSocketServerDeviceProtocol.py      | 34 +++++++++++-------
 .../TeraWebSocketServerParticipantProtocol.py | 35 ++++++++++++-------
 .../TeraWebSocketServerUserProtocol.py        | 19 +++++++---
 teraserver/python/opentera/redis/RedisVars.py |  5 +++
 .../opentera/services/ServiceOpenTera.py      | 18 +++++-----
 .../API/QueryArchiveFile.py                   |  9 +++++
 .../API/QueryArchiveFileInfos.py              | 12 +++++--
 .../API/send_archive_event.py                 | 26 ++++++++++++++
 8 files changed, 117 insertions(+), 41 deletions(-)
 create mode 100644 teraserver/python/services/FileTransferService/API/send_archive_event.py

diff --git a/teraserver/python/modules/TwistedModule/TeraWebSocketServerDeviceProtocol.py b/teraserver/python/modules/TwistedModule/TeraWebSocketServerDeviceProtocol.py
index fe075a2e..b24fced9 100644
--- a/teraserver/python/modules/TwistedModule/TeraWebSocketServerDeviceProtocol.py
+++ b/teraserver/python/modules/TwistedModule/TeraWebSocketServerDeviceProtocol.py
@@ -4,7 +4,7 @@
 # OpenTera
 from opentera.db.models.TeraDevice import TeraDevice
 from opentera.modules.BaseModule import ModuleNames, create_module_message_topic_from_name, create_module_event_topic_from_name
-
+from opentera.redis.RedisVars import RedisVars
 
 # Messages
 import opentera.messages.python as messages
@@ -34,21 +34,25 @@ def redisConnectionMade(self):
         # print(ret)
 
         if self.device:
-            # This will wait until subscribe result is available...
-            # Register only once to events from modules, will be filtered after
-            ret1 = yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
+            # Events from UserManagerModule
+            yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
                 ModuleNames.USER_MANAGER_MODULE_NAME), self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret2 = yield self.subscribe_pattern_with_callback(
+            yield self.subscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.TWISTED_MODULE_NAME, self.device.device_uuid),
                 self.redis_tera_module_message_received)
 
-            ret3 = yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
+            # Events from DatabaseModule
+            yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
                 ModuleNames.DATABASE_MODULE_NAME), self.redis_event_message_received)
 
+            # Events from FileTransferService
+            yield self.subscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
             # Direct events
-            ret4 = yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
+            yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
 
             # MAKE SURE TO SUBSCRIBE TO EVENTS BEFORE SENDING ONLINE MESSAGE
             tera_message = self.create_tera_message(
@@ -129,21 +133,27 @@ def onClose(self, wasClean, code, reason):
             self.publish(create_module_message_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME),
                          tera_message.SerializeToString())
 
-            # Unsubscribe to events
-            ret1 = yield self.unsubscribe_pattern_with_callback(
+            # Events from UserManagerModule
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME),
                 self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret2 = yield self.unsubscribe_pattern_with_callback(
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.TWISTED_MODULE_NAME, self.device.device_uuid),
                 self.redis_tera_module_message_received)
 
-            ret3 = yield self.unsubscribe_pattern_with_callback(
+            # Events from DatabaseModule
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.DATABASE_MODULE_NAME),
                 self.redis_event_message_received)
 
-            ret4 = yield self.unsubscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
+            # Events from FileTransferService
+            yield self.unsubscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
+            # Direct events
+            yield self.unsubscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
 
             # log information
             self.logger.log_info(self, "Device websocket disconnected",
diff --git a/teraserver/python/modules/TwistedModule/TeraWebSocketServerParticipantProtocol.py b/teraserver/python/modules/TwistedModule/TeraWebSocketServerParticipantProtocol.py
index 061018b5..5197191e 100644
--- a/teraserver/python/modules/TwistedModule/TeraWebSocketServerParticipantProtocol.py
+++ b/teraserver/python/modules/TwistedModule/TeraWebSocketServerParticipantProtocol.py
@@ -17,6 +17,7 @@
 from modules.ParticipantEventManager import ParticipantEventManager
 
 from modules.TwistedModule.TeraWebSocketServerProtocol import TeraWebSocketServerProtocol
+from opentera.redis.RedisVars import RedisVars
 
 
 class TeraWebSocketServerParticipantProtocol(TeraWebSocketServerProtocol):
@@ -34,22 +35,25 @@ def redisConnectionMade(self):
         # print(ret)
 
         if self.participant:
-            # This will wait until subscribe result is available...
-            # Register only once to events from modules, will be filtered after
-            # ret = yield self.subscribe(create_module_event_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME))
-            ret1 = yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
+            # Events from UserManagerModule
+            yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
                 ModuleNames.USER_MANAGER_MODULE_NAME), self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret2 = yield self.subscribe_pattern_with_callback(
+            yield self.subscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.TWISTED_MODULE_NAME, self.participant.participant_uuid),
                 self.redis_tera_module_message_received)
 
-            ret3 = yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
+            # Events from FileTransferService
+            yield self.subscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
+            # Events from DatabaseModule
+            yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
                 ModuleNames.DATABASE_MODULE_NAME), self.redis_event_message_received)
 
             # Direct events
-            ret4 = yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
+            yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
 
             # MAKE SURE TO SUBSCRIBE TO EVENTS BEFORE SENDING ONLINE MESSAGE
             tera_message = self.create_tera_message(
@@ -134,22 +138,27 @@ def onClose(self, wasClean, code, reason):
             self.publish(create_module_message_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME),
                          tera_message.SerializeToString())
 
-            # Unsubscribe to events
-            # ret = yield self.unsubscribe(create_module_event_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME))
-            ret1 = yield self.unsubscribe_pattern_with_callback(
+            # Events from UserManagerModule
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME),
                 self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret2 = yield self.unsubscribe_pattern_with_callback(
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.TWISTED_MODULE_NAME, self.participant.participant_uuid),
                 self.redis_tera_module_message_received)
 
-            ret3 = yield self.unsubscribe_pattern_with_callback(
+            # Events from DatabaseModule
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.DATABASE_MODULE_NAME),
                 self.redis_event_message_received)
 
-            ret4 = yield self.unsubscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
+            # Events from FileTransferService
+            yield self.unsubscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
+            # Direct events
+            yield self.unsubscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
 
             # log information
             self.logger.log_info(self, "Participant websocket disconnected",
diff --git a/teraserver/python/modules/TwistedModule/TeraWebSocketServerUserProtocol.py b/teraserver/python/modules/TwistedModule/TeraWebSocketServerUserProtocol.py
index e2e632d7..7dff2fb5 100644
--- a/teraserver/python/modules/TwistedModule/TeraWebSocketServerUserProtocol.py
+++ b/teraserver/python/modules/TwistedModule/TeraWebSocketServerUserProtocol.py
@@ -17,6 +17,7 @@
 from modules.UserEventManager import UserEventManager
 
 from modules.TwistedModule.TeraWebSocketServerProtocol import TeraWebSocketServerProtocol
+from opentera.redis.RedisVars import RedisVars
 
 
 class TeraWebSocketServerUserProtocol(TeraWebSocketServerProtocol):
@@ -42,14 +43,18 @@ def redisConnectionMade(self):
             # Register only once to events from modules, will be filtered after
 
             # Events from UserManagerModule
-            ret = yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
+            yield self.subscribe_pattern_with_callback(create_module_event_topic_from_name(
                 ModuleNames.USER_MANAGER_MODULE_NAME), self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret = yield self.subscribe_pattern_with_callback(
+            yield self.subscribe_pattern_with_callback(
                 create_module_event_topic_from_name(
                     ModuleNames.TWISTED_MODULE_NAME, self.user.user_uuid), self.redis_tera_module_message_received)
 
+            # Events from FileTransferService
+            yield self.subscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
             # Specific events from DatabaseModule
             # We are specific otherwise we receive every database event
             from opentera.db.models import EventNameClassMap
@@ -60,7 +65,7 @@ def redisConnectionMade(self):
                     self.redis_event_message_received)
 
             # Direct events
-            ret = yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
+            yield self.subscribe_pattern_with_callback(self.event_topic(), self.redis_event_message_received)
 
             # MAKE SURE TO SUBSCRIBE TO EVENTS BEFORE SENDING ONLINE MESSAGE
             # Advertise that we have a new user
@@ -143,16 +148,20 @@ def onClose(self, wasClean, code, reason):
                          tera_message.SerializeToString())
 
             # Unsubscribe to events
-            ret = yield self.unsubscribe_pattern_with_callback(
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(ModuleNames.USER_MANAGER_MODULE_NAME),
                 self.redis_event_message_received)
 
             # Events from FlaskModule
-            ret = yield self.unsubscribe_pattern_with_callback(
+            yield self.unsubscribe_pattern_with_callback(
                 create_module_event_topic_from_name(
                     ModuleNames.TWISTED_MODULE_NAME, self.user.user_uuid),
                 self.redis_tera_module_message_received)
 
+            # Events from FileTransferService
+            yield self.unsubscribe_pattern_with_callback(
+                RedisVars.build_service_event_topic('FileTransferService'), self.redis_event_message_received)
+
             # Specific events from DatabaseModule
             # We are specific otherwise we receive every database event
             from opentera.db.models import EventNameClassMap
diff --git a/teraserver/python/opentera/redis/RedisVars.py b/teraserver/python/opentera/redis/RedisVars.py
index 3d955aab..b51e73b2 100644
--- a/teraserver/python/opentera/redis/RedisVars.py
+++ b/teraserver/python/opentera/redis/RedisVars.py
@@ -35,3 +35,8 @@ def build_service_rpc_topic(cls, service_key) -> str:
     @classmethod
     def build_service_message_topic(cls, service_key) -> str:
         return cls.RedisVar_ServicePrefixKey + service_key + '.messages'
+
+    @classmethod
+    def build_service_event_topic(cls, service_key) -> str:
+        """ Build service event topic from service key, used to subscribe events to a specific service. """
+        return cls.RedisVar_ServicePrefixKey + service_key + '.events'
diff --git a/teraserver/python/opentera/services/ServiceOpenTera.py b/teraserver/python/opentera/services/ServiceOpenTera.py
index d1ee2059..006d4b33 100644
--- a/teraserver/python/opentera/services/ServiceOpenTera.py
+++ b/teraserver/python/opentera/services/ServiceOpenTera.py
@@ -71,23 +71,21 @@ def notify_service_messages(self, pattern, channel, message):
     def build_interface(self):
         # TODO not sure of the interface using UUID or name here...
         # Will do  both!
-        ret1 = yield self.subscribe_pattern_with_callback(
+        yield self.subscribe_pattern_with_callback(
             RedisVars.build_service_message_topic( self.service_info['service_uuid']), self.notify_service_messages)
 
-        ret2 = yield self.subscribe_pattern_with_callback(
+        yield self.subscribe_pattern_with_callback(
             RedisVars.build_service_message_topic(self.service_info['service_key']), self.notify_service_messages)
 
-        ret3 = yield self.subscribe_pattern_with_callback(
+        yield self.subscribe_pattern_with_callback(
             RedisVars.build_service_rpc_topic(self.service_info['service_uuid']), self.notify_service_rpc)
 
-        ret4 = yield self.subscribe_pattern_with_callback(
+        yield self.subscribe_pattern_with_callback(
             RedisVars.build_service_rpc_topic(self.service_info['service_key']), self.notify_service_rpc)
 
-        print(ret1, ret2, ret3, ret4)
-
     def notify_service_rpc(self, pattern, channel, message):
-        import threading
-        print('ServiceOpenTera - Received rpc', self, pattern, channel, message, ' thread:', threading.current_thread())
+        # import threading
+        # print('ServiceOpenTera - Received rpc', self, pattern, channel, message, ' thread:', threading.current_thread())
 
         rpc_message = messages.RPCMessage()
 
@@ -172,6 +170,10 @@ def send_event_message(self, event, topic: str):
         message.events.extend([any_message])
         return self.publish(message.header.topic, message.SerializeToString())
 
+    def send_service_event_message(self, event):
+        topic = RedisVars.build_service_event_topic(self.service_info['service_key'])
+        self.send_event_message(event, topic)
+
     def create_event_message(self, topic):
         event_message = messages.TeraEvent()
         event_message.header.version = 1
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 9464582a..9a2c4f62 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -10,6 +10,7 @@
 from services.FileTransferService.FlaskModule import flask_app
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import TeraArchiveStatus
+from services.FileTransferService.API.send_archive_event import send_archive_event
 
 # Parser definition(s)
 get_parser = api.parser()
@@ -134,6 +135,8 @@ def post(self):
             # Update DB
             archive.commit()
 
+            send_archive_event(archive)
+
             return archive.to_json()
         except Exception as e:
             return gettext('Error parsing archive information : ') + str(e), 400
@@ -170,5 +173,11 @@ def delete(self):
             return gettext('Access denied to the requested archive'), 403
 
         # Delete archive
+        archive_copy = ArchiveFileData()
+        archive_copy.from_json(archive.to_json())
+        archive_copy.archive_status = TeraArchiveStatus.STATUS_DELETED.value
+        send_archive_event(archive_copy)
+
         archive.delete_file_archive(flask_app.config['UPLOAD_FOLDER'])
+
         return gettext('Archive deleted'), 200
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
index 92d0bd9b..3c7f37bd 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -7,6 +7,7 @@
 from opentera.services.ServiceAccessManager import current_device_client, current_participant_client
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
 from werkzeug.utils import secure_filename
+from services.FileTransferService.API.send_archive_event import send_archive_event
 
 # Parser definition(s)
 get_parser = api.parser()
@@ -109,6 +110,10 @@ def post(self):
             except Exception as e:
                 return gettext('Error parsing archive information'), 400
 
+            # Send event
+            send_archive_event(archive)
+
+            # Send response
             return archive.to_json()
 
         else:
@@ -126,7 +131,8 @@ def post(self):
                 except Exception as e:
                     return gettext('Error parsing archive information'), 400
 
-                return archive.to_json()
-
-            return gettext('Badly formatted request'), 400
+                # Send event
+                send_archive_event(archive)
 
+                # Send response
+                return archive.to_json()
diff --git a/teraserver/python/services/FileTransferService/API/send_archive_event.py b/teraserver/python/services/FileTransferService/API/send_archive_event.py
new file mode 100644
index 00000000..2989e40b
--- /dev/null
+++ b/teraserver/python/services/FileTransferService/API/send_archive_event.py
@@ -0,0 +1,26 @@
+from flask import request
+from flask_babel import gettext
+import services.FileTransferService.Globals as Globals
+import opentera.messages.python as messages
+from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
+
+
+def send_archive_event(archive: ArchiveFileData):
+    if Globals.service:
+        servername = Globals.service.config['hostname']
+        port = Globals.service.config['port']
+        if 'X_EXTERNALSERVER' in request.headers:
+            servername = request.headers['X_EXTERNALSERVER']
+
+        if 'X_EXTERNALPORT' in request.headers:
+            port = request.headers['X_EXTERNALPORT']
+
+        event = messages.ArchiveEvent()
+        event.status = archive.archive_status
+        event.archive_uuid = archive.archive_uuid
+        event.owner_uuid = archive.archive_owner_uuid
+        endpoint = Globals.service.service_info['service_clientendpoint'] + '/api/archives'
+        event.archive_url = f"https://{servername}:{port}{endpoint}?archive_uuid={archive.archive_uuid}"
+
+        # Send event
+        Globals.service.send_service_event_message(event)

From 9ff03076eac71de265458ef0ed4e68b46a9a3035 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Wed, 17 Apr 2024 14:26:05 -0400
Subject: [PATCH 18/36] Added device_type and device_subtype name in
 DeviceLogin reply

---
 .../python/modules/FlaskModule/API/device/DeviceLogin.py    | 6 ++++++
 .../modules/FlaskModule/API/device/test_DeviceLogin.py      | 1 +
 .../FlaskModule/API/device/test_DeviceQueryDevices.py       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py b/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
index fbf9e3cc..da34bf2a 100644
--- a/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
+++ b/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
@@ -46,6 +46,12 @@ def get(self):
         # Reply device information
         response = {'device_info': current_device.to_json(minimal=False)}
 
+        # Append device type & subtype
+        if current_device.device_type:
+            response['device_info']['device_type'] = current_device.device_type.device_type_name
+        if current_device.device_subtype:
+            response['device_info']['device_device_subtype'] = current_device.device_subtype.device_subtype_name
+
         device_access = DBManager.deviceAccess(current_device)
 
         # Reply participant information
diff --git a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
index ab19199c..84f95952 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
@@ -38,6 +38,7 @@ def test_get_endpoint_with_token_auth(self):
                         self.assertTrue('participants_info' in response.json)
                         self.assertTrue('session_types_info' in response.json)
                         self.assertEqual(device['id_device'], response.json['device_info']['id_device'])
+                        self.assertTrue('device_type' in response.json['device_info'])
 
                         if device['device_onlineable']:
                             self.assertTrue('websocket_url' in response.json)
diff --git a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
index 9d767653..9363b2ba 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
@@ -41,7 +41,7 @@ def test_get_endpoint_from_all_devices(self):
                     self.assertTrue(field in response.json['device_info'])
 
                 ignore_fields = ['device_projects', 'device_participants', 'device_sessions', 'device_certificate',
-                                 'device_type', 'device_subtype', 'authenticated', 'device_assets', 'device_sites',
+                                 'authenticated', 'device_assets', 'device_sites',
                                  'device_onlineable', 'device_config', 'device_notes', 'device_lastonline',
                                  'device_infos', 'device_token']
                 for field in ignore_fields:

From 8d4b2b68a6b610506b8f66b2b3057958e8b21070 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Wed, 17 Apr 2024 14:26:05 -0400
Subject: [PATCH 19/36] Added device_type and device_subtype name in
 DeviceLogin reply

---
 .../python/modules/FlaskModule/API/device/DeviceLogin.py    | 6 ++++++
 .../modules/FlaskModule/API/device/test_DeviceLogin.py      | 1 +
 .../FlaskModule/API/device/test_DeviceQueryDevices.py       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py b/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
index fbf9e3cc..f6316493 100644
--- a/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
+++ b/teraserver/python/modules/FlaskModule/API/device/DeviceLogin.py
@@ -46,6 +46,12 @@ def get(self):
         # Reply device information
         response = {'device_info': current_device.to_json(minimal=False)}
 
+        # Append device type & subtype
+        if current_device.device_type:
+            response['device_info']['device_type'] = current_device.device_type.device_type_name
+        if current_device.device_subtype:
+            response['device_info']['device_subtype'] = current_device.device_subtype.device_subtype_name
+
         device_access = DBManager.deviceAccess(current_device)
 
         # Reply participant information
diff --git a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
index ab19199c..84f95952 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceLogin.py
@@ -38,6 +38,7 @@ def test_get_endpoint_with_token_auth(self):
                         self.assertTrue('participants_info' in response.json)
                         self.assertTrue('session_types_info' in response.json)
                         self.assertEqual(device['id_device'], response.json['device_info']['id_device'])
+                        self.assertTrue('device_type' in response.json['device_info'])
 
                         if device['device_onlineable']:
                             self.assertTrue('websocket_url' in response.json)
diff --git a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
index 9d767653..9363b2ba 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryDevices.py
@@ -41,7 +41,7 @@ def test_get_endpoint_from_all_devices(self):
                     self.assertTrue(field in response.json['device_info'])
 
                 ignore_fields = ['device_projects', 'device_participants', 'device_sessions', 'device_certificate',
-                                 'device_type', 'device_subtype', 'authenticated', 'device_assets', 'device_sites',
+                                 'authenticated', 'device_assets', 'device_sites',
                                  'device_onlineable', 'device_config', 'device_notes', 'device_lastonline',
                                  'device_infos', 'device_token']
                 for field in ignore_fields:

From 083af5f662031eeb6ef5dcbaab4a3b7513efa5e6 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Mon, 22 Apr 2024 09:17:13 -0400
Subject: [PATCH 20/36] Refs #249. Replaced "random" library for token
 generation with "secrets" library

---
 teraserver/python/opentera/db/models/TeraServerSettings.py | 7 +++----
 teraserver/python/tools/TeraPlusImporter.py                | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/teraserver/python/opentera/db/models/TeraServerSettings.py b/teraserver/python/opentera/db/models/TeraServerSettings.py
index 87057743..1dd0b92a 100644
--- a/teraserver/python/opentera/db/models/TeraServerSettings.py
+++ b/teraserver/python/opentera/db/models/TeraServerSettings.py
@@ -1,9 +1,8 @@
 from opentera.db.Base import BaseModel
-from sqlalchemy import Column, ForeignKey, Integer, String, Sequence, Boolean, TIMESTAMP
-from sqlalchemy.orm import relationship
+from sqlalchemy import Column, Integer, String, Sequence
 import string
 from string import digits, ascii_lowercase, ascii_uppercase
-import random
+import secrets
 import uuid
 
 
@@ -40,7 +39,7 @@ def create_defaults(test=False):
     @staticmethod
     def generate_token_key(length: int) -> str:
         token_symbols = digits + ascii_uppercase + ascii_lowercase
-        token_key = ''.join(random.choice(token_symbols) for i in range(length))  # Key length = 32 chars
+        token_key = ''.join(secrets.choice(token_symbols) for i in range(length))  # Key length = 32 chars
         return token_key
 
     @staticmethod
diff --git a/teraserver/python/tools/TeraPlusImporter.py b/teraserver/python/tools/TeraPlusImporter.py
index a7cf6370..fb086a00 100644
--- a/teraserver/python/tools/TeraPlusImporter.py
+++ b/teraserver/python/tools/TeraPlusImporter.py
@@ -11,12 +11,12 @@
 
 
 def generate_password(length: int):
-    import random
+    import secrets
     import string
 
     password = ''
     for i in range(0, length):
-        password = password + random.choice(string.ascii_uppercase + string.ascii_lowercase +
+        password = password + secrets.choice(string.ascii_uppercase + string.ascii_lowercase +
                                             string.digits + string.punctuation)
     return password
 

From 4b7ab9990982d0183ddaa675f01bc7c0bda8f179 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Mon, 22 Apr 2024 10:53:30 -0400
Subject: [PATCH 21/36] Refs #250. Limited port ranges in url mapping in nginx

---
 docker/dev/nginx/opentera.conf                  | 17 +++++++++--------
 docker/prod/nginx/opentera.conf                 |  5 +++--
 teraserver/python/config/external_services.conf | 12 +++++++-----
 teraserver/python/config/opentera.conf          |  5 +++--
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docker/dev/nginx/opentera.conf b/docker/dev/nginx/opentera.conf
index d48472dd..bd6e3605 100644
--- a/docker/dev/nginx/opentera.conf
+++ b/docker/dev/nginx/opentera.conf
@@ -157,7 +157,7 @@ location /example/ {
 ########################################################################################################################
 # webrtc on port xxxx
 ########################################################################################################################
-location ~ ^/webrtc/([0-9]+)/(.*)$ {
+location ~ ^/webrtc/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/$2$is_args$args;
     proxy_set_header 	X-ExternalPort      $server_port;
@@ -171,7 +171,7 @@ location ~ ^/webrtc/([0-9]+)/(.*)$ {
     proxy_set_header 	X-Script-Name       /webrtc/;
 }
 
-location ~ ^/webrtc_dance/([0-9]+)/(.*)$ {
+location ~ ^/webrtc_dance/(1009\d|10100)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/$2$is_args$args;
     proxy_set_header 	X-ExternalPort      $server_port;
@@ -189,7 +189,7 @@ location ~ ^/webrtc_dance/([0-9]+)/(.*)$ {
     proxy_set_header Connection "upgrade";
 }
 
-location ~ ^/websocket/([0-9]+)/(.*)$ {
+location ~ ^/websocket/(808\d|809\d|81[0-2]\d|8130|1009\d|10100)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/websocket/$1/$2$is_args$args;
     proxy_http_version 1.1;
@@ -207,17 +207,18 @@ location ~ ^/webrtc_teleop/.*$ {
     # The order of these rewrites are important!
 
     # Handle request ending with js/*.js or css css/*.css (Styles and scripts files in static folder)
-    rewrite     ^/webrtc_teleop/([0-9]+)/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
+    # Range 9095 - 10005
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
 
     # Handle request for /iceservers
-    rewrite     ^/webrtc_teleop/([0-9]+)/iceservers$                            /signaling_server/$1/iceservers last;
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/iceservers$                            /signaling_server/$1/iceservers last;
 
     # Handle request for /socket.io
-    rewrite     ^/webrtc_teleop/([0-9]+)/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
 
     # Handle request with no index.html and not ending with .css or .js (Application's router)
-    rewrite     ^/webrtc_teleop/([0-9]+)/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
-    
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
+
     # Redirection to the proxy
     rewrite     ^/webrtc_teleop/(.*)$                                           /signaling_server/$1$is_args$args last;
 
diff --git a/docker/prod/nginx/opentera.conf b/docker/prod/nginx/opentera.conf
index 002a9f52..482ba9cd 100644
--- a/docker/prod/nginx/opentera.conf
+++ b/docker/prod/nginx/opentera.conf
@@ -74,7 +74,8 @@ location /rehab/ {
 ########################################################################################################################
 # webrtc on port xxxx
 ########################################################################################################################
-location ~ ^/webrtc/([0-9]+)/(.*)$ {
+# Range from 8080 to 8130
+location ~ ^/webrtc/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/$2$is_args$args;
     proxy_set_header    X-ExternalPort      $server_port;
@@ -88,7 +89,7 @@ location ~ ^/webrtc/([0-9]+)/(.*)$ {
     proxy_set_header    X-Script-Name       /webrtc/;
 }
 
-location ~ ^/websocket/([0-9]+)/(.*)$ {
+location ~ ^/websocket/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/websocket/$1/$2$is_args$args;
     proxy_http_version 1.1;
diff --git a/teraserver/python/config/external_services.conf b/teraserver/python/config/external_services.conf
index b6246e71..20f39b20 100644
--- a/teraserver/python/config/external_services.conf
+++ b/teraserver/python/config/external_services.conf
@@ -27,7 +27,8 @@ location /dance/ {
     proxy_set_header 	X-Script-Name       /dance;
 }
 
-location ~ ^/webrtc_dance/([0-9]+)/(.*)$ {
+# Range from 10090 to 10100
+location ~ ^/webrtc_dance/(1009\d|10100)/(.*)$ {
     resolver 127.0.0.1;
     proxy_pass http://127.0.0.1:$1/$2$is_args$args;
     proxy_set_header 	X-ExternalPort      $server_port;
@@ -126,16 +127,17 @@ location ~ ^/webrtc_teleop/.*$ {
     # The order of these rewrites are important!
 
     # Handle request ending with js/*.js or css css/*.css (Styles and scripts files in static folder)
-    rewrite     ^/webrtc_teleop/([0-9]+)/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
+    # Range 9095 - 10005
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
 
     # Handle request for /iceservers
-    rewrite     ^/webrtc_teleop/([0-9]+)/iceservers$                            /signaling_server/$1/iceservers last;
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/iceservers$                            /signaling_server/$1/iceservers last;
 
     # Handle request for /socket.io
-    rewrite     ^/webrtc_teleop/([0-9]+)/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
 
     # Handle request with no index.html and not ending with .css or .js (Application's router)
-    rewrite     ^/webrtc_teleop/([0-9]+)/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
+    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
 
     # Redirection to the proxy
     rewrite     ^/webrtc_teleop/(.*)$                                           /signaling_server/$1$is_args$args last;
diff --git a/teraserver/python/config/opentera.conf b/teraserver/python/config/opentera.conf
index 9ffdd2f2..d695b8bb 100644
--- a/teraserver/python/config/opentera.conf
+++ b/teraserver/python/config/opentera.conf
@@ -69,7 +69,8 @@ location /rehab/ {
 ########################################################################################################################
 # webrtc on port xxxx
 ########################################################################################################################
-location ~ ^/webrtc/([0-9]+)/(.*)$ {
+# Range from 8080 to 8130
+location ~ ^/webrtc/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.1;
     proxy_pass http://127.0.0.1:$1/$2$is_args$args;
     proxy_set_header 	X-ExternalPort      $server_port;
@@ -83,7 +84,7 @@ location ~ ^/webrtc/([0-9]+)/(.*)$ {
     proxy_set_header 	X-Script-Name       /webrtc/;
 }
 
-location ~ ^/websocket/([0-9]+)/(.*)$ {
+location ~ ^/websocket/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.1;
     proxy_pass http://127.0.0.1:$1/websocket/$1/$2$is_args$args;
     proxy_http_version 1.1;

From 8579d4c7e026c361b626a4e5adf9cd2b09a2887a Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Mon, 22 Apr 2024 11:30:40 -0400
Subject: [PATCH 22/36] Refs #250. Cleaned up nginx config by removing external
 services config.

---
 docker/dev/nginx/opentera.conf                | 142 +---------------
 .../python/config/external_services.conf      | 153 ------------------
 2 files changed, 1 insertion(+), 294 deletions(-)

diff --git a/docker/dev/nginx/opentera.conf b/docker/dev/nginx/opentera.conf
index bd6e3605..3b81e397 100644
--- a/docker/dev/nginx/opentera.conf
+++ b/docker/dev/nginx/opentera.conf
@@ -1,5 +1,3 @@
-
-
 location / {
     proxy_pass http://opentera-server:4040;
     proxy_set_header 	X-ExternalPort      $server_port;
@@ -54,36 +52,6 @@ location /file/ {
     proxy_set_header 	X-Script-Name       /file;
 }
 
-
-location /bureau/ {
-    proxy_pass          http://opentera-server:4050/;
-    proxy_redirect      http://$host/  https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /bureau;
-}
-
-location /dance/ {
-    client_max_body_size 2G;
-    proxy_pass          http://opentera-server:4060/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /dance;
-}
-
 location /rehab/ {
     proxy_pass          http://opentera-server:4070/;
     proxy_redirect      http://$host/ https://$host:$server_port/;
@@ -98,48 +66,6 @@ location /rehab/ {
     proxy_set_header 	X-Script-Name       /rehab;
 }
 
-location /robot/ {
-    proxy_pass          http://opentera-server:4080/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /robot;
-}
-
-location /webportal/ {
-    proxy_pass          http://opentera-server:4090/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /webportal;
-}
-
-location /room/ {
-    proxy_pass          http://opentera-server:5000/;
-    proxy_redirect      http://$host/  https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /room;
-}
-
 location /example/ {
     proxy_pass          http://opentera-server:5010/;
     proxy_redirect      http://$host/  https://$host:$server_port/;
@@ -171,76 +97,10 @@ location ~ ^/webrtc/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     proxy_set_header 	X-Script-Name       /webrtc/;
 }
 
-location ~ ^/webrtc_dance/(1009\d|10100)/(.*)$ {
-    resolver 127.0.0.11;
-    proxy_pass http://opentera-server:$1/$2$is_args$args;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /webrtc_dance/;
-
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-}
-
-location ~ ^/websocket/(808\d|809\d|81[0-2]\d|8130|1009\d|10100)/(.*)$ {
+location ~ ^/websocket/(808\d|809\d|81[0-2]\d|8130)/(.*)$ {
     resolver 127.0.0.11;
     proxy_pass http://opentera-server:$1/websocket/$1/$2$is_args$args;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
 }
-########################################################################################################################
-
-########################################################################################################################
-# webrtc_teleop on port defined in url tilda means will have regexp,
-########################################################################################################################
-location ~ ^/webrtc_teleop/.*$ {
-
-    # Here is a tool to help you debug these regular expressions https://regex101.com/
-    # The order of these rewrites are important!
-
-    # Handle request ending with js/*.js or css css/*.css (Styles and scripts files in static folder)
-    # Range 9095 - 10005
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
-
-    # Handle request for /iceservers
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/iceservers$                            /signaling_server/$1/iceservers last;
-
-    # Handle request for /socket.io
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
-
-    # Handle request with no index.html and not ending with .css or .js (Application's router)
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
-
-    # Redirection to the proxy
-    rewrite     ^/webrtc_teleop/(.*)$                                           /signaling_server/$1$is_args$args last;
-
-    # No request has matched, Forbiden
-    return 403;
-}
-
-location ~ ^/signaling_server/(.*)$ {
-    proxy_pass http://opentera-server:$1$is_args$args;
-    proxy_set_header    X-ExternalPort      $server_port;
-    proxy_set_header    X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Scheme            $scheme;
-    # proxy_set_header    X-Script-Name       /webrtc_teleop/;
-
-    # Websocket upgrades
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-}
-
diff --git a/teraserver/python/config/external_services.conf b/teraserver/python/config/external_services.conf
index 20f39b20..6c254073 100644
--- a/teraserver/python/config/external_services.conf
+++ b/teraserver/python/config/external_services.conf
@@ -1,93 +1,3 @@
-# location /bureau/ {
-#     proxy_pass          http://127.0.0.1:4050/;
-#     proxy_redirect      http://$host/  https://$host:$server_port/;
-#     proxy_set_header 	X-ExternalPort      $server_port;
-#     proxy_set_header 	X-ExternalHost      $host;
-#     proxy_set_header    X_ExternalServer    $server_name;
-#     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-Forwarded-Proto   $scheme;
-#     proxy_set_header	X-Scheme            $scheme;
-#     proxy_set_header 	X-Script-Name       /bureau;
-# }
-
-location /dance/ {
-    client_max_body_size 2G;
-    proxy_pass          http://127.0.0.1:4060/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /dance;
-}
-
-# Range from 10090 to 10100
-location ~ ^/webrtc_dance/(1009\d|10100)/(.*)$ {
-    resolver 127.0.0.1;
-    proxy_pass http://127.0.0.1:$1/$2$is_args$args;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /webrtc_dance/;
-
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-}
-
-location /robot/ {
-    proxy_pass          http://127.0.0.1:4080/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /robot;
-}
-
-location /webportal/ {
-    proxy_pass          http://127.0.0.1:4090/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /webportal;
-}
-
-# location /room/ {
-#     proxy_pass          http://localhost:5000/;
-#     proxy_redirect      http://$host/  https://$host:$server_port/;
-#     proxy_set_header 	X-ExternalPort      $server_port;
-#     proxy_set_header 	X-ExternalHost      $host;
-#     proxy_set_header    X_ExternalServer    $server_name;
-#     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-Forwarded-Proto   $scheme;
-#     proxy_set_header	X-Scheme            $scheme;
-#     proxy_set_header 	X-Script-Name       /room;
-# }
-
 location /example/ {
     proxy_pass          http://127.0.0.1:5010/;
     proxy_redirect      http://$host/  https://$host:$server_port/;
@@ -101,66 +11,3 @@ location /example/ {
     proxy_set_header	X-Scheme            $scheme;
     proxy_set_header 	X-Script-Name       /example;
 }
-
-location /recrutement/ {
-    proxy_pass          http://127.0.0.1:5020/;
-    proxy_redirect      http://$host/ https://$host:$server_port/;
-    proxy_set_header 	X-ExternalPort      $server_port;
-    proxy_set_header 	X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header	X-Scheme            $scheme;
-    proxy_set_header 	X-Script-Name       /recrutement;
-}
-
-########################################################################################################################
-
-########################################################################################################################
-# webrtc_teleop on port defined in url tilda means will have regexp,
-########################################################################################################################
-location ~ ^/webrtc_teleop/.*$ {
-
-    # Here is a tool to help you debug these regular expressions https://regex101.com/
-    # The order of these rewrites are important!
-
-    # Handle request ending with js/*.js or css css/*.css (Styles and scripts files in static folder)
-    # Range 9095 - 10005
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/.*((?>js|css)/.*\.(?>css|js|map))$         /signaling_server/$1/$2 last;
-
-    # Handle request for /iceservers
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/iceservers$                            /signaling_server/$1/iceservers last;
-
-    # Handle request for /socket.io
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/socket.io(.*)$                         /signaling_server/$1/socket.io$2 last;
-
-    # Handle request with no index.html and not ending with .css or .js (Application's router)
-    rewrite     ^/webrtc_teleop/(909[5-9]|1000[0-5])/((?!index.html).*(?<!\.css|\.js))$     /signaling_server/$1/index.html last;
-
-    # Redirection to the proxy
-    rewrite     ^/webrtc_teleop/(.*)$                                           /signaling_server/$1$is_args$args last;
-
-    # No request has matched, Forbiden
-    return 403;
-}
-
-location ~ ^/signaling_server/(.*)$ {
-    proxy_pass http://127.0.0.1:$1$is_args$args;
-    proxy_set_header    X-ExternalPort      $server_port;
-    proxy_set_header    X-ExternalHost      $host;
-    proxy_set_header    X_ExternalServer    $server_name;
-    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-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Scheme            $scheme;
-    # proxy_set_header    X-Script-Name       /webrtc_teleop/;
-
-    # Websocket upgrades
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-}
-

From a10ffd624c4809abc5a81cff78054d52cabf6dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20Le=CC=81tourneau?= <doumdi@gmail.com>
Date: Mon, 22 Apr 2024 14:57:03 -0400
Subject: [PATCH 23/36] Refs #248, using host from DB

---
 .../API/user/UserQueryAssetsArchive.py        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 691474eb..9480bd6c 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -166,12 +166,19 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
 
         # Send archive information to file transfer service
         # TODO TLS verification
-        file_transfer_service_token = TeraService.get_service_by_key('FileTransferService').get_token(service_key)
-        archive_file_infos_url = f"https://{server_name}:{port}/file/api/archives/infos"
-        archive_file_upload_url = f"https://{server_name}:{port}/file/api/archives"
+        file_transfer_service: TeraService = TeraService.get_service_by_key('FileTransferService')
+        file_transfer_service_token = file_transfer_service.get_token(service_key)
+        file_transfer_service_host = file_transfer_service.service_hostname
+        file_transfer_service_port = file_transfer_service.service_port
+
+        #archive_file_infos_url = f"https://{server_name}:{port}/file/api/archives/infos"
+        #archive_file_upload_url = f"https://{server_name}:{port}/file/api/archives"
+        archive_file_infos_url = f"http://{file_transfer_service_host}:{file_transfer_service_port}/api/archives/infos"
+        archive_file_upload_url = f"http://{file_transfer_service_host}:{file_transfer_service_port}/api/archives"
 
         response = requests.post(archive_file_infos_url, json=archive_info,
-                                 headers={'Authorization': 'OpenTera ' + file_transfer_service_token}, verify=False)
+                                 headers={'Authorization': 'OpenTera ' + file_transfer_service_token},
+                                 timeout=30, verify=False)
 
         if response.status_code != 200:
             return gettext('Unable to create archive information from FileTransferService'), 501
@@ -196,7 +203,3 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
         process = subprocess.Popen(command)
 
         return response.json()
-
-
-
-

From e9b1f84ef057063e1da92bfbd254df01e99e51d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20Le=CC=81tourneau?= <doumdi@gmail.com>
Date: Mon, 22 Apr 2024 15:24:11 -0400
Subject: [PATCH 24/36] Refs #248, using host from DB

---
 .../FlaskModule/API/user/UserQueryAssetsArchive.py       | 2 ++
 teraserver/python/workers/AssetsArchiveWorker.py         | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 9480bd6c..55e393d2 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -63,6 +63,8 @@ def get(self):
             # Fill all required info for service
             asset_map_per_service[service.service_key] = {'service_uuid': service.service_uuid,
                                                           'service_assets': [],
+                                                          'service_hostname': service.service_hostname,
+                                                          'service_port': service.service_port,
                                                           'service_endpoint': service.service_clientendpoint,
                                                           'service_token': service_token}
 
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 3a982942..33877d44 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -76,7 +76,8 @@
     # Change status of the file transfer to 'in progress'
     archive_info['archive_status'] = 1 # STATUS_INPROGRESS
     response = requests.post(archive_file_infos_url, json={'archive': archive_info},
-                             headers={'Authorization': 'OpenTera ' + job_info['service_token']}, verify=args.verify)
+                             headers={'Authorization': 'OpenTera ' + job_info['service_token']},
+                             timeout=30, verify=args.verify)
 
     # Create a temporary file to store the zip file, deleted when closed
     zip_buffer = tempfile.NamedTemporaryFile(delete=True)
@@ -99,10 +100,11 @@
                 params = {'access_token': access_token, 'asset_uuid': asset['asset_uuid']}
 
                 # Request file from service
-                url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
+                # url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
+                url = f'https://{service_data["service_hostname"]}:{service_data["service_port"]}/api/assets'
 
                 # Certificate will be verified if verify arg is True
-                response = requests.get(url=url, params=params, headers=headers, verify=args.verify)
+                response = requests.get(url=url, params=params, headers=headers, timeout=300, verify=args.verify)
 
                 if response.status_code == 200:
                     # Add to zip file
@@ -117,6 +119,7 @@
     response = requests.post(archive_file_upload_url,
                              files={'file': (archive_info['archive_original_filename'], zip_buffer)},
                              data={'archive': json.dumps(archive_info)},
+                             timeout=30,
                              headers={'Authorization': 'OpenTera ' + job_info['service_token']}, verify=args.verify)
 
     # Close will automatically delete file

From a2b8ef9caa779d4672b1e56fe8a0dcefa982e701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20Le=CC=81tourneau?= <doumdi@gmail.com>
Date: Mon, 22 Apr 2024 15:32:02 -0400
Subject: [PATCH 25/36] Refs #248, using host from DB

---
 teraserver/python/workers/AssetsArchiveWorker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 33877d44..1e6a75de 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -101,7 +101,7 @@
 
                 # Request file from service
                 # url = 'https://' + server_name + ':' + str(port) + service_data['service_endpoint'] + '/api/assets'
-                url = f'https://{service_data["service_hostname"]}:{service_data["service_port"]}/api/assets'
+                url = f'http://{service_data["service_hostname"]}:{service_data["service_port"]}/api/assets'
 
                 # Certificate will be verified if verify arg is True
                 response = requests.get(url=url, params=params, headers=headers, timeout=300, verify=args.verify)

From d73391f44bd19b395473b452eac5fca772fd99be Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Tue, 23 Apr 2024 09:44:28 -0400
Subject: [PATCH 26/36] Refs #248. Sending relative url in ArchiveEvent

---
 .../python/services/FileTransferService/API/QueryArchiveFile.py | 2 +-
 .../services/FileTransferService/API/send_archive_event.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 9a2c4f62..77558a48 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -53,7 +53,7 @@ def get(self):
             return gettext('No archive found'), 404
 
         # Verify ownership
-        if archive.owner_uuid != requester_uuid:
+        if archive.archive_owner_uuid != requester_uuid:
             return gettext('Access denied to the requested archive'), 403
 
         src_dir = flask_app.config['UPLOAD_FOLDER']
diff --git a/teraserver/python/services/FileTransferService/API/send_archive_event.py b/teraserver/python/services/FileTransferService/API/send_archive_event.py
index 2989e40b..35d9c313 100644
--- a/teraserver/python/services/FileTransferService/API/send_archive_event.py
+++ b/teraserver/python/services/FileTransferService/API/send_archive_event.py
@@ -20,7 +20,7 @@ def send_archive_event(archive: ArchiveFileData):
         event.archive_uuid = archive.archive_uuid
         event.owner_uuid = archive.archive_owner_uuid
         endpoint = Globals.service.service_info['service_clientendpoint'] + '/api/archives'
-        event.archive_url = f"https://{servername}:{port}{endpoint}?archive_uuid={archive.archive_uuid}"
+        event.archive_url = f"{endpoint}?archive_uuid={archive.archive_uuid} "#f"https://{servername}:{port}{endpoint}?archive_uuid={archive.archive_uuid}"
 
         # Send event
         Globals.service.send_service_event_message(event)

From e94f0d0af0a14e2e99b33b0a120396245b78f466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 13:29:38 +0000
Subject: [PATCH 27/36] changed date

---
 teraserver/python/TeraServer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teraserver/python/TeraServer.py b/teraserver/python/TeraServer.py
index 7244daec..37914775 100755
--- a/teraserver/python/TeraServer.py
+++ b/teraserver/python/TeraServer.py
@@ -1,7 +1,7 @@
 """
 Project OpenTera (https://github.com/introlab/opentera)
 
-Copyright (C) 2020
+Copyright (C) 2020-2024
 IntRoLab / ESTRAD, Université de Sherbrooke, Centre de Recherche sur le Vieillissement de Sherbrooke
 
 Authors:

From 9ad684ebdb615980c274ad30336eec9203839273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:11:10 +0000
Subject: [PATCH 28/36] Refs #248, Archive cleanup

---
 .../FileTransferService.py                    | 60 +++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/teraserver/python/services/FileTransferService/FileTransferService.py b/teraserver/python/services/FileTransferService/FileTransferService.py
index df433dad..f1a9f1eb 100644
--- a/teraserver/python/services/FileTransferService/FileTransferService.py
+++ b/teraserver/python/services/FileTransferService/FileTransferService.py
@@ -1,3 +1,4 @@
+import datetime
 from services.FileTransferService.FlaskModule import flask_app
 import services.FileTransferService.Globals as Globals
 from opentera.redis.RedisClient import RedisClient
@@ -6,7 +7,7 @@
 from opentera.redis.RedisVars import RedisVars
 
 # Twisted
-from twisted.internet import reactor, defer
+from twisted.internet import reactor, defer, task
 from twisted.python import log
 import sys
 import os
@@ -16,20 +17,71 @@
 from services.FileTransferService.FlaskModule import FlaskModule
 import opentera.messages.python as messages
 
+from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
 
 class FileTransferService(ServiceOpenTeraWithAssets):
     def __init__(self, config_man: ConfigManager, this_service_info):
         ServiceOpenTeraWithAssets.__init__(self, config_man, this_service_info)
 
-        self.verify_file_upload_directory(config_man)
-
         # Create REST backend
         self.flaskModule = FlaskModule(config_man)
 
         # Create twisted service
         self.flaskModuleService = self.flaskModule.create_service()
 
-        # self.application = service.Application(self.config['name'])
+        self.upload_directory = self.verify_file_upload_directory(config_man)
+
+        if self.upload_directory is not None:
+            # Create cleaning task, every hour by default, can specify period (s) in arg.
+            self.archive_cleaning_task = self.setup_file_archive_cleanup_task(30.0)
+
+
+    def setup_file_archive_cleanup_task(self, period_s:float = 3600.0) -> task.LoopingCall:
+        loop = task.LoopingCall(self.archive_cleanup_task_callback)
+
+        # Start looping every period_s seconds.
+        d = loop.start(period_s, False)
+
+        # Add callbacks for stop and failure.
+        d.addCallback(self.cbArchiveLoopDone)
+        d.addErrback(self.ebArvhiveLoopFailed)
+
+        return loop
+
+    def archive_cleanup_task_callback(self):
+        if self.upload_directory is not None:
+            with flask_app.app_context():
+                # Get all archives
+                archives = ArchiveFileData.query.all()
+                for archive in archives:
+                    # 1) Verify if we have an expiration date
+                    if archive.archive_expiration_datetime is not None:
+                        # Verify if the expiration date is passed
+                        if archive.archive_expiration_datetime < datetime.datetime.now(datetime.timezone.utc):
+                            # Delete the archive
+                            if not archive.delete_file_archive(self.upload_directory):
+                                print('Error deleting archive')
+                            continue
+                    # 2) Verify the state of the archive, if created more than 24 hours ago and not uploaded, delete it
+                    elif archive.archive_creation_datetime < datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(hours=24):
+                        if archive.archive_upload_datetime is None:
+                            # Delete the archive from DB
+                            ArchiveFileData.delete(archive.id_archive_file_data)
+                            continue
+
+
+    def cbArchiveLoopDone(self, result):
+        """
+        Called when file archive cleanup task was stopped with success.
+        """
+        print('cbArchiveLoopDone', result)
+
+    def ebArvhiveLoopFailed(self, failure):
+        """
+        Called when file archive cleanup task execution failed.
+        """
+        print('ebArvhiveLoopFailed', failure)
+
 
     def verify_file_upload_directory(self, config: ConfigManager, create=True):
         file_upload_path = config.filetransfer_config['files_directory']

From 2f3b0a70b37ff14517fe501559c6a2c93e74a215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:17:40 +0000
Subject: [PATCH 29/36] Refs #248, Archive cleanup

---
 .../services/FileTransferService/FileTransferService.py  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/teraserver/python/services/FileTransferService/FileTransferService.py b/teraserver/python/services/FileTransferService/FileTransferService.py
index f1a9f1eb..0b04dc41 100644
--- a/teraserver/python/services/FileTransferService/FileTransferService.py
+++ b/teraserver/python/services/FileTransferService/FileTransferService.py
@@ -61,12 +61,19 @@ def archive_cleanup_task_callback(self):
                             # Delete the archive
                             if not archive.delete_file_archive(self.upload_directory):
                                 print('Error deleting archive')
+                                self.logger.log_error('FileTransferService', f'Error deleting archive {archive.archive_uuid}.')
+                            else:
+                                self.logger.log_info('FileTransferService', f'Archive {archive.archive_uuid} deleted.')
                             continue
                     # 2) Verify the state of the archive, if created more than 24 hours ago and not uploaded, delete it
                     elif archive.archive_creation_datetime < datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(hours=24):
                         if archive.archive_upload_datetime is None:
                             # Delete the archive from DB
-                            ArchiveFileData.delete(archive.id_archive_file_data)
+                            self.logger.log_info('FileTransferService', f'Archive {archive.archive_uuid} deleted.')
+                            try:
+                                ArchiveFileData.delete(archive.id_archive_file_data)
+                            except Exception as e:
+                                self.logger.log_error('FileTransferService', f'Error deleting archive {archive.archive_uuid} : {e}.')
                             continue
 
 

From 2a9d5bb3a29591c25133844f86ec14c1d4fe0fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:32:28 +0000
Subject: [PATCH 30/36] Refs #248, Add automatic expiration datetime in 30
 days.

---
 .../FileTransferService/API/QueryArchiveFileInfos.py   |  8 ++++++++
 .../FileTransferService/FileTransferService.py         | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
index 3c7f37bd..d9bedcd9 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -8,6 +8,7 @@
 from services.FileTransferService.libfiletransferservice.db.models.ArchiveFileData import ArchiveFileData
 from werkzeug.utils import secure_filename
 from services.FileTransferService.API.send_archive_event import send_archive_event
+import datetime
 
 # Parser definition(s)
 get_parser = api.parser()
@@ -104,6 +105,13 @@ def post(self):
             archive = ArchiveFileData()
             try:
                 archive.from_json(archive_info)
+
+                # Add Creation datetime
+                archive.archive_creation_datetime = datetime.datetime.now(datetime.timezone.utc)
+
+                # Add Expiration datetime in 30 days
+                archive.archive_expiration_datetime = archive.archive_creation_datetime + datetime.timedelta(days=30)
+
                 # Make sure file name is secure
                 archive.archive_original_filename = secure_filename(archive.archive_original_filename)
                 ArchiveFileData.insert(archive)
diff --git a/teraserver/python/services/FileTransferService/FileTransferService.py b/teraserver/python/services/FileTransferService/FileTransferService.py
index 0b04dc41..4af8175e 100644
--- a/teraserver/python/services/FileTransferService/FileTransferService.py
+++ b/teraserver/python/services/FileTransferService/FileTransferService.py
@@ -44,7 +44,7 @@ def setup_file_archive_cleanup_task(self, period_s:float = 3600.0) -> task.Loopi
 
         # Add callbacks for stop and failure.
         d.addCallback(self.cbArchiveLoopDone)
-        d.addErrback(self.ebArvhiveLoopFailed)
+        d.addErrback(self.ebArchiveLoopFailed)
 
         return loop
 
@@ -60,7 +60,7 @@ def archive_cleanup_task_callback(self):
                         if archive.archive_expiration_datetime < datetime.datetime.now(datetime.timezone.utc):
                             # Delete the archive
                             if not archive.delete_file_archive(self.upload_directory):
-                                print('Error deleting archive')
+                                print(f'Error deleting archive {archive.archive_uuid}')
                                 self.logger.log_error('FileTransferService', f'Error deleting archive {archive.archive_uuid}.')
                             else:
                                 self.logger.log_info('FileTransferService', f'Archive {archive.archive_uuid} deleted.')
@@ -73,6 +73,7 @@ def archive_cleanup_task_callback(self):
                             try:
                                 ArchiveFileData.delete(archive.id_archive_file_data)
                             except Exception as e:
+                                print(f'Error deleting archive {archive.archive_uuid}')
                                 self.logger.log_error('FileTransferService', f'Error deleting archive {archive.archive_uuid} : {e}.')
                             continue
 
@@ -83,11 +84,12 @@ def cbArchiveLoopDone(self, result):
         """
         print('cbArchiveLoopDone', result)
 
-    def ebArvhiveLoopFailed(self, failure):
+    def ebArchiveLoopFailed(self, failure):
         """
         Called when file archive cleanup task execution failed.
         """
-        print('ebArvhiveLoopFailed', failure)
+        self.logger.log_error('FileTransferService', f'ebArchiveLoopFailed : {failure}.')
+        print('ebArchiveLoopFailed', failure)
 
 
     def verify_file_upload_directory(self, config: ConfigManager, create=True):

From 5f381326a32dfc7082e949d58156a1cac2ea918a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:36:54 +0000
Subject: [PATCH 31/36] Refs #248, Make sure to include timezone.

---
 .../services/FileTransferService/API/QueryArchiveFile.py     | 4 ++--
 .../libfiletransferservice/db/models/ArchiveFileData.py      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 77558a48..9ca79b8b 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -1,5 +1,5 @@
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 from flask import request, send_file
 from flask_babel import gettext
@@ -111,7 +111,7 @@ def post(self):
                 return gettext('Filename does not match the archive information'), 400
 
             # Get the data from the post
-            archive.archive_upload_datetime = datetime.now()
+            archive.archive_upload_datetime = datetime.now(timezone.utc)
             archive.archive_uploader_uuid = uploader_uuid
 
             # Save the file
diff --git a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
index c1a397da..02a413ff 100644
--- a/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
+++ b/teraserver/python/services/FileTransferService/libfiletransferservice/db/models/ArchiveFileData.py
@@ -4,7 +4,7 @@
 from sqlalchemy import Column, ForeignKey, Sequence, Integer, String, BigInteger, TIMESTAMP
 import os
 from enum import Enum
-from datetime import datetime
+from datetime import datetime, timezone
 import uuid
 
 
@@ -24,7 +24,7 @@ class ArchiveFileData(BaseModel):
     archive_original_filename = Column(String, nullable=False)
     archive_file_size = Column(BigInteger, nullable=False, default=0)
 
-    archive_creation_datetime = Column(TIMESTAMP(timezone=True), nullable=False, default=lambda: str(datetime.now()))
+    archive_creation_datetime = Column(TIMESTAMP(timezone=True), nullable=False, default=lambda: str(datetime.now(timezone.utc)))
     archive_upload_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
     archive_expiration_datetime = Column(TIMESTAMP(timezone=True), nullable=True)
     archive_status = Column(Integer, nullable=False, default=TeraArchiveStatus.STATUS_PENDING.value)
@@ -56,4 +56,3 @@ def delete_file_archive(self, file_folder: str) -> bool:
             return False
 
         return True
-

From 44611066590c0332e87d61a7a7cae0c931b18ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:46:35 +0000
Subject: [PATCH 32/36] Refs #248, Add download archive to log.

---
 .../services/FileTransferService/API/QueryArchiveFile.py       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 9ca79b8b..0e4aca56 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -58,6 +58,9 @@ def get(self):
 
         src_dir = flask_app.config['UPLOAD_FOLDER']
 
+        # Log access
+        self.module.logger.log_info('FileTransferService.FlaskModule.QueryArchiveFile', f'User {requester_uuid} downloaded archive {archive.archive_uuid}')
+
         # Send file
         filename = archive.archive_original_filename
         return send_file(src_dir + '/' + str(archive.archive_uuid), as_attachment=True, download_name=filename)

From 3bdf6bdcf6b999a0882c3f29d653ef343a509e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 15:48:04 +0000
Subject: [PATCH 33/36] Refs #248, Fix to every hour.

---
 .../python/services/FileTransferService/FileTransferService.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teraserver/python/services/FileTransferService/FileTransferService.py b/teraserver/python/services/FileTransferService/FileTransferService.py
index 4af8175e..8f61c332 100644
--- a/teraserver/python/services/FileTransferService/FileTransferService.py
+++ b/teraserver/python/services/FileTransferService/FileTransferService.py
@@ -33,7 +33,7 @@ def __init__(self, config_man: ConfigManager, this_service_info):
 
         if self.upload_directory is not None:
             # Create cleaning task, every hour by default, can specify period (s) in arg.
-            self.archive_cleaning_task = self.setup_file_archive_cleanup_task(30.0)
+            self.archive_cleaning_task = self.setup_file_archive_cleanup_task(3600.0)
 
 
     def setup_file_archive_cleanup_task(self, period_s:float = 3600.0) -> task.LoopingCall:

From 89499c178829b8adaf49de5dbcda7325eaa4f68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20L=C3=A9tourneau?=
 <dominic.letourneau@usherbrooke.ca>
Date: Wed, 24 Apr 2024 20:14:20 +0000
Subject: [PATCH 34/36] Refs #248, Monitor process with thread, add logging
 events

---
 .../API/user/UserQueryAssetsArchive.py        | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index 55e393d2..fb7dd674 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -1,6 +1,16 @@
+import requests
+import sys
+import subprocess
+import json
+import datetime
+import threading
+import zipfile
+from io import BytesIO
+
 from flask import session, request, Response
 from flask_restx import Resource, inputs
 from flask_babel import gettext
+
 from modules.LoginModule.LoginModule import user_multi_auth, current_user
 from modules.FlaskModule.FlaskModule import user_api_ns as api
 from modules.FlaskModule import FlaskModule
@@ -10,15 +20,10 @@
 from opentera.db.models.TeraProject import TeraProject
 from opentera.db.models.TeraSession import TeraSession
 from opentera.db.models.TeraParticipant import TeraParticipant
-import zipfile
-from io import BytesIO
-import requests
-import sys
-import subprocess
-import json
 from modules.DatabaseModule.DBManager import DBManager
 from opentera.redis.RedisVars import RedisVars
-import datetime
+
+from twisted.internet import reactor
 
 # Parser definition(s)
 # GET
@@ -196,12 +201,41 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
                     'archive_info': response.json()
                     }
 
-        # TODO set job information with expiration
+        # Set job information with expiration
         self.module.redisSet(job_id, json.dumps(job_info), ex=60)
 
         # Launch subprocess
         command = [sys.executable, 'workers/AssetsArchiveWorker.py', '--config', 'config/TeraServerConfig.ini',
                    '--job_id', job_id]
-        process = subprocess.Popen(command)
+        
+        # Launch process, will be monitored by a thread
+        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        # Monitor process termination with callback
+        def process_monitor_thread(process, job_id, flaskModule: FlaskModule):
+            start_time = datetime.datetime.now()
+            flaskModule.logger.log_info('TeraServer.FlaskModule.UserQueryAssetsArchive', f'job: {job_id} started.')
+            while process.poll() is None:
+                output, error = process.communicate()
+                if output:
+                    print(f"workers/AssetsArchiveWorker.py (stdout): {output.decode('utf-8')}")
+                if error:
+                    print(f"workers/AssetsArchiveWorker.py (stderr): {error.decode('utf-8')}")
+
+            process.wait()
+            # Get return code
+            return_code = process.returncode
+            end_time = datetime.datetime.now()
+            duration_s = (end_time - start_time).total_seconds()
+            
+            flaskModule.logger.log_info('TeraServer.FlaskModule.UserQueryAssetsArchive', 
+                                        f"job: {job_id} finished with code: {return_code}. Duration: {duration_s} seconds.")
+            
+            # Join thread later
+            thread = threading.currentThread()
+            reactor.callFromThread(lambda: thread.join())
+            
+        thread = threading.Thread(target=process_monitor_thread, args=(process, job_id, self.module))
+        thread.start()
 
         return response.json()

From a2d94a37c3e6d639be67da0981c281057a090946 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Mon, 29 Apr 2024 11:32:24 -0400
Subject: [PATCH 35/36] Refs #248. Changed zip file structure and file names

---
 .../API/user/UserQueryAssetsArchive.py        | 12 +++++-------
 .../API/QueryArchiveFile.py                   |  5 ++---
 .../API/QueryArchiveFileInfos.py              |  4 ++--
 .../FileTransferService.py                    |  5 +----
 .../python/workers/AssetsArchiveWorker.py     | 19 +++++++++++++++----
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
index fb7dd674..2997c022 100644
--- a/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
+++ b/teraserver/python/modules/FlaskModule/API/user/UserQueryAssetsArchive.py
@@ -118,7 +118,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
 
             p = TeraProject.get_project_by_id(args['id_project'])
             site = p.project_site
-            get_assets_for_project(p, f"/{site.site_name}")
+            get_assets_for_project(p, f"{site.site_name}")
 
         elif args['id_participant'] is not None:
             # Get all assets for participant
@@ -129,7 +129,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
             project = participant.participant_project
             site = project.project_site
             get_assets_for_participant(participant,
-                                       f"/{site.site_name}/{project.project_name}")
+                                       f"{site.site_name}/{project.project_name}")
 
         elif args['id_session'] is not None:
             # Get all assets for session
@@ -146,7 +146,7 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
                     project = participant.participant_project
                     site = project.project_site
                     get_assets_for_session(sess,
-                                           f"/{site.site_name}/{project.project_name}/{participant.participant_name}")
+                                           f"{site.site_name}/{project.project_name}/{participant.participant_name}")
 
         else:
             return gettext('Missing required parameter'), 400
@@ -178,8 +178,6 @@ def get_assets_for_project(project: TeraProject, path: str = ''):
         file_transfer_service_host = file_transfer_service.service_hostname
         file_transfer_service_port = file_transfer_service.service_port
 
-        #archive_file_infos_url = f"https://{server_name}:{port}/file/api/archives/infos"
-        #archive_file_upload_url = f"https://{server_name}:{port}/file/api/archives"
         archive_file_infos_url = f"http://{file_transfer_service_host}:{file_transfer_service_port}/api/archives/infos"
         archive_file_upload_url = f"http://{file_transfer_service_host}:{file_transfer_service_port}/api/archives"
 
@@ -232,8 +230,8 @@ def process_monitor_thread(process, job_id, flaskModule: FlaskModule):
                                         f"job: {job_id} finished with code: {return_code}. Duration: {duration_s} seconds.")
             
             # Join thread later
-            thread = threading.currentThread()
-            reactor.callFromThread(lambda: thread.join())
+            current_thread = threading.current_thread()
+            reactor.callFromThread(lambda: current_thread.join())
             
         thread = threading.Thread(target=process_monitor_thread, args=(process, job_id, self.module))
         thread.start()
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
index 0e4aca56..704d7c58 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFile.py
@@ -59,7 +59,8 @@ def get(self):
         src_dir = flask_app.config['UPLOAD_FOLDER']
 
         # Log access
-        self.module.logger.log_info('FileTransferService.FlaskModule.QueryArchiveFile', f'User {requester_uuid} downloaded archive {archive.archive_uuid}')
+        self.module.logger.log_info('FileTransferService.FlaskModule.QueryArchiveFile',
+                                    f'User {requester_uuid} downloaded archive {archive.archive_uuid}')
 
         # Send file
         filename = archive.archive_original_filename
@@ -144,8 +145,6 @@ def post(self):
         except Exception as e:
             return gettext('Error parsing archive information : ') + str(e), 400
 
-        return gettext("Not implemented"), 501
-
     @api.expect(delete_parser, validate=True)
     @api.doc(description='Delete archive',
              responses={200: 'Success - archive deleted',
diff --git a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
index d9bedcd9..0be70856 100644
--- a/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
+++ b/teraserver/python/services/FileTransferService/API/QueryArchiveFileInfos.py
@@ -109,8 +109,8 @@ def post(self):
                 # Add Creation datetime
                 archive.archive_creation_datetime = datetime.datetime.now(datetime.timezone.utc)
 
-                # Add Expiration datetime in 30 days
-                archive.archive_expiration_datetime = archive.archive_creation_datetime + datetime.timedelta(days=30)
+                # Add Expiration datetime in 7 days
+                archive.archive_expiration_datetime = archive.archive_creation_datetime + datetime.timedelta(days=7)
 
                 # Make sure file name is secure
                 archive.archive_original_filename = secure_filename(archive.archive_original_filename)
diff --git a/teraserver/python/services/FileTransferService/FileTransferService.py b/teraserver/python/services/FileTransferService/FileTransferService.py
index 8f61c332..ac59dec9 100644
--- a/teraserver/python/services/FileTransferService/FileTransferService.py
+++ b/teraserver/python/services/FileTransferService/FileTransferService.py
@@ -35,8 +35,7 @@ def __init__(self, config_man: ConfigManager, this_service_info):
             # Create cleaning task, every hour by default, can specify period (s) in arg.
             self.archive_cleaning_task = self.setup_file_archive_cleanup_task(3600.0)
 
-
-    def setup_file_archive_cleanup_task(self, period_s:float = 3600.0) -> task.LoopingCall:
+    def setup_file_archive_cleanup_task(self, period_s: float = 3600.0) -> task.LoopingCall:
         loop = task.LoopingCall(self.archive_cleanup_task_callback)
 
         # Start looping every period_s seconds.
@@ -77,7 +76,6 @@ def archive_cleanup_task_callback(self):
                                 self.logger.log_error('FileTransferService', f'Error deleting archive {archive.archive_uuid} : {e}.')
                             continue
 
-
     def cbArchiveLoopDone(self, result):
         """
         Called when file archive cleanup task was stopped with success.
@@ -91,7 +89,6 @@ def ebArchiveLoopFailed(self, failure):
         self.logger.log_error('FileTransferService', f'ebArchiveLoopFailed : {failure}.')
         print('ebArchiveLoopFailed', failure)
 
-
     def verify_file_upload_directory(self, config: ConfigManager, create=True):
         file_upload_path = config.filetransfer_config['files_directory']
 
diff --git a/teraserver/python/workers/AssetsArchiveWorker.py b/teraserver/python/workers/AssetsArchiveWorker.py
index 1e6a75de..a121f806 100644
--- a/teraserver/python/workers/AssetsArchiveWorker.py
+++ b/teraserver/python/workers/AssetsArchiveWorker.py
@@ -74,7 +74,7 @@
     # zip_buffer = BytesIO()
 
     # Change status of the file transfer to 'in progress'
-    archive_info['archive_status'] = 1 # STATUS_INPROGRESS
+    archive_info['archive_status'] = 1  # STATUS_INPROGRESS
     response = requests.post(archive_file_infos_url, json={'archive': archive_info},
                              headers={'Authorization': 'OpenTera ' + job_info['service_token']},
                              timeout=30, verify=args.verify)
@@ -83,8 +83,8 @@
     zip_buffer = tempfile.NamedTemporaryFile(delete=True)
 
     # Create a ZipFile object to write to the in-memory stream
-    with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
-
+    with (zipfile.ZipFile(zip_buffer, 'w') as zip_file):
+        files_in_zip = {}
         for _, service_data in job_info['assets_map'].items():
             for asset in service_data['service_assets']:
 
@@ -108,7 +108,18 @@
 
                 if response.status_code == 200:
                     # Add to zip file
-                    file_path = pathlib.Path(path) / pathlib.Path(f"[{asset['asset_uuid']}]_{asset['asset_name']}")
+                    # file_path = pathlib.Path(path) / pathlib.Path(f"[{asset['asset_uuid']}]_{asset['asset_name']}")
+                    file_path = pathlib.Path(path) / pathlib.Path(f"{asset['asset_name']}")
+
+                    if file_path in files_in_zip:
+                        files_in_zip[file_path] = files_in_zip[file_path] + 1
+                        # File with that name already exists - insert number
+                        file_name_ext = '.' + asset['asset_name'].split('.')[-1]
+                        file_name = asset['asset_name'].removesuffix(file_name_ext) + '(' + \
+                            str(files_in_zip[file_path]) + ')' + file_name_ext
+                        file_path = pathlib.Path(path) / pathlib.Path(f"{file_name}")
+                    else:
+                        files_in_zip[file_path] = 1
                     # Compress
                     zip_file.writestr(str(file_path), response.content)
 

From d61f414754e6cc9565629a2e92bb624c78c32028 Mon Sep 17 00:00:00 2001
From: Simon Briere <simon.briere@usherbrooke.ca>
Date: Fri, 10 May 2024 10:24:54 -0400
Subject: [PATCH 36/36] Allowed devices to list the assets for a specific
 session

---
 .../DBManagerTeraDeviceAccess.py              |  4 +-
 .../API/device/DeviceQueryAssets.py           | 16 +++++--
 .../python/opentera/db/models/TeraAsset.py    | 12 +++++
 .../python/opentera/db/models/TeraSession.py  |  6 +--
 .../API/device/test_DeviceQueryAssets.py      | 45 +++++++++++++++++++
 .../API/service/test_ServiceQueryAssets.py    |  2 +-
 .../API/user/test_UserQueryAssets.py          |  3 +-
 7 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/teraserver/python/modules/DatabaseModule/DBManagerTeraDeviceAccess.py b/teraserver/python/modules/DatabaseModule/DBManagerTeraDeviceAccess.py
index 43b4c358..ca6cf0fc 100644
--- a/teraserver/python/modules/DatabaseModule/DBManagerTeraDeviceAccess.py
+++ b/teraserver/python/modules/DatabaseModule/DBManagerTeraDeviceAccess.py
@@ -78,13 +78,15 @@ def get_accessible_session_types_ids(self):
             types.append(my_type.id_session_type)
         return types
 
-    def get_accessible_assets(self, id_asset: int = None, uuid_asset: str = None):
+    def get_accessible_assets(self, id_asset: int = None, uuid_asset: str = None, session_id: int = None):
         from opentera.db.models.TeraAsset import TeraAsset
         query = TeraAsset.query.filter(TeraAsset.id_device == self.device.id_device)
         if id_asset:
             query = query.filter(TeraAsset.id_asset == id_asset)
         elif uuid_asset:
             query = query.filter(TeraAsset.asset_uuid == uuid_asset)
+        elif session_id:
+            query = query.filter(TeraAsset.id_session == session_id)
 
         return query.all()
 
diff --git a/teraserver/python/modules/FlaskModule/API/device/DeviceQueryAssets.py b/teraserver/python/modules/FlaskModule/API/device/DeviceQueryAssets.py
index c8854e34..c2ebb674 100644
--- a/teraserver/python/modules/FlaskModule/API/device/DeviceQueryAssets.py
+++ b/teraserver/python/modules/FlaskModule/API/device/DeviceQueryAssets.py
@@ -1,9 +1,9 @@
-from flask import session, request
+from flask import request
 from flask_restx import Resource, inputs
+from flask_babel import gettext
 from modules.LoginModule.LoginModule import LoginModule, current_device
 from modules.DatabaseModule.DBManager import DBManager
 from modules.FlaskModule.FlaskModule import device_api_ns as api
-from opentera.db.models.TeraDevice import TeraDevice
 from opentera.db.models.TeraAsset import TeraAsset
 from opentera.redis.RedisVars import RedisVars
 
@@ -11,6 +11,7 @@
 get_parser = api.parser()
 get_parser.add_argument('asset_uuid', type=str, help='Asset UUID to query', default=None)
 get_parser.add_argument('id_asset', type=int, help='Asset ID to query', default=None)
+get_parser.add_argument('id_session', type=int, help='Session ID to query assets for', default=None)
 get_parser.add_argument('with_urls', type=inputs.boolean, help='Also include assets infos and download-upload url')
 get_parser.add_argument('with_only_token', type=inputs.boolean, help='Only includes the access token. '
                                                                      'Will ignore with_urls if specified.')
@@ -24,7 +25,7 @@ def __init__(self, _api, *args, **kwargs):
         self.module = kwargs.get('flaskModule', None)
         self.test = kwargs.get('test', False)
 
-    @api.doc(description='Get device assets based on the ID or, if no parameters, get all assets',
+    @api.doc(description='Get device assets based specified session or asset ID or, if no parameters, get all assets',
              responses={200: 'Success',
                         403: 'Device doesn\'t have access to the specified asset'})
     @api.expect(get_parser)
@@ -32,7 +33,13 @@ def __init__(self, _api, *args, **kwargs):
     def get(self):
         args = get_parser.parse_args()
         device_access = DBManager.deviceAccess(current_device)
-        assets = device_access.get_accessible_assets(id_asset=args['id_asset'], uuid_asset=args['asset_uuid'])
+
+        if args['id_session']:
+            if args['id_session'] not in device_access.get_accessible_sessions_ids():
+                return gettext('No access to session'), 403
+
+        assets = device_access.get_accessible_assets(id_asset=args['id_asset'], uuid_asset=args['asset_uuid'],
+                                                     session_id=args['id_session'])
 
         # Create response
         servername = self.module.config.server_config['hostname']
@@ -44,6 +51,7 @@ def get(self):
         if 'X_EXTERNALPORT' in request.headers:
             port = request.headers['X_EXTERNALPORT']
         services_infos = []
+
         if (args['with_urls'] or args['with_only_token']) and assets:
             services_infos = {service.service_uuid: service.service_clientendpoint
                               for service in device_access.get_accessible_services()}
diff --git a/teraserver/python/opentera/db/models/TeraAsset.py b/teraserver/python/opentera/db/models/TeraAsset.py
index 758314f7..42808edf 100644
--- a/teraserver/python/opentera/db/models/TeraAsset.py
+++ b/teraserver/python/opentera/db/models/TeraAsset.py
@@ -108,6 +108,18 @@ def create_defaults(test=False):
             new_asset.id_service = 1
             TeraAsset.insert(new_asset)
 
+            device_session = TeraSession.get_session_by_name('Séance #9')
+            for i in range(3):
+                new_asset = TeraAsset()
+                new_asset.asset_name = "Device Asset"
+                new_asset.asset_session = device_session
+                new_asset.asset_device = asset_device
+                new_asset.asset_uuid = str(uuid.uuid4())
+                new_asset.asset_service_uuid = '00000000-0000-0000-0000-000000000001'
+                new_asset.asset_type = 'video/mpeg'
+                new_asset.id_service = 1
+                TeraAsset.insert(new_asset)
+
     @staticmethod
     def get_asset_by_id(asset_id: int, with_deleted: bool = False):
         return TeraAsset.query.filter_by(id_asset=asset_id).execution_options(include_deleted=with_deleted).first()
diff --git a/teraserver/python/opentera/db/models/TeraSession.py b/teraserver/python/opentera/db/models/TeraSession.py
index a3b28fdd..9d002f20 100644
--- a/teraserver/python/opentera/db/models/TeraSession.py
+++ b/teraserver/python/opentera/db/models/TeraSession.py
@@ -179,7 +179,7 @@ def create_defaults(test=False):
                 base_session.session_creator_device = TeraDevice.get_device_by_id(1)
                 ses_type = random.randint(1, 3)
                 base_session.session_session_type = TeraSessionType.get_session_type_by_id(ses_type)
-                base_session.session_name = "Séance #" + str(i + 1)
+                base_session.session_name = "Séance #" + str(i + 1 + 8)
                 base_session.session_start_datetime = datetime.now() - timedelta(days=i)
                 base_session.session_duration = random.randint(60, 4800)
                 # ses_status = random.randint(0, 4)
@@ -199,7 +199,7 @@ def create_defaults(test=False):
                 base_session.session_creator_participant = TeraParticipant.get_participant_by_id(1)
                 ses_type = random.randint(1, 3)
                 base_session.session_session_type = TeraSessionType.get_session_type_by_id(ses_type)
-                base_session.session_name = "Séance #" + str(i + 1)
+                base_session.session_name = "Séance #" + str(i + 1 + 16)
                 base_session.session_start_datetime = datetime.now() - timedelta(days=i)
                 base_session.session_duration = random.randint(60, 4800)
                 # ses_status = random.randint(0, 4)
@@ -227,7 +227,7 @@ def create_defaults(test=False):
                 base_session.session_creator_service = session_service
                 ses_type = random.randint(1, 3)
                 base_session.session_session_type = TeraSessionType.get_session_type_by_id(ses_type)
-                base_session.session_name = "Séance #" + str(i + 1)
+                base_session.session_name = "Séance #" + str(i + 1 + 24)
                 base_session.session_start_datetime = datetime.now() - timedelta(days=i)
                 base_session.session_duration = random.randint(60, 4800)
                 # ses_status = random.randint(0, 4)
diff --git a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryAssets.py b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryAssets.py
index 1e5a5eb8..429b303f 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryAssets.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/device/test_DeviceQueryAssets.py
@@ -2,6 +2,7 @@
 from BaseDeviceAPITest import BaseDeviceAPITest
 from opentera.db.models.TeraDevice import TeraDevice
 from opentera.db.models.TeraAsset import TeraAsset
+from opentera.db.models.TeraSession import TeraSession
 
 
 class DeviceQueryAssetsTest(BaseDeviceAPITest):
@@ -164,6 +165,50 @@ def test_get_endpoint_with_token_auth_with_forbidden_uuid_asset(self):
                                                                         params=params)
                             self.assertEqual(401, response.status_code)
 
+    def test_get_endpoint_with_token_auth_with_forbidden_id_session(self):
+        with self._flask_app.app_context():
+            devices: List[TeraDevice] = TeraDevice.query.all()
+
+            for device in devices:
+                for session in TeraSession.query.all():
+                    params = {
+                        'id_session': session.id_session,
+                        'with_urls': True
+                    }
+
+                    if device.device_token:
+                        if device.device_enabled:
+                            if session.id_creator_device != device.id_device:
+                                response = self._get_with_device_token_auth(self.test_client, token=device.device_token,
+                                                                            params=params)
+                                self.assertEqual(403, response.status_code)
+
+    def test_get_endpoint_with_token_auth_with_session_id(self):
+        with self._flask_app.app_context():
+            devices: List[TeraDevice] = TeraDevice.query.all()
+
+            for device in devices:
+                for session in TeraSession.query.all():
+                    params = {
+                        'id_session': session.id_session,
+                        'with_urls': True
+                    }
+
+                    if device.device_token:
+                        if device.device_enabled:
+                            if session.id_creator_device == device.id_device:
+                                response = self._get_with_device_token_auth(self.test_client, token=device.device_token,
+                                                                            params=params)
+                                self.assertEqual(200, response.status_code)
+
+                                assets_ids = [asset.id_asset for asset in
+                                              TeraAsset.get_assets_for_session(session.id_session)]
+                                for asset_json in response.json:
+                                    self.assertTrue(asset_json['id_asset'] in assets_ids)
+                                    self._checkJson(asset_json, minimal=False)
+                                    assets_ids.remove(asset_json['id_asset'])
+                                self.assertFalse(assets_ids)
+
     def test_get_endpoint_with_token_auth_with_token_only(self):
         with self._flask_app.app_context():
             devices: List[TeraDevice] = TeraDevice.query.all()
diff --git a/teraserver/python/tests/modules/FlaskModule/API/service/test_ServiceQueryAssets.py b/teraserver/python/tests/modules/FlaskModule/API/service/test_ServiceQueryAssets.py
index f737457b..45367e33 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/service/test_ServiceQueryAssets.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/service/test_ServiceQueryAssets.py
@@ -162,7 +162,7 @@ def test_get_endpoint_query_asset(self):
 
     def test_get_endpoint_query_asset_no_access(self):
         with self._flask_app.app_context():
-            params = {'id_asset': 5, 'with_urls': True}
+            params = {'id_asset': 15, 'with_urls': True}
             response = self._get_with_service_token_auth(client=self.test_client, token=self.service_token,
                                                          params=params, endpoint=self.test_endpoint)
             self.assertEqual(response.status_code, 200)
diff --git a/teraserver/python/tests/modules/FlaskModule/API/user/test_UserQueryAssets.py b/teraserver/python/tests/modules/FlaskModule/API/user/test_UserQueryAssets.py
index b548d900..8f16ce9b 100644
--- a/teraserver/python/tests/modules/FlaskModule/API/user/test_UserQueryAssets.py
+++ b/teraserver/python/tests/modules/FlaskModule/API/user/test_UserQueryAssets.py
@@ -1,4 +1,5 @@
 from BaseUserAPITest import BaseUserAPITest
+from opentera.db.models.TeraAsset import TeraAsset
 
 
 class UserQueryAssetsTest(BaseUserAPITest):
@@ -72,7 +73,7 @@ def test_query_device_assets_as_admin(self):
             response = self._get_with_user_http_auth(self.test_client, username='admin', password='admin',
                                                      params=params)
             self.assertEqual(200, response.status_code)
-            self.assertEqual(len(response.json), 1)
+            self.assertEqual(len(response.json), len(TeraAsset.get_assets_for_device(1)))
 
             for data_item in response.json:
                 self._checkJson(json_data=data_item)