Version 0.6.1; mainly bug fixes + heif support

Author: itsjunetime

README.md

@@ -72,6 +72,7 @@ The source code may be updated past the latest released version, so don't be sur
 If there are any issues, questions, or feature requests at all, don't hesitate to create an issue or pull request here, or email me at [email protected]. I will not run into all issues that could possibly come up, so I would really appreciate any issues you let me know about.
 
 ### Acknowledged issues:
+- Read receipts don't update until you reload a conversation. This is being worked on.
 - Although typing indicators do appear when the other party starts typing, they don't always disappear when they stop typing. This is also being worked on.
 
 ### To file an issue:

docs/Changelog.md

@@ -1,7 +1,13 @@
 # Changelog
 0.6.0 → 0.6.1
+ - Added support for heic/heif images embedded in browser
+ - May have actually fixed duplicating text issue
+ - Fixed issue that would prevent loss of information when database was locked (mostly manifested in missing profile pictures)
  - Fixed issue that would offset sender names in `printListOfTexts` when `append` was false
  - Fixed font-weight display issues
+ - Fixed issue that would incorrectly display texts that contained both attachments and a body or subject
+ - Fixed issue that would prevent you from typing in the subject box
+ - Fixed issue that would prevent sender name from appearing when you received a new text in a group chat
 
 0.5.4 → 0.6.0
  - Made a new build script which makes it __much__ easier and faster to build SMServer from scratch

docs/Settings.md

@@ -32,20 +32,29 @@ This is the port that the webSocket runs on; must not be the same as the server
 ### Theme
 This setting sets the color theme of the web interface; Dark is the default. It is much more polished, and, I think, looks much better than the light theme, but I did make a light theme as well for easy access. As of version 0.3.8, a `Nord` theme is also available (my favorite).
 
-### Toggle debug
-This will log basically every thing that happens, and may slow down the server considerably. Unless you're actually debugging or logging with the app, I'd highly recommend leaving this off. This does not require a server restart to take effect.
+### Enable subject line
+This will show a subject field as well as a body field in the text interface, allowing you to send texts with subject as well as with bodies. You do not need to enable this option to use subjects in the API, however.
+
+### Send typing indicators
+When this is toggled on, typing indicators will be sent to the other party in the conversation whenever you are currently typing in the web interface.
+
+### Automatically mark as read
+If this is toggled, whenever you view a conversation on the web interface (more specifically, whenever you use the API to request the messages to and from one conversation, and `offset` is 0), that conversation is marked as read on your device as well.
 
 ### Requre Authentication to view messages:
 Toggling this on will prevent anyone from querying the host if they have not already authenticated with the main page. I'd highly recommend leaving it on; without it, anyone can send and view texts from your device without restriction.
 
+### Merge contact addresses (experimental)
+When this is off, messages to and from each individual address are treated as separate conversations. However, when this is toggled on, conversations are grouped by contact, as opposed to by address.
+
+### Toggle debug
+This will log basically every thing that happens, and may slow down the server considerably. Unless you're actually debugging or logging with the app, I'd highly recommend leaving this off. This does not require a server restart to take effect.
+
 ### Enable backgrounding
 Toggling this on will prevent the server from shutting off when the app goes into the background, given that the server is already running. Even if this is on, though, the server will shut down when the app is forcibly killed from the multitasking screen. This does not require anything to take effect, simply a toggle.
 
 ### Enable SSL
 Toggling this will require you to connect to the `https://` site, instead of the `http://` site. It also encrypts everything sent to your phone for the server, preventing anyone from listening in on your messages.
 
-### Mark conversations as read when viewed on web interface
-This should be fairly self explanatory; if this is toggled, whenever you view a conversation on the web interface, it is marked as read on your device as well.
-
-### Override `No Wifi` prevention setting on main interface
+### Allow operation off of Wifi
 A user reported an issue with the server refusing to start due to thinking that the phone was not connected to wifi, so this allows you to override the section of the app that prevents you from starting the server if it is not connected to wifi.

docs/WebSocket.md

@@ -5,7 +5,7 @@ As of 0.2.0+debug2, the server supports websockets. This is, as of 0.5.0, used t
 ## Messages to client from host
 
 ### `text`
-Every time that the host reeives a new text, a message with the prefix `text` is sent to all connected devices. The content of this message is a JSON message with a key of `text` that describes all the necessary parameters of the most recent text that you just received. For example, if you just got sent a text that simply said 'Hello!' from the number '+11231231234', this message would look something like:
+Every time that the host receives a new text or sends a text through SMServer, a message with the prefix `text` is sent to all connected devices. The content of this message is a JSON message with a key of `text` that describes all the necessary parameters of the most recent text that you just received or sent. For example, if you just got sent a text that simply said 'Hello!' from the number '+11231231234', this message would look something like:
 ```json
 text:{ "text": {  "ROWID" : "150000",  "subject" : "",  "chat_identifier" : "+11231231234",  "balloon_bundle_id" : "",  "is_from_me" : "0",  "service" : "iMessage",  "guid" : "3FCF9CC7-FFF3-4172-82FD-773F9A3CC89A",  "text" : "Hello!",  "date_read" : "0",  "date" : "626981115265999744",  "cache_has_attachments" : "0",  "handle_id" : "100",  "associated_message_type" : "0",  "associated_message_guid" : ""}}
 ```

package/deb/DEBIAN/control

@@ -1,7 +1,7 @@
 Package: com.ianwelker.smserver
 Depends: com.janshai.libsmserver | com.twickd.ian-welker.libsmserver
 Name: SMServer
-Version: 0.6.0
+Version: 0.6.1
 Architecture: iphoneos-arm
 Description: Send texts from your browser!
 Maintainer: Ian Welker <[email protected]>

src/SMServer.xcworkspace/xcuserdata/ian.xcuserdatad/UserInterfaceState.xcuserstate

@@ -39,6 +39,8 @@ final class ChatDelegate {
 			return db
 		}
 
+		sqlite3_busy_timeout(db, 20)
+
 		self.log("opened database")
 
 		/// Return pointer to the database
@@ -76,14 +78,15 @@ final class ChatDelegate {
 
 		self.log("opened statement")
 
+		var main_return = [[String:String]]()
+
 		/// Prepare the database for querying $sqlString
 		if sqlite3_prepare_v2(db, sqlString, -1, &statement, nil) != SQLITE_OK {
 			let errmsg = String(cString: sqlite3_errmsg(db)!)
 			self.log("WARNING: error preparing select: \(errmsg)", warning: true)
+			return main_return
 		}
 
-		var main_return = [[String:String]]()
-
 		var i = 0
 		/// for each row, up to num_items rows
 		while sqlite3_step(statement) == SQLITE_ROW && (i < num_items || num_items <= 0) {
@@ -220,12 +223,12 @@ final class ChatDelegate {
 		var messages = [[String:String]]()
 		var from_string: String = ""
 		var fixed_num = num
-		
+
 		if num.contains(",") {
 			/// So that you can merge multiple conversations
 			fixed_num = num.split(separator: ",").joined(separator: "\" or chat_identifier is \"")
 		}
-		
+
 		if from != 0 {
 			from_string = " and \(is_group ? "m." : "")is_from_me is \(from == 1 ? 1 : 0)"
 		}
@@ -257,7 +260,7 @@ final class ChatDelegate {
 				let name = getDisplayNameWithDb(sms_db: db, contact_db: contact_db, chat_id: messages[i]["id"] ?? "")
 				messages[i]["sender"] = name
 			}
-			
+
 			if messages[i]["payload_data"]?.count ?? 0 > 0 && messages[i]["ROWID"] != nil {
 				messages[i]["balloon_bundle_id"] = "com.apple.messages.URLBalloonProvider"
 				let link_info = getLinkInfo(messages[i]["ROWID"]!, db: db)
@@ -395,7 +398,6 @@ final class ChatDelegate {
 			}
 
 			new_chat["chat_identifier"] = i["c.chat_identifier"]
-			new_chat["send_to"] = i["c.chat_identifier"]
 			new_chat["time_marker"] = i["m.date"]
 			new_chat["pinned"] = "false"
 
@@ -482,7 +484,6 @@ final class ChatDelegate {
 
 		/// Use default profile if you don't have them in your contacts
 		if docid.count == 0 {
-
 			let image_dat = UIImage(named: "profile")
 			let pngdata = (image_dat?.pngData())!
 
@@ -500,6 +501,11 @@ final class ChatDelegate {
 		if sqlite3_prepare_v2(image_db, sqlString, -1, &statement, nil) != SQLITE_OK {
 			let errmsg = String(cString: sqlite3_errmsg(image_db)!)
 			self.log("WARNING: error preparing select: \(errmsg)", warning: true)
+
+			let image_dat = UIImage(named: "profile")
+			let pngdata = (image_dat?.pngData())!
+
+			return pngdata
 		}
 
 		var pngdata: Data
@@ -597,9 +603,14 @@ final class ChatDelegate {
 		let parsed_path = path.replacingOccurrences(of: "../", with: "") /// To prevent LFI
 
 		do {
-			/// Pretty strsightforward -- get data and return it
-			let attachment_data = try Data.init(contentsOf: URL(fileURLWithPath: ChatDelegate.imageStoragePrefix + parsed_path))
-			return attachment_data
+			/// Pretty straightforward -- get data and return it
+			if (getAttachmentType(path: parsed_path) == "image/heic") { /// Since they're used so much
+				let attachment_data = UIImage(contentsOfFile: ChatDelegate.imageStoragePrefix + parsed_path)
+				return attachment_data?.jpegData(compressionQuality: 0) ?? Data.init(capacity: 0)
+			} else {
+				let attachment_data = try Data.init(contentsOf: URL(fileURLWithPath: ChatDelegate.imageStoragePrefix + parsed_path))
+				return attachment_data
+			}
 		} catch {
 			self.log("WARNING: failed to load image for path \(ChatDelegate.imageStoragePrefix + path)", warning: true)
 			return Data.init(capacity: 0)
@@ -805,7 +816,24 @@ final class ChatDelegate {
 
 		if db == nil || contact_db == nil { return [String:String]() }
 
-		var text = selectFromSql(db: db, columns: ["m.ROWID", "m.guid", "m.text", "m.subject", "m.is_from_me", "m.date", "m.service", "m.cache_has_attachments", "m.handle_id", "m.balloon_bundle_id", "m.associated_message_guid", "m.associated_message_type", "h.id", "c.chat_identifier", "c.room_name"], table: "message m", condition: "left join handle h on h.ROWID = m.handle_id inner join chat_message_join j on j.message_id = m.ROWID inner join chat c on j.chat_id = c.ROWID where m.guid is \"\(guid)\"", num_items: 1, offset: 0, split_ids: true)[0]
+		var text_array = selectFromSql(db: db, columns: ["m.ROWID", "m.guid", "m.text", "m.subject", "m.is_from_me", "m.date", "m.service", "m.cache_has_attachments", "m.handle_id", "m.balloon_bundle_id", "m.associated_message_guid", "m.associated_message_type", "h.id", "c.chat_identifier", "c.room_name"], table: "message m", condition: "left join handle h on h.ROWID = m.handle_id inner join chat_message_join j on j.message_id = m.ROWID inner join chat c on j.chat_id = c.ROWID where m.guid is \"\(guid)\"", num_items: 1, offset: 0, split_ids: true)
+
+		var total = 0;
+		let begin = 50000;
+		let max = begin * 5
+
+		while text_array.count == 0 && total <= max {
+			usleep(useconds_t(begin))  /// I hate race conditions so much but I have no idea how to avoid it for this
+			total += begin
+
+			text_array = selectFromSql(db: db, columns: ["m.ROWID", "m.guid", "m.text", "m.subject", "m.is_from_me", "m.date", "m.service", "m.cache_has_attachments", "m.handle_id", "m.balloon_bundle_id", "m.associated_message_guid", "m.associated_message_type", "h.id", "c.chat_identifier", "c.room_name"], table: "message m", condition: "left join handle h on h.ROWID = m.handle_id inner join chat_message_join j on j.message_id = m.ROWID inner join chat c on j.chat_id = c.ROWID where m.guid is \"\(guid)\"", num_items: 1, offset: 0, split_ids: true)
+		}
+
+		guard text_array.count > 0 else {
+			return [String:String]()
+		}
+
+		var text = text_array[0]
 
 		if text["cache_has_attachments"] == "1" && text["ROWID"] != nil {
 			let a = getAttachmentFromMessage(mid: text["ROWID"] ?? "") /// get list of attachments
@@ -820,7 +848,7 @@ final class ChatDelegate {
 		}
 
 		if text["room_name"]?.count ?? 0 > 0 && text["is_from_me"] == "0" {
-			let name = getDisplayNameWithDb(sms_db: db, contact_db: contact_db, chat_id: text["handle_id"] ?? "")
+			let name = getDisplayNameWithDb(sms_db: db, contact_db: contact_db, chat_id: text["id"] ?? "")
 			text["sender"] = name
 		}
 

src/SMServer/ChatDelegate.swift

@@ -23,7 +23,7 @@ struct ContentView: View {
 	@State var secure: Bool = UserDefaults.standard.object(forKey: "is_secure") as? Bool ?? true
 	@State var override_no_wifi: Bool = UserDefaults.standard.object(forKey: "override_no_wifi") as? Bool ?? false
 	@State var background: Bool = UserDefaults.standard.object(forKey: "enable_backgrounding") as? Bool ?? true
-	
+
 	@State var mark_when_read: Bool = true
 	@State var view_settings: Bool = false
 	@State var server_running: Bool = false
@@ -106,7 +106,7 @@ struct ContentView: View {
 			res.send(self.checkIfAuthenticated(ras: ip) ? self.main_page : self.gatekeeper_page)
 		}
 
-		server.add("/requests") { (req, res, next) in
+		server.add("/requests") { (req, res, _) in
 			/// There is no authentication handler here 'cause it handles that within parseAndReturn()
 			/// since they send the password auth request to this subdirectory
 			/// This handler is part of the API, and returns JSON info.
@@ -330,7 +330,7 @@ struct ContentView: View {
 		let default_num_messages = UserDefaults.standard.object(forKey: "num_messages") as? Int ?? 100
 		let default_num_chats = UserDefaults.standard.object(forKey: "num_chats") as? Int ?? 40
 		let default_num_photos = UserDefaults.standard.object(forKey: "num_photos") as? Int ?? 40
-		
+
 		let subjects_enabled = UserDefaults.standard.object(forKey: "subjects_enabled") as? Bool ?? false
 		let light_theme = UserDefaults.standard.object(forKey: "light_theme") as? Bool ?? false
 		let nord_theme = UserDefaults.standard.object(forKey: "nord_theme") as? Bool ?? false
@@ -375,6 +375,8 @@ struct ContentView: View {
 
 	func setNewestTexts(_ guid: String) {
 		/// Is called when you receive a new text; Tells the socket to send a notification to all connected that you received a new text
+		guard server.isListening && socket.server?.webSockets.count ?? 0 > 0 else { return }
+
 		let text = ContentView.chat_delegate.getTextByGUID(guid);
 		let json = encodeToJson(object: text, title: "text")
 
@@ -609,7 +611,6 @@ struct ContentView: View {
 					HStack {
 						Button(action: {
 							self.loadFiles()
-							//ContentView.sender.launchMobileSMS()
 							ContentView.chat_delegate.refreshVars()
 							self.socket.refreshVars()
 						}) {

src/SMServer/ContentView.swift

@@ -44,8 +44,11 @@
 				prefix = "http://192.168.0.180:8741";
 				num_texts_to_load = 100;
 				num_chats_to_load = 60;
+				num_photos_to_load = 40;
 				socket_port = 8740;
 				socket_address = prefix.split("/")[2].split(":")[0];
+				debug = true;
+				subject = false;
 			}
 
 			function timeConverter(t, ts_only = false, apple = true, rev = false) {
@@ -400,6 +403,8 @@
 					var ft = fts.length === undefined ? [fts] : fts;
 					if (ft.length === 0) continue;
 
+					if (!append) ft.reverse();
+
 					var ld = i > 0 ? texts[i-1].date : 0;
 					var notLast = false;
 					var n = append ? i+1 : i-1;
@@ -424,6 +429,8 @@
 								et[et.length-1].classList.add("notLast");
 							else if (texts[i].date - et[et.length-1].getAttribute("date") >= 3600000000000)
 								append_time_display = true;
+							else if (is_group && !sameSender)
+								sender_box.innerText = texts[i].sender;
 						} else {
 							var hourTillFirst = texts[i].date - et[0].getAttribute("date") >= 3600000000000;
 							if (!hourTillFirst) document.getElementsByClassName("time-display")[0].outerHTML = "";
@@ -452,7 +459,7 @@
 
 					for (var j = 0; j < ft.length; j++) {
 						if (ft[j].innerHTML === undefined || ft[j].innerHTML === "") continue;
-						if (notLast || j < ft.length - 1) ft[j].classList.add("notLast");
+						if (notLast || (append && j < ft.length - 1) || (!append && j > 0)) ft[j].classList.add("notLast");
 						if (append) tc.appendChild(ft[j]);
 						else tc.insertBefore(ft[j], document.getElementById("moretextsbutton").nextSibling);
 					}
@@ -505,7 +512,7 @@
 					var lt = undefined;
 
 					for (var i = et.length - 1; i >= 0 && lt === undefined; i--)
-						if (et[i].className.includes("from_me") && et[i].className.includes("iMessage") && et[i].getAttribute("date_read") !== "0")
+						if (et[i].className.includes("from_me") && et[i].className.includes("iMessage") && et[i].getAttribute("date_read") !== "0" && et[i].getAttribute("date_read") !== "undefined")
 							lt = et[i];
 
 					if (lt !== undefined) {
@@ -736,17 +743,6 @@
 					photos.value = "";
 
 					autoGrow();
-
-					var seg = 6000; /// kinda arbitrary
-					var at_sleep = 400;
-					var sleep_time = 250;
-					if (has_attachments)
-						await sleep(Math.max((total_size / seg), at_sleep));
-					else
-						await sleep(sleep_time);
-
-					getLatestText(1, current_chat_id, true);
-					setChatAsTop(current_chat_id, oldval);
 				}
 			}
 
@@ -875,14 +871,16 @@
 
 				var name = await getTextFromURL(`${prefix}/requests?name=${chat}`);
 
-				if (notif_text.text.replace(//g, "").trim() === "" && notif_text.cache_has_attachments === "1")
-					new_text = `Attachment: ${notif_text.attachment_type.split(":")[0]}`
+				if (notif_text.is_from_me === "0") {
+					if (notif_text.text.replace(//g, "").trim() === "" && notif_text.cache_has_attachments === "1")
+						new_text = `Attachment: ${notif_text.attachment_type.split(":")[0]}`
 
-				if (notif_text.sender !== undefined && notif_text.sender !== "nil")
-					new_text = `${notif_text.sender}: ${new_text}`;
+					if (notif_text.sender !== undefined && notif_text.sender !== "nil")
+						new_text = `${notif_text.sender}: ${new_text}`;
 
-				if (window.Notification && Notification.permission === "granted" && (!document.hasFocus() || chat !== current_chat_id))
-					var n = new Notification(name, { body: new_text, icon: "/favicon.ico"});
+					if (window.Notification && Notification.permission === "granted" && (!document.hasFocus() || chat !== current_chat_id))
+						var n = new Notification(name, { body: new_text, icon: "/favicon.ico"});
+				}
 
 				if (chat.length !== 0) {
 					if (btn === undefined || btn === null || chat === "any") {
@@ -1159,7 +1157,7 @@
 				sbox.id = "subjectBox";
 				sbox.setAttribute("name", "subject");
 				sbox.setAttribute("oninput", "if (event.keyCode !== 13) inputKeyDown(true);");
-				sbox.setAttribute("onkeydown", "if (event.keyCode === 13) document.getElementById('sendbox').focus(); event.preventDefault();");
+				sbox.setAttribute("onkeydown", "if (event.keyCode === 13) { document.getElementById('sendbox').focus(); event.preventDefault(); }");
 				sbox.setAttribute("form", tbox.getAttribute("form"));
 				sbox.setAttribute("placeholder", "Subject");
 

src/SMServer/html/chats.html

@@ -1,7 +1,7 @@
 :root {
 	--text-box-gradient: linear-gradient(to bottom right, #a6a6a6, #989898);
 	--body-background: #fff;
-	--font-color: #111;
+	--font-color: #353535;
 	--main-background: #f0f0f0;
 	--chats-border: #ccc;
 	--light-button-background: #ccc;