dredless 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dredless",
-    "version": "0.5.0",
+    "version": "0.5.2",
     "description": "A fully-featured and from-scratch headless drednot.io client implementation written in pure js.",
     "license": "MIT",
     "homepage": "https://github.com/certainhuman/dredless#readme",

package/src/client/core.js

@@ -72,6 +72,7 @@ import {
     shipReadSummary,
     currentPlayerSummary,
     summariesFor,
+    entitySnapshotFor,
     emptyMachineSummary,
     normalizeDegrees,
     normalizeLauncherPower,

package/src/client/domains/index.js

@@ -427,7 +427,7 @@ export class OverworldDomain extends WorldDomain {
 
 const ENTITY_SNAPSHOT_CACHE = new WeakMap();
 
-function entitySnapshotFor(summary) {
+export function entitySnapshotFor(summary) {
     if (!summary || typeof summary !== "object") return null;
     let snapshot = ENTITY_SNAPSHOT_CACHE.get(summary);
     if (!snapshot) {
@@ -1587,7 +1587,10 @@ function normalizeInventorySlotIndex(value, name = "slot") {
 export function currentPlayerSummary(client, scope = "current") {
     const sid = Number(client?.sid);
     if (!Number.isFinite(sid)) return null;
-    return worldStateFor(client, scope)?.model.players().find((player) => player.entity === sid) || null;
+    const players = worldStateFor(client, scope)?.model.players() || [];
+    // `sid` is the websocket session id, not the ECS entity id used by the
+    // player component. The local-player flag identifies the ECS entity.
+    return players.find((player) => player.state?.q109) || null;
 }
 
 function currentPlayerRank(client) {

package/src/network/servers.js

@@ -60,11 +60,11 @@ export async function fetchServerStatus(server, baseUrl = DEFAULT_BASE_URL) {
     const resolved = await resolveServer(server, baseUrl);
     if (!resolved?.domain) throw new Error(`Unable to resolve server ${serverId(server)}`);
     const WebSocket = await getWebSocket();
-    const startedAt = Date.now();
     const socket = new WebSocket(`wss://${resolved.domain}:4000/`);
 
     return new Promise((resolve, reject) => {
         let settled = false;
+        let startedAt = 0;
         const finish = (callback, value) => {
             if (settled) return;
             settled = true;
@@ -73,7 +73,10 @@ export async function fetchServerStatus(server, baseUrl = DEFAULT_BASE_URL) {
             if (socket.readyState === 0 || socket.readyState === 1) socket.close();
         };
         const timeout = setTimeout(() => finish(reject, new Error(`Timed out fetching status for ${resolved.domain}`)), 10000);
-        const onOpen = () => socket.send("yo");
+        const onOpen = () => {
+            startedAt = Date.now();
+            socket.send("yo");
+        };
         const onMessage = async (event) => {
             try {
                 const data = JSON.parse(await websocketText(event?.data ?? event));