Nodejs counters and lists (googleforgames#3726)

* Add getCounterCount * Add types * Implement incrementCounter * Implement decrementCounter * Implement setCounterCount * Implement getCounterCapacity * Implement setCounterCapacity * Implement list requests * Fix int64 values * Example usage * Remove boolean return types. Update packages * Update example, fix SDK and tests * update conformance test * Update package-lock.json * Update gameserver-counts-and-lists.yaml * Split beta methods out of alpha * Fix typo and update example * Update testSDKClient.js * Output arguments test * Update make file for Node.js conformance tests * Enable standard counts and lists tests * alpha --> beta * Update nodejs-simple * Update build/includes/sdk.mk Co-authored-by: igooch <[email protected]> --------- Co-authored-by: igooch <[email protected]>
GonzaloSaez · Jun 2, 2024 · 8835510 · 8835510
1 parent a2903ca
commit 8835510
Show file tree

Hide file tree

Showing 11 changed files with 1,867 additions and 2,690 deletions.
diff --git a/build/includes/sdk.mk b/build/includes/sdk.mk
@@ -165,7 +165,8 @@ run-sdk-conformance-test-cpp:
 	$(MAKE) run-sdk-conformance-test SDK_FOLDER=cpp GRPC_PORT=9003 HTTP_PORT=9103
 
 run-sdk-conformance-test-node:
-	$(MAKE) run-sdk-conformance-test SDK_FOLDER=node GRPC_PORT=9002 HTTP_PORT=9102
+	# run with on-by-default (Beta) feature flags enabled. If running locally first run `SDK_FOLDER=node make test-sdk` to build dependencies.
+	$(MAKE) run-sdk-conformance-test SDK_FOLDER=node GRPC_PORT=9002 HTTP_PORT=9102 TESTS=$(DEFAULT_CONFORMANCE_TESTS),$(COUNTS_AND_LISTS_TESTS)
 
 run-sdk-conformance-test-go:
 	# run with on-by-default (Beta) feature flags enabled

diff --git a/examples/nodejs-simple/package-lock.json b/examples/nodejs-simple/package-lock.json
diff --git a/examples/nodejs-simple/src/index.js b/examples/nodejs-simple/src/index.js
@@ -18,7 +18,7 @@ const {setTimeout} = require('timers/promises');
 const DEFAULT_TIMEOUT = 60;
 const MAX_TIMEOUT = 2147483;
 
-const connect = async (timeout, enableAlpha) => {
+const connect = async (timeout, enableAlpha, enableBeta) => {
 	let agonesSDK = new AgonesSDK();
 
 	let lifetimeInterval;
@@ -56,32 +56,37 @@ const connect = async (timeout, enableAlpha) => {
 			process.exit(0);
 		});
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Setting a label');
 		await agonesSDK.setLabel('test-label', 'test-value');
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Setting an annotation');
 		await agonesSDK.setAnnotation('test-annotation', 'test value');
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Marking server as ready...');
 		await agonesSDK.ready();
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Allocating');
 		await agonesSDK.allocate();
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Reserving for 10 seconds');
 		await agonesSDK.reserve(10);
-		await setTimeout(20000);
+		await setTimeout(15000);
 
 		if (enableAlpha) {
 			console.log('Running alpha suite');
 			await runAlphaSuite(agonesSDK);
 		}
 
+		if (enableBeta) {
+			console.log('Running beta suite');
+			await runBetaSuite(agonesSDK);
+		}
+
 		if (timeout === 0) {
 			do {
 				await setTimeout(MAX_TIMEOUT);
@@ -93,12 +98,12 @@ const connect = async (timeout, enableAlpha) => {
 		console.log('Shutting down...');
 		agonesSDK.shutdown();
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Closing connection to SDK server');
 		clearInterval(healthInterval);
 		agonesSDK.close();
 
-		await setTimeout(10000);
+		await setTimeout(5000);
 		console.log('Exiting');
 		clearInterval(lifetimeInterval);
 
@@ -113,58 +118,126 @@ const connect = async (timeout, enableAlpha) => {
 };
 
 const runAlphaSuite = async (agonesSDK) => {
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Setting capacity');
 	await agonesSDK.alpha.setPlayerCapacity(64);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Getting capacity');
 	let result = await agonesSDK.alpha.getPlayerCapacity();
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Connecting a player');
 	result = await agonesSDK.alpha.playerConnect('firstPlayerID');
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Connecting a duplicate player');
 	result = await agonesSDK.alpha.playerConnect('firstPlayerID');
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Connecting another player');
 	await agonesSDK.alpha.playerConnect('secondPlayerID');
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Getting player count');
 	result = await agonesSDK.alpha.getPlayerCount();
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Finding if firstPlayerID connected');
 	result = await agonesSDK.alpha.isPlayerConnected('firstPlayerID');
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Getting connected players');
 	result = await agonesSDK.alpha.getConnectedPlayers();
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Disconnecting a player');
 	result = await agonesSDK.alpha.playerDisconnect('firstPlayerID');
 	console.log(`result: ${result}`);
 
-	await setTimeout(10000);
+	await setTimeout(5000);
 	console.log('Disconnecting the same player');
 	result = await agonesSDK.alpha.playerDisconnect('firstPlayerID');
 	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Setting counter capacity');
+	result = await agonesSDK.alpha.setCounterCapacity('testCounter', 10);
+	console.log(`result: ${result}`);
+};
+
+const runBetaSuite = async (agonesSDK) => {
+	let result;
+
+	await setTimeout(5000);
+	console.log('Getting counter count');
+	result = await agonesSDK.beta.getCounterCount('rooms');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Incrementing counter');
+	await agonesSDK.beta.incrementCounter('rooms', 1);
+
+	await setTimeout(5000);
+	console.log('Decrementing counter');
+	await agonesSDK.beta.decrementCounter('rooms', 1);
+
+	await setTimeout(5000);
+	console.log('Setting counter count');
+	await agonesSDK.beta.setCounterCount('rooms', 2);
+
+	await setTimeout(5000);
+	console.log('Getting counter capacity');
+	result = await agonesSDK.beta.getCounterCapacity('rooms');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Setting counter capacity');
+	await agonesSDK.beta.setCounterCapacity('rooms', 200);
+
+	await setTimeout(5000);
+	console.log('Getting list capacity');
+	result = await agonesSDK.beta.getListCapacity('players');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Setting list capacity');
+	await agonesSDK.beta.setListCapacity('players', 10);
+
+	await setTimeout(5000);
+	console.log('Getting list contains');
+	result = await agonesSDK.beta.listContains('players', 'test0');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Getting list length');
+	result = await agonesSDK.beta.getListLength('players');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Getting list values');
+	result = await agonesSDK.beta.getListValues('players');
+	console.log(`result: ${result}`);
+
+	await setTimeout(5000);
+	console.log('Appending list value');
+	await agonesSDK.beta.appendListValue('players', 'test3');
+
+	await setTimeout(5000);
+	console.log('Deleting list value');
+	await agonesSDK.beta.deleteListValue('players', 'test3');
 };
 
 let args = process.argv.slice(2);
 let timeout = DEFAULT_TIMEOUT;
 let enableAlpha = false;
+let enableBeta = false;
 
 for (let arg of args) {
 	let [argName, argValue] = arg.split('=');
@@ -173,7 +246,8 @@ for (let arg of args) {
 		
 Options:
 	--timeout=...\t\tshutdown timeout in seconds. Use 0 to never shut down
-	--alpha\t\t\tenable alpha features`);
+	--alpha\t\t\tenable alpha features
+	--beta\t\t\tenable beta features`);
 		return;
 	}
 	if (argName === '--timeout') {
@@ -194,6 +268,11 @@ Options:
 		console.log('Enabling alpha features!');
 		enableAlpha = true;
 	}
+
+	if (argName === '--beta') {
+		console.log('Enabling beta features!');
+		enableBeta = true;
+	}
 }
 
-connect(timeout, enableAlpha);
+connect(timeout, enableAlpha, enableBeta);