@shipload/sdk 1.0.0-next.56 → 1.0.0-next.59

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "1.0.0-next.56",
+    "version": "1.0.0-next.59",
     "homepage": "https://github.com/shipload/toolkit/tree/master/packages/sdk",
     "repository": {
         "type": "git",

package/src/capabilities/craftable.test.ts

@@ -0,0 +1,82 @@
+import {describe, expect, test} from 'bun:test'
+import {ServerContract} from '../contracts'
+import {UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import {
+    ITEM_ENGINE_T1,
+    ITEM_GENERATOR_T1,
+    ITEM_CRAFTER_T1,
+    ITEM_PLASMA_CELL,
+    ITEM_SHIP_T1_PACKED,
+} from '../data/item-ids'
+import {getRecipe} from '../data/recipes-runtime'
+import {encodeStats} from '../derivation/crafting'
+import {rollupCrafter} from '../derivation/rollups'
+import {makeEntity} from '../entities/makers'
+import type {IncomingSource} from '../scheduling/availability'
+import {maxCraftable} from './craftable'
+
+const NOW = new Date('2026-06-11T17:06:40.000Z')
+
+function ship(cargo: ServerContract.Types.cargo_item[] = []) {
+    return makeEntity(ITEM_SHIP_T1_PACKED, {
+        id: 99,
+        owner: 'tester.gm',
+        name: 'Craft Tester',
+        coordinates: {x: 0, y: 0},
+        hullmass: 200_000,
+        capacity: 8_000_000,
+        cargomass: 0,
+        energy: 500_000,
+        modules: [
+            {itemId: ITEM_GENERATOR_T1, stats: encodeStats([999, 999])},
+            {itemId: ITEM_CRAFTER_T1, stats: encodeStats([999, 999])},
+        ],
+        cargo,
+    })
+}
+
+function crafterSpeed(entity: ReturnType<typeof ship>): number {
+    return rollupCrafter(entity.crafter_lanes)!.speed.toNumber()
+}
+
+function plasmaCell(quantity: number) {
+    return ServerContract.Types.cargo_item.from({
+        item_id: UInt16.from(ITEM_PLASMA_CELL),
+        quantity: UInt32.from(quantity),
+        stats: UInt64.from(0),
+        modules: [],
+    })
+}
+
+describe('maxCraftable — incoming', () => {
+    test('on-hand-only baseline stays 0 for an empty-cargo entity', () => {
+        const recipe = getRecipe(ITEM_ENGINE_T1)!
+        const entity = ship([])
+        expect(maxCraftable(entity, recipe, crafterSpeed(entity), NOW)).toBe(0)
+    })
+
+    test('incoming source alone covers the recipe inputs', () => {
+        const recipe = getRecipe(ITEM_ENGINE_T1)!
+        const entity = ship([])
+        const incoming: IncomingSource[] = [
+            {holdId: '1', until: new Date(NOW.getTime() - 1000), items: [plasmaCell(1800)]},
+        ]
+
+        expect(maxCraftable(entity, recipe, crafterSpeed(entity), NOW)).toBe(0)
+        expect(maxCraftable(entity, recipe, crafterSpeed(entity), NOW, incoming)).toBe(3)
+    })
+
+    test('an incoming source arriving well after craft completion still resolves (eventually craftable)', () => {
+        const recipe = getRecipe(ITEM_ENGINE_T1)!
+        const entity = ship([])
+        const farFuture: IncomingSource[] = [
+            {
+                holdId: '1',
+                until: new Date(NOW.getTime() + 1_000_000_000),
+                items: [plasmaCell(1800)],
+            },
+        ]
+
+        expect(maxCraftable(entity, recipe, crafterSpeed(entity), NOW, farFuture)).toBe(3)
+    })
+})

package/src/capabilities/craftable.ts

@@ -1,8 +1,14 @@
 import type {ServerContract} from '../contracts'
 import {getItem} from '../data/catalog'
 import type {Recipe} from '../data/recipes-runtime'
-import {availableForItem, cargoReadyAt, projectedCargoAvailableAt} from '../scheduling/availability'
+import {
+    availableForItem,
+    projectedCargoAvailableAt,
+    taskCargoEffect,
+    type IncomingSource,
+} from '../scheduling/availability'
 import {candidateLaneCompletesAt, workerLaneKey} from '../scheduling/lanes'
+import * as schedule from '../scheduling/schedule'
 import type {ScheduleData} from '../scheduling/schedule'
 import {calc_craft_duration} from './crafting'
 
@@ -14,11 +20,35 @@ export interface CraftableEntity extends ScheduleData {
     modules: ModuleEntry[]
 }
 
+// Recipe inputs aren't stat-pinned (any variant counts, mirroring availableForItem's item-id aggregation).
+function itemReadyAt(
+    entity: CraftableEntity,
+    itemIds: readonly number[],
+    incoming: readonly IncomingSource[]
+): Date {
+    let readyMs = 0
+    for (const ordered of schedule.orderedTasks(entity)) {
+        for (const item of taskCargoEffect(ordered.task).added) {
+            if (itemIds.includes(item.item_id.toNumber())) {
+                readyMs = Math.max(readyMs, ordered.completesAt.getTime())
+                break
+            }
+        }
+    }
+    for (const src of incoming) {
+        if (src.items.some((item) => itemIds.includes(item.item_id.toNumber()))) {
+            readyMs = Math.max(readyMs, src.until.getTime())
+        }
+    }
+    return new Date(readyMs)
+}
+
 export function maxCraftable(
     entity: CraftableEntity,
     recipe: Recipe,
     crafterSpeed: number,
-    now: Date
+    now: Date,
+    incoming: readonly IncomingSource[] = []
 ): number {
     if (recipe.inputs.length === 0) return 0
 
@@ -30,12 +60,13 @@ export function maxCraftable(
     const crafterLane = workerLaneKey(entity.modules, 'crafter', entity.lanes ?? [])
     const naiveCompletesAt = candidateLaneCompletesAt(entity, crafterLane, perUnitDuration, now)
     const laneStartMs = naiveCompletesAt.getTime() - perUnitDuration * 1000
-    const readyMs = cargoReadyAt(
+    const readyMs = itemReadyAt(
         entity,
-        recipe.inputs.map((input) => input.itemId)
+        recipe.inputs.map((input) => input.itemId),
+        incoming
     ).getTime()
     const completesAt = new Date(Math.max(laneStartMs, readyMs) + perUnitDuration * 1000)
-    const availability = projectedCargoAvailableAt(entity, completesAt)
+    const availability = projectedCargoAvailableAt(entity, completesAt, incoming)
 
     let maxUnits: bigint | undefined
     for (const input of recipe.inputs) {

package/src/capabilities/modules.ts

@@ -28,6 +28,7 @@ export const MODULE_STORAGE = 8
 export const MODULE_HAULER = 9
 export const MODULE_BATTERY = 10
 export const MODULE_BUILDER = 12
+export const MODULE_AUX = 13
 
 export interface PackedModule {
     itemId: number
@@ -40,6 +41,13 @@ export interface ModuleEntry {
 }
 
 export function moduleAccepts(slotType: number, moduleType: number): boolean {
+    if (slotType === MODULE_AUX) {
+        return (
+            moduleType === MODULE_GENERATOR ||
+            moduleType === MODULE_ENGINE ||
+            moduleType === MODULE_BATTERY
+        )
+    }
     return slotType === MODULE_ANY || slotType === moduleType
 }
 
@@ -104,6 +112,8 @@ export function moduleSlotTypeToCode(slotType: string): number {
             return MODULE_HAULER
         case 'battery':
             return MODULE_BATTERY
+        case 'aux':
+            return MODULE_AUX
         default:
             return MODULE_ANY
     }

package/src/data/entities.json

@@ -227,7 +227,7 @@
         "maxTier": 1
       }
     ],
-    "baseHullmass": 3600000
+    "baseHullmass": 4000000
   },
   {
     "entityItemId": 10212,
@@ -248,7 +248,7 @@
         "maxTier": 1
       }
     ],
-    "baseHullmass": 3600000
+    "baseHullmass": 4000000
   },
   {
     "entityItemId": 10213,
@@ -269,7 +269,7 @@
         "maxTier": 1
       }
     ],
-    "baseHullmass": 4400000
+    "baseHullmass": 4000000
   },
   {
     "entityItemId": 10214,
@@ -290,7 +290,7 @@
         "maxTier": 1
       }
     ],
-    "baseHullmass": 4400000
+    "baseHullmass": 4000000
   },
   {
     "entityItemId": 10215,
@@ -311,28 +311,23 @@
         "maxTier": 1
       }
     ],
-    "baseHullmass": 5000000
+    "baseHullmass": 4000000
   },
   {
-    "entityItemId": 10216,
+    "entityItemId": 10218,
     "slots": [
       {
         "type": "generator",
-        "outputPct": 90,
+        "outputPct": 85,
         "maxTier": 1
       },
       {
         "type": "engine",
-        "outputPct": 90,
-        "maxTier": 1
-      },
-      {
-        "type": "gatherer",
-        "outputPct": 100,
+        "outputPct": 85,
         "maxTier": 1
       },
       {
-        "type": "gatherer",
+        "type": "crafter",
         "outputPct": 100,
         "maxTier": 1
       }
@@ -340,52 +335,47 @@
     "baseHullmass": 4000000
   },
   {
-    "entityItemId": 10217,
+    "entityItemId": 20200,
+    "slots": [],
+    "baseHullmass": 100000
+  },
+  {
+    "entityItemId": 20212,
     "slots": [
       {
         "type": "generator",
         "outputPct": 90,
-        "maxTier": 1
+        "maxTier": 2
       },
       {
         "type": "engine",
         "outputPct": 90,
-        "maxTier": 1
+        "maxTier": 2
       },
       {
         "type": "gatherer",
         "outputPct": 100,
-        "maxTier": 1
-      },
-      {
-        "type": "storage",
-        "outputPct": 100,
-        "maxTier": 1
+        "maxTier": 2
       }
     ],
-    "baseHullmass": 4800000
-  },
-  {
-    "entityItemId": 20200,
-    "slots": [],
-    "baseHullmass": 100000
+    "baseHullmass": 5920000
   },
   {
-    "entityItemId": 20210,
+    "entityItemId": 20213,
     "slots": [
       {
         "type": "generator",
-        "outputPct": 100,
+        "outputPct": 95,
         "maxTier": 2
       },
       {
-        "type": "generator",
-        "outputPct": 100,
+        "type": "engine",
+        "outputPct": 95,
         "maxTier": 2
       },
       {
-        "type": "engine",
-        "outputPct": 100,
+        "type": "aux",
+        "outputPct": 95,
         "maxTier": 2
       },
       {
@@ -394,32 +384,32 @@
         "maxTier": 2
       }
     ],
-    "baseHullmass": 5760000
+    "baseHullmass": 7360000
   },
   {
-    "entityItemId": 20211,
+    "entityItemId": 20214,
     "slots": [
       {
         "type": "generator",
-        "outputPct": 100,
+        "outputPct": 95,
         "maxTier": 2
       },
       {
         "type": "engine",
-        "outputPct": 100,
+        "outputPct": 95,
         "maxTier": 2
       },
       {
-        "type": "hauler",
+        "type": "gatherer",
         "outputPct": 100,
         "maxTier": 2
       },
       {
-        "type": "hauler",
+        "type": "storage",
         "outputPct": 100,
         "maxTier": 2
       }
     ],
-    "baseHullmass": 7040000
+    "baseHullmass": 7360000
   }
 ]

package/src/data/item-ids.ts

@@ -81,14 +81,13 @@ export const ITEM_MASS_CATCHER_T1_PACKED = 10206
 export const ITEM_HUB_T1_PACKED = 10207
 export const ITEM_WORKSHOP_T1_PACKED = 10208
 export const ITEM_CONSTRUCTION_DOCK_T1_PACKED = 10209
-export const ITEM_ROUSTABOUT_T1_PACKED = 10210
-export const ITEM_PROSPECTOR_T1_PACKED = 10211
-export const ITEM_TENDER_T1_PACKED = 10212
-export const ITEM_WRIGHT_T1_PACKED = 10213
-export const ITEM_TUG_T1_PACKED = 10214
-export const ITEM_PORTER_T1_PACKED = 10215
-export const ITEM_WRANGLER_T1_PACKED = 10216
-export const ITEM_DREDGER_T1_PACKED = 10217
+export const ITEM_ROUSTABOUT_T1A_PACKED = 10210
+export const ITEM_PROSPECTOR_T1A_PACKED = 10211
+export const ITEM_TENDER_T1A_PACKED = 10212
+export const ITEM_WRIGHT_T1A_PACKED = 10213
+export const ITEM_TUG_T1A_PACKED = 10214
+export const ITEM_PORTER_T1A_PACKED = 10215
+export const ITEM_SMITH_T1A_PACKED = 10218
 export const ITEM_PLATE_T2 = 20001
 export const ITEM_FRAME_T2 = 20002
 export const ITEM_PLASMA_CELL_T2 = 20003
@@ -102,5 +101,6 @@ export const ITEM_RESIN_T2 = 20010
 export const ITEM_GATHERER_T2 = 20102
 export const ITEM_HAULER_T2 = 20106
 export const ITEM_CONTAINER_T2_PACKED = 20200
-export const ITEM_PROSPECTOR_T2_PACKED = 20210
-export const ITEM_HAULER_SHIP_T2_PACKED = 20211
+export const ITEM_PROSPECTOR_T2A_PACKED = 20212
+export const ITEM_PROSPECTOR_T2B_PACKED = 20213
+export const ITEM_DREDGER_T2A_PACKED = 20214

package/src/data/items.json

@@ -583,14 +583,8 @@
     "tier": 1
   },
   {
-    "id": 10216,
-    "mass": 3600000,
-    "type": "entity",
-    "tier": 1
-  },
-  {
-    "id": 10217,
-    "mass": 3600000,
+    "id": 10218,
+    "mass": 2400000,
     "type": "entity",
     "tier": 1
   },
@@ -675,14 +669,20 @@
     "tier": 2
   },
   {
-    "id": 20210,
-    "mass": 3840000,
+    "id": 20212,
+    "mass": 4320000,
+    "type": "entity",
+    "tier": 2
+  },
+  {
+    "id": 20213,
+    "mass": 5760000,
     "type": "entity",
     "tier": 2
   },
   {
-    "id": 20211,
-    "mass": 3840000,
+    "id": 20214,
+    "mass": 5760000,
     "type": "entity",
     "tier": 2
   }

package/src/data/kind-registry.json

@@ -122,14 +122,9 @@
       "displayLabel": "Porter"
     },
     {
-      "itemId": 10216,
+      "itemId": 10218,
       "kind": "ship",
-      "displayLabel": "Wrangler"
-    },
-    {
-      "itemId": 10217,
-      "kind": "ship",
-      "displayLabel": "Dredger"
+      "displayLabel": "Smith"
     },
     {
       "itemId": 10202,
@@ -182,14 +177,19 @@
       "displayLabel": ""
     },
     {
-      "itemId": 20210,
+      "itemId": 20212,
       "kind": "ship",
       "displayLabel": "Prospector"
     },
     {
-      "itemId": 20211,
+      "itemId": 20213,
       "kind": "ship",
-      "displayLabel": "Tug"
+      "displayLabel": "Prospector"
+    },
+    {
+      "itemId": 20214,
+      "kind": "ship",
+      "displayLabel": "Dredger"
     }
   ]
 }

package/src/data/metadata.ts

@@ -320,15 +320,10 @@ export const itemMetadata: Record<number, ItemMetadata> = {
             'A cargo ship built around a large storage hold. The extra mass makes it slower than a Roustabout.',
         color: '#4AE898',
     },
-    10216: {
-        name: 'Wrangler',
-        description: 'A heavy gathering ship with two gathering rigs, so it mines faster.',
-        color: '#4AE898',
-    },
-    10217: {
-        name: 'Dredger',
+    10218: {
+        name: 'Smith',
         description:
-            'A gathering ship with its own storage hold, so it can keep mining before it has to offload.',
+            'A crafting ship. One engine, one power core, and a fabricator for crafting away from home.',
         color: '#4AE898',
     },
 
@@ -405,16 +400,21 @@ export const itemMetadata: Record<number, ItemMetadata> = {
         description: 'Advanced cargo container with improved capacity formulas.',
         color: '#9BADB8',
     },
-    20210: {
+    20212: {
+        name: 'Prospector',
+        description: 'The tier 2 Prospector. The same three systems, ready for tier 2 modules.',
+        color: '#4AE898',
+    },
+    20213: {
         name: 'Prospector',
         description:
-            'Advanced exploration vessel with tiered engine, power core, and limpet bay slots.',
+            'A tier 2 Prospector with an auxiliary system for extra power, mobility, or endurance.',
         color: '#4AE898',
     },
-    20211: {
-        name: 'Tug',
+    20214: {
+        name: 'Dredger',
         description:
-            'Advanced towing vessel with tiered engine, generator, and tractor beam slots.',
+            'A gathering ship that stores what it digs. Its limpet bay works alongside a cargo hold.',
         color: '#4AE898',
     },
 }
@@ -427,8 +427,7 @@ export const entityMetadata: Record<number, EntityMetadata> = {
     10213: {moduleSlotLabels: ['Power Core', 'Engine', 'Assembly Arm']},
     10214: {moduleSlotLabels: ['Power Core', 'Engine', 'Tractor Beam']},
     10215: {moduleSlotLabels: ['Power Core', 'Engine', 'Cargo Hold']},
-    10216: {moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Limpet Bay']},
-    10217: {moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Cargo Hold']},
+    10218: {moduleSlotLabels: ['Power Core', 'Engine', 'Fabricator']},
     10202: {
         moduleSlotLabels: ['Shuttle Bay', 'Cargo Hold', 'Cargo Hold', 'Cargo Hold', 'Cargo Hold'],
     },
@@ -440,8 +439,9 @@ export const entityMetadata: Record<number, EntityMetadata> = {
         moduleSlotLabels: ['Fabricator', 'Fabricator', 'Fabricator', 'Fabricator', 'Fabricator'],
     },
     10209: {moduleSlotLabels: ['Power Core', 'Assembly Arm']},
-    20210: {moduleSlotLabels: ['Power Core', 'Power Core', 'Engine', 'Limpet Bay']},
-    20211: {moduleSlotLabels: ['Power Core', 'Engine', 'Tractor Beam', 'Tractor Beam']},
+    20212: {moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay']},
+    20213: {moduleSlotLabels: ['Power Core', 'Engine', 'Auxiliary System', 'Limpet Bay']},
+    20214: {moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Cargo Hold']},
 }
 
 for (const item of items as Array<{id: number}>) {