@streamplace/components 0.8.17 → 0.8.18

package/src/livestream-store/livestream-store.tsx

@@ -22,6 +22,8 @@ export const makeLivestreamStore = (): StoreApi<LivestreamState> => {
     authors: {},
     recentSegments: [],
     problems: [],
+    websocketConnected: false,
+    hasReceivedSegment: false,
   }));
 };
 
@@ -59,4 +61,7 @@ export const useLivestream = () => useLivestreamStore((x) => x.livestream);
 
 export const useSegment = () => useLivestreamStore((x) => x.segment);
 
+export const useRecentSegments = () =>
+  useLivestreamStore((x) => x.recentSegments);
+
 export const useRenditions = () => useLivestreamStore((x) => x.renditions);

package/src/livestream-store/websocket-consumer.tsx

@@ -21,84 +21,106 @@ export const handleWebSocketMessages = (
   messages: any[],
 ): LivestreamState => {
   for (let message of messages) {
-    if (PlaceStreamLivestream.isLivestreamView(message)) {
-      const newLivestream = message as LivestreamViewHydrated;
-      const oldLivestream = state.livestream;
-
-      // check if this is actually new
-      if (!oldLivestream || oldLivestream.uri !== newLivestream.uri) {
-        const streamTitle = newLivestream.record.title || "something cool!";
-        const systemMessage = SystemMessages.streamStart(streamTitle);
-        // set proper times
-        systemMessage.indexedAt = newLivestream.indexedAt;
-        systemMessage.record.createdAt = newLivestream.record.createdAt;
-
-        state = reduceChat(state, [systemMessage], []);
-      }
-
-      state = {
-        ...state,
-        livestream: newLivestream,
-      };
-    } else if (PlaceStreamLivestream.isViewerCount(message)) {
-      message = message as PlaceStreamLivestream.ViewerCount;
-      state = {
-        ...state,
-        viewers: message.count,
-      };
-    } else if (PlaceStreamChatDefs.isMessageView(message)) {
-      message = message as PlaceStreamChatDefs.MessageView;
-      // Explicitly map MessageView to MessageViewHydrated
-      const hydrated: ChatMessageViewHydrated = {
-        uri: message.uri,
-        cid: message.cid,
-        author: message.author,
-        record: message.record as PlaceStreamChatMessage.Record,
-        indexedAt: message.indexedAt,
-        chatProfile: (message as any).chatProfile,
-        replyTo: (message as any).replyTo,
-        deleted: message.deleted,
-      };
-      state = reduceChat(state, [hydrated], [], []);
-    } else if (PlaceStreamSegment.isRecord(message)) {
-      const newRecentSegments = [...state.recentSegments];
-      newRecentSegments.unshift(message);
-      if (newRecentSegments.length > MAX_RECENT_SEGMENTS) {
-        newRecentSegments.pop();
-      }
-      state = {
-        ...state,
-        segment: message as PlaceStreamSegment.Record,
-        recentSegments: newRecentSegments,
-        problems: findProblems(newRecentSegments),
-      };
-    } else if (PlaceStreamDefs.isBlockView(message)) {
-      const block = message as PlaceStreamDefs.BlockView;
-      state = reduceChat(state, [], [block], []);
-    } else if (PlaceStreamDefs.isRenditions(message)) {
-      message = message as PlaceStreamDefs.Renditions;
+    if (message.$type === "place.stream.error") {
       state = {
         ...state,
-        renditions: message.renditions,
+        problems: [
+          ...state.problems,
+          {
+            code: message.code,
+            message: message.message,
+            severity: "error",
+          },
+        ],
       };
-    } else if (AppBskyActorDefs.isProfileViewBasic(message)) {
-      state = {
-        ...state,
-        profile: message,
-      };
-    } else if (PlaceStreamChatGate.isRecord(message)) {
-      const hideRecord = message as PlaceStreamChatGate.Record;
-      const hiddenMessageUri = hideRecord.hiddenMessage;
-      const newPendingHides = [...state.pendingHides];
-      if (!newPendingHides.includes(hiddenMessageUri)) {
-        newPendingHides.push(hiddenMessageUri);
+    } else {
+      if (!state.websocketConnected) {
+        state = {
+          ...state,
+          websocketConnected: true,
+        };
       }
 
-      state = {
-        ...state,
-        pendingHides: newPendingHides,
-      };
-      state = reduceChat(state, [], [], [hiddenMessageUri]);
+      if (PlaceStreamLivestream.isLivestreamView(message)) {
+        const newLivestream = message as LivestreamViewHydrated;
+        const oldLivestream = state.livestream;
+
+        // check if this is actually new
+        if (!oldLivestream || oldLivestream.uri !== newLivestream.uri) {
+          const streamTitle = newLivestream.record.title || "something cool!";
+          const systemMessage = SystemMessages.streamStart(streamTitle);
+          // set proper times
+          systemMessage.indexedAt = newLivestream.indexedAt;
+          systemMessage.record.createdAt = newLivestream.record.createdAt;
+
+          state = reduceChat(state, [systemMessage], []);
+        }
+
+        state = {
+          ...state,
+          livestream: newLivestream,
+        };
+      } else if (PlaceStreamLivestream.isViewerCount(message)) {
+        message = message as PlaceStreamLivestream.ViewerCount;
+        state = {
+          ...state,
+          viewers: message.count,
+        };
+      } else if (PlaceStreamChatDefs.isMessageView(message)) {
+        message = message as PlaceStreamChatDefs.MessageView;
+        // Explicitly map MessageView to MessageViewHydrated
+        const hydrated: ChatMessageViewHydrated = {
+          uri: message.uri,
+          cid: message.cid,
+          author: message.author,
+          record: message.record as PlaceStreamChatMessage.Record,
+          indexedAt: message.indexedAt,
+          chatProfile: (message as any).chatProfile,
+          replyTo: (message as any).replyTo,
+          deleted: message.deleted,
+        };
+        state = reduceChat(state, [hydrated], [], []);
+      } else if (PlaceStreamSegment.isRecord(message)) {
+        const newRecentSegments = [...state.recentSegments];
+        newRecentSegments.unshift(message);
+        if (newRecentSegments.length > MAX_RECENT_SEGMENTS) {
+          newRecentSegments.pop();
+        }
+        state = {
+          ...state,
+          segment: message as PlaceStreamSegment.Record,
+          recentSegments: newRecentSegments,
+          problems: findProblems(newRecentSegments),
+          hasReceivedSegment: true,
+        };
+      } else if (PlaceStreamDefs.isBlockView(message)) {
+        const block = message as PlaceStreamDefs.BlockView;
+        state = reduceChat(state, [], [block], []);
+      } else if (PlaceStreamDefs.isRenditions(message)) {
+        message = message as PlaceStreamDefs.Renditions;
+        state = {
+          ...state,
+          renditions: message.renditions,
+        };
+      } else if (AppBskyActorDefs.isProfileViewBasic(message)) {
+        state = {
+          ...state,
+          profile: message,
+        };
+      } else if (PlaceStreamChatGate.isRecord(message)) {
+        const hideRecord = message as PlaceStreamChatGate.Record;
+        const hiddenMessageUri = hideRecord.hiddenMessage;
+        const newPendingHides = [...state.pendingHides];
+        if (!newPendingHides.includes(hiddenMessageUri)) {
+          newPendingHides.push(hiddenMessageUri);
+        }
+
+        state = {
+          ...state,
+          pendingHides: newPendingHides,
+        };
+        state = reduceChat(state, [], [], [hiddenMessageUri]);
+      }
     }
   }
   return reduceChat(state, [], [], []);