Continued development

1. Moved string-decoder to a sub-project
2. Updated Express and internal HTTP modules
3. Enhanced the MongoDB module (added Mongo DSL)

Author: ldaniels528

README.md

@@ -63,24 +63,28 @@ modules implemented for most web applications.
 
 The following NodeJS modules have been implemented thus far:
 
-* body-parser
-* buffer
-* events
-* express
-* express-ws
-* fs
-* http
-* https
-* kafka-node
-* mongodb
-* net
-* os
-* node-zookeeper-client
-* readline
-* repl
-* stream
-* url
-* util
+| Module            | Artifact              | Description |
+|-------------------|-----------------------|-------------|
+| body-parser       | means-node-express    | Node.js body parsing middleware. |
+| buffer            | means-node-core       | 
+| events            | means-node-core       |
+| express           | means-node-express    |
+| express-ws        | means-node-express    |
+| fs                | means-node-core       |
+| http              | means-node-core       |
+| https             | means-node-core       |
+| kafka-node        | means-node-kafkanode  |
+| mongodb           | means-node-mongodb    |
+| net               | means-node-core       |
+| os                | means-node-os         |
+| node-zookeeper-client | means-node-zookeeper-client |
+| readline          | means-node-core       |
+| repl              | means-node-repl       |
+| stream            | means-node-core       |
+| string-decoder    | means-node-string-decoder |
+| url               | means-node-core       |
+| util              | means-node-core       |
+| zlib              | means-node-zlib       |
 
 I've provided an example to demonstrate how similar the Scala.js code is to the JavaScript
 that it replaces.

build.sbt

@@ -4,7 +4,7 @@ import sbt.Keys._
 import sbt.Project.projectToRef
 import sbt._
 
-val apiVersion = "0.1.1"
+val apiVersion = "0.1.2"
 val paradisePluginVersion = "2.1.0"
 val _scalaVersion = "2.11.8"
 val scalaJsDomVersion = "0.9.0"
@@ -15,19 +15,27 @@ val commonSettings = Seq(
   version := apiVersion,
   scalaVersion := _scalaVersion,
   scalacOptions ++= Seq("-feature", "-deprecation"),
+  scalacOptions in (Compile, doc) ++= Seq(
+    "-no-link-warnings" // Suppresses problems with Scaladoc @throws links
+  ),
   homepage := Some(url("http://github.com.ldaniels528/MEANS.js")),
   addCompilerPlugin("org.scalamacros" % "paradise" % paradisePluginVersion cross CrossVersion.full),
   libraryDependencies ++= Seq(
     "be.doeraene" %%% "scalajs-jquery" % scalaJsJQueryVersion,
     "org.scala-js" %%% "scalajs-dom" % scalaJsDomVersion,
-    "org.scala-lang" % "scala-reflect" % _scalaVersion
+    "org.scala-lang" % "scala-reflect" % _scalaVersion,
+    //
+    // Testing dependencies
+    //
+    "org.mockito" % "mockito-all" % "1.9.5" % "test",
+    "org.scalatest" %% "scalatest" % "2.2.2" % "test"
   )
 )
 
 lazy val root = (project in file(".")).
   aggregate(
     core, angularjs, facebook, linkedin,
-    node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_zlib, node_zookeeper
+    node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_string_decoder, node_zlib, node_zookeeper
   )
 
 lazy val core = (project in file("core")).
@@ -119,6 +127,15 @@ lazy val node_repl = (project in file("node/repl")).
     description := "NodeJS/REPL facade for Scala.js"
   )
 
+lazy val node_string_decoder = (project in file("node/string_decoder")).
+  dependsOn(core, node_core).
+  enablePlugins(ScalaJSPlugin).
+  settings(commonSettings: _*).
+  settings(
+    name := "means-node-string-decoder",
+    description := "NodeJS/REPL facade for Scala.js"
+  )
+
 lazy val node_zlib = (project in file("node/zlib")).
   dependsOn(core, node_core).
   enablePlugins(ScalaJSPlugin).
@@ -138,8 +155,8 @@ lazy val node_zookeeper = (project in file("node/node_zookeeper")).
   )
 
 lazy val examples = (project in file("examples")).
-  aggregate(core, node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_zlib, node_zookeeper).
-  dependsOn(core, node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_zlib, node_zookeeper).
+  aggregate(core, node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_string_decoder, node_zlib, node_zookeeper).
+  dependsOn(core, node_core, node_express, node_kafka, node_mongodb, node_os, node_repl, node_string_decoder, node_zlib, node_zookeeper).
   enablePlugins(ScalaJSPlugin).
   settings(commonSettings: _*).
   settings(

core/src/main/scala/com/github/ldaniels528/meansjs/util/PromiseHelper.scala

@@ -15,14 +15,16 @@ object PromiseHelper {
   //    Monitoring Functions
   ////////////////////////////////////////////////////////////////////////
 
-  def time[T](action: String, task: => Future[T], showHeader: Boolean = true)(implicit ec: ExecutionContext): Future[T] = {
+  def time[T](action: String, task: => Future[T], showHeader: Boolean = false)(implicit ec: ExecutionContext): Future[T] = {
     if (showHeader) console.info(s"$action...")
     val startTime = System.currentTimeMillis()
     task onComplete {
       case Success(_) =>
-        console.info(s"$action took ${System.currentTimeMillis() - startTime} msecs")
+        val elapsedTime = System.currentTimeMillis - startTime
+        console.info(f"$action took $elapsedTime msecs")
       case Failure(e) =>
-        console.warn(s"$action failed after ${System.currentTimeMillis() - startTime} msecs")
+        val elapsedTime = System.currentTimeMillis - startTime
+        console.info(f"$action took $elapsedTime msecs")
     }
     task
   }

core/src/main/scala/com/github/ldaniels528/meansjs/util/ScalaJsHelper.scala

@@ -39,6 +39,18 @@ object ScalaJsHelper {
     promise.future
   }
 
+  /**
+    * Converts a JavaScript-style callback to a Scala-style future
+    * @param f the given callback function
+    * @return a Scala-style future
+    */
+  @inline
+  def callback2ToFuture[E <: js.Any, R](f: js.Function => Unit): Future[R] = {
+    val promise = Promise[R]()
+    f((err: E, result: R) => if (!isDefined(err)) promise.success(result) else promise.failure(wrapJavaScriptException(err)))
+    promise.future
+  }
+
   /**
     * Converts a JavaScript-style callback to a Scala-style future
     * @param f the given callback function

node/core/src/main/scala/com/github/ldaniels528/meansjs/nodejs/Console.scala

@@ -0,0 +1,78 @@
+package com.github.ldaniels528.meansjs.nodejs
+
+import scala.scalajs.js
+
+/**
+  * The console module provides a simple debugging console that is similar to the JavaScript console mechanism
+  * provided by web browsers.
+  *
+  * The module exports two specific components:
+  * <ul>
+  * <li>A Console class with methods such as console.log(), console.error() and console.warn() that can be used to
+  * write to any Node.js stream.</li>
+  * <li>A global console instance configured to write to stdout and stderr. Because this object is global, it can be
+  * used without calling require('console').</li>
+  * </ul>
+  * @author [email protected]
+  */
+@js.native
+trait Console extends js.Object {
+
+  /**
+    * A simple assertion test that verifies whether value is truthy. If it is not, an AssertionError is thrown.
+    * If provided, the error message is formatted using util.format() and used as the error message.
+    * @example console.assert(value[, message][, ...])
+    */
+  def assert(value: js.Any, message: String, args: js.Any*): Unit = js.native
+
+  /**
+    * A simple assertion test that verifies whether value is truthy. If it is not, an AssertionError is thrown.
+    * If provided, the error message is formatted using util.format() and used as the error message.
+    * @example console.assert(value[, message][, ...])
+    */
+  def assert(value: js.Any, args: js.Any*): Unit = js.native
+
+  /**
+    * Prints to stdout with newline. Multiple arguments can be passed, with the first used as the primary message and
+    * all additional used as substitution values similar to printf(3) (the arguments are all passed to util.format()).
+    * @param data the given data arguments
+    * @example console.log([data][, ...])
+    */
+  def log(data: js.Any, args: js.Any*): Unit = js.native
+
+  /**
+    * Prints to stderr with newline. Multiple arguments can be passed, with the first used as the primary message and
+    * all additional used as substitution values similar to printf(3) (the arguments are all passed to util.format()).
+    * @param data the given data arguments
+    * @example console.error([data][, ...])
+    */
+  def error(data: js.Any, args: js.Any*): Unit = js.native
+
+  /**
+    * The console.info() function is an alias for console.log().
+    * @example console.info([data][, ...])
+    */
+  def info(data: js.Any, args: js.Any*): Unit = js.native
+
+  /**
+    * Starts a timer that can be used to compute the duration of an operation. Timers are identified by a unique label.
+    * Use the same label when you call console.timeEnd() to stop the timer and output the elapsed time in milliseconds
+    * to stdout. Timer durations are accurate to the sub-millisecond.
+    * @example console.time(label)
+    */
+  def time(label: String): Unit = js.native
+
+  /**
+    * Stops a timer that was previously started by calling console.time() and prints the result to stdout
+    * @example console.timeEnd(label)
+    */
+  def timeEnd(label: String): Unit = js.native
+
+  /**
+    * Prints to stderr the string 'Trace :', followed by the util.format() formatted message and stack trace to the
+    * current position in the code.
+    * @example console.trace(message[, ...])
+    */
+  def trace(message: String, args: js.Any*): Unit = js.native
+
+}

node/core/src/main/scala/com/github/ldaniels528/meansjs/nodejs/StringDecoder.scala

@@ -22,6 +22,17 @@ trait Http extends NodeModule {
     */
   def globalAgent: js.Array[js.Any] = js.native
 
+  /**
+    * A list of the HTTP methods that are supported by the parser.
+    */
+  val METHODS: js.Array[String] = js.native
+
+  /**
+    * A collection of all the standard HTTP response status codes, and the short description of each.
+    * @example http.STATUS_CODES[404] === 'Not Found'.
+    */
+  val STATUS_CODES: js.Dictionary[String] = js.native
+
   /////////////////////////////////////////////////////////////////////////////////
   //      Methods
   /////////////////////////////////////////////////////////////////////////////////

node/core/src/main/scala/com/github/ldaniels528/meansjs/nodejs/http/Http.scala

@@ -1,7 +1,9 @@
 package com.github.ldaniels528.meansjs.nodejs.http
 
+import com.github.ldaniels528.meansjs.nodejs.net.Socket
 import com.github.ldaniels528.meansjs.nodejs.stream
 
+import scala.concurrent.duration.FiniteDuration
 import scala.scalajs.js
 
 /**
@@ -14,4 +16,98 @@ import scala.scalajs.js
 @js.native
 trait IncomingMessage extends stream.Readable {
 
+  /**
+    * The request/response headers object. Key-value pairs of header names and values. Header names are lower-cased.
+    * @example message.headers
+    */
+  def headers: js.Dictionary[String] = js.native
+
+  /**
+    * In case of server request, the HTTP version sent by the client. In the case of client response,
+    * the HTTP version of the connected-to server. Probably either '1.1' or '1.0'.
+    * @example message.httpVersion
+    */
+  def httpVersion: String = js.native
+
+  /**
+    * Only valid for request obtained from http.Server. The request method as a string. Read only. Example: 'GET', 'DELETE'.
+    * @example message.method
+    */
+  def method: String = js.native
+
+  /**
+    * The raw request/response headers list exactly as they were received. <b>Note</b> that the keys and values are
+    * in the same list. It is not a list of tuples. So, the even-numbered offsets are key values, and the odd-numbered
+    * offsets are the associated values. Header names are not lowercased, and duplicates are not merged.
+    * @example message.rawHeaders
+    */
+  def rawHeaders: js.Array[String] = js.native
+
+  /**
+    * The raw request/response trailer keys and values exactly as they were received. Only populated at the 'end' event.
+    * @example message.rawTrailers
+    */
+  def rawTrailers: js.Array[String] = js.native
+
+  /**
+    * Calls message.connection.setTimeout(msecs, callback).
+    * @example message.setTimeout(msecs, callback)
+    */
+  def setTimeout(msecs: Number, callback: js.Function): Unit = js.native
+
+  /**
+    * Only valid for response obtained from http.ClientRequest. The 3-digit HTTP response status code (e.g. 404).
+    * @example message.statusCode
+    */
+  def statusCode: Int = js.native
+
+  /**
+    * Only valid for response obtained from http.ClientRequest. The HTTP response status message (reason phrase)
+    * (e.g. OK or Internal Server Error).
+    * @example message.statusMessage
+    */
+  def statusMessage: String = js.native
+
+  /**
+    * The net.Socket object associated with the connection. With HTTPS support, use request.socket.getPeerCertificate()
+    * to obtain the client's authentication details.
+    * @example message.socket
+    */
+  def socket: Socket = js.native
+
+  /**
+    * The request/response trailers object. Only populated at the 'end' event.
+    * @example message.trailers
+    */
+  def trailers: js.Array[String] = js.native
+
+  /**
+    * Only valid for request obtained from http.Server. Request URL string. This contains only the URL that is
+    * present in the actual HTTP request.
+    * @example message.url
+    */
+  def url: String = js.native
+
 }
+
+/**
+  * Incoming Message Companion
+  * @author [email protected]
+  */
+object IncomingMessage {
+
+  /**
+    * Incoming Message Extensions
+    * @author [email protected]
+    */
+  implicit class IncomingMessageExtensions(val message: IncomingMessage) extends AnyVal {
+
+    @inline
+    def onClose(callback: js.Function) = message.on("close", callback)
+
+    @inline
+    def setTimeout(duration: FiniteDuration, callback: js.Function) = message.setTimeout(duration.toMillis, callback)
+
+  }
+
+}