Skip to content

Suggest update to correct the issue "Webocket does not respond to asset or assets request #578" #580

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

Closed
dwickelhaus wants to merge 1 commit into from
Closed

Suggest update to correct the issue "Webocket does not respond to asset or assets request #578" #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions src/mtconnect/sink/rest_sink/rest_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,8 @@ namespace mtconnect {
request->m_request = "MTConnectAssets";

respond(session,
assetRequest(printer, count, removed, request->parameter<string>("type"),
request->parameter<string>("device"), pretty, request->m_requestId),
assetRequest(printer, count, removed, request->parameter<string>("type"),
request->parameter<string>("device"), pretty, request->m_requestId),
request->m_requestId);
return true;
};
Expand Down Expand Up @@ -567,22 +567,25 @@ namespace mtconnect {
string qp(
"type={string}&removed={bool:false}&"
"count={integer:100}&device={string}&pretty={bool:false}&format={string}");
m_server->addRouting({boost::beast::http::verb::get, "/assets?" + qp, handler})
.document("MTConnect assets request", "Returns up to `count` assets");
m_server->addRouting({boost::beast::http::verb::get, "/asset?" + qp, handler})
.document("MTConnect assets request", "Returns up to `count` assets");
m_server->addRouting({boost::beast::http::verb::get, "/{device}/asset?" + qp, handler})
.document("MTConnect assets request", "Returns up to `count` assets for deivce `device`")
.command("asset");
m_server->addRouting({boost::beast::http::verb::get, "/assets?" + qp, handler})
.document("MTConnect asset request", "Returns up to `count` assets");
m_server->addRouting({boost::beast::http::verb::get, "/{device}/assets?" + qp, handler})
.document("MTConnect assets request", "Returns up to `count` assets for deivce `device`");
m_server->addRouting({boost::beast::http::verb::get, "/{device}/asset?" + qp, handler})
.document("MTConnect asset request", "Returns up to `count` assets for deivce `device`");
m_server->addRouting({boost::beast::http::verb::get, "/assets/{assetIds}", idHandler})
.document("MTConnect asset request", "Returns up to `count` asset for deivce `device`")
.command("assets");
m_server->addRouting({boost::beast::http::verb::get, "/asset/{assetIds}", idHandler})
.document(
"MTConnect assets request",
"Returns a set assets identified by asset ids `asset` separated by semi-colon (;)");
m_server->addRouting({boost::beast::http::verb::get, "/asset/{assetIds}", idHandler})
m_server->addRouting({boost::beast::http::verb::get, "/assets/{assetIds}", idHandler})
.document("MTConnect asset request",
"Returns a set of assets identified by asset ids `asset` separated by "
"semi-colon (;)");
"semi-colon (;)")
.command("assetsById");

if (m_server->arePutsAllowed())
{
Expand Down
19 changes: 17 additions & 2 deletions src/mtconnect/sink/rest_sink/websocket_session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,12 @@ namespace mtconnect::sink::rest_sink {

break;
case rapidjson::kNumberType:
if (it.value.IsInt())
if (it.value.IsInt()){
request->m_parameters.emplace(
make_pair(it.name.GetString(), ParameterValue(it.value.GetInt())));
else if (it.value.IsUint())
LOG(debug) << "int - " << it.name.GetString() << " value: " << it.value.GetInt();
}
else if (it.value.IsUint())
request->m_parameters.emplace(
make_pair(it.name.GetString(), ParameterValue(uint64_t(it.value.GetUint()))));
else if (it.value.IsInt64())
Expand All @@ -404,6 +406,19 @@ namespace mtconnect::sink::rest_sink {
}
}

int count = *request->parameter<int32_t>("count");

if ( !request->parameter<int32_t>("count") && *request->parameter<string>("request") == "sample")
request->m_parameters["count"] = 100;

LOG(debug) << "request: " << *request->parameter<string>("request") << "| count: " << *request->parameter<int>("count");

auto asset = request->parameter<string>("assetIds");
if (asset)
{
request->m_parameters["request"] = "assetsById";
}

return request;
}

Expand Down
Loading