Merge pull request #612 from MihailRis/update-base64

Add url-safe function versions to base64

doc/en/scripting/builtins/libbase64.md

@@ -8,4 +8,10 @@ base64.encode(bytes: table|ByteArray) -> str
 
 -- Decode base64 string to ByteArray or lua table if second argument is set to true
 base64.decode(base64string: str, [optional]usetable: bool=false) -> table|ByteArray
+
+-- Encode bytes to urlsafe-base64 string ('-', '_' instead of '+', '/')
+base64.encode_urlsafe(bytes: table|ByteArray) -> str
+
+-- Decodes urlsafe-base64 string to a ByteArray or a table of numbers if the second argument is set to true
+base64.decode_urlsafe(base64string: str, [optional]usetable: bool=false) -> table|ByteArray
 ```

doc/ru/scripting/builtins/libbase64.md

@@ -8,4 +8,10 @@ base64.encode(bytes: table|ByteArray) -> str
 
 -- Декодирует base64 строку в ByteArray или таблицу чисел, если второй аргумент установлен на true
 base64.decode(base64string: str, [опционально]usetable: bool=false) -> table|ByteArray
+
+-- Кодирует массив байт в urlsafe-base64 строку ('-', '_' вместо '+', '/')
+base64.encode_urlsafe(bytes: table|ByteArray) -> str
+
+-- Декодирует urlsafe-base64 строку в ByteArray или таблицу чисел, если второй аргумент установлен на true
+base64.decode_urlsafe(base64string: str, [опционально]usetable: bool=false) -> table|ByteArray
 ```

src/logic/scripting/lua/libs/libbase64.cpp

@@ -2,6 +2,7 @@
 
 #include "util/stringutil.hpp"
 
+template<std::string(*encode_func)(const ubyte*, size_t)>
 static int l_encode(lua::State* L) {
     if (lua::istable(L, 1)) {
         lua::pushvalue(L, 1);
@@ -13,12 +14,12 @@ static int l_encode(lua::State* L) {
             lua::pop(L);
         }
         lua::pop(L);
-        return lua::pushstring(L, util::base64_encode(
+        return lua::pushstring(L, encode_func(
             reinterpret_cast<const ubyte*>(buffer.data()), buffer.size()
         ));
     } else {
         auto string = lua::bytearray_as_string(L, 1);
-        auto out = util::base64_encode(
+        auto out = encode_func(
             reinterpret_cast<const ubyte*>(string.data()),
             string.size()
         );
@@ -28,8 +29,9 @@ static int l_encode(lua::State* L) {
     throw std::runtime_error("array or ByteArray expected");
 }
 
+template<util::Buffer<ubyte>(*decode_func)(std::string_view)>
 static int l_decode(lua::State* L) {
-    auto buffer = util::base64_decode(lua::require_lstring(L, 1));
+    auto buffer = decode_func(lua::require_lstring(L, 1));
     if (lua::toboolean(L, 2)) {
         lua::createtable(L, buffer.size(), 0);
         for (size_t i = 0; i < buffer.size(); i++) {
@@ -43,7 +45,9 @@ static int l_decode(lua::State* L) {
 }
 
 const luaL_Reg base64lib[] = {
-    {"encode", lua::wrap<l_encode>},
-    {"decode", lua::wrap<l_decode>},
+    {"encode", lua::wrap<l_encode<util::base64_encode>>},
+    {"decode", lua::wrap<l_decode<util::base64_decode>>},
+    {"encode_urlsafe", lua::wrap<l_encode<util::base64_urlsafe_encode>>},
+    {"decode_urlsafe", lua::wrap<l_decode<util::base64_urlsafe_decode>>},
     {NULL, NULL}
 };