@google-cloud/agones-sdk 1.24.0 → 1.26.0-rc

package/lib/alpha/alpha_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/lib/alpha/google/api/annotations_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/lib/alpha/google/api/http_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/lib/google/api/annotations_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/lib/google/api/http_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/lib/sdk_pb.js

@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2022 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/package.json

@@ -26,5 +26,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "1.24.0"
+    "version": "1.26.0-rc"
 }

package/spec/agonesSDK.spec.js

@@ -152,7 +152,7 @@ describe('AgonesSDK', () => {
 
 	describe('health', () => {
 		it('calls the server and passes calls to stream', async () => {
-			let stream = jasmine.createSpyObj('stream', ['write']);
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
 			spyOn(agonesSDK.client, 'health').and.callFake(() => {
 				return stream;
 			});
@@ -163,7 +163,7 @@ describe('AgonesSDK', () => {
 		});
 
 		it('uses the same stream for subsequent calls', async () => {
-			let stream = jasmine.createSpyObj('stream', ['write']);
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
 			spyOn(agonesSDK.client, 'health').and.callFake(() => {
 				return stream;
 			});
@@ -187,8 +187,55 @@ describe('AgonesSDK', () => {
 			}
 		});
 
+		it('calls the server and handles stream write error if callback provided', async () => {
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
+			stream.write.and.callFake((chunk, encoding, callback) => {
+				callback('error');
+			});
+			spyOn(agonesSDK.client, 'health').and.callFake(() => {
+				return stream;
+			});
+			try {
+				agonesSDK.health((error) => {
+					expect(error).toEqual('error');
+				});
+			} catch (error) {
+				fail();
+			}
+		});
+
+		it('calls the server and re throws stream write error if no callback', async () => {
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
+			stream.write.and.callFake((chunk, encoding, callback) => {
+				callback('error');
+			});
+			spyOn(agonesSDK.client, 'health').and.callFake(() => {
+				return stream;
+			});
+			try {
+				agonesSDK.health();
+				fail();
+			} catch (error) {
+				expect(agonesSDK.client.health).toHaveBeenCalled();
+				expect(error).toEqual('error');
+			}
+		});
+
+		it('does not call error callback if there was no stream error', async () => {
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
+			stream.write.and.callFake((chunk, encoding, callback) => {
+				callback();
+			});
+			spyOn(agonesSDK.client, 'health').and.callFake(() => {
+				return stream;
+			});
+			agonesSDK.health(() => {
+				fail();
+			});
+		});
+
 		it('calls the server and handles stream completing', async () => {
-			let stream = jasmine.createSpyObj('stream', ['write']);
+			let stream = jasmine.createSpyObj('stream', ['write', 'on']);
 			spyOn(agonesSDK.client, 'health').and.callFake((callback) => {
 				let result = new messages.Empty();
 				callback(undefined, result);
@@ -358,7 +405,7 @@ describe('AgonesSDK', () => {
 			expect(agonesSDK.client.close).toHaveBeenCalled();
 		});
 		it('ends the health stream if set', async () => {
-			let stream = jasmine.createSpyObj('stream', ['end', 'write']);
+			let stream = jasmine.createSpyObj('stream', ['end', 'write', 'on']);
 			spyOn(agonesSDK.client, 'health').and.callFake(() => {
 				return stream;
 			});

package/src/agonesSDK.js

@@ -93,14 +93,25 @@ class AgonesSDK {
 		});
 	}
 
-	health() {
+	health(errorCallback) {
 		if (this.healthStream === undefined) {
 			this.healthStream = this.client.health(() => {
 				// Ignore error as this can't be caught
 			});
+			this.healthStream.on('error', () => {
+				// ignore error, prevent from being uncaught
+			});
 		}
 		const request = new messages.Empty();
-		this.healthStream.write(request);
+		this.healthStream.write(request, null, (error) => {
+			if (error) {
+				if (errorCallback) {
+					errorCallback(error);
+					return;
+				}
+				throw error;
+			}
+		});
 	}
 
 	async getGameServer() {