Skip to content

Commit 243860a

Browse files
authored
Merge pull request #248 from Intermodalics/build_PR_247
build 'get actionlib servers #247'
2 parents bb2878d + 4ed81ea commit 243860a

File tree

2 files changed

+43
-6
lines changed

2 files changed

+43
-6
lines changed

build/roslib.js

+41-5
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,15 @@
723723
}();
724724

725725
},{}],2:[function(require,module,exports){
726+
/*
727+
object-assign
728+
(c) Sindre Sorhus
729+
@license MIT
730+
*/
731+
726732
'use strict';
727733
/* eslint-disable no-unused-vars */
734+
var getOwnPropertySymbols = Object.getOwnPropertySymbols;
728735
var hasOwnProperty = Object.prototype.hasOwnProperty;
729736
var propIsEnumerable = Object.prototype.propertyIsEnumerable;
730737

@@ -745,7 +752,7 @@ function shouldUseNative() {
745752
// Detect buggy property enumeration order in older V8 versions.
746753

747754
// https://bugs.chromium.org/p/v8/issues/detail?id=4118
748-
var test1 = new String('abc'); // eslint-disable-line
755+
var test1 = new String('abc'); // eslint-disable-line no-new-wrappers
749756
test1[5] = 'de';
750757
if (Object.getOwnPropertyNames(test1)[0] === '5') {
751758
return false;
@@ -774,7 +781,7 @@ function shouldUseNative() {
774781
}
775782

776783
return true;
777-
} catch (e) {
784+
} catch (err) {
778785
// We don't expect any of the above to throw, but better to be safe.
779786
return false;
780787
}
@@ -794,8 +801,8 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) {
794801
}
795802
}
796803

797-
if (Object.getOwnPropertySymbols) {
798-
symbols = Object.getOwnPropertySymbols(from);
804+
if (getOwnPropertySymbols) {
805+
symbols = getOwnPropertySymbols(from);
799806
for (var i = 0; i < symbols.length; i++) {
800807
if (propIsEnumerable.call(from, symbols[i])) {
801808
to[symbols[i]] = from[symbols[i]];
@@ -1616,6 +1623,35 @@ Ros.prototype.callOnConnection = function(message) {
16161623
}
16171624
};
16181625

1626+
/**
1627+
* Retrieves Action Servers in ROS as an array of string
1628+
*
1629+
* * actionservers - Array of action server names
1630+
*/
1631+
Ros.prototype.getActionServers = function(callback, failedCallback) {
1632+
var getActionServers = new Service({
1633+
ros : this,
1634+
name : '/rosapi/action_servers',
1635+
serviceType : 'rosapi/GetActionServers'
1636+
});
1637+
1638+
var request = new ServiceRequest({});
1639+
if (typeof failedCallback === 'function'){
1640+
getActionServers.callService(request,
1641+
function(result) {
1642+
callback(result.action_servers);
1643+
},
1644+
function(message){
1645+
failedCallback(message);
1646+
}
1647+
);
1648+
}else{
1649+
getActionServers.callService(request, function(result) {
1650+
callback(result.action_servers);
1651+
});
1652+
}
1653+
};
1654+
16191655
/**
16201656
* Retrieves list of topics in ROS as an array.
16211657
*
@@ -1641,7 +1677,7 @@ Ros.prototype.getTopics = function(callback, failedCallback) {
16411677
);
16421678
}else{
16431679
topicsClient.callService(request, function(result) {
1644-
callback(result.topics);
1680+
callback(result);
16451681
});
16461682
}
16471683
};

0 commit comments

Comments
 (0)