Skip to content

T8 #1747

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

Merged
nmaguiar merged 13 commits into from
Mar 9, 2026
Merged

T8 #1747

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
155adf5
refactor(file-response): improve path handling and security checks
nmaguiar Mar 5, 2026
ebfda39
chore(deps): bump org.eclipse.jetty:jetty-util from 12.1.6 to 12.1.7
dependabot[bot] Mar 5, 2026
06a66f1
chore(deps): bump org.eclipse.jetty:jetty-io from 12.1.6 to 12.1.7
dependabot[bot] Mar 5, 2026
36da053
sync oafproc
nmaguiar Mar 6, 2026
39d0762
refactor(jsonrpc): improve code readability and consistency
Mar 7, 2026
81dee0a
Merge branch 't8' of https://github.com/openaf/openaf into t8
Mar 7, 2026
32c4058
Merge pull request #1744 from OpenAF/dependabot/maven/t8/org.eclipse.…
nmaguiar Mar 9, 2026
166d9e2
Merge pull request #1743 from OpenAF/dependabot/maven/t8/org.eclipse.…
nmaguiar Mar 9, 2026
850ef91
chore(deps): bump jetty-io and jetty-util to 12.1.7
nmaguiar Mar 9, 2026
ff233bc
Update src/com/nwu2/httpd/responses/FileResponse.java
nmaguiar Mar 9, 2026
8aac368
refactor(FileResponse): enhance security checks in serveFile method
nmaguiar Mar 9, 2026
0320874
sync openaf/oafp
nmaguiar Mar 9, 2026
32cb317
Merge branch 't8' of https://github.com/openaf/openaf into t8
nmaguiar Mar 9, 2026
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
12 changes: 6 additions & 6 deletions js/oafp.js
View file
Open in desktop

Large diffs are not rendered by default.

134 changes: 67 additions & 67 deletions js/openaf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8486,20 +8486,20 @@ const $jsonrpc = function (aOptions) {

const _defaultCmdDir = (isDef(__flags) && isDef(__flags.JSONRPC) && isDef(__flags.JSONRPC.cmd) && isDef(__flags.JSONRPC.cmd.defaultDir)) ? __flags.JSONRPC.cmd.defaultDir : __

const _r = {
_ids: $atomic(1, "long"),
_p: __,
_s: false,
_cmd: false,
_sy: $sync(),
_q: {},
_r: {},
_info: __,
_pwd: _defaultCmdDir,
_copies: $atomic(0, "long"),
type: type => {
aOptions.type = type
return _r
const _r = {
_ids: $atomic(1, "long"),
_p: __,
_s: false,
_cmd: false,
_sy: $sync(),
_q: {},
_r: {},
_info: __,
_pwd: _defaultCmdDir,
_copies: $atomic(0, "long"),
type: type => {
aOptions.type = type
return _r
},
url: url => {
aOptions.url = url
Expand Down Expand Up @@ -8538,7 +8538,7 @@ const $jsonrpc = function (aOptions) {
$doWait($doAll(
[
// in stream
$do(() => {
$doV(() => {
$await("__jsonrpc_" + _main_id).notifyAll()
do {
var _id = _r._ids.get()
Expand All @@ -8565,7 +8565,7 @@ const $jsonrpc = function (aOptions) {
} while (!_r._s)
}),
// out stream
$do(() => {
$doV(() => {
do {
var _id = _r._ids.get()
$await("__jsonrpc_r-" + _id + "-" + _main_id).wait()
Expand Down Expand Up @@ -8608,13 +8608,13 @@ const $jsonrpc = function (aOptions) {
if (isMap(aOptions.options.fns)) {
if (isFunction(aOptions.options.fns[aMethod])) {
var _res = aOptions.options.fns[aMethod](aParams)
_debug("jsonrpc dummy <- " + stringify({ result: _res }, __, ""))
if (aMethod == "initialize" && !aNotification) _r._info = _res
return _res
} else {
_debug("jsonrpc dummy <- " + stringify({ error: "Method not found" }, __, ""))
throw new Error("Method not found")
}
_debug("jsonrpc dummy <- " + stringify({ result: _res }, __, ""))
if (aMethod == "initialize" && !aNotification) _r._info = _res
return _res
} else {
_debug("jsonrpc dummy <- " + stringify({ error: "Method not found" }, __, ""))
throw new Error("Method not found")
}
}
return __
case "stdio":
Expand Down Expand Up @@ -8644,12 +8644,12 @@ const $jsonrpc = function (aOptions) {
}
$await("__jsonrpc_a-" + _id + "-" + _main_id).wait(aOptions.timeout)
})
if (isMap(_r._r[_id])) {
_res = _r._r[_id]
delete _r._r[_id]
}
if (aMethod == "initialize" && !aNotification) _r._info = isDef(_res) && isDef(_res.result) ? _res.result : _res
return isDef(_res) && isDef(_res.result) ? _res.result : _res
if (isMap(_r._r[_id])) {
_res = _r._r[_id]
delete _r._r[_id]
}
if (aMethod == "initialize" && !aNotification) _r._info = isDef(_res) && isDef(_res.result) ? _res.result : _res
return isDef(_res) && isDef(_res.result) ? _res.result : _res
case "remote":
default:
_$(aOptions.url, "aOptions.url").isString().$_()
Expand All @@ -8672,23 +8672,23 @@ const $jsonrpc = function (aOptions) {
}
_debug("jsonrpc -> " + stringify(_req, __, ""))
var res = $rest(_restOptions).post(aOptions.url, _req)
// Notifications do not expect a reply
if (!!aNotification) return
_debug("jsonrpc <- " + stringify(res, __, ""))
if (isDef(res)) {
if (isDef(res.error) && (isDef(res.error.response))) return res.error.response
if (aMethod == "initialize" && !aNotification) _r._info = res.result
if (isDef(res.result)) return res.result
}
return __
}
},
getInfo: () => _r._info,
destroy: () => {
if (_r._copies.get() > 0) {
_r._copies.dec()
return
}
// Notifications do not expect a reply
if (!!aNotification) return
_debug("jsonrpc <- " + stringify(res, __, ""))
if (isDef(res)) {
if (isDef(res.error) && (isDef(res.error.response))) return res.error.response
if (aMethod == "initialize" && !aNotification) _r._info = res.result
if (isDef(res.result)) return res.result
}
return __
}
},
getInfo: () => _r._info,
destroy: () => {
if (_r._copies.get() > 0) {
_r._copies.dec()
return
}
_r._s = true
if (isDef(_r._p)) {
$doWait(_r._p)
Expand Down Expand Up @@ -9000,26 +9000,26 @@ const $mcp = function(aOptions) {
return _r
},
initialize: (clientInfo) => {
clientInfo = _$(clientInfo, "clientInfo").isMap().default({})
clientInfo = merge(aOptions.clientInfo, clientInfo)
clientInfo = _$(clientInfo, "clientInfo").isMap().default({})
clientInfo = merge(aOptions.clientInfo, clientInfo)

var initResult = _jsonrpc.exec("initialize", {
protocolVersion: aOptions.protocolVersion,
var initResult = _jsonrpc.exec("initialize", {
protocolVersion: aOptions.protocolVersion,
capabilities: {
sampling: {}
},
clientInfo: clientInfo
})

if (isDef(initResult) && isUnDef(initResult.error)) {
_r._initialized = true
_r._capabilities = initResult.capabilities || {}
_r._initResult = initResult
if (isDef(initResult) && isUnDef(initResult.error)) {
_r._initialized = true
_r._capabilities = initResult.capabilities || {}
_r._initResult = initResult

// Send initialized notification
if (aOptions.strict) {
try {
// send as a notification (no response expected)
// Send initialized notification
if (aOptions.strict) {
try {
// send as a notification (no response expected)
_jsonrpc.exec("notifications/initialized", {}, true)
} catch(e) {
// Notifications might not return responses, ignore errors
Expand All @@ -9028,15 +9028,15 @@ const $mcp = function(aOptions) {

return _r
} else {
throw new Error("MCP initialization failed: " + (isDef(initResult) ? initResult.error : __ || "Unknown error"))
}
},
getInfo: () => _r._initResult,
listTools: () => {
if (!_r._initialized) {
throw new Error("MCP client not initialized. Call initialize() first.")
}
return _jsonrpc.exec("tools/list", {})
throw new Error("MCP initialization failed: " + (isDef(initResult) ? initResult.error : __ || "Unknown error"))
}
},
getInfo: () => _r._initResult,
listTools: () => {
if (!_r._initialized) {
throw new Error("MCP client not initialized. Call initialize() first.")
}
return _jsonrpc.exec("tools/list", {})
},
callTool: (toolName, toolArguments, toolOptions) => {
if (!_r._initialized) {
Expand Down
Binary file renamed lib/jetty-io-12.1.6.jar → lib/jetty-io-12.1.7.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed lib/jetty-util-12.1.6.jar → lib/jetty-util-12.1.7.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>12.1.6</version>
<version>12.1.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>12.1.6</version>
<version>12.1.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
Expand Down
Loading
Loading