feat: add new server endpoints (#292)

Author: ferreira-tb

Cargo.lock

@@ -23,3 +23,11 @@ pub async fn get_public_bot(app: AppHandle, req: GetPublicBotRequest) -> Result<
     .await
     .map_err(Into::into)
 }
+
+#[tauri::command]
+pub async fn get_public_bots(app: AppHandle, req: GetPublicBotsRequest) -> Result<Vec<PublicBot>> {
+  app
+    .client(async |cl| cl.get_public_bots(req).await)
+    .await
+    .map_err(Into::into)
+}

app/src-tauri/src/command/npc/bot.rs

@@ -29,3 +29,14 @@ pub async fn get_public_precursor(
     .await
     .map_err(Into::into)
 }
+
+#[tauri::command]
+pub async fn get_public_precursors(
+  app: AppHandle,
+  req: GetPublicPrecursorsRequest,
+) -> Result<Vec<PublicPrecursor>> {
+  app
+    .client(async |cl| cl.get_public_precursors(req).await)
+    .await
+    .map_err(Into::into)
+}

app/src-tauri/src/command/npc/precursor.rs

@@ -10,6 +10,7 @@ use nil_core::military::Military;
 use nil_core::player::{Player, PlayerStatus, PublicPlayer};
 use nil_core::report::ReportId;
 use nil_core::resources::maintenance::Maintenance;
+use nil_core::world::config::WorldId;
 use nil_payload::player::*;
 use tap::Pipe;
 use tauri::AppHandle;
@@ -89,6 +90,17 @@ pub async fn get_player_storage_capacity(
     .map_err(Into::into)
 }
 
+#[tauri::command]
+pub async fn get_player_worlds(
+  app: AppHandle,
+  req: GetPlayerWorldsRequest,
+) -> Result<Vec<WorldId>> {
+  app
+    .client(async |cl| cl.get_player_worlds(req).await)
+    .await
+    .map_err(Into::into)
+}
+
 #[tauri::command]
 pub async fn get_players(app: AppHandle, req: GetPlayersRequest) -> Result<Vec<Player>> {
   app

app/src-tauri/src/command/player.rs

@@ -4,6 +4,8 @@
 use crate::error::{CoreError, Error, Result};
 use crate::manager::ManagerExt;
 use itertools::Itertools;
+use nil_core::npc::bot::BotId;
+use nil_core::npc::precursor::PrecursorId;
 use nil_core::player::{Player, PlayerId};
 use nil_core::savedata::{Savedata, SavedataInfo};
 use nil_core::world::config::{WorldConfig, WorldId};
@@ -53,6 +55,14 @@ pub async fn get_savedata_players(path: PathBuf) -> Result<Vec<PlayerId>> {
   .map_err(Into::into)
 }
 
+#[tauri::command]
+pub async fn get_world_bots(app: AppHandle, req: GetWorldBotsRequest) -> Result<Vec<BotId>> {
+  app
+    .client(async |cl| cl.get_world_bots(req).await)
+    .await
+    .map_err(Into::into)
+}
+
 #[tauri::command]
 pub async fn get_world_config(app: AppHandle, req: GetWorldConfigRequest) -> Result<WorldConfig> {
   app
@@ -61,6 +71,28 @@ pub async fn get_world_config(app: AppHandle, req: GetWorldConfigRequest) -> Res
     .map_err(Into::into)
 }
 
+#[tauri::command]
+pub async fn get_world_players(
+  app: AppHandle,
+  req: GetWorldPlayersRequest,
+) -> Result<Vec<PlayerId>> {
+  app
+    .client(async |cl| cl.get_world_players(req).await)
+    .await
+    .map_err(Into::into)
+}
+
+#[tauri::command]
+pub async fn get_world_precursors(
+  app: AppHandle,
+  req: GetWorldPrecursorsRequest,
+) -> Result<Vec<PrecursorId>> {
+  app
+    .client(async |cl| cl.get_world_precursors(req).await)
+    .await
+    .map_err(Into::into)
+}
+
 #[tauri::command]
 pub async fn get_world_stats(app: AppHandle, req: GetWorldStatsRequest) -> Result<WorldStats> {
   app

app/src-tauri/src/command/world.rs

@@ -114,15 +114,18 @@ pub fn run() {
       command::military::request_maneuver,
       command::npc::bot::get_bot_coords,
       command::npc::bot::get_public_bot,
+      command::npc::bot::get_public_bots,
       command::npc::precursor::get_precursor_coords,
       command::npc::precursor::get_public_precursor,
+      command::npc::precursor::get_public_precursors,
       command::player::get_player,
       command::player::get_player_coords,
       command::player::get_player_maintenance,
       command::player::get_player_military,
       command::player::get_player_reports,
       command::player::get_player_status,
       command::player::get_player_storage_capacity,
+      command::player::get_player_worlds,
       command::player::get_players,
       command::player::get_public_player,
       command::player::get_public_players,
@@ -153,7 +156,10 @@ pub fn run() {
       command::world::get_remote_world,
       command::world::get_remote_worlds,
       command::world::get_savedata_players,
+      command::world::get_world_bots,
       command::world::get_world_config,
+      command::world::get_world_players,
+      command::world::get_world_precursors,
       command::world::get_world_stats,
       command::world::read_savedata_info,
       command::world::save_local_world,

app/src-tauri/src/lib.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { invoke } from '@tauri-apps/api/core';
-import type { GetBotCoordsRequest, GetPublicBotRequest } from '@/lib/request';
+import type { GetBotCoordsRequest, GetPublicBotRequest, GetPublicBotsRequest } from '@/lib/request';
 
 export async function getBotCoords(id: BotId) {
   const req: GetBotCoordsRequest = {
@@ -21,3 +21,11 @@ export async function getPublicBot(id: BotId) {
 
   return invoke<PublicBot>('get_public_bot', { req });
 }
+
+export async function getPublicBots() {
+  const req: GetPublicBotsRequest = {
+    world: NIL.world.getIdStrict(),
+  };
+
+  return invoke<readonly PublicBot[]>('get_public_bots', { req });
+}

app/src/commands/npc/bot.ts

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { invoke } from '@tauri-apps/api/core';
-import type { GetPrecursorCoordsRequest, GetPublicPrecursorRequest } from '@/lib/request';
+import type {
+  GetPrecursorCoordsRequest,
+  GetPublicPrecursorRequest,
+  GetPublicPrecursorsRequest,
+} from '@/lib/request';
 
 export async function getPrecursorCoords(id: PrecursorId) {
   const req: GetPrecursorCoordsRequest = {
@@ -21,3 +25,11 @@ export async function getPublicPrecursor(id: PrecursorId) {
 
   return invoke<PublicPrecursor>('get_public_precursor', { req });
 }
+
+export async function getPublicPrecursors() {
+  const req: GetPublicPrecursorsRequest = {
+    world: NIL.world.getIdStrict(),
+  };
+
+  return invoke<readonly PublicPrecursor[]>('get_public_precursors', { req });
+}

app/src/commands/npc/precursor.ts

@@ -12,6 +12,7 @@ import type {
   GetPlayersRequest,
   GetPlayerStatusRequest,
   GetPlayerStorageCapacityRequest,
+  GetPlayerWorldsRequest,
   GetPublicPlayerRequest,
   GetPublicPlayersRequest,
   PlayerExistsRequest,
@@ -78,6 +79,11 @@ export async function getPlayerStorageCapacity() {
   return invoke<OverallStorageCapacity>('get_player_storage_capacity', { req });
 }
 
+export async function getPlayerWorlds(id: PlayerId) {
+  const req: GetPlayerWorldsRequest = { id };
+  return invoke<readonly WorldId[]>('get_player_worlds', { req });
+}
+
 export async function getPlayers() {
   const req: GetPlayersRequest = {
     world: NIL.world.getIdStrict(),

app/src/commands/player.ts

@@ -9,7 +9,10 @@ import { type RawWorldStats, WorldStatsImpl } from '@/core/model/stats/world-sta
 import type {
   CreateRemoteWorldRequest,
   GetRemoteWorldRequest,
+  GetWorldBotsRequest,
   GetWorldConfigRequest,
+  GetWorldPlayersRequest,
+  GetWorldPrecursorsRequest,
   GetWorldStatsRequest,
   SaveLocalWorldRequest,
 } from '@/lib/request';
@@ -41,6 +44,14 @@ export async function getSavedataPlayers(path: string) {
   return invoke<readonly PlayerId[]>('get_savedata_players', { path });
 }
 
+export async function getWorldBots(world?: Option<WorldId>) {
+  const req: GetWorldBotsRequest = {
+    world: world ?? NIL.world.getIdStrict(),
+  };
+
+  return invoke<readonly BotId[]>('get_world_bots', { req });
+}
+
 export async function getWorldConfig(world?: Option<WorldId>): Promise<WorldConfigImpl> {
   const req: GetWorldConfigRequest = {
     world: world ?? NIL.world.getIdStrict(),
@@ -50,6 +61,22 @@ export async function getWorldConfig(world?: Option<WorldId>): Promise<WorldConf
   return WorldConfigImpl.create(config);
 }
 
+export async function getWorldPlayers(world?: Option<WorldId>) {
+  const req: GetWorldPlayersRequest = {
+    world: world ?? NIL.world.getIdStrict(),
+  };
+
+  return invoke<readonly PlayerId[]>('get_world_players', { req });
+}
+
+export async function getWorldPrecursors(world?: Option<WorldId>) {
+  const req: GetWorldPrecursorsRequest = {
+    world: world ?? NIL.world.getIdStrict(),
+  };
+
+  return invoke<readonly PrecursorId[]>('get_world_precursors', { req });
+}
+
 export async function getWorldStats(world?: Option<WorldId>): Promise<WorldStatsImpl> {
   const req: GetWorldStatsRequest = {
     world: world ?? NIL.world.getIdStrict(),