Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Http wasm #1913

Merged
merged 13 commits into from
May 24, 2024
Merged

Http wasm #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
868cdd3
starting implementation
Zwiterrion May 13, 2024
05c0896
integration of http-wasm
Zwiterrion May 15, 2024
9ee2d1d
starting implementation
Zwiterrion May 20, 2024
4b5548a
start writing http wasm plugin
Zwiterrion May 22, 2024
99393e6
start testing with TCK
Zwiterrion May 22, 2024
21428f9
testing integration with http-wasm TCK
Zwiterrion May 24, 2024
7cb5416
better integration and fix graphql proxy to REST plugin
Zwiterrion May 24, 2024
89d2efc
cleanup el
Zwiterrion May 24, 2024
08b9356
show http wasm in form
Zwiterrion May 24, 2024
0ab78b9
swap back "otoroshi/user" to "env"
Zwiterrion May 24, 2024
8194ad7
remove wasm4s dev jar
Zwiterrion May 24, 2024
9ca5cd1
remove unused imports
Zwiterrion May 24, 2024
c7cefa3
Merge branch 'master' into http-wasm
Zwiterrion May 24, 2024
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
1 change: 0 additions & 1 deletion otoroshi/app/el/el.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import otoroshi.utils.http.RequestImplicits._
import kaleidoscope._
import otoroshi.next.extensions.HttpListenerNames
import otoroshi.next.models.NgRoute
import otoroshi.next.plugins.Keys
import otoroshi.utils.{ReplaceAllWith, TypedMap}
import otoroshi.utils.syntax.implicits._

Expand Down
4 changes: 2 additions & 2 deletions otoroshi/app/next/plugins/graphql.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ object GraphQLQueryConfig {
"query" -> o.query,
"timeout" -> o.timeout,
"response_path" -> o.responsePath.map(JsString.apply).getOrElse(JsNull).asValue,
"response_filter" -> o.responsePath.map(JsString.apply).getOrElse(JsNull).asValue
"response_filter" -> o.responseFilter.map(JsString.apply).getOrElse(JsNull).asValue
)
}
}
Expand Down Expand Up @@ -1164,7 +1164,7 @@ class GraphQLBackend extends NgBackendCall {
builder = customBuilder,
initialData = config.initialData.map(_.as[JsObject]).getOrElse(JsObject.empty),
maxDepth = config.maxDepth,
variables = (jsonBody \ "variables").asOpt[JsValue].getOrElse(Json.obj()).as[JsObject]
variables = (jsonBody \ "variables").asOpt[JsObject].getOrElse(Json.obj())
)
case None => jsonResponse(400, Json.obj("error" -> "query field missing")).future
}
Expand Down
2 changes: 1 addition & 1 deletion otoroshi/app/wasm/host.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import otoroshi.utils.cache.types.UnboundedTrieMap
import otoroshi.utils.json.JsonOperationsHelper
import otoroshi.utils.syntax.implicits._
import otoroshi.utils.{ConcurrentMutableTypedMap, RegexPool, TypedMap}
import otoroshi.wasm.httpwasm.HttpWasmFunctions
import play.api.Logger
import play.api.libs.json._

Expand Down Expand Up @@ -1225,7 +1226,6 @@ object HostFunctions {
Http.getFunctions(config, attrs) ++
State.getFunctions(config, pluginId) ++
DataStore.getFunctions(config, pluginId)

functions.collect {
case func if func.authorized(config) => func.function
}.toArray
Expand Down
Loading
Loading