@google-cloud/agones-sdk 1.18.0 → 1.20.0

package/package.json

@@ -26,5 +26,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "1.18.0"
+    "version": "1.20.0"
 }

package/spec/agonesSDK.spec.js

@@ -249,35 +249,27 @@ describe('AgonesSDK', () => {
 			serverStream.emit('data', gameServer);
 
 			expect(callback).toHaveBeenCalled();
-			let result = callback.calls.argsFor(0)[0];
-			expect(result.status).toBeDefined();
-			expect(result.status.state).toEqual('up');
+			let callbackArgs = callback.calls.argsFor(0)[0];
+			expect(callbackArgs.status).toBeDefined();
+			expect(callbackArgs.status.state).toEqual('up');
 		});
-		it('captures CANCELLED errors only', async() => {
+		it('calls the server and passes errors to the optional error callback', async () => {
 			let serverStream = stream.Readable({read: () => undefined});
 			spyOn(agonesSDK.client, 'watchGameServer').and.callFake(() => {
 				return serverStream;
 			});
 
 			let callback = jasmine.createSpy('callback');
-			agonesSDK.watchGameServer(callback);
-
-			try {
-				serverStream.emit('error', {
-					code: grpc.status.CANCELLED
-				});
-			} catch (error) {
-				fail();
-			}
-
-			try {
-				serverStream.emit('error', {
-					code: grpc.status.ABORTED
-				});
-				fail();
-			} catch (error) {
-				expect(error.code).toEqual(grpc.status.ABORTED);
-			}
+			let errorCallback = jasmine.createSpy('errorCallback');
+			agonesSDK.watchGameServer(callback, errorCallback);
+
+			let error = {
+				code: grpc.status.CANCELLED
+			};
+			serverStream.emit('error', error);
+			expect(errorCallback).toHaveBeenCalled();
+			let errorCallbackArgs = errorCallback.calls.argsFor(0)[0];
+			expect(errorCallbackArgs).toEqual(error);
 		});
 	});
 

package/src/agonesSDK.js

@@ -116,19 +116,17 @@ class AgonesSDK {
 		});
 	}
 
-	watchGameServer(callback) {
+	watchGameServer(callback, errorCallback) {
 		const request = new messages.Empty();
 		const stream = this.client.watchGameServer(request);
 		stream.on('data', (data) => {
 			callback(data.toObject());
 		});
-		stream.on('error', (error) => {
-			if (error.code === grpc.status.CANCELLED) {
-				// Capture error when call is cancelled
-				return;
-			}
-			throw error;
-		});
+		if (errorCallback) {
+			stream.on('error', (error) => {
+				errorCallback(error);
+			});
+		}
 		this.streams.push(stream);
 	}