Merge pull request #24 from vicanso/main

version 0.1.12

Author: vicanso

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.12] - 2023-06-29
+
+### Bug Fixes
+
+- Fix base64 encode, #23
+
+### Refactor
+
+- Improve the performance of select file
+- Improve the performance of select file
+
 ## [0.1.11] - 2023-06-26
 
 ### 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.11 --prepend CHANGELOG.md
+	git cliff --unreleased --tag 0.1.12 --prepend CHANGELOG.md

src-tauri/Cargo.lock

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

src-tauri/Cargo.toml

@@ -412,7 +412,7 @@ pub async fn request(
 
     let body = if http_request.content_type.starts_with("multipart/form-data") {
         // 数据为base64
-        let buf = general_purpose::STANDARD_NO_PAD.decode(http_request.body)?;
+        let buf = general_purpose::STANDARD.decode(http_request.body)?;
         Body::from(buf)
     } else {
         Body::from(http_request.body)
@@ -593,7 +593,7 @@ pub async fn request(
         latency: stats.total,
         status,
         headers,
-        body: general_purpose::STANDARD_NO_PAD.encode(buf),
+        body: general_purpose::STANDARD.encode(buf),
         stats,
     };
 

src-tauri/src/http_request.rs

@@ -10,6 +10,7 @@ import { fromUint8Array } from "js-base64";
 import sha256 from "crypto-js/sha256";
 import md5 from "crypto-js/md5";
 
+import { i18nCommon } from "../i18n";
 import { getLatestResponse, getResponseBody } from "./http_response";
 import { listVariable, VariableCategory, VariableStatus } from "./variable";
 interface FnHandler {
@@ -154,7 +155,9 @@ export async function doFnHandler(handler: FnHandler): Promise<string> {
       case Fn.openFile:
       case Fn.of:
         {
-          const selected = await open();
+          const selected = await open({
+            title: i18nCommon("selectFile"),
+          });
           if (selected) {
             p = selected as string;
           }

src/commands/fn.ts

@@ -226,7 +226,6 @@ async function convertMultipartForm(body: string): Promise<MultipartFormData> {
     type: encoder.contentType,
   });
   const buf = await b.arrayBuffer();
-  encoder.headers;
   return {
     headers: encoder.headers,
     body: fromUint8Array(new Uint8Array(buf)),

src/commands/http_request.ts

@@ -132,8 +132,6 @@ 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;
@@ -146,6 +144,7 @@ export function getResponseBody(resp: HTTPResponse): ResponseBodyResult {
     switch (k) {
       case "content-type":
         {
+          const mimeTextReg = /text|javascript/gi;
           const value = values.join(" ");
           if (value.includes(applicationJSON)) {
             category = ResponseBodyCategory.JSON;

src/commands/http_response.ts

@@ -9,10 +9,11 @@ import {
 } from "@vicons/ionicons5";
 import { debounce } from "lodash-es";
 import { open } from "@tauri-apps/api/dialog";
+import { downloadDir } from "@tauri-apps/api/path";
 
 import ExDeleteCheck from "./ExDeleteCheck";
 import { KVParam } from "../commands/interface";
-import { i18nCollection } from "../i18n";
+import { i18nCollection, i18nCommon } from "../i18n";
 import { padding } from "../constants/style";
 import { showError } from "../helpers/util";
 
@@ -154,7 +155,11 @@ export default defineComponent({
         return;
       }
       try {
-        const selected = await open();
+        const selected = await open({
+          title: i18nCommon("selectFile"),
+          multiple: false,
+          defaultPath: await downloadDir(),
+        });
         if (selected) {
           const item = kvList.value[index];
           item.value = ("file://" + selected) as string;

src/components/ExKeyValue.tsx

@@ -62,6 +62,7 @@ export default {
     settings: "Configurations",
     create: "Create",
     keywordFilterPlaceholder: "Please enter a keyword",
+    selectFile: "Please select a file",
     saveToDownloadSuccess: "File is save to download successful",
   },
   dashboard: {