chore: move header files

src/Permission/Permission.h → include/PermissionCore/PermissionCore/PermissionCore.h

@@ -1,15 +1,38 @@
-#include "db/db.h"
+#pragma once
+
 #include "entry/Macros.h"
-#include "permission/struct.h"
 #include <memory>
+#include <optional>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 
 namespace perm {
 
 using string = std::string;
 
+struct PERMISSION_CORE_API UserGroup {
+    std::string              groupName;
+    std::vector<std::string> authority;
+    std::vector<std::string> user;
+};
+struct PERMISSION_CORE_API PluginPermData {
+    std::vector<std::string> admin;
+    std::vector<UserGroup>   user;
+    std::vector<std::string> publicAuthority;
+};
+struct PERMISSION_CORE_API GetUserGroupStruct {
+    const int       index;
+    const UserGroup data;
+
+    GetUserGroupStruct(int idx, const UserGroup& grp) : index(idx), data(grp) {}
+};
+struct PERMISSION_CORE_API GetUserPermissionsStruct {
+    std::unordered_map<string, std::vector<string>> source;
+    std::vector<string>                             authority;
+};
+
 class PERMISSION_CORE_API PermissionCore {
 public:
     PermissionCore(string pluginName, bool enablePublicGroups);
@@ -26,9 +49,9 @@ class PERMISSION_CORE_API PermissionCore {
     //! user
     bool hasUserGroup(const std::string& name);
 
-    const std::optional<perm::structs::GetUserGroupStruct> getUserGroup(const string& name);
+    const std::optional<GetUserGroupStruct> getUserGroup(const string& name);
 
-    const std::vector<perm::structs::UserGroup>& getAllUserGroups();
+    const std::vector<UserGroup>& getAllUserGroups();
 
     bool createUserGroup(const std::string& name);
 
@@ -48,9 +71,9 @@ class PERMISSION_CORE_API PermissionCore {
 
     bool removeUserToUserGroup(const std::string& name, const std::string& userid);
 
-    const std::vector<perm::structs::UserGroup> getUserGroupsOfUser(const string& userid);
+    const std::vector<UserGroup> getUserGroupsOfUser(const string& userid);
 
-    const std::optional<perm::structs::GetUserPermissionsStruct> getUserPermissionOfUserData(const string& userid);
+    const std::optional<GetUserPermissionsStruct> getUserPermissionOfUserData(const string& userid);
 
     //! public
     const std::vector<std::string>& getPublicGroupAllPermissions();
@@ -70,7 +93,7 @@ class PERMISSION_CORE_API PermissionCore {
     static bool validateName(const std::string& name);
 
 private:
-    std::unique_ptr<perm::structs::PluginPermData> data;
+    std::unique_ptr<PluginPermData> data;
 
     bool   enablePublicGroups;
     string pluginName;

src/register/register.h → include/PermissionCore/Registers/Registers.h

@@ -1,3 +1,4 @@
+#pragma once
 #include "entry/Macros.h"
 #include <optional>
 #include <string>

include/include_all.h

@@ -0,0 +1,2 @@
+#include "PermissionCore/PermissionCore/PermissionCore.h"
+#include "PermissionCore/Registers/Registers.h"

src/DB/db.cpp

@@ -1,6 +1,6 @@
 #include "db/db.h"
 #include "entry/Entry.h"
-#include "permission/struct.h"
+#include "include_all.h"
 #include <ll/api/data/KeyValueDB.h>
 #include <memory>
 #include <nlohmann/json.hpp>
@@ -30,11 +30,11 @@ bool loadLevelDB() {
 using string = std::string;
 using json   = nlohmann::json;
 
-perm::structs::PluginPermData from_json(const json& j) {
-    perm::structs::PluginPermData permData;
+PluginPermData from_json(const json& j) {
+    PluginPermData permData;
     permData.admin = j["admin"].get<std::vector<std::string>>();
     for (const auto& userGroup : j["user"]) {
-        perm::structs::UserGroup group;
+        UserGroup group;
         group.groupName = userGroup["groupName"];
         group.authority = userGroup["authority"].get<std::vector<std::string>>();
         group.user      = userGroup["user"].get<std::vector<std::string>>();
@@ -44,7 +44,7 @@ perm::structs::PluginPermData from_json(const json& j) {
     return permData;
 }
 
-json to_json(const perm::structs::PluginPermData& permData) {
+json to_json(const PluginPermData& permData) {
     json data;
     data["admin"] = permData.admin;
     for (const auto& group : permData.user) {
@@ -58,7 +58,7 @@ json to_json(const perm::structs::PluginPermData& permData) {
     return data;
 }
 
-std::optional<perm::structs::PluginPermData> getPluginData(string pluginName) {
+std::optional<PluginPermData> getPluginData(string pluginName) {
     auto& logger = entry::entry::getInstance().getSelf().getLogger();
     try {
         auto d = mKVDB->get(pluginName);
@@ -73,7 +73,7 @@ std::optional<perm::structs::PluginPermData> getPluginData(string pluginName) {
     }
 }
 
-bool setPluginData(string pluginName, perm::structs::PluginPermData& data) {
+bool setPluginData(string pluginName, PluginPermData& data) {
     auto& logger = entry::entry::getInstance().getSelf().getLogger();
     try {
         auto j   = to_json(data);

src/DB/db.h

@@ -1,4 +1,4 @@
-#include "permission/struct.h"
+#include "include_all.h"
 #include <ll/api/data/KeyValueDB.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
@@ -15,12 +15,12 @@ std::unique_ptr<ll::data::KeyValueDB>&       getInstance();
 
 bool loadLevelDB();
 
-json                          to_json(const perm::structs::PluginPermData& permData);
-perm::structs::PluginPermData from_json(const json& j);
+json           to_json(const PluginPermData& permData);
+PluginPermData from_json(const json& j);
 
-std::optional<perm::structs::PluginPermData> getPluginData(string pluginName);
-bool                                         setPluginData(string pluginName, perm::structs::PluginPermData& data);
-bool                                         initPluginData(string pluginName);
-bool                                         isPluginInit(string pluginName);
+std::optional<PluginPermData> getPluginData(string pluginName);
+bool                          setPluginData(string pluginName, PluginPermData& data);
+bool                          initPluginData(string pluginName);
+bool                          isPluginInit(string pluginName);
 
 } // namespace perm::db

src/Entry/Entry.cpp

@@ -5,6 +5,8 @@
 
 // my
 #include "db/db.h"
+
+
 namespace entry {
 
 entry::entry() = default;

src/Permission/Permission.cpp → src/PermissionCore/PermissionCore.cpp

@@ -1,5 +1,5 @@
-#include "permission/Permission.h"
 #include "db/db.h"
+#include "include_all.h"
 #include <exception>
 #include <fstream>
 #include <iostream>
@@ -11,6 +11,7 @@
 #include <string>
 #include <vector>
 
+
 namespace perm {
 
 using json   = nlohmann::json;
@@ -26,7 +27,7 @@ bool PermissionCore::loadPermDataFromDB() {
     }
     auto d = perm::db::getPluginData(pluginName);
     if (d) {
-        data = std::unique_ptr<perm::structs::PluginPermData>(new perm::structs::PluginPermData(*d));
+        data = std::unique_ptr<PluginPermData>(new PluginPermData(*d));
         return true;
     }
     return false;
@@ -76,24 +77,24 @@ bool PermissionCore::hasUserGroup(const string& name) {
 }
 
 // 获取组
-const std::optional<perm::structs::GetUserGroupStruct> PermissionCore::getUserGroup(const string& name) {
+const std::optional<GetUserGroupStruct> PermissionCore::getUserGroup(const string& name) {
     auto& userGroup = data->user;
     for (size_t i = 0; i < userGroup.size(); ++i) {
         if (userGroup[i].groupName == name) {
             // 使用构造函数创建a的实例
-            return perm::structs::GetUserGroupStruct(i, userGroup[i]);
+            return GetUserGroupStruct(i, userGroup[i]);
         }
     }
     return std::nullopt;
 }
 
 // 获取所有组
-const std::vector<perm::structs::UserGroup>& PermissionCore::getAllUserGroups() { return data->user; }
+const std::vector<UserGroup>& PermissionCore::getAllUserGroups() { return data->user; }
 
 // 创建组
 bool PermissionCore::createUserGroup(const string& name) {
     if (hasUserGroup(name) || !validateName(name)) return false;
-    perm::structs::UserGroup gp;
+    UserGroup gp;
     gp.groupName = name;
     gp.user      = std::vector<string>();
     gp.authority = std::vector<string>();
@@ -182,8 +183,8 @@ bool PermissionCore::removeUserToUserGroup(const string& name, const string& use
 }
 
 // 获取用户所在的组
-const std::vector<perm::structs::UserGroup> PermissionCore::getUserGroupsOfUser(const string& userid) {
-    std::vector<perm::structs::UserGroup> us;
+const std::vector<UserGroup> PermissionCore::getUserGroupsOfUser(const string& userid) {
+    std::vector<UserGroup> us;
 
     auto& userGroup = data->user;
     for (const auto& group : userGroup) {
@@ -198,9 +199,8 @@ const std::vector<perm::structs::UserGroup> PermissionCore::getUserGroupsOfUser(
 }
 
 // 获取用户权限
-const std::optional<perm::structs::GetUserPermissionsStruct>
-PermissionCore::getUserPermissionOfUserData(const string& userid) {
-    perm::structs::GetUserPermissionsStruct data;
+const std::optional<GetUserPermissionsStruct> PermissionCore::getUserPermissionOfUserData(const string& userid) {
+    GetUserPermissionsStruct data;
 
     auto groups = getUserGroupsOfUser(userid);
     for (const auto& group : groups) {

src/register/register.cpp → src/Registers/Registers.cpp

@@ -1,5 +1,4 @@
-#include "register/register.h"
-#include "permission/Permission.h"
+#include "include_all.h"
 #include <algorithm>
 
 

xmake.lua

@@ -19,7 +19,7 @@ target("Permission") -- Change this to your plugin name.
         "PERMISSION_CORE_API_EXPORT" -- export dll api
     )
     add_files("src/**.cpp")
-    add_includedirs("src")
+    add_includedirs("src", "include")
     add_packages("levilamina")
     add_shflags("/DELAYLOAD:bedrock_server.dll") -- To use symbols provided by SymbolProvider.
     set_exceptions("none") -- To avoid conflicts with /EHa.