Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: chat example frontend race condition #2219

Merged
merged 1 commit into from
May 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _examples/chat/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

# testing
/coverage
/corpus

# production
/build
Expand Down
3 changes: 1 addition & 2 deletions _examples/chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
"private": true,
"dependencies": {
"@apollo/client": "^3.2.3",
"apollo-cache-inmemory": "^1.3.11",
"apollo-utilities": "^1.0.26",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"graphql-ws": "^5.8.1",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-scripts": "^2.1.1",
"styled-components": "^5.2.0",
"graphql-ws": "^5.8.1",
"subscriptions-transport-ws": "^0.9.5"
},
"scripts": {
Expand Down
38 changes: 32 additions & 6 deletions _examples/chat/src/Room.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import gql from 'graphql-tag';
import { useQuery, useMutation } from '@apollo/client';
import { Chat, ChatContainer, Message, MessageReceived } from './components/room';

let queuedMessages = []
export const Room = ({ channel, name }) => {
const messagesEndRef = useRef(null)
const [ text, setText ] = useState('');
Expand All @@ -13,12 +14,25 @@ export const Room = ({ channel, name }) => {
}
});

const { loading, error, data, subscribeToMore } = useQuery(QUERY, {
let { loading, error, data, subscribeToMore } = useQuery(QUERY, {
variables: {
channel
},
});

if (data && data.room) {
data = Object.assign({}, data, {
room: Object.assign({}, data.room, {
messages: [
...data.room.messages,
...queuedMessages.filter((queuedMessage) => (
!data.room.messages.find((msg) => msg.id === queuedMessage.id)
)),
],
})
});
}

// subscribe to more messages
useEffect(() => {
const subscription = subscribeToMore({
Expand All @@ -32,16 +46,29 @@ export const Room = ({ channel, name }) => {
return prev;
}
const newMessage = subscriptionData.data.messageAdded;
if (!prev.room) {
queuedMessages.push(newMessage)
return prev;
}

if (prev.room.messages.find((msg) => msg.id === newMessage.id)) {
return prev
}

return Object.assign({}, prev, {
prev = Object.assign({}, prev, {
room: Object.assign({}, prev.room, {
messages: [...prev.room.messages, newMessage],
})
messages: [
...prev.room.messages,
...queuedMessages.filter((queuedMessage) => (
newMessage.id !== queuedMessage.id
&& !prev.room.messages.find((msg) => msg.id === queuedMessage.id)
)),
newMessage,
],
}),
});
queuedMessages = [];
return prev;
},
});

Expand Down Expand Up @@ -88,8 +115,7 @@ export const Room = ({ channel, name }) => {
channel: channel,
name: name,
}
})
} >
})}>
send
</button>
</p>
Expand Down
2 changes: 1 addition & 1 deletion _examples/chat/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
ApolloProvider,
HttpLink,
split,
InMemoryCache,
} from '@apollo/client';
import { InMemoryCache } from 'apollo-cache-inmemory';
import { WebSocketLink as ApolloWebSocketLink} from '@apollo/client/link/ws';
import { getMainDefinition } from 'apollo-utilities';
import { App } from './App';
Expand Down