Merge pull request #433 from BlueBubblesApp/development

v1.4.0

macos/database/samples/ventura/attachment.sql

@@ -0,0 +1,26 @@
+CREATE TABLE attachment (
+    ROWID INTEGER PRIMARY KEY AUTOINCREMENT,
+    guid TEXT UNIQUE NOT NULL,
+    created_date INTEGER DEFAULT 0,
+    start_date INTEGER DEFAULT 0,
+    filename TEXT,
+    uti TEXT,
+    mime_type TEXT,
+    transfer_state INTEGER DEFAULT 0,
+    is_outgoing INTEGER DEFAULT 0,
+    user_info BLOB,
+    transfer_name TEXT,
+    total_bytes INTEGER DEFAULT 0,
+    is_sticker INTEGER DEFAULT 0,
+    sticker_user_info BLOB,
+    attribution_info BLOB,
+    hide_attachment INTEGER DEFAULT 0,
+    ck_sync_state INTEGER DEFAULT 0,
+    ck_server_change_token_blob BLOB,
+    ck_record_id TEXT,
+    original_guid TEXT UNIQUE NOT NULL,
+    sr_ck_sync_state INTEGER DEFAULT 0,
+    sr_ck_server_change_token_blob BLOB,
+    sr_ck_record_id TEXT,
+    is_commsafety_sensitive INTEGER DEFAULT 0
+)

macos/database/samples/ventura/chat.sql

@@ -0,0 +1,31 @@
+CREATE TABLE chat (
+    ROWID INTEGER PRIMARY KEY AUTOINCREMENT,
+    guid TEXT UNIQUE NOT NULL,
+    style INTEGER,
+    state INTEGER,
+    account_id TEXT,
+    properties BLOB,
+    chat_identifier TEXT,
+    service_name TEXT,
+    room_name TEXT,
+    account_login TEXT,
+    is_archived INTEGER DEFAULT 0,
+    last_addressed_handle TEXT,
+    display_name TEXT,
+    group_id TEXT,
+    is_filtered INTEGER,
+    successful_query INTEGER,
+    engram_id TEXT,
+    server_change_token TEXT,
+    ck_sync_state INTEGER DEFAULT 0,
+    original_group_id TEXT,
+    last_read_message_timestamp INTEGER DEFAULT 0,
+    sr_server_change_token TEXT,
+    sr_ck_sync_state INTEGER DEFAULT 0,
+    cloudkit_record_id TEXT,
+    sr_cloudkit_record_id TEXT,
+    last_addressed_sim_id TEXT,
+    is_blackholed INTEGER DEFAULT 0,
+    syndication_date INTEGER DEFAULT 0,
+    syndication_type INTEGER DEFAULT 0
+)

macos/database/samples/ventura/handle.sql

@@ -0,0 +1,9 @@
+CREATE TABLE handle (
+    ROWID INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
+    id TEXT NOT NULL,
+    country TEXT,
+    service TEXT NOT NULL,
+    uncanonicalized_id TEXT,
+    person_centric_id TEXT,
+    UNIQUE (id, service)
+)

macos/database/samples/ventura/message.sql

@@ -0,0 +1,84 @@
+CREATE TABLE message (
+    ROWID INTEGER PRIMARY KEY AUTOINCREMENT,
+    guid TEXT UNIQUE NOT NULL,
+    text TEXT,
+    replace INTEGER DEFAULT 0,
+    service_center TEXT,
+    handle_id INTEGER DEFAULT 0,
+    subject TEXT,
+    country TEXT,
+    attributedBody BLOB,
+    version INTEGER DEFAULT 0,
+    type INTEGER DEFAULT 0,
+    service TEXT,
+    account TEXT,
+    account_guid TEXT,
+    error INTEGER DEFAULT 0,
+    date INTEGER,
+    date_read INTEGER,
+    date_delivered INTEGER,
+    is_delivered INTEGER DEFAULT 0,
+    is_finished INTEGER DEFAULT 0,
+    is_emote INTEGER DEFAULT 0,
+    is_from_me INTEGER DEFAULT 0,
+    is_empty INTEGER DEFAULT 0,
+    is_delayed INTEGER DEFAULT 0,
+    is_auto_reply INTEGER DEFAULT 0,
+    is_prepared INTEGER DEFAULT 0,
+    is_read INTEGER DEFAULT 0,
+    is_system_message INTEGER DEFAULT 0,
+    is_sent INTEGER DEFAULT 0,
+    has_dd_results INTEGER DEFAULT 0,
+    is_service_message INTEGER DEFAULT 0,
+    is_forward INTEGER DEFAULT 0,
+    was_downgraded INTEGER DEFAULT 0,
+    is_archive INTEGER DEFAULT 0,
+    cache_has_attachments INTEGER DEFAULT 0,
+    cache_roomnames TEXT,
+    was_data_detected INTEGER DEFAULT 0,
+    was_deduplicated INTEGER DEFAULT 0,
+    is_audio_message INTEGER DEFAULT 0,
+    is_played INTEGER DEFAULT 0,
+    date_played INTEGER,
+    item_type INTEGER DEFAULT 0,
+    other_handle INTEGER DEFAULT 0,
+    group_title TEXT,
+    group_action_type INTEGER DEFAULT 0,
+    share_status INTEGER DEFAULT 0,
+    share_direction INTEGER DEFAULT 0,
+    is_expirable INTEGER DEFAULT 0,
+    expire_state INTEGER DEFAULT 0,
+    message_action_type INTEGER DEFAULT 0,
+    message_source INTEGER DEFAULT 0,
+    associated_message_guid TEXT,
+    associated_message_type INTEGER DEFAULT 0,
+    balloon_bundle_id TEXT,
+    payload_data BLOB,
+    expressive_send_style_id TEXT,
+    associated_message_range_location INTEGER DEFAULT 0,
+    associated_message_range_length INTEGER DEFAULT 0,
+    time_expressive_send_played INTEGER,
+    message_summary_info BLOB,
+    ck_sync_state INTEGER DEFAULT 0,
+    ck_record_id TEXT,
+    ck_record_change_tag TEXT,
+    destination_caller_id TEXT,
+    sr_ck_sync_state INTEGER DEFAULT 0,
+    sr_ck_record_id TEXT,
+    sr_ck_record_change_tag TEXT,
+    is_corrupt INTEGER DEFAULT 0,
+    reply_to_guid TEXT,
+    sort_id INTEGER,
+    is_spam INTEGER DEFAULT 0,
+    has_unseen_mention INTEGER DEFAULT 0,
+    thread_originator_guid TEXT DEFAULT NULL,
+    thread_originator_part TEXT DEFAULT NULL,
+    syndication_ranges TEXT DEFAULT NULL,
+    was_delivered_quietly INTEGER DEFAULT 0,
+    did_notify_recipient INTEGER DEFAULT 0,
+    synced_syndication_ranges TEXT DEFAULT NULL,
+    date_retracted INTEGER DEFAULT 0,
+    date_edited INTEGER DEFAULT 0,
+    was_detonated INTEGER DEFAULT 0,
+    part_count INTEGER
+)

package.json

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

packages/server/appResources/macos/daemons/cloudflared.md5

@@ -1 +1 @@
-103dce48075ee6127391f9e98ec81613
+9634641719401486f332668480e92582

packages/server/appResources/private-api/README.md

@@ -4,6 +4,6 @@ The `macosXbundle.md5` files within this directory contain a single string that
 
 `find -s /path/to/private/api/folder/BlueBubblesHelper.bundle -type f -exec md5 {} \; | md5`
 
-**GitHub Release Reference**: https://github.com/BlueBubblesApp/BlueBubbles-Server-Helper/releases/tag/0.0.6
+**GitHub Release Reference**: https://github.com/BlueBubblesApp/BlueBubbles-Server-Helper/releases/tag/0.0.7
 
 You can also check the current versions of these bundles by opening the `version.txt` file.

packages/server/appResources/private-api/macos10/BlueBubblesHelper.bundle/Contents/Info.plist

@@ -17,15 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

packages/server/appResources/private-api/macos10bundle.md5

@@ -1 +1 @@
-27135516ee78f28bf217ce3971595a5a
+fda8b29c5cb50e02534284ba8722ecbd

packages/server/appResources/private-api/macos11/BlueBubblesHelper.bundle/Contents/Info.plist

@@ -17,15 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

packages/server/appResources/private-api/macos11bundle.md5

@@ -1 +1 @@
-045ca94bd19577a0fc40c099e6d7072c
+07556d32c978a0d3aa75e6b9aea0f80c

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

@@ -1 +1 @@
-0.0.6
+0.0.7

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bluebubbles/server",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "main": "./dist/main.js",
     "license": "Apache-2.0",
     "author": {
@@ -9,9 +9,8 @@
     },
     "description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
     "scripts": {
-        "build-objc": "cd ./src/objcHelper && clang -mmacosx-version-min=10.11 -framework Foundation bluebubbles_objc_helper.m -o ../../appResources/bluebubblesObjcHelper && cd ../../",
-        "build": "export NODE_ENV=production && npm run build-objc && webpack --config ./scripts/webpack.main.prod.config.js",
-        "start": "export NODE_ENV=development && npm run build-objc && webpack --config ./scripts/webpack.main.config.js && electron ./dist/main.js",
+        "build": "export NODE_ENV=production && webpack --config ./scripts/webpack.main.prod.config.js",
+        "start": "export NODE_ENV=development && webpack --config ./scripts/webpack.main.config.js && electron ./dist/main.js",
         "lint": "eslint --ext=jsx,js,tsx,ts src",
         "dist": "electron-rebuild -f -o better-sqlite3 && npm run build && electron-builder build --mac --publish never --config ./scripts/electron-builder-config.js",
         "postinstall": "electron-rebuild install-app-deps"
@@ -92,7 +91,7 @@
         "electron-log": "^4.4.7",
         "electron-updater": "^4.5.2",
         "find-process": "^1.4.4",
-        "firebase-admin": "^11.0.1",
+        "firebase-admin": "^11.1.0",
         "google-libphonenumber": "^3.2.10",
         "koa": "^2.13.1",
         "koa-body": "^4.2.0",
@@ -107,6 +106,7 @@
         "node-forge": "^1.3.1",
         "node-mac-contacts": "^1.6.0",
         "node-mac-permissions": "^2.2.1",
+        "node-typedstream": "^1.4.0",
         "numeral": "^2.0.6",
         "plist": "^3.0.6",
         "read-chunk": "^3.2.0",

packages/server/src/main.ts

@@ -7,6 +7,8 @@ import { FileSystem } from "@server/fileSystem";
 import { Server } from "@server";
 import { isEmpty, safeTrim } from "@server/helpers/utils";
 
+app.commandLine.appendSwitch('in-process-gpu');
+
 // Patch in original user data directory
 app.setPath('userData', app.getPath('userData').replace('@bluebubbles/server', 'bluebubbles-server'));
 
@@ -37,9 +39,6 @@ if (!gotTheLock) {
 }
 
 process.on("uncaughtException", error => {
-    // These are typically errors from the Swift Helper
-    if (error?.message === 'write EPIPE') return;
-
     // Print the exception
     Server().log(`Uncaught Exception: ${error.message}`, "error");
     if (error?.stack) Server().log(`Uncaught Exception StackTrace: ${error?.stack}`, 'debug');