Refactored the code to separate automation code from the lib handling the api

4 files changed, 96 insertions, 109 deletions

diff --git a/automation/contract.js b/automation/contract.js
new file mode 100644
index 0000000..bf428e9
--- /dev/null
+++ b/automation/contract.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({id: 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/mining.js b/automation/mining.js
new file mode 100644
index 0000000..bdd89ac
--- /dev/null
+++ b/automation/mining.js
@@ -0,0 +1,37 @@
+import * as api from '../lib/api.js';
+import * as ships from '../lib/ships.js';
+
+// example ctx { good: 'SILVER_ORE', ship: 'ADYXAX-2' }
+// returns the number of units of the good the ship extracted
+export async function mineUntilFullOf(ctx) {
+	while(true) {
+		let response = await mineUntilFull({ship: ctx.ship});
+		if (response === null) response = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this
+		let good = response.data.cargo.inventory.filter(i => i.symbol === ctx.good)[0];
+		const inventory = response.data.cargo.inventory.filter(i => i.symbol !== ctx.good);
+		const antimatter = response.data.cargo.inventory.filter(i => i.symbol === 'ANTIMATTER')[0];
+		if (good?.units + (antimatter?.units ?? 0) >= response.data.cargo.capacity * 0.9) { // > 90% full of the valuable goods
+			return good.units;
+		} else { // we are full but need to sell junk
+			await ships.dock({ship: ctx.ship});
+			for (let i=0; i<inventory.length; ++i) {
+				if (inventory[i].symbol === 'ANTIMATTER') continue;
+				//console.log(`selling ${inventory[i].units} of ${inventory[i].symbol}`);
+				await ships.sell({ship: ctx.ship, good: inventory[i].symbol, units: inventory[i].units});
+			}
+			await ships.orbit({ship: ctx.ship});
+		}
+	}
+}
+
+// example ctx { ship: 'ADYXAX-2' }
+// returns the last ship's extract api response
+async function mineUntilFull(ctx) {
+	while(true) {
+		const response = await ships.extract(ctx);
+		if (response === null) return null;
+		//console.log(`${ctx.ship}: extracted ${response.data.extraction.yield.units} of ${response.data.extraction.yield.symbol}`);
+		await api.sleep(response.data.cooldown.remainingSeconds*1000);
+		if (response.data.cargo.units >= response.data.cargo.capacity * 0.9) return response;
+	}
+}
diff --git a/lib/agent.js b/lib/agent.js
index 7360dd3..bf27e85 100644
--- a/lib/agent.js
+++ b/lib/agent.js
@@ -1,88 +1,4 @@
 import { registerAgent } from '../database/config.js';
-import * as api from './api.js';
-import * as contracts from './contracts.js';
-import * as ships from './ships.js';
-import * as systems from './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({id: 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 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?`;
-		}
-	}
-}
-
-// example ctx { good: 'SILVER_ORE', ship: 'ADYXAX-2' }
-// returns the number of units of the good the ship extracted
-async function mineUntilFullOf(ctx) {
-	while(true) {
-		let response = await mineUntilFull({ship: ctx.ship});
-		if (response === null) response = await ships.ship({ship: ctx.ship}); // TODO we should not need to fetch this
-		let good = response.data.cargo.inventory.filter(i => i.symbol === ctx.good)[0];
-		const inventory = response.data.cargo.inventory.filter(i => i.symbol !== ctx.good);
-		const antimatter = response.data.cargo.inventory.filter(i => i.symbol === 'ANTIMATTER')[0];
-		if (good?.units + (antimatter?.units ?? 0) >= response.data.cargo.capacity * 0.9) { // > 90% full of the valuable goods
-			return good.units;
-		} else { // we are full but need to sell junk
-			await ships.dock({ship: ctx.ship});
-			for (let i=0; i<inventory.length; ++i) {
-				if (inventory[i].symbol === 'ANTIMATTER') continue;
-				//console.log(`selling ${inventory[i].units} of ${inventory[i].symbol}`);
-				await ships.sell({ship: ctx.ship, good: inventory[i].symbol, units: inventory[i].units});
-			}
-			await ships.orbit({ship: ctx.ship});
-		}
-	}
-}
-
-// example ctx { ship: 'ADYXAX-2' }
-// returns the last ship's extract api response
-async function mineUntilFull(ctx) {
-	while(true) {
-		const response = await ships.extract(ctx);
-		if (response === null) return null;
-		//console.log(`${ctx.ship}: extracted ${response.data.extraction.yield.units} of ${response.data.extraction.yield.symbol}`);
-		await api.sleep(response.data.cooldown.remainingSeconds*1000);
-		if (response.data.cargo.units >= response.data.cargo.capacity * 0.9) return response;
-	}
-}
 
 // This function inits the database in case we have an already registered game
 export function init(symbol, faction, token) {
diff --git a/main.js b/main.js
index 908a8ba..e6a516f 100755
--- a/main.js
+++ b/main.js
@@ -1,3 +1,4 @@
+import * as autoContract from './automation/contract.js';
 import * as agent from './lib/agent.js';
 import * as api from './lib/api.js';
 import * as contracts from './lib/contracts.js';
@@ -5,35 +6,18 @@ import * as ships from './lib/ships.js';
 import * as systems from './lib/systems.js';
 
 function usage() {
-	console.log(`contracts\t\t\tList all of your contracts.
-extract [ship] [good]\t\tExtracts a good from the asteroid field the ship is orbiting and sell locally the unwanted ores until cargo is full
-init [symbol] [faction] [token]\tinits the database in case we have an already registered game
-my-agent\t\t\tFetch your agent's details.
-register [symbol] [faction]\tRegisters your agent then inits the database
-ships\t\t\tRetrieve all of your ships.`);
+	console.log(`autoContractForShip [ship_symbol]	run a contract extraction-delivery loop for the ship.
+contracts.contracts			List your contracts.
+my-agent				Fetch your agent's status.
+register [symbol] [faction]		Registers your agent then inits the database
+ships.ship [ship_symbol]		Retrieve a ship's status.
+ships					Retrieve all of your ships.
 }
 
 switch(process.argv[2]) {
-case 'auto':
-	await agent.auto({ship: process.argv[3]});
+case 'autoContractForShip':
+	await autoContract.auto({ship: process.argv[3]});
 	break;
-//case 'deliver':
-//	agent.deliver({
-//		contract: process.argv[3],
-//		ship: process.argv[4],
-//		good: process.argv[5],
-//		destination: process.argv[6],
-//		field: process.argv[7],
-//		//units: process.argv[8],
-//	});
-//	break;
-//case 'extract':
-//	if (process.argv[3] !== undefined && process.argv[4] !== undefined) {
-//		agent.extract({ship: process.argv[3], good: process.argv[4]});
-//	} else {
-//		usage();
-//	}
-//	break;
 case 'init':
 	if (process.argv[3] !== undefined && process.argv[4] !== undefined && process.argv[5] !== undefined) {
 		agent.init(process.argv[3], process.argv[4], process.argv[5]);