WIP: feat: Project restructure

Author: celarye

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
-name = "discord-bot"
-description = "A WASI plugin based Discord bot, configurable through YAML."
+name = "wbps"
+description = "WASM based plugin services."
 version = "0.1.0"
 authors = ["Eduard Smet <contact@celarye.dev>"]
 license = "GPL-3.0-or-later"

Cargo.toml

@@ -7,7 +7,9 @@ use indexmap::IndexMap;
 use serde::Deserialize;
 use tracing::{error, info};
 
-use crate::plugins::ConfigPlugin;
+use crate::config::plugins::ConfigPlugin;
+
+pub mod plugins;
 
 #[derive(Deserialize)]
 pub struct Config {

src/config.rs

@@ -0,0 +1,17 @@
+use std::collections::HashMap;
+
+use serde::Deserialize;
+use sonic_rs::Value;
+
+use crate::config::plugins::permissions::ConfigPluginPermissions;
+
+pub mod permissions;
+
+#[derive(Deserialize)]
+pub struct ConfigPlugin {
+    pub plugin: String,
+    pub cache: Option<bool>,
+    pub permissions: ConfigPluginPermissions,
+    pub environment: Option<HashMap<String, String>>,
+    pub settings: Option<Value>,
+}

src/config/plugins.rs

@@ -0,0 +1,37 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Deserialize, Serialize)]
+pub struct ConfigPluginPermissions {
+    #[serde(default)]
+    pub core: Vec<ConfigSupportedCoreRegistrations>,
+    #[serde(default)]
+    pub job_scheduler: Vec<ConfigSupportedJobSchedulerRegistrations>,
+    #[serde(default)]
+    pub discord: Vec<ConfigSupportedDiscordRegistrations>,
+}
+
+#[derive(Deserialize, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum ConfigSupportedCoreRegistrations {
+    DependencyFunctions,
+    Shutdown,
+}
+
+#[derive(Deserialize, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum ConfigSupportedJobSchedulerRegistrations {
+    ScheduledJobs,
+}
+
+#[derive(Deserialize, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum ConfigSupportedDiscordRegistrations {
+    MessageCreate,
+    InteractionCreate,
+    ThreadCreate,
+    ThreadDelete,
+    ThreadListSync,
+    ThreadMemberUpdate,
+    ThreadMembersUpdate,
+    ThreadUpdate,
+}

src/config/plugins/permissions.rs

@@ -10,7 +10,7 @@ use twilight_model::application::interaction::InteractionData;
 
 use crate::{
     discord::DiscordBotClient,
-    plugins::discord_bot::plugin::discord_export_types::DiscordEvents,
+    runtime::plugins::exports::wbps::plugin::discord_export_functions::DiscordEvents,
     utils::channels::{CoreMessages, RuntimeMessages, RuntimeMessagesDiscord},
 };
 

src/discord/events.rs

@@ -14,21 +14,19 @@ use twilight_model::{
     },
 };
 
-use crate::{discord::DiscordBotClient, plugins::PluginRegistrationRequestsApplicationCommand};
+use crate::discord::DiscordBotClient;
 
 impl DiscordBotClient {
     pub async fn application_command_registrations(
         http_client: Arc<Client>,
-        discord_application_command_registration_request: Vec<
-            PluginRegistrationRequestsApplicationCommand,
-        >,
+        discord_application_command_registration_request: Vec<Vec<u8>>,
     ) -> Result<(Vec<String>, Vec<String>)> {
         let mut discord_commands = HashMap::new();
 
         let mut commands = HashMap::new();
 
         for command in discord_application_command_registration_request {
-            let command_data = match sonic_rs::from_slice::<Command>(&command.data) {
+            let command_data = match sonic_rs::from_slice::<Command>(&command) {
                 Ok(command) => command,
                 Err(err) => {
                     error!(

src/discord/interactions.rs

@@ -17,9 +17,8 @@ use twilight_model::gateway::{
 
 use crate::{
     discord::DiscordBotClient,
-    plugins::discord_bot::plugin::{
-        discord_import_functions::{DiscordRequests, DiscordResponses},
-        discord_import_types::Body,
+    runtime::plugins::wbps::plugin::discord_import_types::{
+        Body, DiscordRequests, DiscordResponses,
     },
 };
 

src/discord/requests.rs

@@ -78,7 +78,7 @@ impl JobScheduler {
             let core_tx = core_tx.clone();
 
             Box::pin(async move {
-                let _ = core_tx.send(CoreMessages::RuntimeModule(RuntimeMessages::JobScheduler(
+                let _ = core_tx.send(CoreMessages::Runtime(RuntimeMessages::JobScheduler(
                     RuntimeMessagesJobScheduler::CallScheduledJob(plugin_id, job_id),
                 )));
             })

src/job_scheduler.rs

@@ -25,17 +25,20 @@ mod database;
 mod discord;
 mod http;
 mod job_scheduler;
-mod plugins;
+mod registry;
+mod runtime;
 mod utils;
 
 use cli::{Cli, CliLogParameters};
 use config::Config;
 use discord::DiscordBotClient;
 use job_scheduler::JobScheduler;
-use plugins::{registry, runtime::Runtime};
 use utils::{channels::Channels, env::Secrets};
 
-use crate::utils::channels::{ChannelsCore, CoreMessages};
+use crate::{
+    runtime::Runtime,
+    utils::channels::{ChannelsCore, CoreMessages},
+};
 
 #[derive(PartialEq)]
 enum Shutdown {
@@ -149,7 +152,7 @@ fn start(database: Database, mut channels_core: ChannelsCore) -> JoinHandle<()>
                         .discord_bot_client_tx
                         .send(discord_bot_client_message);
                 }
-                CoreMessages::RuntimeModule(runtime_message) => {
+                CoreMessages::Runtime(runtime_message) => {
                     channels_core.runtime_tx.send(runtime_message);
                 }
                 CoreMessages::Shutdown(shutdown) => todo!(), // TODO: Figure shutdown out