Skip to content

Commit aa7eec1

Browse files
committed
Update NES hook
1 parent 252a2e3 commit aa7eec1

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ import React from 'react'
297297
import { useNes } from '@brightleaf/react-hooks'
298298
export default () => {
299299

300-
const { message, error, connecting, connected } = useNes(
300+
const { messages, error, connecting, connected } = useNes(
301301
'wss://kev-pi.herokuapp.com'
302302
)
303303

@@ -307,11 +307,11 @@ export default () => {
307307
const connectMessage = connecting ? <div>Connecting</div> : <div>Not Connecting</div>
308308
const connectedMessage = connected ? <div>Connected</div> : <div>Not Connected</div>
309309

310-
const messages = message.map((m, index) => <div key={`key-${index}`}>{m}</div>)
310+
const messageList = messages.map((m, index) => <div key={`key-${index}`}>{m}</div>)
311311
return (
312312
<div className="App">
313313
<h1>Messages from Server</h1>
314-
<div>{messages}</div>
314+
<div>{messageList}</div>
315315
<div>
316316
<b>Status Messages</b>
317317
{connectMessage}

src/use-nes.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useEffect, useReducer } from 'react'
22
import Nes from '@hapi/nes/lib/client'
33

44
const reducer = (state, action, ...other) => {
5+
const messages = [].concat(state.messages)
56
switch (action.type) {
67
case 'connecting':
78
return { ...state, connecting: true, connected: false }
@@ -10,12 +11,10 @@ const reducer = (state, action, ...other) => {
1011
case 'disconnected':
1112
return { ...state, connecting: false, connected: false }
1213
case 'message':
13-
const message = [].concat(state.message)
14-
message.push(action.payload.data)
15-
14+
messages.push(action.payload.data)
1615
return {
1716
...state,
18-
message,
17+
messages,
1918
error: null,
2019
connecting: false,
2120
}
@@ -29,9 +28,9 @@ const reducer = (state, action, ...other) => {
2928
return state
3029
}
3130
}
32-
const useNes = (url = 'ws://localhost:4567', subscribe = true) => {
31+
const useNes = (url = 'ws://localhost:4567', subscribe) => {
3332
const [state, dispatch] = useReducer(reducer, {
34-
message: [],
33+
messages: [],
3534
error: null,
3635
connecting: true,
3736
connected: false,
@@ -41,8 +40,8 @@ const useNes = (url = 'ws://localhost:4567', subscribe = true) => {
4140
useEffect(() => {
4241
const connectClient = async () => {
4342
dispatch({ type: 'connecting', payload: {} })
44-
return new Promise(async (resolve, reject) => {
45-
client.onConnect = update => {
43+
return new Promise(async resolve => {
44+
client.onConnect = () => {
4645
dispatch({ type: 'connected' })
4746
return resolve()
4847
}
@@ -58,7 +57,7 @@ const useNes = (url = 'ws://localhost:4567', subscribe = true) => {
5857
}
5958

6059
if (subscribe) {
61-
client.subscribe(url, update => {
60+
client.subscribe(subscribe, update => {
6261
dispatch({ type: 'message', payload: { data: update } })
6362
return resolve()
6463
})

working/hooks/nes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useNes, useTitle } from '@brightleaf/react-hooks'
33
export default () => {
44
useTitle('useNes example from @brightleaf/react-hooks')
55

6-
const { message, error, connecting, connected, client } = useNes(
6+
const { messages, error, connecting, connected, client } = useNes(
77
'wss://kev-pi.herokuapp.com'
88
)
99

@@ -24,7 +24,7 @@ export default () => {
2424
) : (
2525
<div className="alert alert-danger">Not Connected</div>
2626
)
27-
const messages = message.map((m, index) => (
27+
const messageList = messages.map((m, index) => (
2828
<div
2929
className={`mar-0 pad-b-xs ${
3030
index % 2 ? 'text-secondary' : 'text-primary'
@@ -37,7 +37,7 @@ export default () => {
3737
return (
3838
<div className="App content">
3939
<h2>Messages from Server</h2>
40-
<div>{messages}</div>
40+
<div>{messageList}</div>
4141
<div className="pad-t-md mar-t-md">
4242
<div
4343
className="button"

0 commit comments

Comments
 (0)