Improve mime-type handling

Sources/Helpers/Deprecations.swift

@@ -35,6 +35,16 @@ public extension DispatchTimer {
  }
 }
 
+// MARK: - FileManager
+
+public extension FileManager {
+ /// Provides the mime-type of the url based on the path extension.
+ @available(*, deprecated, message: "use <url>.mimeType")
+ func mimeType(of url: URL) -> String {
+ return url.mimeType
+ }
+}
+
 // MARK: - HTTPHeader
 
 @available(*, deprecated, renamed: "HTTPHeaderName")

Sources/Helpers/Extensions/FileManager+Ext.swift

@@ -13,19 +13,22 @@ import Foundation
 #endif
 
 public extension FileManager {
- /// Returns the mime type of a file.
- func mimeType(of url: URL) -> String {
- let fallback = "application/octet-stream"
- let fileExt = url.pathExtension as CFString
-
- // Wasm extensions must return `application/wasm`
- // Or else browsers will throw an error 
- if fileExt as String == "wasm" {
- return "application/wasm"
+ /// Returns the mime type for a path extension (e.g. wasm).
+ func mimeType(pathExtension: String) -> String {
+ // Check if there is an override for the extension
+ switch pathExtension {
+ case "wasm": return "application/wasm"
+ default: break
  }
 
- guard let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, fileExt, nil)?.takeRetainedValue() else { return fallback }
- guard let mimeType = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() else { return fallback }
- return mimeType as String
+ // Let the system determine the proper mime-type
+ if
+ let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension as CFString, nil)?.takeRetainedValue(),
+ let mimeType = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() {
+ return mimeType as String
+ }
+
+ // No mime-type found? Return the fallback
+ return "application/octet-stream"
  }
 }

Sources/Helpers/Extensions/URL+Ext.swift

@@ -24,3 +24,10 @@ public extension URL {
  return scheme == "https" || scheme == "wss"
  }
 }
+
+public extension URL {
+ /// Provides the mime-type of the url based on the path extension.
+ var mimeType: String {
+ return FileManager.default.mimeType(pathExtension: pathExtension)
+ }
+}

Sources/Protocols/HTTP/Handlers/HTTPFileHandler.swift

@@ -77,7 +77,7 @@ open class HTTPFileHandler: HTTPRequestHandler {
 
  // Construct a response
  let response = HTTPResponse()
- response.headers.contentType = fileManager.mimeType(of: url)
+ response.headers.contentType = url.mimeType
  response.headers.lastModified = attributes.fileModificationDate()?.rfc1123
 
  // Is a range requested?

Telegraph.xcodeproj/project.pbxproj

@@ -219,6 +219,7 @@
  82897603217402B60089D662 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82897602217402B60089D662 /* Endpoint.swift */; };
  82897604217402B60089D662 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82897602217402B60089D662 /* Endpoint.swift */; };
  82897605217402B60089D662 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82897602217402B60089D662 /* Endpoint.swift */; };
+ 82C00C7024F9A2E4009A6B1F /* URLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C00C6E24F9A252009A6B1F /* URLTests.swift */; };
  82D2AF04210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; };
  82D2AF05210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; };
  82D2AF06210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; };
@@ -336,6 +337,7 @@
  8284FF151ECE89BF00303A00 /* FileManager+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileManager+Ext.swift"; sourceTree = "<group>"; };
  8284FF1C1ECE8C8E00303A00 /* HTTPFileHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPFileHandler.swift; sourceTree = "<group>"; };
  82897602217402B60089D662 /* Endpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = "<group>"; };
+ 82C00C6E24F9A252009A6B1F /* URLTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLTests.swift; sourceTree = "<group>"; };
  82D2AF03210D354600BF5BBA /* DataStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataStream.swift; sourceTree = "<group>"; };
  82EB7CC924D4ACE5004C91B5 /* URITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URITests.swift; sourceTree = "<group>"; };
  82EC461E22CD1E26008A6A22 /* HTTPHeader+Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPHeader+Common.swift"; sourceTree = "<group>"; };
@@ -400,6 +402,7 @@
  825A71831ECD22F60043AC8D /* SecurityTests.swift */,
  8206413C240C7821003403F3 /* ServerTests.swift */,
  82EB7CC924D4ACE5004C91B5 /* URITests.swift */,
+ 82C00C6E24F9A252009A6B1F /* URLTests.swift */,
  );
  path = Tests;
  sourceTree = "<group>";
@@ -1173,6 +1176,7 @@
  isa = PBXSourcesBuildPhase;
  buildActionMask = 2147483647;
  files = (
+ 82C00C7024F9A2E4009A6B1F /* URLTests.swift in Sources */,
  825A718A1ECD230E0043AC8D /* HelperTests.swift in Sources */,
  82EB7CCA24D4ACE5004C91B5 /* URITests.swift in Sources */,
  82EB7CCB24D4AD78004C91B5 /* URI.swift in Sources */,

Tests/URLTests.swift

@@ -0,0 +1,31 @@
+//
+// URLTests.swift
+// Telegraph iOS
+//
+// Created by Yvo van Beek on 8/28/20.
+// Copyright © 2020 Building42. All rights reserved.
+//
+
+import XCTest
+@testable import Telegraph
+
+class URLTests: XCTestCase {
+ /// Tests the URL mime-type helper.
+ func testURLMimeType() {
+ let url1 = URL(string: "https://www.apple.com")
+ let url2 = URL(string: "https://www.apple.com/hello")
+ let url3 = URL(string: "https://www.apple.com/hello.wasm")
+ let url4 = URL(string: "https://www.apple.com/hello.jpg")
+ let url5 = URL(string: "https://www.apple.com/hello.png")
+ let url6 = URL(string: "https://www.apple.com/hello.html")
+ let url7 = URL(string: "https://www.apple.com/hello.mp4?hello=world")
+
+ XCTAssertEqual(url1?.mimeType, "application/octet-stream")
+ XCTAssertEqual(url2?.mimeType, "application/octet-stream")
+ XCTAssertEqual(url3?.mimeType, "application/wasm")
+ XCTAssertEqual(url4?.mimeType, "image/jpeg")
+ XCTAssertEqual(url5?.mimeType, "image/png")
+ XCTAssertEqual(url6?.mimeType, "text/html")
+ XCTAssertEqual(url7?.mimeType, "video/mp4")
+ }
+}