From cd211a6be7c5d4eb0f90055f6ad164b7467de40b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 15 Oct 2021 18:36:40 +0800
Subject: [PATCH] [http options] fine tune

---
 server/model/monitor.js   |  4 ++
 server/util-server.js     |  2 +-
 src/languages/en.js       |  2 -
 src/pages/EditMonitor.vue | 90 +++++++++++++++++++++------------------
 4 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 85c07cb71..6ec97372c 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -180,6 +180,10 @@ class Monitor extends BeanModel {
                         debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
                     }
 
+                    if (process.env.UPTIME_KUMA_LOG_RESPONSE_BODY_MONITOR_ID == this.id) {
+                        console.log(res.data);
+                    }
+
                     if (this.type === "http") {
                         bean.status = UP;
                     } else {
diff --git a/server/util-server.js b/server/util-server.js
index a65af74a4..7fd613ceb 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -327,7 +327,7 @@ exports.startUnitTest = async () => {
  */
 exports.convertToUTF8 = (body) => {
     const guessEncoding = chardet.detect(body);
-    debug("Guess Encoding: " + guessEncoding);
+    //debug("Guess Encoding: " + guessEncoding);
     const str = iconv.decode(body, guessEncoding);
     return str.toString();
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index fac34a370..aef14c81e 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -288,6 +288,4 @@ export default {
     PushUrl: "Push URL",
     HeadersInvalidFormat: "The request headers are not valid JSON: ",
     BodyInvalidFormat: "The request body is not valid JSON: ",
-    BodyPlaceholder: "&lbrace;\n\t\"id\": 124357,\n\t\"username\": \"admin\",\n\t\"password\": \"myAdminPassword\"\n&rbrace;",
-    HeadersPlaceholder: "&lbrace;\n\t\"Authorization\": \"Bearer abc123\",\n\t\"Content-Type\": \"application/json\"\n&rbrace;",
 };
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 374c14e76..f88614415 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -44,46 +44,6 @@
                                 <input id="url" v-model="monitor.url" type="url" class="form-control" pattern="https?://.+" required>
                             </div>
 
-                            <!-- Method -->
-                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                                <label for="method" class="form-label">{{ $t("Method") }}</label>
-                                <select id="method" v-model="monitor.method" class="form-select">
-                                    <option value="GET">
-                                        GET
-                                    </option>
-                                    <option value="POST">
-                                        POST
-                                    </option>
-                                    <option value="PUT">
-                                        PUT
-                                    </option>
-                                    <option value="PATCH">
-                                        PATCH
-                                    </option>
-                                    <option value="DELETE">
-                                        DELETE
-                                    </option>
-                                    <option value="HEAD">
-                                        HEAD
-                                    </option>
-                                    <option value="OPTIONS">
-                                        OPTIONS
-                                    </option>
-                                </select>
-                            </div>
-
-                            <!-- Body -->
-                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                                <label for="body" class="form-label">{{ $t("Body") }}</label>
-                                <textarea id="body" v-model="monitor.body" class="form-control" :placeholder="bodyPlaceholder"></textarea>
-                            </div>
-
-                            <!-- Headers -->
-                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                                <label for="headers" class="form-label">{{ $t("Headers") }}</label>
-                                <textarea id="headers" v-model="monitor.headers" class="form-control" :placeholder="headersPlaceholder"></textarea>
-                            </div>
-
                             <!-- Push URL -->
                             <div v-if="monitor.type === 'push' " class="my-3">
                                 <label for="push-url" class="form-label">{{ $t("PushUrl") }}</label>
@@ -235,6 +195,7 @@
                         <div class="col-md-6">
                             <div v-if="$root.isMobile" class="mt-3" />
 
+                            <!-- Notifications -->
                             <h2 class="mb-2">{{ $t("Notifications") }}</h2>
                             <p v-if="$root.notificationList.length === 0">
                                 {{ $t("Not available, please setup.") }}
@@ -254,6 +215,51 @@
                             <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
                                 {{ $t("Setup Notification") }}
                             </button>
+
+                            <!-- HTTP Options -->
+                            <template v-if="monitor.type === 'http' || monitor.type === 'keyword' ">
+                                <h2 class="mt-5 mb-2">{{ $t("HTTP Options") }}</h2>
+
+                                <!-- Method -->
+                                <div class="my-3">
+                                    <label for="method" class="form-label">{{ $t("Method") }}</label>
+                                    <select id="method" v-model="monitor.method" class="form-select">
+                                        <option value="GET">
+                                            GET
+                                        </option>
+                                        <option value="POST">
+                                            POST
+                                        </option>
+                                        <option value="PUT">
+                                            PUT
+                                        </option>
+                                        <option value="PATCH">
+                                            PATCH
+                                        </option>
+                                        <option value="DELETE">
+                                            DELETE
+                                        </option>
+                                        <option value="HEAD">
+                                            HEAD
+                                        </option>
+                                        <option value="OPTIONS">
+                                            OPTIONS
+                                        </option>
+                                    </select>
+                                </div>
+
+                                <!-- Body -->
+                                <div class="my-3">
+                                    <label for="body" class="form-label">{{ $t("Body") }}</label>
+                                    <textarea id="body" v-model="monitor.body" class="form-control" :placeholder="bodyPlaceholder"></textarea>
+                                </div>
+
+                                <!-- Headers -->
+                                <div class="my-3">
+                                    <label for="headers" class="form-label">{{ $t("Headers") }}</label>
+                                    <textarea id="headers" v-model="monitor.headers" class="form-control" :placeholder="headersPlaceholder"></textarea>
+                                </div>
+                            </template>
                         </div>
                     </div>
                 </div>
@@ -328,11 +334,11 @@ export default {
         },
 
         bodyPlaceholder() {
-            return this.decodeHtml(this.$t("BodyPlaceholder"));
+            return this.decodeHtml("&lbrace;\n\t\"id\": 124357,\n\t\"username\": \"admin\",\n\t\"password\": \"myAdminPassword\"\n&rbrace;");
         },
 
         headersPlaceholder() {
-            return this.decodeHtml(this.$t("HeadersPlaceholder"));
+            return this.decodeHtml("&lbrace;\n\t\"Authorization\": \"Bearer abc123\",\n\t\"Content-Type\": \"application/json\"\n&rbrace;");
         }
 
     },