Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

[http] Various updates for Node.js v14 #239

Merged
merged 1 commit into from
May 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package io.scalajs.nodejs
package http

import com.thoughtworks.enableIf

import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport
import scala.scalajs.js.|
Expand All @@ -27,12 +29,13 @@ import scala.scalajs.js.|
@js.native
@JSImport("http", "ClientRequest")
class ClientRequest extends stream.Writable {
// TODO: Remove Int when dropping Node.js v10
def aborted: Int | Boolean = js.native

@deprecated("Use request.socket", "Node.js v13.0.0")
def connection: net.Socket = js.native

@deprecated("Use request.writableEnded", "Node.js v13.0.0")
@deprecated("Use request.writableEnded", "Node.js v13.4.0, v12.16.0")
def finished: Boolean = js.native

var maxHeadersCount: Int | Null = js.native
Expand All @@ -50,6 +53,7 @@ class ClientRequest extends stream.Writable {
* to be dropped and the socket to be destroyed.
* @see [[https://nodejs.org/api/http.html#http_request_abort]]
*/
@deprecated("Use destroy()", "Node.js v14.1.0")
def abort(): Unit = js.native

/**
Expand Down Expand Up @@ -97,6 +101,9 @@ class ClientRequest extends stream.Writable {
* </ul>
*/
def setTimeout(timeout: Int, callback: js.Function = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def reusedSocket: Boolean = js.native
}

trait Information extends js.Object {
Expand Down
6 changes: 6 additions & 0 deletions app/current/src/main/scala/io/scalajs/nodejs/http/Http.scala
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ trait Http extends js.Object {
def request(url: String | URL): Unit = js.native
def request(options: RequestOptions): Unit = js.native
def request(options: RequestOptions, callback: js.Function1[ServerResponse, Any]): Unit = js.native

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
def validateHeaderName(name: String): Unit = js.native

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
def validateHeaderValue(name: String, value: js.Any): Unit = js.native
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.scalajs.nodejs.http

import com.thoughtworks.enableIf
import io.scalajs.nodejs.buffer.Buffer
import io.scalajs.nodejs.tls
import net.exoego.scalajs.types.util.Factory
Expand Down Expand Up @@ -41,4 +42,8 @@ trait RequestOptions extends js.Object {
var secureOptions: js.UndefOr[Int] = js.undefined
var secureProtocol: js.UndefOr[String] = js.undefined
var sessionIdContext: js.UndefOr[String] = js.undefined
var insecureHTTPParser: js.UndefOr[Int] = js.undefined

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
var maxHeaderSize: js.UndefOr[Int] = js.undefined
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import scala.scalajs.js.|
class Server extends net.Server {
var headersTimeout: Int = js.native
var maxHeadersCount: Int | Null = js.native
var timeout: Int = js.native
var timeout: Double = js.native
var keepAliveTimeout: Int = js.native

def setTimeout(callback: js.Function): this.type = js.native
def setTimeout(msecs: Double, callback: js.Function): this.type = js.native
def setTimeout(msecs: Double): this.type = js.native
def setTimeout(callback: js.Function): this.type = js.native
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.scalajs.nodejs.http

import com.thoughtworks.enableIf
import net.exoego.scalajs.types.util.Factory

import scala.scalajs.js
Expand All @@ -8,4 +9,8 @@ import scala.scalajs.js
trait ServerOptions extends js.Object {
var IncomingMessage: js.UndefOr[js.Function] = js.undefined
var ServerResponse: js.UndefOr[js.Function] = js.undefined
var insecureHTTPParser: js.UndefOr[Boolean] = js.undefined

@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
var maxHeaderSize: js.UndefOr[Int] = js.undefined
}