From 87f3f03966f7f3441cebdf543c841cfe30c7bde4 Mon Sep 17 00:00:00 2001 From: Eugenio Marzo Date: Mon, 25 Jan 2021 08:41:51 +0100 Subject: [PATCH] html5 bundle --- game.project | 2 +- .../KubeInvaders/archive/archive_files.json | 2 +- js-web/KubeInvaders/archive/game.arcd0 | Bin 379711 -> 379707 bytes js-web/KubeInvaders/archive/game.arci0 | Bin 7408 -> 7408 bytes js-web/KubeInvaders/archive/game.dmanifest0 | Bin 13430 -> 13430 bytes js-web/KubeInvaders/archive/game.projectc0 | 2 +- js-web/KubeInvaders/archive/game.public.der0 | Bin 162 -> 162 bytes js-web/KubeInvaders/index.html | 28 +++++++++++------- main/mymodules/node.lua | 2 +- nginx/metrics.lua-script | 6 ++-- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/game.project b/game.project index b0ff767..a601fee 100644 --- a/game.project +++ b/game.project @@ -18,7 +18,7 @@ high_dpi = 1 shared_state = 1 [html5] -scale_mode = fit +scale_mode = downscale_fit htmlfile = /builtins/manifests/web/engine_template.html splash_image = /assets/kubeinvaderslogo.png show_made_with_defold = 0 diff --git a/js-web/KubeInvaders/archive/archive_files.json b/js-web/KubeInvaders/archive/archive_files.json index 5e1cc27..2f8658e 100644 --- a/js-web/KubeInvaders/archive/archive_files.json +++ b/js-web/KubeInvaders/archive/archive_files.json @@ -1 +1 @@ -{"content":[{"name":"game.projectc","size":3188,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":7408,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":379711,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":13430,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]} \ No newline at end of file +{"content":[{"name":"game.projectc","size":3198,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":7408,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":379707,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":13430,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]} \ No newline at end of file diff --git a/js-web/KubeInvaders/archive/game.arcd0 b/js-web/KubeInvaders/archive/game.arcd0 index 73b0530f9fb3fab565ab2345d396819b98cb9887..6d71590a5e2fb0ed1ad32d8cd2b317bac9248138 100644 GIT binary patch delta 1119 zcmV-l1fcuBmKVF07qC|)1r7iKwA+)A7#Xv5CE@{p*eUFR1D(L7L6n&Q3dGt2d)9r$ z5(rAyDtoRimFIT%1|K>}()zh+_W!83C*CixA6{zNc@>)KKgtBd#rQ(aS>GERZN2GQylnb=igLjdFGZ_j2em z{fR~5i*c(184Bb~t&i+t zM}AtYz1aIR5|~rRZN%(2va5fBQMaZN(EJHt;WK$asDKOhn1`)%p30I)x0CD6CkuS4 z24VTaO)HYwPscmK{l?&dW=X;d2E4rLCkt^j8PR<<|6#?fGpugFxf*c^VWJ9TAC;1S zJx~R)Nr0b&odQ=hASH)Yx~_M!hu^d;|1e=00k!FCoQ?Khv%(Pk6ROxoKHk0oJ?LCu zD%EFHY41{1nKkykD7~kivK^&5OB4fsM5-pnEda_#`%*ZcLJJaGiG9*X;_Uodnn#g%nSs7P!K+Kdjb z*yI|03F_QjR%=*^=k`8#u_RcmWpe$|%pUG|cUm4#)+}33)5A4zKro~SnHTeaP#AVr zvu|w5jpAp?bxj}E8h0S# zcz3mN<3sQTKG>(IoZtTLx?9L&p(qY2p@AC#xOk}nUrxIjP32g49HzSpmQ_28fCD|8 zTz%s+A*Jt!IWxtoxi&-2h)g+uRoO3-rroie%b46<;W}o;XI~Hz4LWkIlDHe!<=xg2 z#+tOJVd|>h&Z+ep{sT$dpW+=67wp19T%Hk0uljDWDfz;_-XJ*3NrSm&36VCu`voM! zX9M64!~*9u+3N7%xEabrI!LR|I_Plr&rI-OuGQ2**AN_o7)_p4h~%b!RdUW8EB_l` z5QVLqr*?wboK-H0crEKWVE#2rB(KKH}x|)N)px+?=!$Xn!Oov zPw++sIY-gJcc4eG=08$&zE^81pGTbx3MpcL7YcSwdxrXeb_=8?alB;4qK-@pZ#?A3 zHjTqq8h8=2EfdUQC6qhkz>rhkz>shkz>tw}2}Jzn{^x7sdbp delta 1123 zcmV-p1f2W3mKVR47qC|)1q}cJx7(AD7#Xv5CE@{p=qc=h1Dw_IU73<(3B-~?OO8it+uhhcF|SXeH07>;CNf8eNhD~h$MVMFJ#huAP5l6b2MZ^e zNJvM$wT8$tD5G+{6zSs@zSIGsUQtaD*5?#uw_w4Dx11-@z?!gNoyxIW&Xcm!Iv#nd zk;Z))aVCh3Qrarz=%DM3bWYP9=^(z<89D_P2y&`AJFM7}-Dhcn|0{bFW@7JY_I8th zDPuFCO-EUit?`5wI6s4SwoRVt_58Ol{GP@eo+|oUA`$k$EXNl75I;>t{~YROAmj=p zJ@9ijtX?2YmUE!_LB#3xks8{ng&L~@d@2*mLboRpgk9!`d$>OBcwp(Bg~-t{d4<>2 zhrR}5zhAZ^1Y(G`9k^E6)lAB09wcdh+^Cr?{w**~V0pl6zy*#OR@9b76)vS5AeY$u zOP_XQiIMqqW<~g-ckWP~w8=fUt&aiA+p_rDA#4M)8P~7mI6Rrnz>9B6uTE_U--~_O z*gC~*fAptv5M*BL>;ARZCx@IhJmDHpInybpThENoBlrhj?W%E~0}_?{OF&U+{o%i6pUWQ?oolIv11(-)XFxWw&S# zO7k*wDk;{!Rjx-?ELs+EuTy>_%`}5E%*AEXx($3qF8J}1bPJ3=bZWB2e^O2scRudV za^lEO5}U!a5h==A9F>VNeT;u9i##$&jwFwW0d^At_JcV|=O)W) p_!731Uj&CQZnppc0E2uhhkPpmhkPpnhkPpohkPppw|pxFzn_s~A3Xp7 diff --git a/js-web/KubeInvaders/archive/game.arci0 b/js-web/KubeInvaders/archive/game.arci0 index d45fa1b5cd070b6db7dbfb75484c0531a9d7bf4d..bb91332b54020e1c3b53d42e3b72f3c29af4415a 100644 GIT binary patch delta 1506 zcmY+EZ)nwJ6vw~M{q4@VU2NW6b&!@T9COp{Zr*9b%w-xuBFntyi$zxv6j?IETra8{ z2BDZRnNcJ9Yeq6f{FhR`NE9>`8Z^P6-e};)rd)LfX;h!{{KoF}!1s5~_c_lw&w0-C zJilB^uBCfs`JvrE?kHRG;>Ah1kAKe8Qwq4R6{~>7PSVn5SCN=E!RKpvkM_!Pk3AmF652B*jA9%m3 zX_JC1W0yjH?*euu_F>O8??d#@z%;U;9Df5wucyi`nl7z4DLr+<54br+Qt?%iq7nCb zjY|8TkSgYTt|2RIb-v(~B`)CggYaRn9Ux6s(5Dz@JXL)sdMn6yo>fB!Mpr&zGDW~V z#=i9vbf*M<1Uw(|l-w$~sJM{jwA&XLx*CRZ@^K1y(Og&Nby$Bm9t#4$K!+EKcy+3NM&RB zD|axro*eHoFUy(UZ6nKBQ0Ef_n`bJTrd@SUjwSpKUmE*?=dLD!UI7+*u5I1;tvj|6 zr|1C|Z2nEEvaWEF`$tvVw^EVdmglOYz~Fr;ve@=d0SgHT))3nqP8fa~o!@~{_}wUD z=R^NAcH^u#OGy0nRp^3_HLZV`$BCC+&@RAI9TXhhKxnu1pMl<`d~J7M7?qO0^JxVs zfHcu=tpnBtWYk)0N74$A6i1+n@s_*f<*2}k2oL5nx*f68`rEwH+|#~f=_mw$wxNXAKqK5a@7GWYUGT(h zv}g-S;ur)}SE6mfX903J#!qsDIV(MN)$L=a^S$Sq#Rg;i9*V7r#2+09|7lC^c>m+N V{*6?+hf7)PC+Id@?*O_c{SPgn2KoR1 delta 1501 zcmY+EZ%oxy7{|Yd%e^Vy4Y;7Nr4CCOf^si#5g03Pe{8&9&LP))QS0W~VhtI!64t8A zax!hbfZ+?#^*{3uZQ6B8FMMIMt+jgLmM&|xnl^<&?xxVFUeM>9!?^ft-}9XB^ZcH3 zogDc|Q9+`*QYY99P2-`djd>=S`erqU=XKPd`#2Z6BAK&pU(Jv`h+J=g@r5-`}Ky zv4^CREk0oK2zpm8;kdnE39p@oPl2}qQg0JF#^x(WRr@O1BIS5m(Ox!vxdUU(1TIx~pg_zscPwQTzTD<{! ztU=oHHOr1%LM6|@cY=0c$b}JwY*MelQGXMgJS9aEjw?HW-nbYa7@d$-(zO)}=a(Pk z+gi?ei|^9R^j;^YTn07nfI!cB1(UR^=3&Q`{TyGC{eO;|s&e#p(CWDM9ma3Fa}^i` zPjO-6PtrQu6()InPSs-_$_w0aTr~q2_e*(OZT%$BN^(P0k)j{7qt)cC5bZejfP)ZhxSCfUCMmIQSx=L$?3OhE6F=b)k(Aqrhkz+E)7k zKw`hMBtRS>^+haufb9x0Gr(d;lmJNFj@TjFsq6=e@RG>qS=PkQ9^67)ow7u3&=_O}XT|atF?%LX`@Krh9 z$hF$G$W3S(z6(47ki1f2Au`#_ zVw;!(3zGjbheRL*RN8^q3m@~&Gt^W_68RmDo66L}U@mx`x$ghY9>43qzj=}#4D)jg P!Ho*_7Y4lvc;(XnMb8H< diff --git a/js-web/KubeInvaders/archive/game.dmanifest0 b/js-web/KubeInvaders/archive/game.dmanifest0 index 3577619af7975d48c38ae12426d4fb8ac83fbb09..576b8bc18c66083d2e97e49de5c2fea19db1b2b1 100644 GIT binary patch delta 267 zcmeyC@hxLRrwaRvyK66V=2h|)?QG5~so=_w{`1)O{LE-!wVxZj`nR}e zTq^$~HgU)7`0a^zrf_@Oyv=&|W~qv8TmFJKZ}xv(dtGsEnby}Q6~FEm?-#C>5?I^2 TyMx=w`xM`Y>F2xuFh>9Yj}VGh delta 267 zcmeyC@hxLRr^z)vdvWd8cT!P3XD(vY<`o!dBr5L=f$(th-VwW>7 zgh>SYDU8kzDR=u&OrH;q{PN vencr)B^8M<<(`7bU!J1bR6oP+ZzsM)cgp;I>2IhRmv5Or(FXql0|5X59PdHs delta 141 zcmV;80CNAL0ipqr9e=u*kv1Jgh+5(-Omwi5V*l;_EUO<$&N-e2MPEZHROP`I7NVfEWN+A_gxRbw|{10nK&0@a(}AFe^Mc0Otfcmzc^{XYb@J! vv^>8f`V(}CCtrj3&!97$bso^2z}7&osu=*;r1ayY3nJO-%(0|5X5u~|TE diff --git a/js-web/KubeInvaders/index.html b/js-web/KubeInvaders/index.html index 5549f94..74f6beb 100644 --- a/js-web/KubeInvaders/index.html +++ b/js-web/KubeInvaders/index.html @@ -189,23 +189,29 @@ var targetRatio = width / height; var actualRatio = innerWidth / innerHeight; - - - //Fit - if (actualRatio > targetRatio) { - width = innerHeight * targetRatio; - height = innerHeight; - app_container.style.marginLeft = ((innerWidth - width) / 2) + "px"; - app_container.style.marginTop = "0px"; + //Downscale fit + if (innerWidth < width || innerHeight < height) { + if (actualRatio > targetRatio) { + width = innerHeight * targetRatio; + height = innerHeight; + app_container.style.marginLeft = ((innerWidth - width) / 2) + "px"; + app_container.style.marginTop = "0px"; + } + else { + width = innerWidth; + height = innerWidth / targetRatio; + app_container.style.marginLeft = "0px"; + app_container.style.marginTop = ((innerHeight - height) / 2) + "px"; + } } else { - width = innerWidth; - height = innerWidth / targetRatio; - app_container.style.marginLeft = "0px"; + app_container.style.marginLeft = ((innerWidth - width) / 2) + "px"; app_container.style.marginTop = ((innerHeight - height) / 2) + "px"; } + + app_container.style.width = width + "px"; app_container.style.height = height + buttonHeight + "px"; game_canvas.width = width; diff --git a/main/mymodules/node.lua b/main/mymodules/node.lua index 74155e1..5aef93a 100644 --- a/main/mymodules/node.lua +++ b/main/mymodules/node.lua @@ -26,7 +26,7 @@ function M.get_nodes() worker_diff_time = current_time - latest_kubernetes_nodes_request_show - if worker_diff_time > 0.05 then + if worker_diff_time > 0.1 then kubernetes_nodes_size = table.getn(kubernetes_nodes) if kubernetes_nodes_size == 0 and not kubernetes_nodes_request_show then print("Show kubernetes nodes...") diff --git a/nginx/metrics.lua-script b/nginx/metrics.lua-script index 02f9f5e..3e574d9 100644 --- a/nginx/metrics.lua-script +++ b/nginx/metrics.lua-script @@ -1,10 +1,10 @@ local redis = require "resty.redis" -local red = redis:new() -local okredis, errredis = red:connect(os.getenv("REDIS_HOST"), 6379) local arg = ngx.req.get_uri_args() local incr = 0 if okredis then if ngx.var.request_method == "DELETE" then + local red = redis:new() + local okredis, errredis = red:connect(os.getenv("REDIS_HOST"), 6379) ngx.log(ngx.ERR, "Connection to Redis is ok") -- Count the total of deleted pods @@ -32,6 +32,8 @@ if okredis then elseif ngx.var.request_method == "GET" and string.match(ngx.var.request_uri, "^.*/chaos[-]node.*$") then + local red = redis:new() + local okredis, errredis = red:connect(os.getenv("REDIS_HOST"), 6379) ngx.log(ngx.ERR, "Chaos node action has been detected") -- Count the total of chaos jobs launched against nodes