1.3.0 add octet stream upload

garyxuehong · Feb 13, 2020 · 3de06ab · 3de06ab
1 parent e2b3271
commit 3de06ab
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG.md
 
+## v1.3.0 (2020-02-13)
+### Feature: Add octet/stream upload
+
 ## v1.2.4 (2019-12-16)
 ### Bugfix: fix edit menu missing
 

diff --git a/docs/index.html b/docs/index.html
@@ -65,7 +65,7 @@ <h1 class="hero-title h2-mobile mt-0 is-revealing">
                 <div class="control control-expanded">
                   <a
                     class="button button-primary button-block button-shadow"
-                    href="https://github.com/garyxuehong/postmate/releases/download/v1.2.4/Postmate-1.2.4.dmg"
+                    href="https://github.com/garyxuehong/postmate/releases/download/v1.3.0/Postmate-1.3.0.dmg"
                     >Download now</a
                   >
                   <p style="display:block; margin-top: 20px;">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postmate",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "private": true,
   "main": "public/electron.js",
   "homepage": "./",

diff --git a/src/model/model.ts b/src/model/model.ts
@@ -40,6 +40,7 @@ export class ApiRequest {
   url: string = "";
   headers: Headers | null = {};
   body: string = "";
+  bodyBuffer: Buffer | null = null;
   variablesExtract: VariablesExtract = {};
 }
 
@@ -49,6 +50,7 @@ export class HttpRequest {
   url: string = "";
   headers: Headers | null = {};
   body: string = "";
+  bodyBuffer: Buffer | null = null;
   cert: ApiCert | null | undefined = undefined;
 }
 

diff --git a/src/request-parser/request-parser.ts b/src/request-parser/request-parser.ts
@@ -18,13 +18,15 @@ export default function parse(
   if (body !== "") {
     body = varReplace(body, variables);
   }
+  let bodyBuffer = request.bodyBuffer;
   const method = varReplace(request.method, variables);
   const headers = varHeaderReplace(request.headers || {}, variables);
   return {
     isHttps,
     method,
     url,
     body,
+    bodyBuffer,
     headers,
     cert
   };

diff --git a/src/request-sender/request-sender.ts b/src/request-sender/request-sender.ts
@@ -27,7 +27,9 @@ export default async function send(
       method: request.method,
       headers: {
         ...request.headers,
-        'content-length': request.body.length //TODO deal with unicode
+        "content-length": request.bodyBuffer
+          ? request.bodyBuffer.length
+          : request.body.length //TODO deal with unicode
       },
       ...certOption
     };
@@ -54,7 +56,7 @@ export default async function send(
     newRequest.on("error", e => {
       reject(e);
     });
-    newRequest.write(request.body, err => {
+    newRequest.write(request.bodyBuffer || request.body, err => {
       if (err) reject(err);
       newRequest.end();
     });

diff --git a/src/ui/RequestList.tsx b/src/ui/RequestList.tsx
@@ -73,6 +73,7 @@ export default function RequestList({
                         key={req.name}
                         onClick={() => {
                           updateLastClicked(req.name);
+                          if(req.bodyBuffer) req.bodyBuffer = null;
                           onActivateRequest(req);
                         }}
                       >

diff --git a/src/ui/RequestOperationPanel.tsx b/src/ui/RequestOperationPanel.tsx
@@ -125,6 +125,9 @@ export default function RequestOperationPanel({
             onBodyChange={body => {
               updateTempRequest({ ...tempRequest, body });
             }}
+            onBodyBufferChange={bodyBuffer => {
+              updateTempRequest({ ...tempRequest, bodyBuffer });
+            }}
           />
           <p>
             <br />

diff --git a/src/ui/RequestPanel.tsx b/src/ui/RequestPanel.tsx
@@ -2,19 +2,31 @@ import React from "react";
 import { ApiRequest } from "../model/model";
 import { Form } from "semantic-ui-react";
 
+import fs from 'fs';
+
 const RequestPanel: React.FC<{
   request: ApiRequest;
   onMethodChange: (value: string) => void;
   onUrlChange: (value: string) => void;
   onHeadersChange: (key: string, value: string) => void;
-  onBodyChange: (value: string) => void;
+  onBodyChange: (value: string ) => void;
+  onBodyBufferChange: (value: Buffer) => void;
 }> = ({
   request,
   onMethodChange,
   onUrlChange,
   onHeadersChange,
-  onBodyChange
+  onBodyChange,
+  onBodyBufferChange
 }) => {
+  const headers = request.headers || {};
+  const isFileUpload =
+    (
+      headers["content-type"] ||
+      headers["Content-Type"] ||
+      headers["CONTENT-TYPE"] ||
+      ""
+    ).toLowerCase() === "application/octet-stream";
   return (
     <Form>
       <Form.Field>
@@ -42,10 +54,25 @@ const RequestPanel: React.FC<{
       ))}
       <Form.Field>
         <label>Body</label>
-        <textarea
-          value={request.body}
-          onChange={e => onBodyChange(e.target.value)}
-        />
+        {isFileUpload ? (
+          <input
+            type="file"
+            onChange={async e => {
+              if (e.target.files && e.target.files.length > 0) {
+                const file = e.target.files[0];
+                if (file) {
+                  const fileContent = await fs.promises.readFile(file.path);
+                  onBodyBufferChange(fileContent);
+                }
+              }
+            }}
+          />
+        ) : (
+          <textarea
+            value={request.body}
+            onChange={e => onBodyChange(e.target.value)}
+          />
+        )}
       </Form.Field>
     </Form>
   );