@mattduffy/banner 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mattduffy/banner",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Displays server start-up information.",
   "author": "Matthew Duffy",
   "license": "ISC",

package/src/index.js

@@ -20,7 +20,10 @@ export class Banner {
   #appName
   #arch
   #bannerText
-  #borderGlyph = '#'
+  #borderGlyphGET = '#'
+  #borderGlyphPUT = '&'
+  #borderGlyphPOST = '@'
+  #borderGlyphDELETE = '*'
   #lineStarts = []
   #lines = []
   #local
@@ -56,7 +59,7 @@ export class Banner {
 
     if (strings) {
       this.#appName = strings.name
-      this.#borderGlyph = strings?.borderGlyph ?? this.#borderGlyph
+      this.#borderGlyphGET = strings?.borderGlyph ?? this.#borderGlyphGET
       this.#localPort = strings?.localPort ?? null
       this.#local = `${strings.local}${(this.#localPort) ? ':' + this.#localPort : ''}`
       this.#public = strings.public
@@ -116,7 +119,7 @@ export class Banner {
       + this.archLine.length, ' ')
     this.#lines[4] = this.archLine
 
-    const g = this.#borderGlyph
+    const g = this.#borderGlyphGET
     this.#bannerText =
       `${g}${g.padEnd(this.longestLine + 5, g)}${g}\n`
       + `${g}  ${' '.padEnd(this.longestLine + 2, ' ')} ${g}\n`
@@ -203,7 +206,7 @@ export class Banner {
    * @param { string } glyph - The border glyph character of the banner.
    */
   set borderGlyph(glyph) {
-    this.#borderGlyph = glyph
+    this.#borderGlyphGET = glyph
     if (this.#appName && this.#local && this.#public) {
       this.#compose()
     }
@@ -256,29 +259,57 @@ export class Banner {
     const _log = log ?? console.log
     const _error = error ?? console.error
     _log('adding request banner to the app.')
-    const g = this.#borderGlyph
+    const gGET = this.#borderGlyphGET
+    const gPUT = this.#borderGlyphPUT
+    const gPOST = this.#borderGlyphPOST
+    const gDEL = this.#borderGlyphDELETE
     const n = this.#appName
     return async function banner(ctx, next){
       try {
-        const _g = (/post/i.test(ctx.request.method)) ? '@' : g
+        // const _g = (/post/i.test(ctx.request.method)) ? '@' : g
+        let _g
+        switch(ctx.request.method.toLowerCase()) {
+          case 'get':
+            _g = gGET
+            break
+          case 'post':
+            _g = gPOST
+            break
+          case 'put':
+            _g = gPUT
+            break
+          case 'delete':
+            _g = gDEL
+            break
+          default:
+            _g = gGET
+        }
+        _log('ctx.request.header.host', ctx.request.header.host)
         const _urlLabel = `${ctx.request.method}:` 
-        const _url = `${ctx.request.header.host}${ctx.request.url}`
-        const _urlLine = `${_urlLabel} ${_url}`
+        const _url = `${ctx.request.protocol}://${ctx.request.header.host}${ctx.request.url}`
+        let _urlLine = `${_urlLabel} ${_url}`
         const _refLabel = 'Referer:'
         const _ref = ctx.request.header.referer ?? '<emtpy header field>'
-        const _refLine = `${_refLabel} ${_ref}`
+        let _refLine = `${_refLabel} ${_ref}`
         const _longestLabel = [_urlLabel, _refLabel].reduce((a, c) => {
-          if (a > (c.indexOf(':') + 1)) {
+          if (a.length > (c.indexOf(':') + 1)) {
             return a
           }
-          return (c.indexOf(':' + 1))
+          return (c.indexOf(':') + 1)
         }, '')
+        _refLine = _refLine.padStart(
+          (_longestLabel - _refLine.indexOf(':')) + _refLine.length, ' '
+        )
+        _urlLine = _urlLine.padStart(
+          (_longestLabel - _urlLine.indexOf(':')) + _urlLine.length, ' '
+        )
         const _longestLine = [_urlLine, _refLine].reduce((a, c) => {
           if (a > c.length) return a
           return c.length
         }, '')
         // _log('request banner _longestLine', _longestLine)
-        const _requestBanner = `${_g.padEnd(_longestLine + 5, _g)}\n`
+        const _requestBanner = 
+          `${_g.padEnd(_longestLine + 5, _g)}\n`
           + `${_g} ${_urlLine}\n`
           + `${_g} ${_refLine}\n`
           + `${_g.padEnd(_longestLine + 5, _g)}`

package/test/test.js

@@ -14,16 +14,19 @@ let cfg
 let ctx
 let ctx_POST
 let ctx_GET
+let ctx_PUT
+let ctx_DEL
 let next
 console.log(skip)
 describe('First test suite for banner package', async () => {
   before(() => {
     ctx = {
       request: {
+        protocol: 'https',
         method: '',
         url: '/a/really/long/url/to/a/special/page',
         header: {
-          host: 'https://banner.test',
+          host: 'banner.test',
           referer: 'https://googoogle.com',
         },
       },
@@ -31,6 +34,8 @@ describe('First test suite for banner package', async () => {
         throw new Error(`Error code ${code}: ${msg}`)
       }
     }
+    ctx_DEL = { ...ctx }
+    ctx_PUT = { ...ctx }
     ctx_POST = { ...ctx }
     ctx_GET = { ...ctx }
     next = async () => {
@@ -62,13 +67,15 @@ describe('First test suite for banner package', async () => {
     assert(!banner.print())
   })
 
-  it('Should work as a koajs middleware function.', async () => {
+  it('Should work as a koajs middleware function - POST method.', async () => {
     ctx_POST = Object.assign(ctx_POST, ctx)
     ctx_POST.request.method = 'POST'
     console.log(ctx_POST)
     const post = new Banner(ctx_POST)
     assert(await post.use()(ctx, next))
+  })
 
+  it('Should work as a koajs middleware function - GET method.', async () => {
     ctx_GET = Object.assign(ctx_GET, ctx)
     ctx_GET.request.method = 'GET'
     console.log(ctx_GET)
@@ -76,7 +83,23 @@ describe('First test suite for banner package', async () => {
     assert(await get.use()(ctx, next))
   })
 
-  it('Should fail as a koajs middleware function, missing input parameters.', async () => {
+  it('Should work as a koajs middleware function - PUT method.', async () => {
+    ctx_PUT = Object.assign(ctx_PUT, ctx)
+    ctx_PUT.request.method = 'PUT'
+    console.log(ctx_PUT)
+    const put = new Banner(ctx_PUT)
+    assert(await put.use()(ctx, next))
+  })
+
+  it('Should work as a koajs middleware function - DELETE method.', async () => {
+    ctx_DEL = Object.assign(ctx_DEL, ctx)
+    ctx_DEL.request.method = 'DELETE'
+    console.log(ctx_DEL)
+    const del = new Banner(ctx_DEL)
+    assert(await del.use()(ctx, next))
+  })
+
+it('Should fail as a koajs middleware function, missing input parameters.', async () => {
     ctx.url= ''
     ctx.request.header.host = undefined 
     ctx.request.url = undefined