@shipload/sdk 2.0.0-rc21 → 2.0.0-rc22

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "2.0.0-rc21",
+    "version": "2.0.0-rc22",
     "homepage": "https://github.com/shipload/sdk",
     "license": "MIT",
     "main": "lib/shipload.js",

package/src/entities/ship.ts

@@ -8,8 +8,8 @@ import {
 } from '../travel/travel'
 import {
     ProjectedEntity,
-    projectEntity as sharedProjectEntity,
-    projectEntityAt as sharedProjectEntityAt,
+    projectFromCurrentState as sharedProjectFromCurrentState,
+    projectFromCurrentStateAt as sharedProjectFromCurrentStateAt,
 } from '../scheduling/projection'
 import {Location} from './location'
 import {ScheduleAccessor} from '../scheduling/accessor'
@@ -128,11 +128,11 @@ export class Ship extends ServerContract.Types.entity_info {
     }
 
     project(): ProjectedEntity {
-        return sharedProjectEntity(this)
+        return sharedProjectFromCurrentState(this)
     }
 
     projectAt(now: Date): ProjectedEntity {
-        return sharedProjectEntityAt(this, now)
+        return sharedProjectFromCurrentStateAt(this, now)
     }
 
     get location(): Location {

package/src/index-module.ts

@@ -143,9 +143,16 @@ export {
     createProjectedEntity,
     projectEntity,
     projectEntityAt,
+    projectFromCurrentState,
+    projectFromCurrentStateAt,
     validateSchedule,
 } from './scheduling/projection'
-export type {Projectable, ProjectedEntity, ProjectionOptions} from './scheduling/projection'
+export type {
+    Projectable,
+    ProjectableSnapshot,
+    ProjectedEntity,
+    ProjectionOptions,
+} from './scheduling/projection'
 
 export * from './types/capabilities'
 export * from './types/entity'

package/src/scheduling/projection.ts

@@ -1,4 +1,4 @@
-import {Name, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import {Name, TimePoint, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
 import {Coordinates, PRECISION, TaskType} from '../types'
 import {
@@ -290,6 +290,38 @@ export function projectEntity(entity: Projectable, options?: ProjectionOptions):
     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 projectFromCurrentState(snapshot: ProjectableSnapshot): ProjectedEntity {
+    const projectable = buildRemainingProjectable(snapshot)
+    return projectable ? projectEntity(projectable) : createProjectedEntity(snapshot)
+}
+
 function getRecipeInputsForOutput(outputItemId: number): RecipeInput[] | undefined {
     const recipe = getRecipe(outputItemId)
     return recipe?.inputs
@@ -421,3 +453,11 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
 
     return projected
 }
+
+export function projectFromCurrentStateAt(
+    snapshot: ProjectableSnapshot,
+    now: Date
+): ProjectedEntity {
+    const projectable = buildRemainingProjectable(snapshot)
+    return projectable ? projectEntityAt(projectable, now) : createProjectedEntity(snapshot)
+}