From c3a1740c762f5b3ba6b246e67ae73073e467e756 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 29 Aug 2021 16:58:53 +0200 Subject: [PATCH] fix bundle --- bundle/database.db | Bin 0 -> 225280 bytes bundle/package-lock.json | 60 +++++++++++++++++++++++++-------------- bundle/package.json | 3 +- bundle/src/Database.ts | 44 ---------------------------- bundle/src/Server.ts | 4 ++- bundle/src/start.ts | 2 -- 6 files changed, 43 insertions(+), 70 deletions(-) create mode 100644 bundle/database.db delete mode 100644 bundle/src/Database.ts diff --git a/bundle/database.db b/bundle/database.db new file mode 100644 index 0000000000000000000000000000000000000000..9572c45e6e1597955832f51dd400105d0fadc376 GIT binary patch literal 225280 zcmeI5eQX>_cGx*uElGV)-22#@+tX>cceFZ+7A5uf2QTY0ml{c2Qk0gWZclqQ+ST3F zWQ#rBqwXG3+|Am)y}dizXJ0OXkqQUl+RMo3~^{ZE}URATZ@4m4XWK{6uq(w48nRsrZ zR-5=SL714BxB@IPx|NTrzh*n=V}u{BTPi+%=G)KCPSwwyt9|z;GU9}^MbngQ(X@DfZh51*wAmCkmtI?I z3XLMUAzW+(UPIU=3DlGbcQ#gTEp6NvR-5;Q_1l}m`n|Qa1)<@_QAVSzUk;M80P4s{ ztKAShl2P`xFCkoOUSGPmwkcdJvM$a=@!s70JP1+`+Tz)Vmd~=ZAvkdyQW8OREzm27 zBb)BhWIv85pGUHcxZA7*h-CCp*4L2f(Q>FaB0ZtRWi^h-isHzH1F)K)f_4CX0PF_3 zWczK%E?6$#Y%Z@}6j-9LvMyYl6XzD@B>0u#SAky@el_^j;n#p)6MilDmGXkDq{NC! ztenION-S3v=jMfZz9mfG-5}fVYvzY!i$Myuf{1C_>uo!sK20d!2FRyLx4nI7H*U27 z{f%>;PLFiS|z*x8Aq>|WT(5s1i)Y*>Xok~&CZij(O^1dw}ZKyT8Bbzc9kRvISx(vF6?2?QmrA~@>XsOpmb-?J6GTy2? z>CnJP<4)pId#LvLtEV3axnN{V#iyC~Zl0K`pFLZ9f2%h+uwe*uL;iNMjJTJ2K*AA> z7M{%mn4!SC6PPOs-_M(BJE5(h)3Vbb_d?A5Y|#WLdzAQnSISGYI@!Rd^BHX#c|o)_ zQYfWa26-b~ICyu@hIxxsTAdL_bipwD%O@x6OJ~PT%sqI_z2t09y{Ao0)$8@z`zty5 z1g5Ptf0-^*&(jXb+>OH+46+B0XR;j!DUk2YNPJFGPJ^z48=-2~)Agp(Va)T>ll52Y<1pv6Y$<;`@vY$59PxLh95L&~ zG=G^aBhJ$fh?tcf+iWjjzPlAfBxC(B!dnmf4C1;#*)De-*uBF7xj`k6(%#Oam|m^< z&`5W(7~-r^-5NW=m|p7*wUJ`QFzour5xwKYqs_<(;*kwb_tT8FMjk6l{XLt6VZ1la z{Cr~5h*{rg^K@a%vWRh4jI}SuD z_Sk&zgJjs*_~4&t(oO*W2sbsxfz8iPK5kg#7H&)V+thoVXQt|sRQuNR`LKWxKB8{U z(RJev9CbM5czM7K7dYVPVaA@Oc2=4vd1QVPfcLi3{m2~&f9%jp=q^+`y2sM(7!0i+ z3y&Br<#2$Du6iakQkUHz4PcPv@%4z2!eEyI(B!m)mzDAk*jsE0F98Q*FOwQt$*>g(TfyYZlj?G0h=_G; zvVLoB91&h+SXDnu;YHbim*;;JUcPhe$C=x1yt5qFc zv0JeRWO~Q)f|RLcZ;=*F?Tk46oUXohmZi2Ew^}3u)w@;EN9{0hgACH6j7FL52Vq8& zyvcqN(8#mXxRbclh92KyEnr}~($JPIfVW5XnREnXxi)MCzD+t=%v!Nu94&9M?Z=^) zWBvM1Kn;w7-Hy|M^$Q$;B?eI#MARl3Am45=wOZ5*NKs8Mo3W#|8EvwtuF|Ia)Xt_~ZC1dsp{Kmter2_OL^fCP{L5v0X+YIH2W1>g#?fQ5W-s-D|J;L$lS1;5i0=NO=qx2!%#1rlc z33rvuzuUWU05_&&H&BH8T}s_=-`q5&>gUeYzWol|05gPpYj*G9S-hWK-e@juHigZl z*VdW>+-b3Qi%;QVBk&r+E=k;Nk_dM;R&FhA+!t1x_l5P_o5K3NwY3GI5wZI=_6u;UE%Kp!#%`HeeCI2I+feS<`~kVTx_89nGFe6YZSKI!H=E0=7X_9mtgH(c z=cKuXIeBhgnCFkdZXHT8d!#6r$Jekhr&MZLzP)~Tb7N^`eN$*$U$rGm@!)o`o~g;i zC7Pld)Yn|gmqo21T)(~1T)DBHL%Z0!u_rWRUf5_}Z*DZ#mz#HmZZbg0dCv>C*M)1% zwI=k)`fXupd2BalWvKmQNUE31FUZtJRP<9#&bK z-NvqvpmVPd_z@zs#vO`o4)&r_V$8MQN;5# z*>ruwpr-7bq9V(RNDZnOo>^6d<5M=gUdD$uy&+{>g=&hZsX7b>$5`5zUr%%tBO=K zMBP(F$#lR)RMn_jVOgErI6t&L^Ox1h`qJ5PZlcBR;G2M#=zTcx{@0YL`q{I!pPR~^ zL@&AbHeGfRz0?DGhzRBtekebHDGP2^OtOaH!F0uL*US6rc0yZ02ksM{-|AY(??p@# z7}y>qK+cKdkdla(Xmv7}5k_RR;bz4_v^6ph?hKqk9&pX*ql~W(Za55gdS)}}a9&|B zg;xZ%KG=77L={y>^F7N|ERo8ZqL`MYQ`wWMmQd7Rwt$bvASIo+)bl*eF)g^exnojK z7iEih!-KWorm`M~w8VLNvi@p)oFyjEpJ0di+q2*NQE94Puh+i)_1p^c#Qf!W*#h&l z1KOV(hcQepJwxJqdOHqMu)-0R1NQ}oyJbTZG%62nTMc))W+Bzc{L<{k9}ezP-U{Fj z?Cjp&f)i|kMy2fDjlV~#+6|wWsUFDWTt#*z;z+LQxrXODqHLJ1>PU|1R88*V?dxT6 zvi_ztuCM#|M(^Lp-Ij*ap84iqzdBWyq}q4R=TMw?WAM|5`c^j)|$|Hx{~VHOu6!_D^L&gi2paW^P#_dn96 z3THELW|dgOR}EQJWmzLSk>KX;qDmB1S3J)Wt5#IhRdyJMa$NJ)mC5?8xp6j>Po`3%fFHO}iT&R6#FGt$Xo0ypT5B2lsYu{YynR*emq=Nt^yy!Cjk%T80lnSChd@Lq)+44Cj*;r3=e}wu0-(! z3vK~7uU(w1ubdy(Bk%+ZYKK89fMQ9_z!EtK$A%pJIlSP=&sdL(WlH{w7fR^E zPLNRO*svR}429j5xk7a;)1;yY!KG)ZE_GaAG+@1Kx=AXLs^x>4dEe06xmQU8J5Q?@m1Jf5*>+{rsBKiP@pq_U)H2DY!AGT}MX-^@AMemkd|}Q2XKuo;1;0}6?U}omWcI?Gy~Mn|#Byb^>hlLH$KD1(_W@H3d!`sjdjxsj^a4rq8sj%E#nlMGcPbxVoiLIGsVMB*G@X zuEP0^Aw>oqS=QuGer?FVIBY8 z#Q}k<a3)*UrE>P{@XBZ&Of-_~Si0;{T{TTzF?`Q3EN_TQ zWu%l9;xb`4f5Zqumxv`hj;=Y1C=)}69c{^XJvjHHRtb$9q-E7AbI^fV&0jSi7xEV; zvTdpOG=tawfB3x)lt2PV00|%gB!C2v01`j~NB{{S0VMFG5#X->|J;+NJL-!BkN^@u z0!RP}AOR$R1dsp{Kmter2^@?7p8r1>CoF{okN^@u0!RP}AOR$R1dsp{KmthMNhZLZ z|Ns1x+z!+o2_OL^fCP{L5{Qnn^V*9X7NB{{S0VIF~kN^@u0!RP}AOR$R z1dzbQ1fKs#D?kEB00|%gB!C2v01`j~NB{{S0VHtr32^8CUp)G)#TFs~B!C2v01`j~ zNB{{S0VIF~kN^^RItk$U|EIIxvDHWb2_OL^fCP{L5FH~1DH1>eNB{{S0VIF~kN^@u0!RP} zJiP?C^Z$*fmjbpN2_OL^fCP{L5DpxdD=*Y0g2Mb%M}K zZK?Zy_Is}^Pt{*|q4xLBXT%9cGTzYM-DKxr?4dG%V@EXD{N!)Fc z2zNGCZY^!x7gn41h4tH;!uq|nwFRL;{2eua7h-#QOb*YGd99$+veS;!2R(eeqEr@?IVNmCi=xJ7NynNsMmYB%l$-WJVl8nJ4@ZU_CxOtk0;&Y}TDyaz^V zm($uE2W-jiv^|p1bc|rq3CHH`k|@ab?M@N`Rj-7;r{hRvmT#}$-P~AOS>F^I*H>*{ zvm~PHjwwo(XBv*^Q{9zhk9c}RxPE)1xpHGYABz|BA;?uZFKjfgH#eH=%gwt&qn82v z^Wi)%++G*1HP@Oj+}CdlOUs)pkO2Sh-MPkGKtF9ks4C=2MAaliHmIVjic2&@CW_-I zmReP)kF~5yZxnn)Jxov4L`Rf#&ov$DDw?n8hHO#Q5vzKP@5-`b9~&b}Gi6iPO+pk! zQFRf%Qqd*4VhwfLkOh50D!H;NnWE(x7Ih?9q(pQb(^FKLz!)jpQPpr^fK-#pN(Rv` zOgV*VLGj$)4{u_YCwaQADWEI$J!+VSP9%f)#ImZo4v(a=YKQI8dE>Ro`s#&obLws! zxZr}a+%-u2w->(s;?h+8!iCy*e>$IE`8@vf=gV^~pLM_)H-!llTrlsp`031}#P54Q zKBLvi2JV*6NNMQXW5x2^$IGT!LP@KCP%wmCD4zrSsih-!+H9r+%jtP(J~IzL_|`GQ z>P@6&SIrzsxnRX-iHZTX@w7@qw zs_1}?8`SeeS@*ml=gBp-tjb|cddQP&K9xMpw-lIQ3~FkkV!661ilXFHsT73EnjFfJ z&tLwr$@zeEZ1{D@lW3M3rSxfl1$yWk)3*u{2*b z!5^1rS`L4i%b`Zr&;XYtB6<*)`KAv8+j1q#rJ674jy5!pR=WIS(S~0s=D{8_Llz0o z&$IRa-1KKBX8-f--<|bl#WR0-=0BeKr87TyW?|;fXa3#H_h){5=Hlr;J^gP^|HA37 zoqpxiAD#M*Q$KrZ^OSJ%4^RH9lkcCrbMlKPe*eV3IPo(l)=qqW`uC>)+4NtZz6sUg z4-!BENB{{S0VME*5s>F5rRnJ}f5tQ=O_NMnS47cJ;G-govUFKAFUyu7sf(JtD4ADG zMOs{xawkF+RBS7cpdGA~zUWZ0h5P1dp! zgPx4VWCUJDku3}UTPAGi6*7t_Kr1wHQPQrcrom)hD$5v(q3N*YCRe$EjCI8{a&9kH zWlU4nL`kXY)|D~yK0U|Dh@h4t%c`R3(5a>NsMew=UD0)w>Gs94i~&ZVLj+#6ovw_e z=B&?FWmL;B^&#B~8J!*H3%rbMD4>|EfhkmV(-%b(Y$s>^LRm(%3`4PGSo~Molgj`b zcAU>wW%ACEOlTC}r)p0oXI&r2sFo#)vZkpb45q4#x~N!JbUAO&=Xe>|m;jqL6j2r{ z_NL}Cl9b!^^HmwJH0T~!^OSY#%5;zOSzbobft(0i$f{bg165vBq${vH!x(&~EF&jR;gHM%YnCH>K?XW&7w?}4U+tl+ueXc44 z{s@NA5bLgtk@x8=FC$x~1?~XA!F%;Ml72ZiNX_{bmC3_pl}BbZL}|=u(8el{(tWD&rHnz_Us?b{-fF7nBANG-t14# z%Cjr8XV3iK+2d#a>zRLi=3k$A`^?`wvv$Tkqn(*L^Ww}O&HUS$|333iX5O9or5S(5 zoVh*o^65XBIeGfmPXF%de}DRCPXC=JEZ{+PkpL1v0!RP}AOR$R1dsp{_$wjsxo4!> z@IK>QCAqhi_@zNIzgu{roLp=OzEVyu_WaIs$=tSHqnupq+`T+V<~QdAK6$YJ_EI^y z*kXIJpIq8SJI5yvHp;$OPA>Ms&JL3K?XEBI$%7rO7s|=Srq$<*X>Z=1h@X-gTMb zlLs3sr_0I3-pQ$ca%p?yB%eIk0Xb1h?r(BT_mfNe7*l-mV5?%XoLuZiJj*3>8xF@y z$^AWrX9mgqw!yLIpOH?mkp_Qz1-l8w&Hy|AUz_@S6Yw8@kN^@u0!RP}Ab}q=f$w{@ zJXqQ@=$cW0AG9#3 zR!&x-U;<5HrGhql?Orw4ZSfvl>lp8W7-JX4PPcP=C1hxKzraGniNS^e9u$RZuhzAdI(y+}wxD z>8vJp=^b2H$LkG7R5TE57ND}91-Sge?Ids!8mpCE5PC1an5}E8te%G*nnDk4Mfo+6 zVE_Jg`W$X@8;Nhded*Ei8}26Ef4g~i_CZS06|#8}}1QzaG%#t?d=( z?MLy-)*bKWj{C;j;nLpSmfn2hRfgG*lRe^5?>e*9s1t@TWJo)MVZ%DMxYBXaCt*ri zrzg8`by86>g-f$`D40N35KJQPFZK;ABw!XnmfFE8E7G8Fk(yyRvZ*?XLtMC=&M{

B=MtwIgf5yo22Ppoa8%u?K{QQ)NJU+DO?y0^#j8GRke#>2WQD9HZHe2?=-Ft%I`9N+OrV5SnT%ZM0JzPm!B*kz^c8mGfZojfFNQmPES?eL|P&N;DjSVt(;F{aqNS!3! z$>);X?%rkR|7){nO zj>Q%s0VIF~kN^@u0!RP}AOR$R1dsp{s1o3w|97dHhu@I^5nF}l|K8-qXaD4xUzz=H6MsJOo6o#f`+n{FKg4a)HYV#U=W7!| zq6uF?i$om~HUuY*LrNk(3yvE_G_*N2 zpvq24lS)#q1ROpkTeO_De0%-w=El;>`lishzG|zYM`Yh6Dita54I(R!=J>AWDQZKw zetV<2a$`Mj;l&1b@OfdQdA+&OTwiY96^e|s2WVcny)Im9t~G(;`fXupd2DlBw!>lB}tqlcJigs49l8RFx^(T-Jo8esnc-U)D6wG!)l&e9s`3 zVyc#7_`Wg3q{_LhPOk$#v_|vquiu)gKmUB~XMZ}kREI<<`+cQsn=I*oMj3z+7Iw?o zDp+?KNBykPwzSm=La%H@4f=?>FyJa?SLsg8vMg#+RkeIm1k2Kape)LYrdfZL-D!CW zaSX62Q>2dP$*Sghj;>Rez+f($c)zLTe$0~#)Q2~3(IB2_x~A?)zHEt}svD}QN}{Kk zRYiEdWnB(s;`7SdWc|j=<2)wmctK`|@fJAD!RPbevR0?+FTY&-`B!r*9OMi>HOdyr zWgN^|5;u2-*?yb$tx#CL*<4<|C~$eg%DQlIPMTYolSKBCf0EfJg}tckMS~Za<;pBq zX1OxUm07Nw=j!Z}!Cp*wQCMMx6;@bbm3>v&SCxI$*jJ5x)!0{^ebw1loqaX(7goK& zsyA5mCM#mHBBneyFU<3fJ8rXff(d2xQ3k_|`O+=g`_2~}9+4SIwrExve}(%i2KA6D zRa{S$T(Ep<5aNiEsDPbWI&n<^T{il`0X_yx8&bsaWJA_{Pmvr&Q&q*6VE{Uo;t;W_ zNYSW|L5+Fi^~w6`g|P)qp6z&xd9Ev2vZt??vU}>HBxiM5_L+PynWYE?R$rg;d5m8r0 zNvl$4e>NC2w=%;KMW>!9Tbd#ohOdgIC;AF?TvZ;56pH%G#?4Yc`ouyZWHU^d)f{R$ z#F9i^_6*h4h(oGltly@x9*3LZ=I3ut)?clU8)bRpY$<Ae?kOx5f4+WTkoag`_L zFE5ryQl56eAygeHV~14N3=971Gpi76wKv8|U*I4RD zABwK*_^PEFuIb7|cT80Sy!<$w)JrFSf9gL?{ey{LKlv{wZcij^<$wBj*z19QK*)Vl8h6}` zw%T#RoOZDqV&+>-GoX?e>ylLaW$PE;4W{x>7kcIlWq&b%v~%ZbzuZkLYAW9KvS}B| z2Q+J#ZZlYv_pKSGi4jZpzJ0>d_WIJjwN2q-v8ul~7sY#X^Yb7`A&{otsHOkGd*q^a51a zz=$ZUj|RsZ8Kbkr?kH!$FN=LyV9erT78bLpn8n;IB`2YQCbaXTD?Iik^@GPyL^ZQ8D` zexbLRd#(f#d(_#E7fM!ghFVk3uXsIOB9`npy5=aNObp$#T*-&9UmD)37+G=I z_f!VX;a9q_eMDW!bu0)(sIHo(t{AYBVpyJD4M-{^$_jCrV6pl3+u@b+O$9cS9M_jT zU!|HW!qP~SDeQC&&F);Ml@;n`d~{_TQIjERRAD)!%Z?#R5Hf0tCb`BCp@CVIb?MEv zADN4&!GRrDw=`<`2Bngy>XNQ%ux~QdS$(rFt8%DGYj~+BS&C+wswz362|CF{bz$Xd zsq&B_{V`eA<8Wc@kRqn;KoD&?lBQAU8y7aOT%tItqYv#EaW12*N-yI>Tgv?W_Tyse zoU|?FZ?oUp*~(+;?`ru}nJ4BiXUY>|o_4_5kd+-9M|%NVinfA?z}{bf!sI6&vP)n; zp`Qg)5piAcwy?|$nMiNt1?doqz}k>6+1}2lxPfPfmG4d#!`9`9b!jVhf^aY)@;bB= z+6p?Ykz&0(yE~hWSO>z=c%+~c#C=`)gQfc^gfk;WqSW8BNf^d^+)T>LwtQmKh@FcV z%(Q&I3)3|VCkUui1RH#QzFH2(2t!|uui2v^g_=jIO!r0vz*ENsYuw|2uH3)v& zxQJHzbSX=WrP}?xS-sO{DeMBVn5ptrEH$r^d6D^t1(2No#!ubLWA$&&<#j?; z$^KX=-BH(f5FmoB>!BaitT~B>b9zqJ}+%f)|)Slvq`qj3Bi2w6?^aFmG^)8 z?o|Dymuf$ED`(a()BkX}OsJn;fEjTfhwb5w^iJbF`G`$LXk{lqVOTyl3CSPih&pZN zp2j;Wm{S5025&==H0~s@i!@8~j> zs-aBYr0$W*6E{Cu9zNJqVc{>rDOEy=2)hwPlpxrIy+T(S(xlqDvO0$iY4~B22hNNx zGn4uG-m3l>yidXJ9-g{~*^1LyH#Yhh_Ej!?T|J!K|^rH`Uv~ zwE7c#c>|Qq=;f5k2Ig=9^rhv+05~4p%EYbAV#k*Sh2^lR5`-K+ki)Ia5BjS;+{#@4 z;hl_skRi(aGVIuVZYj172_OL^fCP{L5 { - (async () => { - console.log(`Stopping MongoDB ...`); - await mongod.stop(); - console.log(`Stopped MongoDB`); - callback(); - })(); - }); - - console.log(`[Database] starting ...`); - mongod = new MongoMemoryServer({ - instance: { - port, - ip, - dbName, - dbPath, - storageEngine, - auth: false, // by default `mongod` is started with '--noauth', start `mongod` with '--auth' - }, - }); - await mongod.start(); - process.env.MONGO_URL = mongod.getUri(dbName); -} diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index e0586601..56c82cd1 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -6,7 +6,7 @@ import { FosscordServer as APIServer } from "@fosscord/api"; import { Server as GatewayServer } from "@fosscord/gateway"; import { CDNServer } from "@fosscord/cdn/"; import express from "express"; -import { Config } from "@fosscord/util"; +import { Config, initDatabase } from "@fosscord/util"; const app = express(); const server = http.createServer(); @@ -22,6 +22,8 @@ const cdn = new CDNServer({ server, port, production, app }); const gateway = new GatewayServer({ server, port, production }); async function main() { + await initDatabase(); + await Config.init(); await Config.set({ cdn: { endpointClient: "${location.host}", diff --git a/bundle/src/start.ts b/bundle/src/start.ts index 323995ae..843e3812 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,7 +1,6 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; -import { setupDatabase } from "./Database"; import { initStats } from "./stats"; // TODO: add tcp socket event transmission @@ -12,7 +11,6 @@ if (cluster.isMaster && !process.env.masterStarted) { (async () => { initStats(); - await setupDatabase(); if (cores === 1) { require("./Server.js");