@shipload/sdk 1.0.0-next.3 → 1.0.0-next.31

package/src/scheduling/lane-core.ts

@@ -0,0 +1,130 @@
+import type {ServerContract} from '../contracts'
+import {TaskType} from '../types'
+
+type Schedule = ServerContract.Types.schedule
+type Task = ServerContract.Types.task
+
+export function laneDuration(schedule: Schedule): number {
+    return schedule.tasks.reduce((sum, task) => sum + task.duration.toNumber(), 0)
+}
+
+export function laneRawElapsed(schedule: Schedule, now: Date): number {
+    const started = schedule.started.toDate()
+    return Math.floor((now.getTime() - started.getTime()) / 1000)
+}
+
+export function laneElapsed(schedule: Schedule, now: Date): number {
+    return Math.max(0, laneRawElapsed(schedule, now))
+}
+
+export function laneStartsIn(schedule: Schedule, now: Date): number {
+    return Math.max(0, -laneRawElapsed(schedule, now))
+}
+
+export function laneRemaining(schedule: Schedule, now: Date): number {
+    return Math.max(0, laneDuration(schedule) - laneRawElapsed(schedule, now))
+}
+
+export function laneComplete(schedule: Schedule, now: Date): boolean {
+    if (schedule.tasks.length === 0) return false
+    if (schedule.tasks.some((t) => t.type.toNumber() === TaskType.RESERVED)) return false
+    return laneRemaining(schedule, now) === 0
+}
+
+export function laneProgress(schedule: Schedule, now: Date): number {
+    const duration = laneDuration(schedule)
+    if (duration === 0) return schedule.tasks.length > 0 ? 1 : 0
+    return Math.min(1, laneElapsed(schedule, now) / duration)
+}
+
+export function currentTaskIndexForLane(schedule: Schedule, now: Date): number {
+    if (schedule.tasks.length === 0) return -1
+    if (laneRawElapsed(schedule, now) < 0) return -1
+    const elapsed = laneElapsed(schedule, now)
+    let timeAccum = 0
+    for (let i = 0; i < schedule.tasks.length; i++) {
+        const taskDuration = schedule.tasks[i].duration.toNumber()
+        if (elapsed < timeAccum + taskDuration) return i
+        timeAccum += taskDuration
+    }
+    return -1
+}
+
+export function currentTask(schedule: Schedule, now: Date): Task | undefined {
+    const index = currentTaskIndexForLane(schedule, now)
+    if (index < 0) return undefined
+    return schedule.tasks[index]
+}
+
+export function currentTaskType(schedule: Schedule, now: Date): TaskType | undefined {
+    const task = currentTask(schedule, now)
+    return task ? (task.type.toNumber() as TaskType) : undefined
+}
+
+export function laneTaskStartTime(schedule: Schedule, index: number): number {
+    if (index < 0 || index >= schedule.tasks.length) return 0
+    let timeAccum = 0
+    for (let i = 0; i < index; i++) {
+        timeAccum += schedule.tasks[i].duration.toNumber()
+    }
+    return timeAccum
+}
+
+export function laneTaskElapsed(schedule: Schedule, index: number, now: Date): number {
+    if (index < 0 || index >= schedule.tasks.length) return 0
+    const elapsed = laneElapsed(schedule, now)
+    const taskStart = laneTaskStartTime(schedule, index)
+    const taskDuration = schedule.tasks[index].duration.toNumber()
+    if (elapsed <= taskStart) return 0
+    return Math.min(elapsed - taskStart, taskDuration)
+}
+
+export function laneTaskRemaining(schedule: Schedule, index: number, now: Date): number {
+    if (index < 0 || index >= schedule.tasks.length) return 0
+    const taskDuration = schedule.tasks[index].duration.toNumber()
+    return Math.max(0, taskDuration - laneTaskElapsed(schedule, index, now))
+}
+
+export function laneTaskComplete(schedule: Schedule, index: number, now: Date): boolean {
+    if (index < 0 || index >= schedule.tasks.length) return false
+    if (schedule.tasks[index].type.toNumber() === TaskType.RESERVED) return false
+    const taskDuration = schedule.tasks[index].duration.toNumber()
+    return laneTaskElapsed(schedule, index, now) >= taskDuration
+}
+
+export function laneTaskInProgress(schedule: Schedule, index: number, now: Date): boolean {
+    if (index < 0 || index >= schedule.tasks.length) return false
+    const taskElapsed = laneTaskElapsed(schedule, index, now)
+    const taskDuration = schedule.tasks[index].duration.toNumber()
+    return taskElapsed > 0 && taskElapsed < taskDuration
+}
+
+export function laneCompletesAt(schedule: Schedule, index: number): Date {
+    const startedMs = schedule.started.toDate().getTime()
+    const endSec =
+        laneTaskStartTime(schedule, index) + (schedule.tasks[index]?.duration.toNumber() ?? 0)
+    return new Date(startedMs + endSec * 1000)
+}
+
+export function currentTaskProgress(schedule: Schedule, now: Date): number {
+    const index = currentTaskIndexForLane(schedule, now)
+    if (index < 0) return 0
+    const elapsed = laneTaskElapsed(schedule, index, now)
+    const duration = schedule.tasks[index].duration.toNumber()
+    if (duration === 0) return 1
+    return Math.min(1, elapsed / duration)
+}
+
+export function currentTaskProgressFloatForLane(schedule: Schedule, now: Date): number {
+    if (schedule.tasks.length === 0) return 0
+    const index = currentTaskIndexForLane(schedule, now)
+    if (index < 0) return 0
+    const task = schedule.tasks[index]
+    const durationMs = task.duration.toNumber() * 1000
+    if (durationMs === 0) return 1
+    const startedMs = schedule.started.toDate().getTime()
+    const taskStartMs = startedMs + laneTaskStartTime(schedule, index) * 1000
+    const elapsedMs = now.getTime() - taskStartMs
+    if (elapsedMs <= 0) return 0
+    return Math.min(1, elapsedMs / durationMs)
+}

package/src/scheduling/lanes.ts

@@ -0,0 +1,60 @@
+import type {ServerContract} from '../contracts'
+import {getItem} from '../data/catalog'
+import type {ModuleType} from '../types'
+import {getLane, type ScheduleData} from './schedule'
+
+type ModuleEntry = ServerContract.Types.module_entry
+type Lane = ServerContract.Types.lane
+type Schedule = ServerContract.Types.schedule
+
+export function laneKeyForModule(slotIndex: number): number {
+    return slotIndex + 1
+}
+
+function laneIsFree(lanes: Lane[], laneKey: number): boolean {
+    const lane = lanes.find((entry) => entry.lane_key.toNumber() === laneKey)
+    return lane ? lane.schedule.tasks.length === 0 : true
+}
+
+export function workerLaneKey(
+    modules: ModuleEntry[],
+    moduleSubtype: ModuleType,
+    lanes: Lane[]
+): number {
+    const occupiedMatchingLaneKeys: number[] = []
+
+    for (let slotIndex = 0; slotIndex < modules.length; slotIndex++) {
+        const installed = modules[slotIndex].installed
+        if (!installed) continue
+        if (getItem(installed.item_id).moduleType !== moduleSubtype) continue
+
+        const laneKey = laneKeyForModule(slotIndex)
+        if (laneIsFree(lanes, laneKey)) return laneKey
+        occupiedMatchingLaneKeys.push(laneKey)
+    }
+
+    if (occupiedMatchingLaneKeys.length > 0) {
+        return Math.min(...occupiedMatchingLaneKeys)
+    }
+
+    throw new Error(`No installed ${moduleSubtype} worker module`)
+}
+
+export function rawScheduleEnd(schedule: Schedule): Date {
+    const durationSec = schedule.tasks.reduce((sum, task) => sum + task.duration.toNumber(), 0)
+    return new Date(schedule.started.toDate().getTime() + durationSec * 1000)
+}
+
+export function candidateLaneCompletesAt(
+    entity: ScheduleData,
+    laneKey: number,
+    durationSec: number,
+    now: Date
+): Date {
+    const lane = getLane(entity, laneKey)
+    const startMs = lane
+        ? Math.max(rawScheduleEnd(lane.schedule).getTime(), now.getTime())
+        : now.getTime()
+
+    return new Date(startMs + durationSec * 1000)
+}

package/src/scheduling/projection.ts

@@ -1,6 +1,6 @@
-import {Name, TimePoint, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import {Name, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
-import {Coordinates, PRECISION, TaskType} from '../types'
+import {Coordinates, TaskType} from '../types'
 import {
     capsHasLoaders,
     capsHasMovement,
@@ -14,17 +14,19 @@ import {
     RECIPE_INPUTS_INSUFFICIENT,
     RECIPE_INPUTS_INVALID,
     RECIPE_NOT_FOUND,
-    SHIP_CARGO_NOT_LOADED,
+    ENTITY_CARGO_NOT_LOADED,
 } from '../errors'
-import {getRecipe, type RecipeInput} from '../data/recipes-runtime'
-import {getItem} from '../data/catalog'
-import {distanceBetweenCoordinates, lerp} from '../travel/travel'
+import {getEntityLayout, getRecipe, type RecipeInput} from '../data/recipes-runtime'
+import {computeEntityCapabilities} from '../derivation/capabilities'
+import {decodeCraftedItemStats} from '../derivation/crafting'
+import {packedModulesToInstalled, type InstalledModule} from '../entities/slot-multiplier'
+import {lerp} from '../travel/travel'
 import {
     calcStacksMass,
     cargoItemToStack,
     type CargoStack,
     mergeStacks,
-    removeFromStacks,
+    subtractFromStacks,
     stackToCargoItem,
 } from '../capabilities/storage'
 import * as schedule from './schedule'
@@ -63,19 +65,74 @@ export interface Projectable extends ScheduleData {
     cargo: ServerContract.Types.cargo_item[]
     cargomass: UInt32
     owner?: Name
+    stats?: bigint
+    item_id?: number | UInt16
+    modules?: ServerContract.Types.module_entry[] | InstalledModule[]
 }
 
-function getHullMass(entity: Projectable): UInt32 {
-    return UInt32.from(entity.hullmass ?? 0)
+function toInstalledModules(
+    modules: ServerContract.Types.module_entry[] | InstalledModule[]
+): InstalledModule[] {
+    if (modules.length > 0 && 'itemId' in modules[0]) {
+        return modules as InstalledModule[]
+    }
+    return packedModulesToInstalled(modules as ServerContract.Types.module_entry[])
+}
+
+interface ProjectedCaps {
+    hullmass?: UInt32
+    capacity?: UInt32
+    engines?: ServerContract.Types.movement_stats
+    generator?: ServerContract.Types.energy_stats
+    loaders?: ServerContract.Types.loader_stats
+    hauler?: ServerContract.Types.hauler_stats
+}
+
+function recomputeCaps(entity: Projectable): ProjectedCaps | undefined {
+    if (
+        entity.item_id === undefined ||
+        entity.modules === undefined ||
+        entity.stats === undefined
+    ) {
+        return undefined
+    }
+
+    const itemId = Number(
+        typeof entity.item_id === 'number' ? entity.item_id : entity.item_id.value
+    )
+    const hullStats = decodeCraftedItemStats(itemId, entity.stats)
+    const layout = getEntityLayout(itemId)?.slots ?? []
+    const installed = toInstalledModules(entity.modules)
+    const caps = computeEntityCapabilities(hullStats, itemId, installed, layout)
+
+    return {
+        hullmass: UInt32.from(caps.hullmass),
+        capacity: UInt32.from(caps.capacity),
+        engines: caps.engines ? ServerContract.Types.movement_stats.from(caps.engines) : undefined,
+        generator: caps.generator
+            ? ServerContract.Types.energy_stats.from(caps.generator)
+            : undefined,
+        loaders: caps.loaders ? ServerContract.Types.loader_stats.from(caps.loaders) : undefined,
+        hauler: caps.hauler ? ServerContract.Types.hauler_stats.from(caps.hauler) : undefined,
+    }
 }
 
 export function createProjectedEntity(entity: Projectable): ProjectedEntity {
-    const shipMass = getHullMass(entity)
-    const loaders = entity.loaders
-    const engines = entity.engines
-    const generator = entity.generator
-    const hauler = entity.hauler
-    const capacity = entity.capacity
+    const needsRecompute =
+        entity.hullmass === undefined ||
+        entity.loaders === undefined ||
+        entity.engines === undefined ||
+        entity.generator === undefined ||
+        entity.hauler === undefined ||
+        entity.capacity === undefined
+    const caps = needsRecompute ? recomputeCaps(entity) : undefined
+
+    const shipMass = UInt32.from(entity.hullmass ?? caps?.hullmass ?? 0)
+    const loaders = entity.loaders ?? caps?.loaders
+    const engines = entity.engines ?? caps?.engines
+    const generator = entity.generator ?? caps?.generator
+    const hauler = entity.hauler ?? caps?.hauler
+    const capacity = entity.capacity ?? caps?.capacity
 
     const cargo: CargoStack[] = entity.cargo.map(cargoItemToStack)
 
@@ -160,25 +217,22 @@ function applyFlightTask(
     task: ServerContract.Types.task,
     options: {complete: boolean; progress?: number}
 ): void {
-    if (!task.coordinates || !projected.engines) return
+    if (!task.coordinates) return
 
-    const origin = projected.location
     const destination = Coordinates.from(task.coordinates)
-    const distance = distanceBetweenCoordinates(origin, task.coordinates)
-    const energyUsage = distance.dividing(PRECISION).multiplying(projected.engines.drain)
 
     if (options.complete) {
-        projected.energy = projected.energy.gt(energyUsage)
-            ? UInt16.from(projected.energy.subtracting(energyUsage))
-            : UInt16.from(0)
+        applyEnergyCost(projected, task)
         projected.location = destination
     } else if (options.progress !== undefined) {
-        const interpolated = lerp(origin, destination, options.progress)
+        const interpolated = lerp(projected.location, destination, options.progress)
         projected.location = Coordinates.from({
             x: Math.round(interpolated.x),
             y: Math.round(interpolated.y),
         })
-        const partialEnergy = UInt64.from(Math.floor(Number(energyUsage) * options.progress))
+        const partialEnergy = UInt64.from(
+            Math.floor(Number(task.energy_cost ?? 0) * options.progress)
+        )
         projected.energy = projected.energy.gt(partialEnergy)
             ? UInt16.from(projected.energy.subtracting(partialEnergy))
             : UInt16.from(0)
@@ -190,7 +244,7 @@ function addCargoItem(projected: ProjectedEntity, item: ServerContract.Types.car
 }
 
 function removeCargoItem(projected: ProjectedEntity, item: ServerContract.Types.cargo_item): void {
-    projected.cargo = removeFromStacks(projected.cargo, cargoItemToStack(item))
+    projected.cargo = subtractFromStacks(projected.cargo, cargoItemToStack(item))
 }
 
 function applyAddCargoTask(projected: ProjectedEntity, task: ServerContract.Types.task): void {
@@ -248,6 +302,7 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
             applyRechargeTask(projected, task, {complete: true})
             break
         case TaskType.TRAVEL:
+        case TaskType.WARP:
             applyFlightTask(projected, task, {complete: true})
             break
         case TaskType.LOAD:
@@ -255,7 +310,6 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
             applyAddCargoTask(projected, task)
             break
         case TaskType.UNLOAD:
-        case TaskType.WRAP:
             applyRemoveCargoTask(projected, task)
             break
         case TaskType.GATHER:
@@ -267,6 +321,9 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
         case TaskType.DEPLOY:
             applyDeployTask(projected, task)
             break
+        case TaskType.UNDEPLOY:
+        case TaskType.DEMOLISH:
+            break
     }
 }
 
@@ -276,50 +333,27 @@ export interface ProjectionOptions {
 
 export function projectEntity(entity: Projectable, options?: ProjectionOptions): ProjectedEntity {
     const projected = createProjectedEntity(entity)
-    if (!entity.schedule || entity.schedule.tasks.length === 0) return projected
+    const ordered = schedule.orderedTasks(entity)
+    if (ordered.length === 0) return projected
 
-    const tasks = entity.schedule.tasks
     const taskCount =
         options?.upToTaskIndex !== undefined
-            ? Math.max(0, Math.min(options.upToTaskIndex, tasks.length))
-            : tasks.length
+            ? Math.max(0, Math.min(options.upToTaskIndex, ordered.length))
+            : ordered.length
 
     for (let i = 0; i < taskCount; i++) {
-        applyTask(projected, tasks[i])
+        applyTask(projected, ordered[i].task)
     }
     return projected
 }
 
-export interface ProjectableSnapshot extends Projectable {
-    current_task?: ServerContract.Types.task
-    pending_tasks?: ServerContract.Types.task[]
-}
-
-function buildRemainingProjectable(snapshot: ProjectableSnapshot): Projectable | null {
-    if (!snapshot.schedule) return null
-    const remainingTasks: ServerContract.Types.task[] = []
-    if (snapshot.current_task) remainingTasks.push(snapshot.current_task)
-    if (snapshot.pending_tasks?.length) remainingTasks.push(...snapshot.pending_tasks)
-    if (remainingTasks.length === 0) return null
-
-    const completedCount = snapshot.schedule.tasks.length - remainingTasks.length
-    let startedMs = snapshot.schedule.started.toMilliseconds()
-    for (let i = 0; i < completedCount; i++) {
-        startedMs += snapshot.schedule.tasks[i].duration.toNumber() * 1000
-    }
-
-    return {
-        ...snapshot,
-        schedule: ServerContract.Types.schedule.from({
-            started: TimePoint.fromMilliseconds(startedMs),
-            tasks: remainingTasks,
-        }),
+export function projectRemainingAt(entity: Projectable, _now: Date): ProjectedEntity {
+    // Resolve is lazy/entity-global: completed tasks are unsettled until resolve, so replay all.
+    const projected = createProjectedEntity(entity)
+    for (const {task} of schedule.orderedTasks(entity)) {
+        applyTask(projected, task)
     }
-}
-
-export function projectFromCurrentState(snapshot: ProjectableSnapshot): ProjectedEntity {
-    const projectable = buildRemainingProjectable(snapshot)
-    return projectable ? projectEntity(projectable) : createProjectedEntity(snapshot)
+    return projected
 }
 
 function getRecipeInputsForOutput(outputItemId: number): RecipeInput[] | undefined {
@@ -342,19 +376,10 @@ function validateCraftTask(task: ServerContract.Types.task, projected: Projected
         let matched = false
         for (let ri = 0; ri < recipe.length; ri++) {
             const req = recipe[ri]
-            if ('itemId' in req) {
-                if (input.item_id.toNumber() === req.itemId) {
-                    groupedInputs[ri].push(input)
-                    matched = true
-                    break
-                }
-            } else {
-                const item = getItem(input.item_id)
-                if (item.category === req.category && item.tier === req.tier) {
-                    groupedInputs[ri].push(input)
-                    matched = true
-                    break
-                }
+            if (input.item_id.toNumber() === req.itemId) {
+                groupedInputs[ri].push(input)
+                matched = true
+                break
             }
         }
         if (!matched) throw new Error(RECIPE_INPUTS_INVALID)
@@ -385,15 +410,16 @@ function validateCraftTask(task: ServerContract.Types.task, projected: Projected
                 break
             }
         }
-        if (!found) throw new Error(SHIP_CARGO_NOT_LOADED)
+        if (!found) throw new Error(ENTITY_CARGO_NOT_LOADED)
     }
 }
 
 export function validateSchedule(entity: Projectable): void {
-    if (!entity.schedule || entity.schedule.tasks.length === 0) return
+    const ordered = schedule.orderedTasks(entity)
+    if (ordered.length === 0) return
 
     const projected = createProjectedEntity(entity)
-    for (const task of entity.schedule.tasks) {
+    for (const {task} of ordered) {
         if (task.type.toNumber() === TaskType.CRAFT) {
             validateCraftTask(task, projected)
         }
@@ -407,28 +433,35 @@ export function validateSchedule(entity: Projectable): void {
 export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity {
     const projected = createProjectedEntity(entity)
 
-    if (!entity.schedule || entity.schedule.tasks.length === 0) {
+    const ordered = schedule.orderedTasks(entity)
+    if (ordered.length === 0) {
         return projected
     }
 
-    for (let i = 0; i < entity.schedule.tasks.length; i++) {
-        const task = entity.schedule.tasks[i]
-        const taskComplete = schedule.isTaskComplete(entity, i, now)
-        const taskInProgress = schedule.isTaskInProgress(entity, i, now)
+    const nowMs = now.getTime()
+
+    for (const {task, startsAt} of ordered) {
+        const duration = task.duration.toNumber()
+        const isReserved = task.type.toNumber() === TaskType.RESERVED
+        const elapsed = Math.min(
+            Math.max(0, Math.floor((nowMs - startsAt.getTime()) / 1000)),
+            duration
+        )
+        const taskComplete = !isReserved && elapsed >= duration
+        const taskInProgress = elapsed > 0 && elapsed < duration
 
         if (!taskComplete && !taskInProgress) {
-            break
+            continue
         }
 
-        const progress = taskInProgress
-            ? schedule.getTaskElapsed(entity, i, now) / task.duration.toNumber()
-            : undefined
+        const progress = taskInProgress ? elapsed / duration : undefined
 
         switch (task.type.toNumber()) {
             case TaskType.RECHARGE:
                 applyRechargeTask(projected, task, {complete: taskComplete, progress})
                 break
             case TaskType.TRAVEL:
+            case TaskType.WARP:
                 applyFlightTask(projected, task, {complete: taskComplete, progress})
                 break
             case TaskType.LOAD:
@@ -436,7 +469,6 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
                 if (taskComplete) applyAddCargoTask(projected, task)
                 break
             case TaskType.UNLOAD:
-            case TaskType.WRAP:
                 if (taskComplete) applyRemoveCargoTask(projected, task)
                 break
             case TaskType.GATHER:
@@ -448,16 +480,11 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
             case TaskType.DEPLOY:
                 if (taskComplete) applyDeployTask(projected, task)
                 break
+            case TaskType.UNDEPLOY:
+            case TaskType.DEMOLISH:
+                break
         }
     }
 
     return projected
 }
-
-export function projectFromCurrentStateAt(
-    snapshot: ProjectableSnapshot,
-    now: Date
-): ProjectedEntity {
-    const projectable = buildRemainingProjectable(snapshot)
-    return projectable ? projectEntityAt(projectable, now) : createProjectedEntity(snapshot)
-}