Merge pull request #43 from Simperium/issue/download-ghost-when-outdated

Bucket requests ghost at "sv" when local version is not up to date

Author: roundhill

src/simperium/channel.js

@@ -139,6 +139,15 @@ internal.findAcknowledgedChange = function( change ) {
 	}
 };
 
+internal.requestObjectVersion = function( id, version ) {
+	return new Promise( resolve => {
+		this.once( `version.${ id }.${ version }`, data => {
+			resolve( data );
+		} );
+		this.send( `e:${ id }.${ version }` );
+	} );
+};
+
 internal.applyChange = function( change, ghost ) {
 	var acknowledged = internal.findAcknowledgedChange.bind( this )( change ),
 		error,
@@ -166,14 +175,15 @@ internal.applyChange = function( change, ghost ) {
 
 	if ( change.o === operation.MODIFY ) {
 		if ( ghost && ( ghost.version !== change.sv ) ) {
-			// throw new Error( "Source version and ghost version do not match" );
+			internal.requestObjectVersion.call( this, change.id, change.sv ).then( data => {
+				internal.applyChange.call( this, change, { version: change.sv, data } )
+			} );
 			return;
 		}
 
 		original = ghost.data;
 		patch = change.v;
 		modified = jsondiff.apply_object_diff( original, patch );
-
 		return internal.updateObjectVersion.bind( this )( change.id, change.ev, modified, original, patch, acknowledged )
 			.then( emit );
 	} else if ( change.o === operation.REMOVE ) {
@@ -424,6 +434,7 @@ Channel.prototype.onVersion = function( data ) {
 
 	this.emit( 'version', ghost.id, ghost.version, ghost.data );
 	this.emit( 'version.' + ghost.id, ghost.id, ghost.version, ghost.data );
+	this.emit( 'version.' + ghost.id + '.' + ghost.version, ghost.data );
 };
 
 function NetworkQueue() {

test/simperium/channel_test.js

@@ -470,6 +470,19 @@ describe( 'Channel', function() {
 			} );
 			channel.handleMessage( 'auth:user@example.com' );
 		} );
+
+		it( 'should request entire object when source version is out of date', ( done ) => {
+			var change = {o: 'M', id: 'thing', sv: 1, ev: 2, ccid: 'abc', cv: 'new-cv', v: diff( { hello: 'mundo'}, {hello: 'world'} ) };
+			channel.once( 'send', ( data ) => {
+				equal( data, `e:${change.id}.${change.sv}` );
+				channel.once( 'change-version', ( cv ) => {
+					equal( cv, 'new-cv' );
+					done();
+				} );
+				channel.handleMessage( `e:${change.id}.${change.sv}\n${JSON.stringify( { data: { hello: 'mundo'} } )} ` );
+			} );
+			channel.handleMessage( `c:[${JSON.stringify( change )}]` );
+		} );
 	} );
 } );