[node] dependencies update and commit old files

haskell/src/SpaceTraders/APIClient/Contracts.hs

@@ -24,5 +24,5 @@ myContracts = do
         Right (APIMessage r (Just p')) -> do
           mapM_ setContract r
           if limit p' * page p' < total p' then listContracts' (nextPage p')
-                                             else Right <$> getContracts
+                                           else Right <$> getContracts
         _ -> undefined

haskell/src/SpaceTraders/Automation/Init.hs

@@ -6,6 +6,7 @@ module SpaceTraders.Automation.Init
   ) where
 
 import           Control.Exception
+import           Control.Monad
 import           Control.Monad.Error.Class
 import           Control.Monad.Reader
 import qualified Data.Text                        as T

nodejs/automation/agent.ts

@@ -17,6 +17,7 @@ enum states {
 	start_running_contracts_with_the_command_ship = 0,
 	visit_all_shipyards,
 	visit_all_markets,
+	send_probes_to_all_shipyards,
 }
 
 export async function run(): Promise<void> {
@@ -41,6 +42,8 @@ export async function run(): Promise<void> {
 					await visit_all_markets();
 					state++;
 					continue;
+				case states.send_probes_to_all_shipyards:
+					await send_probes_to_all_shipyards();
 					state++;
 					continue;
 				default:
@@ -54,6 +57,33 @@ export async function run(): Promise<void> {
 	}
 }
 
+async function send_probes_to_all_shipyards(): Promise<void> {
+	outer: while(true) {
+		const shipyardWaypoints = await trait(getShips()[0].nav.systemSymbol, 'SHIPYARD');
+		let candidates: Array<Waypoint> = [];
+		for (const w of shipyardWaypoints) {
+			if (is_there_a_ship_at_this_waypoint(w)) continue;
+			candidates.push(w);
+		}
+		if (candidates.length === 0) return;
+		// if we do not have enough probes, we buy some
+		if (candidates.length - 1 >= getShips().length - 2) {
+			const probe = await purchaseShip('SHIP_PROBE');
+			const probeWaypoint = await waypoint(probe.nav.waypointSymbol);
+			await probe.navigate(candidates[0]);
+			continue outer;
+		}
+		// otherwise we find the closest ones from a shipyard
+		const probes = getShips().slice(2);
+		let probesWaypoints: Array<Waypoint> = [];
+		for (const p of probes) {
+			probesWaypoints.push(await waypoint(p.nav.waypointSymbol));
+		}
+		const next = sortByDistanceFrom(candidates[0], probesWaypoints)[0].data;
+		await probes.filter(p => p.nav.waypointSymbol === next.symbol)[0].navigate(candidates[0]);
+	}
+}
+
 async function visit_all_markets(): Promise<void> {
 	if (await are_we_done_visiting_all_markets()) return;
 	// send all our probes except the starting one to map the system's markets

nodejs/automation/contracting.ts

@@ -1,7 +1,8 @@
+import * as autoTrading from './trading.ts';
 import { debugLog } from '../lib/api.ts';
 import { Ship } from '../lib/ships.ts';
-import * as mining from './mining.js';
+import * as mining from './mining.ts';
-import * as selling from './selling.js';
+import * as selling from './selling.ts';
 import { Contract, getContracts } from '../lib/contracts.ts';
 import * as libSystems from '../lib/systems.ts';
 import * as systems from '../lib/systems.ts';
@@ -105,7 +106,9 @@ async function runTradeProcurement(contract: Contract, ship: Ship): Promise<void
 				}
 			}
 			if (buyingPoint === "") {
-				throw `runTradeProcurement failed, no market exports or exchanges ${wantedCargo}`;
+				debugLog(`runTradeProcurement failed, no market exports or exchanges ${wantedCargo}`);
+				//await autoTrading.run(ship);
+				throw "not implemented";
 			}
 			// go buy what we need
 			await ship.navigate(await libSystems.waypoint(buyingPoint));

nodejs/automation/trading.ts

@@ -0,0 +1,63 @@
+//import events from 'events';
+//
+//const bus = new events.EventEmitter();
+
+import { debugLog } from '../lib/api.ts';
+import { Ship } from '../lib/ships.ts';
+import { market, trait, waypoint } from '../lib/systems.ts';
+import { Waypoint } from '../lib/types.ts';
+import {
+	distance,
+	sortByDistanceFrom,
+	sortByPrice,
+	whatCanBeTradedAt,
+} from '../lib/utils.ts';
+
+async function navigate_to_nearest_exporting_waypoint(ship: Ship): Promise<void> {
+	const shipWaypoint = await waypoint(ship.nav.waypointSymbol);
+	const marketplaceWaypoints = await trait(ship.nav.systemSymbol, 'MARKETPLACE');
+	const candidates: Array<Waypoint> = [];
+	for (const w of marketplaceWaypoints) {
+		const marketplaceData = await market(w);
+		if (!marketplaceData.exports) continue;
+		candidates.push(w);
+	}
+	const next = sortByDistanceFrom(shipWaypoint, candidates)[0].data;
+	await ship.navigate(next);
+}
+
+export async function run(ship: Ship): Promise<void> {
+	while (true) {
+		const shipWaypoint = await waypoint(ship.nav.waypointSymbol);
+		const marketplaceData = await market(shipWaypoint);
+		if (marketplaceData.exports.length === 0) {
+			await navigate_to_nearest_exporting_waypoint(ship);
+			continue;
+		}
+		const marketplaceWaypoints = await trait(ship.nav.systemSymbol, 'MARKETPLACE');
+		const candidates: Array<{price: number, tradeVolume: number, symbol: string, waypoint: Waypoint}> = [];
+		for (const w of marketplaceWaypoints) {
+			const data = await market(w);
+			const trades = marketplaceData.exports.filter(g => data.imports.some(h => g.symbol === h.symbol));
+			if (!trades) continue;
+			const exports = marketplaceData.tradeGoods.filter(g => trades.some(h => g.symbol === h.symbol));
+			const imports = data.tradeGoods.filter(g => trades.some(h => g.symbol === h.symbol));
+			for (const e of exports) {
+				const i = imports.filter(g => g.symbol === e.symbol)[0];
+				const price = i.sellPrice - e.purchasePrice - distance(w, shipWaypoint);
+				candidates.push({price: price, tradeVolume: e.tradeVolume, symbol: e.symbol, waypoint: w});
+				debugLog({distance: distance(w, shipWaypoint), purchasePrice: e.purchasePrice, sellPrice: i.sellPrice, tradeVolume: e.tradeVolume, symbol: e.symbol, waypoint: w});
+			}
+		}
+		sortByPrice(candidates);
+		debugLog(candidates[0]);
+		throw "STOP";
+		while(!ship.isFull()) {
+			await ship.purchase(candidates[0].symbol, Math.min(candidates[0].tradeVolume, ship.cargo.capacity - ship.cargo.units));
+		}
+		await ship.navigate(candidates[0].waypoint);
+		while (!ship.isEmpty()) {
+			await ship.sell(candidates[0].symbol, Math.min(candidates[0].tradeVolume, ship.cargo.inventory.filter(i => i.symbol === candidates[0].symbol)[0].units));
+		}
+	}
+}

nodejs/package.json

@@ -1,20 +1,19 @@
 {
 	"engines": {
-		"node": ">=21.6.2"
+		"node": ">=22.14.0"
-	},
-	"dependencies": {
-		"@types/better-sqlite3": "^7.6.12",
-		"better-sqlite3": "^11.7.2",
-		"tsx": "^4.18.0",
-		"typescript": "^5.7.3"
-	},
-	"devDependencies": {
-		"esrun": "^3.2.26",
-		"prettier": "^3.4.2",
-		"typescript-language-server": "^4.3.3"
 	},
 	"module": "nodenext",
 	"name": "spacetraders",
 	"type": "module",
-	"version": "0.0.1"
+	"version": "0.0.1",
+	"dependencies": {
+		"better-sqlite3": "^11.8.1"
+	},
+	"devDependencies": {
+		"@types/better-sqlite3": "^7.6.12",
+		"npm-check-updates": "^17.1.14",
+		"prettier": "^3.5.1",
+		"ts-node": "^10.9.2",
+		"typescript": "^5.7.3"
+	}
 }

nodejs/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2022",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2024",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */