Repository navigation
Expand file tree
/
Copy pathcask.patch
More file actions
275 lines (258 loc) · 11.9 KB
/
Copy pathcask.patch
File metadata and controls
275 lines (258 loc) · 11.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
diff --git a/cask/src/cask/decorators/compress.scala b/cask/src/cask/decorators/compress.scala
index cd384c1..e73af28 100644
--- a/cask/src/cask/decorators/compress.scala
+++ b/cask/src/cask/decorators/compress.scala
@@ -7,7 +7,7 @@ import cask.model.{Request, Response}
import collection.JavaConverters._
class compress extends cask.RawDecorator{
def wrapFunction(ctx: Request, delegate: Delegate) = {
- val acceptEncodings = Option(ctx.exchange.getRequestHeaders.get("Accept-Encoding"))
+ val acceptEncodings = Option(ctx.exchange.getRequestHeaders().get("Accept-Encoding"))
.toSeq
.flatMap(_.asScala)
.flatMap(_.split(", "))
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 72f8277..97accf8 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -52,7 +52,7 @@ abstract class postJsonBase(val path: String, override val subpath: Boolean = fa
def wrapFunction(ctx: Request, delegate: Delegate): Result[Response.Raw] = {
val obj = for{
json <-
- try Right(ujson.read(if (cacheBody) ctx.bytes else ctx.exchange.getInputStream))
+ try Right(ujson.read(if (cacheBody) ctx.bytes else ctx.exchange.getInputStream()))
catch{case e: Throwable => Left(cask.model.Response(
"Input text is invalid JSON: " + e + "\n" + Util.stackTraceString(e),
statusCode = 400
diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala
index c6a61f2..448302d 100644
--- a/cask/src/cask/endpoints/WebEndpoints.scala
+++ b/cask/src/cask/endpoints/WebEndpoints.scala
@@ -18,7 +18,7 @@ trait WebEndpoint extends HttpEndpoint[Response.Raw, Seq[String]]{
object WebEndpoint{
def buildMapFromQueryParams(ctx: Request) = {
val b = Map.newBuilder[String, Seq[String]]
- val queryParams = ctx.exchange.getQueryParameters
+ val queryParams = ctx.exchange.getQueryParameters()
for(k <- queryParams.keySet().iterator().asScala){
val deque = queryParams.get(k)
val arr = new Array[String](deque.size)
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index a5032de..35ec18a 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -42,31 +42,31 @@ extends WebsocketResult with WebSocketConnectionCallback {
// as different events here; the former goes to AbstractReceiveListener#onClose,
// while the latter to ChannelListener#handleEvent. Make sure we handle both cases.
channel.addCloseTask(channel => actor.send(Ws.ChannelClosed()))
- channel.getReceiveSetter.set(
+ channel.getReceiveSetter().set(
new AbstractReceiveListener() {
override def onFullTextMessage(channel: WebSocketChannel, message: BufferedTextMessage) = {
- actor.send(Ws.Text(message.getData))
+ actor.send(Ws.Text(message.getData()))
}
override def onFullBinaryMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Binary(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onFullPingMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Ping(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onFullPongMessage(channel: WebSocketChannel, message: BufferedBinaryMessage): Unit = {
actor.send(Ws.Pong(
- WebSockets.mergeBuffers(message.getData.getResource:_*).array()
+ WebSockets.mergeBuffers(message.getData().getResource():_*).array()
))
}
override def onCloseMessage(cm: CloseMessage, channel: WebSocketChannel) = {
- actor.send(Ws.Close(cm.getCode, cm.getReason))
+ actor.send(Ws.Close(cm.getCode(), cm.getReason()))
}
}
)
diff --git a/cask/src/cask/internal/Util.scala b/cask/src/cask/internal/Util.scala
index 7f47063..8f633da 100644
--- a/cask/src/cask/internal/Util.scala
+++ b/cask/src/cask/internal/Util.scala
@@ -14,7 +14,8 @@ import scala.util.Try
import scala.util.control.NonFatal
object Util {
- private val lookup = MethodHandles.lookup()
+ // lazy: java.lang.invoke is not available on Scala Native, and only the virtual thread helpers use it
+ private lazy val lookup = MethodHandles.lookup()
import cask.util.Logger.Console.globalLogger
diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
index c1ade66..a14b40d 100644
--- a/cask/src/cask/main/Main.scala
+++ b/cask/src/cask/main/Main.scala
@@ -56,20 +56,15 @@ abstract class Main{
* where virtual threads are supported, then a virtual thread executor will be used.
* */
protected def handlerExecutor(): Option[ExecutorService] = {
- for {
- config <- Option(System.getProperty(Main.VIRTUAL_THREAD_ENABLED))
- if config.toBoolean
- executor <- Util.createDefaultCaskVirtualThreadExecutor
- } yield executor
+ // Virtual threads (java.lang.invoke) are not available on Scala Native
+ None
}
def defaultHandler: HttpHandler = {
val mainHandler = new Main.DefaultHandler(
dispatchTrie, mainDecorators, debugMode, handleNotFound, handleMethodNotAllowed, handleEndpointError)
- cachedHandlerExecutor match {
- case None => new BlockingHandler(mainHandler)
- case Some(executor) => new ThreadBlockingHandler(executor, mainHandler)
- }
+ // ThreadBlockingHandler needs HttpServerExchange.dispatch(Executor, HttpHandler), which snunit-undertow does not implement
+ new BlockingHandler(mainHandler)
}
def handleNotFound(req: Request): Response.Raw = Main.defaultHandleNotFound(req)
@@ -85,16 +80,15 @@ abstract class Main{
def main(args: Array[String]): Unit = {
if (!verbose) Main.silenceJboss()
- val server = Undertow.builder
+ val server = Undertow.builder()
.addHttpListener(port, host)
.setHandler(defaultHandler)
- .build
+ .build()
server.start()
//register an on exit hook to stop the server
Runtime.getRuntime.addShutdownHook(new Thread(() => {
server.stop()
cachedHandlerExecutor.foreach(_.shutdown())
- executionContext.shutdown()
}))
}
@@ -115,7 +109,7 @@ object Main {
(implicit log: Logger) extends HttpHandler() {
def handleRequest(exchange: HttpServerExchange): Unit = try {
// println("Handling Request: " + exchange.getRequestPath)
- val (effectiveMethod, runner) = if ("websocket".equalsIgnoreCase(exchange.getRequestHeaders.getFirst("Upgrade"))) {
+ val (effectiveMethod, runner) = if ("websocket".equalsIgnoreCase(exchange.getRequestHeaders().getFirst("Upgrade"))) {
Tuple2(
"websocket",
(r: Any) =>
@@ -129,12 +123,12 @@ object Main {
}
)
} else Tuple2(
- exchange.getRequestMethod.toString.toLowerCase(),
+ exchange.getRequestMethod().toString.toLowerCase(),
(r: Any) => Main.writeResponse(exchange, r.asInstanceOf[Response.Raw])
)
val decodedSegments = Util
- .splitPath(exchange.getRequestURI)
+ .splitPath(exchange.getRequestURI())
.iterator
.map(java.net.URLDecoder.decode(_, "UTF-8"))
.toList
@@ -210,24 +204,24 @@ object Main {
def writeResponse(exchange: HttpServerExchange, response: Response.Raw) = {
response.data.headers.foreach { case (k, v) =>
- exchange.getResponseHeaders.put(new HttpString(k), v)
+ exchange.getResponseHeaders().put(new HttpString(k), v)
}
response.headers.foreach { case (k, v) =>
- exchange.getResponseHeaders.put(new HttpString(k), v)
+ exchange.getResponseHeaders().put(new HttpString(k), v)
}
response.cookies.foreach(c => exchange.setResponseCookie(Cookie.toUndertow(c)))
exchange.setStatusCode(response.statusCode)
- val output = exchange.getOutputStream
+ val output = exchange.getOutputStream()
response.data.write(new java.io.OutputStream {
def write(b: Int): Unit = output.write(b)
override def write(b: Array[Byte]): Unit = output.write(b)
override def write(b: Array[Byte], off: Int, len: Int): Unit = output.write(b, off, len)
override def close() = {
- if (!exchange.isComplete) output.close()
+ if (!exchange.isComplete()) output.close()
}
override def flush() = {
- if (!exchange.isComplete) output.flush()
+ if (!exchange.isComplete()) output.flush()
}
})
}
diff --git a/cask/src/cask/model/Params.scala b/cask/src/cask/model/Params.scala
index 6f3fba6..3b04feb 100644
--- a/cask/src/cask/model/Params.scala
+++ b/cask/src/cask/model/Params.scala
@@ -15,9 +15,9 @@ case class Request(exchange: HttpServerExchange, remainingPathSegments: Seq[Stri
extends geny.ByteData with geny.Readable {
import collection.JavaConverters._
lazy val cookies: Map[String, Cookie] = {
- exchange.getRequestCookies.asScala.mapValues(Cookie.fromUndertow).toMap
+ exchange.getRequestCookies().asScala.mapValues(Cookie.fromUndertow).toMap
}
- lazy val data: InputStream = exchange.getInputStream
+ lazy val data: InputStream = exchange.getInputStream()
/**
* Read all the bytes of the incoming request *with* caching
@@ -33,11 +33,11 @@ extends geny.ByteData with geny.Readable {
baos.toByteArray
}
lazy val queryParams: Map[String, collection.Seq[String]] = {
- exchange.getQueryParameters.asScala.mapValues(_.asScala.toArray.toSeq).toMap
+ exchange.getQueryParameters().asScala.mapValues(_.asScala.toArray.toSeq).toMap
}
lazy val headers: Map[String, collection.Seq[String]] = {
- exchange.getRequestHeaders.asScala
- .map{ header => header.getHeaderName.toString.toLowerCase -> header.asScala }
+ exchange.getRequestHeaders().asScala
+ .map{ header => header.getHeaderName().toString.toLowerCase -> header.asScala }
.toMap
}
@@ -47,18 +47,18 @@ object Cookie{
def fromUndertow(from: io.undertow.server.handlers.Cookie): Cookie = {
Cookie(
- from.getName,
- from.getValue,
- from.getComment,
- from.getDomain,
- if (from.getExpires == null) null else from.getExpires.toInstant,
- from.getMaxAge,
- from.getPath,
- from.getVersion,
- from.isDiscard,
- from.isHttpOnly,
- from.isSecure,
- from.getSameSiteMode
+ from.getName(),
+ from.getValue(),
+ from.getComment(),
+ from.getDomain(),
+ if (from.getExpires() == null) null else from.getExpires().toInstant,
+ from.getMaxAge(),
+ from.getPath(),
+ from.getVersion(),
+ from.isDiscard(),
+ from.isHttpOnly(),
+ from.isSecure(),
+ from.getSameSiteMode()
)
}
def toUndertow(from: Cookie): io.undertow.server.handlers.Cookie = {
@@ -101,12 +101,12 @@ sealed trait FormEntry{
}
object FormEntry{
def fromUndertow(from: io.undertow.server.handlers.form.FormData.FormValue): FormEntry = {
- val isOctetStream = Option(from.getHeaders)
+ val isOctetStream = Option(from.getHeaders())
.flatMap(headers => Option(headers.get(HttpString.tryFromString("Content-Type"))))
.exists(h => h.asScala.exists(v => v == "application/octet-stream"))
// browsers will set empty file fields to content type: octet-stream
- if (isOctetStream || from.isFileItem) FormFile(from.getFileName, Try(from.getFileItem.getFile).toOption, from.getHeaders)
- else FormValue(from.getValue, from.getHeaders)
+ if (isOctetStream || from.isFileItem()) FormFile(from.getFileName(), Try(from.getFileItem().getFile()).toOption, from.getHeaders())
+ else FormValue(from.getValue(), from.getHeaders())
}
}