Merge pull request #413 from BlueBubblesApp/development

v1.2.3

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
     "private": true,
     "workspaces": [

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bluebubbles/server",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "main": "./dist/main.js",
     "license": "Apache-2.0",
     "author": {

packages/server/src/server/api/v1/interfaces/chatInterface.ts

@@ -203,7 +203,10 @@ export class ChatInterface {
         }
 
         const chat = chats[0];
-        chat.messages = [sentMessage];
+        if (sentMessage) {
+            chat.messages = [sentMessage];
+        }
+
         return chat;
     }
 

packages/server/src/server/databases/imessage/listeners/outgoingMessageListener.ts

@@ -127,9 +127,8 @@ export class OutgoingMessageListener extends ChangeListener {
 
             // Reject the corresponding promise.
             // This will emit a message send error
-            const success = Server().messageManager.reject("message-send-error", entry);
-            Server().log(
-                `Errored Msg -> ${cacheName} -> ${(entry.text ?? "").substring(0, 25)} -> ${success}`,
+            const success = await Server().messageManager.reject("message-send-error", entry);
+            Server().log(`Errored Msg -> ${cacheName} -> ${entry.contentString()} -> ${success} (Code: ${entry.error})`,
                 "debug"
             );
 

packages/server/src/server/index.ts

@@ -144,8 +144,24 @@ class BlueBubblesServer extends EventEmitter {
     region: string | null;
 
     get hasDiskAccess(): boolean {
-        const status = getAuthStatus("full-disk-access");
-        return status === "authorized";
+        // As long as we've tried to initialize the DB, we know if we do/do not have access.
+        const dbInit: boolean | null = this.iMessageRepo?.db?.isInitialized;
+        if (dbInit != null) return dbInit;
+
+        // If we've never initialized the DB, and just want to detect if we have access,
+        // we can check the permissions using node-mac-permissions. However, default to true,
+        // if the macOS version is under Mojave.
+        let status = true;
+        if (isMinMojave) {
+            const authStatus = getAuthStatus("full-disk-access");
+            if (authStatus === 'authorized') {
+                status = true;
+            } else {
+                this.log(`FullDiskAccess Permission Status: ${authStatus}`, 'debug');
+            }
+        }
+
+        return status;
     }
 
     get hasAccessibilityAccess(): boolean {
@@ -658,7 +674,7 @@ class BlueBubblesServer extends EventEmitter {
         }
 
         // Log if we dont have accessibility access
-        if (this.iMessageRepo?.db) {
+        if (this.hasDiskAccess) {
             this.log("Full-disk access permissions are enabled");
         } else {
             this.log("Full-disk access permissions are required!", "error");
@@ -965,7 +981,7 @@ class BlueBubblesServer extends EventEmitter {
      * we will emit a message to the socket, as well as the FCM server
      */
     private startChatListeners() {
-        if (!this.iMessageRepo?.db) {
+        if (!this.hasDiskAccess) {
             AlertsInterface.create(
                 "info",
                 "Restart the app once 'Full Disk Access' and 'Accessibility' permissions are enabled"

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluebubbles/ui",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "homepage": "./",
   "license": "Apache-2.0",
   "scripts": {