2.1.1: Fixed compile errors

Author: Bjornskjald

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "libfb",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Facebook MQTT library for Node.js",
   "repository": "https://github.com/ChatPlug/libfb-js",
   "main": "dist/index.js",
@@ -17,37 +17,36 @@
     "Bjornskjald <github@bjorn.ml>"
   ],
   "dependencies": {
-    "@types/long": "^4.0.0",
     "buffer-hexdump": "^1.0.0",
     "debug": "^4.1.1",
     "length-stream": "^0.1.1",
     "long": "^4.0.0",
     "mime-types": "^2.1.24",
-    "node-fetch": "^2.5.0",
+    "node-fetch": "^2.6.0",
     "strict-event-emitter-types": "^2.0.0",
     "thrift": "^0.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@types/long": "^4.0.0",
     "@types/chai": "^4.1.7",
     "@types/debug": "^4.1.4",
-    "@types/mocha": "^5.2.6",
-    "@types/node": "^12.0.0",
-    "@types/node-fetch": "^2.3.3",
+    "@types/long": "^4.0.0",
+    "@types/mocha": "^5.2.7",
+    "@types/node": "^12.0.4",
+    "@types/node-fetch": "^2.3.4",
     "@types/node-int64": "^0.4.29",
     "@types/thrift": "^0.10.8",
     "chai": "^4.2.0",
     "console-stamp": "^0.2.7",
     "mocha": "^6.1.4",
     "shx": "^0.3.2",
-    "ts-node": "^8.1.0",
-    "tslint": "^5.16.0",
+    "ts-node": "^8.2.0",
+    "tslint": "^5.17.0",
     "tslint-config-standard": "^8.0.1",
     "typedoc": "^0.14.2",
     "typedoc-plugin-as-member-of": "^1.0.2",
     "typedoc-plugin-sourcefile-url": "^1.0.4",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "license": "MIT"
 }

package.json

@@ -9,8 +9,7 @@ import User, { parseUser } from './types/User'
 import debug from 'debug'
 import { Readable } from 'stream'
 import { PublishPacket } from './mqtt/messages/Publish'
-import Message, { MessageOptions, parseThreadMessage } from './types/Message'
-import parseDeltaMessage from './types/message/parseDeltaMessage'
+import Message, { MessageOptions, parseThreadMessage, parseDeltaMessage } from './types/Message'
 import parseDeltaEvent from './types/events/parseDeltaEvent'
 import EventEmitter from 'events'
 import { AttachmentNotFoundError, AttachmentURLMissingError } from './types/Errors'

src/Client.ts

@@ -1,11 +1,10 @@
+export { default as Message, MessageOptions, Mention } from './types/Message'
 export { default as Client, ClientOptions } from './Client'
 export { default as Attachment } from './types/Attachment'
 export { default as AuthTokens } from './types/AuthTokens'
 export { default as DeviceId } from './types/DeviceId'
-export { default as Message } from './types/Message'
 export { default as Session } from './types/Session'
 export { default as Thread } from './types/Thread'
 export { default as User } from './types/User'
 export * from './types/Attachment'
 export * from './types/Events'
-export * from './types/Message'

src/index.ts

@@ -1,6 +1,6 @@
 import Payload from './Payload'
 import { Thrift, TCompactProtocol, Int64 } from 'thrift'
-import Message from '../../types/message'
+import Message from '../../types/Message'
 import RandomIntGenerator from '../../RandomIntGenerator'
 import Long from 'long'
 

src/mqtt/payloads/ReadReceiptPayload.ts

@@ -18,5 +18,5 @@ export interface Mention {
 export interface MessageOptions {
   mentions?: Mention[]
 }
-export { default as parseDeltaMessage } from './message/parseDeltaMessage'
+export { default as parseDeltaMessage, getThreadId } from './message/parseDeltaMessage'
 export { default as parseThreadMessage } from './message/parseThreadMessage'

src/types/Message.ts

@@ -10,7 +10,7 @@ import {
     EventType
 } from '../Events'
 import parseAdminMessage from './parseAdminMessage'
-import { getThreadId } from '../message/parseDeltaMessage'
+import { getThreadId } from '../Message'
 
 export default function parseDeltaEvent (event: any): { type: EventType, event: Event } {
   if (event.deltaAdminTextMessage) return parseAdminMessage(event.deltaAdminTextMessage)