fix: Remove dicer dependency to libs/utils.js (#105)

* fix: Remove dicer dependecny to libs/utils.js

* fix

* more changes

Co-authored-by: Lahiru Maramba <[email protected]>

Author: Uzlopak

deps/dicer/lib/Dicer.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const WritableStream = require('stream').Writable
 const inherits = require('util').inherits
 

deps/dicer/lib/HeaderParser.js

@@ -1,6 +1,8 @@
+'use strict'
+
 const EventEmitter = require('events').EventEmitter
 const inherits = require('util').inherits
-const getLimit = require('../../../lib/utils').getLimit
+const getLimit = require('../../../lib/utils/getLimit')
 
 const StreamSearch = require('../../streamsearch/sbmh')
 

deps/dicer/lib/PartStream.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const inherits = require('util').inherits
 const ReadableStream = require('stream').Readable
 

deps/streamsearch/sbmh.js

@@ -1,3 +1,5 @@
+'use strict'
+
 /**
  * Copyright Brian White. All rights reserved.
  *

lib/main.js

@@ -1,10 +1,12 @@
+'use strict'
+
 const WritableStream = require('stream').Writable
 const { inherits } = require('util')
 const Dicer = require('../deps/dicer/lib/Dicer')
 
 const MultipartParser = require('./types/multipart')
 const UrlencodedParser = require('./types/urlencoded')
-const parseParams = require('./utils').parseParams
+const parseParams = require('./utils/parseParams')
 
 function Busboy (opts) {
   if (!(this instanceof Busboy)) { return new Busboy(opts) }

lib/types/multipart.js

@@ -1,3 +1,5 @@
+'use strict'
+
 // TODO:
 //  * support 1 nested multipart level
 //    (see second multipart example here:
@@ -10,10 +12,10 @@ const inherits = require('util').inherits
 
 const Dicer = require('../../deps/dicer/lib/Dicer')
 
-const parseParams = require('../utils').parseParams
-const decodeText = require('../utils').decodeText
-const basename = require('../utils').basename
-const getLimit = require('../utils').getLimit
+const parseParams = require('../utils/parseParams')
+const decodeText = require('../utils/decodeText')
+const basename = require('../utils/basename')
+const getLimit = require('../utils/getLimit')
 
 const RE_BOUNDARY = /^boundary$/i
 const RE_FIELD = /^form-data$/i

lib/types/urlencoded.js

@@ -1,6 +1,8 @@
-const Decoder = require('../utils').Decoder
-const decodeText = require('../utils').decodeText
-const getLimit = require('../utils').getLimit
+'use strict'
+
+const Decoder = require('../utils/Decoder')
+const decodeText = require('../utils/decodeText')
+const getLimit = require('../utils/getLimit')
 
 const RE_CHARSET = /^charset$/i
 

lib/utils.js

@@ -0,0 +1,54 @@
+'use strict'
+
+const RE_PLUS = /\+/g
+
+const HEX = [
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+  0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+]
+
+function Decoder () {
+  this.buffer = undefined
+}
+Decoder.prototype.write = function (str) {
+  // Replace '+' with ' ' before decoding
+  str = str.replace(RE_PLUS, ' ')
+  let res = ''
+  let i = 0; let p = 0; const len = str.length
+  for (; i < len; ++i) {
+    if (this.buffer !== undefined) {
+      if (!HEX[str.charCodeAt(i)]) {
+        res += '%' + this.buffer
+        this.buffer = undefined
+        --i // retry character
+      } else {
+        this.buffer += str[i]
+        ++p
+        if (this.buffer.length === 2) {
+          res += String.fromCharCode(parseInt(this.buffer, 16))
+          this.buffer = undefined
+        }
+      }
+    } else if (str[i] === '%') {
+      if (i > p) {
+        res += str.substring(p, i)
+        p = i
+      }
+      this.buffer = ''
+      ++p
+    }
+  }
+  if (p < len && this.buffer === undefined) { res += str.substring(p) }
+  return res
+}
+Decoder.prototype.reset = function () {
+  this.buffer = undefined
+}
+
+module.exports = Decoder

lib/utils/Decoder.js

@@ -0,0 +1,14 @@
+'use strict'
+
+module.exports = function basename (path) {
+  if (typeof path !== 'string') { return '' }
+  for (var i = path.length - 1; i >= 0; --i) { // eslint-disable-line no-var
+    switch (path.charCodeAt(i)) {
+      case 0x2F: // '/'
+      case 0x5C: // '\'
+        path = path.slice(i + 1)
+        return (path === '..' || path === '.' ? '' : path)
+    }
+  }
+  return (path === '..' || path === '.' ? '' : path)
+}