Removed unnecessary imports, fixed code style

justandras · May 30, 2019 · 659ffb4 · 659ffb4
1 parent 1ea0729
commit 659ffb4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/src/mqtt/MqttApi.ts b/src/mqtt/MqttApi.ts
@@ -16,7 +16,7 @@ import MqttPacket from './MqttPacket'
 import { MqttMessageFlag } from './MqttTypes'
 import debug from 'debug'
 import RandomIntGenerator from '../RandomIntGenerator'
-import { MessageOptions } from '../types/Message'
+import { MessageOptions } from '..'
 
 const debugLog = debug('fblib')
 

diff --git a/src/mqtt/messages/Connect.ts b/src/mqtt/messages/Connect.ts
@@ -1,11 +1,10 @@
-import { TBufferedTransport, TCompactProtocol, Thrift } from 'thrift'
 import * as zlib from 'zlib'
 import AuthTokens from '../../types/AuthTokens'
 import DeviceId from '../../types/DeviceId'
 import MqttMessage from '../MqttMessage'
-import { MqttConnectFlag, MqttMessageFlag } from '../MqttTypes'
-import { MessageType } from './MessageTypes'
+import { MqttConnectFlag } from '../MqttTypes'
 import * as Payloads from '../payloads'
+import { MessageType } from './MessageTypes'
 
 const USER_AGENT =
     'Facebook plugin / LIBFB-JS / [FBAN/Orca-Android;FBAV/148.0.0.5.83;FBPN/com.facebook.orca;FBLC/en_US;FBBV/26040814]'
@@ -18,20 +17,16 @@ export const encodeConnectMessage = async (
     deviceId: DeviceId
 ): Promise<MqttMessage> => {
   const payload = new Payloads.Connect(deviceId, tokens, USER_AGENT)
-
-  const message = new MqttMessage()
   const flags =
-        MqttConnectFlag.User |
-        MqttConnectFlag.Pass |
-        MqttConnectFlag.Clr |
-        MqttConnectFlag.QoS1
-  message.writeString('MQTToT')
-  message.writeU8(3)
-  message.writeU8(flags)
-  message.writeU16(60) // KEEP ALIVE
-  message.writeRaw(zlib.deflateSync(await Payloads.encodePayload(payload)))
-  message.flags = 0
-  message.type = FacebookMessageType.Connect
-
-  return message
+    MqttConnectFlag.User |
+    MqttConnectFlag.Pass |
+    MqttConnectFlag.Clr |
+    MqttConnectFlag.QoS1
+  return new MqttMessage(MessageType.Connect)
+    .setFlags(MqttConnectFlag.QoS0)
+    .writeString('MQTToT')
+    .writeU8(3)
+    .writeU8(flags)
+    .writeU16(60) // KEEP ALIVE
+    .writeRaw(zlib.deflateSync(await Payloads.encodePayload(payload)))
 }
diff --git a/src/mqtt/payloads/Payload.ts b/src/mqtt/payloads/Payload.ts
@@ -1,4 +1,4 @@
-import { Thrift, TCompactProtocol, TBufferedTransport } from 'thrift'
+import { TCompactProtocol, TBufferedTransport } from 'thrift'
 
 export default abstract class Payload {
  /**