Merge pull request #40 from Michaelpalacce/develop

[develop] v28.2.2
Michaelpalacce · Aug 8, 2020 · 2e7bbcf · 2e7bbcf
2 parents ff9a360 + 9960912
commit 2e7bbcf
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,3 +1,6 @@
+28.2.2
+- setUpPersistence with DataServerMap now works correctly without having to delete the file.
+
 28.2.1
 - X-Powered-By added when using EventRequest.send()
 

diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "test": "nyc --reporter=lcov --reporter=text-summary node test.js --debug",
     "deploy": "npm run test && npm publish"
   },
-  "version": "28.2.1",
+  "version": "28.2.2",
   "devDependencies": {
     "nyc": "^15.1.0"
   }

diff --git a/server/components/caching/data_server_map.js b/server/components/caching/data_server_map.js
@@ -47,7 +47,7 @@ class DataServerMap extends DataServer
 		}
 		else
 		{
-			fs.writeFileSync( this.persistPath, JSON.stringify( this.useBigMap ? new BigMap() : new Map() ) );
+			fs.writeFileSync( this.persistPath, JSON.stringify( this.useBigMap ? new BigMap() : new Map(), DataServerMap.replacer ) );
 		}
 	}
 

diff --git a/tests/server/components/caching/data_server_map_test.js b/tests/server/components/caching/data_server_map_test.js
@@ -780,6 +780,46 @@ test({
 	}
 });
 
+test({
+	message			: 'DataServerMap._setUpPersistence.works.correctly',
+	test			: ( done ) => {
+		const persistPath	= path.join( __dirname, 'testSetUpPersistence' );
+
+		if ( fs.existsSync( persistPath ) )
+			fs.unlinkSync( persistPath );
+
+		// Wait in case the file has not been deleted from the FS
+		setTimeout( async () => {
+			const dataServer	= new DataServerMap( { persist: true, persistPath } );
+
+			assert.deepStrictEqual( fs.readFileSync( persistPath ).toString(), '{"dataType":"Map","value":[]}' );
+
+			removeCache( dataServer );
+			done();
+		}, 10 );
+	}
+});
+
+test({
+	message			: 'DataServerMap._setUpPersistence.works.correctly',
+	test			: ( done ) => {
+		const persistPath	= path.join( __dirname, 'testSetUpPersistenceBigMap' );
+
+		if ( fs.existsSync( persistPath ) )
+			fs.unlinkSync( persistPath );
+
+		// Wait in case the file has not been deleted from the FS
+		setTimeout( async () => {
+			const dataServer	= new DataServerMap( { persist: true, persistPath, useBigMap: true } );
+
+			assert.deepStrictEqual( fs.readFileSync( persistPath ).toString(), '{"dataType":"BigMap","value":{"maps":[{"dataType":"Map","value":[]}],"_limit":14000000}}' );
+
+			removeCache( dataServer );
+			done();
+		}, 10 );
+	}
+});
+
 test({
 	message			: 'DataServerMap.unlock.returns.false.on.invalid.arguments',
 	test			: ( done ) => {