Skip to content

Commit f095347

Browse files
author
pemrouz
committed
it should respond via ack if available
1 parent 1e50f99 commit f095347

File tree

3 files changed

+90
-48
lines changed

3 files changed

+90
-48
lines changed

dist/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var _is2 = _interopRequireDefault(_is);
6363
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
6464

6565
// -------------------------------------------
66-
// API: Synchronises resources between server/client
66+
// Synchronises resources between server/client
6767
// -------------------------------------------
6868
function sync(ripple, server) {
6969
log('creating');
@@ -168,7 +168,7 @@ var to = function to(ripple, res, change) {
168168

169169
// incoming transforms
170170
var consume = function consume(ripple) {
171-
return function (_ref3) {
171+
return function (_ref3, ack) {
172172
/* istanbul ignore next */
173173
var _ref4 = _slicedToArray(_ref3, 3);
174174

@@ -186,7 +186,7 @@ var consume = function consume(ripple) {
186186
xres = (0, _header2.default)('from')(res),
187187
next = (0, _set2.default)(change),
188188
silent = silence(this),
189-
respond = ripple.respond(this, name, change.time);
189+
respond = ack || ripple.respond(this, name, change.time);
190190

191191
return xall && !xall.call(this, req, change, respond) ? debug('skip all', name) // rejected - by xall
192192
: xtype && !xtype.call(this, req, change, respond) ? debug('skip type', name) // rejected - by xtype

src/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ export default function sync(ripple, server){
2222
}
2323

2424
const respond = ripple => (socket, name, time) => reply => {
25-
socket.emit('response', [ name, time, reply ])
25+
socket.emit('response', [name, time, reply])
2626
}
2727

28-
const response = ripple => function([ name, time, reply ]) {
28+
const response = ripple => function([name, time, reply]) {
2929
ripple.resources[name].body.emit('response._' + time, reply)
3030
}
3131

@@ -78,7 +78,7 @@ const to = (ripple, res, change) => socket => {
7878
}
7979

8080
// incoming transforms
81-
const consume = ripple => function([name, change, req = {}]) {
81+
const consume = ripple => function([name, change, req = {}], ack) {
8282
log('receiving', name)
8383

8484
const res = ripple.resources[name]
@@ -87,7 +87,7 @@ const consume = ripple => function([name, change, req = {}]) {
8787
, xres = header('from')(res)
8888
, next = set(change)
8989
, silent = silence(this)
90-
, respond = ripple.respond(this, name, change.time)
90+
, respond = ack || ripple.respond(this, name, change.time)
9191

9292
return xall && !xall.call(this, req, change, respond) ? debug('skip all' , name) // rejected - by xall
9393
: xtype && !xtype.call(this, req, change, respond) ? debug('skip type', name) // rejected - by xtype

0 commit comments

Comments
 (0)