@shipload/sdk 1.0.0-next.20 → 1.0.0-next.21

package/lib/shipload.m.js

@@ -10722,6 +10722,69 @@ class ConstructionManager extends BaseManager {
         }
         return out.sort((a, b) => a.estimatedDuration.value - b.estimatedDuration.value);
     }
+    inboundTransfersTo(plotId, entities, now) {
+        return this.inboundTransfersByTarget(entities, now).get(plotId.toString()) ?? [];
+    }
+    inboundTransfersByTarget(entities, now) {
+        const buckets = new Map();
+        const nowMs = now.getTime();
+        for (const entity of entities) {
+            const schedule = entity.schedule;
+            if (!schedule)
+                continue;
+            const entityIdStr = entity.id.toString();
+            const sourceName = entity.entity_name || entityIdStr;
+            const startedMs = schedule.started.toDate().getTime();
+            let cumulativeSec = 0;
+            for (const task of schedule.tasks) {
+                cumulativeSec += task.duration.toNumber();
+                if (!isTransferTask(task))
+                    continue;
+                if (!task.entitytarget)
+                    continue;
+                const targetIdStr = task.entitytarget.entity_id.toString();
+                const etaSeconds = Math.max(0, Math.round((startedMs + cumulativeSec * 1000 - nowMs) / 1000));
+                let perTarget = buckets.get(targetIdStr);
+                if (!perTarget) {
+                    perTarget = new Map();
+                    buckets.set(targetIdStr, perTarget);
+                }
+                for (const c of task.cargo) {
+                    const itemId = c.item_id.toNumber();
+                    const quantity = c.quantity.toNumber();
+                    if (quantity === 0)
+                        continue;
+                    const key = `${entityIdStr}#${itemId}`;
+                    const existing = perTarget.get(key);
+                    if (existing) {
+                        existing.quantity += quantity;
+                        existing.etaSeconds = Math.min(existing.etaSeconds, etaSeconds);
+                    }
+                    else {
+                        perTarget.set(key, {
+                            sourceEntityId: entity.id,
+                            sourceEntityType: entity.type,
+                            sourceName,
+                            itemId,
+                            quantity,
+                            etaSeconds,
+                        });
+                    }
+                }
+            }
+        }
+        const out = new Map();
+        for (const [targetId, perTarget] of buckets) {
+            out.set(targetId, Array.from(perTarget.values()));
+        }
+        return out;
+    }
+    reservationsFrom(sourceEntityId, entities) {
+        const source = entities.find((e) => e.id.equals(sourceEntityId));
+        if (!source)
+            return [];
+        return reservationsOf(source);
+    }
     estimateFinalizeDuration(target, crafterSpeed) {
         return calc_craft_duration(crafterSpeed, target.progress.massRequired);
     }
@@ -10732,26 +10795,49 @@ class ConstructionManager extends BaseManager {
 function coordsEqual(a, b) {
     return a.x.equals(b.x) && a.y.equals(b.y);
 }
-function matchRelevantCargo(entity, target, cargo) {
-    const quantityByItemId = new Map();
+function moduleKey(module) {
+    const installed = module.installed;
+    if (!installed)
+        return `${module.type.toNumber()}:empty`;
+    return `${module.type.toNumber()}:${installed.item_id.toNumber()}:${installed.stats.toString()}`;
+}
+function sourceStackKey(cargo) {
+    return `${cargo.item_id.toNumber()}#${cargo.stats.toString()}#${(cargo.modules ?? [])
+        .map(moduleKey)
+        .join(',')}`;
+}
+function matchRelevantCargo(entity, target, cargo, reservedByItem) {
+    const needsByItemId = new Map(target.progress.rows.filter((row) => row.missing > 0).map((row) => [row.itemId, row]));
+    const remainingReserved = new Map(reservedByItem);
+    const out = [];
     for (const c of cargo) {
         if (!c.entity_id.equals(entity.id))
             continue;
-        const id = c.item_id.toNumber();
-        quantityByItemId.set(id, (quantityByItemId.get(id) ?? 0) + c.quantity.toNumber());
-    }
-    const out = [];
-    for (const row of target.progress.rows) {
-        if (row.missing === 0)
+        const itemId = c.item_id.toNumber();
+        const need = needsByItemId.get(itemId);
+        if (!need)
             continue;
-        const available = quantityByItemId.get(row.itemId) ?? 0;
+        const gross = c.quantity.toNumber();
+        if (gross === 0)
+            continue;
+        const reservedRemaining = remainingReserved.get(itemId) ?? 0;
+        const reserved = Math.min(gross, reservedRemaining);
+        const available = gross - reserved;
+        if (reserved > 0) {
+            remainingReserved.set(itemId, reservedRemaining - reserved);
+        }
         if (available === 0)
             continue;
         out.push({
-            itemId: row.itemId,
-            item: getItem(row.itemId),
+            key: sourceStackKey(c),
+            rowId: c.id,
+            itemId,
+            item: getItem(itemId),
+            stats: c.stats,
+            modules: c.modules ?? [],
             available,
-            plotNeeds: row.missing,
+            plotNeeds: need.missing,
+            reserved,
         });
     }
     return out;
@@ -10766,7 +10852,8 @@ function partitionSources(target, entities, cargo) {
             continue;
         if (!coordsEqual(entity.coordinates, target.coordinates))
             continue;
-        const relevant = matchRelevantCargo(entity, target, cargo);
+        const reserved = reservedByItemFor(entity);
+        const relevant = matchRelevantCargo(entity, target, cargo, reserved);
         if (relevant.length === 0)
             continue;
         const loaderCount = entity.loaders?.quantity.toNumber() ?? 0;
@@ -10786,6 +10873,50 @@ function partitionSources(target, entities, cargo) {
     }
     return { eligible, unreachable };
 }
+function isTransferTask(task) {
+    const type = task.type.toNumber();
+    return type === TaskType.LOAD || type === TaskType.UNLOAD;
+}
+function reservationsOf(source) {
+    if (!source.schedule)
+        return [];
+    const out = new Map();
+    for (const task of source.schedule.tasks) {
+        if (!isTransferTask(task))
+            continue;
+        if (!task.entitytarget)
+            continue;
+        const targetType = task.entitytarget.entity_type;
+        const targetId = task.entitytarget.entity_id;
+        for (const c of task.cargo) {
+            const itemId = c.item_id.toNumber();
+            const quantity = c.quantity.toNumber();
+            if (quantity === 0)
+                continue;
+            const key = `${targetId.toString()}#${itemId}`;
+            const existing = out.get(key);
+            if (existing) {
+                existing.quantity += quantity;
+            }
+            else {
+                out.set(key, {
+                    targetEntityId: targetId,
+                    targetEntityType: targetType,
+                    itemId,
+                    quantity,
+                });
+            }
+        }
+    }
+    return Array.from(out.values());
+}
+function reservedByItemFor(source) {
+    const out = new Map();
+    for (const r of reservationsOf(source)) {
+        out.set(r.itemId, (out.get(r.itemId) ?? 0) + r.quantity);
+    }
+    return out;
+}
 
 function totalCargoMass(cargo) {
     return cargo.reduce((sum, c) => {