Merge pull request #619 from BlueBubblesApp/development

v1.9.5

macos/database/samples/big-sur/CallHistoryDB/ZCALLDBPROPERTIES.sql

@@ -0,0 +1,10 @@
+CREATE TABLE ZCALLDBPROPERTIES (
+    Z_PK INTEGER PRIMARY KEY,
+    Z_ENT INTEGER,
+    Z_OPT INTEGER,
+    ZTIMER_ALL FLOAT,
+    ZTIMER_INCOMING FLOAT,
+    ZTIMER_LAST FLOAT,
+    ZTIMER_LIFETIME FLOAT,
+    ZTIMER_OUTGOING FLOAT
+)

macos/database/samples/big-sur/CallHistoryDB/ZCALLRECORD.sql

@@ -0,0 +1,27 @@
+CREATE TABLE ZCALLRECORD (
+    Z_PK INTEGER PRIMARY KEY,
+    Z_ENT INTEGER,
+    Z_OPT INTEGER,
+    ZANSWERED INTEGER,
+    ZCALL_CATEGORY INTEGER,
+    ZCALLTYPE INTEGER,
+    ZDISCONNECTED_CAUSE INTEGER,
+    ZFACE_TIME_DATA INTEGER,
+    ZFILTERED_OUT_REASON INTEGER,
+    ZHANDLE_TYPE INTEGER,
+    ZJUNKCONFIDENCE INTEGER,
+    ZNUMBER_AVAILABILITY INTEGER,
+    ZORIGINATED INTEGER,
+    ZREAD INTEGER,
+    ZVERIFICATIONSTATUS INTEGER,
+    ZDATE TIMESTAMP,
+    ZDURATION FLOAT,
+    ZISO_COUNTRY_CODE VARCHAR,
+    ZLOCATION VARCHAR,
+    ZNAME VARCHAR,
+    ZSERVICE_PROVIDER VARCHAR,
+    ZUNIQUE_ID VARCHAR,
+    ZLOCALPARTICIPANTUUID BLOB,
+    ZOUTGOINGLOCALPARTICIPANTUUID BLOB,
+    ZADDRESS BLOB
+)

macos/database/samples/big-sur/CallHistoryDB/ZHANDLE.sql

@@ -0,0 +1,8 @@
+CREATE TABLE ZHANDLE (
+    Z_PK INTEGER PRIMARY KEY,
+    Z_ENT INTEGER,
+    Z_OPT INTEGER,
+    ZTYPE INTEGER,
+    ZNORMALIZEDVALUE VARCHAR,
+    ZVALUE BLOB
+)

macos/database/samples/big-sur/CallHistoryDB/Z_2REMOTEPARTICIPANTHANDLES.sql

@@ -0,0 +1,8 @@
+CREATE TABLE Z_2REMOTEPARTICIPANTHANDLES (
+    Z_2REMOTEPARTICIPANTCALLS INTEGER,
+    Z_3REMOTEPARTICIPANTHANDLES INTEGER,
+    PRIMARY KEY (
+        Z_2REMOTEPARTICIPANTCALLS,
+        Z_3REMOTEPARTICIPANTHANDLES
+    )
+)

macos/database/samples/big-sur/CallHistoryDB/Z_METADATA.sql

@@ -0,0 +1,5 @@
+CREATE TABLE Z_METADATA (
+    Z_VERSION INTEGER PRIMARY KEY,
+    Z_UUID VARCHAR(255),
+    Z_PLIST BLOB
+)

macos/database/samples/big-sur/CallHistoryDB/Z_MODELCACHE.sql

@@ -0,0 +1 @@
+CREATE TABLE Z_MODELCACHE (Z_CONTENT BLOB)

macos/database/samples/big-sur/CallHistoryDB/Z_PRIMARYKEY.sql

@@ -0,0 +1,6 @@
+CREATE TABLE Z_PRIMARYKEY (
+    Z_ENT INTEGER PRIMARY KEY,
+    Z_NAME VARCHAR,
+    Z_SUPER INTEGER,
+    Z_MAX INTEGER
+)

package.json

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

packages/server/appResources/private-api/macos11/BlueBubblesHelper.dylib.md5

@@ -1 +1 @@
-7c5f6f04d0d178ffbf2a1ce623b65370
+49d31742bc468cb5287413a7c0cf13c7

packages/server/appResources/private-api/version.txt

@@ -1 +1 @@
-0.0.18
+0.0.19

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bluebubbles/server",
-    "version": "1.9.4",
+    "version": "1.9.5",
     "main": "./dist/main.js",
     "license": "Apache-2.0",
     "author": {
@@ -54,6 +54,7 @@
         "@types/node-forge": "^1.0.4",
         "@types/numeral": "^0.0.26",
         "@types/plist": "^3.0.2",
+        "@types/uuid": "^9.0.8",
         "@types/validatorjs": "^3.15.0",
         "@types/vcf": "^2.0.3",
         "@types/webpack-env": "^1.15.1",
@@ -83,6 +84,7 @@
         "@firebase/app-types": "^0.9.0",
         "@firebase/util": "^1.9.3",
         "@peculiar/x509": "^1.6.1",
+        "async-sema": "^3.1.1",
         "axios": "^0.25.0",
         "better-sqlite3": "^8.0.1",
         "blurhash": "^1.1.3",
@@ -119,6 +121,7 @@
         "slugify": "^1.6.0",
         "socket.io": "3.1.2",
         "typeorm": "0.3.6",
+        "uuid": "^9.0.1",
         "validatorjs": "^3.22.1",
         "vcf": "^2.1.1",
         "zx": "^4.3.0"

packages/server/src/server/api/http/api/v1/httpRoutes.ts

@@ -36,6 +36,7 @@ import { ScheduledMessageValidator } from "./validators/scheduledMessageValidato
 import { ScheduledMessageRouter } from "./routers/scheduledMessageRouter";
 import { ThemeValidator } from "./validators/themeValidator";
 import type { Context, Next } from "koa";
+import { FindMyRouter } from "./routers/findmyRouter";
 
 export class HttpRoutes {
     static version = 1;
@@ -110,23 +111,23 @@ export class HttpRoutes {
                     {
                         method: HttpMethod.GET,
                         path: "findmy/devices",
-                        controller: iCloudRouter.devices
+                        controller: FindMyRouter.devices
                     },
                     {
                         method: HttpMethod.POST,
                         path: "findmy/devices/refresh",
-                        controller: iCloudRouter.refreshDevices
+                        controller: FindMyRouter.refreshDevices
                     },
                     {
                         method: HttpMethod.GET,
                         path: "findmy/friends",
                         middleware: [...HttpRoutes.protected, PrivateApiMiddleware],
-                        controller: iCloudRouter.friends
+                        controller: FindMyRouter.friends
                     },
                     {
                         method: HttpMethod.POST,
                         path: "findmy/friends/refresh",
-                        controller: iCloudRouter.refreshFriends
+                        controller: FindMyRouter.refreshFriends
                     }
                 ]
             },

packages/server/src/server/api/http/api/v1/routers/findmyRouter.ts

@@ -0,0 +1,58 @@
+import { Next } from "koa";
+import { RouterContext } from "koa-router";
+import { Success } from "../responses/success";
+import { ServerError } from "../responses/errors";
+import { FindMyInterface } from "@server/api/interfaces/findMyInterface";
+
+export class FindMyRouter {
+    static async refreshDevices(ctx: RouterContext, _: Next) {
+        try {
+            await FindMyInterface.refreshDevices();
+            return new Success(ctx, { message: "Successfully refreshed Find My device locations!" }).send();
+        } catch (ex: any) {
+            throw new ServerError({
+                message: "Failed to refresh Find My device locations!",
+                error: ex?.message ?? ex.toString()
+            });
+        }
+    }
+
+    static async refreshFriends(ctx: RouterContext, _: Next) {
+        try {
+            const locations = await FindMyInterface.refreshFriends();
+            return new Success(ctx, {
+                message: "Successfully refreshed Find My friends locations!",
+                data: locations
+            }).send();
+        } catch (ex: any) {
+            throw new ServerError({
+                message: "Failed to refresh Find My friends locations!",
+                error: ex?.message ?? ex.toString()
+            });
+        }
+    }
+
+    static async devices(ctx: RouterContext, _: Next) {
+        try {
+            const data = await FindMyInterface.getDevices();
+            return new Success(ctx, { message: "Successfully fetched Find My device locations!", data }).send();
+        } catch (ex: any) {
+            throw new ServerError({
+                message: "Failed to fetch Find My device locations!",
+                error: ex?.message ?? ex.toString()
+            });
+        }
+    }
+
+    static async friends(ctx: RouterContext, _: Next) {
+        try {
+            const data: any = await FindMyInterface.getFriends();
+            return new Success(ctx, { message: "Successfully fetched Find My friends locations!", data }).send();
+        } catch (ex: any) {
+            throw new ServerError({
+                message: "Failed to fetch Find My friends locations!",
+                error: ex?.message ?? ex.toString()
+            });
+        }
+    }
+}

packages/server/src/server/api/http/api/v1/routers/icloudRouter.ts

@@ -2,52 +2,9 @@ import { Next } from "koa";
 import { RouterContext } from "koa-router";
 import { Success } from "../responses/success";
 import { ServerError } from "../responses/errors";
-import { FindMyService } from "@server/services/findMyService";
 import { iCloudInterface } from "@server/api/interfaces/iCloudInterface";
-import { findMyInterface } from "@server/api/interfaces/findMyInterface";
 
 export class iCloudRouter {
-    static async refreshDevices(ctx: RouterContext, _: Next) {
-        try {
-            const data = await FindMyService.refreshDevices();
-            return new Success(ctx, { message: "Successfully refreshed Find My device locations!", data }).send();
-        } catch (ex: any) {
-            throw new ServerError(
-                { message: "Failed to refresh Find My device locations!", error: ex?.message ?? ex.toString() });
-        }
-    }
-
-    static async refreshFriends(ctx: RouterContext, _: Next) {
-        try {
-            await FindMyService.refreshFriends();
-            const data = findMyInterface.getFriends();
-            return new Success(ctx, { message: "Successfully refreshed Find My friends locations!", data }).send();
-        } catch (ex: any) {
-            throw new ServerError(
-                { message: "Failed to refresh Find My friends locations!", error: ex?.message ?? ex.toString() });
-        }
-    }
-
-    static async devices(ctx: RouterContext, _: Next) {
-        try {
-            const data = await FindMyService.getDevices();
-            return new Success(ctx, { message: "Successfully fetched Find My device locations!", data }).send();
-        } catch (ex: any) {
-            throw new ServerError(
-                { message: "Failed to fetch Find My device locations!", error: ex?.message ?? ex.toString() });
-        }
-    }
-
-    static async friends(ctx: RouterContext, _: Next) {
-        try {
-            const data: any = await findMyInterface.getFriends();
-            return new Success(ctx, { message: "Successfully fetched Find My friends locations!", data }).send();
-        } catch (ex: any) {
-            throw new ServerError(
-                { message: "Failed to fetch Find My friends locations!", error: ex?.message ?? ex.toString() });
-        }
-    }
-
     static async getAccountInfo(ctx: RouterContext, _: Next) {
         try {
             const data: any = await iCloudInterface.getAccountInfo();

packages/server/src/server/api/interfaces/contactInterface.ts

@@ -153,8 +153,8 @@ export class ContactInterface {
 
         // Also load the thumbnail if the image is requested.
         // The regular thumbnail will take precedence over the contactImageThumbnail
-        if (extraProps.includes('contactImage') && !extraProps.includes('contactThumbnailImage')) {
-            extraProps.push('contactThumbnailImage');
+        if (extraProps.includes("contactImage") && !extraProps.includes("contactThumbnailImage")) {
+            extraProps.push("contactThumbnailImage");
         }
 
         return ContactInterface.mapContacts(ContactsLib.getAllContacts(extraProps), "api", { extraProps });
@@ -471,18 +471,13 @@ export class ContactInterface {
         const parsed = vcf.parse(content);
         const output: Contact[] = [];
         for (const contact of parsed) {
-            const nameParts = contact
-                .get("n")
-                .valueOf()
-                .toString()
-                .split(";")
-                .reverse()
-                .filter(e => e && e.length > 0);
+            const nameParts = contact.get("n").valueOf().toString().split(";");
             if (nameParts.length === 0) continue;
 
             const params: any = {
-                firstName: nameParts[0],
-                lastName: nameParts.length > 1 ? nameParts.slice(1).join(" ") : ""
+                // If a first name isn't provided, use the middle name
+                firstName: nameParts[1] ?? nameParts[2] ?? "",
+                lastName: nameParts[0] ?? ""
             };
 
             if (contact.get("tel")) {