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

Commit 2f95d70

Browse files
authored
Merge pull request #239 from exoego/http
[http] Various updates for Node.js v14
2 parents 84b2992 + 4afbc49 commit 2f95d70

File tree

5 files changed

+28
-3
lines changed

5 files changed

+28
-3
lines changed

app/current/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.scalajs.nodejs
22
package http
33

4+
import com.thoughtworks.enableIf
5+
46
import scala.scalajs.js
57
import scala.scalajs.js.annotation.JSImport
68
import scala.scalajs.js.|
@@ -27,12 +29,13 @@ import scala.scalajs.js.|
2729
@js.native
2830
@JSImport("http", "ClientRequest")
2931
class ClientRequest extends stream.Writable {
32+
// TODO: Remove Int when dropping Node.js v10
3033
def aborted: Int | Boolean = js.native
3134

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

35-
@deprecated("Use request.writableEnded", "Node.js v13.0.0")
38+
@deprecated("Use request.writableEnded", "Node.js v13.4.0, v12.16.0")
3639
def finished: Boolean = js.native
3740

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

5559
/**
@@ -97,6 +101,9 @@ class ClientRequest extends stream.Writable {
97101
* </ul>
98102
*/
99103
def setTimeout(timeout: Int, callback: js.Function = js.native): Unit = js.native
104+
105+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
106+
def reusedSocket: Boolean = js.native
100107
}
101108

102109
trait Information extends js.Object {

app/current/src/main/scala/io/scalajs/nodejs/http/Http.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ trait Http extends js.Object {
6666
def request(url: String | URL): Unit = js.native
6767
def request(options: RequestOptions): Unit = js.native
6868
def request(options: RequestOptions, callback: js.Function1[ServerResponse, Any]): Unit = js.native
69+
70+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
71+
def validateHeaderName(name: String): Unit = js.native
72+
73+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
74+
def validateHeaderValue(name: String, value: js.Any): Unit = js.native
6975
}
7076

7177
/**

app/current/src/main/scala/io/scalajs/nodejs/http/RequestOptions.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.scalajs.nodejs.http
22

3+
import com.thoughtworks.enableIf
34
import io.scalajs.nodejs.buffer.Buffer
45
import io.scalajs.nodejs.tls
56
import net.exoego.scalajs.types.util.Factory
@@ -41,4 +42,8 @@ trait RequestOptions extends js.Object {
4142
var secureOptions: js.UndefOr[Int] = js.undefined
4243
var secureProtocol: js.UndefOr[String] = js.undefined
4344
var sessionIdContext: js.UndefOr[String] = js.undefined
45+
var insecureHTTPParser: js.UndefOr[Int] = js.undefined
46+
47+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
48+
var maxHeaderSize: js.UndefOr[Int] = js.undefined
4449
}

app/current/src/main/scala/io/scalajs/nodejs/http/Server.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import scala.scalajs.js.|
1313
class Server extends net.Server {
1414
var headersTimeout: Int = js.native
1515
var maxHeadersCount: Int | Null = js.native
16-
var timeout: Int = js.native
16+
var timeout: Double = js.native
1717
var keepAliveTimeout: Int = js.native
1818

19-
def setTimeout(callback: js.Function): this.type = js.native
19+
def setTimeout(msecs: Double, callback: js.Function): this.type = js.native
20+
def setTimeout(msecs: Double): this.type = js.native
21+
def setTimeout(callback: js.Function): this.type = js.native
2022
}

app/current/src/main/scala/io/scalajs/nodejs/http/ServerOptions.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.scalajs.nodejs.http
22

3+
import com.thoughtworks.enableIf
34
import net.exoego.scalajs.types.util.Factory
45

56
import scala.scalajs.js
@@ -8,4 +9,8 @@ import scala.scalajs.js
89
trait ServerOptions extends js.Object {
910
var IncomingMessage: js.UndefOr[js.Function] = js.undefined
1011
var ServerResponse: js.UndefOr[js.Function] = js.undefined
12+
var insecureHTTPParser: js.UndefOr[Boolean] = js.undefined
13+
14+
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14)
15+
var maxHeaderSize: js.UndefOr[Int] = js.undefined
1116
}

0 commit comments

Comments
 (0)