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

package/lib/shipload.js

@@ -17353,23 +17353,28 @@ class ConstructionManager extends BaseManager {
     }
     inboundTransfersByTarget(entities, now) {
         const buckets = new Map();
+        const entitiesById = new Map(entities.map((entity) => [entity.id.toString(), entity]));
         const nowMs = now.getTime();
         for (const entity of entities) {
-            const entityIdStr = entity.id.toString();
-            const sourceName = entity.entity_name || entityIdStr;
             for (const lane of getLanes(entity)) {
                 const startedMs = lane.schedule.started.toDate().getTime();
                 let cumulativeSec = 0;
                 for (const task of lane.schedule.tasks) {
                     cumulativeSec += task.duration.toNumber();
-                    if (!isPushTask(task))
+                    if (!isDeliveryTask(task))
                         continue;
-                    if (task.couplings.length === 0)
+                    const target = deliveryTarget(task);
+                    if (!target)
+                        continue;
+                    const source = deliverySource(task, entity, entitiesById);
+                    if (!source)
                         continue;
                     const projectedEndMs = startedMs + cumulativeSec * 1000;
                     if (projectedEndMs < nowMs)
                         continue;
-                    const targetIdStr = task.couplings[0].counterpart.entity_id.toString();
+                    const targetIdStr = target.entity_id.toString();
+                    const sourceIdStr = source.id.toString();
+                    const sourceName = source.entity_name || sourceIdStr;
                     const etaSeconds = Math.max(0, Math.round((projectedEndMs - nowMs) / 1000));
                     let perTarget = buckets.get(targetIdStr);
                     if (!perTarget) {
@@ -17381,7 +17386,7 @@ class ConstructionManager extends BaseManager {
                         const quantity = c.quantity.toNumber();
                         if (quantity === 0)
                             continue;
-                        const key = `${entityIdStr}#${itemId}`;
+                        const key = `${sourceIdStr}#${itemId}`;
                         const existing = perTarget.get(key);
                         if (existing) {
                             existing.quantity += quantity;
@@ -17389,8 +17394,8 @@ class ConstructionManager extends BaseManager {
                         }
                         else {
                             perTarget.set(key, {
-                                sourceEntityId: entity.id,
-                                sourceEntityType: entity.type,
+                                sourceEntityId: source.id,
+                                sourceEntityType: source.type,
                                 sourceName,
                                 itemId,
                                 quantity,
@@ -17583,7 +17588,24 @@ function partitionSources(target, entities, cargo) {
     }
     return { eligible, unreachable };
 }
-function isPushTask(task) {
+function isDeliveryTask(task) {
+    const type = task.type.toNumber();
+    return type === exports.TaskType.UNLOAD || type === exports.TaskType.SHUTTLE;
+}
+function deliveryTarget(task) {
+    if (task.type.toNumber() === exports.TaskType.SHUTTLE) {
+        return task.couplings.find((coupling) => coupling.kind.toNumber() === exports.HoldKind.PUSH)
+            ?.counterpart;
+    }
+    return task.couplings[0]?.counterpart;
+}
+function deliverySource(task, transporter, entitiesById) {
+    if (task.type.toNumber() !== exports.TaskType.SHUTTLE)
+        return transporter;
+    const source = task.couplings.find((coupling) => coupling.kind.toNumber() === exports.HoldKind.PULL)?.counterpart;
+    return source ? entitiesById.get(source.entity_id.toString()) : undefined;
+}
+function isReservingPushTask(task) {
     return task.type.toNumber() === exports.TaskType.UNLOAD;
 }
 function isBuildOfPlot(task, plotId) {
@@ -17594,7 +17616,7 @@ function isBuildOfPlot(task, plotId) {
 function reservationsOf(source) {
     const out = new Map();
     for (const task of getTasks(source)) {
-        if (!isPushTask(task))
+        if (!isReservingPushTask(task))
             continue;
         if (task.couplings.length === 0)
             continue;