From d722d15003dc391ac0fbec5b59e6923ebe91ba67 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Fri, 6 Aug 2021 23:22:40 +0800 Subject: [PATCH] feat: add observatory result in GUI --- gui/package.json | 2 +- gui/public/img/icons/switch-menu.svg | 1 + gui/src/App.vue | 90 ++++++- .../assets/iconfont/fonts/_font-preview.html | 7 +- gui/src/assets/iconfont/fonts/font.css | 22 +- gui/src/assets/iconfont/fonts/fonts.js | 13 +- gui/src/assets/iconfont/fonts/iconfont.eot | Bin 9012 -> 9508 bytes gui/src/assets/iconfont/fonts/iconfont.svg | 11 +- gui/src/assets/iconfont/fonts/iconfont.ttf | Bin 8844 -> 9340 bytes gui/src/assets/iconfont/fonts/iconfont.woff | Bin 5628 -> 5936 bytes gui/src/assets/iconfont/fonts/iconfont.woff2 | Bin 4808 -> 5080 bytes gui/src/assets/iconfont/svgs/switch-menu.svg | 1 + gui/src/assets/js/utils.js | 6 +- gui/src/assets/scss/buefy.scss | 5 +- gui/src/node.vue | 254 ++++++++++++++++-- gui/yarn.lock | 8 +- service/common/jwt/jwtTools.go | 31 ++- service/core/v2ray/api.go | 23 +- service/core/v2ray/feed.go | 6 +- service/server/controller/message.go | 5 + service/server/router/index.go | 3 + service/server/service/message.go | 20 +- 22 files changed, 421 insertions(+), 87 deletions(-) create mode 100644 gui/public/img/icons/switch-menu.svg create mode 100644 gui/src/assets/iconfont/svgs/switch-menu.svg diff --git a/gui/package.json b/gui/package.json index 1058c087..3869d436 100644 --- a/gui/package.json +++ b/gui/package.json @@ -15,7 +15,7 @@ "buefy": "0.9.3", "clipboard": "^2.0.4", "core-js": "^3.1.2", - "dayjs": "^1.8.16", + "dayjs": "^1.10.6", "js-base64": "^2.5.1", "normalize.css": "^8.0.1", "qrcode": "^1.4.2", diff --git a/gui/public/img/icons/switch-menu.svg b/gui/public/img/icons/switch-menu.svg new file mode 100644 index 00000000..e4131a39 --- /dev/null +++ b/gui/public/img/icons/switch-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gui/src/App.vue b/gui/src/App.vue index 57636e1b..e336bade 100644 --- a/gui/src/App.vue +++ b/gui/src/App.vue @@ -26,9 +26,9 @@ @active-change="handleOutboundDropdownActiveChange" > {{ $t("operations.addOutbound") }} + >{{ $t("operations.addOutbound") }} + - + - + { + // console.log("ws opened"); + // + }; + ws.onmessage = msg => { + msg.data && that.handleMessage(JSON.parse(msg.data)); + }; + ws.onclose = () => { + ws.onmessage = null; + that.ws = null; + // console.log("ws closed"); + setTimeout(() => { + if (that.ws === null) { + that.connectWsMessage(); + } + }, 3000); + }; + this.ws = ws; + }, + handleMessage(msg) { + if (msg.type === "observatory") { + this.observatory = msg; + } + }, handleOutboundDropdownActiveChange(active) { if (active) { this.updateOutboundDropdown = false; @@ -263,12 +323,8 @@ export default { } else { return `${outbound} - ${this.runningState.outboundToServerName[outbound]}`; } - } else { - return outbound; } - return this.runningState.outboundToServerName[outbound] - ? `${outbound} - ${this.runningState.outboundToServerName[outbound]}` - : outbound; + return outbound; }, handleAddOutbound() { this.$buefy.dialog.prompt({ @@ -583,6 +639,7 @@ a { color: rgba(0, 0, 0, 0.45); animation: loading-rotate 2s infinite linear; } + .modal-custom-ports { z-index: 999; } @@ -592,20 +649,25 @@ a { margin-bottom: 0.5em; } } + .about-small { font-size: 0.85em; text-indent: 1em; color: rgba(0, 0, 0, 0.6); } + .margin-right-2em { margin-right: 2em; } + .justify-content-space-between { justify-content: space-between; } + .padding-right-1rem { padding-right: 1rem !important; } + #statusTag { width: 5em; } diff --git a/gui/src/assets/iconfont/fonts/_font-preview.html b/gui/src/assets/iconfont/fonts/_font-preview.html index 56162393..39ff5bb1 100644 --- a/gui/src/assets/iconfont/fonts/_font-preview.html +++ b/gui/src/assets/iconfont/fonts/_font-preview.html @@ -51,7 +51,7 @@
-

iconfont (30)

+

iconfont (31)

Class name prefix: icon-

@@ -187,6 +187,11 @@
+
+
icon-switch-menu
+
+
+
icon-sync
diff --git a/gui/src/assets/iconfont/fonts/font.css b/gui/src/assets/iconfont/fonts/font.css index 96b10497..f1b7553e 100644 --- a/gui/src/assets/iconfont/fonts/font.css +++ b/gui/src/assets/iconfont/fonts/font.css @@ -1,10 +1,10 @@ @font-face { font-family: iconfont; - src: url("iconfont.eot");src: url("iconfont.eot?5b1dd27b#iefix") format("embedded-opentype"), - url("iconfont.woff2?5b1dd27b") format("woff2"), - url("iconfont.woff?5b1dd27b") format("woff"), - url("iconfont.ttf?5b1dd27b") format("truetype"), - url("iconfont.svg?5b1dd27b#iconfont") format("svg"); + src: url("iconfont.eot");src: url("iconfont.eot?238fde36#iefix") format("embedded-opentype"), + url("iconfont.woff2?238fde36") format("woff2"), + url("iconfont.woff?238fde36") format("woff"), + url("iconfont.ttf?238fde36") format("truetype"), + url("iconfont.svg?238fde36#iconfont") format("svg"); font-weight: normal; font-style: normal; } @@ -121,18 +121,22 @@ content: "\ea1a"; } -.icon-sync::before { +.icon-switch-menu::before { content: "\ea1b"; } -.icon-wave::before { +.icon-sync::before { content: "\ea1c"; } -.icon-wendangxiugai::before { +.icon-wave::before { content: "\ea1d"; } -.icon-winfo-icon-chakanbaogao::before { +.icon-wendangxiugai::before { content: "\ea1e"; } + +.icon-winfo-icon-chakanbaogao::before { + content: "\ea1f"; +} diff --git a/gui/src/assets/iconfont/fonts/fonts.js b/gui/src/assets/iconfont/fonts/fonts.js index c87cb192..67e91061 100644 --- a/gui/src/assets/iconfont/fonts/fonts.js +++ b/gui/src/assets/iconfont/fonts/fonts.js @@ -131,23 +131,28 @@ export default [ "svg": "" }, { - "name": "sync", + "name": "switch-menu", "unicode": "ea1b", + "svg": "" + }, + { + "name": "sync", + "unicode": "ea1c", "svg": "" }, { "name": "wave", - "unicode": "ea1c", + "unicode": "ea1d", "svg": "" }, { "name": "wendangxiugai", - "unicode": "ea1d", + "unicode": "ea1e", "svg": "" }, { "name": "winfo-icon-chakanbaogao", - "unicode": "ea1e", + "unicode": "ea1f", "svg": "" } ] diff --git a/gui/src/assets/iconfont/fonts/iconfont.eot b/gui/src/assets/iconfont/fonts/iconfont.eot index 4aabefda10805717b946e1ebbf465a4edda6a73c..e61cfe87a25d50a65d647432b9416da02e5c26be 100644 GIT binary patch delta 840 zcma)4O=uHQ5T4n$*}rTyA=##Fl%(CXsVR0_(z0odBt?t#PZ1>*TWCp>)M%47+Nvp7 zqM$vfV9Fjm^x_{yJP8q05YbCP(1RDji+JdvlpOUY!IyXtz36*y=6&DHH*ep=GY_f&ObURgXR<4EvmGOc0W7ZoJe5p3 zkxFtyAE@>#H6ud<{6|)#nC77^lUpvVG*JY&P2JV(VlpxP<Xy11fJ7; zP1UlH$fY;#dR|KuKc-FH`NgH>#M=rTNP9y?FU=JC8(ILVnA)mmtukXj_#Lcd$GlHe z^C>o9i@Am8@txVv#L#CJn38#qVNHR!f~9&Lz)c`^w4dIz6PAF5Y5F2dH+^;2XAY60 z=qs0q4aMs;QCq(9CVLL0U0+R5ZhVg>2jq>N37-WO8D$T*TO|aPIQS8vB+D9j6W=FR1yTI z7!w7Su~kntDXKybc5X?EBGp`V`~PAug5#+H$-&4{Pkd0*2ID=F%s8Zh)OZlbCW&|aX<97aEy_9KwYZ!d>tkIa&*!k2b-Dz$iFHc6Fh~2-d9+_cr6s$a vGJnmf_VgdQ^1eOSIQpfYv_=_hE$_58qikKee0DjR>B^-SE}H1?WdMExo;00X delta 350 zcmZ4DwZ)CiM45r1M`0?1d$OUzB3JzZ)a7XyRb381B71^LA# z_us2Z0_7e66|J6}!l*1N&%g*&48*}UPpjhjZN4&aGryR;kXdB%21Zdv`N_u^3mH#L zwqUYnl$%_^G+{Civ#@3#SPuh32Lm&hr30jawlMZFurR~`O=AHKCVMdZ0+p}< z&HFQX12a264^WnYu>wQ_f!yXbELn_`71%5|xSnyl@G$XA*qp+4Q)DxzYy%t6?k;7! O&8L(l87IG2F$Mr}kyNJu diff --git a/gui/src/assets/iconfont/fonts/iconfont.svg b/gui/src/assets/iconfont/fonts/iconfont.svg index ba0752ee..5e0929b7 100644 --- a/gui/src/assets/iconfont/fonts/iconfont.svg +++ b/gui/src/assets/iconfont/fonts/iconfont.svg @@ -85,17 +85,20 @@ - + diff --git a/gui/src/assets/iconfont/fonts/iconfont.ttf b/gui/src/assets/iconfont/fonts/iconfont.ttf index 0f97936e3479838aadb52d8032fc30bd298a19cb..c4b56b4ae80390c2217c15ff2402a51c2bf9044d 100644 GIT binary patch delta 820 zcma))O=uHQ5XWcUes4G1kSys3lC&F}l47?tEr~Ud6hEM~)q|2sTd1ZPbO*&%p{s>O~L~^dfi>4?Rc;h|psRPU1oIqHo{K`_Ihp&6~rnp4=ZQ z`HRm0a1{W?Qu$<|a^YzefTaOA<5F&UX1a6uIDoJP&|1l6lIfIq;ytln$--GmNFRBH zG}Yl?Hov&E+)N5^hulhTK9!vMa{d$DU!wR}KDkuDD7>J0jcS`q<}>S$T3@N8H|SAM zVSZsT`MN>_ncD=tT-)+H+5m|qyVbJyc&&06+iWjh#kY0|cP`TeRh5J6LwngQAM`LmakmpuAsV0M9siw zXN4nL!`X&+T9@|CaRZ>dA$&H9jvCBaoCOCU3a4NkCLjg#P=IB)3-{mwtOInI7V8Ye z(9`7QLNOMJp%*2cL(^|zB*uljtjVKepwr?^ok==2nLTJ>41IMDJN^p&h9?y65169h zFPee=a1=uxgM#1be`Rs+=k_@YrniIWkp4Ih@E{%O%2c z9h16;C#ENcyCu~71Tm_Jid%^)MM>Z^+!y$mD$6b)6e=zW^U{54cYZEU2-Uvoxd=8sx=rS-N*KNo9{F>Egn Zwzr_xuyFJ8Vk+C6&&*x7$IU(l@Ds_+nuY)X delta 307 zcmez4(c?Nnxqcx717i;Z14CGHZeqd7e;=kWFfb)BFfg;F=TxTY+DzZaz`(kKfk9Fs zBQ-H4na$-aQ0)UCHp>7CuwP{10J8T0u}Vg6Nkypvkj23G1W456QvTnYOI)Sm(5 zJLD!-6fjybYzN9q0Qm}eiMgq>r%UbQVqlOv0kl-CAiuce{(DtPpxgtXqSX`kDD%oQ zFap&Aaj;E{-^4eDjPjG^7z-IsOrF4K&nP$f0^@|qDNMqeePCq_3>^&2V3rP$2Aa#* z$H2l612ljI2!V#YlAFAM$#?U6CLTu43ZO6u$Zcj}$zq&b!D_+5^^Dtvhlyvx<~^)8 ZMK&kOG_V1!d!%HySxH%vak9ILF#w9dN}2!w diff --git a/gui/src/assets/iconfont/fonts/iconfont.woff b/gui/src/assets/iconfont/fonts/iconfont.woff index 9bd502c187806d85593008d627850f13a5eb5b65..3d195e20bf583339ac067d41a32be9b0ce0b7a3a 100644 GIT binary patch delta 5461 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 L4GK_zQvd(})9zJu delta 5170 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 literal 4808 zcmV;(5;yI4Pew8T0RR91020Um3jhEB03wV401|ru0RR9100000000000000000000 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 diff --git a/gui/src/assets/iconfont/svgs/switch-menu.svg b/gui/src/assets/iconfont/svgs/switch-menu.svg new file mode 100644 index 00000000..e4131a39 --- /dev/null +++ b/gui/src/assets/iconfont/svgs/switch-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gui/src/assets/js/utils.js b/gui/src/assets/js/utils.js index 81651780..f1daadcc 100644 --- a/gui/src/assets/js/utils.js +++ b/gui/src/assets/js/utils.js @@ -95,7 +95,11 @@ function parseURL(u) { password: a.password, protocol: fakeProto ? protocol : a.protocol.replace(":", ""), host: a.hostname, - port: a.port ? parseInt(a.port) : 80, + port: a.port + ? parseInt(a.port) + : protocol === "https" || protocol === "wss" + ? 443 + : 80, query: a.search, params: (function() { var ret = {}, diff --git a/gui/src/assets/scss/buefy.scss b/gui/src/assets/scss/buefy.scss index 7e1afd9b..f9147234 100644 --- a/gui/src/assets/scss/buefy.scss +++ b/gui/src/assets/scss/buefy.scss @@ -8,6 +8,8 @@ $primary: $warning; $primary-invert: findColorInvert($primary); $twitter: #4099FF; $twitter-invert: findColorInvert($twitter); +$lightblue: #acd1f0; +$lightblue-invert: findColorInvert($lightblue); $warning: #ff845e; $warning-invert: findColorInvert($warning); @@ -35,7 +37,8 @@ $colors: ( "danger": ($danger, $danger-invert), "twitter": ($twitter, $twitter-invert), "green": ($green, $green-invert), - "delete": ($delete, $delete-invert) + "delete": ($delete, $delete-invert), + "lightblue": ($lightblue, $lightblue-invert) ); // Links diff --git a/gui/src/node.vue b/gui/src/node.vue index f52ca8a4..55a94023 100644 --- a/gui/src/node.vue +++ b/gui/src/node.vue @@ -1,5 +1,61 @@