velocious 1.0.108 → 1.0.109

package/src/http-client/response.js

@@ -1,136 +0,0 @@
-// @ts-check
-
-import Header from "./header.js"
-
-export default class Response {
-  /**
-   * @param {object} args
-   * @param {string} args.method
-   * @param {function() : void} args.onComplete
-   */
-  constructor({method = "GET", onComplete}) {
-    if (!method) throw new Error(`Invalid method given: ${method}`)
-
-    /** @type {Header[]} */
-    this.headers = []
-
-    this.method = method.toUpperCase().trim()
-    this.onComplete = onComplete
-    this.state = "status-line"
-
-    /** @type {Buffer} */
-    this.response = Buffer.alloc(0);
-  }
-
-  /** @param {Buffer} data */
-  feed(data) {
-    this.response = Buffer.concat([this.response, data])
-    this.tryToParse()
-  }
-
-  /**
-   * @param {string} name
-   * @returns {Header}
-   */
-  getHeader(name) {
-    const compareName = name.toLowerCase().trim()
-
-    for (const header of this.headers) {
-      const headerCompareName = header.getName().toLowerCase().trim()
-
-      if (compareName == headerCompareName) {
-        return header
-      }
-    }
-
-    throw new Error(`Header ${name} not found`)
-  }
-
-  json() {
-    const contentTypeHeader = this.getHeader("Content-Type")?.getValue()
-
-    if (typeof contentTypeHeader != "string") throw new Error(`Content-Type wasn't a string: ${contentTypeHeader}`)
-
-    if (!contentTypeHeader.toLowerCase().trim().startsWith("application/json")) {
-      throw new Error(`Content-Type is not JSON: ${contentTypeHeader}`)
-    }
-
-    const body = this.response.toString()
-    const json = JSON.parse(body)
-
-    return json
-  }
-
-  tryToParse() {
-    while (true) {
-      if (this.state == "body") {
-        const contentLengthValue = this.getHeader("Content-Length")?.getValue()
-
-        if (contentLengthValue === undefined) {
-          throw new Error("No content length given")
-        }
-
-        let contentLengthNumber
-
-        if (typeof contentLengthValue == "number") {
-          contentLengthNumber = contentLengthValue
-        } else if (contentLengthValue == "string") {
-          contentLengthNumber = parseInt(contentLengthValue)
-        } else {
-          throw new Error(`Content-Length is not a number: ${contentLengthValue}`)
-        }
-
-        if (this.response.byteLength >= contentLengthNumber) {
-          this.completeResponse()
-          break
-        }
-      } else {
-        const response = this.response.toString()
-        let lineEndIndex = response.indexOf("\r\n")
-        let lineEndLength = 2
-
-        if (lineEndIndex === -1) {
-          lineEndIndex = response.indexOf("\n")
-          lineEndLength = 1
-        }
-
-        if (lineEndIndex === -1) {
-          break // We need to get fed more to continue reading
-        } else {
-          const line = response.substring(0, lineEndIndex)
-
-          this.response = this.response.slice(lineEndIndex + lineEndLength)
-
-          if (this.state == "status-line") {
-            this.statusLine = line
-            this.state = "headers"
-          } else if (this.state == "headers") {
-            if (line == "") {
-              if (this.method == "GET" || this.method == "HEAD") {
-                this.completeResponse()
-                break
-              } else if (this.method == "POST") {
-                this.state = "body"
-              }
-            } else {
-              const headerMatch = line.match(/^(.+?):\s*(.+)$/)
-
-              if (!headerMatch) throw new Error(`Invalid header: ${line}`)
-
-              const header = new Header(headerMatch[1], headerMatch[2])
-
-              this.headers.push(header)
-            }
-          } else {
-            throw new Error(`Unexpected state: ${this.state}`)
-          }
-        }
-      }
-    }
-  }
-
-  completeResponse() {
-    this.state = "done"
-    this.onComplete()
-  }
-}

package/src/http-server/client/index.js

@@ -1,137 +0,0 @@
-// @ts-check
-
-import {digg} from "diggerize"
-import {EventEmitter} from "events"
-import {Logger} from "../../logger.js"
-import Request from "./request.js"
-import RequestRunner from "./request-runner.js"
-
-export default class VeoliciousHttpServerClient {
-  events = new EventEmitter()
-  state = "initial"
-
-  /**
-   * @param {object} args
-   * @param {number} args.clientCount
-   * @param {import("../../configuration.js").default} args.configuration
-   */
-  constructor({clientCount, configuration}) {
-    if (!configuration) throw new Error("No configuration given")
-
-    this.logger = new Logger(this)
-    this.clientCount = clientCount
-    this.configuration = configuration
-
-    /** @type {RequestRunner[]} */
-    this.requestRunners = []
-  }
-
-  executeCurrentRequest = () => {
-    this.logger.debug("executeCurrentRequest")
-
-    if (!this.currentRequest) throw new Error("No current request")
-
-    // We are done parsing the given request and can theoretically start parsing a new one, before the current request is done - so reset the state.
-    this.state = "initial"
-
-    const requestRunner = new RequestRunner({
-      configuration: this.configuration,
-      request: this.currentRequest
-    })
-
-    this.requestRunners.push(requestRunner)
-
-    requestRunner.events.on("done", this.requestDone)
-    requestRunner.run()
-  }
-
-  /**
-   * @param {Buffer} data
-   * @returns {void}
-   */
-  onWrite(data) {
-    if (this.state == "initial") {
-      this.currentRequest = new Request({client: this, configuration: this.configuration})
-      this.currentRequest.requestParser.events.on("done", this.executeCurrentRequest)
-      this.currentRequest.feed(data)
-      this.state = "requestStarted"
-    } else if (this.state == "requestStarted") {
-      if (!this.currentRequest) throw new Error("No current request")
-
-      this.currentRequest.feed(data)
-    } else {
-      throw new Error(`Unknown state for client: ${this.state}`)
-    }
-  }
-
-  requestDone = () => {
-    this.sendDoneRequests()
-  }
-
-  sendDoneRequests() {
-    while (true) {
-      const requestRunner = this.requestRunners[0]
-      const request = requestRunner?.getRequest()
-
-      if (requestRunner?.getState() == "done") {
-        const httpVersion = request.httpVersion()
-        const connectionHeader = request.header("connection")?.toLowerCase()?.trim()
-
-        this.requestRunners.shift()
-        this.sendResponse(requestRunner)
-        this.logger.debug(() => ["sendDoneRequests", {clientCount: this.clientCount, connectionHeader, httpVersion}])
-
-        if (httpVersion == "1.0" && connectionHeader != "keep-alive") {
-          this.logger.debug(() => [`Closing the connection because ${httpVersion} and connection header ${connectionHeader}`, {clientCount: this.clientCount}])
-          this.events.emit("close")
-        }
-      } else {
-        break
-      }
-    }
-  }
-
-  /**
-   * @param {RequestRunner} requestRunner
-   * @returns {void}
-   */
-  sendResponse(requestRunner) {
-    if (!this.currentRequest) throw new Error("No current request")
-
-    const response = digg(requestRunner, "response")
-    const request = requestRunner.getRequest()
-    const body = response.getBody()
-    const date = new Date()
-    const connectionHeader = request.header("connection")?.toLowerCase()?.trim()
-    const httpVersion = request.httpVersion()
-
-    this.logger.debug("sendResponse", {clientCount: this.clientCount, connectionHeader, httpVersion})
-
-    if (httpVersion == "1.0" && connectionHeader == "keep-alive") {
-      response.setHeader("Connection", "Keep-Alive")
-    } else {
-      response.setHeader("Connection", "Close")
-    }
-
-    const contentLength = new TextEncoder().encode(body).length
-
-    response.setHeader("Content-Length", contentLength)
-    response.setHeader("Date", date.toUTCString())
-    response.setHeader("Server", "Velocious")
-
-    let headers = ""
-
-    headers += `HTTP/${this.currentRequest.httpVersion()} ${response.getStatusCode()} ${response.getStatusMessage()}\r\n`
-
-    for (const headerKey in response.headers) {
-      for (const headerValue of response.headers[headerKey]) {
-        headers += `${headerKey}: ${headerValue}\r\n`
-      }
-    }
-
-    headers += "\r\n"
-
-    this.events.emit("output", headers)
-    this.events.emit("output", body)
-  }
-}

package/src/http-server/client/params-to-object.js

@@ -1,88 +0,0 @@
-// @ts-check
-
-export default class ParamsToObject {
-  /**
-   * @param {Record<string, string>} object
-   */
-  constructor(object) {
-    this.object = object
-  }
-
-  toObject() {
-    const result = {}
-
-    for(const key in this.object) {
-      const value = this.object[key]
-
-      this.treatInitial(key, value, result)
-    }
-
-    return result
-  }
-
-  /**
-   * @param {string} key
-   * @param {string} value
-   * @param {Record<string, any> | any[]} result
-   */
-  treatInitial(key, value, result) {
-    const firstMatch = key.match(/^(.+?)(\[([\s\S]+$))/)
-
-    if (firstMatch) {
-      const inputName = firstMatch[1]
-      const rest = firstMatch[2]
-
-      /** @type {Array<any> | Record<string, any>} */
-      let newResult
-
-      if (inputName in result) {
-        newResult = result[inputName]
-      } else if (rest == "[]") {
-        newResult = []
-        result[inputName] = newResult
-      } else {
-        newResult = {}
-        result[inputName] = newResult
-      }
-
-      this.treatSecond(value, rest, newResult)
-    } else {
-      result[key] = value
-    }
-  }
-
-  /**
-   * @param {string} value
-   * @param {string} rest
-   * @param {Record<string, any> | any[]} result
-   */
-  treatSecond(value, rest, result) {
-    const secondMatch = rest.match(/^\[(.*?)\]([\s\S]*)$/)
-
-    if (!secondMatch) throw new Error(`Could not parse rest part: ${rest}`)
-
-    const key = secondMatch[1]
-    const newRest = secondMatch[2]
-
-    /** @type {Array<any> | Record<string, any>} */
-    let newResult
-
-    if (rest == "[]") {
-      result.push(value)
-    } else if (newRest == "") {
-      result[key] = value
-    } else {
-      if (typeof result == "object" && key in result) {
-        newResult = result[key]
-      } else if (newRest == "[]") {
-        newResult = []
-        result[key] = newResult
-      } else {
-        newResult = {}
-        result[key] = newResult
-      }
-
-      this.treatSecond(value, newRest, newResult)
-    }
-  }
-}

package/src/http-server/client/request-buffer/form-data-part.js

@@ -1,53 +0,0 @@
-// @ts-check
-
-export default class FormDataPart {
-  /** @type {Record<string, import("./header.js").default>} */
-  headers = {}
-
-  /** @type {number[]} */
-  body = []
-
-  /**
-   * @param {import("./header.js").default} header
-   */
-  addHeader(header) {
-    const name = header.formattedName
-
-    this.headers[name] = header
-
-    if (name == "content-disposition") {
-      const match = header.value.match(/^form-data; name="(.+)"$/)
-
-      if (match) {
-        this.name = match[1]
-      } else {
-        console.error(`Couldn't match name from content-disposition: ${header.value}`)
-      }
-    } else if (name == "content-length") {
-      this.contentLength = parseInt(header.value)
-    }
-  }
-
-  finish() {
-    this.value = String.fromCharCode.apply(null, this.body)
-  }
-
-  getName() {
-    if (!this.name) throw new Error("Name hasn't been set")
-
-    return this.name
-  }
-
-  getValue() {
-    if (!this.value) throw new Error("Value hasn't been set")
-
-    return this.value
-  }
-
-  /**
-   * @param {string} text
-   */
-  removeFromBody(text) {
-    this.body = this.body.slice(0, this.body.length - text.length)
-  }
-}

package/src/http-server/client/request-buffer/header.js

@@ -1,18 +0,0 @@
-// @ts-check
-
-export default class Header {
-  /**
-   * @param {string} name
-   * @param {string} value
-   */
-  constructor(name, value) {
-    this.formattedName = name.toLowerCase().trim()
-    this.name = name
-    this.value = value
-  }
-
-  getName() { return this.name }
-  getFormattedName() { return this.formattedName }
-  getValue() { return this.value }
-  toString() { return `${this.getName()}: ${this.getValue()}` }
-}