adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

[javascript] implemented contract fulfillment

Browse source
This commit is contained in:
Julien Dessaux 2023-10-19 01:58:06 +02:00
parent 4dd8a2e90f
commit 378b5a5ffb
Signed by: adyxax
GPG key ID: F92E51B86E07177E
3 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nodejs/automation/contracting.js
View file

@ -34,7 +34,7 @@ async function runProcurement(contract, ships) {
const asteroidFields = await systems.type({symbol: ships[0].nav.systemSymbol, type: 'ASTEROID_FIELD'});
const asteroidField = asteroidFields[0].symbol;
ships.forEach(async function(ship) {
while (!contract.fulfilled) {
while (!dbContracts.getContract(contract.id).fulfilled) {
ship = dbShips.getShip(ship.symbol);
let goodCargo = ship.cargo.inventory.filter(i => i.symbol === wantedCargo)[0];
// If we are in transit, we wait until we arrive
@ -49,8 +49,9 @@ async function runProcurement(contract, ships) {
case deliveryPoint:
if (goodCargo !== undefined) { // we could be here if a client restart happens right after selling before we navigate away
console.log(`delivering ${goodCargo.units} of ${wantedCargo}`);
await contracts.deliver({contract: contract.id, symbol: ship.symbol, good: wantedCargo, units: goodCargo.units });
// TODO check if contract is fulfilled!
if (await contracts.deliver({id: contract.id, symbol: ship.symbol, good: wantedCargo, units: goodCargo.units })) {
break;
}
}
await libShips.navigate({symbol: ship.symbol, waypoint: asteroidField});
break;
@ -58,5 +59,6 @@ async function runProcurement(contract, ships) {
await libShips.navigate({symbol: ship.symbol, waypoint: asteroidField});
}
}
// TODO repurpose the ship
});
}

35
nodejs/lib/contracts.js
View file

@ -19,21 +19,48 @@ export async function contracts() {
return contracts;
}
// returns true if the contract has been fulfilled
export async function deliver(ctx) {
const contract = dbContracts.getContract(ctx.id);
if (contract.terms.deliver[0].unitsRequired === contract.terms.deliver[0].unitsFulfilled) {
await fulfill(ctx);
return true;
}
await libShips.dock(ctx);
const response = await api.send({ endpoint: `/my/contracts/${ctx.contract}/deliver`, method: 'POST', payload: {
const response = await api.send({ endpoint: `/my/contracts/${ctx.id}/deliver`, method: 'POST', payload: {
shipSymbol: ctx.symbol,
tradeSymbol: ctx.good,
units: ctx.units,
}});
if (response.error !== undefined) {
throw response;
switch(response.error.code) {
case 4509: // contract delivery terms have been met
await fulfill(ctx);
return true;
default: // yet unhandled error
api.debugLog(response);
throw response;
}
}
dbContracts.setContract(response.data.contract);
dbShips.setShipCargo(ctx.symbol, response.data.cargo);
// TODO update contract delivered units
// TODO track credits
if(response.data.contract.terms.deliver[0].unitsRequired === response.data.contract.terms.deliver[0].unitsFulfilled) {
await fulfill(ctx);
return true;
}
return false;
}
export async function fulfill(ctx) {
return await api.send({ endpoint: `/my/contracts/${ctx.contract}/fulfill`, method: 'POST'});
const contract = dbContracts.getContract(ctx.id);
if (contract.fulfilled) {
return;
}
const response = await api.send({ endpoint: `/my/contracts/${ctx.id}/fulfill`, method: 'POST'});
if (response.error !== undefined) {
api.debugLog(response);
throw response;
}
dbContracts.setContract(response.data.contract);
}

1
nodejs/main.js
View file

@ -3,7 +3,6 @@ import * as autoExploring from './automation/exploration.js';
import * as autoInit from './automation/init.js';
import * as api from './lib/api.js';
import * as contracts from './lib/contracts.js';
import * as ships from './lib/ships.js';
await autoInit.init();
autoContracting.init();