feat: move off of systems.json and move Systems and SystemWaypoint into database

TODO.md

@@ -1542,4 +1542,4 @@ cli-1     | [WARN] FleetRole.probe has no specified behaviors, idling.
 
 ### fleet_charters will be empty until restart and then full.
 
-Not sure why. Some cache is not getting invalidated.
+Not sure why. Some cache is not getting invalidated.

packages/cli/bin/asteroids.dart

@@ -1,15 +1,14 @@
 import 'package:cli/caches.dart';
 import 'package:cli/cli.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   // List all known asteroids that have a market or shipyard.
   final marketListings = await MarketListingSnapshot.load(db);
   final shipyardListings = await ShipyardListingSnapshot.load(db);
-  final systemsCache = SystemsCache.load(fs);
 
   for (final marketListing in marketListings.listings) {
     final waypointSymbol = marketListing.waypointSymbol;
-    final waypoint = systemsCache.waypoint(waypointSymbol);
+    final waypoint = await db.systems.waypoint(waypointSymbol);
     if (!waypoint.isAsteroid) {
       continue;
     }

packages/cli/bin/behavior.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:cli/cli.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   var behaviors = await db.allBehaviorStates();
   if (argResults.rest.isNotEmpty) {
     final onlyShips =

packages/cli/bin/cli.dart

@@ -9,7 +9,6 @@ import 'package:cli/logic/logic.dart';
 import 'package:cli/net/auth.dart';
 import 'package:cli/net/register.dart';
 import 'package:db/db.dart';
-import 'package:file/local.dart';
 import 'package:scoped_deps/scoped_deps.dart';
 import 'package:types/types.dart';
 
@@ -129,8 +128,6 @@ Future<void> cliMain(List<String> args) async {
 
   logger.info('Welcome to Space Traders! 🚀');
 
-  // Use package:file to make things mockable.
-  const fs = LocalFileSystem();
   final db = await defaultDatabase();
 
   var agentSymbol = await db.getAgentSymbol();
@@ -163,7 +160,7 @@ Future<void> cliMain(List<String> args) async {
 
   config = await Config.fromDb(db);
 
-  final caches = await Caches.loadOrFetch(fs, api, db);
+  final caches = await Caches.loadOrFetch(api, db);
   final marketPricesCount = await db.marketPricesCount();
   final marketWaypointsCount = await db.marketPricesWaypointCount();
   final shipyardPricesCount = await db.shipyardPricesCount();

packages/cli/bin/contracts.dart

@@ -24,7 +24,7 @@ Future<void> printContracts(
   }
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final printAll = argResults['all'] as bool;
   final contractSnapshot = await ContractSnapshot.load(db);
   await printContracts(

packages/cli/bin/db_stats.dart

@@ -1,6 +1,6 @@
 import 'package:cli/cli.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   // Get a list of all tables.
   final tableNames = await db.allTableNames();
   // Get counts for each table.

packages/cli/bin/deals_in_progress.dart

@@ -13,7 +13,7 @@ String annotatedName(CostedDeal deal) {
   return deal.tradeSymbol.value;
 }
 
-Future<void> cliMain(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> cliMain(Database db, ArgResults argResults) async {
   final behaviors = await BehaviorSnapshot.load(db);
   final states = behaviors.states.where((state) => state.deal != null).toList();
 

packages/cli/bin/deals_recent.dart

@@ -100,7 +100,7 @@ bool Function(Transaction t) filterFromArgs(List<String> args) {
   return (Transaction t) => t.shipSymbol == shipSymbol;
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final filter = filterFromArgs(argResults.rest);
   final deals = <SyntheticDeal>[];
   final openDeals = <ShipSymbol, List<Transaction>>{};

packages/cli/bin/delete_behavior.dart

@@ -1,6 +1,6 @@
 import 'package:cli/cli.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   var behaviors = await db.allBehaviorStates();
   final onlyShips = argResults.rest.map((s) => int.parse(s, radix: 16)).toSet();
   behaviors =
@@ -13,7 +13,7 @@ Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
   logger.confirm('Deleting behaviors: ${behaviors.map((b) => b.shipSymbol)}');
 
   for (final behavior in behaviors) {
-    await db.deleteBehaviorState(behavior.shipSymbol);
+    await db.deleteBehavior(behavior.shipSymbol);
   }
 }
 

packages/cli/bin/earning_per_ship.dart

@@ -43,7 +43,7 @@ class TransactionSummary {
   }
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   // For a given ship, show the credits per minute averaged over the
   // last hour.
   final lookbackMinutesString = argResults.rest.firstOrNull;

packages/cli/bin/earning_rate.dart

@@ -11,7 +11,7 @@ int hoursAgo(DateTime time) {
   return DateTime.timestamp().difference(time).inHours;
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   // Credits per hour.
   final oneDayAgoAsHour = snapToHour(
     DateTime.timestamp().subtract(const Duration(hours: 24)),

packages/cli/bin/exports_supply_chain.dart

@@ -6,12 +6,12 @@ import 'package:cli/plan/supply_chain.dart';
 // Returns the distance between two waypoints, or null if they are in different
 // systems.
 int? _distanceBetween(
-  SystemsCache systemsCache,
+  SystemsSnapshot systems,
   WaypointSymbol a,
   WaypointSymbol b,
 ) {
-  final aWaypoint = systemsCache.waypoint(a);
-  final bWaypoint = systemsCache.waypoint(b);
+  final aWaypoint = systems.waypoint(a);
+  final bWaypoint = systems.waypoint(b);
   if (aWaypoint.system != bWaypoint.system) {
     return null;
   }
@@ -31,7 +31,7 @@ class DescribingVisitor extends SupplyLinkVisitor {
   /// Create a new describing visitor.
   DescribingVisitor(this.systems, this.db);
 
-  final SystemsCache systems;
+  final SystemsSnapshot systems;
   final Database db;
 
   final _indent = ' ';
@@ -83,19 +83,19 @@ class DescribingVisitor extends SupplyLinkVisitor {
   }
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final exports = await TradeExportCache(db).snapshot();
-  final systems = SystemsCache.load(fs);
+  final systems = await db.systems.snapshotAllSystems();
   final marketListings = await MarketListingSnapshot.load(db);
   final charting = await ChartingSnapshot.load(db);
   final agent = await db.getMyAgent();
 
-  final jumpgate =
-      systems.jumpGateWaypointForSystem(agent!.headquarters.system)!;
-  final waypointSymbol = jumpgate.symbol;
+  final waypointSymbol = systems.jumpGateSymbolForSystem(
+    agent!.headquarters.system,
+  );
   final construction =
       (await db.getConstructionRecord(
-        waypointSymbol,
+        waypointSymbol!,
         defaultMaxAge,
       ))!.construction;
 

packages/cli/bin/extract_scores.dart

@@ -1,6 +1,5 @@
 import 'package:cli/cache/charting_cache.dart';
 import 'package:cli/cache/market_price_snapshot.dart';
-import 'package:cli/cache/systems_cache.dart';
 import 'package:cli/cli.dart';
 import 'package:cli/config.dart';
 import 'package:cli/plan/extraction_score.dart';
@@ -39,7 +38,7 @@ double _scoreMarkets(
   return percentiles.average / 100.0;
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final countLimit = int.tryParse(argResults['limit'] as String);
   if (countLimit == null) {
     throw ArgumentError.value(
@@ -65,7 +64,7 @@ Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
     ' with matching markets within $maxDistance total round-trip:',
   );
 
-  final systems = await SystemsCache.loadOrFetch(fs);
+  final systems = await db.systems.snapshotAllSystems();
   final charting = ChartingCache(db);
   final hqSystem = await myHqSystemSymbol(db);
   final marketPrices = await MarketPriceSnapshot.loadOneSystem(db, hqSystem);

packages/cli/bin/find_mounts.dart

@@ -2,11 +2,11 @@ import 'package:cli/caches.dart';
 import 'package:cli/cli.dart';
 import 'package:cli/plan/trading.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final marketPrices = await MarketPriceSnapshot.loadAll(db);
-  final systemsCache = SystemsCache.load(fs);
+  final systemsCache = await db.systems.snapshotAllSystems();
   final systemConnectivity = await loadSystemConnectivity(db);
-  final routePlanner = RoutePlanner.fromSystemsCache(
+  final routePlanner = RoutePlanner.fromSystemsSnapshot(
     systemsCache,
     systemConnectivity,
     sellsFuel: (_) => false,

packages/cli/bin/fleet.dart

@@ -49,14 +49,14 @@ String _behaviorOrTypeString(Ship ship, BehaviorState? behavior) {
       '${ship.registration.role}';
 }
 
-void logShip(
-  SystemsCache systemsCache,
+Future<void> logShip(
+  Database db,
   MarketPriceSnapshot marketPrices,
   Ship ship,
   BehaviorState? behavior,
-) {
+) async {
   const indent = '   ';
-  final waypoint = systemsCache.waypoint(ship.waypointSymbol);
+  final waypointType = await db.systems.waypointType(ship.waypointSymbol);
   final cargoStatus =
       ship.cargo.capacity == 0
           ? ''
@@ -74,14 +74,14 @@ void logShip(
   if (routePlan != null) {
     final timeLeft = ship.timeToArrival(routePlan);
     final destination = routePlan.endSymbol.sectorLocalName;
-    final destinationType = systemsCache.waypoint(routePlan.endSymbol).type;
+    final destinationType = await db.systems.waypointType(routePlan.endSymbol);
     final arrival = approximateDuration(timeLeft);
     logger.info(
       '${indent}en route to $destination $destinationType '
       'in $arrival',
     );
   } else {
-    logger.info('$indent${describeShipNav(ship.nav)} ${waypoint.type}');
+    logger.info('$indent${describeShipNav(ship.nav)} $waypointType');
   }
   final deal = behavior?.deal;
   if (deal != null) {
@@ -99,7 +99,7 @@ bool Function(Ship) filterFromArgs(List<String> args) {
   return (ship) => ship.symbol.symbol == symbol;
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final filter = filterFromArgs(argResults.rest);
   final ships = await ShipSnapshot.load(db);
 
@@ -113,11 +113,10 @@ Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
     return;
   }
 
-  final systemsCache = SystemsCache.load(fs);
   final marketPrices = await MarketPriceSnapshot.loadAll(db);
   for (final ship in matchingShips) {
-    final behaviorState = await db.behaviorStateBySymbol(ship.symbol);
-    logShip(systemsCache, marketPrices, ship, behaviorState);
+    final behaviorState = await db.getBehavior(ship.symbol);
+    await logShip(db, marketPrices, ship, behaviorState);
   }
 
   final behaviors = await BehaviorSnapshot.load(db);

packages/cli/bin/fleet_charters.dart

@@ -11,9 +11,9 @@ String plural(int count, String singular, [String plural = 's']) {
   return '$count ${count == 1 ? singular : singular + plural}';
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
-  final charterStates = await db.behaviorStatesWithBehavior(Behavior.charter);
-  final systemsCache = SystemsCache.load(fs);
+Future<void> command(Database db, ArgResults argResults) async {
+  final charterStates = await db.behaviorsOfType(Behavior.charter);
+  final systemsCache = db.systems;
   final ships = await ShipSnapshot.load(db);
 
   logger.info('${plural(charterStates.length, 'charter')}:');
@@ -27,7 +27,9 @@ Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
     if (routePlan != null) {
       final timeLeft = ship.timeToArrival(routePlan);
       final destination = routePlan.endSymbol.sectorLocalName;
-      final destinationType = systemsCache.waypoint(routePlan.endSymbol).type;
+      final destinationType = await systemsCache.waypointType(
+        routePlan.endSymbol,
+      );
       final arrival = approximateDuration(timeLeft);
       logger.info('  en route to $destination $destinationType in $arrival');
     }

packages/cli/bin/fleet_closest_to.dart

@@ -3,15 +3,15 @@ import 'package:cli/cli.dart';
 import 'package:cli/nav/navigation.dart';
 import 'package:collection/collection.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   // For a given destination, compute the time to travel there for each ship.
   final destination = WaypointSymbol.fromString(argResults.rest[0]);
   final ships = await ShipSnapshot.load(db);
-  final systemsCache = SystemsCache.load(fs);
+  final systemsCache = await db.systems.snapshotAllSystems();
   final marketListings = await MarketListingSnapshot.load(db);
 
   final systemConnectivity = await loadSystemConnectivity(db);
-  final routePlanner = RoutePlanner.fromSystemsCache(
+  final routePlanner = RoutePlanner.fromSystemsSnapshot(
     systemsCache,
     systemConnectivity,
     sellsFuel: defaultSellsFuel(marketListings),

packages/cli/bin/fleet_idle.dart

@@ -2,7 +2,7 @@ import 'package:cli/caches.dart';
 import 'package:cli/cli.dart';
 
 // count the number of idle behaviors by FleetRole.
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final ships = await ShipSnapshot.load(db);
   final behaviors = await BehaviorSnapshot.load(db);
   final idleByRole = <FleetRole, int>{};

packages/cli/bin/fleet_needed_mounts.dart

@@ -4,7 +4,7 @@ import 'package:cli/caches.dart';
 import 'package:cli/central_command.dart';
 import 'package:cli/cli.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final ships = await ShipSnapshot.load(db);
   final centralCommand = CentralCommand();
 

packages/cli/bin/fleet_ship_to_buy.dart

@@ -3,7 +3,7 @@ import 'package:cli/central_command.dart';
 import 'package:cli/cli.dart';
 import 'package:cli/config.dart';
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final shipCache = await ShipSnapshot.load(db);
   final shipyardListings = await ShipyardListingSnapshot.load(db);
   final shipyardShips = await ShipyardShipCache(db).snapshot();

packages/cli/bin/fleet_systems.dart

@@ -22,7 +22,7 @@ String _describeBehaviors(BehaviorSnapshot behaviors, List<Ship> ships) {
   return behaviorCounts.entries.map((e) => '${e.key}: ${e.value}').join(', ');
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final ships = await ShipSnapshot.load(db);
   final behaviors = await BehaviorSnapshot.load(db);
 

packages/cli/bin/fleet_value.dart

@@ -31,7 +31,7 @@ Map<ShipType, int> _shipTypeCounts(
   return typeCounts;
 }
 
-Future<void> command(FileSystem fs, Database db, ArgResults argResults) async {
+Future<void> command(Database db, ArgResults argResults) async {
   final ships = await ShipSnapshot.load(db);
   final marketPrices = await MarketPriceSnapshot.loadAll(db);
   final shipyardPrices = await ShipyardPriceSnapshot.load(db);