Fixed U.atob() + U.btoa().

petersirka · petersirka · commit 46f3bb88b993 · 2018-03-19T15:42:12.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -39,6 +39,8 @@
 - fixed: `Date.format()` now it formats a date as UTC correctly
 - fixed: HTML compressor with `\r\n` (Windows line endings)
 - fixed: schema validation
+- fixed: `U.atob()`
+- fixed: `U.btoa()`
 
 - improved: `debug` mode timing with improved consumption
 
diff --git a/test/test-utils.js b/test/test-utils.js
@@ -612,12 +612,18 @@ function other() {
 
 	var a = { buf: Buffer.from('123456') };
 	assert.ok(U.clone(a).buf !== a, 'Cloning buffers');
+
+	var input = '12345čťžýáýáííéídfsfgd';
+	var a = U.btoa(input);
+	var b = U.atob(a);
+
+	assert.ok(b === input, 'U.atob() / U.btoa()');
 }
 
 function Utils_Ls2_StringFilter() {
 	var result;
 	var async = new Utils.Async();
-	
+
 	async.await('U.ls2', function(next) {
 		U.ls2(
 			'./app',
@@ -628,7 +634,7 @@ function Utils_Ls2_StringFilter() {
 			'app'
 		);
 	});
-	
+
 	async.run(function() {
 		assert.ok(result.files.length === 1, 'problem with number of files from U.ls2 string filter');
 		assert.ok(result.files[0].filename.indexOf('virtual.txt') !== -1, 'problem with files[0].filename from U.ls2 string filter');
@@ -640,7 +646,7 @@ function Utils_Ls2_StringFilter() {
 function Utils_Ls_RegExpFilter() {
 	var result;
 	var async = new Utils.Async();
-	
+
 	async.await('U.ls', function(next) {
 		U.ls(
 			'./app',
@@ -651,7 +657,7 @@ function Utils_Ls_RegExpFilter() {
 			/QQQ/
 		);
 	});
-	
+
 	async.run(function() {
 		assert.ok(result.files.length === 0, 'problem with files from U.ls regExp filter');
 		assert.ok(result.folders.length === 0, 'problem with folders from U.ls regExp filter');
diff --git a/utils.js b/utils.js
@@ -792,11 +792,11 @@ exports.$$request = function(url, flags, data, cookies, headers, encoding, timeo
 };
 
 exports.btoa = function(str) {
-	return (str instanceof Buffer) ? str.toString('base64') : exports.createBuffer(str.toString(), 'binary').toString('base64');
+	return (str instanceof Buffer) ? str.toString('base64') : exports.createBuffer(str.toString(), 'utf8').toString('base64');
 };
 
 exports.atob = function(str) {
-	return exports.createBuffer(str, 'base64').toString('binary');
+	return exports.createBuffer(str, 'base64').toString('utf8');
 };
 
 /**
