Merge pull request #101 from BlueBubblesApp/zach/dev

Zach/dev
BlueBubblesApp · Nov 23, 2020 · 4038baa · 4038baa
2 parents 37a9a15 + 57b34b9
commit 4038baa
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "0.1.9",
+    "version": "0.1.10",
     "description": "",
     "main": "./dist/main.js",
     "scripts": {

diff --git a/src/main/server/helpers/actions.ts b/src/main/server/helpers/actions.ts
@@ -72,6 +72,8 @@ export class ActionHandler {
                     )
                 );
             } catch (ex) {
+                Server().log(ex);
+
                 // If it's not a timeout failure, throw the error
                 if (!((ex?.message ?? "") as string).includes("AppleEvent timed out")) {
                     throw ex;

diff --git a/src/main/server/services/queue/index.ts b/src/main/server/services/queue/index.ts
@@ -1,3 +1,4 @@
+import { FileSystem } from "@server/fileSystem";
 import { ActionHandler } from "@server/helpers/actions";
 import { Server } from "@server/index";
 
@@ -7,7 +8,7 @@ export type QueueItem = {
 };
 
 export class QueueService {
-    items: QueueItem[];
+    items: QueueItem[] = [];
 
     isProcessing = false;
 
@@ -30,10 +31,26 @@ export class QueueService {
 
         // Handle the event
         try {
+            Server().log(`Handling queue item, '${item.type}'`);
             switch (item.type) {
                 case "open-chat":
                     await ActionHandler.openChat(item.data);
                     break;
+                case "send-attachment":
+                    await ActionHandler.sendMessage(
+                        item.data.tempGuid,
+                        item.data.chatGuid,
+                        item.data.message,
+                        item.data.attachmentGuid,
+                        item.data.attachmentName,
+                        item.data.chunks
+                    );
+
+                    // After 60 seconds, delete the attachment chunks
+                    setTimeout(() => {
+                        FileSystem.deleteChunks(item.data.attachmentGuid);
+                    }, 60000);
+                    break;
                 default:
                     Server().log(`Unhandled queue item type: ${item.type}`, "warn");
             }

diff --git a/src/main/server/services/socket/index.ts b/src/main/server/services/socket/index.ts
@@ -29,7 +29,7 @@ import { getAttachmentResponse } from "@server/databases/imessage/entity/Attachm
 import { DBMessageParams } from "@server/databases/imessage/types";
 import { Queue } from "@server/databases/server/entity/Queue";
 import { ActionHandler } from "@server/helpers/actions";
-import { QueueItem } from "@server/services/queue";
+import { QueueItem } from "@server/services/queue/index";
 
 const osVersion = macosVersion();
 
@@ -524,21 +524,19 @@ export class SocketService {
 
                 // If there are no more chunks, compile, save, and send
                 if (!hasMore) {
-                    try {
-                        await ActionHandler.sendMessage(
+                    Server().queue.add({
+                        type: "send-attachment",
+                        data: {
                             tempGuid,
                             chatGuid,
                             message,
                             attachmentGuid,
-                            params?.attachmentName,
-                            attachmentGuid ? FileSystem.buildAttachmentChunks(attachmentGuid) : null
-                        );
-
-                        FileSystem.deleteChunks(attachmentGuid);
-                        return response(cb, "message-sent", createSuccessResponse(null));
-                    } catch (ex) {
-                        return response(cb, "send-message-chunk-error", createServerErrorResponse(ex.message));
-                    }
+                            attachmentName: params?.attachmentName,
+                            chunks: attachmentGuid ? FileSystem.buildAttachmentChunks(attachmentGuid) : null
+                        }
+                    });
+
+                    return response(cb, "message-sent", createSuccessResponse(null));
                 }
 
                 return response(cb, "message-chunk-saved", createSuccessResponse(null));