Compare commits

..

1 Commits

Author SHA1 Message Date
Dmitry Popov
d2f7e4a892 feat(Core): Added unsplashed systems support 2025-10-16 22:11:19 +02:00
16 changed files with 175 additions and 98 deletions

View File

@@ -2,24 +2,6 @@
<!-- changelog -->
## [v1.82.2](https://github.com/wanderer-industries/wanderer/compare/v1.82.1...v1.82.2) (2025-10-21)
### Bug Fixes:
* Map: Fix system static info - for J012635 add D382; for J015092 - changed from J244, Z060 to N110, J244; for J000487 removed C008
## [v1.82.1](https://github.com/wanderer-industries/wanderer/compare/v1.82.0...v1.82.1) (2025-10-20)
### Bug Fixes:
* Core: Fixed 'viewer' map access & characters tracking
## [v1.82.0](https://github.com/wanderer-industries/wanderer/compare/v1.81.15...v1.82.0) (2025-10-15)

View File

@@ -19,7 +19,13 @@ import {
} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants';
import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
import { TooltipPosition, WdTooltip, WdTooltipHandlers, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
import { ExtendedSystemSignature, SignatureGroup, SignatureKind, SystemSignature } from '@/hooks/Mapper/types';
import {
ExtendedSystemSignature,
OutCommand,
SignatureGroup,
SignatureKind,
SystemSignature,
} from '@/hooks/Mapper/types';
import {
renderAddedTimeLeft,
@@ -73,6 +79,7 @@ export const SystemSignaturesContent = ({
const [hoveredSignature, setHoveredSignature] = useState<SystemSignature | null>(null);
const {
outCommand,
storedSettings: { settingsSignatures, settingsSignaturesUpdate },
} = useMapRootState();
@@ -238,6 +245,16 @@ export const SystemSignaturesContent = ({
});
}, []);
const handleUnsplash = useCallback(
async (row: SystemSignature) => {
await outCommand({
type: OutCommand.unsplashSignature,
data: { system_id: systemId, eve_id: row.eve_id },
});
},
[outCommand],
);
return (
<div ref={tableRef} className="h-full">
{filteredSignatures.length === 0 ? (
@@ -354,8 +371,11 @@ export const SystemSignaturesContent = ({
{!selectable && (
<Column
header=""
body={() => (
body={(row: SystemSignature) => (
<div className="flex justify-end items-center gap-2 mr-[4px]">
<WdTooltipWrapper content="Unsplash signature">
<span className={PrimeIcons.SHARE_ALT + ' text-[10px]'} onClick={() => handleUnsplash(row)} />
</WdTooltipWrapper>
<WdTooltipWrapper content="Double-click a row to edit signature">
<span className={PrimeIcons.PENCIL + ' text-[10px]'} />
</WdTooltipWrapper>

View File

@@ -282,6 +282,7 @@ export enum OutCommand {
unlinkSignature = 'unlink_signature',
searchSystems = 'search_systems',
undoDeleteSignatures = 'undo_delete_signatures',
unsplashSignature = 'unsplash_signature',
}
export type OutCommandHandler = <T = unknown>(event: { type: OutCommand; data: unknown }) => Promise<T>;

View File

@@ -1,5 +1,6 @@
defmodule WandererApp.CachedInfo do
require Logger
use(Nebulex.Caching)
def run(_arg) do
:ok = cache_trig_systems()
@@ -39,7 +40,7 @@ defmodule WandererApp.CachedInfo do
def get_system_static_info(solar_system_id) do
case Cachex.get(:system_static_info_cache, solar_system_id) do
{:ok, nil} ->
case WandererApp.Api.MapSolarSystem.read() do
case get_solar_systems() do
{:ok, systems} ->
systems
|> Enum.each(fn system ->
@@ -70,8 +71,24 @@ defmodule WandererApp.CachedInfo do
end)
case Cachex.get(:system_static_info_cache, solar_system_id) do
{:ok, nil} -> {:error, :not_found}
result -> result
{:ok, nil} ->
system_static_info = %{
solar_system_id: solar_system_id,
solar_system_name: "Unsplashed",
region_name: "Unknown",
system_class: 5
}
Cachex.put(
:system_static_info_cache,
solar_system_id,
system_static_info
)
{:ok, system_static_info}
result ->
result
end
{:error, reason} ->
@@ -99,6 +116,24 @@ defmodule WandererApp.CachedInfo do
end
end
def get_random_solar_system_id() do
result = -:rand.uniform(1_000_000_000)
case Cachex.exists?(:system_static_info_cache, result) do
{:ok, true} ->
get_random_solar_system_id()
_ ->
result
end
end
@decorate cacheable(
cache: WandererApp.Cache,
key: "solar_systems"
)
def get_solar_systems(), do: WandererApp.Api.MapSolarSystem.read()
def get_wormhole_types() do
case WandererApp.Cache.lookup(:wormhole_types) do
{:ok, nil} ->

View File

@@ -173,11 +173,12 @@ defmodule WandererApp.Character.TrackingUtils do
%{
id: character_id,
eve_id: eve_id
} = _character,
},
map_id,
is_track_allowed,
caller_pid
) do
)
when not is_nil(caller_pid) do
WandererAppWeb.Presence.update(caller_pid, map_id, character_id, %{
tracked: is_track_allowed,
from: DateTime.utc_now()
@@ -216,16 +217,13 @@ defmodule WandererApp.Character.TrackingUtils do
end
defp track_character(
character,
_character,
_map_id,
_is_track_allowed,
_caller_pid
) do
Logger.error(
"Invalid character data for tracking - character must have :id and :eve_id fields, got: #{inspect(character)}"
)
{:error, "Invalid character data"}
Logger.error("caller_pid is required for tracking characters")
{:error, "caller_pid is required"}
end
def untrack(characters, map_id, caller_pid) do
@@ -245,7 +243,7 @@ defmodule WandererApp.Character.TrackingUtils do
:ok
else
true ->
Logger.error("caller_pid is required for untracking characters 2")
Logger.error("caller_pid is required for untracking characters")
{:error, "caller_pid is required"}
end
end

View File

@@ -312,7 +312,10 @@ defmodule WandererApp.Kills.Client do
@impl true
def handle_cast({:subscribe_systems, system_ids}, state) do
{updated_systems, to_subscribe} =
Manager.subscribe_systems(state.subscribed_systems, system_ids)
Manager.subscribe_systems(
state.subscribed_systems,
system_ids |> Enum.filter(fn id -> id > 0 end)
)
# Log subscription details
if length(to_subscribe) > 0 do
@@ -635,7 +638,7 @@ defmodule WandererApp.Kills.Client do
@impl true
def handle_connected(transport, state) do
join_params = %{
systems: state.subscribed_systems,
systems: state.subscribed_systems |> Enum.filter(fn id -> id > 0 end),
client_identifier: "wanderer_app"
}
@@ -710,7 +713,9 @@ defmodule WandererApp.Kills.Client do
@impl true
def handle_info({:subscribe_systems, system_ids}, transport, state) do
case push_to_channel(transport, "subscribe_systems", %{"systems" => system_ids}) do
case push_to_channel(transport, "subscribe_systems", %{
"systems" => system_ids |> Enum.filter(fn id -> id > 0 end)
}) do
:ok ->
Logger.debug(fn -> "[Handler] Successfully pushed subscribe_systems event" end)
@@ -723,7 +728,9 @@ defmodule WandererApp.Kills.Client do
@impl true
def handle_info({:unsubscribe_systems, system_ids}, transport, state) do
case push_to_channel(transport, "unsubscribe_systems", %{"systems" => system_ids}) do
case push_to_channel(transport, "unsubscribe_systems", %{
"systems" => system_ids |> Enum.filter(fn id -> id > 0 end)
}) do
:ok ->
Logger.debug(fn -> "[Handler] Successfully pushed unsubscribe_systems event" end)
@@ -796,7 +803,10 @@ defmodule WandererApp.Kills.Client do
@spec validate_system_ids(list()) :: {:ok, [integer()]} | {:error, :invalid_system_ids}
defp validate_system_ids(system_ids) when is_list(system_ids) do
results = Enum.map(system_ids, &validate_system_id/1)
results =
system_ids
|> Enum.filter(fn id -> id > 0 end)
|> Enum.map(&validate_system_id/1)
case Enum.all?(results, &match?({:ok, _}, &1)) do
true ->

View File

@@ -557,7 +557,11 @@ defmodule WandererApp.Map.Server.SystemsImpl do
_ ->
%{x: x, y: y} =
WandererApp.Map.PositionCalculator.get_new_system_position(nil, rtree_name, map_opts)
WandererApp.Map.PositionCalculator.get_new_system_position(
extra_info,
rtree_name,
map_opts
)
%{"x" => x, "y" => y}
end

View File

@@ -18,37 +18,43 @@ defmodule WandererApp.Maps do
]
def find_routes(map_id, hubs, origin, routes_settings, false) do
WandererApp.Esi.find_routes(
map_id,
origin,
hubs,
routes_settings
)
|> case do
{:ok, routes} ->
systems_static_data =
routes
|> Enum.map(fn route_info -> route_info.systems end)
|> List.flatten()
|> Enum.uniq()
|> Task.async_stream(
fn system_id ->
case WandererApp.CachedInfo.get_system_static_info(system_id) do
{:ok, nil} ->
nil
origin_int = origin |> String.to_integer()
{:ok, system} ->
system |> Map.take(@minimum_route_attrs)
end
end,
max_concurrency: System.schedulers_online() * 4
)
|> Enum.map(fn {:ok, val} -> val end)
if origin_int > 0 do
WandererApp.Esi.find_routes(
map_id,
origin,
hubs,
routes_settings
)
|> case do
{:ok, routes} ->
systems_static_data =
routes
|> Enum.map(fn route_info -> route_info.systems end)
|> List.flatten()
|> Enum.uniq()
|> Task.async_stream(
fn system_id ->
case WandererApp.CachedInfo.get_system_static_info(system_id) do
{:ok, nil} ->
nil
{:ok, %{routes: routes, systems_static_data: systems_static_data}}
{:ok, system} ->
system |> Map.take(@minimum_route_attrs)
end
end,
max_concurrency: System.schedulers_online() * 4
)
|> Enum.map(fn {:ok, val} -> val end)
error ->
{:ok, %{routes: [], systems_static_data: []}}
{:ok, %{routes: routes, systems_static_data: systems_static_data}}
error ->
{:ok, %{routes: [], systems_static_data: []}}
end
else
{:ok, %{routes: [], systems_static_data: []}}
end
end

View File

@@ -365,19 +365,15 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
end
defp handle_tracking_event({:track_characters, map_characters, track_character}, socket, map_id) do
case WandererApp.Character.TrackingUtils.track(
map_characters,
map_id,
track_character,
self()
) do
:ok ->
socket
:ok =
WandererApp.Character.TrackingUtils.track(
map_characters,
map_id,
track_character,
self()
)
{:error, reason} ->
Logger.error("Failed to track characters: #{inspect(reason)}")
socket
end
socket
end
defp handle_tracking_event(:invalid_token_message, socket, _map_id) do

View File

@@ -557,12 +557,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
# in case user has not tracked any character track his main character as viewer
track_character && not has_tracked_characters? ->
main_character = Enum.find(current_user.characters, &(&1.id == main_character_id))
if main_character do
events ++ [{:track_characters, [main_character], false}]
else
events
end
events ++ [{:track_characters, [main_character], false}]
track_character && not character_limit_reached? ->
events ++ [{:track_characters, tracked_characters, track_character}]
@@ -573,12 +568,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
# in case user has view only permissions track his main character as viewer
not track_character ->
main_character = Enum.find(current_user.characters, &(&1.id == main_character_id))
if main_character do
events ++ [{:track_characters, [main_character], track_character}]
else
events
end
events ++ [{:track_characters, [main_character], track_character}]
true ->
events

View File

@@ -400,6 +400,36 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
)}
end
def handle_ui_event(
"unsplash_signature",
%{"system_id" => solar_system_id, "eve_id" => eve_id} = payload,
%{
assigns: %{
map_id: map_id,
current_user: current_user,
main_character_id: main_character_id,
user_permissions: %{update_system: true}
}
} = socket
)
when not is_nil(main_character_id) do
{:ok, system} =
WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(map_id, solar_system_id)
WandererApp.Map.Server.add_system(
map_id,
%{
solar_system_id: WandererApp.CachedInfo.get_random_solar_system_id(),
coordinates: nil,
extra_info: %{position_x: system.position_x, position_y: system.position_y}
},
current_user.id,
main_character_id
)
{:noreply, socket}
end
def handle_ui_event(event, body, socket),
do: MapCoreEventHandler.handle_ui_event(event, body, socket)

View File

@@ -127,7 +127,8 @@ defmodule WandererAppWeb.MapEventHandler do
"get_signatures",
"link_signature_to_system",
"unlink_signature",
"undo_delete_signatures"
"undo_delete_signatures",
"unsplash_signature"
]
@map_structures_events [

View File

@@ -73,7 +73,11 @@ defmodule WandererAppWeb.PresenceGracePeriodManager do
# Update cache with final character IDs (includes grace period logic)
WandererApp.Cache.insert("map_#{map_id}:presence_character_ids", final_character_ids)
WandererApp.Cache.insert("map_#{map_id}:presence_data", presence_data)
# Only update presence_data if the character IDs actually changed
if final_character_ids != previous_tracked_character_ids do
WandererApp.Cache.insert("map_#{map_id}:presence_data", presence_data)
end
WandererApp.Cache.insert("map_#{map_id}:presence_updated", true)
{:noreply, state}

View File

@@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do
@source_url "https://github.com/wanderer-industries/wanderer"
@version "1.82.2"
@version "1.82.0"
def project do
[

View File

@@ -32562,8 +32562,7 @@
"solarSystemID": 31002522,
"statics": [
"A239",
"B274",
"D382"
"B274"
],
"systemName": "J012635",
"effectName": null
@@ -33101,8 +33100,8 @@
],
"solarSystemID": 31002505,
"statics": [
"N110",
"J244"
"J244",
"Z060"
],
"systemName": "J015092",
"effectName": "Black Hole"
@@ -36793,6 +36792,7 @@
"wanderers": [],
"solarSystemID": 31002581,
"statics": [
"C008",
"Q003",
"Z006"
],

View File

@@ -827,7 +827,7 @@
{
"mass_regen": 0,
"dest": "pochven",
"src": ["ns"],
"src": [],
"static": false,
"max_mass_per_jump": 375000000,
"lifetime": "16",