release 2.1.1.RELEASE

Author: hellokaton

blade-core/src/main/java/com/hellokaton/blade/kit/MimeTypeKit.java

@@ -3,15 +3,25 @@
 import com.hellokaton.blade.mvc.multipart.MimeType;
 import lombok.experimental.UtilityClass;
 
+import java.net.URLConnection;
+
 @UtilityClass
 public class MimeTypeKit {
 
     public static String parse(String fileName) {
-        String ext = fileExt(fileName);
-        if (null == ext) {
+        try {
+            String mimeType = URLConnection.guessContentTypeFromName(fileName);
+            if (StringKit.isNotEmpty(mimeType)) {
+                return mimeType;
+            }
+            String ext = fileExt(fileName);
+            if (null == ext) {
+                return null;
+            }
+            return MimeType.get(ext);
+        } catch (Exception e) {
             return null;
         }
-        return MimeType.get(ext);
     }
 
     public static String fileExt(String fname) {

blade-core/src/main/java/com/hellokaton/blade/mvc/HttpConst.java

@@ -9,5 +9,6 @@ public interface HttpConst {
     String CONTENT_TYPE_XML = "text/xml; charset=UTF-8";
     String CONTENT_TYPE_JSON = "application/json; charset=UTF-8";
     String CONTENT_TYPE_TEXT = "text/plain; charset=UTF-8";
+    String CONTENT_TYPE_STREAM = "application/octet-stream";
 
 }

blade-core/src/main/java/com/hellokaton/blade/mvc/http/Body.java

@@ -1,9 +1,9 @@
 package com.hellokaton.blade.mvc.http;
 
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponse;
 
 public interface Body {
 
-    FullHttpResponse write(BodyWriter writer);
+    HttpResponse write(BodyWriter writer);
 
 }

blade-core/src/main/java/com/hellokaton/blade/mvc/http/BodyWriter.java

@@ -1,16 +1,18 @@
 package com.hellokaton.blade.mvc.http;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponse;
+
+import java.nio.channels.FileChannel;
 
 public interface BodyWriter {
 
-    FullHttpResponse onView(ViewBody body);
+    HttpResponse onView(ViewBody body);
 
-    FullHttpResponse onRawBody(RawBody body);
+    HttpResponse onRawBody(RawBody body);
 
-    FullHttpResponse onByteBuf(Object byteBuf);
+    HttpResponse onByteBuf(ByteBuf byteBuf);
 
-    FullHttpResponse onByteBuf(ByteBuf byteBuf);
+    HttpResponse onByteBuf(String fileName, FileChannel channel);
 
 }

blade-core/src/main/java/com/hellokaton/blade/mvc/http/ByteBody.java

@@ -2,7 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponse;
 
 import java.io.File;
 import java.io.IOException;
@@ -58,9 +58,9 @@ public static ByteBody of(ByteBuf byteBuf) {
     }
 
     @Override
-    public FullHttpResponse write(BodyWriter writer) {
+    public HttpResponse write(BodyWriter writer) {
         if (null != outputStream) {
-            return writer.onByteBuf(outputStream);
+            return writer.onByteBuf((ByteBuf) null);
         }
         return writer.onByteBuf(byteBuf);
     }

blade-core/src/main/java/com/hellokaton/blade/mvc/http/ChannelBody.java

@@ -0,0 +1,30 @@
+package com.hellokaton.blade.mvc.http;
+
+import io.netty.handler.codec.http.HttpResponse;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.file.StandardOpenOption;
+
+public class ChannelBody implements Body {
+
+    private final String fileName;
+    private final FileChannel content;
+
+    public ChannelBody(final String fileName, final FileChannel content) {
+        this.fileName = fileName;
+        this.content = content;
+    }
+
+    public static ChannelBody of(File file) throws IOException {
+        FileChannel fileChannel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
+        return new ChannelBody(file.getName(), fileChannel);
+    }
+
+    @Override
+    public HttpResponse write(BodyWriter writer) {
+        return writer.onByteBuf(fileName, content);
+    }
+
+}

blade-core/src/main/java/com/hellokaton/blade/mvc/http/EmptyBody.java

@@ -1,7 +1,7 @@
 package com.hellokaton.blade.mvc.http;
 
 import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponse;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
@@ -14,7 +14,7 @@ public static EmptyBody empty() {
     }
 
     @Override
-    public FullHttpResponse write(BodyWriter writer) {
+    public HttpResponse write(BodyWriter writer) {
         return writer.onByteBuf( Unpooled.buffer(0));
     }
 

blade-core/src/main/java/com/hellokaton/blade/mvc/http/HttpResponse.java

@@ -1,7 +1,5 @@
 package com.hellokaton.blade.mvc.http;
 
-import com.hellokaton.blade.exception.NotFoundException;
-import com.hellokaton.blade.kit.MimeTypeKit;
 import com.hellokaton.blade.mvc.ui.ModelAndView;
 import com.hellokaton.blade.server.NettyHttpConst;
 import io.netty.handler.codec.http.cookie.Cookie;
@@ -10,8 +8,10 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.StandardOpenOption;
 import java.util.*;
 
 /**
@@ -23,8 +23,8 @@
 @Slf4j
 public class HttpResponse implements Response {
 
-    private Map<String, String> headers = new HashMap<>();
-    private Set<Cookie> cookies = new HashSet<>();
+    private final Map<String, String> headers = new HashMap<>();
+    private final Set<Cookie> cookies = new HashSet<>();
 
     private int statusCode = 200;
     private Body body;
@@ -138,18 +138,6 @@ public Set<Cookie> cookiesRaw() {
         return this.cookies;
     }
 
-    @Override
-    public void download(@NonNull String fileName, @NonNull File file) throws Exception {
-        if (!file.exists() || !file.isFile()) {
-            throw new NotFoundException("Not found file: " + file.getPath());
-        }
-        String contentType = MimeTypeKit.parse(file.getName());
-        headers.put("Content-Disposition", "attachment; filename=" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859_1"));
-        headers.put(NettyHttpConst.CONTENT_LENGTH.toString(), String.valueOf(file.length()));
-        headers.put(NettyHttpConst.CONTENT_TYPE_STRING, contentType);
-        this.body = new StreamBody(new FileInputStream(file));
-    }
-
     @Override
     public void render(@NonNull ModelAndView modelAndView) {
         this.body = new ViewBody(modelAndView);
@@ -161,6 +149,18 @@ public void redirect(@NonNull String newUri) {
         this.status(302);
     }
 
+    @Override
+    public void write(File file) throws IOException {
+        this.body = ChannelBody.of(file);
+    }
+
+    @Override
+    public void write(String fileName, File file) throws IOException {
+        FileChannel fileChannel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
+        headers.put("Content-Disposition", "attachment; filename=" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
+        this.body = new ChannelBody(null, fileChannel);
+    }
+
     @Override
     public ModelAndView modelAndView() {
         if (this.body instanceof ViewBody) {

blade-core/src/main/java/com/hellokaton/blade/mvc/http/RawBody.java

@@ -2,10 +2,11 @@
 
 import io.netty.handler.codec.http.DefaultHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponse;
 
 public class RawBody implements Body {
 
-    private FullHttpResponse    httpResponse;
+    private HttpResponse    httpResponse;
     private DefaultHttpResponse defaultHttpResponse;
 
     public RawBody(FullHttpResponse httpResponse) {
@@ -16,7 +17,7 @@ public RawBody(DefaultHttpResponse defaultHttpResponse) {
         this.defaultHttpResponse = defaultHttpResponse;
     }
 
-    public FullHttpResponse httpResponse() {
+    public HttpResponse httpResponse() {
         return httpResponse;
     }
 
@@ -25,7 +26,7 @@ public DefaultHttpResponse defaultHttpResponse() {
     }
 
     @Override
-    public FullHttpResponse write(BodyWriter writer) {
+    public HttpResponse write(BodyWriter writer) {
         return writer.onRawBody(this);
     }
 

blade-core/src/main/java/com/hellokaton/blade/mvc/http/Response.java

@@ -8,6 +8,8 @@
 import com.hellokaton.blade.mvc.ui.ModelAndView;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -229,14 +231,6 @@ default void body(String body) {
      */
     Response body(Body body);
 
-    /**
-     * download some file to client
-     *
-     * @param fileName give client file name
-     * @param file     file storage location
-     */
-    void download(String fileName, File file) throws Exception;
-
     /**
      * Render view, can be modified after WebHook
      *
@@ -265,6 +259,10 @@ default void render(String view) {
      */
     void redirect(String newUri);
 
+    void write(File file) throws IOException;
+
+    void write(String fileName, File file) throws IOException;
+
     /**
      * @return Returns the currently set view, returning an empty Optional type when not set
      * @since 2.0.8