Merge pull request berty#3020 from n0izn0iz/fix-medias-eof

fix(messenger): replace EOF checks
sakul-budhathoki · Jan 20, 2021 · 201c7bb · 201c7bb
2 parents a2d17e4 + e046002
commit 201c7bb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/js/packages/components/settings/DevTools.tsx b/js/packages/components/settings/DevTools.tsx
@@ -11,14 +11,15 @@ import { ScreenProps, useNavigation } from '@berty-tech/navigation'
 import * as middleware from '@berty-tech/grpc-bridge/middleware'
 import beapi from '@berty-tech/api'
 import { bridge as rpcBridge } from '@berty-tech/grpc-bridge/rpc'
-import { EOF, Service } from '@berty-tech/grpc-bridge'
+import { Service } from '@berty-tech/grpc-bridge'
 import GoBridge from '@berty-tech/go-bridge'
 import messengerMethodsHooks from '@berty-tech/store/methods'
 import { useAccount, useMsgrContext } from '@berty-tech/store/hooks'
 import { SwipeNavRecognizer } from '../shared-components/SwipeNavRecognizer'
 import { Player } from '@react-native-community/audio-toolkit'
 import { playSound } from '../sounds'
 import { MessengerActions, PersistentOptionsKeys } from '@berty-tech/store/context'
+import Long from 'long'
 
 //
 // DevTools
@@ -81,11 +82,7 @@ const NativeCallButton: React.FC = () => {
 		__DEV__ ? middleware.logger.create('MESSENGER') : null, // eslint-disable-line
 	)
 
-	const messengerClient: any = Service(
-		beapi.messenger.MessengerService,
-		rpcBridge,
-		messengerMiddlewares,
-	)
+	const messengerClient = Service(beapi.messenger.MessengerService, rpcBridge, messengerMiddlewares)
 	const { t } = useTranslation()
 	let i = 0
 	return (
@@ -101,10 +98,10 @@ const NativeCallButton: React.FC = () => {
 				messengerClient
 					.echoTest({
 						echo: `hello number #${n}`,
-						delay: 1000,
+						delay: Long.fromNumber(1000),
 					})
-					.then((stream: any) => {
-						stream.onMessage((res: any) => {
+					.then((stream) => {
+						stream.onMessage((res) => {
 							if (res) {
 								Vibration.vibrate(500)
 							}
@@ -113,8 +110,8 @@ const NativeCallButton: React.FC = () => {
 						setTimeout(stream.stop, 10000)
 						return stream.start()
 					})
-					.catch((err: Error) => {
-						if (err === EOF) {
+					.catch((err) => {
+						if (err?.EOF) {
 							console.info(`end of the EchoTest stream #${n}`)
 						} else if (err) {
 							console.warn(err)

diff --git a/js/packages/components/utils.ts b/js/packages/components/utils.ts
@@ -1,5 +1,4 @@
 import { Buffer } from 'buffer'
-import { EOF } from '@berty-tech/grpc-bridge'
 import { WelshProtocolServiceClient } from '@berty-tech/grpc-bridge/welsh-clients.gen'
 
 let cache: { cid: string; prom: Promise<string> }[] = []
@@ -17,7 +16,7 @@ const fetchSource = async (
 	const data = await new Promise<Buffer>((resolve, reject) => {
 		let buf = Buffer.from('')
 		stream.onMessage((msg, err) => {
-			if (err === EOF) {
+			if (err?.EOF) {
 				resolve(buf)
 				return
 			}

diff --git a/js/packages/store/providerEffects.ts b/js/packages/store/providerEffects.ts
@@ -14,7 +14,7 @@ import beapi from '@berty-tech/api'
 import { reducerAction } from '@berty-tech/store/providerReducer'
 import { ServiceClientType } from '@berty-tech/grpc-bridge/welsh-clients.gen'
 import i18n from '@berty-tech/berty-i18n'
-import { EOF, Service } from '@berty-tech/grpc-bridge'
+import { Service } from '@berty-tech/grpc-bridge'
 import GoBridge, { GoBridgeDefaultOpts, GoBridgeOpts } from '@berty-tech/go-bridge'
 
 import ExternalTransport from './externalTransport'
@@ -298,7 +298,7 @@ export const openingClients = (
 			cancel = () => stream.stop()
 			stream.onMessage((msg, err) => {
 				if (err) {
-					// if (err === EOF) {
+					// if (err.EOF) {
 					// 	return
 					// }
 					// console.warn('events stream onMessage error:', err)
@@ -356,8 +356,8 @@ export const openingClients = (
 			})
 			await stream.start()
 		})
-		.catch((err: Error) => {
-			if (err === EOF) {
+		.catch((err) => {
+			if (err?.EOF) {
 				console.info('end of the events stream')
 				dispatch({ type: MessengerActions.SetStateClosed })
 			} else {

diff --git a/js/packages/store/services.tsx b/js/packages/store/services.tsx
@@ -3,7 +3,7 @@ import { MsgrState } from './context'
 import { Alert } from 'react-native'
 import { useAccount } from './hooks'
 import * as middleware from '@berty-tech/grpc-bridge/middleware'
-import { EOF, Service } from '@berty-tech/grpc-bridge'
+import { Service } from '@berty-tech/grpc-bridge'
 import { bridge as rpcBridge } from '@berty-tech/grpc-bridge/rpc'
 import RNFS from 'react-native-fs'
 import RNFetchBlob from 'rn-fetch-blob'
@@ -187,7 +187,7 @@ export const exportAccountToFile = async () => {
 			})
 		})
 		.catch(async (err) => {
-			if (err === EOF) {
+			if (err?.EOF) {
 			} else {
 				console.warn(err)
 			}