Merge pull request #19 from vicanso/main

version 0.1.9

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.9] - 2023-06-13
+
+### Features
+
+- Add accept-encoding and support text content preview
+
+### Refactor
+
+- Adjust json format
+
 ## [0.1.8] - 2023-06-10
 
 ### Bug Fixes

Makefile

@@ -19,4 +19,4 @@ orm:
     -u "sqlite:///~/Library/Application Support/com.bigtree.cyberapi/my_db.db" \
     -o src/entities
 version:
-	git cliff --unreleased --tag 0.1.8 --prepend CHANGELOG.md
+	git cliff --unreleased --tag 0.1.9 --prepend CHANGELOG.md

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyberapi",
   "private": true,
-  "version": "0.1.8",
+  "version": "0.1.9",
   "scripts": {
     "format": "prettier --write src/*.ts src/*.tsx src/**/*.ts src/**/*.tsx src/**/**/*.tsx",
     "lint": "eslint . --ext .js,.tsx,.ts --fix && vue-tsc --noEmit",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cyberapi"
-version = "0.1.8"
+version = "0.1.9"
 description = "API tool based on tauri, it is smaller and faster."
 authors = ["tree.xie@outlook.com"]
 license = "Apache License 2.0"

src-tauri/src/http_request.rs

@@ -460,6 +460,7 @@ pub async fn request(
             HeaderValue::from_str(h.value.as_str())?,
         );
     }
+    header.insert("Accept-Encoding", HeaderValue::from_str("gzip, br")?);
     // 如果未设置content type
     // 设置content type
     if !set_content_type && !http_request.content_type.is_empty() {

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "CyberAPI",
-    "version": "0.1.8"
+    "version": "0.1.9"
   },
   "tauri": {
     "allowlist": {

src/commands/http_response.ts

@@ -132,6 +132,9 @@ export function getStatusText(code: number) {
   return statusTextMap.get(code.toString()) || "";
 }
 
+
+const mimeTextReg = /text|javascript/gi;
+
 export function getResponseBody(resp: HTTPResponse): ResponseBodyResult {
   const { headers, body } = resp;
   let category = ResponseBodyCategory.Binary;
@@ -151,8 +154,8 @@ export function getResponseBody(resp: HTTPResponse): ResponseBodyResult {
             json = JSON.parse(data);
             isJSON = true;
             // format
-            data = JSON.stringify(json, null, 2);
-          } else if (value.includes("text")) {
+            data = JSON.stringify(json, null, 4);
+          } else if (mimeTextReg.test(value)) {
             category = ResponseBodyCategory.Text;
             data = decode(data);
           }

src/components/APISettingParams/req_params.tsx

@@ -27,7 +27,7 @@ import {
 import { useSettingStore } from "../../stores/setting";
 import { i18nCollection, i18nCommon } from "../../i18n";
 import { CaretDownOutline, CodeSlashOutline } from "@vicons/ionicons5";
-import { jsonFormat, showError, tryToParseArray } from "../../helpers/util";
+import { showError, tryToParseArray } from "../../helpers/util";
 import ExKeyValue, { HandleOption } from "../ExKeyValue";
 import { KVParam } from "../../commands/interface";
 import { padding } from "../../constants/style";
@@ -306,6 +306,11 @@ export default defineComponent({
         showError(message, err);
       }
     };
+    const handleFormat = () => {
+      if (editorIns) {
+        editorIns.getAction("editor.action.formatDocument")?.run();
+      }
+    };
 
     onMounted(() => {
       initEditor();
@@ -322,6 +327,7 @@ export default defineComponent({
       handleAuth,
       handleChangeContentType,
       handleUpdateActiveTab,
+      handleFormat,
       activeTab,
       codeEditor,
     };
@@ -508,6 +514,20 @@ export default defineComponent({
             ref="codeEditor"
             class={codeEditorClass}
           ></div>
+          {activeTab === TabItem.Body && contentType === ContentType.JSON && (
+            <NButton
+              class="format"
+              quaternary
+              onClick={() => {
+                this.handleFormat();
+              }}
+            >
+              <NIcon>
+                <CodeSlashOutline />
+              </NIcon>
+              {i18nCollection("format")}
+            </NButton>
+          )}
           {/* body form/multipart */}
           {showBodyKeyValue && (
             <ExKeyValue

src/helpers/util.ts

@@ -161,7 +161,7 @@ export function jsonFormat(data: string) {
         if (!isJSON(item)) {
           return item;
         }
-        return JSON.stringify(JSON.parse(item), null, 2);
+        return JSON.stringify(JSON.parse(item), null, 4);
       })
       .join("\n");
   }
@@ -228,7 +228,7 @@ export async function writeFileToDownload(file: string, data: ArrayBuffer) {
 }
 
 export async function writeSettingToDownload(arr: unknown, name: string) {
-  const data = JSON.stringify(arr, null, 2);
+  const data = JSON.stringify(arr, null, 4);
   const buf = await stringToArrayBuffer(data);
   await writeFileToDownload(`cyberapi-${name}.json`, buf);
 }