github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

make apply() somewhat more idiomatic

Browse Source
This commit is contained in:
Geoff Schmidt
2012-03-01 05:11:56 -08:00
parent 562a1a1122
commit 79aabd797b
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/livedata/livedata_connection.js
View File

@@ -263,27 +263,29 @@ _.extend(Meteor._LivedataConnection.prototype, {
},
call: function (name /*, arguments */) {
return this.apply(name, Array.prototype.slice.call(arguments, 1));
// if it's a function, the last argument is the result callback,
// not a parameter to the remote method.
var args = Array.prototype.slice.call(arguments, 1);
if (args.length && typeof args[args.length - 1] === "function")
var callback = args.pop();
return this.apply(name, args, callback);
},
apply: function (name, args) {
apply: function (name, args, callback) {
var self = this;
var enclosing = Meteor._CurrentInvocation.get();
var handler = self.method_handlers[name];
var result_func = function () {};
// if it's a function, the last argument is the result callback,
// not a parameter to the remote method.
args = _.clone(args);
if (args.length && typeof args[args.length - 1] === "function") {
if (callback)
// XXX would it be better form to do the binding in stream.on,
// or caller, instead of here?
result_func = Meteor.bindEnvironment(args.pop(), function (e) {
callback = Meteor.bindEnvironment(callback, function (e) {
// XXX improve error message (and how we report it)
Meteor._debug("Exception while delivering result of invoking '" +
name + "'", e.stack);
});
}
else
callback = function () {};
var enqueue = function (msg, callback) {
msg.id = '' + (self.next_method_id++);
@@ -295,7 +297,7 @@ _.extend(Meteor._LivedataConnection.prototype, {
var invocation = new Meteor._ClientMethodInvocation(name, handler, self);
// if _run throws an exception, allow it to propagate
return invocation._run(args, result_func, enqueue);
return invocation._run(args, callback, enqueue);
},
status: function () {

24
packages/livedata/livedata_server.js
View File

@@ -763,31 +763,35 @@ _.extend(Meteor._LivedataServer.prototype, {
},
call: function (name /*, arguments */) {
return this.apply(name, Array.prototype.slice.call(arguments, 1));
// if it's a function, the last argument is the result callback,
// not a parameter to the remote method.
var args = Array.prototype.slice.call(arguments, 1);
if (args.length && typeof args[args.length - 1] === "function")
var callback = args.pop();
return this.apply(name, args, callback);
},
apply: function (name, args) {
apply: function (name, args, callback) {
var self = this;
args = _.clone(args);
var result_func;
if (args.length && typeof args[args.length - 1] === "function") {
result_func = Meteor.bindEnvironment(args.pop(), function (e) {
if (callback)
callback = Meteor.bindEnvironment(callback, function (e) {
// XXX improve error message (and how we report it)
Meteor._debug("Exception while delivering result of invoking '" +
name + "'", e.stack);
});
}
else
callback = function () {};
var handler = self.method_handlers[name];
if (!handler) {
if (result_func)
result_func({error: 404, reason: "Method not found"});
if (callback)
callback({error: 404, reason: "Method not found"});
throw new Error("No such method '" + name + "'");
}
var invocation = new Meteor._ServerMethodInvocation(name, handler);
return invocation._run(args, result_func);
return invocation._run(args, callback);
},
// A much more elegant way to do this would be: let any autopublish