harp 0.43.0 → 0.46.0

package/README.md

@@ -69,7 +69,7 @@ Harp can be used as a library or as a command line utility.
 
 ```
  
-  Harp 〜 Static Web Server v0.40.0
+  Harp 〜 Static Web Server v0.46.0
 
   USAGE
     harp <source>                                   serves project locally
@@ -78,8 +78,9 @@ Harp can be used as a library or as a command line utility.
   OPTIONS
     -p, --port                      9000            server port to listen on
     -h, --host                      0.0.0.0         server host to answer to
-    -h, --help                                      server/compile keep whitespace
-    -v, --version                                   server/compile keep whitespace
+    -s, --silent                    false           supresses logs
+    -h, --help                                      outputs this help message
+    -v, --version                                   outputs version of harp
 
  ╭───────────────────────────────────────────────────────────────────────────────╮
  │                                                                               │

package/bin/harp

@@ -19,9 +19,9 @@ var help = function(){
   var box = (...args) => console.log(boxt(...args).split("\n").join("\n "));
 
   log()
-  log("Harp".underline.blue, "〜".grey, "Static Web Server".brightYellow, "v".grey + pkg.version.grey)
+  log("Harp".underline.blue, "〜".grey, pkg.description.brightYellow, "v".grey + pkg.version.grey)
   log()
-  // log("Process | Bundle | Generate - Just In Time".grey)
+  // log("Server | Generator | Bundler".grey)
   // log()
   log("USAGE".grey)
   log("  harp <source>                                   serves project locally")
@@ -30,10 +30,11 @@ var help = function(){
   log("OPTIONS".grey)
   log("  -p, --port                      " +"9000".blue +"            server port to listen on")
   log("  -h, --host                      " +"0.0.0.0".blue +"         server host to answer to")
+  log("  -s, --silent                    " +"false".grey +"           supresses logs")
   // log("  -c, --cache                     " +"false".blue +"           server memory cache")
   // log("  -t, --pretty                    " +"false".blue +"           server/compile keep whitespace")
-  log("  -h, --help                                      server/compile keep whitespace")
-  log("  -v, --version                                   server/compile keep whitespace")
+  log("  -h, --help                                      outputs this help message")
+  log("  -v, --version                                   outputs version of harp")
   box(
 `${'PROCESSING'.grey }                          ${'DATA'.grey }                                   
   ${'.ejs  ->  .html' }                     ${'_data.json  -  directory data' }     
@@ -73,21 +74,40 @@ if ((argv["_"].length === 0) || argv.help || argv.h) return help()
 var harp = require("../")
 
 
+var duration = function(d){
+  if (d[0] < 1){
+    var ms = d[1].toString().substring(0,3)
+    return  + ms + "ms"
+  } else {
+    var ms = d[1].toString().substring(0,1)
+    return [d[0], ms].join(".") + "s"
+  }
+}
+
 /**
  * Server
  */
 
 if (argv["_"].length === 1){
+  const serverStart = process.hrtime()
+  
+  argv.log        = !(argv.silent || argv.s)
   var projectPath = path.resolve(process.cwd(), argv["_"][0])
   var host        = argv.host || '0.0.0.0'
   var port        = argv.port || 9000
+  
   var server      = harp.server(projectPath, argv)
 
   server.listen(port, host, function(error){
     if (error) process.exit(1)
+
+    var serverReady = process.hrtime(serverStart)
+
     box(
     `${ 'Harp'.blue } ${ ('v' + pkg.version).grey}                                        
-${ ('http://localhost:' + port + "/").underline.cyan }`, { align: "left", color: "grey", padding: 3 })
+${ ('http://localhost:' + port + "/").underline.cyan }
+${ duration(serverReady).grey }`, { align: "left", color: "grey", padding: 3 })
+
   })
 }
 
@@ -97,15 +117,26 @@ ${ ('http://localhost:' + port + "/").underline.cyan }`, { align: "left", color:
  */
 
 if (argv["_"].length === 2){
+  argv.log        = !(argv.silent || argv.s)
+
   var projectPath = path.resolve(process.cwd(), argv["_"][0])
   var buildPath   = path.resolve(process.cwd(), argv["_"][1])
 
-  harp.compile(projectPath, buildPath, function(errors, output){
+  console.log()
+  console.log(" ", `Harp v${ pkg.version }`.yellow)
+  console.log(" ", "Generating Site & Bundling Assets...".blue)
+  if (argv.log) console.log()
+
+  harp.compile(projectPath, buildPath, argv, function(errors, output){
     if(errors) {
       console.log(JSON.stringify(errors, null, 2))
       process.exit(1)
     }
-    //console.log("Done!".green)
+    
+    if (argv.log) console.log()
+    console.log(" ", "Done!".green, `(${ duration(output.stats.duration) })`.grey)
+    console.log()
   })
+
 }
 

package/lib/index.js

@@ -8,6 +8,7 @@ var helpers     = require('./helpers')
 var middleware  = require('./middleware')
 var pkg         = require('../package.json')
 var url         = require("url")
+var hrn         = require("human-readable-numbers")
 
 
 
@@ -19,7 +20,14 @@ var url         = require("url")
  */
 
 exports.server = function(dirPath, options){
+  options = options || {}
+
   var app = connect()
+  
+  if (options.log || options.l){
+    app.use(middleware.setupLog)
+  }
+
   app.use(middleware.regProjectFinder(dirPath))
   app.use(middleware.setup)
   app.use(middleware.basicAuth)
@@ -153,7 +161,17 @@ exports.middleware = middleware;
  *
  */
 
-exports.compile = function(projectPath, outputPath, callback){
+exports.compile = function(projectPath, outputPath, options, callback){
+  if (!callback){
+    callback = options
+    options  = { log: false }
+  }
+
+  const compileStart = process.hrtime()
+
+  var stats = {
+    types: {}
+  }
 
   /**
    * Both projectPath and outputPath are optional
@@ -176,7 +194,7 @@ exports.compile = function(projectPath, outputPath, callback){
   try{
     outputPath = path.resolve(projectPath, outputPath)
     var setup  = helpers.setup(projectPath, "production")
-    var terra   = terraform.root(setup.publicPath, setup.config.globals)
+    var terra  = terraform.root(setup.publicPath, setup.config.globals)
   }catch(err){
     return callback(err)
   }
@@ -196,6 +214,13 @@ exports.compile = function(projectPath, outputPath, callback){
     })
   }
 
+  var toHuman = function(bytes){
+    var human   = hrn.toHumanString(bytes)
+    var pattern = /\d+\D$/
+    if (pattern.test(human)) return human
+    return human + "B"
+  }
+
 
   /**
    * Compile and save file
@@ -204,40 +229,19 @@ exports.compile = function(projectPath, outputPath, callback){
   var compileFile = function(file, done){
     process.nextTick(function () {
       terra.render(file, function(error, body){
-        if(error){
-          done(error)
-        }else{
-          if(body){
-            var dest = path.resolve(outputPath, terraform.helpers.outputPath(file))
-            fs.mkdirp(path.dirname(dest), function(err){
-              fs.writeFile(dest, body, done)
-            })
-          }else{
-            if (file === "app.jsx"){
-              var results = esbuild.buildSync({
-                absWorkingDir: setup.publicPath,
-                entryPoints: [setup.publicPath + '/app.jsx'],
-                outfile: 'app.js',
-                bundle: true,
-                write: false,
-                plugins: [],
-              })
-              fs.writeFile([outputPath, "app.js"].join(path.sep), results.outputFiles[0]["text"], done)
-            }else if (file === "bundle.cjs"){
-              var results = esbuild.buildSync({
-                absWorkingDir: setup.publicPath,
-                entryPoints: [setup.publicPath + '/bundle.cjs'],
-                outfile: 'bundle.js',
-                bundle: true,
-                write: false,
-                plugins: [],
-              })
-              fs.writeFile([outputPath, "bundle.js"].join(path.sep), results.outputFiles[0]["text"], done)
-            } else {
-              done()  
-            }
+        if(error) return done(error)
+        if(!body) return done()
+        var dest = path.resolve(outputPath, terraform.helpers.outputPath(file))
+        fs.mkdirp(path.dirname(dest), function(err){
+          var sizeInBytes = body.length
+          var sizeHuman   = toHuman(sizeInBytes)
+          var sizePadded  = sizeHuman.padStart(8, " ")
+          var filePath    = `/${ terraform.helpers.outputPath(file) }`
+          if (options.log){
+            console.log(sizePadded.green, filePath)
           }
-        }
+          fs.writeFile(dest, body, done)
+        })
       })
     })
   }
@@ -253,7 +257,16 @@ exports.compile = function(projectPath, outputPath, callback){
     if(!terraform.helpers.shouldIgnore(file) && [".jsx", ".jade", ".ejs", ".md", ".styl", ".less", ".scss", ".sass", ".coffee", ".cjs"].indexOf(ext) === -1){
       var localPath = path.resolve(outputPath, file)
       fs.mkdirp(path.dirname(localPath), function(err){
-        fs.copy(path.resolve(setup.publicPath, file), localPath, done)
+        fs.stat(path.resolve(setup.publicPath, file), function(err, stats){
+          var sizeInBytes = stats.size
+          var sizeHuman   = toHuman(sizeInBytes)
+          var sizePadded  = sizeHuman.padStart(8, " ")
+          var filePath    = `/${ file }`
+          if (options.log){
+            console.log(sizePadded.grey, filePath)    
+          }
+          fs.copy(path.resolve(setup.publicPath, file), localPath, done)
+        })
       })
     }else{
       done()
@@ -273,9 +286,12 @@ exports.compile = function(projectPath, outputPath, callback){
           callback(err)
         }else{
           async.each(results, copyFile, function(err){
+            stats.duration = process.hrtime(compileStart)
+
             setup.config['harp_version'] = pkg.version
             delete setup.config.globals
-            callback(null, setup.config)
+            setup.stats = stats
+            callback(null, setup)
           })
         }
       })

package/lib/middleware.js

@@ -11,6 +11,41 @@ var utilsPause      = require('pause')
 var parse           = require('parseurl')
 var url             = require('url')
 var auth            = require('basic-auth')
+var hrn             = require("human-readable-numbers")
+var onFinished      = require("on-finished")
+
+var toHuman = function(bytes){
+  var human   = hrn.toHumanString(bytes)
+  var pattern = /\d+\D$/
+  if (pattern.test(human)) return human
+  return human + "B"
+}
+
+var measureBody = function(contentLength){
+  if (!contentLength) return ""
+  return `(${ toHuman(contentLength) })`
+}
+
+exports.setupLog = function(req, rsp, next){
+  onFinished(rsp, function (err, rsp) {
+    var contentLength = null
+    try{
+      contentLength = parseInt(rsp._header.split("\n").find(h => h.includes("Content-Length")).split(" ")[1].split("\r")[0])
+    }catch(e){}
+    console.log(new Date(), rsp.req.method.green, rsp.statusCode, rsp.req.url, measureBody(contentLength).grey)
+  })
+
+  // var start = process.hrtime()
+  // var _end = rsp.end
+  
+  // rsp.end = function(body){
+  //   var stop = process.hrtime(start)
+  //   console.log(new Date(), this.req.method.green, this.statusCode, this.req.url, measureBody(body).grey)
+  //   return _end.call(this, body)
+  // }
+
+  return next()
+}
 
 exports.notMultihostURL = function(req, rsp, next){
   var host      = req.headers.host
@@ -447,7 +482,6 @@ exports.static = function(req, res, next) {
   }
 
   function directory() {
-
     if (!redirect) return resume();
     var pathname = url.parse(req.originalUrl).pathname;
     res.statusCode = 301;
@@ -572,7 +606,6 @@ var poly = exports.poly = function(req, rsp, next){
 
 exports.denySymlink = function(options){
   options = options || {}
-
   return function(req, rsp, next){
     if (!options.hasOwnProperty("deny-symlinks")) return next()
     if (options["deny-symlinks"] === false) return next()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harp",
-  "version": "0.43.0",
-  "description": "Static web server with built in preprocessing",
+  "version": "0.46.0",
+  "description": "Static Web Server/Generator/Bundler",
   "author": "Brock Whitten <brock@chloi.io>",
   "contributors": [
     "Brock Whitten <brock@chloi.io>",
@@ -50,12 +50,14 @@
     "connect": "3.7.0",
     "envy-json": "0.2.1",
     "fs-extra": "10.1.0",
+    "human-readable-numbers": "0.9.5",
     "mime-types": "2.1.35",
     "minimist": "1.2.6",
+    "on-finished": "^2.4.1",
     "parseurl": "1.3.3",
     "pause": "0.1.0",
     "send": "0.18.0",
-    "terraform": "1.22.0"
+    "terraform": "1.22.1"
   },
   "devDependencies": {
     "axios": "0.27.2",