@shipload/sdk 1.0.0-next.23 → 1.0.0-next.25

package/src/managers/construction.ts

@@ -10,6 +10,7 @@ import type {
     FinalizerEntityRef,
     InboundTransfer,
     Reservation,
+    ScheduledBuild,
     SourceCargoStack,
     SourceEntityRef,
 } from './construction-types'
@@ -22,11 +23,12 @@ export class ConstructionManager extends BaseManager {
     getTarget(
         entity: ServerContract.Types.entity_row,
         cargo: ServerContract.Types.cargo_row[],
-        activeTask?: ServerContract.Types.task
+        activeTask?: ServerContract.Types.task,
+        scheduledBuild?: ScheduledBuild
     ): BuildableTarget | null {
         const kind = entity.kind.toString()
         if (kind === 'plot') {
-            return this.plot.buildableTarget(entity, cargo, activeTask)
+            return this.plot.buildableTarget(entity, cargo, activeTask, scheduledBuild)
         }
         return null
     }
@@ -140,6 +142,53 @@ export class ConstructionManager extends BaseManager {
         return out
     }
 
+    scheduledBuildFor(
+        plotId: UInt64,
+        entities: ServerContract.Types.entity_info[],
+        now: Date
+    ): ScheduledBuild | null {
+        return this.scheduledBuildsByTarget(entities, now).get(plotId.toString()) ?? null
+    }
+
+    scheduledBuildsByTarget(
+        entities: ServerContract.Types.entity_info[],
+        now: Date
+    ): Map<string, ScheduledBuild> {
+        const nowMs = now.getTime()
+        const best = new Map<string, ScheduledBuild>()
+        for (const entity of entities) {
+            const schedule = entity.schedule
+            if (!schedule) continue
+            const startedMs = schedule.started.toDate().getTime()
+            const tasks = schedule.tasks
+            let cumulativeSec = 0
+            for (let i = 0; i < tasks.length; i++) {
+                const task = tasks[i]
+                const startSec = cumulativeSec
+                cumulativeSec += task.duration.toNumber()
+                if (task.type.toNumber() !== TaskType.BUILDPLOT) continue
+                if (!task.entitytarget) continue
+                const completesAt = startedMs + cumulativeSec * 1000
+                if (completesAt < nowMs) continue
+                const startsAt = startedMs + startSec * 1000
+                const targetId = task.entitytarget.entity_id.toString()
+                const candidate: ScheduledBuild = {
+                    shipId: entity.id,
+                    shipName: entity.entity_name || entity.id.toString(),
+                    hasStarted: startsAt <= nowMs,
+                    startsAt,
+                    completesAt,
+                    trailingCancelCount: tasks.length - 1 - i,
+                }
+                const existing = best.get(targetId)
+                if (!existing || candidate.completesAt < existing.completesAt) {
+                    best.set(targetId, candidate)
+                }
+            }
+        }
+        return best
+    }
+
     reservationsFrom(
         sourceEntityId: UInt64,
         entities: ServerContract.Types.entity_info[]

package/src/managers/context.ts

@@ -27,7 +27,8 @@ export class GameContext {
     constructor(
         public readonly client: APIClient,
         public readonly server: Contract,
-        public readonly platform: Contract
+        public readonly platform: Contract,
+        public readonly atomicAssetsAccount: string = 'atomicassets'
     ) {}
 
     get entities(): EntitiesManager {

package/src/managers/index.ts

@@ -20,5 +20,6 @@ export type {
     FinalizerEntityRef,
     FinalizerCapability,
     InboundTransfer,
+    ScheduledBuild,
     Reservation,
 } from './construction-types'

package/src/managers/locations.ts

@@ -1,10 +1,10 @@
-import type {UInt16Type} from '@wharfkit/antelope'
+import {BlockTimestamp, type UInt16Type} from '@wharfkit/antelope'
 import {BaseManager} from './base'
 import type {CoordinatesType, Distance} from '../types'
 import {hasSystem} from '../utils/system'
 import {findNearbyPlanets} from '../travel/travel'
 import type {ServerContract} from '../contracts'
-import {type DerivedStratum, deriveStrata} from '../derivation'
+import {type DerivedStratum, deriveStrata, getEffectiveReserve} from '../derivation'
 
 export interface LocationStratum extends DerivedStratum {
     reserveMax: number
@@ -24,7 +24,10 @@ export class LocationsManager extends BaseManager {
         return findNearbyPlanets(game.config.seed, origin, maxDistance)
     }
 
-    async getStrata(coords: CoordinatesType): Promise<LocationStratum[]> {
+    async getStrata(
+        coords: CoordinatesType,
+        now: BlockTimestamp = BlockTimestamp.fromMilliseconds(Date.now())
+    ): Promise<LocationStratum[]> {
         const game = await this.getGame()
         const state = await this.getState()
 
@@ -36,15 +39,26 @@ export class LocationsManager extends BaseManager {
             y: coords.y,
         })) as ServerContract.Types.stratum_remaining[]
 
-        const overrideMap = new Map<number, number>()
+        const epochSeconds = Number(game.config.epochtime)
+        const overrideMap = new Map<number, ServerContract.Types.stratum_remaining>()
         for (const o of overrides) {
-            overrideMap.set(Number(o.stratum), Number(o.remaining))
+            overrideMap.set(Number(o.stratum), o)
         }
 
-        return derived.map((s) => ({
-            ...s,
-            reserveMax: s.reserve,
-            reserve: overrideMap.get(s.index) ?? s.reserve,
-        }))
+        return derived.map((s) => {
+            const override = overrideMap.get(s.index)
+            const reserve = override
+                ? getEffectiveReserve(
+                      {
+                          remaining: override.remaining,
+                          max_reserve: s.reserve,
+                          last_block: override.last_block,
+                      },
+                      now,
+                      epochSeconds
+                  )
+                : s.reserve
+            return {...s, reserveMax: s.reserve, reserve}
+        })
     }
 }

package/src/managers/plot.ts

@@ -6,7 +6,7 @@ import {calc_craft_duration} from '../capabilities/crafting'
 import {TaskType} from '../types'
 import {BaseManager} from './base'
 import type {ServerContract} from '../contracts'
-import type {BuildableTarget} from './construction-types'
+import type {BuildableTarget, ScheduledBuild} from './construction-types'
 
 export interface PlotProgressInputRow {
     itemId: number
@@ -67,7 +67,8 @@ export class PlotManager extends BaseManager {
     buildableTarget(
         plot: ServerContract.Types.entity_row,
         cargo: ServerContract.Types.cargo_row[],
-        activeTask?: ServerContract.Types.task
+        activeTask?: ServerContract.Types.task,
+        scheduledBuild?: ScheduledBuild
     ): BuildableTarget {
         const progress = this.progress(plot, cargo)
         const targetItemId = Number(plot.item_id.toString())
@@ -79,10 +80,12 @@ export class PlotManager extends BaseManager {
 
         let state: BuildableTarget['state']
         const taskType = activeTask?.type.toNumber()
-        if (taskType === TaskType.CLAIMPLOT) {
-            state = 'initializing'
-        } else if (taskType === TaskType.BUILDPLOT) {
+        if (scheduledBuild?.hasStarted) {
             state = 'finalizing'
+        } else if (scheduledBuild) {
+            state = 'scheduled'
+        } else if (taskType === TaskType.CLAIMPLOT) {
+            state = 'initializing'
         } else if (progress.isComplete) {
             state = 'ready'
         } else {
@@ -101,6 +104,7 @@ export class PlotManager extends BaseManager {
             finalizeAction: Name.from('buildplot'),
             finalizerCapability: 'crafter',
             activeTask,
+            scheduledBuild,
         }
     }