From afe2db8a35c175c6fdd1cd9f120fcc466dd71f2e Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Tue, 30 May 2023 22:22:16 +0200
Subject: Refactoring

---
 automation/contract.js    | 50 -----------------------------------------------
 automation/contracting.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 main.js                   |  4 ++--
 3 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 automation/contract.js
 create mode 100644 automation/contracting.js

diff --git a/automation/contract.js b/automation/contract.js
deleted file mode 100644
index aebb265..0000000
--- a/automation/contract.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as mining from './mining.js';
-import * as api from '../lib/api.js';
-import * as contracts from '../lib/contracts.js';
-import * as ships from '../lib/ships.js';
-import * as systems from '../lib/systems.js';
-
-export async function auto(ctx) {
-	let ship = await ships.ship({ship: ctx.ship});
-	// Fetch our contracts in the system the ship currently is in
-	let cs = await contracts.contracts();
-	cs = cs.data.filter(c => c.terms.deliver[0].destinationSymbol.startsWith(ship.data.nav.systemSymbol));
-	if (cs === []) throw `No contract at ${ctx.ship}'s location`;
-	let contract = cs[0];
-	if (!contract.accepted) {
-		console.log(new Date(), `accepting contract ${contract.id}`);
-		await contracts.accept({contract: contract.id});
-	}
-	const good = contract.terms.deliver[0].tradeSymbol;
-	const deliveryPoint = contract.terms.deliver[0].destinationSymbol;
-	const asteroidFields = await systems.type({symbol: ship.data.nav.systemSymbol, type: 'ASTEROID_FIELD'});
-	const asteroidField = asteroidFields[0].symbol;
-	while (true) {
-		ship = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this
-		// If we are in transit, we wait until we arrive
-		const delay = new Date(ship.data.nav.route.arrival) - new Date();
-		if (delay > 0) await api.sleep(delay);
-		// Then it depends on where we are
-		let goodCargo = ship.data.cargo.inventory.filter(i => i.symbol === good)[0];
-		// the switch makes this 'resumable'
-		switch (ship.data.nav.waypointSymbol) {
-		case asteroidField:
-			let response = await mining.mineUntilFullOf({good: good, ship: ctx.ship});
-			//console.log(`${ctx.ship}'s cargo is full with ${response.units} of ${good}!`);
-			await ships.navigate({ship: ctx.ship, waypoint: deliveryPoint});
-			break;
-		case deliveryPoint:
-			await ships.dock({ship: ctx.ship});
-			await ships.refuel({ship: ctx.ship});
-			console.log(`delivering ${goodCargo.units} of ${good}`);
-			await contracts.deliver({contract: contract.id, ship: ctx.ship, good: good, units: goodCargo.units });
-			await ships.navigate({ship: ctx.ship, waypoint: asteroidField});
-			await ships.dock({ship: ctx.ship});
-			await ships.refuel({ship: ctx.ship});
-			await ships.orbit({ship: ctx.ship});
-			break;
-		default:
-			throw `where is the ship?`;
-		}
-	}
-}
diff --git a/automation/contracting.js b/automation/contracting.js
new file mode 100644
index 0000000..aebb265
--- /dev/null
+++ b/automation/contracting.js
@@ -0,0 +1,50 @@
+import * as mining from './mining.js';
+import * as api from '../lib/api.js';
+import * as contracts from '../lib/contracts.js';
+import * as ships from '../lib/ships.js';
+import * as systems from '../lib/systems.js';
+
+export async function auto(ctx) {
+	let ship = await ships.ship({ship: ctx.ship});
+	// Fetch our contracts in the system the ship currently is in
+	let cs = await contracts.contracts();
+	cs = cs.data.filter(c => c.terms.deliver[0].destinationSymbol.startsWith(ship.data.nav.systemSymbol));
+	if (cs === []) throw `No contract at ${ctx.ship}'s location`;
+	let contract = cs[0];
+	if (!contract.accepted) {
+		console.log(new Date(), `accepting contract ${contract.id}`);
+		await contracts.accept({contract: contract.id});
+	}
+	const good = contract.terms.deliver[0].tradeSymbol;
+	const deliveryPoint = contract.terms.deliver[0].destinationSymbol;
+	const asteroidFields = await systems.type({symbol: ship.data.nav.systemSymbol, type: 'ASTEROID_FIELD'});
+	const asteroidField = asteroidFields[0].symbol;
+	while (true) {
+		ship = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this
+		// If we are in transit, we wait until we arrive
+		const delay = new Date(ship.data.nav.route.arrival) - new Date();
+		if (delay > 0) await api.sleep(delay);
+		// Then it depends on where we are
+		let goodCargo = ship.data.cargo.inventory.filter(i => i.symbol === good)[0];
+		// the switch makes this 'resumable'
+		switch (ship.data.nav.waypointSymbol) {
+		case asteroidField:
+			let response = await mining.mineUntilFullOf({good: good, ship: ctx.ship});
+			//console.log(`${ctx.ship}'s cargo is full with ${response.units} of ${good}!`);
+			await ships.navigate({ship: ctx.ship, waypoint: deliveryPoint});
+			break;
+		case deliveryPoint:
+			await ships.dock({ship: ctx.ship});
+			await ships.refuel({ship: ctx.ship});
+			console.log(`delivering ${goodCargo.units} of ${good}`);
+			await contracts.deliver({contract: contract.id, ship: ctx.ship, good: good, units: goodCargo.units });
+			await ships.navigate({ship: ctx.ship, waypoint: asteroidField});
+			await ships.dock({ship: ctx.ship});
+			await ships.refuel({ship: ctx.ship});
+			await ships.orbit({ship: ctx.ship});
+			break;
+		default:
+			throw `where is the ship?`;
+		}
+	}
+}
diff --git a/main.js b/main.js
index 92aca26..04214fd 100755
--- a/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-import * as autoContract from './automation/contract.js';
+import * as autoContracting from './automation/contracting.js';
 import * as autoMining from './automation/mining.js';
 import * as agent from './lib/agent.js';
 import * as api from './lib/api.js';
@@ -18,7 +18,7 @@ status					Servers' status`);
 
 switch(process.argv[2]) {
 case 'autoContractForShip':
-	await autoContract.auto({ship: process.argv[3]});
+	await autoContracting.auto({ship: process.argv[3]});
 	break;
 case 'autoMiningForShip':
 	await autoMining.mineUntilFullOf({ship: process.argv[3], good: 'NON_EXISTENT'});
-- 
cgit v1.2.3