From eb981485332903953f36a0fda4d1795591970e19 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Tue, 5 Aug 2025 15:27:07 +0100 Subject: [PATCH] Updates --- bun.lockb | Bin 61162 -> 57140 bytes .../functions/backend/dbHandler.d.ts | 12 ++-- .../functions/backend/dbHandler.js | 10 ++-- .../handle-mariadb-user-creation.d.ts | 6 +- dist/package-shared/shell/checkDb.js | 2 +- .../shell/test-external-server.js | 2 +- dist/package-shared/shell/updateSSLUsers.js | 4 +- .../utils/backend/grabDbSSL.d.ts | 5 +- .../package-shared/utils/backend/grabDbSSL.js | 1 - .../utils/db/conn-db-handler.js | 4 +- .../utils/grab-dsql-connection-config.d.ts | 4 +- .../utils/grab-dsql-connection-config.js | 31 ++--------- .../utils/grab-dsql-connection.d.ts | 4 +- .../utils/grab-dsql-connection.js | 5 +- package-shared/functions/backend/dbHandler.ts | 23 ++++---- package-shared/shell/checkDb.ts | 2 +- package-shared/shell/test-external-server.ts | 2 +- package-shared/shell/updateSSLUsers.ts | 6 +- package-shared/utils/backend/grabDbSSL.ts | 6 +- package-shared/utils/db/conn-db-handler.ts | 8 +-- .../utils/grab-dsql-connection-config.ts | 52 ++++++++---------- package-shared/utils/grab-dsql-connection.ts | 6 +- package.json | 5 +- 23 files changed, 84 insertions(+), 116 deletions(-) diff --git a/bun.lockb b/bun.lockb index 509792605ba4ff67d1616966634627d37db3f6a2..7a988b4c7ff8f038575463303b2a9745aa4d4db5 100755 GIT binary patch delta 9933 zcmeHNd0bRintkt4B|NYc6tR#J0dXq@1(k|Ip5Ve(sGwqjYY;GivI)2w$|S}u8ufG1 zYDA4OQHdH5_bo2T7>!wMTRSFdYi5!tF^ip(iEa}3J+$HEYSgbcofj=6*4oEe2Vc~gYf z%$j{YnC*RAXdUL|my}oK3j!?>L#n5GYK6vwx%ZJ^9@SDW&7J_wz4ih7fv=$_UvMm1 z9%B5tV=-quZOagG#Q@!I0ds>F z^p1~$xx<~{HsJNTeHoYsG*{O}I-4+BwpSLHscWHmuxm z5||r4iQ;X+MYAf@isdl!K#OMOs5%^)^KZAIMk%Xmp`TIY1oUk)&=hXt$zOO%KQ>+4+kpqgoR2|VEnlY5TQ@^XfO{X4$M2KBENWM{tQ8gf@X(uOQ)AY3bVUvj=ckJB~)W4 zb<+xbiBa%~FMxTZ`*d9c<_4eB?L}ZrntLpmXCNNT19yOV=4a&RAam zAeD$-%oOG4kWDx>6euq$w>YG69%T1b zngk&oMNDcdccBJq3axZCQ=^|E<(kRfMv-=zsR;CynQB`q@}L$N2TDp5)zV?EhU!PV zymidw0 zrbrk3sK}+cZIdbi zZl7Ci$sVl8iFjoCz$mLlWm@@kdNs~+mhaRn$wWyp_UvA#q|WL$Hcw>#j_@< zc_*P#p**SF$07UUVT^{tmTc{i6QO#kCF_wl1B(0eRQJIiC>|hsusGz;p?D%%@Nne_ zJo4IKZI~h*u~H+*BarN! z6k|jcU6n<_So2h*MyRQMNF{PgmO~ynV{w?1pvI{7SCGm@i&(EN z4)a5(EY&_XR1omtquY-|scp-0m>`UQWY2?2SIh51YVsp{+s=kP7pW%uX(+9oR^gA@ z!J-sGO*CrD{|c33D04R)keWADNR3i^`vX$EY}i*V9kN$f%{OczUxzsnDw@6th?So2 zO0_)|>Gxf!v8N)3;*jU%6!?rVPlg&z-$cZjkZ@5krcLh7CQeO2Dnm`}MoP;y^$>(i z)s~HvQ%!9{Y9y!RACQVg4G6CkX0Egz-3_G3y!31D$tDFnwcBkTfLQNFv8O1u6>jf&o+(8wVml63wZ+2#gsP76TlZx!f{<>n{g5EawVba0S34T?24nX8T&5Uj}n%j=9`AfE!*9 zaA0P=fdv9Hm)i)iy$0Y=Z6umwF1QI`-VAVHX1xXA2Dbtn9%s&f4Pf2|aA0QrIuHOH z)wo)?hy;hnnG60NV7{dDAHW=#*?yS?0yFC?ED)Gk|B(d(GwV-SATYDO%7Pb6OZ<|# zz^4H7X8?!CnLWP_F#ieQayJ1EH`Vx`Wc1%`1#b9ry`jgM?fYM4`OO{bue6D-sv(JA^-d7_K%LtTbyOScpk?HFvKVS}7vJ4%RmQPvO(MI<@J z_B1ESMP5TKbR8;?dL+B(5Y&ofrx-+6p$djs=*bkP*pZf|xX7Alp>Lo%(STGJy$4m3 z>J&ri4%F-<3k`QV#m=@scbQmf*%|ad1onjOfro%s|51{%|U|gZcn!GzCt8e_8Nv zf>X?-b5L2?@Nc41bkUrN@NXRagUY5Jli(lJib+m!JY9t<7!Us@JH?5#bTa�RNyS z(}1VoA5_g#PBDk>K+T>A|8ksSF0IdTiFtGnaXzI?fp?SO-4v(zG(DK&5(_9J*CiIx zPQ*nd=DEaal#O^g)gvw@Io~CgP!8f!I*hoC{HD6Zaw5YMKIi04p`LYFv~79yTUR}s&rs3MoRfR-YDhHfFQrUBDjqMKGDUPyNk zKT8SIUE*`J9`W;Z5Ah;ODTW7y@SxZ!E~W>?E^!HEl(@vDv=i|%5=&j;a>_>hBGn^a zL2{W(TuC{IU!uchSeIg~OSw~AO@-xH7pM=)w^RCTlQ|AAFRdC9=DVbZx{56l+oS>h z4a$5wr_Evzl6ytfe6|bH!-KuO^!MSRYp8Bx?BIug(*nOPtOEG$hF>f>7@FUZN>z&> ztOj$LGQF8YYw63)VN_5PU(MC{9d!%vD!}i*{4(SQ76Q)#&jHT^{Jp3LfG>&yz7X>N zCxi$9|7uacT6F>Ad#w6(&JWxM!2eSCzm5DaPJ#coTLUd(TVd3-AtU4YUHh08fCw z%<)b#115mqvs(f_fHxom767(t)ySDf0nTg(v<2D#{y=A-6A%pW^z${bNMq9>U zcow;xYRvjPL^VBHc#aUkj<8 z0x<`e4a@>&0#!gIzz@d^pbRJhrUOMl0Z!{Ipb&T($OrO(Twp4|8;;9!J+9B~ zaC_V?+D}qD;!Q9Y=mpFJ<^ziX9_><{&0rJY0jvPH;gjnSAr#e7<7-_xr=j(>S4Am8 zq~Pt=81=3bXYI;Y_h$aQ;G;}QoYXI}Ph=mggQ#7)R2*EnP?16vyH&~) z>4oiSHskiSVrlZjeXoblN4coTC~l!%q;FAfum_#kVU^N7C~QZXbl!u?pfsb+xPtxL zmENPJ+v~ZL{^$gcnO>`@@}E(8y_w>7T4Rj+*YDq1P`2@p7cOy^sDwU^n^@zPM-n@? z(5_X(JgM$YtJKGnR_?S)37)j7&MJ-cB=;_>G~Sc0!8p~Ee%v`#TIxlUYNKt&ZDmc# z(r+&PIORKZ(hq*&B*>O&SFP1%+=D9T2EA1?^=BWoKy+kOA7QRcH*2ji#>Hvef$*@d zOQkb<3wWxGtJSloepgo--hB>oF#5=-Xkn*Jk#AaKjJw!z-`*WL`kZeowW?acxUDVT z_SDu9XRbswRlO$D{5PW|-BG(YrNOmdIvVRuC3~W!=JIUDb#TDi?3NXaD=+Ay#X9QK z6W~K1?y}m9d+5wdcf;qF`evhCOk^~#x7NDNxOX1W`}Eep^Jo0^v7% z*WbHJqxMbzHg^+pcuIL#7P`CJYBR3CFJ{$#obn%=zmUXdc%R}_Z+6D?snYZGX>8W0 zZ6X@`RtID5wbHchf44}@wrKLD+B$W&->-|7miSVydaLapx3-s`cH8-jF+SdFbL*`4 zXftlRU86P%55N2AJmxD(eT0PYHk7wFT5`0Zb$h2uwtC)FJy08( z)}G?_TW!XDecr!??*H_=goTo5=aUctH~3}yqot#Pv~7QybfyFSd4IHR5k8k?9EE#! z{IGb`hWc~xgf|~H$jTs!KVX$M;5PX{w7+`$jBuTwZ z@6S&yIMh=T`(uOg2kN;Xx^}>7`wTt!qUMR$8{SRcy)W6H=e%E3WVG;g5cwXo+gjk0 z6f^heLVTVz_NT(dW2X9wEo?OQU`UK{W4zsig;AF){d-bYQ%;eM zb{(|Zj7#|B7lhPa+q0;tK#h%V9<;_7xAv>P-*F*v=7r8p1&n+Bw5vPkB#n|D>-9?; zMIK6%qB_$2L(x)PN2)tyjWK>taQc3)`)|GX%~q3$!?`b?oW?H>h8+0o^^3#Ldy=s(7AFZ@XAHu^bfK~v72V6q*t+KgXw*n%D`|Dtc}D@_G%22=VG zYmD(Tkg_+FL(k6pdUI0&C&57&H~a(?PWn~p@=e%&L@<^N$$v`LHk^;!M( zmC%;T_Umh@9k|l$u5=9R@{i{(Hof|ozSEVyM*-tkBtMqC{H(wC8=dhS^M^T}gGf7t zAB&c5*(vLoUAk+h=Z}Rn|GuHNhxd(>$E=dvi#|OT?R}_@pL9XEUq=DQhtgBWqWzeA;6?G60K|roufx&``gI$DCQ3Rx@5OpwlwwTzq1uWPV zTf~xRNX%2yB*hY=Q4=+$_|(|mOJX7~>i64s=88$od*8R#`{!HhoyG6`&faIAvQN8r zxaYvz4Q^g)usAIA=Skl0Zmc`=s%yhR-ETPVT=&|t%+QP+@w2@{wxr#h`f>HpJAx7_ zmzV>rTi4hGTdWs^vYSY{fhUy|PR@xGgu|jBXdxf4^G2`-E+who?$AEi+7|YgCHWSi7Wv#<5%kR2V6N`8 zAC)%nw|WKJmeJ!NK|q6Lcff4s7-AdGbC7u-C4vLNZ-IFjT7XfstP0G_&%CTmcqzz4eE*Sx!|zqfSdOR=FR z-%n{fY=`F~m%*CKzB3K~95Vj$v>o@qkmsD7nf8ItrN)TIqox6ryk8OJ72Hn1t3Tr{i^XqF*H8;6V(NFs@TF}g*N;vwO@ z5^ds;{BhtNhVHb-4!v;yi6hoqsSZZT4L11fcurFjjg##PoHM_w}WB$}m*(fBzC zf=mg{@!DZXMJal8RJ#ZgcUvUXCw=Zfby`^(p`kb@S=yZigTAGZx5~@T&d1O)?UB{>4Y*G5DQlaI$XuLqk*>7XXEb{S5}&QJ2rcu-vvSrdd~w-+T~JjQuasgJB#2SpsO0qKG#)%nO$ zuouPYWo&-PrbDZ;dz%_2z z`28rsBVIcSso}7|8upCQz6pufS|i1+yG^L3sjMA@VxJwOqscP>*V%HmT2et7{ZSJA-Xni&$&O<-3M&D~nrT((^F_gTkuwR3B0L1-TojCP3Dv7;Ka8snoL2KyiVx_9B$gC|stJ^( zG(V~XRrpa{kStxo^Cd{u`uht)%#%)x@uxcExdc*Nu&iknjNze#;CM|DQhk-wF{Ci* z!SPz35Y-vO3MOJ9XjX)9UVuC>id;L}kv3DQ7%7!#X(MY}V()NA1!a|5!YHn-EUgKnQqVVHRMS@0hTwU}%S=@ENM<{VGs@a^ zP;v_>=NF^72&n^iL~0yPbw*iA38%QQI4e#Be%TQ4T;X>memn|TkxF=)IUg%d3D08A z$2)`)m|4cUQ^K?z?{?0_7Ms1leP02mad4Y;KQX4YftD&bko z`Pgboc#5q8o+Ls7z@5fWE8$tp`8Xq$z|3+Nz!@+B>{Kei;c4bU9SU#RBf%U- z;sr>_$gs)0h?T(14UDmKrlM6go|1Z6)<82J;E~F)b3T|GEVT0!yS~)UGwu3WJpSC! z3jhaZmS1E6ftf3s1F(lL+j%Ki0+s*Gw!0l{?*TmffE#G5@L4At$|xrvSMYy2;pmn2KFYYZe*gAau}7bIy-tm6 zdAp4Ibktj?%P$*8`LrCcF=~M3^no`cYp0j2*|0qPnCr*~6FS5uuFjqsFr-r#sb;|N zs^vS+E^^Imo8x^V z4}F&OYjx~{Hya%O(P6~#{E6#V#QViRw2bndduepTtb`d=`TwZBr|-G!iu?Y!%SNA| zkKU(;=-r&d=U!j;e%9R1*TWljit+yD@!$>RnXmS|wP3OJ%z?mBALSIE*tp{Dqh2Q# zwcqhYk>;nxgI>(I)+?-aqGjp6E)QM5d#ZPQgs8z`T8;R=Yqe+Hg~fDr;IFBp(r9bf z9!Da3#9Xd=cj%dY>qktIM;7Ll_;&xQ%75R(po9i5t$Jxr#+vMk>bNVe9WPJ*oOZ|R ztqX5#DeRIs;K0GECF_HGR_t$ir2YPGLj#99b{seL_9sy%l5>0)^cBy}7(M*OEpP97 zt!?m{8}6RB{;Fwwt7UW1Vd46xde=zp8rUKFadPpg;ax-fZ>*T*SG3DAIQIPyEMt53 z{&nuYQ@+DB^8zC-8;>pg(syjZ!Zu%A`>5pnsXM89>x`2FkCnvr+wt*dV`xO2KBfFr z;JDPS$Io}a<-B8U#KDJyqHiv&J991F;UAmif3A-|xy|@`z^Kh)Q8`6)!qA$cf3f$Wn@;b& znflA*tcuyQT0g!NySi7ezz|pc!;4RKRYzCR)oGn{DIJzp?mQJx>-_Gt3w_Q+m5W<; zmit_3;dk6^zweBuNonKTZ0>d2qvD&t#?4B2y!HJTqJP*oezx27iFg0Dw{FM$irF`x zsz$C;^PXB`#CnM5Bt3h6qe z=i*JGFHMd&Q+XF1orTnlf;yQgv8#?|cQT27bQ;nxkUAuo!~mL=V5X{WI{FS$5XE*j zQ+jtDt?g_QL+A!1#~wQB)5Rn{M-^SnbO_QzNG&O;tC`04)Y0y)CNY#AK+^Zp(THv) zu?=nSW~Sqiblpv&k%n}~F!k2aVMy&r+XMb3>S$6AlNdp7Kspb}uct|DPuV@;Uy_bK zfz*L~d%?eC9nI)v5@V`4_S_y_4Bq~4U20{{BMzZ8?0 zL=Pb8Q{i79lW3ytec&G?U0;*fhlccpe*@qjq<*CB2mc1bzkVh$mEM4K9+F>wlQ@vF z`@_FM@DEZN`KH3ZH29Zl63tW#={h9i0FyX`N(R8c!SD~#FbW+A|IF}jph+A-7a;ut zDPfRF97Xd7!M}9)2PuPM)8O9__?Ko9GwDW}SX0te+ zHXzQX2Z$$7YPwmRNZS$TkT}FFPNE@*b7?Q)Jkky|i}{p+crv|#xPaV;nZ-iNMqETk z5f_v1aI-jtCL^9owTP!t&V%!|b&E}=IdormN%)+7>Tk2Q zjsFko@P83#noEi%&HssJm#x&iRj^aOeV zy@5m^36OyVzyR=%B#gcg3bf|G=14pTv;g=AoEN}9t}%_u*x}!={FO<#O@7OoSx+PN zDR2h(3^)s%13m}N0~dgcz!$)mz$M@~Pz!tr{0Q*x(@nr;U>(5k+{=KWz%XDqFdb+E z_yPR0{yK1jz1o7r24EvF3K$KH0A>PZz!>0rU>3kXunz*w0RE-uxE>M0SDP@+!Pd1% zt^ppcZ5uH~4#*JD_%o^ZzXU`*L0Fwmret9*DXD z-2t8(wK27_r#(|E8VS1;pdY|%wJ(qan1E!U55W1HX0RRS4+RDTX#j8K{yhH!kl@A! zfd>LZ05iaQo0$s_2Y7vt0WtwzpyPnCKsGP|$N^RZtAGk%C9ncm4iLa?s9_0YKC>P_ zZt?i>A|w_9uK+It3xJn^`M^A25^Q36Z_ih)94I#3Es1Ev5)Kmm{s+B zWPn#3+jBWC&-HM9GXUPTybgE`%m!kBIlx?CDZstO(Ga2}JRx`h?m#)f6}xRlgy3?R zR+P8cf24f9XuS#94X1(nwOJBJMutU%g~K2F6&dyWGjiI8MMNS?x!i&>>X&2WM4(Ir zP6PY(7xmk6eQoMRnWgrx&`M7GFe?hFcWTrR*2oGEiw{RY;$xhh2!gNrV7q*5>4bfJrtkv2aK>J_O8{l7lh z{IgpfV9hHuB0~6$>k@v@j9wr4zcr6mFGe+4HpHcHZqdi~{$tkud<>hrQrq=<+?UhAX|gULUPq@A3=28gfJ%{DxA4 zvSic?Uqi(;U-bHUT|RPntzf6lccov^xc%l=*{!UhX_q=3=>Y@#x*pw_!Z+xpB)6q| z^ak}F*y;2gr;>hL_njopNU4qpLU%d9QrBRo`d<7Ip7q2o7@$2w#8tW!{1<-*Vfd=)qS!H_MIq98De}^Z1%nG1;Xxw%`O(@%AwO;qo z-Yu^;P;am$&JmK^ZcC^7oSgwA@6<;hL*sfhzW83%$GxU}98zzfUW!Y(u)U=B0O_e# ze+;0Pccw_41L@+u&(X1=O7sP_iX z?i;`O?bSEr`ifcv(Ph{r22nWd)O&+>=FR)kvG?Q`>bo*Mh}!Pf8`O)3bql(N%sf+3 zTyIbnM5A}>qt%;>chfH|cTIlHr`|xl<7jC1V8M6o8=tGsxf4XMqNsW~GJmUl=!NIM zUsrFSUY|5g6_Znc_|mOD$1#L{-5qJ~zGQReUwCU94#_q+|6=s)!~5ssuNg~uH z&4$emwcGY8=K^*UUcRtyoiH)=2d?@e^=T;e#fhw5q`aTI;sr0Ktsy9iS?80zlaXH7 z6Di#_((8L#%XRn#fWIdfnn(2uXdZm*+yZ5Lw-3Wh>oZ?jl#O4hA^&Q<LR=Rrk;+X*yWl)#;QyW5AvL(q1>QaiOIEcR_P3g@s0bSta*xweE64n@JMqH(1eQwxoSg*nFjg1oWWsC%3x*HVyCWHF8{&dn^! z&dbft%*&l(%*n>J+>A+&~*@*k!#TMKyFDxp^&K*bYhnh8g zB5`-r93#JBQpV*#-zTM%-r8$0Vq_@%Y*54>TY=dhl}3I}Djv{Bug7WdlG;(J-P8W6 zj6(L5F@mb!3~9_S*Q^8?JA}2T4F`kB^;lEtad2krADo8aA9RWX5j wT5IsD7fVp?DG7ZHM>}cH{eF;P_Is7Bm-~(TmN`(1Pn*%**W>r!KPb2SAIBT*8~^|S diff --git a/dist/package-shared/functions/backend/dbHandler.d.ts b/dist/package-shared/functions/backend/dbHandler.d.ts index f4f62d5..4bcc056 100644 --- a/dist/package-shared/functions/backend/dbHandler.d.ts +++ b/dist/package-shared/functions/backend/dbHandler.d.ts @@ -1,10 +1,6 @@ -import { DSQL_TableSchemaType, PostInsertReturn } from "../../types"; +import { DSQL_TableSchemaType } from "../../types"; import { ConnectionConfig } from "mariadb"; -type Param = { +type Param = { query: string; values?: string[] | object; noErrorLogs?: boolean; @@ -18,5 +14,7 @@ type Param({ query, values, noErrorLogs, database, config, }: Param): Promise; +} = { + [k: string]: any; +}>({ query, values, noErrorLogs, database, config, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/backend/dbHandler.js b/dist/package-shared/functions/backend/dbHandler.js index a8301d8..bbabe39 100644 --- a/dist/package-shared/functions/backend/dbHandler.js +++ b/dist/package-shared/functions/backend/dbHandler.js @@ -27,16 +27,16 @@ function dbHandler(_a) { try { CONNECTION = yield (0, grab_dsql_connection_1.default)({ database, config }); if (query && values) { - const queryResults = (yield CONNECTION.query(query, values)); - results = queryResults; + const queryResults = yield CONNECTION.query(query, values); + results = queryResults[0]; } else { - const queryResults = (yield CONNECTION.query(query)); - results = queryResults; + const queryResults = yield CONNECTION.query(query); + results = queryResults[0]; } } catch (error) { - console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.getConfig()); + console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.info); if (error.message && typeof error.message == "string" && error.message.match(/Access denied for user.*password/i)) { diff --git a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts index 19effbc..4fd9e8f 100644 --- a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts +++ b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts @@ -15,5 +15,9 @@ type CreateNewUserParams = { host?: string; password?: string; }; -export declare function createNewSQLUser({ host, password, username, }: CreateNewUserParams): Promise; +export declare function createNewSQLUser({ host, password, username, }: CreateNewUserParams): Promise<{ + [k: string]: any; +} | { + [k: string]: any; +}[] | null>; export {}; diff --git a/dist/package-shared/shell/checkDb.js b/dist/package-shared/shell/checkDb.js index 9458eee..80105da 100644 --- a/dist/package-shared/shell/checkDb.js +++ b/dist/package-shared/shell/checkDb.js @@ -28,7 +28,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne (() => __awaiter(void 0, void 0, void 0, function* () { const CONNECTION = yield (0, grab_dsql_connection_1.default)(); try { - const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); + const [result] = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); console.log("Connection Query Success =>", result); } catch (error) { diff --git a/dist/package-shared/shell/test-external-server.js b/dist/package-shared/shell/test-external-server.js index 92f84e9..51e6183 100644 --- a/dist/package-shared/shell/test-external-server.js +++ b/dist/package-shared/shell/test-external-server.js @@ -33,7 +33,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne * @description If a database is provided, switch to it */ try { - const result = yield CONNECTION.query("SHOW DATABASES"); + const [result] = yield CONNECTION.query("SHOW DATABASES"); const parsedResults = JSON.parse(JSON.stringify(result)); console.log("parsedResults =>", parsedResults); } diff --git a/dist/package-shared/shell/updateSSLUsers.js b/dist/package-shared/shell/updateSSLUsers.js index d6d45c9..fde4ac0 100644 --- a/dist/package-shared/shell/updateSSLUsers.js +++ b/dist/package-shared/shell/updateSSLUsers.js @@ -30,7 +30,7 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name" var _a; const CONNECTION = yield (0, grab_dsql_connection_1.default)(); try { - const result = (yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user")); + const [result] = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user"); for (let i = 0; i < result.length; i++) { const user = result[i]; if (user.User !== process.env.DSQL_DB_READ_ONLY_USERNAME || @@ -42,7 +42,7 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name" if (ssl_type === "ANY") { continue; } - const addUserSSL = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`); + const [addUserSSL] = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`); console.log(`addUserSSL => ${User}@${Host}`, addUserSSL); } } diff --git a/dist/package-shared/utils/backend/grabDbSSL.d.ts b/dist/package-shared/utils/backend/grabDbSSL.d.ts index 77ad19c..d507388 100644 --- a/dist/package-shared/utils/backend/grabDbSSL.d.ts +++ b/dist/package-shared/utils/backend/grabDbSSL.d.ts @@ -1,4 +1,7 @@ +import type { ConnectionConfig } from "mariadb"; +type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ -export default function grabDbSSL(): any; +export default function grabDbSSL(): Return; +export {}; diff --git a/dist/package-shared/utils/backend/grabDbSSL.js b/dist/package-shared/utils/backend/grabDbSSL.js index dcd40a5..b6996f2 100644 --- a/dist/package-shared/utils/backend/grabDbSSL.js +++ b/dist/package-shared/utils/backend/grabDbSSL.js @@ -7,7 +7,6 @@ exports.default = grabDbSSL; const fs_1 = __importDefault(require("fs")); const grab_dir_names_1 = __importDefault(require("./names/grab-dir-names")); const path_1 = __importDefault(require("path")); -// type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index 0f09dd6..a533ca1 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -42,7 +42,7 @@ values, debug) { throw new Error("Query String Required!"); let queryErrorArray = []; if (typeof query == "string") { - const results = (yield finalConnection.query(trimQuery(query), values)); + const [results] = yield finalConnection.query(trimQuery(query), values); if (debug) { (0, debug_log_1.default)({ log: results, @@ -61,7 +61,7 @@ values, debug) { currentQueryError.sql = queryObj.query; currentQueryError.sqlValues = queryObj.values; const queryObjRes = yield finalConnection.query(trimQuery(queryObj.query), queryObj.values); - const results = queryObjRes; + const results = queryObjRes[0]; if (debug) { (0, debug_log_1.default)({ log: results, diff --git a/dist/package-shared/utils/grab-dsql-connection-config.d.ts b/dist/package-shared/utils/grab-dsql-connection-config.d.ts index 4a805c6..5341bd9 100644 --- a/dist/package-shared/utils/grab-dsql-connection-config.d.ts +++ b/dist/package-shared/utils/grab-dsql-connection-config.d.ts @@ -1,6 +1,6 @@ +import { ConnectionConfig } from "mariadb"; import { DsqlConnectionParam } from "../types"; -import serverlessMysql from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ -export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): serverlessMysql.Config; +export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): ConnectionConfig; diff --git a/dist/package-shared/utils/grab-dsql-connection-config.js b/dist/package-shared/utils/grab-dsql-connection-config.js index f445f5d..8d3677b 100644 --- a/dist/package-shared/utils/grab-dsql-connection-config.js +++ b/dist/package-shared/utils/grab-dsql-connection-config.js @@ -5,35 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = grabDSQLConnectionConfig; const grabDbSSL_1 = __importDefault(require("./backend/grabDbSSL")); -const lodash_1 = __importDefault(require("lodash")); /** * # Grab General CONNECTION for DSQL */ function grabDSQLConnectionConfig(param) { const CONN_TIMEOUT = 10000; - const config = { - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: (param === null || param === void 0 ? void 0 : param.database) || - ((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME), - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - ssl: (0, grabDbSSL_1.default)(), - connectTimeout: CONN_TIMEOUT, - dateStrings: true, - compress: true, - decimalNumbers: true, - // supportBigNumbers: true, - // bigNumberStrings: false, - // bigIntAsNumber: true, - // metaAsArray: true, - // socketTimeout: CONN_TIMEOUT, - // ...param?.config, - }, - }; - return lodash_1.default.merge(config, param === null || param === void 0 ? void 0 : param.config); + const config = Object.assign({ host: process.env.DSQL_DB_HOST, user: process.env.DSQL_DB_USERNAME, password: process.env.DSQL_DB_PASSWORD, database: (param === null || param === void 0 ? void 0 : param.database) || + ((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME), port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, charset: "utf8mb4", ssl: (0, grabDbSSL_1.default)(), bigIntAsNumber: true, supportBigNumbers: true, bigNumberStrings: false, dateStrings: true, metaAsArray: true, socketTimeout: CONN_TIMEOUT, connectTimeout: CONN_TIMEOUT, compress: true }, param === null || param === void 0 ? void 0 : param.config); + return config; } diff --git a/dist/package-shared/utils/grab-dsql-connection.d.ts b/dist/package-shared/utils/grab-dsql-connection.d.ts index ceb0a5f..990d4c7 100644 --- a/dist/package-shared/utils/grab-dsql-connection.d.ts +++ b/dist/package-shared/utils/grab-dsql-connection.d.ts @@ -1,6 +1,6 @@ +import { Connection } from "mariadb"; import { DsqlConnectionParam } from "../types"; -import { ServerlessMysql } from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ -export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise; +export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise; diff --git a/dist/package-shared/utils/grab-dsql-connection.js b/dist/package-shared/utils/grab-dsql-connection.js index b08fc39..4a2c9fc 100644 --- a/dist/package-shared/utils/grab-dsql-connection.js +++ b/dist/package-shared/utils/grab-dsql-connection.js @@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = grabDSQLConnection; +const mariadb_1 = __importDefault(require("mariadb")); const grab_dsql_connection_config_1 = __importDefault(require("./grab-dsql-connection-config")); -const serverless_mysql_1 = __importDefault(require("serverless-mysql")); /** * # Grab General CONNECTION for DSQL */ @@ -22,8 +22,7 @@ function grabDSQLConnection(param) { return __awaiter(this, void 0, void 0, function* () { const config = (0, grab_dsql_connection_config_1.default)(param); try { - const sql = (0, serverless_mysql_1.default)(config); - return sql; + return yield mariadb_1.default.createConnection(config); } catch (error) { console.log(`Error Grabbing DSQL Connection =>`, config); diff --git a/package-shared/functions/backend/dbHandler.ts b/package-shared/functions/backend/dbHandler.ts index 628cf1e..7593bba 100644 --- a/package-shared/functions/backend/dbHandler.ts +++ b/package-shared/functions/backend/dbHandler.ts @@ -1,11 +1,10 @@ import fs from "fs"; import path from "path"; import grabDSQLConnection from "../../utils/grab-dsql-connection"; -import { DSQL_TableSchemaType, PostInsertReturn } from "../../types"; +import { DSQL_TableSchemaType } from "../../types"; import { Connection, ConnectionConfig } from "mariadb"; -import { ServerlessMysql } from "serverless-mysql"; -type Param = { +type Param = { query: string; values?: string[] | object; noErrorLogs?: boolean; @@ -19,31 +18,29 @@ type Param = { * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database */ export default async function dbHandler< - T extends { [k: string]: any } = PostInsertReturn + T extends { [k: string]: any } = { [k: string]: any } >({ query, values, noErrorLogs, database, config, -}: Param): Promise { - let CONNECTION: ServerlessMysql | undefined; +}: Param): Promise { + let CONNECTION: Connection | undefined; let results: T[] | T | null; try { CONNECTION = await grabDSQLConnection({ database, config }); if (query && values) { - const queryResults = (await CONNECTION.query(query, values)) as - | T - | T[]; - results = queryResults; + const queryResults = await CONNECTION.query(query, values); + results = queryResults[0]; } else { - const queryResults = (await CONNECTION.query(query)) as T | T[]; - results = queryResults; + const queryResults = await CONNECTION.query(query); + results = queryResults[0]; } } catch (error: any) { - console.log("Connection Info =>", CONNECTION?.getConfig()); + console.log("Connection Info =>", CONNECTION?.info); if ( error.message && diff --git a/package-shared/shell/checkDb.ts b/package-shared/shell/checkDb.ts index 33f33d1..76a84c8 100644 --- a/package-shared/shell/checkDb.ts +++ b/package-shared/shell/checkDb.ts @@ -16,7 +16,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; const CONNECTION = await grabDSQLConnection(); try { - const result = await CONNECTION.query( + const [result] = await CONNECTION.query( "SELECT id,first_name,last_name FROM users LIMIT 3" ); console.log("Connection Query Success =>", result); diff --git a/package-shared/shell/test-external-server.ts b/package-shared/shell/test-external-server.ts index f959c04..38ba677 100644 --- a/package-shared/shell/test-external-server.ts +++ b/package-shared/shell/test-external-server.ts @@ -21,7 +21,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; * @description If a database is provided, switch to it */ try { - const result = await CONNECTION.query("SHOW DATABASES"); + const [result] = await CONNECTION.query("SHOW DATABASES"); const parsedResults = JSON.parse(JSON.stringify(result)); diff --git a/package-shared/shell/updateSSLUsers.ts b/package-shared/shell/updateSSLUsers.ts index 5087c7f..bba2877 100644 --- a/package-shared/shell/updateSSLUsers.ts +++ b/package-shared/shell/updateSSLUsers.ts @@ -17,9 +17,9 @@ import grabSQLKeyName from "../utils/grab-sql-key-name"; const CONNECTION = await grabDSQLConnection(); try { - const result = (await CONNECTION.query( + const [result] = await CONNECTION.query( "SELECT user,host,ssl_type FROM mysql.user" - )) as any[]; + ); for (let i = 0; i < result.length; i++) { const user = result[i]; @@ -38,7 +38,7 @@ import grabSQLKeyName from "../utils/grab-sql-key-name"; continue; } - const addUserSSL = await CONNECTION.query( + const [addUserSSL] = await CONNECTION.query( `ALTER USER '${User}'@'${Host}'` ); diff --git a/package-shared/utils/backend/grabDbSSL.ts b/package-shared/utils/backend/grabDbSSL.ts index 254556d..74801de 100644 --- a/package-shared/utils/backend/grabDbSSL.ts +++ b/package-shared/utils/backend/grabDbSSL.ts @@ -2,15 +2,13 @@ import fs from "fs"; import grabDirNames from "./names/grab-dir-names"; import type { ConnectionConfig } from "mariadb"; import path from "path"; -import serverlessMysql from "serverless-mysql"; -import { ConnectionOptions } from "tls"; -// type Return = ConnectionConfig["ssl"] | undefined; +type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ -export default function grabDbSSL(): any { +export default function grabDbSSL(): Return { let maxscaleSSLCaCertFileFinal; try { diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index ea10b33..44babfa 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -43,10 +43,10 @@ export default async function connDbHandler( let queryErrorArray: DSQLErrorObject[] = []; if (typeof query == "string") { - const results = (await finalConnection.query( + const [results] = await finalConnection.query( trimQuery(query), values - )) as any; + ); if (debug) { debugLog({ @@ -74,7 +74,7 @@ export default async function connDbHandler( queryObj.values ); - const results = queryObjRes; + const results = queryObjRes[0]; if (debug) { debugLog({ @@ -106,7 +106,7 @@ export default async function connDbHandler( }; } - return resArray as ReturnType; + return resArray; } else { return null; } diff --git a/package-shared/utils/grab-dsql-connection-config.ts b/package-shared/utils/grab-dsql-connection-config.ts index 4910b66..f58f5fa 100644 --- a/package-shared/utils/grab-dsql-connection-config.ts +++ b/package-shared/utils/grab-dsql-connection-config.ts @@ -1,43 +1,37 @@ import { ConnectionConfig } from "mariadb"; import grabDbSSL from "./backend/grabDbSSL"; import { DsqlConnectionParam } from "../types"; -import serverlessMysql from "serverless-mysql"; -import { ConnectionOptions } from "tls"; -import _ from "lodash"; /** * # Grab General CONNECTION for DSQL */ export default function grabDSQLConnectionConfig( param?: DsqlConnectionParam -): serverlessMysql.Config { +): ConnectionConfig { const CONN_TIMEOUT = 10000; - const config: serverlessMysql.Config = { - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: - param?.database || - (param?.noDb ? undefined : process.env.DSQL_DB_NAME), - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - ssl: grabDbSSL(), - connectTimeout: CONN_TIMEOUT, - dateStrings: true, - compress: true, - decimalNumbers: true, - // supportBigNumbers: true, - // bigNumberStrings: false, - // bigIntAsNumber: true, - // metaAsArray: true, - // socketTimeout: CONN_TIMEOUT, - // ...param?.config, - }, + const config: ConnectionConfig = { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: + param?.database || + (param?.noDb ? undefined : process.env.DSQL_DB_NAME), + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + ssl: grabDbSSL(), + bigIntAsNumber: true, + supportBigNumbers: true, + bigNumberStrings: false, + dateStrings: true, + metaAsArray: true, + socketTimeout: CONN_TIMEOUT, + connectTimeout: CONN_TIMEOUT, + compress: true, + ...param?.config, }; - return _.merge(config, param?.config); + return config; } diff --git a/package-shared/utils/grab-dsql-connection.ts b/package-shared/utils/grab-dsql-connection.ts index 50918bf..7860998 100644 --- a/package-shared/utils/grab-dsql-connection.ts +++ b/package-shared/utils/grab-dsql-connection.ts @@ -2,19 +2,17 @@ import mariadb, { Connection, ConnectionConfig } from "mariadb"; import grabDbSSL from "./backend/grabDbSSL"; import { DsqlConnectionParam } from "../types"; import grabDSQLConnectionConfig from "./grab-dsql-connection-config"; -import serverlessMysql, { ServerlessMysql } from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ export default async function grabDSQLConnection( param?: DsqlConnectionParam -): Promise { +): Promise { const config = grabDSQLConnectionConfig(param); try { - const sql = serverlessMysql(config); - return sql; + return await mariadb.createConnection(config); } catch (error) { console.log(`Error Grabbing DSQL Connection =>`, config); throw error; diff --git a/package.json b/package.json index 6811831..23581b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.1.6", + "version": "5.1.7", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { @@ -45,7 +45,6 @@ "lodash": "^4.17.21", "mariadb": "^3.4.4", "nodemailer": "^6.9.14", - "sanitize-html": "^2.13.1", - "serverless-mysql": "^2.1.0" + "sanitize-html": "^2.13.1" } }