WIP: feat: Further plugin API tweaks and integration

Author: celarye

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
-name = "wbps"
-description = "WASM based plugin services."
+name = "wpbs"
+description = "WASM plugin based services."
 version = "0.1.0"
 authors = ["Eduard Smet <contact@celarye.dev>"]
 license = "GPL-3.0-or-later"

Cargo.toml

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

src/config/plugins.rs

@@ -1,31 +1,37 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize)]
-pub struct ConfigPluginPermissions {
+pub struct PluginPermissions {
     #[serde(default)]
-    pub core: Vec<ConfigSupportedCoreRegistrations>,
+    pub core: Vec<PluginPermissionsCore>,
     #[serde(default)]
-    pub job_scheduler: Vec<ConfigSupportedJobSchedulerRegistrations>,
+    pub job_scheduler: Vec<PluginPermissionsJobScheduler>,
     #[serde(default)]
-    pub discord: Vec<ConfigSupportedDiscordRegistrations>,
+    pub discord: PluginPermissionsDiscord,
 }
 
-#[derive(Deserialize, PartialEq, Serialize)]
+#[derive(Default, Deserialize, Serialize)]
+pub struct PluginPermissionsDiscord {
+    pub events: Vec<PluginPermissionsDiscordEvents>,
+    pub interactions: Vec<PluginPermissionsDiscordInteractions>,
+}
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 #[serde(untagged)]
-pub enum ConfigSupportedCoreRegistrations {
+pub enum PluginPermissionsCore {
     DependencyFunctions,
     Shutdown,
 }
 
-#[derive(Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 #[serde(untagged)]
-pub enum ConfigSupportedJobSchedulerRegistrations {
+pub enum PluginPermissionsJobScheduler {
     ScheduledJobs,
 }
 
-#[derive(Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 #[serde(untagged)]
-pub enum ConfigSupportedDiscordRegistrations {
+pub enum PluginPermissionsDiscordEvents {
     MessageCreate,
     InteractionCreate,
     ThreadCreate,
@@ -35,3 +41,11 @@ pub enum ConfigSupportedDiscordRegistrations {
     ThreadMembersUpdate,
     ThreadUpdate,
 }
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum PluginPermissionsDiscordInteractions {
+    ApplicationCommands,
+    MessageComponents,
+    Modals,
+}

src/config/plugins/permissions.rs

@@ -39,8 +39,11 @@ pub fn handle_action(database: Database, message: DatabaseMessages) {
         DatabaseMessages::Get(keyspace, key, response_sender) => {
             response_sender.send(get(database, keyspace, key));
         }
-        DatabaseMessages::GetAll(keyspace, response_sender) => {
-            response_sender.send(get_all(database, keyspace));
+        DatabaseMessages::GetAllKeys(keyspace, response_sender) => {
+            response_sender.send(get_all_keys(database, keyspace));
+        }
+        DatabaseMessages::GetAllValues(keyspace, response_sender) => {
+            response_sender.send(get_all_values(database, keyspace));
         }
         DatabaseMessages::Insert(keyspace, key, value, response_sender) => {
             response_sender.send(insert(database, keyspace, key, value));
@@ -74,7 +77,13 @@ where
     Ok(keyspace.range(range))
 }
 
-pub fn get_all(database: Database, keyspace: Keyspaces) -> Result<Vec<Slice>> {
+pub fn get_all_keys(database: Database, keyspace: Keyspaces) -> Result<Vec<Slice>> {
+    Ok(range(database, keyspace, Vec::new()..=Vec::new())?
+        .map(|g| g.key())
+        .collect::<std::result::Result<Vec<Slice>, fjall::Error>>()?)
+}
+
+pub fn get_all_values(database: Database, keyspace: Keyspaces) -> Result<Vec<Slice>> {
     Ok(range(database, keyspace, Vec::new()..=Vec::new())?
         .map(|g| g.value())
         .collect::<std::result::Result<Vec<Slice>, fjall::Error>>()?)

src/database.rs

@@ -61,7 +61,7 @@ async fn main() -> ExitCode {
         }
     }
 
-    ExitCode::from(0)
+    ExitCode::from(1)
 }
 
 async fn run() -> Result<(), ()> {
@@ -97,7 +97,7 @@ async fn run() -> Result<(), ()> {
             .await
             .map_err(|_| ())?;
 
-    let runtime = Runtime::new(channels.runtime.rx);
+    let runtime = Runtime::new(channels.runtime.core_tx.clone(), channels.runtime.rx);
 
     tasks.push(job_scheduler.start().await.map_err(|_| ())?);
 

src/main.rs

@@ -7,7 +7,7 @@ use semver::Version;
 use serde::Deserialize;
 use sonic_rs::Value;
 
-use crate::config::plugins::permissions::ConfigPluginPermissions;
+use crate::config::plugins::permissions::PluginPermissions;
 
 #[derive(Deserialize)]
 #[allow(unused)]
@@ -31,7 +31,7 @@ pub struct AvailablePlugin {
     pub id: String,
     pub user_id: String,
     pub version: Version,
-    pub permissions: ConfigPluginPermissions,
+    pub permissions: PluginPermissions,
     pub environment: HashMap<String, String>,
     pub settings: Value,
 }