2.3.0: Fixed errors with attachments

Author: Bjornskjald

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "libfb",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Facebook MQTT library for Node.js",
   "repository": "https://github.com/ChatPlug/libfb-js",
   "main": "dist/index.js",
@@ -25,28 +25,28 @@
     "node-fetch": "^2.6.0",
     "strict-event-emitter-types": "^2.0.0",
     "thrift": "^0.12.0",
-    "tslib": "^1.9.3"
+    "tslib": "^1.10.0"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/debug": "^4.1.4",
     "@types/long": "^4.0.0",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^12.0.4",
-    "@types/node-fetch": "^2.3.4",
+    "@types/node": "^12.0.10",
+    "@types/node-fetch": "^2.3.7",
     "@types/node-int64": "^0.4.29",
     "@types/thrift": "^0.10.8",
     "chai": "^4.2.0",
-    "console-stamp": "^0.2.7",
+    "console-stamp": "^0.2.9",
     "mocha": "^6.1.4",
     "shx": "^0.3.2",
-    "ts-node": "^8.2.0",
-    "tslint": "^5.17.0",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.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.5.1"
+    "typescript": "^3.5.2"
   },
   "license": "MIT"
 }

package.json

@@ -3,4 +3,4 @@ export default interface Attachment {
 }
 export * from './attachments/XMAAttachment'
 export * from './attachments/FileAttachment'
-export { default as parseAttachment } from './attachments/parseAttachment'
+export { default as parseAttachments } from './attachments/parseAttachments'

src/types/Attachment.ts

@@ -26,6 +26,7 @@ export interface XMAAttachment extends Attachment {
 export interface UnavailableXMA extends XMAAttachment {
   type: 'UnavailableXMA'
   message: string
+  attach: any
 }
 export interface StoryXMA extends XMAAttachment {
   type: 'StoryXMA'

src/types/attachments/XMAAttachment.ts

@@ -0,0 +1,26 @@
+import parseFileAttachment from './parseFileAttachment'
+import parseBlobAttachment from './parseBlobAttachment'
+import parseXMAAttachment from './parseXMAAttachment'
+import { FileAttachment, XMAAttachment } from '../Attachment'
+
+interface Attachments {
+  fileAttachments: FileAttachment[],
+  mediaAttachments: XMAAttachment[]
+}
+
+export default function parseAttachments (attachments: any[]): Attachments {
+  const result: Attachments = {
+    fileAttachments: [],
+    mediaAttachments: []
+  }
+  for (let attachment of attachments) {
+    if (attachment.mimeType) result.fileAttachments.push(parseFileAttachment(attachment))
+    if (attachment.mimetype) result.fileAttachments.push(parseBlobAttachment(attachment))
+    if (attachment.xmaGraphQL) result.mediaAttachments.push(parseXMAAttachment(JSON.parse(attachment.xmaGraphQL)))
+    result.mediaAttachments.push({
+      type: 'Unknown',
+      ...attachment
+    })
+  }
+  return result
+}

src/types/attachments/parseAttachment.ts

@@ -11,10 +11,11 @@ import vm from 'vm'
 
 export default function parseXMAAttachment (attach: any) {
   attach = attach[Object.keys(attach)[0]].story_attachment
-  if (!attach.target) {
+  if (!attach.target || !attach.target.__type__) {
     return {
       type: 'UnavailableXMA',
-      message: attach.description.text
+      message: attach.description.text,
+      attach
     } as UnavailableXMA
   }
   const type = attach.target.__type__.name

src/types/attachments/parseAttachments.ts

@@ -1,10 +1,10 @@
-import { parseAttachment } from '../Attachment'
+import { parseAttachments } from '../Attachment'
 import Message, { Mention } from '../Message'
 
 export default function parseDeltaMessage (delta: any) {
   return {
     threadId: getThreadId(delta),
-    attachments: delta.attachments ? delta.attachments.map(parseAttachment) : [],
+    attachments: delta.attachments ? parseAttachments(delta.attachments) : [],
     authorId: delta.messageMetadata.actorFbId,
     id: delta.messageMetadata.messageId,
     timestamp: delta.messageMetadata.timestamp,