v2.0.0 rewrite

example/echo.js

@@ -0,0 +1,7 @@
+var imessage = require('..')
+
+imessage.listen().on('message', (msg) => {
+    if (!msg.fromMe) {
+        imessage.send(msg.handle, msg.text)
+    }
+})

example/log.js

@@ -0,0 +1,5 @@
+var imessage = require('..')
+
+imessage.listen().on('message', (msg) => {
+    console.log(msg)
+})

index.js

@@ -1,57 +1,141 @@
-var fs = require('fs');
-var osa = require('osa');
-var spawn = require('child_process').spawn;
-
-var EventEmitter = require("events").EventEmitter;
-var LineStream = require('byline').LineStream;
-
-var PHONE_REGEX = /^\+\d{3,}$/;
-var EMAIL_REGEX = /^\S+@\S+$/;
-
-var parse = function(input) {
-    if(typeof(input) == 'undefined')
-        return '';
-    else if(typeof(input) == 'object')
-        return input;
-    else if(input.match(PHONE_REGEX) || input.match(EMAIL_REGEX))
-        return { handle: input };
-    else
-        return { name: input };
-    return '';
-};
-
-var iMessage = {};
-
-iMessage.send = function(message, to, cb) {
-    var recipient = parse(to);
-    cb = cb || function(){};
-
-    osa(function(message, recipient) {
-        var Messages = Application('Messages');
-        recipient = Messages.buddies.whose(recipient)[0];
-
-        Messages.send(message, { to: recipient });
-
-        return {
-            name:   recipient.name(),
-            handle: recipient.handle()
-        };
-    }, message, recipient, cb);
-};
-
-iMessage.getContact = function(input, cb) {
-    var search = parse(input);
-    cb = cb || function(){};
-
-    osa(function(search) {
-        var Messages = Application('Messages');
-        found = Messages.buddies.whose(search)[0];
-
-        return {
-            name:   found.name(),
-            handle: found.handle()
-        };
-    }, search, cb);
-};
-
-module.exports = iMessage;
+var fs = require('fs')
+var osa = require('osa2')
+var ol = require('one-liner')
+var assert = require('assert')
+
+var versions = require('./macos_versions')
+var currentVersion = require('macos-version')()
+
+if (versions.broken.includes(currentVersion)) {
+    console.error(ol(
+        `This version of macOS \(${currentVersion}) is known to be
+         incompatible with osa-imessage. Please upgrade either
+         macOS or osa-imessage.`
+    ))
+    process.exit(1)
+}
+
+if (!versions.working.includes(currentVersion)) {
+    console.warn(ol(
+        `This version of macOS \(${currentVersion}) is currently
+         untested with this version of osa-imessage. Proceed with
+         caution.`
+    ))
+}
+
+// Instead of doing something reasonable, Apple stores dates as the number of
+// seconds since 01-01-2001 00:00:00 GMT. DATE_OFFSET is the offset in seconds
+// between their epoch and unix time
+var DATE_OFFSET = 978307200
+
+// Gets the current Apple-style timestamp
+function appleTimeNow() {
+    return Math.floor(Date.now() / 1000) - DATE_OFFSET
+}
+
+// Transforms an Apple-style timestamp to a proper unix timestamp
+function fromAppleTime(at) {
+    if (at == 0) {
+        return null
+    }
+    return new Date((at + DATE_OFFSET) * 1000)
+}
+
+// Attempt to require in optional dep sqlite with a more helpful error message
+function requireSqlite() {
+    try {
+        return require('sqlite3')
+    } catch (e) {
+        throw new Error('sqlite3 optional dependency required to receive messages')
+    }
+}
+
+// Gets the proper handle string for a contact with the given name
+function handleForName(name) {
+    assert(typeof name == 'string', 'name must be a string')
+    return osa((name) => {
+        var Messages = Application('Messages')
+        return Messages.buddies.whose({ name: name })[0].handle()
+    })(name)
+}
+
+// Sends a message to the given handle
+function send(handle, message) {
+    assert(typeof handle  == 'string', 'handle must be a string')
+    assert(typeof message == 'string', 'message must be a string')
+    return osa((handle, message) => {
+        var Messages = Application('Messages')
+        var buddy = Messages.buddies.whose({ handle: handle })[0]
+        Messages.send(message, { to: buddy })
+    })(handle, message)
+}
+
+var emitter = null
+var guids = []
+function listen() {
+    // If listen has already been run, return the existing emitter
+    if (emitter != null) {
+        return emitter
+    }
+
+    // Create an EventEmitter
+    var emitter = new (require('events').EventEmitter)()
+
+    // Set up the database
+    var sqlite = requireSqlite()
+    var db = new sqlite.Database(
+        process.env.HOME + '/Library/Messages/chat.db',
+        sqlite.OPEN_READONLY
+    )
+
+    var last = appleTimeNow()
+    var bail = false
+
+    function check() {
+        var query = `
+            SELECT guid, id as handle, text, date, date_read, is_from_me
+            FROM message
+            JOIN handle ON message.handle_id = handle.ROWID
+            WHERE date >= ${last}
+        `
+
+        last = appleTimeNow()
+
+        db.each(query, (err, row) => {
+            if (err) {
+                bail = true
+                emitter.emit('error', err)
+                console.error([
+                    'sqlite3 returned an error while polling for new message!',
+                    'bailing out of poll routine for safety. new messages will',
+                    'not be detected'
+                ].join('\n'))
+            }
+
+            if (guids.indexOf(row.guid) != -1) {
+                return
+            } else {
+                guids.push(row.guid)
+            }
+
+            emitter.emit('message', {
+                guid: row.guid,
+                text: row.text,
+                handle: row.handle,
+                fromMe: !!row.is_from_me,
+                date: fromAppleTime(row.date),
+                dateRead: fromAppleTime(row.date_read)
+            })
+        }, () => {
+            if (bail) return
+            setTimeout(check , 1000)
+        })
+
+    }
+
+    check()
+
+    return emitter
+}
+
+module.exports = { send, listen, handleForName }

macos_versions.json

@@ -0,0 +1,7 @@
+{
+    "working": [
+        "10.12.5"
+    ],
+    "broken": [
+    ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osa-imessage",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "description": "Bring the power of NodeJS to Apple iMessage",
   "author": {
     "name": "Will Franzen",
@@ -13,20 +13,26 @@
     "url": "https://github.com/wtfaremyinitials/osa-imessage.git"
   },
   "main": "index.js",
+  "keywords": [
+    "messages",
+    "osx",
+    "yosemite",
+    "jxa",
+    "osa",
+    "imessage",
+    "sms",
+    "send",
+    "receive"
+  ],
+  "engines": {
+    "node": ">=6.4"
+  },
   "dependencies": {
-    "byline": "^4.1.1",
-    "node-uuid": "^1.4.1",
-    "osa": "^2.0.1"
-   },
-   "keywords": [
-       "messages",
-       "osx",
-       "yosemite",
-       "jxa",
-       "osa",
-       "imessage",
-       "sms",
-       "send",
-       "receive"
-   ]
+    "macos-version": "^4.0.0",
+    "one-liner": "^1.0.3",
+    "osa2": "^0.0.0"
+  },
+  "optionalDependencies": {
+    "sqlite3": "^3.1.8"
+  }
 }