From 5c0974fbba094d4c84e2bfd6aefe0c1e68a3ddfb Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Mon, 29 Apr 2024 13:11:05 +0200
Subject: [PATCH] fix tracker: 12.0.12 with some fixes for network proxy

---
 tracker/tracker/CHANGELOG.md                  |   5 +++++
 tracker/tracker/bun.lockb                     | Bin 212150 -> 212150 bytes
 tracker/tracker/package.json                  |   2 +-
 .../tracker/src/main/modules/Network/utils.ts |   7 +++++--
 .../tracker/src/tests/network.utils.test.ts   |   6 +++++-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tracker/tracker/CHANGELOG.md b/tracker/tracker/CHANGELOG.md
index 9edadaedc..d881fb5fb 100644
--- a/tracker/tracker/CHANGELOG.md
+++ b/tracker/tracker/CHANGELOG.md
@@ -1,6 +1,11 @@
+# 12.0.12
+
+- fix for potential redux plugin issues after .11 ...
+
 # 12.0.11
 
 - better restart on unauth (new token assign for long sessions)
+- more safeguards around arraybuffer and dataview types for network proxy
 
 # 12.0.10
 
diff --git a/tracker/tracker/bun.lockb b/tracker/tracker/bun.lockb
index 835c5d24b59942b812a5c28fc28041228f9c3757..b88246e27dd5a03c31ee0fcb14783ac2467d5b7d 100755
GIT binary patch
delta 3594
zcmXBW*|Xnr9LDkaRi&0AC}NLOG_;64wZ>9n4=qh8f|l50DX}(p!d1qMk<J*CE0fF2
zxQQ#_Dilqv!9naPs<DS-N%i|YH_z+)dH(}RF*{YvPCczpZ<=2&eqrs#74x20v}D<q
zmzU1?s}`<Vmu=g+dihfuW}eGmv^Q6i$uq`lE4Ocq?Xc$Sq9oWJYi$rE#SU2e4N)@e
zh;`l+CC5r{iMNX_u<}MxJZy<oYEgV_g;h6+5@2hr_O>V?w!!M}h!SC2tnscWF}A~+
z?}?INd#v@oC@FTp+8>CLVMnafh>~Na55?QX7FhWsQ9NvkRX!HQ$5vQ%Mw9?sW3^92
z39$`U|5TI++hUE+M2WE-)@(&duszoLT$B_$VC^qN$*?2V`BIb|D}5#2F1EnRUyI^l
zORVyZC_c8rs^5wdU~8<_i4tNPtiD;42-{+f??j2Q9oGC_lmy#jtsg{5u>;oLB1(oG
zvCfa8<XCB|c)QpFEBB&!*b=M!B#Mu%u<FmE1lSs@{US<;ZLs>UqD0shYy2ikjP0=I
z@1i8w9&7y}N{St@_8>}z9kI@zqU2cVFY$J<1y-IF#lx0Z<!@1ZY=u?-5hcLZSnXd?
zLTrQ8{}Uy`wpe2nCB}AGbDJm$wio-XH4&R)2eIqz3CPGuoH>X&k#@l4l7h%{5j|28
zWk*DxR78~!15y)h9%4uuqVI$lk(L-cBgUj7<}Qc{>4~)~VoC;LPa$SxB+hP#Igw;s
zE-8q-JEBKQqU?d_lZvQ&A_k-;+I+;2G(_JEF(NH7_C}0JN6dW?6Vek)K}^X&?0pe4
zG7@J$#GFX`<8nzs<O2{rQWE7rM4wbdJqR%%HPH@63`s+D6)_?$F%ChDNk`0S#Dw(3
zT7a06f!K#4W@IGJVTd`A4#(w^g2)RIJyH@yL-a{S)FTiBQWNb+#E>*ZUxXNumKci>
zW6}}xD8z*H#5x)=B?GaKLCnZV933$y(y_Q)QV{t#M30n2IUdm`6;V$>3`kA16A?qw
z5d9>?h_u8w88IduF%86o^u$_%n393mryyozB+jXbIgw7o<&uKPrz3i#B+40xKB<U$
zCSpKpqM3*xX^4InVnkYEoQ)Whj+o~lCZs3Uxriwlh`kgsBO`InL(GYEJ}#FOM79t;
zQWE6?M4wbdy$~@VHPJ3Y3`s-uixDHz65|rYm~_Ov6fq$^u`WYQ$v|uyF(V^!E=SCX
zbOkP#6hvNz=#i2r%MpE25%o&MfYe003Na)N(N`cwq$P%f7?X~eD-jd2{Wn2;>a43l
zN(N$IgP4(#II9qIB3+BiB?XbML-a^Vl<N_FQW4cf3`kA18xTX%5dB8Ph_uAG2{9%e
zF;^odq$k!I#FPxgz8NtiBXMp)%!%aTa!EntTM<1{66H2TpHxJ>9Wfv^(e6MDNkjBI
z5hKzP<1WOQbi}+HF(Ey%e8iLt#J&eHBO`I{Ma+qGA1;>^M7|%<BPCJRBKo8v>H~-Y
zsfqR=Vn`aI2Z#}AiSZC(OgdsdjF^y~SdSp4WFYpVh#47)^B7`Iq{nf&WI;Od*1!7v
RWbTvG>n1NvubY#+@;@aP1YQ6D

delta 3592
zcmXBW*|XSU9L8~{Dz+o`s4Y&5P)mwxN)c2=Z9$P*V^7r*Yh!KP#a+fQ(i?JPCYPCU
z6Enty3u2F@q!dv_YK=X5EaAM*bMt)O-}fI#is{K>dh#)SYR=|Y7R-NU`TBWF7H?hp
z_{Pnf!qqQ4y==pZMbEEU7{5II$g}pAYGRuwj8|9AY>e%&=4+xP*dA-WE=r0Wu=X3G
zWY`hwyeUeKmEIC>7h7QEw?*-=C040L@v#+FeMgi4TVu6%MG3JDR)0^F2-{+f_eF`Z
z9oAegN`mdN)(4`b*a2&QC`yJMu}&jOj+Hiuw~H;X@<*b0*b=LJEQ*h<u<Axp0&I=d
zJ`p9vHdy^rQ6g-MH9iw1#&%e<6(zy;SnG39QtW`WH;IyAN38ROC^=TzEZ#1*z{+2W
z;$cgy@|7q)w!*4kixOaKtk#JVVjHZ!MU)8JVvTP^iLo8l{8p3%+heWoL`ks&*8X0U
z3_D_-A4JKq(vRZpVhgO?i{fERtn!m6KDNTDKZ_DzYpnK*C?U4N>c5H-VOy;6n<z21
z!<xT~l3;tR^@k`acEH+$C>eIdI)93iW2LR)?P3e8JS~ccEwRd9qWIVftNtxYfUU9G
zKca-#2CM%oN`!5(#wbdR?Xc#5q9oW}?331n*c3a6U1v{#jEuyYg_sj*TU;(Fh&&t7
zBPCI`L-a{SR0%O4HPN<53`s-u9S|eZ5@Scim~_P42{9o(v35pG$w2H$#Egu@*#$8t
zl8nnG1(A0}^himR-4K0J5p{ROfYe0W12H5G(f34*NK1^p5M$C2b8p0i^u$sSQ!)^H
zAH<A|#F>Mb6KP*uE-8q-AEHM}qU?|8lZvPZAO@r++JT56X^5^OMx-UiL5MNwh&hFr
zke*m`5mPb{dmds&M&cZdm=oy`TrMeyd?=zvN}_0pKB<U$7-B$bq8*MHl7{H>5hKzP
z;|Ro<bi_OoF(Ey%jzUbyK<uLtGcpoKN6d+|0GCS&A|He3k&-CKBKo8v>T!qxsfo4_
zF(eJqk4KD1ON>Q`G3khDASR?I)?&nz48%SGF(V^!PDIR!v;>z+3L>9`=#i2rCnNf#
zBI+rK0jY^*B8H?P`l*N!X^C+fVoW+>o{pH1o>)r}Q!)_y48)9##94-z6X{G`E-8p?
zA$p`F%2|j$sffB9F(5V3&PEJLL-cbHBhnJ%T*R1k#5@l%Aw99qM@-2;Y#T8nBXKT3
z%!za%E|(NUz6jAHB~ex&`lKT2#fSl^iFOHMNE)JFiWrfW7!G1gI%2LwOvub{g80-~
zmw}WF#J(IcBO`IHK+K7BB`%i~M7|2qBPCI;M)XNVR2MNIHPNm?3`s-uYY`*T65~3=
zm~_Ov9x)+3v2H+2$w2HI5i>Fp=O)CQNFFYi6hvNy=#i2rHzWF_BI;_yfYe001u-NI
z(QieJNK1^{5M$C2^LE69^u+QJQ!)_y4#bR%#JLkOC(>QGTv8DEZbXliM7amiClyie
zMGQzyv^9t!X^0*mMx-UieTXsXh<QI^LV997fS8hj*bgFRWF*c*h&hoS#^uhiZf-iU
WYTZjuP0W6DYVE{xQ)_1>Fa8he<N~1p

diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index 5b3055e4a..04fff1035 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "12.0.10-beta.1",
+  "version": "12.0.12",
   "keywords": [
     "logging",
     "replay"
diff --git a/tracker/tracker/src/main/modules/Network/utils.ts b/tracker/tracker/src/main/modules/Network/utils.ts
index 4dd90b3d3..e397d1f40 100644
--- a/tracker/tracker/src/main/modules/Network/utils.ts
+++ b/tracker/tracker/src/main/modules/Network/utils.ts
@@ -153,13 +153,13 @@ export const genFormattedBody = (body?: BodyInit) => {
       result[key] = typeof value === 'string' ? value : '[object Object]'
     }
   } else if (
+    ArrayBuffer.isView(body) ||
     body instanceof Blob ||
     body instanceof ReadableStream ||
     body instanceof ArrayBuffer
   ) {
-    result = 'byte data'
+    result = '[byte data]'
   } else if (isPureObject(body)) {
-    // overriding ArrayBufferView which is not convertable to string
     result = <any>body
   } else {
     result = `can't parse body ${typeof body}`
@@ -175,6 +175,9 @@ export function isIterable(value: any) {
   if (value === null || value === undefined) {
     return false
   }
+  if (ArrayBuffer.isView(value)) {
+    return false
+  }
   return typeof Symbol !== 'undefined' && typeof value[Symbol.iterator] === 'function'
 }
 
diff --git a/tracker/tracker/src/tests/network.utils.test.ts b/tracker/tracker/src/tests/network.utils.test.ts
index 1aae41eb6..cf2730af9 100644
--- a/tracker/tracker/src/tests/network.utils.test.ts
+++ b/tracker/tracker/src/tests/network.utils.test.ts
@@ -41,10 +41,14 @@ describe('Network utility function tests', () => {
   it('genFormattedBody should format body correctly', () => {
     const param = new URLSearchParams('key=value&other=test')
     const blob = new Blob([param.toString()], { type: 'text/plain' })
+    const uArr = new Uint8Array([1, 2, 3])
+    const dataView = new DataView(uArr.buffer)
     expect(genFormattedBody('{"key":"value"}')).toEqual({ key: 'value' })
     expect(genFormattedBody('key=value&other=test')).toEqual({ key: 'value', other: 'test' })
     expect(genFormattedBody(param)).toEqual({ key: 'value', other: 'test' })
-    expect(genFormattedBody(blob)).toEqual('byte data')
+    expect(genFormattedBody(blob)).toEqual('[byte data]')
+    expect(genFormattedBody(dataView)).toEqual('[byte data]')
+    expect(genFormattedBody(uArr)).toEqual('[byte data]')
   })
 
   it('isPureObject should return true for objects', () => {