Merge pull request #119 from BlueBubblesApp/zach/dev

zlshames · web-flow · commit ba2c678aeeb8 · 2020-12-07T09:37:58.000-05:00
v0.1.12
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "0.1.11",
+    "version": "0.1.12",
     "description": "BlueBubbles Server is the app that powers the BlueBubbles Android and Desktop Apps",
     "main": "./dist/main.js",
     "scripts": {
diff --git a/src/main/server/databases/imessage/listeners/incomingMessageListener.ts b/src/main/server/databases/imessage/listeners/incomingMessageListener.ts
@@ -1,6 +1,7 @@
 import { MessageRepository } from "@server/databases/imessage";
 import { Message } from "@server/databases/imessage/entity/Message";
 import { EventCache } from "@server/eventCache";
+import { Server } from "@server/index";
 import { ChangeListener } from "./changeListener";
 import { getCacheName } from "../helpers/utils";
 
@@ -19,20 +20,27 @@ export class IncomingMessageListener extends ChangeListener {
     async getEntries(after: Date, before: Date): Promise<void> {
         // Offset 15 seconds to account for the "Apple" delay
         const offsetDate = new Date(after.getTime() - 15000);
+        const query = [
+            {
+                statement: "message.is_from_me = :fromMe",
+                args: { fromMe: 0 }
+            }
+        ];
+
+        // If SMS support isn't enabled, add the iMessage server specifier
+        const smsSupport = Server().repo.getConfig("sms_support") as boolean;
+        if (!smsSupport) {
+            query.push({
+                statement: "message.service = 'iMessage'",
+                args: null
+            });
+        }
+
         const entries = await this.repo.getMessages({
             after: offsetDate,
             before,
             withChats: true,
-            where: [
-                {
-                    statement: "message.service = 'iMessage'",
-                    args: null
-                },
-                {
-                    statement: "message.is_from_me = :fromMe",
-                    args: { fromMe: 0 }
-                }
-            ]
+            where: query
         });
 
         // Emit the new message
diff --git a/src/main/server/databases/imessage/listeners/outgoingMessageListener.ts b/src/main/server/databases/imessage/listeners/outgoingMessageListener.ts
@@ -145,6 +145,15 @@ export class OutgoingMessageListener extends ChangeListener {
             }
         ];
 
+        // If SMS support is disabled, only search for iMessage
+        const smsSupport = Server().repo.getConfig("sms_support") as boolean;
+        if (!smsSupport) {
+            baseQuery.push({
+                statement: "message.service = 'iMessage'",
+                args: null
+            });
+        }
+
         // First, check for unsent messages
         const newUnsent = await this.repo.getMessages({
             after,
@@ -236,12 +245,24 @@ export class OutgoingMessageListener extends ChangeListener {
     }
 
     async emitUpdatedMessages(after: Date, before: Date) {
+        const baseQuery: DBWhereItem[] = [];
+
+        // If SMS support is disabled, only search for iMessage
+        const smsSupport = Server().repo.getConfig("sms_support") as boolean;
+        if (!smsSupport) {
+            baseQuery.push({
+                statement: "message.service = 'iMessage'",
+                args: null
+            });
+        }
+
         // Get updated entries from myself only
         const entries = await this.repo.getUpdatedMessages({
             after,
             before,
             withChats: true,
             where: [
+                ...baseQuery,
                 {
                     statement: "message.is_from_me = :isFromMe",
                     args: { isFromMe: 1 }
diff --git a/src/main/server/databases/server/constants.ts b/src/main/server/databases/server/constants.ts
@@ -11,5 +11,6 @@ export const DEFAULT_DB_ITEMS: { [key: string]: Function } = {
     encrypt_coms: () => 0,
     hide_dock_icon: () => 0,
     last_fcm_restart: () => 0,
-    start_via_terminal: () => 0
+    start_via_terminal: () => 0,
+    sms_support: () => 0
 };
diff --git a/src/main/server/index.ts b/src/main/server/index.ts
@@ -302,6 +302,8 @@ class BlueBubblesServer {
         } catch (ex) {
             Server().log(`Failed to restart via terminal!\n${ex}`);
         }
+
+        this.log("Finished post-start checks...");
     }
 
     private setDockIcon() {
diff --git a/src/main/server/services/socket/index.ts b/src/main/server/services/socket/index.ts
@@ -88,9 +88,12 @@ export class SocketService {
          * Handle all other data requests
          */
         this.server.on("connection", async socket => {
-            const pass = socket.handshake.query?.password ?? socket.handshake.query?.guid;
+            let pass = socket.handshake.query?.password ?? socket.handshake.query?.guid;
             const cfgPass = (await Server().repo.getConfig("password")) as string;
 
+            // Decode the param incase it contains URL encoded characters
+            pass = decodeURI(pass);
+
             // Basic authentication
             if (pass === cfgPass) {
                 Server().log(`Client Authenticated Successfully`);
diff --git a/src/renderer/components/ViewContainer/PreDashboardView/PreDashboardView.tsx b/src/renderer/components/ViewContainer/PreDashboardView/PreDashboardView.tsx
@@ -11,7 +11,7 @@ import * as React from "react";
 import Dropzone from "react-dropzone";
 import { shell, ipcRenderer } from "electron";
 import { Redirect } from "react-router";
-import { isValidServerConfig, isValidClientConfig } from "@renderer/helpers/utils";
+import { isValidServerConfig, isValidClientConfig, checkFirebaseUrl, invokeMain } from "@renderer/helpers/utils";
 import "./PreDashboardView.css";
 import { Config } from "@server/databases/server/entity";
 
@@ -27,6 +27,7 @@ interface State {
     enableNgrok: boolean;
     showModal: boolean;
     serverUrl: string;
+    smsSupport: boolean;
 }
 
 class PreDashboardView extends React.Component<unknown, State> {
@@ -45,7 +46,8 @@ class PreDashboardView extends React.Component<unknown, State> {
             inputPassword: "",
             enableNgrok: true,
             showModal: false,
-            serverUrl: ""
+            serverUrl: "",
+            smsSupport: false
         };
     }
 
@@ -147,25 +149,29 @@ class PreDashboardView extends React.Component<unknown, State> {
             const binaryStr = reader.result;
             const valid = isValidServerConfig(binaryStr as string);
             const validClient = isValidClientConfig(binaryStr as string);
+            const jsonData = JSON.parse(binaryStr as string);
 
             if (valid) {
-                ipcRenderer.invoke("set-fcm-server", JSON.parse(binaryStr as string));
+                ipcRenderer.invoke("set-fcm-server", jsonData);
                 this.setState({ fcmServer: binaryStr });
             } else if (validClient) {
-                ipcRenderer.invoke("set-fcm-client", JSON.parse(binaryStr as string));
-                this.setState({ fcmClient: binaryStr });
-
-                this.invokeMain("show-dialog", {
-                    type: "warning",
-                    buttons: ["OK"],
-                    title: "BlueBubbles Warning",
-                    message: "We've corrected a mistake you made",
-                    detail:
-                        `The file you chose was for the FCM Client configuration and ` +
-                        `we've saved it as such. Now, please choose the correct server configuration.`
-                });
+                const test = checkFirebaseUrl(jsonData);
+                if (test) {
+                    ipcRenderer.invoke("set-fcm-client", jsonData);
+                    this.setState({ fcmClient: binaryStr });
+
+                    invokeMain("show-dialog", {
+                        type: "warning",
+                        buttons: ["OK"],
+                        title: "BlueBubbles Warning",
+                        message: "We've corrected a mistake you made",
+                        detail:
+                            `The file you chose was for the FCM Client configuration and ` +
+                            `we've saved it as such. Now, please choose the correct server configuration.`
+                    });
+                }
             } else {
-                this.invokeMain("show-dialog", {
+                invokeMain("show-dialog", {
                     type: "error",
                     buttons: ["OK"],
                     title: "BlueBubbles Error",
@@ -178,10 +184,6 @@ class PreDashboardView extends React.Component<unknown, State> {
         reader.readAsText(acceptedFiles[0]);
     };
 
-    async invokeMain(event: string, args: any): Promise<any> {
-        return ipcRenderer.invoke(event, args);
-    }
-
     handleClientFile = (acceptedFiles: any) => {
         const reader = new FileReader();
 
@@ -192,25 +194,19 @@ class PreDashboardView extends React.Component<unknown, State> {
             const binaryStr = reader.result;
             const valid = isValidClientConfig(binaryStr as string);
             const validServer = isValidServerConfig(binaryStr as string);
+            const jsonData = JSON.parse(binaryStr as string);
 
             if (valid) {
-                ipcRenderer.invoke("set-fcm-client", JSON.parse(binaryStr as string));
-                this.setState({ fcmClient: binaryStr });
+                const test = checkFirebaseUrl(jsonData);
+                if (test) {
+                    ipcRenderer.invoke("set-fcm-client", jsonData);
+                    this.setState({ fcmClient: binaryStr });
+                }
             } else if (validServer) {
                 ipcRenderer.invoke("set-fcm-server", JSON.parse(binaryStr as string));
                 this.setState({ fcmServer: binaryStr });
-
-                this.invokeMain("show-dialog", {
-                    type: "warning",
-                    buttons: ["OK"],
-                    title: "BlueBubbles Warning",
-                    message: "We've corrected a mistake you made",
-                    detail:
-                        `The file you chose was for the FCM Server configuration and ` +
-                        `we've saved it as such. Now, please choose the correct client configuration.`
-                });
             } else {
-                this.invokeMain("show-dialog", {
+                invokeMain("show-dialog", {
                     type: "error",
                     buttons: ["OK"],
                     title: "BlueBubbles Error",
@@ -228,7 +224,6 @@ class PreDashboardView extends React.Component<unknown, State> {
     }
 
     completeTutorial() {
-        console.log(this.state);
         ipcRenderer.invoke("toggle-tutorial", true);
         this.setState({ redirect: "/dashboard" });
     }
@@ -237,11 +232,19 @@ class PreDashboardView extends React.Component<unknown, State> {
         this.setState({ [e.target.name]: e.target.value } as any);
     };
 
-    handleNgrokCheckboxChange(e: React.ChangeEvent<HTMLInputElement>) {
-        this.setState({ enableNgrok: e.target.checked });
-        ipcRenderer.invoke("toggle-ngrok", e.target.checked);
-        if (!e.target.checked) {
-            this.setState({ showModal: true });
+    handleCheckboxChange(e: React.ChangeEvent<HTMLInputElement>, stateVar: string) {
+        this.setState({ [stateVar]: e.target.checked } as any);
+
+        if (e.target.id === "toggleNgrok") {
+            ipcRenderer.invoke("toggle-ngrok", e.target.checked);
+
+            if (!e.target.checked) {
+                this.setState({ showModal: true });
+            }
+        } else {
+            ipcRenderer.invoke("set-config", {
+                [e.target.id]: e.target.checked
+            });
         }
     }
 
@@ -358,7 +361,19 @@ class PreDashboardView extends React.Component<unknown, State> {
                                 <input
                                     id="toggleNgrok"
                                     checked={this.state.enableNgrok}
-                                    onChange={e => this.handleNgrokCheckboxChange(e)}
+                                    onChange={e => this.handleCheckboxChange(e, "enableNgrok")}
+                                    type="checkbox"
+                                />
+                                <i />
+                            </div>
+                        </div>
+                        <div id="setNgrokContainer">
+                            <h3>SMS Support (Android Client): </h3>
+                            <div style={{ marginTop: "3px" }}>
+                                <input
+                                    id="sms_support"
+                                    checked={this.state.smsSupport}
+                                    onChange={e => this.handleCheckboxChange(e, "smsSupport")}
                                     type="checkbox"
                                 />
                                 <i />
diff --git a/src/renderer/components/ViewContainer/SettingsView/SettingsView.tsx b/src/renderer/components/ViewContainer/SettingsView/SettingsView.tsx
diff --git a/src/renderer/helpers/utils.ts b/src/renderer/helpers/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bluebubbles-server",`
`3`		`- "version": "0.1.11",`
	`3`	`+ "version": "0.1.12",`
`4`	`4`	`"description": "BlueBubbles Server is the app that powers the BlueBubbles Android and Desktop Apps",`
`5`	`5`	`"main": "./dist/main.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,8 @@ class BlueBubblesServer {`
`302`	`302`	`} catch (ex) {`
`303`	`303`	Server().log(`Failed to restart via terminal!\n${ex}`);
`304`	`304`	`}`
	`305`	`+`
	`306`	`+ this.log("Finished post-start checks...");`
`305`	`307`	`}`
`306`	`308`
`307`	`309`	`private setDockIcon() {`