var types = validator.Types;
var T = xwalk.utils.type;
var kIdKey = Symbol();
-var converter = xwalk.converter;
+var converter = xwalk.utils.converter;
function createListener(name, c) {
var listenerName = name;
return r;
}
-function Request(data) {
- this[kIdKey] = data.id;
-
- delete data.id;
+function Request(id, data) {
+ data.id = id;
if (data.representation) {
data.representation = createRepresentation(data.representation);
var resourceRequestListener = createListener('ResourceRequestListener');
-var _setRequestListener = function(id, listener) {
+var _setRequestListener = function(id, args_listener) {
var callArgs = {};
callArgs.id = id;
var listener = function(result) {
- var request = new Request(result.data.request);
+ var request = new Request(result.data.id, result.data.request);
switch (converter.toString(result.data.type, false)) {
case RequestType.GET:
- native.callIfPossible(listener.onget, request);
+ native.callIfPossible(args_listener.onget, request);
break;
case RequestType.PUT:
- native.callIfPossible(listener.onput, request);
+ native.callIfPossible(args_listener.onput, request);
break;
case RequestType.POST:
- native.callIfPossible(listener.onpost, request);
+ native.callIfPossible(args_listener.onpost, request);
break;
case RequestType.DELETE:
- native.callIfPossible(listener.ondelete, request);
+ native.callIfPossible(args_listener.ondelete, request);
break;
}
var observeType = converter.toString(result.data.observeType, false);
var observerId = converter.toUnsignedLong(result.data.observerId, false);
if (observeType !== ObserveType.NO_TYPE && observerId) {
- native.callIfPossible(listener.onobserving(request, observeType, observerId));
+ native.callIfPossible(args_listener.onobserving(request, observeType, observerId));
}
};
Response.prototype.send = function() {
var callArgs = {};
- callArgs.id = this.request[kIdKey];
+ callArgs.id = this.request.id;
callArgs.result = this.result;
callArgs.representation = this.representation;
callArgs.options = this.options;
if (!resource->request_listener) {
resource->request_listener = [this, id](const common::TizenResult&,
const picojson::value& v) {
- picojson::value response{picojson::object{}};
- auto& obj = response.get<picojson::object>();
+ picojson::value request{picojson::object{}};
+ auto& obj = request.get<picojson::object>();
obj.insert(std::make_pair(kId, picojson::value{static_cast<double>(id)}));
obj.insert(std::make_pair(kData, v));
- Post(kResourceRequestListenerToken, common::TizenSuccess{response});
+ Post(kResourceRequestListenerToken, common::TizenSuccess{request});
};
}