@shipload/sdk 1.0.0-next.72 → 1.0.0-next.73

package/src/data/task-types.json

@@ -0,0 +1,184 @@
+{
+  "types": [
+    {
+      "type": 0,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 1,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 2,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 3,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 4,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 5,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 6,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 7,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 9,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 10,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 11,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": true,
+      "capsPlan": true,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 12,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 13,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": true,
+      "capsPlan": true,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 15,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 16,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 17,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 18,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 20,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 21,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 22,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    }
+  ]
+}

package/src/entities/makers.ts

@@ -6,7 +6,7 @@ import {getKindMeta, getTemplateMeta} from '../data/kind-registry'
 import type {EntityTypeName} from '../data/kind-registry'
 import {getEntityLayout} from '../data/recipes-runtime'
 import type {EntitySlot} from '../data/recipes-runtime'
-import {itemMetadata} from '../data/metadata'
+import {getItemFamily} from '../data/metadata'
 import {getItem} from '../data/catalog'
 import {getModuleCapabilityType, moduleAccepts, moduleSlotTypeToCode} from '../capabilities/modules'
 import {computeEntityCapabilities} from '../derivation/capabilities'
@@ -52,7 +52,7 @@ function assignModulesToSlots(
             try {
                 modName = getItem(mod.itemId).name
             } catch {
-                modName = itemMetadata[mod.itemId]?.name ?? `item ${mod.itemId}`
+                modName = getItemFamily(mod.itemId)?.name ?? `item ${mod.itemId}`
             }
             throw new Error(
                 `No compatible slot for module ${modName} (type ${modType}) on ${entityLabel}`

package/src/index-module.ts

@@ -124,6 +124,8 @@ export {
     categoryFromIndex,
     categoryLabelFromIndex,
 } from './data/catalog'
+export {getItemFamily, itemFamilies, itemFamilyKey} from './data/metadata'
+export type {ItemFamily} from './data/metadata'
 export {getCurrentEpoch, getEpochInfo} from './scheduling/epoch'
 export type {EpochInfo} from './scheduling/epoch'
 export {
@@ -374,12 +376,18 @@ export {
     derivedLoaders,
     estimateUnwrapDuration,
     incomingHoldMass,
+    projectCargomass,
     projectedPeakCargomass,
     receiveFits,
     unwrapLoadDuration,
     unwrapTransitDuration,
 } from './scheduling/unwrap'
-export type {DerivedLoaders, UnwrapDestination, UnwrapItem} from './scheduling/unwrap'
+export type {
+    CargomassProjection,
+    DerivedLoaders,
+    UnwrapDestination,
+    UnwrapItem,
+} from './scheduling/unwrap'
 
 export {
     projectedCargoAvailableAt,

package/src/managers/actions.ts

@@ -610,6 +610,18 @@ export class ActionsManager extends BaseManager {
         })
     }
 
+    blenddepot(
+        depotId: UInt64Type,
+        owner: NameType,
+        inputs: ServerContract.ActionParams.Type.cargo_item[]
+    ): Action {
+        return this.server.action('blenddepot', {
+            depot_id: UInt64.from(depotId),
+            owner: Name.from(owner),
+            inputs,
+        })
+    }
+
     deploy(
         entityId: UInt64Type,
         ref: ServerContract.ActionParams.Type.cargo_ref,

package/src/resolution/resolve-item.ts

@@ -4,7 +4,7 @@ import type {ResourceCategory} from '../types'
 import {getItem, getModules} from '../data/catalog'
 import {ENTITY_SHIP, getPackedEntityType} from '../data/kind-registry'
 import {getEntityLayout} from '../data/recipes-runtime'
-import {entityMetadata, itemMetadata} from '../data/metadata'
+import {entityMetadata, getItemFamily} from '../data/metadata'
 import {
     getModuleCapabilityType,
     isModuleItem,
@@ -370,7 +370,7 @@ function resolveEntity(
                     modName = modItem.name
                     modTier = modItem.tier
                 } catch {
-                    modName = itemMetadata[modItemId]?.name ?? 'Module'
+                    modName = getItemFamily(modItemId)?.name ?? 'Module'
                 }
                 const group = computeCapabilityGroup(modType, decodedStats, modTier, slot.outputPct)
                 return {

package/src/scheduling/unwrap.test.ts

@@ -5,8 +5,14 @@ import {
     unwrapLoadDuration,
     estimateUnwrapDuration,
     incomingHoldMass,
+    projectCargomass,
     projectedPeakCargomass,
 } from './unwrap'
+import {TimePoint, UInt8, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import {ServerContract} from '../contracts'
+import {getItem} from '../data/catalog'
+import {ITEM_BEAM} from '../data/item-ids'
+import {TaskType} from '../types'
 
 describe('unwrap duration mirror', () => {
     test('derivedLoaders aggregates lanes like derived_loaders()', () => {
@@ -84,3 +90,57 @@ test('projectedPeakCargomass tracks the running peak from cargomass', () => {
     // No pending tasks: peak = base + candidate add.
     expect(projectedPeakCargomass(entity, new Date(0), 500)).toBe(1500)
 })
+
+const DEPOSIT_START = new Date('2026-09-20T07:48:37.000Z')
+const BEAM_QTY = 2_500
+const BEAM_MASS = getItem(ITEM_BEAM).mass
+
+function unloadingShip(projectedAtMs?: number) {
+    const cargo = ServerContract.Types.cargo_item.from({
+        item_id: UInt16.from(ITEM_BEAM),
+        quantity: UInt32.from(BEAM_QTY),
+        stats: UInt64.from(0),
+        modules: [],
+    })
+    const lane = ServerContract.Types.lane.from({
+        lane_key: UInt8.from(0),
+        schedule: ServerContract.Types.schedule.from({
+            started: TimePoint.fromMilliseconds(DEPOSIT_START.getTime()),
+            tasks: [
+                ServerContract.Types.task.from({
+                    type: UInt8.from(TaskType.CIVIC_DEPOSIT),
+                    duration: UInt32.from(1_309),
+                    cancelable: UInt8.from(2),
+                    cargo: [cargo],
+                    couplings: [],
+                }),
+            ],
+        }),
+    })
+    return {
+        cargomass: BEAM_QTY * BEAM_MASS,
+        lanes: [lane],
+        holds: [],
+        projected_at:
+            projectedAtMs === undefined ? undefined : TimePoint.fromMilliseconds(projectedAtMs),
+    }
+}
+
+const UNLOAD_ENDS = new Date(DEPOSIT_START.getTime() + 1_309_000)
+const AFTER_UNLOAD = new Date(UNLOAD_ENDS.getTime() + 60_000)
+
+test('projectCargomass reports the mass held at the candidate and the peak around it', () => {
+    const plan = projectCargomass(unloadingShip(), AFTER_UNLOAD, 400 * BEAM_MASS)
+    // The queued unload empties the hold before the candidate lands.
+    expect(plan.used).toBe(400 * BEAM_MASS)
+    expect(plan.peak).toBe(BEAM_QTY * BEAM_MASS)
+})
+
+test('a task already applied to a projected row is not replayed', () => {
+    const applied = unloadingShip(UNLOAD_ENDS.getTime())
+    applied.cargomass = 0
+    const plan = projectCargomass(applied, AFTER_UNLOAD, 400 * BEAM_MASS)
+    expect(plan.used).toBe(400 * BEAM_MASS)
+    expect(plan.peak).toBe(400 * BEAM_MASS)
+    expect(projectedPeakCargomass(applied, AFTER_UNLOAD, 400 * BEAM_MASS)).toBe(plan.peak)
+})

package/src/scheduling/unwrap.ts

@@ -133,28 +133,44 @@ function cargoListMass(items: CargoItem[]): number {
     return m
 }
 
-export function projectedPeakCargomass(
-    entity: sched.ScheduleData & {cargomass: number | {toNumber(): number}},
+export interface CargomassProjection {
+    used: number
+    peak: number
+}
+
+export function projectCargomass(
+    entity: sched.AnchoredScheduleData & {cargomass: number | {toNumber(): number}},
     at: Date,
     addMass: number,
     removeMass = 0
-): number {
-    const events: {t: number; delta: number}[] = []
-    for (const ordered of sched.orderedTasks(entity)) {
+): CargomassProjection {
+    const events: {t: number; delta: number; candidate: boolean}[] = []
+    for (const ordered of sched.unappliedTasks(entity)) {
         const eff = taskCargoEffect(ordered.task)
         const delta = cargoListMass(eff.added) - cargoListMass(eff.removed)
-        events.push({t: ordered.completesAt.getTime(), delta})
+        events.push({t: ordered.completesAt.getTime(), delta, candidate: false})
     }
-    events.push({t: at.getTime(), delta: addMass - removeMass})
+    events.push({t: at.getTime(), delta: addMass - removeMass, candidate: true})
     events.sort((a, b) => (a.t !== b.t ? a.t - b.t : b.delta - a.delta))
     let running = Number(entity.cargomass)
     let peak = running
+    let used = running
     for (const e of events) {
         running += e.delta
         if (running < 0) running = 0
         if (running > peak) peak = running
+        if (e.candidate) used = running
     }
-    return Math.min(peak, 0xffff_ffff)
+    return {used: Math.min(used, 0xffff_ffff), peak: Math.min(peak, 0xffff_ffff)}
+}
+
+export function projectedPeakCargomass(
+    entity: sched.AnchoredScheduleData & {cargomass: number | {toNumber(): number}},
+    at: Date,
+    addMass: number,
+    removeMass = 0
+): number {
+    return projectCargomass(entity, at, addMass, removeMass).peak
 }
 
 export function receiveFits(

package/src/types.ts

@@ -208,6 +208,7 @@ export const CATEGORY_LABELS: Record<ResourceCategory, string> = {
 
 export interface Item {
     id: number
+    family: string
     name: string
     description: string
     color: string