diff options
Diffstat (limited to '')
31 files changed, 1177 insertions, 1259 deletions
diff --git a/golang/cmd/spacetraders/main.go b/golang/cmd/spacetraders/main.go index bae6c27..0e50497 100644 --- a/golang/cmd/spacetraders/main.go +++ b/golang/cmd/spacetraders/main.go @@ -6,6 +6,7 @@ import ( "log/slog" "os" "os/signal" + "syscall" "git.adyxax.org/adyxax/spacetraders/golang/pkg/agent" "git.adyxax.org/adyxax/spacetraders/golang/pkg/api" @@ -23,7 +24,7 @@ func main() { logger := slog.New(slog.NewJSONHandler(os.Stdout, opts)) slog.SetDefault(logger) - ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt) + ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) defer cancel() db, err := database.NewDB( @@ -35,7 +36,7 @@ func main() { os.Exit(1) } - apiClient := api.NewClient(ctx) + apiClient := api.NewClient(ctx, db) defer apiClient.Close() if err := agent.Run( apiClient, diff --git a/golang/pkg/agent/contracting.go b/golang/pkg/agent/contracting.go index 0f07170..4e476a6 100644 --- a/golang/pkg/agent/contracting.go +++ b/golang/pkg/agent/contracting.go @@ -11,39 +11,79 @@ func (a *agent) autoContracting(ship *model.Ship) { defer a.wg.Done() contracts, err := a.client.MyContracts() if err != nil { - a.sendShipError(fmt.Errorf("failed to get my contracts: %w", err), ship) + a.channel <- fmt.Errorf("failed to get my contracts with ship %s: %w", ship.Symbol, err) return } for _, contract := range contracts { - if contract.Fullfilled { + if contract.Fulfilled { continue } now := time.Now() if now.Before(contract.Terms.Deadline) { if err := a.runContract(&contract, ship); err != nil { - a.sendShipError(fmt.Errorf("failed to run contracts: %w", err), ship) + a.channel <- fmt.Errorf("failed to run contract %s with ship %s: %w", contract.Id, ship.Symbol, err) return } } } - a.sendShipError(fmt.Errorf("failed to run contracts: negotiating new contracts is not implemented yet"), ship) - // TODO - //for { - // negotiate - // runContract - //} + a.channel <- fmt.Errorf("negotiating new contracts is not implemented yet") + for { + contract, err := a.client.NegotiateContract(ship) + if err != nil { + a.channel <- fmt.Errorf("failed to negotiate contract: %w", err) + return + } + if err := a.runContract(contract, ship); err != nil { + a.channel <- fmt.Errorf("failed to run contract %s: %w", contract.Id, err) + return + } + } } func (a *agent) runContract(contract *model.Contract, ship *model.Ship) error { - if err := a.client.Accept(contract, a.db); err != nil { - return fmt.Errorf("failed to run contract: %w", err) + if err := a.client.Accept(contract); err != nil { + return fmt.Errorf("failed to accept contract: %w", err) } //slog.Info("running contract", "contract", contract, "ship", ship.Symbol) switch contract.Type { - // TODO - //case "PROCUREMENT": + case "PROCUREMENT": + if err := a.runProcurement(contract, ship); err != nil { + return fmt.Errorf("failed to run procurement: %w", err) + } default: - return fmt.Errorf("failed to run contract: handling contracts of type %s is not implemented yet", contract.Type) + return fmt.Errorf("handling contracts of type %s is not implemented yet", contract.Type) } return nil } + +func (a *agent) runProcurement(contract *model.Contract, ship *model.Ship) error { + if contract.Fulfilled { + return nil + } + deliver := contract.Terms.Deliver[0] + // make sure we are not carrying useless stuff + if err := a.sellEverythingExcept(ship, deliver.TradeSymbol); err != nil { + return fmt.Errorf("failed to sell everything except %s for ship %s: %w", deliver.TradeSymbol, ship.Symbol, err) + } + // procure the desired goods + if ship.Cargo.Units < min(deliver.UnitsRequired-deliver.UnitsFulfilled, ship.Cargo.Capacity) { + if err := a.buyTradeGood(ship, deliver.TradeSymbol); err != nil { + return fmt.Errorf("failed to buy trade good %s with ship %s: %w", deliver.TradeSymbol, ship.Symbol, err) + } + } + // deliver the goods + if err := a.client.Navigate(ship, deliver.DestinationSymbol); err != nil { + return fmt.Errorf("failed to navigate to %s: %w", deliver.DestinationSymbol, err) + } + if err := a.client.Deliver(contract, ship); err != nil { + return fmt.Errorf("failed to deliver: %w", err) + } + deliver = contract.Terms.Deliver[0] + if deliver.UnitsRequired == deliver.UnitsFulfilled { + if err := a.client.Fulfill(contract); err != nil { + return fmt.Errorf("failed to fulfill: %w", err) + } + return nil + } + return a.runProcurement(contract, ship) +} diff --git a/golang/pkg/agent/error.go b/golang/pkg/agent/error.go deleted file mode 100644 index 64e6b8d..0000000 --- a/golang/pkg/agent/error.go +++ /dev/null @@ -1,15 +0,0 @@ -package agent - -import "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" - -type shipError struct { - err error - ship *model.Ship -} - -func (a *agent) sendShipError(err error, ship *model.Ship) { - a.channel <- shipError{ - err: err, - ship: ship, - } -} diff --git a/golang/pkg/agent/run.go b/golang/pkg/agent/run.go index 1d70be8..0591102 100644 --- a/golang/pkg/agent/run.go +++ b/golang/pkg/agent/run.go @@ -11,7 +11,7 @@ import ( ) type agent struct { - channel chan shipError + channel chan error client *api.Client db *database.DB getenv func(string) string @@ -23,7 +23,8 @@ type State int const ( start_running_contracts_with_the_command_ship = iota - visit_all_shipyards + visit_all_shipyards_with_the_starting_probe + send_the_starting_probe_to_a_shipyard_that_sells_probes ) func Run( @@ -32,7 +33,7 @@ func Run( getenv func(string) string, ) error { agent := agent{ - channel: make(chan shipError), + channel: make(chan error), client: client, db: db, getenv: getenv, @@ -43,7 +44,7 @@ func Run( } if agent.ships, err = client.MyShips(); err != nil { - return fmt.Errorf("failed to init the agent's ships: %w", err) + return fmt.Errorf("failed to get my ships: %w", err) } var state State = start_running_contracts_with_the_command_ship agent.wg.Add(1) @@ -55,14 +56,20 @@ func Run( agent.wg.Add(1) go agent.autoContracting(&agent.ships[0]) state++ - case visit_all_shipyards: + case visit_all_shipyards_with_the_starting_probe: if err := agent.visitAllShipyards(&agent.ships[1]); err != nil { - agent.sendShipError(fmt.Errorf("agent runner returned an error on state %d: %w", state, err), &agent.ships[1]) + agent.channel <- fmt.Errorf("failed to visit all shipyards with ship %s: %w", agent.ships[1].Symbol, err) + return + } + state++ + case send_the_starting_probe_to_a_shipyard_that_sells_probes: + if err := agent.sendShipToShipyardThatSells(&agent.ships[1], "SHIP_PROBE"); err != nil { + agent.channel <- fmt.Errorf("failed to send the starting probe to a shipyard that sells probes: %w", err) + return } state++ - return default: - agent.sendShipError(fmt.Errorf("agent runner reach an unknown state: %d", state), nil) + agent.channel <- fmt.Errorf("state not implemented: %d", state) return } } @@ -71,8 +78,8 @@ func Run( errWg.Add(1) go func() { defer errWg.Done() - for shipErr := range agent.channel { - slog.Error("ship error", "err", shipErr.err, "ship", shipErr.ship.Symbol) + for err := range agent.channel { + slog.Error("agent run error", "err", err) } }() agent.wg.Wait() diff --git a/golang/pkg/agent/trading.go b/golang/pkg/agent/trading.go new file mode 100644 index 0000000..b900f7a --- /dev/null +++ b/golang/pkg/agent/trading.go @@ -0,0 +1,139 @@ +package agent + +import ( + "fmt" + "slices" + + "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" +) + +type TradeGoodNotFoundError struct{} + +func (err *TradeGoodNotFoundError) Error() string { + return "trade good not found" +} + +func (a *agent) buyTradeGood(ship *model.Ship, tradeGoodToBuy string) error { + if ship.Cargo.Units == ship.Cargo.Capacity { + return nil + } + // list markets would sell our goods + markets, err := a.listMarketsInSystem(ship.Nav.SystemSymbol) + if err != nil { + return fmt.Errorf("failed to list markets in system %s: %w", ship.Nav.SystemSymbol, err) + } + markets = slices.DeleteFunc(markets, func(market model.Market) bool { + for _, item := range market.Exports { + if item.Symbol == tradeGoodToBuy { + return false + } + } + return true + }) + if len(markets) == 0 { + return &TradeGoodNotFoundError{} + } + // find the closest place to buy TODO + waypoint, err := a.client.GetWaypoint(ship.Nav.WaypointSymbol) + if err != nil { + return fmt.Errorf("failed to get nav waypoint %s: %w", ship.Nav.WaypointSymbol, err) + } + waypoints := make([]model.Waypoint, 0) + for i := range markets { + waypoint, err := a.client.GetWaypoint(markets[i].Symbol) + if err != nil { + return fmt.Errorf("failed to get waypoint %s: %w", markets[i].Symbol, err) + } + waypoints = append(waypoints, *waypoint) + } + sortByDistanceFrom(waypoint, waypoints) + // Go there and refresh our market data + if err := a.client.Navigate(ship, waypoints[0].Symbol); err != nil { + return fmt.Errorf("failed to navigate to %s: %w", waypoints[0].Symbol, err) + } + market, err := a.client.GetMarket(waypoints[0].Symbol) + if err != nil { + return fmt.Errorf("failed to get market %s: %w", waypoints[0].Symbol, err) + } + // Buy until full + for _, tradeGood := range market.TradeGoods { + if tradeGood.Type == "EXPORT" && tradeGood.Symbol == tradeGoodToBuy { + for ship.Cargo.Units < ship.Cargo.Capacity { + increment := min(ship.Cargo.Capacity-ship.Cargo.Units, tradeGood.TradeVolume) + if err := a.client.Purchase(ship, tradeGoodToBuy, increment); err != nil { + return fmt.Errorf("failed to purchase %d units of %s: %w", increment, tradeGoodToBuy, err) + } + } + break + } + } + return a.buyTradeGood(ship, tradeGoodToBuy) +} + +func (a *agent) sellEverythingExcept(ship *model.Ship, keep string) error { + // First lets see what we need to sell + cargo := ship.Cargo.Inventory + cargo = slices.DeleteFunc(cargo, func(inventory model.Inventory) bool { + return inventory.Symbol == keep + }) + if len(cargo) == 0 { + return nil + } + // list markets would buy our goods + markets, err := a.listMarketsInSystem(ship.Nav.SystemSymbol) + if err != nil { + return fmt.Errorf("failed to list markets in system %s: %w", ship.Nav.SystemSymbol, err) + } + markets = slices.DeleteFunc(markets, func(market model.Market) bool { + for _, item := range market.Imports { + for _, cargoItem := range cargo { + if item.Symbol == cargoItem.Symbol { + return false + } + } + } + return true + }) + if len(markets) == 0 { + return nil + } + // find the closest place to sell something TODO + waypoint, err := a.client.GetWaypoint(ship.Nav.WaypointSymbol) + if err != nil { + return fmt.Errorf("failed to get nav waypoint %s: %w", ship.Nav.WaypointSymbol, err) + } + waypoints := make([]model.Waypoint, 0) + for i := range markets { + waypoint, err := a.client.GetWaypoint(markets[i].Symbol) + if err != nil { + return fmt.Errorf("failed to get waypoint %s: %w", markets[i].Symbol, err) + } + waypoints = append(waypoints, *waypoint) + } + sortByDistanceFrom(waypoint, waypoints) + // Go there and refresh our market data + if err := a.client.Navigate(ship, waypoints[0].Symbol); err != nil { + return fmt.Errorf("failed to navigate to %s: %w", waypoints[0].Symbol, err) + } + market, err := a.client.GetMarket(waypoints[0].Symbol) + if err != nil { + return fmt.Errorf("failed to get market %s: %w", waypoints[0].Symbol, err) + } + // sell everything we can + for _, cargoItem := range cargo { + units := cargoItem.Units + for _, tradeGood := range market.TradeGoods { + if tradeGood.Type == "IMPORT" && tradeGood.Symbol == cargoItem.Symbol { + for units > 0 { + increment := min(units, tradeGood.TradeVolume) + if err := a.client.Sell(ship, cargoItem.Symbol, increment); err != nil { + return fmt.Errorf("failed to sell %d units of %s: %w", units, cargoItem.Symbol, err) + } + units = units - increment + } + break + } + } + } + return a.sellEverythingExcept(ship, keep) +} diff --git a/golang/pkg/agent/utils.go b/golang/pkg/agent/utils.go new file mode 100644 index 0000000..7aa9c7b --- /dev/null +++ b/golang/pkg/agent/utils.go @@ -0,0 +1,117 @@ +package agent + +import ( + "cmp" + "fmt" + "math" + "slices" + + "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" +) + +func distance2(a *model.Waypoint, b *model.Waypoint) int { + x2 := a.X - b.X + y2 := a.Y - b.Y + return x2*x2 + y2*y2 +} + +func (a *agent) isThereAShipAtWaypoint(waypointSymbol string) bool { + for _, ship := range a.ships { + if ship.Nav.WaypointSymbol == waypointSymbol { + return true + } + } + return false +} + +func (a *agent) listWaypointsInSystemWithTrait(systemSymbol string, trait string) ([]model.Waypoint, error) { + waypoints, err := a.client.ListWaypointsInSystem(systemSymbol) + if err != nil { + return nil, fmt.Errorf("failed to list waypoints: %w", err) + } + waypoints = slices.DeleteFunc(waypoints, func(waypoint model.Waypoint) bool { + for _, t := range waypoint.Traits { + if t.Symbol == trait { + return false + } + } + return true + }) + return waypoints, nil +} + +func (a *agent) listMarketsInSystem(systemSymbol string) ([]model.Market, error) { + waypoints, err := a.listWaypointsInSystemWithTrait(systemSymbol, "MARKETPLACE") + if err != nil { + return nil, fmt.Errorf("failed to list waypoints in system %s with trait MARKETPLACE: %w", systemSymbol, err) + } + var markets []model.Market + for i := range waypoints { + market, err := a.client.GetMarket(waypoints[i].Symbol) + if err != nil { + return nil, fmt.Errorf("failed to get market %s: %w", waypoints[i].Symbol, err) + } + markets = append(markets, *market) + } + return markets, nil +} + +func (a *agent) listShipyardsInSystem(systemSymbol string) ([]model.Shipyard, error) { + waypoints, err := a.listWaypointsInSystemWithTrait(systemSymbol, "SHIPYARD") + if err != nil { + return nil, fmt.Errorf("failed to list waypoints in system %s with trait SHIPYARD: %w", systemSymbol, err) + } + var shipyards []model.Shipyard + for i := range waypoints { + shipyard, err := a.client.GetShipyard(waypoints[i].Symbol) + if err != nil { + return nil, fmt.Errorf("failed to get shipyard %s: %w", waypoints[i].Symbol, err) + } + shipyards = append(shipyards, *shipyard) + } + return shipyards, nil +} + +func (a *agent) sendShipToShipyardThatSells(ship *model.Ship, shipType string) error { + shipyards, err := a.listShipyardsInSystem(ship.Nav.SystemSymbol) + if err != nil { + return fmt.Errorf("failed to list shipyards in system %s: %w", ship.Nav.SystemSymbol, err) + } + // filter out the shipyards that do not sell our ship + shipyards = slices.DeleteFunc(shipyards, func(shipyard model.Shipyard) bool { + for _, t := range shipyard.ShipTypes { + if t.Type == shipType { + return false + } + } + return true + }) + // sort by cheapest + slices.SortFunc(shipyards, func(a, b model.Shipyard) int { + aPrice := math.MaxInt + for _, ship := range a.Ships { + if ship.Type == shipType { + aPrice = ship.PurchasePrice + break + } + } + bPrice := math.MaxInt + for _, ship := range b.Ships { + if ship.Type == shipType { + bPrice = ship.PurchasePrice + break + } + } + return cmp.Compare(aPrice, bPrice) + }) + if err := a.client.Navigate(ship, shipyards[0].Symbol); err != nil { + return fmt.Errorf("failed to navigate to %s: %w", shipyards[0].Symbol, err) + } + return nil +} + +func sortByDistanceFrom(origin *model.Waypoint, destinations []model.Waypoint) { + slices.SortFunc(destinations, func(a, b model.Waypoint) int { + return cmp.Compare(distance2(origin, &a), distance2(origin, &b)) + }) +} diff --git a/golang/pkg/agent/visit.go b/golang/pkg/agent/visit.go index 019a6e5..e420186 100644 --- a/golang/pkg/agent/visit.go +++ b/golang/pkg/agent/visit.go @@ -2,23 +2,54 @@ package agent import ( "fmt" - "log/slog" + "slices" "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" ) func (a *agent) visitAllShipyards(ship *model.Ship) error { - system, err := a.client.GetSystem(ship.Nav.SystemSymbol, a.db) + shipyards, err := a.listShipyardsInSystem(ship.Nav.SystemSymbol) if err != nil { - return fmt.Errorf("failed to visit all shipyards: %w", err) + return fmt.Errorf("failed to list shipyards in system %s: %w", ship.Nav.SystemSymbol, err) } - waypoints, err := a.client.ListWaypointsInSystem(system, a.db) + shipyards = slices.DeleteFunc(shipyards, func(shipyard model.Shipyard) bool { + // filter out shipyards for which we already have ships prices + if shipyard.Ships != nil { + return true + } + // filter out shipyards for which a ship is either present or inbound + return a.isThereAShipAtWaypoint(shipyard.Symbol) + }) + if len(shipyards) == 0 { + return nil + } + waypoint, err := a.client.GetWaypoint(ship.Nav.WaypointSymbol) if err != nil { - return fmt.Errorf("failed to visit all shipyards: %w", err) + return fmt.Errorf("failed to get nav waypoint %s: %w", ship.Nav.WaypointSymbol, err) } - //slog.Info("get system", "system", system.Waypoints, "err", err) - //waypoint, err := a.client.GetWaypoint("X1-RR14-J88", a.db) - slog.Info("get waypoint", "waypoint", waypoints[0]) - - return fmt.Errorf("failed to visit all shipyards: not implemented yet") + waypoints := make([]model.Waypoint, 0) + for i := range shipyards { + waypoint, err := a.client.GetWaypoint(shipyards[i].Symbol) + if err != nil { + return fmt.Errorf("failed to get waypoint %s: %w", shipyards[i].Symbol, err) + } + waypoints = append(waypoints, *waypoint) + } + sortByDistanceFrom(waypoint, waypoints) + if err := a.client.Navigate(ship, waypoints[0].Symbol); err != nil { + return fmt.Errorf("failed to navigate to %s: %w", waypoints[0].Symbol, err) + } + if _, err := a.client.GetShipyard(waypoints[0].Symbol); err != nil { + return fmt.Errorf("failed to get shipyard %s: %w", waypoints[0].Symbol, err) + } + // If this waypoint is also a marketplace, get its data + for _, trait := range waypoints[0].Traits { + if trait.Symbol == "MARKETPLACE" { + if _, err := a.client.GetMarket(waypoints[0].Symbol); err != nil { + return fmt.Errorf("failed to get market %s: %w", waypoints[0].Symbol, err) + } + break + } + } + return a.visitAllShipyards(ship) } diff --git a/golang/pkg/api/api.go b/golang/pkg/api/api.go index 472d9e5..6520251 100644 --- a/golang/pkg/api/api.go +++ b/golang/pkg/api/api.go @@ -9,6 +9,7 @@ import ( "log/slog" "net/http" "net/url" + "strconv" "time" ) @@ -25,7 +26,13 @@ func (e *APIError) Error() string { type APIMessage struct { Data json.RawMessage `json:"data"` Error *APIError `json:"error"` - //meta + Meta *Meta `json:"meta"` +} + +type Meta struct { + Limit int `json:"limit"` + Page int `json:"page"` + Total int `json:"total"` } type Request struct { @@ -45,30 +52,62 @@ type Response struct { func (c *Client) Send(method string, uriRef *url.URL, payload any, response any) error { responseChannel := make(chan *Response) - c.requestsChannel <- &Request{ - method: method, - payload: payload, - priority: 10, - responseChannel: responseChannel, - uri: c.baseURI.ResolveReference(uriRef), - } - res := <-responseChannel - if res.Err != nil { - return res.Err + uri := c.baseURI.ResolveReference(uriRef) + query := uri.Query() + query.Add("limit", "20") + page := 1 + var rawResponses []json.RawMessage + for { + query.Set("page", strconv.Itoa(page)) + uri.RawQuery = query.Encode() + c.requestsChannel <- &Request{ + method: method, + payload: payload, + priority: 10, + responseChannel: responseChannel, + uri: uri, + } + res := <-responseChannel + if res.Err != nil { + return res.Err + } + if err := res.Message.Error; err != nil { + switch err.Code { + case 4214: + e := decodeShipInTransitError(err.Data) + select { + case <-c.ctx.Done(): + return fmt.Errorf("failed to send: ctx cancelled") + case <-time.After(e.SecondsToArrival.Duration() * time.Second): + } + return c.Send(method, uriRef, payload, response) + default: + return err + } + } + if res.Message.Meta == nil { + // This is not a paginated request, we are done + if err := json.Unmarshal(res.Message.Data, &response); err != nil { + return fmt.Errorf("failed to unmarshal message: %w", err) + } + return nil + } + var oneResponse []json.RawMessage + if err := json.Unmarshal(res.Message.Data, &oneResponse); err != nil { + return fmt.Errorf("failed to unmarshal message: %w", err) + } + rawResponses = append(rawResponses, oneResponse...) + if res.Message.Meta.Limit*res.Message.Meta.Page >= res.Message.Meta.Total { + break + } + page++ } - err := res.Message.Error + responses, err := json.Marshal(rawResponses) if err != nil { - switch err.Code { - case 4214: - e := decodeShipInTransitError(err.Data) - time.Sleep(e.SecondsToArrival.Duration() * time.Second) - return c.Send(method, uriRef, payload, response) - default: - return err - } + return fmt.Errorf("failed to marshal raw responses to paginated request: %w", err) } - if err := json.Unmarshal(res.Message.Data, &response); err != nil { - return fmt.Errorf("failed to unmarshal message: %w", err) + if err := json.Unmarshal(responses, &response); err != nil { + return fmt.Errorf("failed to unmarshal paginated request responses: %w", err) } return nil } @@ -154,7 +193,11 @@ func (c *Client) sendOne(method string, uri *url.URL, payload any) (*APIMessage, switch resp.StatusCode { case 429: e := decodeRateLimitError(msg.Error.Data) - time.Sleep(e.RetryAfter.Duration() * time.Second) + select { + case <-c.ctx.Done(): + return nil, fmt.Errorf("failed to sendOne: ctx cancelled") + case <-time.After(e.RetryAfter.Duration() * time.Second): + } return c.sendOne(method, uri, payload) } return &msg, nil diff --git a/golang/pkg/api/client.go b/golang/pkg/api/client.go index 2ea555e..e6a1883 100644 --- a/golang/pkg/api/client.go +++ b/golang/pkg/api/client.go @@ -6,10 +6,13 @@ import ( "net/http" "net/url" "time" + + "git.adyxax.org/adyxax/spacetraders/golang/pkg/database" ) type Client struct { baseURI *url.URL + db *database.DB requestsChannel chan *Request ctx context.Context headers *http.Header @@ -17,7 +20,7 @@ type Client struct { pq *PriorityQueue } -func NewClient(ctx context.Context) *Client { +func NewClient(ctx context.Context, db *database.DB) *Client { baseURI, err := url.Parse("https://api.spacetraders.io/v2/") if err != nil { panic("baseURI failed to parse") @@ -26,6 +29,7 @@ func NewClient(ctx context.Context) *Client { heap.Init(&pq) client := &Client{ baseURI: baseURI, + db: db, requestsChannel: make(chan *Request), ctx: ctx, headers: &http.Header{ diff --git a/golang/pkg/api/contracts.go b/golang/pkg/api/contracts.go index 9478d4f..fd20cce 100644 --- a/golang/pkg/api/contracts.go +++ b/golang/pkg/api/contracts.go @@ -5,11 +5,10 @@ import ( "net/url" "path" - "git.adyxax.org/adyxax/spacetraders/golang/pkg/database" "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" ) -func (c *Client) Accept(contract *model.Contract, db *database.DB) error { +func (c *Client) Accept(contract *model.Contract) error { if contract.Accepted { return nil } @@ -20,21 +19,70 @@ func (c *Client) Accept(contract *model.Contract, db *database.DB) error { } var response acceptResponse if err := c.Send("POST", &uriRef, nil, &response); err != nil { - return fmt.Errorf("failed to accept contract %s: %w", contract.Id, err) + return fmt.Errorf("failed API request: %w", err) } - if err := db.SaveAgent(response.Agent); err != nil { - return fmt.Errorf("failed to accept contract %s: %w", contract.Id, err) + if err := c.db.SaveAgent(response.Agent); err != nil { + return fmt.Errorf("failed to save agent: %w", err) } contract.Accepted = response.Contract.Accepted contract.Terms = response.Contract.Terms return nil } +func (c *Client) Deliver(contract *model.Contract, ship *model.Ship) error { + deliver := contract.Terms.Deliver[0] + var units int + for _, cargoItem := range ship.Cargo.Inventory { + if cargoItem.Symbol == deliver.TradeSymbol { + units = min(deliver.UnitsRequired-deliver.UnitsFulfilled, cargoItem.Units) + break + } + } + uriRef := url.URL{Path: path.Join("my/contracts", contract.Id, "deliver")} + type deliverRequest struct { + ShipSymbol string `json:"shipSymbol"` + TradeSymbol string `json:"tradeSymbol"` + Units int `json:"units"` + } + type deliverResponse struct { + Cargo *model.Cargo `json:"cargo"` + Contract *model.Contract `json:"contract"` + } + var response deliverResponse + if err := c.Send("POST", &uriRef, deliverRequest{ship.Symbol, deliver.TradeSymbol, units}, &response); err != nil { + return fmt.Errorf("failed API request: %w", err) + } + ship.Cargo = response.Cargo + contract.Terms = response.Contract.Terms + return nil +} + +func (c *Client) Fulfill(contract *model.Contract) error { + if contract.Fulfilled { + return nil + } + uriRef := url.URL{Path: path.Join("my/contracts", contract.Id, "fulfill")} + type fulfillResponse struct { + Agent *model.Agent `json:"agent"` + Contract *model.Contract `json:"contract"` + } + var response fulfillResponse + if err := c.Send("POST", &uriRef, nil, &response); err != nil { + return fmt.Errorf("failed API request: %w", err) + } + if err := c.db.SaveAgent(response.Agent); err != nil { + return fmt.Errorf("failed to save agent: %w", err) + } + contract.Fulfilled = response.Contract.Fulfilled + contract.Terms = response.Contract.Terms + return nil +} + func (c *Client) MyContracts() ([]model.Contract, error) { uriRef := url.URL{Path: "my/contracts"} var contracts []model.Contract if err := c.Send("GET", &uriRef, nil, &contracts); err != nil { - return nil, fmt.Errorf("failed to get contracts: %w", err) + return nil, fmt.Errorf("failed API request: %w", err) } return contracts, nil } diff --git a/golang/pkg/api/ships.go b/golang/pkg/api/ships.go index 93963c3..c3b7074 100644 --- a/golang/pkg/api/ships.go +++ b/golang/pkg/api/ships.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" "path" + "time" - "git.adyxax.org/adyxax/spacetraders/golang/pkg/database" "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" ) @@ -19,7 +19,7 @@ func (c *Client) dock(s *model.Ship) error { } var response dockResponse if err := c.Send("POST", &uriRef, nil, &response); err != nil { - return fmt.Errorf("failed to dock ship %s: %w", s.Symbol, err) + return fmt.Errorf("failed API request: %w", err) } s.Nav = response.Nav return nil @@ -29,11 +29,56 @@ func (c *Client) MyShips() ([]model.Ship, error) { uriRef := url.URL{Path: "my/ships"} var ships []model.Ship if err := c.Send("GET", &uriRef, nil, &ships); err != nil { - return nil, fmt.Errorf("failed to get ships: %w", err) + return nil, fmt.Errorf("failed API request: %w", err) } return ships, nil } +func (c *Client) Navigate(s *model.Ship, waypointSymbol string) error { + if s.Nav.WaypointSymbol == waypointSymbol { + return nil + } + if err := c.orbit(s); err != nil { + return fmt.Errorf("failed to orbit: %w", err) + } + // TODO shortest path + // TODO go refuel if necessary + uriRef := url.URL{Path: path.Join("my/ships", s.Symbol, "navigate")} + type navigateRequest struct { + WaypointSymbol string `json:"waypointSymbol"` + } + type navigateResponse struct { + //Events []model.Event `json:"events"` + Fuel *model.Fuel `json:"fuel"` + Nav *model.Nav `json:"nav"` + } + var response navigateResponse + if err := c.Send("POST", &uriRef, navigateRequest{waypointSymbol}, &response); err != nil { + return fmt.Errorf("failed API request: %w", err) + } + s.Fuel = response.Fuel + s.Nav = response.Nav + select { + case <-c.ctx.Done(): + return fmt.Errorf("failed: context cancelled") + case <-time.After(s.Nav.Route.Arrival.Sub(time.Now())): + } + s.Nav.Status = "IN_ORBIT" + return nil +} + +func (c *Client) NegotiateContract(s *model.Ship) (*model.Contract, error) { + uriRef := url.URL{Path: path.Join("my/ships", s.Symbol, "negotiate", "contract")} + type negotiateResponse struct { + Contract *model.Contract `json:"contract"` + } + var response negotiateResponse + if err := c.Send("POST", &uriRef, nil, &response); err != nil { + return nil, fmt.Errorf("failed API request: %w", err) + } + return response.Contract, nil +} + func (c *Client) orbit(s *model.Ship) error { if s.Nav.Status == "IN_ORBIT" { return nil @@ -44,18 +89,46 @@ func (c *Client) orbit(s *model.Ship) error { } var response orbitResponse if err := c.Send("POST", &uriRef, nil, &response); err != nil { - return fmt.Errorf("failed to orbit ship %s: %w", s.Symbol, err) + return fmt.Errorf("failed API request: %w", err) } s.Nav = response.Nav return nil } -func (c *Client) Refuel(s *model.Ship, db *database.DB) error { +func (c *Client) Purchase(s *model.Ship, cargoItem string, units int) error { + if err := c.dock(s); err != nil { + return fmt.Errorf("failed to dock: %w", err) + } + uriRef := url.URL{Path: path.Join("my/ships", s.Symbol, "purchase")} + type purchaseRequest struct { + Symbol string `json:"symbol"` + Units int `json:"units"` + } + type purchaseResponse struct { + Agent *model.Agent `json:"agent"` + Cargo *model.Cargo `json:"cargo"` + Transaction *model.Transaction `json:"transaction"` + } + var response purchaseResponse + if err := c.Send("POST", &uriRef, purchaseRequest{cargoItem, units}, &response); err != nil { + return fmt.Errorf("failed API request: %w", err) + } + if err := c.db.SaveAgent(response.Agent); err != nil { + return fmt.Errorf("failed to save agent: %w", err) + } + s.Cargo = response.Cargo + if err := c.db.AppendTransaction(response.Transaction); err != nil { + return fmt.Errorf("failed to append transaction: %w", err) + } + return nil +} + +func (c *Client) refuel(s *model.Ship, db *database.DB) error { if s.Fuel.Current == s.Fuel.Capacity { return nil } if err := c.dock(s); err != nil { - return fmt.Errorf("failed to refuel ship %s: %w", s.Symbol, err) + return fmt.Errorf("failed to dock: %w", err) } uriRef := url.URL{Path: path.Join("my/ships", s.Symbol, "refuel")} type refuelResponse struct { @@ -65,14 +138,42 @@ func (c *Client) Refuel(s *model.Ship, db *database.DB) error { } var response refuelResponse if err := c.Send("POST", &uriRef, nil, &response); err != nil { - return fmt.Errorf("failed to refuel ship %s: %w", s.Symbol, err) + return fmt.Errorf("failed API request: %w", err) } - if err := db.SaveAgent(response.Agent); err != nil { - return fmt.Errorf("failed to refuel ship %s: %w", s.Symbol, err) + if err := c.db.SaveAgent(response.Agent); err != nil { + return fmt.Errorf("failed to save agent: %w", err) } s.Fuel = response.Fuel - if err := db.AppendTransaction(response.Transaction); err != nil { - return fmt.Errorf("failed to refuel ship %s: %w", s.Symbol, err) + if err := c.db.AppendTransaction(response.Transaction); err != nil { + return fmt.Errorf("failed to append transaction: %w", err) + } + return nil +} + +func (c *Client) Sell(s *model.Ship, cargoItem string, units int) error { + if err := c.dock(s); err != nil { + return fmt.Errorf("failed to dock: %w", err) + } + uriRef := url.URL{Path: path.Join("my/ships", s.Symbol, "sell")} + type sellRequest struct { + Symbol string `json:"symbol"` + Units int `json:"units"` + } + type sellResponse struct { + Agent *model.Agent `json:"agent"` + Cargo *model.Cargo `json:"cargo"` + Transaction *model.Transaction `json:"transaction"` + } + var response sellResponse + if err := c.Send("POST", &uriRef, sellRequest{cargoItem, units}, &response); err != nil { + return fmt.Errorf("failed API request: %w", err) + } + if err := c.db.SaveAgent(response.Agent); err != nil { + return fmt.Errorf("failed to save agent: %w", err) + } + s.Cargo = response.Cargo + if err := c.db.AppendTransaction(response.Transaction); err != nil { + return fmt.Errorf("failed to append transaction: %w", err) } return nil } diff --git a/golang/pkg/api/systems.go b/golang/pkg/api/systems.go index 3d3a373..2cdfeca 100644 --- a/golang/pkg/api/systems.go +++ b/golang/pkg/api/systems.go @@ -5,55 +5,90 @@ import ( "net/url" "path" - "git.adyxax.org/adyxax/spacetraders/golang/pkg/database" "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" ) -func (c *Client) GetSystem(symbol string, db *database.DB) (*model.System, error) { - if system, err := db.LoadSystem(symbol); err == nil && system != nil { - return system, nil +func (c *Client) GetMarket(waypointSymbol string) (*model.Market, error) { + if market, err := c.db.LoadMarket(waypointSymbol); err == nil && market != nil { + // TODO check last updated time + return market, nil } - uriRef := url.URL{Path: path.Join("systems", symbol)} - var system model.System - if err := c.Send("GET", &uriRef, nil, &system); err != nil { - return nil, fmt.Errorf("failed to get system %s: %w", symbol, err) + systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol) + uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol, "market")} + var market model.Market + if err := c.Send("GET", &uriRef, nil, &market); err != nil { + return nil, fmt.Errorf("failed API request: %w", err) } - if err := db.SaveSystem(&system); err != nil { - return nil, fmt.Errorf("failed to get system %s: %w", symbol, err) + if err := c.db.SaveMarket(&market); err != nil { + return nil, fmt.Errorf("failed to save market %s: %w", market.Symbol, err) } - return &system, nil + return &market, nil } -func (c *Client) ListWaypointsInSystem(system *model.System, db *database.DB) ([]model.Waypoint, error) { - // TODO database caching - // TODO pagination - // TODO check updated - uriRef := url.URL{Path: path.Join("systems", system.Symbol, "waypoints")} - var waypoints []model.Waypoint - if err := c.Send("GET", &uriRef, nil, &waypoints); err != nil { - return nil, fmt.Errorf("failed to list waypoints in system %s: %w", system.Symbol, err) +func (c *Client) GetShipyard(waypointSymbol string) (*model.Shipyard, error) { + if shipyard, err := c.db.LoadShipyard(waypointSymbol); err == nil && shipyard != nil && + (shipyard.Ships != nil) { // TODO || !IsThereAShipAtWaypoint(waypoint)) { + // TODO check last updated time + return shipyard, nil } - for _, waypoint := range waypoints { - if err := db.SaveWaypoint(&waypoint); err != nil { - return nil, fmt.Errorf("failed to list waypoints in system %s: %w", system.Symbol, err) - } + systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol) + uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol, "shipyard")} + var shipyard model.Shipyard + if err := c.Send("GET", &uriRef, nil, &shipyard); err != nil { + return nil, fmt.Errorf("failed API request: %w", err) } - return waypoints, nil + if err := c.db.SaveShipyard(&shipyard); err != nil { + return nil, fmt.Errorf("failed to save shipyard %s: %w", shipyard.Symbol, err) + } + return &shipyard, nil } -func (c *Client) GetWaypoint(symbol string, db *database.DB) (*model.Waypoint, error) { - // TODO check updated - if waypoint, err := db.LoadWaypoint(symbol); err == nil && waypoint != nil { +func (c *Client) GetSystem(systemSymbol string) (*model.System, error) { + if system, err := c.db.LoadSystem(systemSymbol); err == nil && system != nil { + return system, nil + } + uriRef := url.URL{Path: path.Join("systems", systemSymbol)} + var system model.System + if err := c.Send("GET", &uriRef, nil, &system); err != nil { + return nil, fmt.Errorf("failed API request: %w", err) + } + if err := c.db.SaveSystem(&system); err != nil { + return nil, fmt.Errorf("failed to save system %s: %w", system.Symbol, err) + } + return &system, nil +} + +func (c *Client) GetWaypoint(waypointSymbol string) (*model.Waypoint, error) { + if waypoint, err := c.db.LoadWaypoint(waypointSymbol); err == nil && waypoint != nil { + // TODO check last updated time return waypoint, nil } - systemSymbol := WaypointSymbolToSystemSymbol(symbol) - uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", symbol)} + systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol) + uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol)} var waypoint model.Waypoint if err := c.Send("GET", &uriRef, nil, &waypoint); err != nil { - return nil, fmt.Errorf("failed to get waypoint %s: %w", symbol, err) + return nil, fmt.Errorf("failed API request: %w", err) } - if err := db.SaveWaypoint(&waypoint); err != nil { - return nil, fmt.Errorf("failed to get waypoint %s: %w", symbol, err) + if err := c.db.SaveWaypoint(&waypoint); err != nil { + return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err) } return &waypoint, nil } + +func (c *Client) ListWaypointsInSystem(systemSymbol string) ([]model.Waypoint, error) { + if waypoints, err := c.db.LoadWaypointsInSystem(systemSymbol); err == nil && waypoints != nil { + // TODO check last updated time + return waypoints, nil + } + uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints")} + var waypoints []model.Waypoint + if err := c.Send("GET", &uriRef, nil, &waypoints); err != nil { + return nil, fmt.Errorf("failed API request: %w", err) + } + for _, waypoint := range waypoints { + if err := c.db.SaveWaypoint(&waypoint); err != nil { + return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err) + } + } + return waypoints, nil +} diff --git a/golang/pkg/database/markets.go b/golang/pkg/database/markets.go new file mode 100644 index 0000000..11498d2 --- /dev/null +++ b/golang/pkg/database/markets.go @@ -0,0 +1,42 @@ +package database + +import ( + "database/sql" + "encoding/json" + "fmt" + "time" + + "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" +) + +func (db *DB) LoadMarket(symbol string) (*model.Market, error) { + var buf []byte + if err := db.QueryRow(`SELECT data FROM markets WHERE data->>'symbol' = ?;`, symbol).Scan(&buf); err != nil { + return nil, fmt.Errorf("failed to query row: %w", err) + } + var market model.Market + if err := json.Unmarshal(buf, &market); err != nil { + return nil, fmt.Errorf("failed to unmarshal market: %w", err) + } + return &market, nil +} + +func (db *DB) SaveMarket(market *model.Market) error { + data, err := json.Marshal(market) + if err != nil { + return fmt.Errorf("failed to marshal market: %w", err) + } + _, err = db.Exec( + `INSERT INTO markets(data, updated) + VALUES (json(:data), :updated) + ON CONFLICT DO UPDATE SET data = :data, updated = :updated + WHERE data->>'symbol' = :symbol;`, + sql.Named("data", data), + sql.Named("symbol", market.Symbol), + sql.Named("updated", time.Now()), + ) + if err != nil { + return fmt.Errorf("failed to exec: %w", err) + } + return nil +} diff --git a/golang/pkg/database/shipyards.go b/golang/pkg/database/shipyards.go new file mode 100644 index 0000000..4d44f9a --- /dev/null +++ b/golang/pkg/database/shipyards.go @@ -0,0 +1,42 @@ +package database + +import ( + "database/sql" + "encoding/json" + "fmt" + "time" + + "git.adyxax.org/adyxax/spacetraders/golang/pkg/model" +) + +func (db *DB) LoadShipyard(symbol string) (*model.Shipyard, error) { + var buf []byte + if err := db.QueryRow(`SELECT data FROM shipyards WHERE data->>'symbol' = ?;`, symbol).Scan(&buf); err != nil { + return nil, fmt.Errorf("failed to query row: %w", err) + } + var shipyard model.Shipyard + if err := json.Unmarshal(buf, &shipyard); err != nil { + return nil, fmt.Errorf("failed to unmarshal shipyard: %w", err) + } + return &shipyard, nil +} + +func (db *DB) SaveShipyard(shipyard *model.Shipyard) error { + data, err := json.Marshal(shipyard) + if err != nil { + return fmt.Errorf("failed to marshal shipyard: %w", err) + } + _, err = db.Exec( + `INSERT INTO shipyards(data, updated) + VALUES (json(:data), :updated) + ON CONFLICT DO UPDATE SET data = :data, updated = :updated + WHERE data->>'symbol' = :symbol;`, + sql.Named("data", data), + sql.Named("symbol", shipyard.Symbol), + sql.Named("updated", time.Now()), + ) + if err != nil { + return fmt.Errorf("failed to exec: %w", err) + } + return nil +} diff --git a/golang/pkg/database/sql/001_trading.sql b/golang/pkg/database/sql/001_trading.sql index 68f2568..e218962 100644 --- a/golang/pkg/database/sql/001_trading.sql +++ b/golang/pkg/database/sql/001_trading.sql @@ -4,13 +4,16 @@ CREATE TABLE agents ( ); CREATE TABLE markets ( id INTEGER PRIMARY KEY, - systemSymbol TEXT NOT NULL, data JSON NOT NULL, updated DATE NOT NULL ); -CREATE INDEX markets_systemSymbol on markets (systemSymbol); CREATE UNIQUE INDEX markets_data_symbol on markets(json_extract(data, '$.symbol')); - +CREATE TABLE shipyards ( + id INTEGER PRIMARY KEY, + data JSON NOT NULL, + updated DATE DEFAULT NULL +); +CREATE UNIQUE INDEX shipyards_data_symbol on shipyards (json_extract(data, '$.symbol')); CREATE TABLE systems ( id INTEGER PRIMARY KEY, data JSON NOT NULL diff --git a/golang/pkg/database/systems.go b/golang/pkg/database/systems.go index 858c3dd..b5d533b 100644 --- a/golang/pkg/database/systems.go +++ b/golang/pkg/database/systems.go @@ -12,7 +12,7 @@ import ( func (db *DB) LoadSystem(symbol string) (*model.System, error) { var buf []byte if err := db.QueryRow(`SELECT data FROM systems WHERE data->>'symbol' = ?;`, symbol).Scan(&buf); err != nil { - return nil, fmt.Errorf("failed to query system: %w", err) + return nil, fmt.Errorf("failed to query row: %w", err) } var system model.System if err := json.Unmarshal(buf, &system); err != nil { @@ -27,7 +27,7 @@ func (db *DB) SaveSystem(system *model.System) error { return fmt.Errorf("failed to marshal system: %w", err) } if _, err := db.Exec(`INSERT INTO systems(data) VALUES (json(?));`, data); err != nil { - return fmt.Errorf("failed to append system: %w", err) + return fmt.Errorf("failed to exec: %w", err) } return nil } @@ -36,7 +36,7 @@ func (db *DB) SaveSystem(system *model.System) error { func (db *DB) LoadWaypoint(symbol string) (*model.Waypoint, error) { var buf []byte if err := db.QueryRow(`SELECT data FROM waypoints WHERE data->>'symbol' = ?;`, symbol).Scan(&buf); err != nil { - return nil, fmt.Errorf("failed to query waypoint: %w", err) + return nil, fmt.Errorf("failed to query row: %w", err) } var waypoint model.Waypoint if err := json.Unmarshal(buf, &waypoint); err != nil { @@ -45,13 +45,37 @@ func (db *DB) LoadWaypoint(symbol string) (*model.Waypoint, error) { return &waypoint, nil } +func (db *DB) LoadWaypointsInSystem(systemSymbol string) ([]model.Waypoint, error) { + rows, err := db.Query(`SELECT data FROM waypoints WHERE data->>'systemSymbol' = ?;`, systemSymbol) + if err != nil { + return nil, fmt.Errorf("failed to query rows: %w", err) + } + defer rows.Close() + waypoints := make([]model.Waypoint, 0) + for rows.Next() { + var buf []byte + if err := rows.Scan(&buf); err != nil { + return nil, fmt.Errorf("failed to scan row: %w", err) + } + var waypoint model.Waypoint + if err := json.Unmarshal(buf, &waypoint); err != nil { + return nil, fmt.Errorf("failed to unmarshal waypoint: %w", err) + } + waypoints = append(waypoints, waypoint) + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("failed to scan rows: %w", err) + } + return waypoints, nil +} + func (db *DB) SaveWaypoint(waypoint *model.Waypoint) error { data, err := json.Marshal(waypoint) if err != nil { return fmt.Errorf("failed to marshal waypoint: %w", err) } if _, err := db.Exec(`INSERT INTO waypoints(data, updated) VALUES (json(?), ?);`, data, time.Now()); err != nil { - return fmt.Errorf("failed to append waypoint: %w", err) + return fmt.Errorf("failed to exec: %w", err) } return nil } diff --git a/golang/pkg/database/transactions.go b/golang/pkg/database/transactions.go index 71719c7..08278a1 100644 --- a/golang/pkg/database/transactions.go +++ b/golang/pkg/database/transactions.go @@ -13,7 +13,7 @@ func (db *DB) AppendTransaction(transaction *model.Transaction) error { return fmt.Errorf("failed to marshal transaction: %w", err) } if _, err := db.Exec(`INSERT INTO transactions(data) VALUES (json(?));`, data); err != nil { - return fmt.Errorf("failed to append transaction: %w", err) + return fmt.Errorf("failed to exec: %w", err) } return nil } diff --git a/golang/pkg/model/common.go b/golang/pkg/model/common.go index 058b43d..6a2c321 100644 --- a/golang/pkg/model/common.go +++ b/golang/pkg/model/common.go @@ -5,3 +5,7 @@ type Common struct { //Name string `json:"name"` Symbol string `json:"symbol"` } + +type CommonType struct { + Type string `json:"type"` +} diff --git a/golang/pkg/model/contract.go b/golang/pkg/model/contract.go index 24ed403..9d9c7bd 100644 --- a/golang/pkg/model/contract.go +++ b/golang/pkg/model/contract.go @@ -7,7 +7,7 @@ type Contract struct { DeadlineToAccept time.Time `json:"deadlineToAccept"` Expiration time.Time `json:"expiration"` FactionSymbol string `json:"factionSymbol"` - Fullfilled bool `json:"fulfilled"` + Fulfilled bool `json:"fulfilled"` Id string `json:"id"` Terms *Terms `json:"terms"` Type string `json:"type"` diff --git a/golang/pkg/model/market.go b/golang/pkg/model/market.go new file mode 100644 index 0000000..6c11386 --- /dev/null +++ b/golang/pkg/model/market.go @@ -0,0 +1,10 @@ +package model + +type Market struct { + Exchange []Common `json:"exchange"` + Exports []Common `json:"exports"` + Imports []Common `json:"imports"` + Symbol string `json:"symbol"` + TradeGoods []TradeGood `json:"tradeGoods"` + Transactions []Transaction `json:"transactions"` +} diff --git a/golang/pkg/model/shipyard.go b/golang/pkg/model/shipyard.go new file mode 100644 index 0000000..2ba2e95 --- /dev/null +++ b/golang/pkg/model/shipyard.go @@ -0,0 +1,35 @@ +package model + +import "time" + +type Shipyard struct { + ModificationFee int `json:"modificationFee"` + Symbol string `json:"symbol"` + ShipTypes []CommonType `json:"shipTypes"` + Transactions []ShipyardTransaction `json:"transactions"` + Ships []ShipyardShip `json:"ships"` +} + +type ShipyardShip struct { + Activity string `json:"activity"` + // crew + //Description string `json:"description"` + // engine + // frame + // modules + // mounts + //Name string `json:"name"` + PurchasePrice int `json:"purchasePrice"` + // reactor + Supply string `json:"supply"` + Type string `json:"type"` +} + +type ShipyardTransaction struct { + AgentSymbol string `json:"agentSymbol"` + Price int `json:"price"` + ShipSymbol string `json:"shipSymbol"` + ShipType string `json:"shipType"` + Timestamp time.Time `json:"timestamp"` + WaypointSymbol string `json:"waypointSymbol"` +} diff --git a/golang/pkg/model/trade_good.go b/golang/pkg/model/trade_good.go new file mode 100644 index 0000000..602f667 --- /dev/null +++ b/golang/pkg/model/trade_good.go @@ -0,0 +1,11 @@ +package model + +type TradeGood struct { + Activity string `json:"activity"` + PurchasePrice int `json:"purchasePrice"` + SellPrice int `json:"sellPrice"` + Supply string `json:"supply"` + Symbol string `json:"symbol"` + TradeVolume int `json:"tradeVolume"` + Type string `json:"type"` +} diff --git a/golang/pkg/model/waypoint.go b/golang/pkg/model/waypoint.go index 7b71e6a..d8bd5cd 100644 --- a/golang/pkg/model/waypoint.go +++ b/golang/pkg/model/waypoint.go @@ -14,3 +14,11 @@ type Waypoint struct { X int `json:"x"` Y int `json:"y"` } + +func (w Waypoint) GetX() int { + return w.X +} + +func (w Waypoint) GetY() int { + return w.Y +} diff --git a/haskell/src/SpaceTraders/APIClient/Contracts.hs b/haskell/src/SpaceTraders/APIClient/Contracts.hs index 9c5bf02..81546a9 100644 --- a/haskell/src/SpaceTraders/APIClient/Contracts.hs +++ b/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 diff --git a/haskell/src/SpaceTraders/Automation/Init.hs b/haskell/src/SpaceTraders/Automation/Init.hs index be3dbd2..ac525ca 100644 --- a/haskell/src/SpaceTraders/Automation/Init.hs +++ b/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 diff --git a/nodejs/automation/agent.ts b/nodejs/automation/agent.ts index 2aecef5..a6506c5 100644 --- a/nodejs/automation/agent.ts +++ b/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 diff --git a/nodejs/automation/contracting.ts b/nodejs/automation/contracting.ts index 80569ef..d043d66 100644 --- a/nodejs/automation/contracting.ts +++ b/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 selling from './selling.js'; +import * as mining from './mining.ts'; +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)); diff --git a/nodejs/automation/trading.ts b/nodejs/automation/trading.ts new file mode 100644 index 0000000..897bd46 --- /dev/null +++ b/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)); + } + } +} diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index f3c0816..fbc90c7 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -8,465 +8,141 @@ "name": "spacetraders", "version": "0.0.1", "dependencies": { - "@types/better-sqlite3": "^7.6.12", - "better-sqlite3": "^11.7.2", - "tsx": "^4.18.0", - "typescript": "^5.7.3" + "better-sqlite3": "^11.8.1" }, "devDependencies": { - "esrun": "^3.2.26", - "prettier": "^3.4.2", - "typescript-language-server": "^4.3.3" + "@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" }, "engines": { "node": ">=21.6.2" } }, - "node_modules/@digitak/grubber": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@digitak/grubber/-/grubber-3.1.4.tgz", - "integrity": "sha512-pqsnp2BUYlDoTXWG34HWgEJse/Eo1okRgNex8IG84wHrJp8h3SakeR5WhB4VxSA2+/D+frNYJ0ch3yXzsfNDoA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz", - "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz", - "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz", - "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz", - "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz", - "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz", - "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz", - "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz", - "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz", - "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz", - "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz", - "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz", - "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz", - "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==", - "cpu": [ - "mips64el" - ], + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz", - "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz", - "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz", - "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, "engines": { "node": ">=12" } }, - "node_modules/@esbuild/linux-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz", - "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==", - "cpu": [ - "x64" - ], + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ], "engines": { - "node": ">=12" + "node": ">=6.0.0" } }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz", - "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==", - "cpu": [ - "x64" - ], + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz", - "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } + "license": "MIT" }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz", - "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==", - "cpu": [ - "x64" - ], + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz", - "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==", - "cpu": [ - "x64" - ], + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } + "license": "MIT" }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz", - "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==", - "cpu": [ - "arm64" - ], + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } + "license": "MIT" }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz", - "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==", - "cpu": [ - "ia32" - ], + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } + "license": "MIT" }, - "node_modules/@esbuild/win32-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz", - "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==", - "cpu": [ - "x64" - ], + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } + "license": "MIT" }, "node_modules/@types/better-sqlite3": { "version": "7.6.12", "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz", "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/node": { - "version": "20.14.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", - "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", + "version": "22.13.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz", + "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==", + "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.20.0" } }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, - "license": "ISC", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "acorn": "^8.11.0" }, "engines": { - "node": ">= 8" + "node": ">=0.4.0" } }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -488,9 +164,9 @@ "license": "MIT" }, "node_modules/better-sqlite3": { - "version": "11.7.2", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.7.2.tgz", - "integrity": "sha512-10a57cHVDmfNQS4jrZ9AH2t+2ekzYh5Rhbcnb4ytpmYweoLdogDmyTt5D+hLiY9b44Mx9foowb/4iXBTO2yP3Q==", + "version": "11.8.1", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.8.1.tgz", + "integrity": "sha512-9BxNaBkblMjhJW8sMRZxnxVTRgbRmssZW0Oxc1MPBTfiR+WW21e2Mk4qu8CzrcZb1LwPCnFsfDEzq+SNcBU8eg==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -498,19 +174,6 @@ "prebuild-install": "^7.1.1" } }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/bindings": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", @@ -531,19 +194,6 @@ "readable-stream": "^3.4.0" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -568,37 +218,19 @@ "ieee754": "^1.1.13" } }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "license": "ISC" }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -632,6 +264,16 @@ "node": ">=8" } }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -641,62 +283,6 @@ "once": "^1.4.0" } }, - "node_modules/esbuild": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz", - "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.17.19", - "@esbuild/android-arm64": "0.17.19", - "@esbuild/android-x64": "0.17.19", - "@esbuild/darwin-arm64": "0.17.19", - "@esbuild/darwin-x64": "0.17.19", - "@esbuild/freebsd-arm64": "0.17.19", - "@esbuild/freebsd-x64": "0.17.19", - "@esbuild/linux-arm": "0.17.19", - "@esbuild/linux-arm64": "0.17.19", - "@esbuild/linux-ia32": "0.17.19", - "@esbuild/linux-loong64": "0.17.19", - "@esbuild/linux-mips64el": "0.17.19", - "@esbuild/linux-ppc64": "0.17.19", - "@esbuild/linux-riscv64": "0.17.19", - "@esbuild/linux-s390x": "0.17.19", - "@esbuild/linux-x64": "0.17.19", - "@esbuild/netbsd-x64": "0.17.19", - "@esbuild/openbsd-x64": "0.17.19", - "@esbuild/sunos-x64": "0.17.19", - "@esbuild/win32-arm64": "0.17.19", - "@esbuild/win32-ia32": "0.17.19", - "@esbuild/win32-x64": "0.17.19" - } - }, - "node_modules/esrun": { - "version": "3.2.26", - "resolved": "https://registry.npmjs.org/esrun/-/esrun-3.2.26.tgz", - "integrity": "sha512-gDjP87qj4RW0BryZXPY3/L161hPo9uG6luBTjLsuHG3cKnhSMrzB7eNzSzvDyBLg7OgugyvzSgB2ov7mZ/oa7Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "@digitak/grubber": "^3.1.4", - "chokidar": "^3.5.1", - "esbuild": "^0.17.4" - }, - "bin": { - "esrun": "bin.js" - }, - "engines": { - "node": ">=14.0" - } - }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -712,70 +298,18 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "license": "MIT" }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/get-tsconfig": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz", - "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==", - "license": "MIT", - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", "license": "MIT" }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -808,51 +342,12 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "license": "ISC" }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } + "license": "ISC" }, "node_modules/mimic-response": { "version": "3.1.0", @@ -882,15 +377,15 @@ "license": "MIT" }, "node_modules/napi-build-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", "license": "MIT" }, "node_modules/node-abi": { - "version": "3.65.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz", - "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", + "version": "3.74.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", + "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", "license": "MIT", "dependencies": { "semver": "^7.3.5" @@ -899,14 +394,19 @@ "node": ">=10" } }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "node_modules/npm-check-updates": { + "version": "17.1.14", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.14.tgz", + "integrity": "sha512-dr4bXIxETubLI1tFGeock5hN8yVjahvaVpx+lPO4/O2md3zJuxB7FgH3MIoTvQSCgsgkIRpe0skti01IEAA5tA==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", + "bin": { + "ncu": "build/cli.js", + "npm-check-updates": "build/cli.js" + }, "engines": { - "node": ">=0.10.0" + "node": "^18.18.0 || >=20.0.0", + "npm": ">=8.12.1" } }, "node_modules/once": { @@ -918,23 +418,10 @@ "wrappy": "1" } }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/prebuild-install": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", - "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", "license": "MIT", "dependencies": { "detect-libc": "^2.0.0", @@ -942,7 +429,7 @@ "github-from-package": "0.0.0", "minimist": "^1.2.3", "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", + "napi-build-utils": "^2.0.0", "node-abi": "^3.3.0", "pump": "^3.0.0", "rc": "^1.2.7", @@ -958,9 +445,9 @@ } }, "node_modules/prettier": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", - "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.1.tgz", + "integrity": "sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==", "dev": true, "license": "MIT", "bin": { @@ -974,9 +461,9 @@ } }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", @@ -1012,28 +499,6 @@ "node": ">= 6" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1055,9 +520,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -1130,9 +595,9 @@ } }, "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", "license": "MIT", "dependencies": { "chownr": "^1.1.1", @@ -1157,427 +622,48 @@ "node": ">=6" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "license": "MIT", "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tsx": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.2.tgz", - "integrity": "sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==", - "license": "MIT", - "dependencies": { - "esbuild": "~0.23.0", - "get-tsconfig": "^4.7.5" + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" }, "bin": { - "tsx": "dist/cli.mjs" - }, - "engines": { - "node": ">=18.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - } - }, - "node_modules/tsx/node_modules/@esbuild/android-arm": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz", - "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/android-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz", - "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/android-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz", - "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/darwin-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz", - "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/darwin-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz", - "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz", - "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/freebsd-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz", - "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-arm": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz", - "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz", - "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-ia32": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz", - "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-loong64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz", - "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-mips64el": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz", - "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==", - "cpu": [ - "mips64el" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-ppc64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz", - "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-riscv64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz", - "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-s390x": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz", - "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz", - "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/netbsd-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz", - "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/openbsd-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz", - "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/sunos-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz", - "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/win32-arm64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz", - "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/win32-ia32": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz", - "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/@esbuild/win32-x64": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz", - "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/tsx/node_modules/esbuild": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz", - "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.23.1", - "@esbuild/android-arm": "0.23.1", - "@esbuild/android-arm64": "0.23.1", - "@esbuild/android-x64": "0.23.1", - "@esbuild/darwin-arm64": "0.23.1", - "@esbuild/darwin-x64": "0.23.1", - "@esbuild/freebsd-arm64": "0.23.1", - "@esbuild/freebsd-x64": "0.23.1", - "@esbuild/linux-arm": "0.23.1", - "@esbuild/linux-arm64": "0.23.1", - "@esbuild/linux-ia32": "0.23.1", - "@esbuild/linux-loong64": "0.23.1", - "@esbuild/linux-mips64el": "0.23.1", - "@esbuild/linux-ppc64": "0.23.1", - "@esbuild/linux-riscv64": "0.23.1", - "@esbuild/linux-s390x": "0.23.1", - "@esbuild/linux-x64": "0.23.1", - "@esbuild/netbsd-x64": "0.23.1", - "@esbuild/openbsd-arm64": "0.23.1", - "@esbuild/openbsd-x64": "0.23.1", - "@esbuild/sunos-x64": "0.23.1", - "@esbuild/win32-arm64": "0.23.1", - "@esbuild/win32-ia32": "0.23.1", - "@esbuild/win32-x64": "0.23.1" + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } } }, "node_modules/tunnel-agent": { @@ -1596,6 +682,7 @@ "version": "5.7.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "dev": true, "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -1605,23 +692,11 @@ "node": ">=14.17" } }, - "node_modules/typescript-language-server": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.3.3.tgz", - "integrity": "sha512-3QLj57Ru9S6zv10sa4z1pA3TIR1Rdkd04Ke0EszbO4fx5PLdlYhlC/PMxwlyxls9wrZs7wPCME1Ru0s1Gabz4Q==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "typescript-language-server": "lib/cli.mjs" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, "license": "MIT" }, "node_modules/util-deprecate": { @@ -1630,11 +705,28 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT" + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "license": "ISC" + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } } } } diff --git a/nodejs/package.json b/nodejs/package.json index 9624786..3d33ea5 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -1,20 +1,19 @@ { "engines": { - "node": ">=21.6.2" - }, - "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" + "node": ">=22.14.0" }, "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" + } } diff --git a/nodejs/tsconfig.json b/nodejs/tsconfig.json index 8b75445..ea05759 100644 --- a/nodejs/tsconfig.json +++ b/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. */ |