web/assets/js/util/common.js

@@ -64,24 +64,6 @@ function formatSecond(second) {
     }
 }
 
-function copyToClipboard(text) {
-    // !! here old way of copying is used because not everyone can afford https connection
-    return new Promise((resolve) => {
-        const textarea = document.createElement("textarea");
-
-        textarea.value = text;
-
-        document.body.appendChild(textarea);
-
-        textarea.select();
-        document.execCommand("copy");
-
-        document.body.removeChild(textarea);
-
-        resolve(text)
-    })
-}  
-
 function addZero(num) {
     if (num < 10) {
         return "0" + num;

web/html/common/qrcode_modal.html

@@ -10,7 +10,7 @@
         <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}}</span></a-tag>
         <tr-qr-bg class="qr-bg-sub">
           <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copyToClipboard(genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
+            <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
           </tr-qr-bg-inner>
         </tr-qr-bg>
       </tr-qr-box>
@@ -18,7 +18,7 @@
         <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}} Json</span></a-tag>
         <tr-qr-bg class="qr-bg-sub">
           <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copyToClipboard(genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
+            <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
           </tr-qr-bg-inner>
         </tr-qr-bg>
       </tr-qr-box>
@@ -27,7 +27,7 @@
       <tr-qr-box class="qr-box">
         <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
         <tr-qr-bg class="qr-bg">
-          <canvas @click="copyToClipboard(row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
+          <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
         </tr-qr-bg>
       </tr-qr-box>
     </template>
@@ -41,6 +41,7 @@
     dbInbound: new DBInbound(),
     client: null,
     qrcodes: [],
+    clipboard: null,
     visible: false,
     subId: '',
     show: function(title = '', dbInbound, client) {
@@ -78,10 +79,14 @@
       qrModal: qrModal,
     },
     methods: {
-      copyToClipboard(content) {
+      copyToClipboard(elementId, content) {
-        return copyToClipboard(content).then(() => {
+        this.qrModal.clipboard = new ClipboardJS('#' + elementId, {
+          text: () => content,
+        });
+        this.qrModal.clipboard.on('success', () => {
           app.$message.success('{{ i18n "copied" }}')
-        })
+          this.qrModal.clipboard.destroy();
+        });
       },
       setQrCode(elementId, content) {
         new QRious({

web/html/common/text_modal.html

@@ -7,7 +7,7 @@
             :href="'data:application/text;charset=utf-8,' + encodeURIComponent(txtModal.content)"
             :download="txtModal.fileName">[[ txtModal.fileName ]]
         </a-button>
-        <a-button type="primary" @click="txtModal.copy(txtModal.content)">{{ i18n "copy" }}</a-button>
+            <a-button type="primary" id="copy-btn">{{ i18n "copy" }}</a-button>
     </template>
     <a-input style="overflow-y: auto;" type="textarea" v-model="txtModal.content"
         :autosize="{ minRows: 10, maxRows: 20}"></a-input>
@@ -20,18 +20,24 @@
         content: '',
         fileName: '',
         qrcode: null,
+        clipboard: null,
         visible: false,
         show: function (title = '', content = '', fileName = '') {
             this.title = title;
             this.content = content;
             this.fileName = fileName;
             this.visible = true;
-        },
+            textModalApp.$nextTick(() => {
-        copy: function (content = '') {
+                if (this.clipboard === null) {
-            copyToClipboard(content).then(() => {
+                    this.clipboard = new ClipboardJS('#copy-btn', {
-                app.$message.success('{{ i18n "copied" }}')
+                        text: () => this.content,
-                this.close();
+                    });
-            })
+                    this.clipboard.on('success', () => {
+                        app.$message.success('{{ i18n "copied" }}')
+                        this.close();
+                    });
+                }
+            });
         },
         close: function () {
             this.visible = false;

web/html/xui/inbound_info_modal.html

@@ -258,7 +258,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="purple">Subscription Link</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copyToClipboard(infoModal.subLink)"></a-button>
+              <a-button size="small" icon="snippets" id="copy-sub-link" @click="copyToClipboard('copy-sub-link', infoModal.subLink)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
@@ -267,7 +267,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="purple">Json Link</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copyToClipboard(infoModal.subJsonLink)"></a-button>
+              <a-button size="small" icon="snippets" id="copy-subJson-link" @click="copyToClipboard('copy-subJson-link', infoModal.subJsonLink)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a>
@@ -279,7 +279,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copyToClipboard(infoModal.clientSettings.tgId)"></a-button>
+              <a-button size="small" icon="snippets" id="copy-tg-link" @click="copyToClipboard('copy-tg-link', infoModal.clientSettings.tgId)"></a-button>
             </a-tooltip>
           </tr-info-title>
         </tr-info-row>
@@ -290,7 +290,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copyToClipboard(link.link)"></a-button>
+              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <code>[[ link.link ]]</code>
@@ -304,7 +304,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copyToClipboard(link.link)"></a-button>
+              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <code>[[ link.link ]]</code>
@@ -431,7 +431,7 @@
                 <tr-info-title class="tr-info-title">
                   <a-tag color="blue">Config</a-tag>
                   <a-tooltip title='{{ i18n "copy" }}'>
-                    <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copyToClipboard(infoModal.links[index])"></a-button>
+                    <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, infoModal.links[index])"></a-button>
                   </a-tooltip>
                 </tr-info-title>
                 <div v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)" style="border-radius: 1rem; padding: 0.5rem;" class="client-table-odd-row">
@@ -464,6 +464,7 @@
     clientStats: [],
     upStats: 0,
     downStats: 0,
+    clipboard: null,
     links: [],
     index: null,
     isExpired: false,
@@ -532,10 +533,14 @@
       },
     },
     methods: {
-      copyToClipboard(content) {
+      copyToClipboard(elementId, content) {
-        return copyToClipboard(content).then(() => {
+        this.infoModal.clipboard = new ClipboardJS('#' + elementId, {
+          text: () => content,
+        });
+        this.infoModal.clipboard.on('success', () => {
           app.$message.success('{{ i18n "copied" }}')
-        })
+          this.infoModal.clipboard.destroy();
+        });
       },
       statsColor(stats) {
         return usageColor(stats.up + stats.down, app.trafficDiff, stats.total);

web/html/xui/inbounds.html

@@ -546,6 +546,7 @@
 {{template "js" .}}
 <script src="{{ .base_path }}assets/base64/base64.min.js"></script>
 <script src="{{ .base_path }}assets/qrcode/qrious2.min.js?{{ .cur_ver }}"></script>
+<script src="{{ .base_path }}assets/clipboard/clipboard.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/uri/URI.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/js/model/inbound.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/js/model/dbinbound.js?{{ .cur_ver }}"></script>

web/html/xui/index.html

@@ -332,6 +332,7 @@
     </a-modal>
   </a-layout>
 {{template "js" .}}
+<script src="{{ .base_path }}assets/clipboard/clipboard.min.js?{{ .cur_ver }}"></script>
 {{template "component/themeSwitcher" .}}
 {{template "textModal"}}
 <script>

web/html/xui/xray.html

@@ -1384,7 +1384,8 @@
                         }
                         newTemplateSettings.routing.balancers.push(tmpBalancer);
                         this.templateSettings = newTemplateSettings;
-                        this.updateObservatorySelectors();
+                        if (balancer.strategy == 'leastPing' || balancer.strategy == 'leastLoad')
+                            this.updateObservatorySelectors();
                         balancerModal.close();
                         this.changeObsCode();
                     },
@@ -1432,7 +1433,8 @@
                             });
                         }
                         this.templateSettings = newTemplateSettings;
-                        this.updateObservatorySelectors();
+                        if (balancer.strategy == 'leastPing' || balancer.strategy == 'leastLoad')
+                            this.updateObservatorySelectors();
                         balancerModal.close();
                         this.changeObsCode();
                     },
@@ -1442,11 +1444,7 @@
             updateObservatorySelectors(){
                 newTemplateSettings = this.templateSettings;
                 const leastPings = this.balancersData.filter((b) => b.strategy == 'leastPing');
-                const leastLoads = this.balancersData.filter((b) =>
+                const leastLoads = this.balancersData.filter((b) => b.strategy == 'leastLoad');
-                    b.strategy === 'leastLoad' ||
-                    b.strategy === 'roundRobin' ||
-                    b.strategy === 'random'
-                );
                 if (leastPings.length>0){
                     if (!newTemplateSettings.observatory)
                         newTemplateSettings.observatory = this.defaultObservatory;

web/job/check_cpu_usage.go

@@ -23,7 +23,7 @@ func (j *CheckCpuJob) Run() {
 	threshold, _ := j.settingService.GetTgCpu()
 
 	// get latest status of server
-	percent, err := cpu.Percent(1*time.Minute, false)
+	percent, err := cpu.Percent(1*time.Second, false)
 	if err == nil && percent[0] > float64(threshold) {
 		msg := j.tgbotService.I18nBot("tgbot.messages.cpuThreshold",
 			"Percent=="+strconv.FormatFloat(percent[0], 'f', 2, 64),