Merge pull request #514 from BlueBubblesApp/development

v1.7.1
BlueBubblesApp · Apr 15, 2023 · 041d1a0 · 041d1a0
2 parents a16e69a + e2eb39a
commit 041d1a0
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
     "private": true,
     "workspaces": [

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bluebubbles/server",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "main": "./dist/main.js",
     "license": "Apache-2.0",
     "author": {

diff --git a/packages/server/src/server/api/v1/interfaces/attachmentInterface.ts b/packages/server/src/server/api/v1/interfaces/attachmentInterface.ts
@@ -1,9 +1,13 @@
 import { nativeImage } from "electron";
-import { getBlurHash } from "@server/helpers/utils";
-import { FileSystem } from "@server/fileSystem";
 import fs from "fs";
+import { getBlurHash, isEmpty } from "@server/helpers/utils";
+import { FileSystem } from "@server/fileSystem";
+import { Attachment } from "@server/databases/imessage/entity/Attachment";
 
 export class AttachmentInterface {
+
+    static livePhotoExts = ["png", "jpeg", "jpg", "heic", "tiff"];
+
     static async getBlurhash({
         filePath,
         width = null,
@@ -34,4 +38,26 @@ export class AttachmentInterface {
         // Return the name of the attachment
         return name;
     }
+
+    static getLivePhotoPath(attachment: Attachment): string | null {
+        // If we don't have a path, return null
+        const fPath = attachment?.filePath;
+        if (isEmpty(fPath)) return null;
+
+        // Get the extension
+        const ext = fPath.split(".").pop();
+
+        // If the extension is not an image extension, return null
+        if (!AttachmentInterface.livePhotoExts.includes(ext)) return null;
+
+        // Get the path to the live photo by replacing the extension with .mov
+        const livePath = ext !== fPath ? fPath.replace(`.${ext}`, ".mov") : `${fPath}.mov`;
+        const realPath = FileSystem.getRealPath(livePath);
+
+        // If the live photo doesn't exist, return null
+        if (!fs.existsSync(realPath)) return null;
+
+        // If the .mov file exists, return the path
+        return realPath;
+    }
 }
diff --git a/packages/server/src/server/api/v1/serializers/AttachmentSerializer.ts b/packages/server/src/server/api/v1/serializers/AttachmentSerializer.ts
@@ -7,6 +7,7 @@ import { FileSystem } from "@server/fileSystem";
 import { AttachmentResponse } from "@server/types";
 import { DEFAULT_ATTACHMENT_CONFIG } from "./constants";
 import type { AttachmentSerializerMultiParams, AttachmentSerializerSingleParams } from "./types";
+import { AttachmentInterface } from "../interfaces/attachmentInterface";
 
 export class AttachmentSerializer {
     static async serialize({
@@ -105,10 +106,6 @@ export class AttachmentSerializer {
         };
 
         if (!isForNotification) {
-            // Get the path for a possible live photo
-            const ext = fPath.split(".").pop();
-            const livePath = ext !== fPath ? fPath.replace(`.${ext}`, ".mov") : `${fPath}.mov`;
-
             output = {
                 ...output,
                 ...{
@@ -117,7 +114,7 @@ export class AttachmentSerializer {
                     hideAttachment: attachment.hideAttachment,
                     isSticker: attachment.isSticker,
                     originalGuid: attachment.originalGuid,
-                    hasLivePhoto: !fPath.endsWith('.mov') && fs.existsSync(livePath)
+                    hasLivePhoto: !!AttachmentInterface.getLivePhotoPath(attachment)
                 }
             };
         }

diff --git a/packages/server/src/server/index.ts b/packages/server/src/server/index.ts
@@ -963,6 +963,11 @@ class BlueBubblesServer extends EventEmitter {
             }
         }
 
+        // If the password changes, we need to make sure the clients connected to the socket are kicked.
+        if (prevConfig.password !== nextConfig.password) {
+            this.httpService.kickClients();
+        }
+
         this.emitToUI("config-update", nextConfig);
     }
 

diff --git a/packages/server/src/server/services/httpService/api/v1/routers/attachmentRouter.ts b/packages/server/src/server/services/httpService/api/v1/routers/attachmentRouter.ts
@@ -7,7 +7,7 @@ import { Server } from "@server";
 import { generateMd5Hash } from "@server/utils/CryptoUtils";
 import { FileSystem } from "@server/fileSystem";
 import { convertAudio, convertImage } from "@server/databases/imessage/helpers/utils";
-import { isTruthyBool } from "@server/helpers/utils";
+import { isEmpty, isTruthyBool } from "@server/helpers/utils";
 import { AttachmentInterface } from "@server/api/v1/interfaces/attachmentInterface";
 import { FileStream, Success } from "../responses/success";
 import { NotFound, ServerError } from "../responses/errors";
@@ -104,18 +104,16 @@ export class AttachmentRouter {
 
         // Fetch the info for the attachment by GUID
         const attachment = await Server().iMessageRepo.getAttachment(guid);
-        if (!attachment) throw new NotFound({ error: "Attachment does not exist!" });
+        if (!attachment || isEmpty(attachment.filePath)) throw new NotFound({ error: "Attachment does not exist!" });
 
         const aPath = FileSystem.getRealPath(attachment.filePath);
         if (!fs.existsSync(aPath)) throw new NotFound({ error: "Attachment does not exist in disk!" });
 
         // Replace the extension with .mov (if there is one). Otherwise just append .mov
-        const ext = aPath.split(".").pop();
-        const livePath = ext !== aPath ? aPath.replace(`.${ext}`, ".mov") : `${aPath}.mov`;
-        if (aPath.endsWith('.mov') || !fs.existsSync(livePath))
-            throw new NotFound({ error: "Live photo does not exist for this attachment!" });
+        const livePhotoPath = AttachmentInterface.getLivePhotoPath(attachment);
+        if (!livePhotoPath) throw new NotFound({ error: "Live photo does not exist for this attachment!" });
 
-        return new FileStream(ctx, livePath, "video/quicktime").send();
+        return new FileStream(ctx, livePhotoPath, "video/quicktime").send();
     }
 
     static async blurhash(ctx: RouterContext, _: Next) {

diff --git a/packages/server/src/server/services/httpService/index.ts b/packages/server/src/server/services/httpService/index.ts
@@ -113,7 +113,8 @@ export class HttpService {
                 jsonLimit: "100mb",
                 textLimit: "100mb",
                 formLimit: "1000mb",
-                multipart: true
+                multipart: true,
+                parsedMethods: ['POST', 'PUT', 'PATCH', 'DELETE']
             })
         );
 
@@ -251,6 +252,13 @@ export class HttpService {
         });
     }
 
+    kickClients() {
+        if (!this.socketServer) return;
+        this.socketServer.sockets.sockets.forEach(socket => {
+            socket.disconnect();
+        });
+    }
+
     async stop(): Promise<void> {
         Server().log("Stopping HTTP Service...");
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bluebubbles/ui",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "homepage": "./",
   "license": "Apache-2.0",
   "scripts": {

diff --git a/packages/ui/src/app/layouts/settings/connection/ConnectionSettings.tsx b/packages/ui/src/app/layouts/settings/connection/ConnectionSettings.tsx
@@ -68,21 +68,23 @@ export const ConnectionSettings = (): JSX.Element => {
             <LocalPortField />
 
             <Spacer />
-            <Accordion allowMultiple>
-                <AccordionItem>
-                    <AccordionButton>
-                        <Box flex='1' textAlign='left' width="15em">
-                            Advanced Connection Settings
-                        </Box>
-                        <AccordionIcon />
-                    </AccordionButton>
-                    <AccordionPanel pb={4}>
-                        {/* <EncryptCommunicationsField />
-                        <Box m={15} /> */}
-                        {(proxyService === 'dynamic-dns') ? (<UseHttpsField />) : null}
-                    </AccordionPanel>
-                </AccordionItem>
-            </Accordion>
+            {(proxyService === 'dynamic-dns') ? (
+                <Accordion allowMultiple>
+                    <AccordionItem>
+                        <AccordionButton>
+                            <Box flex='1' textAlign='left' width="15em">
+                                Advanced Connection Settings
+                            </Box>
+                            <AccordionIcon />
+                        </AccordionButton>
+                        <AccordionPanel pb={4}>
+                            {/* <EncryptCommunicationsField />
+                            <Box m={15} /> */}
+                            <UseHttpsField />
+                        </AccordionPanel>
+                    </AccordionItem>
+                </Accordion>
+            ) : null}
         </Stack>
     );
 };