chore: release version v1.77.19

fix(Map): Fixed for all Large wormholes jump mass from 300 to 375. Fi…

CHANGELOG.md

@@ -2,6 +2,83 @@
 
 <!-- changelog -->
 
+## [v1.77.19](https://github.com/wanderer-industries/wanderer/compare/v1.77.18...v1.77.19) (2025-09-14)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed for all Large wormholes jump mass from 300 to 375. Fixed jump mass and total mass for N290, K329. Fixed static for J005663 was H296 now Y790. Added J492 wormhole. Change lifetime for E587 from 16 to 48
+
+## [v1.77.18](https://github.com/wanderer-industries/wanderer/compare/v1.77.17...v1.77.18) (2025-09-13)
+
+
+
+
+## [v1.77.17](https://github.com/wanderer-industries/wanderer/compare/v1.77.16...v1.77.17) (2025-09-11)
+
+
+
+
+### Bug Fixes:
+
+* Updated ACL create/update APIs
+
+## [v1.77.16](https://github.com/wanderer-industries/wanderer/compare/v1.77.15...v1.77.16) (2025-09-11)
+
+
+
+
+### Bug Fixes:
+
+* Fixed issue with ACL add members button for managers. Added WANDERER_RESTRICT_ACLS_CREATION env support.
+
+## [v1.77.15](https://github.com/wanderer-industries/wanderer/compare/v1.77.14...v1.77.15) (2025-09-10)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix problem with unnecessary rerenders and loads routes if move/positioning widgets.
+
+## [v1.77.14](https://github.com/wanderer-industries/wanderer/compare/v1.77.13...v1.77.14) (2025-09-08)
+
+
+
+
+### Bug Fixes:
+
+* Fixed issue with loading connection info
+
+## [v1.77.13](https://github.com/wanderer-industries/wanderer/compare/v1.77.12...v1.77.13) (2025-09-07)
+
+
+
+
+### Bug Fixes:
+
+* Updated character tracking, added an extra check for offline characters to reduce errors
+
+## [v1.77.12](https://github.com/wanderer-industries/wanderer/compare/v1.77.11...v1.77.12) (2025-09-07)
+
+
+
+
+### Bug Fixes:
+
+* Decreased character tracking grace period
+
+## [v1.77.11](https://github.com/wanderer-industries/wanderer/compare/v1.77.10...v1.77.11) (2025-09-07)
+
+
+
+
+### Bug Fixes:
+
+* Fixed CSP errors
+
 ## [v1.77.10](https://github.com/wanderer-industries/wanderer/compare/v1.77.9...v1.77.10) (2025-09-04)
 
 

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/hooks/useLoadRoutes.ts

@@ -3,6 +3,7 @@ import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
 import { LoadRoutesCommand } from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts';
 import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
+import { flattenValues } from '@/hooks/Mapper/utils/flattenValues.ts';
 
 function usePrevious<T>(value: T): T | undefined {
   const ref = useRef<T>();
@@ -64,12 +65,8 @@ export const useLoadRoutes = ({
     systems?.length,
     connections,
     hubs,
-    routesSettings,
-    ...Object.keys(routesSettings)
-      .sort()
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      .map(x => routesSettings[x]),
+    // we need make it flat recursively
+    ...flattenValues(routesSettings),
     ...deps,
   ]);
 

assets/js/hooks/Mapper/utils/flattenValues.ts

@@ -0,0 +1,132 @@
+const TYPE_ORDER = [
+  'undefined',
+  'null',
+  'boolean',
+  'number',
+  'bigint',
+  'string',
+  'symbol',
+  'function',
+  'date',
+  'regexp',
+  'other',
+] as const;
+type TypeTag = (typeof TYPE_ORDER)[number];
+
+const getTypeTag = (v: unknown): TypeTag => {
+  if (v === undefined) return 'undefined';
+  if (v === null) return 'null';
+  const t = typeof v;
+  if (t === 'boolean' || t === 'number' || t === 'bigint' || t === 'string' || t === 'symbol' || t === 'function')
+    return t as TypeTag;
+  const tag = Object.prototype.toString.call(v);
+  if (tag === '[object Date]') return 'date';
+  if (tag === '[object RegExp]') return 'regexp';
+  return 'other';
+};
+
+const cmp = (a: unknown, b: unknown): number => {
+  const ta = getTypeTag(a);
+  const tb = getTypeTag(b);
+  if (ta !== tb) return TYPE_ORDER.indexOf(ta) - TYPE_ORDER.indexOf(tb);
+
+  switch (ta) {
+    case 'undefined':
+    case 'null':
+      return 0;
+    case 'boolean':
+      return (a as boolean) === (b as boolean) ? 0 : a ? 1 : -1;
+    case 'number': {
+      const na = a as number,
+        nb = b as number;
+      const aIsNaN = Number.isNaN(na),
+        bIsNaN = Number.isNaN(nb);
+      if (aIsNaN || bIsNaN) return aIsNaN && bIsNaN ? 0 : aIsNaN ? 1 : -1; // NaN в конец чисел
+      return na === nb ? 0 : na < nb ? -1 : 1;
+    }
+    case 'bigint': {
+      const ba = a as bigint,
+        bb = b as bigint;
+      return ba === bb ? 0 : ba < bb ? -1 : 1;
+    }
+    case 'string':
+      return (a as string).localeCompare(b as string);
+    case 'symbol': {
+      const da = (a as symbol).description ?? '';
+      const db = (b as symbol).description ?? '';
+      return da.localeCompare(db);
+    }
+    case 'function':
+      // @ts-ignore
+      return ((a as Function).name || '').localeCompare((b as Function).name || '');
+    case 'date':
+      return (a as Date).getTime() - (b as Date).getTime();
+    case 'regexp':
+      return a!.toString().localeCompare(b!.toString());
+    default:
+      return String(a).localeCompare(String(b));
+  }
+};
+
+const isIterable = (v: unknown): v is Iterable<unknown> =>
+  v != null && typeof (v as any)[Symbol.iterator] === 'function';
+
+const pushTypedArrayValues = (v: unknown, out: unknown[]) => {
+  if (ArrayBuffer.isView(v) && !(v instanceof DataView)) {
+    // @ts-ignore
+    out.push(...(v as ArrayLike<number> as any));
+    return true;
+  }
+  return false;
+};
+
+/**
+ * Generate this func with ChatGPT 5. Cause it pure func and looks like what i need
+ * May be in net we can find smtng like that
+ * @param input
+ */
+export const flattenValues = (input: unknown): unknown[] => {
+  const out: unknown[] = [];
+  const seen = new WeakSet<object>();
+
+  const visit = (v: unknown): void => {
+    const tag = getTypeTag(v);
+    if (tag !== 'other') {
+      out.push(v);
+      return;
+    }
+
+    if (v && typeof v === 'object') {
+      if (seen.has(v)) return;
+      seen.add(v);
+
+      if (pushTypedArrayValues(v, out)) return;
+
+      if (v instanceof Map) {
+        for (const val of v.values()) visit(val);
+        return;
+      }
+
+      if (v instanceof Set) {
+        for (const val of v.values()) visit(val);
+        return;
+      }
+
+      if (Array.isArray(v) || isIterable(v)) {
+        for (const item of v as Iterable<unknown>) visit(item);
+        return;
+      }
+
+      for (const key of Object.keys(v)) {
+        // @ts-ignore
+        visit((v as never)[key]);
+      }
+      return;
+    }
+
+    out.push(v);
+  };
+
+  visit(input);
+  return out.sort(cmp);
+};

config/runtime.exs

@@ -121,6 +121,11 @@ restrict_maps_creation =
   |> get_var_from_path_or_env("WANDERER_RESTRICT_MAPS_CREATION", "false")
   |> String.to_existing_atom()
 
+restrict_acls_creation =
+  config_dir
+  |> get_var_from_path_or_env("WANDERER_RESTRICT_ACLS_CREATION", "false")
+  |> String.to_existing_atom()
+
 config :wanderer_app,
   web_app_url: web_app_url,
   git_sha: System.get_env("GIT_SHA", "111"),
@@ -150,6 +155,7 @@ config :wanderer_app,
   map_connection_eol_expire_timeout_mins: map_connection_eol_expire_timeout_mins,
   wallet_tracking_enabled: wallet_tracking_enabled,
   restrict_maps_creation: restrict_maps_creation,
+  restrict_acls_creation: restrict_acls_creation,
   subscription_settings: %{
     plans: [
       %{

lib/wanderer_app/character/tracker.ex

@@ -37,13 +37,14 @@ defmodule WandererApp.Character.Tracker do
         }
 
   @pause_tracking_timeout :timer.minutes(60 * 10)
-  @offline_timeout :timer.minutes(10)
+  @offline_timeout :timer.minutes(5)
   @online_error_timeout :timer.minutes(10)
   @ship_error_timeout :timer.minutes(10)
   @location_error_timeout :timer.minutes(10)
   @online_forbidden_ttl :timer.seconds(7)
+  @offline_check_delay_ttl :timer.seconds(15)
   @online_limit_ttl :timer.seconds(7)
-  @forbidden_ttl :timer.seconds(5)
+  @forbidden_ttl :timer.seconds(10)
   @limit_ttl :timer.seconds(5)
   @location_limit_ttl :timer.seconds(1)
   @pubsub_client Application.compile_env(:wanderer_app, :pubsub_client)
@@ -71,18 +72,19 @@ defmodule WandererApp.Character.Tracker do
     WandererApp.Cache.lookup!("character:#{character_id}:last_online_time")
     |> case do
       nil ->
-        WandererApp.Cache.insert(
-          "character:#{character_id}:last_online_time",
-          DateTime.utc_now()
-        )
-
         :ok
 
       last_online_time ->
         duration = DateTime.diff(DateTime.utc_now(), last_online_time, :millisecond)
 
         if duration >= @offline_timeout do
-          pause_tracking(character_id)
+          WandererApp.Character.update_character(character_id, %{online: false})
+
+          WandererApp.Character.update_character_state(character_id, %{
+            is_online: false
+          })
+
+          WandererApp.Cache.delete("character:#{character_id}:last_online_time")
 
           :ok
         else
@@ -186,7 +188,9 @@ defmodule WandererApp.Character.Tracker do
       |> WandererApp.Character.get_character_state!()
       |> update_online()
 
-  def update_online(%{track_online: true, character_id: character_id} = character_state) do
+  def update_online(
+        %{track_online: true, character_id: character_id, is_online: is_online} = character_state
+      ) do
     case WandererApp.Character.get_character(character_id) do
       {:ok, %{eve_id: eve_id, access_token: access_token, tracking_pool: tracking_pool}}
       when not is_nil(access_token) ->
@@ -197,8 +201,6 @@ defmodule WandererApp.Character.Tracker do
             {:error, :skipped}
 
           _ ->
-            # Monitor cache for potential evictions before ESI call
-
             case WandererApp.Esi.get_character_online(eve_id,
                    access_token: access_token,
                    character_id: character_id
@@ -211,70 +213,67 @@ defmodule WandererApp.Character.Tracker do
                     "character:#{character_id}:last_online_time",
                     DateTime.utc_now()
                   )
+
+                  WandererApp.Cache.delete("character:#{character_id}:online_forbidden")
+                else
+                  # Delay next online updates for offline characters
+                  WandererApp.Cache.put(
+                    "character:#{character_id}:online_forbidden",
+                    true,
+                    ttl: @offline_check_delay_ttl
+                  )
+                end
+
+                if online.online == true && online.online != is_online do
+                  WandererApp.Cache.delete("character:#{character_id}:ship_error_time")
+                  WandererApp.Cache.delete("character:#{character_id}:location_error_time")
+                  WandererApp.Cache.delete("character:#{character_id}:info_forbidden")
+                  WandererApp.Cache.delete("character:#{character_id}:ship_forbidden")
+                  WandererApp.Cache.delete("character:#{character_id}:location_forbidden")
+                  WandererApp.Cache.delete("character:#{character_id}:wallet_forbidden")
+                  WandererApp.Cache.delete("character:#{character_id}:corporation_info_forbidden")
                 end
 
-                WandererApp.Cache.delete("character:#{character_id}:online_forbidden")
                 WandererApp.Cache.delete("character:#{character_id}:online_error_time")
-                WandererApp.Cache.delete("character:#{character_id}:ship_error_time")
-                WandererApp.Cache.delete("character:#{character_id}:location_error_time")
-                WandererApp.Cache.delete("character:#{character_id}:info_forbidden")
-                WandererApp.Cache.delete("character:#{character_id}:ship_forbidden")
-                WandererApp.Cache.delete("character:#{character_id}:location_forbidden")
-                WandererApp.Cache.delete("character:#{character_id}:wallet_forbidden")
 
-                try do
-                  WandererApp.Character.update_character(character_id, online)
-                rescue
-                  error ->
-                    Logger.error("DB_ERROR: Failed to update character in database",
-                      character_id: character_id,
-                      error: inspect(error),
-                      operation: "update_character_online"
-                    )
+                if online.online != is_online do
+                  try do
+                    WandererApp.Character.update_character(character_id, online)
+                  rescue
+                    error ->
+                      Logger.error("DB_ERROR: Failed to update character in database",
+                        character_id: character_id,
+                        error: inspect(error),
+                        operation: "update_character_online"
+                      )
 
-                    # Re-raise to maintain existing error handling
-                    reraise error, __STACKTRACE__
-                end
+                      # Re-raise to maintain existing error handling
+                      reraise error, __STACKTRACE__
+                  end
 
-                update = %{
-                  character_state
-                  | is_online: online.online,
-                    track_ship: online.online,
-                    track_location: online.online
-                }
+                  try do
+                    WandererApp.Character.update_character_state(character_id, %{
+                      character_state
+                      | is_online: online.online,
+                        track_ship: online.online,
+                        track_location: online.online
+                    })
+                  rescue
+                    error ->
+                      Logger.error("DB_ERROR: Failed to update character state in database",
+                        character_id: character_id,
+                        error: inspect(error),
+                        operation: "update_character_state"
+                      )
 
-                try do
-                  WandererApp.Character.update_character_state(character_id, update)
-                rescue
-                  error ->
-                    Logger.error("DB_ERROR: Failed to update character state in database",
-                      character_id: character_id,
-                      error: inspect(error),
-                      operation: "update_character_state"
-                    )
-
-                    # Re-raise to maintain existing error handling
-                    reraise error, __STACKTRACE__
+                      # Re-raise to maintain existing error handling
+                      reraise error, __STACKTRACE__
+                  end
                 end
 
                 :ok
 
               {:error, error} when error in [:forbidden, :not_found, :timeout] ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_online",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
-                Logger.warning("ESI_ERROR: Character online tracking failed #{inspect(error)}",
-                  character_id: character_id,
-                  tracking_pool: tracking_pool,
-                  error_type: error,
-                  endpoint: "character_online"
-                )
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:online_forbidden",
                   true,
@@ -301,28 +300,6 @@ defmodule WandererApp.Character.Tracker do
                 remaining =
                   Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
 
-                # Emit telemetry for tracking
-                :telemetry.execute(
-                  [:wanderer_app, :esi, :rate_limited],
-                  %{
-                    reset_duration: reset_timeout,
-                    count: 1
-                  },
-                  %{
-                    endpoint: "character_online",
-                    tracking_pool: tracking_pool,
-                    character_id: character_id
-                  }
-                )
-
-                Logger.warning("ESI_RATE_LIMITED: Character online tracking rate limited",
-                  character_id: character_id,
-                  tracking_pool: tracking_pool,
-                  endpoint: "character_online",
-                  reset_seconds: reset_seconds,
-                  remaining_requests: remaining
-                )
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:online_forbidden",
                   true,
@@ -332,15 +309,7 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :skipped}
 
               {:error, error} ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_online",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
-                Logger.error("ESI_ERROR: Character online tracking failed",
+                Logger.error("ESI_ERROR: Character online tracking failed: #{inspect(error)}",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: error,
@@ -417,21 +386,6 @@ defmodule WandererApp.Character.Tracker do
             :ok
 
           {:error, error} when error in [:forbidden, :not_found, :timeout] ->
-            # Emit telemetry for tracking
-            :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-              endpoint: "character_info",
-              error_type: error,
-              tracking_pool: tracking_pool,
-              character_id: character_id
-            })
-
-            Logger.warning("ESI_ERROR: Character info tracking failed",
-              character_id: character_id,
-              tracking_pool: tracking_pool,
-              error_type: error,
-              endpoint: "character_info"
-            )
-
             WandererApp.Cache.put(
               "character:#{character_id}:info_forbidden",
               true,
@@ -443,33 +397,6 @@ defmodule WandererApp.Character.Tracker do
           {:error, :error_limited, headers} ->
             reset_timeout = get_reset_timeout(headers)
 
-            reset_seconds =
-              Map.get(headers, "x-esi-error-limit-reset", ["unknown"]) |> List.first()
-
-            remaining = Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
-
-            # Emit telemetry for tracking
-            :telemetry.execute(
-              [:wanderer_app, :esi, :rate_limited],
-              %{
-                reset_duration: reset_timeout,
-                count: 1
-              },
-              %{
-                endpoint: "character_info",
-                tracking_pool: tracking_pool,
-                character_id: character_id
-              }
-            )
-
-            Logger.warning("ESI_RATE_LIMITED: Character info tracking rate limited",
-              character_id: character_id,
-              tracking_pool: tracking_pool,
-              endpoint: "character_info",
-              reset_seconds: reset_seconds,
-              remaining_requests: remaining
-            )
-
             WandererApp.Cache.put(
               "character:#{character_id}:info_forbidden",
               true,
@@ -479,21 +406,13 @@ defmodule WandererApp.Character.Tracker do
             {:error, :error_limited}
 
           {:error, error} ->
-            # Emit telemetry for tracking
-            :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-              endpoint: "character_info",
-              error_type: error,
-              tracking_pool: tracking_pool,
-              character_id: character_id
-            })
-
             WandererApp.Cache.put(
               "character:#{character_id}:info_forbidden",
               true,
               ttl: @forbidden_ttl
             )
 
-            Logger.error("ESI_ERROR: Character info tracking failed",
+            Logger.error("ESI_ERROR: Character info tracking failed: #{inspect(error)}",
               character_id: character_id,
               tracking_pool: tracking_pool,
               error_type: error,
@@ -540,21 +459,6 @@ defmodule WandererApp.Character.Tracker do
                 :ok
 
               {:error, error} when error in [:forbidden, :not_found, :timeout] ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_ship",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
-                Logger.warning("ESI_ERROR: Character ship tracking failed",
-                  character_id: character_id,
-                  tracking_pool: tracking_pool,
-                  error_type: error,
-                  endpoint: "character_ship"
-                )
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:ship_forbidden",
                   true,
@@ -573,34 +477,6 @@ defmodule WandererApp.Character.Tracker do
               {:error, :error_limited, headers} ->
                 reset_timeout = get_reset_timeout(headers)
 
-                reset_seconds =
-                  Map.get(headers, "x-esi-error-limit-reset", ["unknown"]) |> List.first()
-
-                remaining =
-                  Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
-
-                # Emit telemetry for tracking
-                :telemetry.execute(
-                  [:wanderer_app, :esi, :rate_limited],
-                  %{
-                    reset_duration: reset_timeout,
-                    count: 1
-                  },
-                  %{
-                    endpoint: "character_ship",
-                    tracking_pool: tracking_pool,
-                    character_id: character_id
-                  }
-                )
-
-                Logger.warning("ESI_RATE_LIMITED: Character ship tracking rate limited",
-                  character_id: character_id,
-                  tracking_pool: tracking_pool,
-                  endpoint: "character_ship",
-                  reset_seconds: reset_seconds,
-                  remaining_requests: remaining
-                )
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:ship_forbidden",
                   true,
@@ -610,15 +486,7 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :error_limited}
 
               {:error, error} ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_ship",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
-                Logger.error("ESI_ERROR: Character ship tracking failed",
+                Logger.error("ESI_ERROR: Character ship tracking failed: #{inspect(error)}",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: error,
@@ -641,14 +509,6 @@ defmodule WandererApp.Character.Tracker do
                 {:error, error}
 
               _ ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_ship",
-                  error_type: "wrong_response",
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
                 Logger.error("ESI_ERROR: Character ship tracking failed - wrong response",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
@@ -711,14 +571,6 @@ defmodule WandererApp.Character.Tracker do
                 :ok
 
               {:error, error} when error in [:forbidden, :not_found, :timeout] ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_location",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
                 Logger.warning("ESI_ERROR: Character location tracking failed",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
@@ -740,34 +592,6 @@ defmodule WandererApp.Character.Tracker do
               {:error, :error_limited, headers} ->
                 reset_timeout = get_reset_timeout(headers, @location_limit_ttl)
 
-                reset_seconds =
-                  Map.get(headers, "x-esi-error-limit-reset", ["unknown"]) |> List.first()
-
-                remaining =
-                  Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
-
-                # Emit telemetry for tracking
-                :telemetry.execute(
-                  [:wanderer_app, :esi, :rate_limited],
-                  %{
-                    reset_duration: reset_timeout,
-                    count: 1
-                  },
-                  %{
-                    endpoint: "character_location",
-                    tracking_pool: tracking_pool,
-                    character_id: character_id
-                  }
-                )
-
-                Logger.warning("ESI_RATE_LIMITED: Character location tracking rate limited",
-                  character_id: character_id,
-                  tracking_pool: tracking_pool,
-                  endpoint: "character_location",
-                  reset_seconds: reset_seconds,
-                  remaining_requests: remaining
-                )
-
                 WandererApp.Cache.put(
                   "character:#{character_id}:location_forbidden",
                   true,
@@ -777,15 +601,7 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :error_limited}
 
               {:error, error} ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_location",
-                  error_type: error,
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
-                Logger.error("ESI_ERROR: Character location tracking failed",
+                Logger.error("ESI_ERROR: Character location tracking failed: #{inspect(error)}",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
                   error_type: error,
@@ -804,14 +620,6 @@ defmodule WandererApp.Character.Tracker do
                 {:error, :skipped}
 
               _ ->
-                # Emit telemetry for tracking
-                :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                  endpoint: "character_location",
-                  error_type: "wrong_response",
-                  tracking_pool: tracking_pool,
-                  character_id: character_id
-                })
-
                 Logger.error("ESI_ERROR: Character location tracking failed - wrong response",
                   character_id: character_id,
                   tracking_pool: tracking_pool,
@@ -873,14 +681,6 @@ defmodule WandererApp.Character.Tracker do
                     :ok
 
                   {:error, error} when error in [:forbidden, :not_found, :timeout] ->
-                    # Emit telemetry for tracking
-                    :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                      endpoint: "character_wallet",
-                      error_type: error,
-                      tracking_pool: tracking_pool,
-                      character_id: character_id
-                    })
-
                     Logger.warning("ESI_ERROR: Character wallet tracking failed",
                       character_id: character_id,
                       tracking_pool: tracking_pool,
@@ -899,34 +699,6 @@ defmodule WandererApp.Character.Tracker do
                   {:error, :error_limited, headers} ->
                     reset_timeout = get_reset_timeout(headers)
 
-                    reset_seconds =
-                      Map.get(headers, "x-esi-error-limit-reset", ["unknown"]) |> List.first()
-
-                    remaining =
-                      Map.get(headers, "x-esi-error-limit-remain", ["unknown"]) |> List.first()
-
-                    # Emit telemetry for tracking
-                    :telemetry.execute(
-                      [:wanderer_app, :esi, :rate_limited],
-                      %{
-                        reset_duration: reset_timeout,
-                        count: 1
-                      },
-                      %{
-                        endpoint: "character_wallet",
-                        tracking_pool: tracking_pool,
-                        character_id: character_id
-                      }
-                    )
-
-                    Logger.warning("ESI_RATE_LIMITED: Character wallet tracking rate limited",
-                      character_id: character_id,
-                      tracking_pool: tracking_pool,
-                      endpoint: "character_wallet",
-                      reset_seconds: reset_seconds,
-                      remaining_requests: remaining
-                    )
-
                     WandererApp.Cache.put(
                       "character:#{character_id}:wallet_forbidden",
                       true,
@@ -936,15 +708,7 @@ defmodule WandererApp.Character.Tracker do
                     {:error, :skipped}
 
                   {:error, error} ->
-                    # Emit telemetry for tracking
-                    :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                      endpoint: "character_wallet",
-                      error_type: error,
-                      tracking_pool: tracking_pool,
-                      character_id: character_id
-                    })
-
-                    Logger.error("ESI_ERROR: Character wallet tracking failed",
+                    Logger.error("ESI_ERROR: Character wallet tracking failed: #{inspect(error)}",
                       character_id: character_id,
                       tracking_pool: tracking_pool,
                       error_type: error,
@@ -960,15 +724,7 @@ defmodule WandererApp.Character.Tracker do
                     {:error, :skipped}
 
                   error ->
-                    # Emit telemetry for tracking
-                    :telemetry.execute([:wanderer_app, :esi, :error], %{count: 1}, %{
-                      endpoint: "character_wallet",
-                      error_type: error,
-                      tracking_pool: tracking_pool,
-                      character_id: character_id
-                    })
-
-                    Logger.error("ESI_ERROR: Character wallet tracking failed",
+                    Logger.error("ESI_ERROR: Character wallet tracking failed: #{inspect(error)}",
                       character_id: character_id,
                       tracking_pool: tracking_pool,
                       error_type: error,
@@ -1073,6 +829,7 @@ defmodule WandererApp.Character.Tracker do
        )
        when old_corporation_id != corporation_id do
     (WandererApp.Cache.has_key?("character:#{character_id}:online_forbidden") ||
+       WandererApp.Cache.has_key?("character:#{character_id}:corporation_info_forbidden") ||
        WandererApp.Cache.has_key?("character:#{character_id}:tracking_paused"))
     |> case do
       true ->
@@ -1112,6 +869,17 @@ defmodule WandererApp.Character.Tracker do
             state
             |> Map.merge(%{corporation_id: corporation_id})
 
+          {:error, :error_limited, headers} ->
+            reset_timeout = get_reset_timeout(headers)
+
+            WandererApp.Cache.put(
+              "character:#{character_id}:corporation_info_forbidden",
+              true,
+              ttl: reset_timeout
+            )
+
+            state
+
           error ->
             Logger.warning(
               "Failed to get corporation info for character #{character_id}: #{inspect(error)}",

lib/wanderer_app/character/tracker_manager_impl.ex

@@ -13,10 +13,9 @@ defmodule WandererApp.Character.TrackerManager.Impl do
         }
 
   @check_start_queue_interval :timer.seconds(1)
-  @garbage_collection_interval :timer.minutes(15)
+  @garbage_collection_interval :timer.minutes(5)
   @untrack_characters_interval :timer.minutes(5)
-  @inactive_character_timeout :timer.minutes(10)
-  @untrack_character_timeout :timer.minutes(10)
+  @inactive_character_timeout :timer.minutes(5)
 
   @logger Application.compile_env(:wanderer_app, :logger)
 
@@ -116,13 +115,6 @@ defmodule WandererApp.Character.TrackerManager.Impl do
   end
 
   def add_to_untrack_queue(map_id, character_id) do
-    if not WandererApp.Cache.has_key?("#{map_id}:#{character_id}:untrack_requested") do
-      WandererApp.Cache.insert(
-        "#{map_id}:#{character_id}:untrack_requested",
-        DateTime.utc_now()
-      )
-    end
-
     WandererApp.Cache.insert_or_update(
       "character_untrack_queue",
       [{map_id, character_id}],
@@ -134,8 +126,6 @@ defmodule WandererApp.Character.TrackerManager.Impl do
   end
 
   def remove_from_untrack_queue(map_id, character_id) do
-    WandererApp.Cache.delete("#{map_id}:#{character_id}:untrack_requested")
-
     WandererApp.Cache.insert_or_update(
       "character_untrack_queue",
       [],
@@ -239,50 +229,32 @@ defmodule WandererApp.Character.TrackerManager.Impl do
     WandererApp.Cache.lookup!("character_untrack_queue", [])
     |> Task.async_stream(
       fn {map_id, character_id} ->
-        untrack_timeout_reached =
-          if WandererApp.Cache.has_key?("#{map_id}:#{character_id}:untrack_requested") do
-            untrack_requested =
-              WandererApp.Cache.lookup!(
-                "#{map_id}:#{character_id}:untrack_requested",
-                DateTime.utc_now()
-              )
+        remove_from_untrack_queue(map_id, character_id)
 
-            duration = DateTime.diff(DateTime.utc_now(), untrack_requested, :millisecond)
-            duration >= @untrack_character_timeout
-          else
-            false
-          end
+        WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:solar_system_id")
+        WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:station_id")
+        WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:structure_id")
 
-        Logger.debug(fn -> "Untrack timeout reached: #{inspect(untrack_timeout_reached)}" end)
+        {:ok, character_state} =
+          WandererApp.Character.Tracker.update_settings(character_id, %{
+            map_id: map_id,
+            track: false
+          })
 
-        if untrack_timeout_reached do
-          remove_from_untrack_queue(map_id, character_id)
+        {:ok, character} = WandererApp.Character.get_character(character_id)
 
-          WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:solar_system_id")
-          WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:station_id")
-          WandererApp.Cache.delete("map:#{map_id}:character:#{character_id}:structure_id")
+        {:ok, _updated} =
+          WandererApp.MapCharacterSettingsRepo.update(map_id, character_id, %{
+            ship: character.ship,
+            ship_name: character.ship_name,
+            ship_item_id: character.ship_item_id,
+            solar_system_id: character.solar_system_id,
+            structure_id: character.structure_id,
+            station_id: character.station_id
+          })
 
-          {:ok, character_state} =
-            WandererApp.Character.Tracker.update_settings(character_id, %{
-              map_id: map_id,
-              track: false
-            })
-
-          {:ok, character} = WandererApp.Character.get_character(character_id)
-
-          {:ok, _updated} =
-            WandererApp.MapCharacterSettingsRepo.update(map_id, character_id, %{
-              ship: character.ship,
-              ship_name: character.ship_name,
-              ship_item_id: character.ship_item_id,
-              solar_system_id: character.solar_system_id,
-              structure_id: character.structure_id,
-              station_id: character.station_id
-            })
-
-          WandererApp.Character.update_character_state(character_id, character_state)
-          WandererApp.Map.Server.Impl.broadcast!(map_id, :untrack_character, character_id)
-        end
+        WandererApp.Character.update_character_state(character_id, character_state)
+        WandererApp.Map.Server.Impl.broadcast!(map_id, :untrack_character, character_id)
       end,
       max_concurrency: System.schedulers_online(),
       on_timeout: :kill_task,

lib/wanderer_app/character/tracker_pool.ex

@@ -18,7 +18,7 @@ defmodule WandererApp.Character.TrackerPool do
 
   @update_location_interval :timer.seconds(1)
   @update_online_interval :timer.seconds(5)
-  @check_offline_characters_interval :timer.minutes(2)
+  @check_offline_characters_interval :timer.minutes(5)
   @check_online_errors_interval :timer.minutes(1)
   @check_ship_errors_interval :timer.minutes(1)
   @check_location_errors_interval :timer.minutes(1)
@@ -124,7 +124,7 @@ defmodule WandererApp.Character.TrackerPool do
     Process.send_after(self(), :check_online_errors, :timer.seconds(60))
     Process.send_after(self(), :check_ship_errors, :timer.seconds(90))
     Process.send_after(self(), :check_location_errors, :timer.seconds(120))
-    # Process.send_after(self(), :check_offline_characters, @check_offline_characters_interval)
+    Process.send_after(self(), :check_offline_characters, @check_offline_characters_interval)
     Process.send_after(self(), :update_location, 300)
     Process.send_after(self(), :update_ship, 500)
     Process.send_after(self(), :update_info, 1500)
@@ -176,11 +176,15 @@ defmodule WandererApp.Character.TrackerPool do
 
     try do
       characters
-      |> Enum.each(fn character_id ->
-        WandererApp.TaskWrapper.start_link(WandererApp.Character.Tracker, :update_online, [
-          character_id
-        ])
-      end)
+      |> Task.async_stream(
+        fn character_id ->
+          WandererApp.Character.Tracker.update_online(character_id)
+        end,
+        max_concurrency: System.schedulers_online(),
+        on_timeout: :kill_task,
+        timeout: :timer.seconds(5)
+      )
+      |> Enum.each(fn _result -> :ok end)
     rescue
       e ->
         Logger.error("""
@@ -234,17 +238,7 @@ defmodule WandererApp.Character.TrackerPool do
       characters
       |> Task.async_stream(
         fn character_id ->
-          if WandererApp.Character.can_pause_tracking?(character_id) do
-            WandererApp.TaskWrapper.start_link(
-              WandererApp.Character.Tracker,
-              :check_offline,
-              [
-                character_id
-              ]
-            )
-          else
-            :ok
-          end
+          WandererApp.Character.Tracker.check_offline(character_id)
         end,
         timeout: :timer.seconds(15),
         max_concurrency: System.schedulers_online(),
@@ -397,11 +391,15 @@ defmodule WandererApp.Character.TrackerPool do
 
     try do
       characters
-      |> Enum.each(fn character_id ->
-        WandererApp.TaskWrapper.start_link(WandererApp.Character.Tracker, :update_location, [
-          character_id
-        ])
-      end)
+      |> Task.async_stream(
+        fn character_id ->
+          WandererApp.Character.Tracker.update_location(character_id)
+        end,
+        max_concurrency: System.schedulers_online(),
+        on_timeout: :kill_task,
+        timeout: :timer.seconds(5)
+      )
+      |> Enum.each(fn _result -> :ok end)
     rescue
       e ->
         Logger.error("""
@@ -434,11 +432,15 @@ defmodule WandererApp.Character.TrackerPool do
 
     try do
       characters
-      |> Enum.each(fn character_id ->
-        WandererApp.TaskWrapper.start_link(WandererApp.Character.Tracker, :update_ship, [
-          character_id
-        ])
-      end)
+      |> Task.async_stream(
+        fn character_id ->
+          WandererApp.Character.Tracker.update_ship(character_id)
+        end,
+        max_concurrency: System.schedulers_online(),
+        on_timeout: :kill_task,
+        timeout: :timer.seconds(5)
+      )
+      |> Enum.each(fn _result -> :ok end)
     rescue
       e ->
         Logger.error("""
@@ -473,9 +475,7 @@ defmodule WandererApp.Character.TrackerPool do
       characters
       |> Task.async_stream(
         fn character_id ->
-          WandererApp.TaskWrapper.start_link(WandererApp.Character.Tracker, :update_info, [
-            character_id
-          ])
+          WandererApp.Character.Tracker.update_info(character_id)
         end,
         timeout: :timer.seconds(15),
         max_concurrency: System.schedulers_online(),
@@ -519,9 +519,7 @@ defmodule WandererApp.Character.TrackerPool do
       characters
       |> Task.async_stream(
         fn character_id ->
-          WandererApp.TaskWrapper.start_link(WandererApp.Character.Tracker, :update_wallet, [
-            character_id
-          ])
+          WandererApp.Character.Tracker.update_wallet(character_id)
         end,
         timeout: :timer.seconds(15),
         max_concurrency: System.schedulers_online(),

lib/wanderer_app/env.ex

@@ -49,6 +49,12 @@ defmodule WandererApp.Env do
             )
   def restrict_maps_creation?(), do: get_key(:restrict_maps_creation, false)
 
+  @decorate cacheable(
+              cache: WandererApp.Cache,
+              key: "restrict_acls_creation"
+            )
+  def restrict_acls_creation?(), do: get_key(:restrict_acls_creation, false)
+
   def sse_enabled?() do
     Application.get_env(@app, :sse, [])
     |> Keyword.get(:enabled, false)

lib/wanderer_app/map/server/map_server_characters_impl.ex

@@ -213,85 +213,100 @@ defmodule WandererApp.Map.Server.CharactersImpl do
   end
 
   def update_characters(%{map_id: map_id} = state) do
-    {:ok, presence_character_ids} =
-      WandererApp.Cache.lookup("map_#{map_id}:presence_character_ids", [])
+    try do
+      {:ok, presence_character_ids} =
+        WandererApp.Cache.lookup("map_#{map_id}:presence_character_ids", [])
 
-    presence_character_ids
-    |> Enum.map(fn character_id ->
-      Task.start_link(fn ->
-        character_updates =
-          maybe_update_online(map_id, character_id) ++
-            maybe_update_tracking_status(map_id, character_id) ++
-            maybe_update_location(map_id, character_id) ++
-            maybe_update_ship(map_id, character_id) ++
-            maybe_update_alliance(map_id, character_id) ++
-            maybe_update_corporation(map_id, character_id)
+      presence_character_ids
+      |> Task.async_stream(
+        fn character_id ->
+          character_updates =
+            maybe_update_online(map_id, character_id) ++
+              maybe_update_tracking_status(map_id, character_id) ++
+              maybe_update_location(map_id, character_id) ++
+              maybe_update_ship(map_id, character_id) ++
+              maybe_update_alliance(map_id, character_id) ++
+              maybe_update_corporation(map_id, character_id)
 
-        character_updates
-        |> Enum.filter(fn update -> update != :skip end)
-        |> Enum.map(fn update ->
-          update
-          |> case do
-            {:character_location, location_info, old_location_info} ->
-              update_location(
-                character_id,
-                location_info,
-                old_location_info,
-                state
-              )
+          character_updates
+          |> Enum.filter(fn update -> update != :skip end)
+          |> Enum.map(fn update ->
+            update
+            |> case do
+              {:character_location, location_info, old_location_info} ->
+                update_location(
+                  character_id,
+                  location_info,
+                  old_location_info,
+                  state
+                )
 
-              :broadcast
+                :broadcast
 
-            {:character_ship, _info} ->
-              :broadcast
+              {:character_ship, _info} ->
+                :broadcast
 
-            {:character_online, _info} ->
-              :broadcast
+              {:character_online, _info} ->
+                :broadcast
 
-            {:character_tracking, _info} ->
-              :broadcast
+              {:character_tracking, _info} ->
+                :broadcast
 
-            {:character_alliance, _info} ->
-              WandererApp.Cache.insert_or_update(
-                "map_#{map_id}:invalidate_character_ids",
-                [character_id],
-                fn ids ->
-                  [character_id | ids]
-                end
-              )
+              {:character_alliance, _info} ->
+                WandererApp.Cache.insert_or_update(
+                  "map_#{map_id}:invalidate_character_ids",
+                  [character_id],
+                  fn ids ->
+                    [character_id | ids] |> Enum.uniq()
+                  end
+                )
 
-              :broadcast
+                :broadcast
 
-            {:character_corporation, _info} ->
-              WandererApp.Cache.insert_or_update(
-                "map_#{map_id}:invalidate_character_ids",
-                [character_id],
-                fn ids ->
-                  [character_id | ids]
-                end
-              )
+              {:character_corporation, _info} ->
+                WandererApp.Cache.insert_or_update(
+                  "map_#{map_id}:invalidate_character_ids",
+                  [character_id],
+                  fn ids ->
+                    [character_id | ids] |> Enum.uniq()
+                  end
+                )
 
-              :broadcast
+                :broadcast
 
-            _ ->
-              :skip
-          end
-        end)
-        |> Enum.filter(fn update -> update != :skip end)
-        |> Enum.uniq()
-        |> Enum.each(fn update ->
-          case update do
-            :broadcast ->
-              update_character(map_id, character_id)
+              _ ->
+                :skip
+            end
+          end)
+          |> Enum.filter(fn update -> update != :skip end)
+          |> Enum.uniq()
+          |> Enum.each(fn update ->
+            case update do
+              :broadcast ->
+                update_character(map_id, character_id)
 
-            _ ->
-              :ok
-          end
-        end)
+              _ ->
+                :ok
+            end
+          end)
 
-        :ok
+          :ok
+        end,
+        timeout: :timer.seconds(15),
+        max_concurrency: System.schedulers_online(),
+        on_timeout: :kill_task
+      )
+      |> Enum.each(fn
+        {:ok, _result} -> :ok
+        {:error, reason} -> Logger.error("Error in update_characters: #{inspect(reason)}")
       end)
-    end)
+    rescue
+      e ->
+        Logger.error("""
+        [Map Server] update_characters => exception: #{Exception.message(e)}
+        #{Exception.format_stacktrace(__STACKTRACE__)}
+        """)
+    end
   end
 
   defp update_character(map_id, character_id) do

lib/wanderer_app/map/server/map_server_impl.ex

@@ -32,7 +32,7 @@ defmodule WandererApp.Map.Server.Impl do
   @backup_state_timeout :timer.minutes(1)
   @update_presence_timeout :timer.seconds(5)
   @update_characters_timeout :timer.seconds(1)
-  @update_tracked_characters_timeout :timer.seconds(1)
+  @update_tracked_characters_timeout :timer.minutes(1)
 
   def new(), do: __struct__()
   def new(args), do: __struct__(args)
@@ -96,7 +96,13 @@ defmodule WandererApp.Map.Server.Impl do
           )
 
           Process.send_after(self(), :update_characters, @update_characters_timeout)
-          Process.send_after(self(), :update_tracked_characters, 100)
+
+          Process.send_after(
+            self(),
+            :update_tracked_characters,
+            @update_tracked_characters_timeout
+          )
+
           Process.send_after(self(), :update_presence, @update_presence_timeout)
           Process.send_after(self(), :cleanup_connections, 5_000)
           Process.send_after(self(), :cleanup_systems, 10_000)

lib/wanderer_app/maps.ex

@@ -94,7 +94,7 @@ defmodule WandererApp.Maps do
     end
   end
 
-  def load_characters(map, user_id) do
+  def load_characters(map, user_id) when not is_nil(map) do
     {:ok, user_characters} =
       WandererApp.Api.Character.active_by_user(%{user_id: user_id})
 
@@ -117,6 +117,8 @@ defmodule WandererApp.Maps do
     {:ok, %{characters: characters}}
   end
 
+  def load_characters(_map, _user_id), do: {:ok, %{characters: []}}
+
   def map_character(
         %{
           name: name,

lib/wanderer_app/repositories/map_chain_passages_repo.ex

@@ -8,13 +8,13 @@ defmodule WandererApp.MapChainPassagesRepo do
       to
     )
     |> case do
-      {:ok, connection} ->
+      {:ok, %{inserted_at: inserted_at} = _connection} when not is_nil(inserted_at) ->
         {:ok, from_passages} =
           WandererApp.Api.MapChainPassages.by_connection(%{
             map_id: map_id,
             from: from,
             to: to,
-            after: connection.inserted_at
+            after: inserted_at
           })
 
         {:ok, to_passages} =
@@ -22,7 +22,7 @@ defmodule WandererApp.MapChainPassagesRepo do
             map_id: map_id,
             from: to,
             to: from,
-            after: connection.inserted_at
+            after: inserted_at
           })
 
         from_passages =
@@ -39,7 +39,7 @@ defmodule WandererApp.MapChainPassagesRepo do
 
         {:ok, passages}
 
-      {:error, _error} ->
+      _error ->
         {:ok, []}
     end
   end

lib/wanderer_app_web/live/access_lists/access_lists_live.ex

@@ -20,6 +20,7 @@ defmodule WandererAppWeb.AccessListsLive do
      |> assign(
        selected_acl: nil,
        selected_acl_id: "",
+       allow_acl_creation: not WandererApp.Env.restrict_acls_creation?(),
        user_id: user_id,
        access_lists: access_lists |> Enum.map(fn acl -> map_ui_acl(acl, nil) end),
        characters: characters,
@@ -34,6 +35,7 @@ defmodule WandererAppWeb.AccessListsLive do
      |> assign(
        selected_acl: nil,
        selected_acl_id: "",
+       allow_acl_creation: false,
        access_lists: [],
        characters: [],
        members: []
@@ -188,7 +190,11 @@ defmodule WandererAppWeb.AccessListsLive do
     {:noreply, assign(socket, form: form)}
   end
 
-  def handle_event("create", %{"form" => form}, socket) do
+  def handle_event(
+        "create",
+        %{"form" => form},
+        %{assigns: %{allow_acl_creation: true}} = socket
+      ) do
     case WandererApp.Api.AccessList.new(form) do
       {:ok, _acl} ->
         {:ok, access_lists} = WandererApp.Acls.get_available_acls(socket.assigns.current_user)
@@ -408,9 +414,8 @@ defmodule WandererAppWeb.AccessListsLive do
         current_user_has_role?(socket.assigns.current_user, access_list, :admin) ->
           true
 
-        not is_nil(eve_character_id) and
-          (characters_has_role?([eve_character_id], access_list, :admin) or
-             characters_has_role?([eve_character_id], access_list, :manager)) and
+        not is_nil(eve_character_id) &&
+          characters_has_roles?([eve_character_id], access_list, [:admin, :manager]) &&
             not current_user_has_role?(socket.assigns.current_user, access_list, :admin) ->
           false
 
@@ -470,12 +475,12 @@ defmodule WandererAppWeb.AccessListsLive do
          |> put_flash(:info, "Only Characters can have Admin or Manager roles")
          |> push_navigate(to: ~p"/access-lists/#{socket.assigns.selected_acl_id}")
 
-  defp characters_has_role?(character_eve_ids, access_list, role_atom) do
-    access_list.members
-    |> Enum.any?(fn member ->
-      member.eve_character_id in character_eve_ids and member.role == role_atom
-    end)
-  end
+  defp characters_has_roles?(character_eve_ids, %{members: members} = _access_list, role_atoms),
+    do:
+      members
+      |> Enum.any?(fn %{eve_character_id: eve_character_id, role: role} = _member ->
+        eve_character_id in character_eve_ids and role in role_atoms
+      end)
 
   defp current_user_is_owner?(current_user, access_list) do
     character_ids = current_user.characters |> Enum.map(& &1.id)
@@ -486,18 +491,16 @@ defmodule WandererAppWeb.AccessListsLive do
   defp current_user_has_role?(current_user, access_list, role_atom) do
     character_eve_ids = current_user.characters |> Enum.map(& &1.eve_id)
 
-    characters_has_role?(character_eve_ids, access_list, role_atom)
+    characters_has_roles?(character_eve_ids, access_list, [role_atom])
   end
 
   defp can_add_members?(nil, _current_user), do: false
 
   defp can_add_members?(access_list, current_user) do
-    character_eve_ids = current_user.characters |> Enum.map(& &1.eve_id)
+    user_character_eve_ids = current_user.characters |> Enum.map(& &1.eve_id)
 
-    member = access_list.members |> Enum.find(&(&1.eve_character_id in character_eve_ids))
-
-    current_user_is_owner?(current_user, access_list) or
-      (not is_nil(member) and member.role in [:admin, :manager])
+    current_user_is_owner?(current_user, access_list) ||
+      characters_has_roles?(user_character_eve_ids, access_list, [:admin, :manager])
   end
 
   defp can_delete_member?(
@@ -512,9 +515,8 @@ defmodule WandererAppWeb.AccessListsLive do
       current_user_has_role?(current_user, access_list, :admin) ->
         true
 
-      not is_nil(eve_character_id) and
-        (characters_has_role?([eve_character_id], access_list, :admin) or
-           characters_has_role?([eve_character_id], access_list, :manager)) and
+      not is_nil(eve_character_id) &&
+        characters_has_roles?([eve_character_id], access_list, [:admin, :manager]) &&
           not current_user_has_role?(current_user, access_list, :admin) ->
         false
 

lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex

@@ -34,7 +34,7 @@
           </button>
         </:action>
       </.table>
-      <.link class="btn mt-2 w-full btn-neutral rounded-none" patch={~p"/access-lists/new"}>
+      <.link :if={@allow_acl_creation} class="btn mt-2 w-full btn-neutral rounded-none" patch={~p"/access-lists/new"}>
         <.icon name="hero-plus-solid" class="w-6 h-6" />
         <h3 class="card-title text-center text-md">New Access List</h3>
       </.link>
@@ -142,10 +142,10 @@
       placeholder="Select an owner"
       options={Enum.map(@characters, fn character -> {character.label, character.id} end)}
     />
-    
+
 <!-- Divider between above inputs and the API key section -->
     <hr class="my-4 border-gray-600" />
-    
+
 <!-- API Key Section with grid layout -->
     <div class="mt-2">
       <label class="block text-sm font-medium text-gray-200 mb-1">ACL API key</label>
@@ -195,78 +195,13 @@
 </.modal>
 
 <.modal
-  :if={@live_action in [:add_members]}
+  :if={@live_action in [:add_members] && can_add_members?(@access_list, @current_user)}
   title="Add Member"
   class="!w-[500px]"
   id="add_member"
   show
   on_cancel={JS.patch(~p"/access-lists/#{@selected_acl_id}")}
 >
-  <%!-- <div class="mt-4 mb-2 p-tabmenu p-component " data-pc-section="tabmenu">
-    <ul
-      class="p-tabmenu-nav border-none h-[25px] w-full flex"
-      role="menubar"
-      data-pc-section="menu"
-    >
-      <li
-        id="pr_id_17_0"
-        class="p-tabmenuitem p-highlight"
-        role="presentation"
-        data-p-highlight="true"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="Router Link"
-          tabindex="0"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Character</span>
-        </a>
-      </li>
-      <li
-        id="pr_id_17_1"
-        class="p-tabmenuitem"
-        role="presentation"
-        data-p-highlight="false"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="Programmatic"
-          tabindex="-1"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Corporation</span>
-        </a>
-      </li>
-      <li
-        id="pr_id_17_2"
-        class="p-tabmenuitem"
-        role="presentation"
-        data-p-highlight="false"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="External"
-          tabindex="-1"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Alliance</span>
-        </a>
-      </li>
-    </ul>
-  </div> --%>
   <.form :let={f} for={@member_form} phx-submit={@live_action}>
     <.live_select
       field={f[:member_id]}

lib/wanderer_app_web/presence_grace_period_manager.ex

@@ -11,7 +11,7 @@ defmodule WandererAppWeb.PresenceGracePeriodManager do
   require Logger
 
   # 30 minutes
-  @grace_period_ms :timer.minutes(30)
+  @grace_period_ms :timer.minutes(10)
   @check_remove_queue_interval :timer.seconds(30)
 
   defstruct pending_removals: %{}, timers: %{}, to_remove: []

lib/wanderer_app_web/router.ex

@@ -70,7 +70,8 @@ defmodule WandererAppWeb.Router do
     "'self'",
     "https://api.appzi.io",
     "https://www.googletagmanager.com",
-    "https://www.google-analytics.com"
+    "https://www.google-analytics.com",
+    "https://*.google-analytics.com"
   ]
 
   # Define sandbox values individually to ensure proper spacing

mix.exs

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

priv/repo/data/wormholeSystems.json

@@ -23286,7 +23286,7 @@
 		"solarSystemID": 31002568,
 		"statics": [
 			"U210",
-			"H296"
+			"Y790"
 		],
 		"systemName": "J005663",
 		"effectName": null

priv/repo/data/wormholes.json

@@ -15,7 +15,7 @@
     "dest": "ls",
     "src": ["c2"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 2000000000,
     "name": "A239",
@@ -37,7 +37,7 @@
     "dest": "c6",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "A982",
@@ -48,7 +48,7 @@
     "dest": "c6",
     "src": ["hs"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "48",
     "total_mass": 3000000000,
     "name": "B041",
@@ -59,7 +59,7 @@
     "dest": "hs",
     "src": ["c2"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 2000000000,
     "name": "B274",
@@ -81,7 +81,7 @@
     "dest": "hs",
     "src": ["c6"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "48",
     "total_mass": 3000000000,
     "name": "B520",
@@ -92,7 +92,7 @@
     "dest": "barbican",
     "src": ["hs", "ls", "ns", "jove"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "B735",
@@ -136,7 +136,7 @@
     "dest": "c3",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "C247",
@@ -169,7 +169,7 @@
     "dest": "conflux",
     "src": ["hs", "ls", "ns", "jove"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "C414",
@@ -191,7 +191,7 @@
     "dest": "c2",
     "src": ["c5"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "D364",
@@ -202,7 +202,7 @@
     "dest": "c2",
     "src": ["c2", "drifter"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "D382",
@@ -224,7 +224,7 @@
     "dest": "hs",
     "src": ["c3", "c4-shattered"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 5000000000,
     "name": "D845",
@@ -246,7 +246,7 @@
     "dest": "c4",
     "src": ["c5"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "E175",
@@ -257,7 +257,7 @@
     "dest": "ns",
     "src": ["c2"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "E545",
@@ -269,7 +269,7 @@
     "src": ["thera"],
     "static": true,
     "max_mass_per_jump": 1000000000,
-    "lifetime": "16",
+    "lifetime": "48",
     "total_mass": 3000000000,
     "name": "E587",
     "respawn": ["static"]
@@ -279,7 +279,7 @@
     "dest": "thera",
     "src": ["c2", "c3", "c4", "c5", "c6"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "F135",
@@ -323,7 +323,7 @@
     "dest": "c2",
     "src": ["c6"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "G024",
@@ -356,7 +356,7 @@
     "dest": "c5",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "H900",
@@ -367,7 +367,7 @@
     "dest": "c2",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "I182",
@@ -396,13 +396,13 @@
     "respawn": ["wandering", "reverse"]
   },
   {
-    "mass_regen": 500000000,
+    "mass_regen": 0,
     "dest": "ns",
     "src": ["c4"],
     "static": false,
-    "max_mass_per_jump": 1800000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
-    "total_mass": 5000000000,
+    "total_mass": 3000000000,
     "name": "K329",
     "respawn": ["wandering"]
   },
@@ -411,7 +411,7 @@
     "dest": "ns",
     "src": ["c3", "c4-shattered", "c5-shattered", "c6-shattered"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 3000000000,
     "name": "K346",
@@ -444,7 +444,7 @@
     "dest": "c3",
     "src": ["c6"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "L477",
@@ -477,7 +477,7 @@
     "dest": "thera",
     "src": ["ls"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "M164",
@@ -488,7 +488,7 @@
     "dest": "c3",
     "src": ["c5"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "M267",
@@ -539,13 +539,13 @@
     "respawn": ["static"]
   },
   {
-    "mass_regen": 500000000,
+    "mass_regen": 0,
     "dest": "ls",
     "src": ["c4"],
     "static": false,
-    "max_mass_per_jump": 2000000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
-    "total_mass": 3300000000,
+    "total_mass": 3000000000,
     "name": "N290",
     "respawn": ["wandering"]
   },
@@ -565,7 +565,7 @@
     "dest": "c2",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "N766",
@@ -576,7 +576,7 @@
     "dest": "c5",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "N770",
@@ -598,7 +598,7 @@
     "dest": "c3",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "N968",
@@ -609,7 +609,7 @@
     "dest": "c4",
     "src": ["hs", "ls", "ns"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "O128",
@@ -620,7 +620,7 @@
     "dest": "c3",
     "src": ["c2", "drifter"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "O477",
@@ -708,7 +708,7 @@
     "dest": "redoubt",
     "src": ["hs", "ls", "ns", "jove"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "R259",
@@ -719,7 +719,7 @@
     "dest": "c6",
     "src": ["c2", "drifter"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "R474",
@@ -730,7 +730,7 @@
     "dest": "c2",
     "src": ["hs", "ls", "ns"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "R943",
@@ -741,7 +741,7 @@
     "dest": "hs",
     "src": ["c4"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "S047",
@@ -774,7 +774,7 @@
     "dest": "sentinel",
     "src": ["hs", "ls", "ns", "jove"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "S877",
@@ -785,7 +785,7 @@
     "dest": "c4",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "T405",
@@ -807,7 +807,7 @@
     "dest": "ls",
     "src": ["c3", "c4-shattered", "c5-shattered"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "U210",
@@ -840,7 +840,7 @@
     "dest": "c6",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 3000000000,
     "name": "U574",
@@ -884,7 +884,7 @@
     "dest": "ls",
     "src": ["thera"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "V898",
@@ -906,7 +906,7 @@
     "dest": "vidette",
     "src": ["hs", "ls", "ns", "jove"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 750000000,
     "name": "V928",
@@ -939,7 +939,7 @@
     "dest": "c3",
     "src": ["hs", "ls", "ns"],
     "static": false,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "X702",
@@ -950,7 +950,7 @@
     "dest": "c4",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "X877",
@@ -961,7 +961,7 @@
     "dest": "c4",
     "src": ["c2", "drifter"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "Y683",
@@ -1016,7 +1016,7 @@
     "dest": "c4",
     "src": ["c6"],
     "static": true,
-    "max_mass_per_jump": 300000000,
+    "max_mass_per_jump": 375000000,
     "lifetime": "16",
     "total_mass": 2000000000,
     "name": "Z457",
@@ -1044,6 +1044,17 @@
     "name": "Z971",
     "respawn": ["wandering"]
   },
+  {
+    "mass_regen": 0,
+    "dest": "ls",
+    "src": ["c1", "c2", "c3", "c4", "c5", "c6"],
+    "static": false,
+    "max_mass_per_jump": 62000000,
+    "lifetime": "24",
+    "total_mass": 100000000,
+    "name": "J492",
+    "respawn": ["wandering", "reverse"]
+  },
   {
     "mass_regen": null,
     "dest": null,