1. Miscellaneous fixes to Express's Response class

2. Added a setContentType method to Http's ServerResponse class
3. Added ServerOptions (to support SSL) to MongoDB module

Author: ldaniels528

node/http/src/main/scala/org/scalajs/nodejs/http/ServerResponse.scala

@@ -2,7 +2,6 @@ package org.scalajs.nodejs.http
 
 import org.scalajs.nodejs.events.EventEmitter
 import org.scalajs.nodejs.stream.Writable
-import org.scalajs.nodejs.events.EventEmitter
 
 import scala.scalajs.js
 
@@ -146,6 +145,17 @@ object ServerResponse {
     */
   implicit class ServerResponseExtensions(val response: ServerResponse) extends AnyVal {
 
+    /**
+      * Sets the content-type for the response
+      * @param contentType the given MIME type
+      */
+    @inline
+    def setContentType(contentType: String) = response.setHeader("Content-Type", contentType)
+
+    /////////////////////////////////////////////////////////////////////////////////
+    //      Response Shortcuts
+    /////////////////////////////////////////////////////////////////////////////////
+
     @inline
     def badRequest() = response.sendStatus(400)
 

node_libs/express/src/main/scala/org/scalajs/nodejs/express/Application.scala

@@ -4,11 +4,9 @@ import org.scalajs.nodejs.errors
 import org.scalajs.nodejs.events.EventEmitter
 import org.scalajs.nodejs.http.Server
 import org.scalajs.nodejs.util.ScalaJsHelper._
-import org.scalajs.nodejs.events.EventEmitter
-import org.scalajs.nodejs.http.Server
-import org.scalajs.nodejs.util.ScalaJsHelper
 
 import scala.scalajs.js
+import scala.scalajs.js.|
 
 /**
   * The app object conventionally denotes the Express application. Create it by calling the
@@ -92,31 +90,31 @@ trait Application extends Router with EventEmitter {
     * This method is identical to Node’s http.Server.listen().
     * @example app.listen(port, [hostname], [backlog], [callback])
     */
-  def listen(port: Int, hostname: String, backlog: Int, callback: js.Function): Unit = js.native
+  def listen(port: Int | String, hostname: String, backlog: Int, callback: js.Function): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String, backlog: Int): Unit = js.native
+  def listen(port: Int | String, hostname: String, backlog: Int): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String, callback: js.Function): Unit = js.native
+  def listen(port: Int | String, hostname: String, callback: js.Function): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String): Unit = js.native
+  def listen(port: Int | String, hostname: String): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, callback: js.Function): Server = js.native
+  def listen(port: Int | String, callback: js.Function): Server = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
@@ -201,17 +199,17 @@ object Application {
     /**
       * Binds and listens for connections on the specified host and port.
       */
-    def listenFuture(port: Int) = futureCallbackE1[errors.Error, Server](app.listen(port, _))
+    def listenFuture(port: Int | String) = futureCallbackE1[errors.Error, Server](app.listen(port, _))
 
     /**
       * Binds and listens for connections on the specified host and port.
       */
-    def listenFuture(port: Int, hostname: String) = futureCallbackE1[errors.Error, Server](app.listen(port, hostname, _))
+    def listenFuture(port: Int | String, hostname: String) = futureCallbackE1[errors.Error, Server](app.listen(port, hostname, _))
 
     /**
       * Binds and listens for connections on the specified host and port.
       */
-    def listenFuture(port: Int, hostname: String, backlog: Int) = futureCallbackE1[errors.Error, Server](app.listen(port, hostname, backlog, _))
+    def listenFuture(port: Int | String, hostname: String, backlog: Int) = futureCallbackE1[errors.Error, Server](app.listen(port, hostname, backlog, _))
 
   }
 

node_libs/express/src/main/scala/org/scalajs/nodejs/express/Request.scala

@@ -1,9 +1,9 @@
 package org.scalajs.nodejs.express
 
-import org.scalajs.nodejs.http.ClientRequest
 import org.scalajs.nodejs.http.ClientRequest
 
 import scala.scalajs.js
+import scala.scalajs.js.|
 
 /**
   * Express Http Request

node_libs/express/src/main/scala/org/scalajs/nodejs/express/Response.scala

@@ -1,6 +1,5 @@
 package org.scalajs.nodejs.express
 
-import org.scalajs.nodejs.http.ServerResponse
 import org.scalajs.nodejs.http.ServerResponse
 
 import scala.scalajs.js
@@ -297,7 +296,10 @@ object Response {
     def internalServerError(message: String) = response.status(500).send(message)
 
     @inline
-    def internalServerError(cause: Throwable) = response.status(500).send(cause.getMessage)
+    def internalServerError(cause: Throwable) = {
+      cause.printStackTrace()
+      response.status(500).send(cause.getMessage)
+    }
 
     @inline
     def notFound() = response.sendStatus(404)

node_libs/mongodb/src/main/scala/org/scalajs/nodejs/mongodb/ServerClass.scala

@@ -1,7 +1,6 @@
 package org.scalajs.nodejs.mongodb
 
 import org.scalajs.nodejs.util.ScalaJsHelper._
-import org.scalajs.nodejs.util.ScalaJsHelper
 
 import scala.scalajs.js
 
@@ -34,7 +33,7 @@ object ServerClass {
   implicit class ServerClassExtensions(val `class`: ServerClass) extends AnyVal {
 
     @inline
-    def apply(host: String, port: Int) = `class`.New[Server](host, port)
+    def apply(host: String, port: Int, options: ServerOptions = null) = `class`.New[Server](host, port, options)
 
   }
 

node_libs/mongodb/src/main/scala/org/scalajs/nodejs/mongodb/ServerOptions.scala

@@ -0,0 +1,11 @@
+package org.scalajs.nodejs.mongodb
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
+
+/**
+  * MongoDB Server Options
+  * @author [email protected]
+  */
+@ScalaJSDefined
+class ServerOptions(ssl: js.UndefOr[Boolean] = js.undefined) extends js.Object