X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMsn%2Fmsnmanager.php;h=a8996ecafadf5eb80d8b45ccfabba0238d4fca6e;hb=3a3a53dfcc6582f637205bc9fb897d5152ca80b1;hp=daafced3b4033af9613f5ab2525191121d5c2174;hpb=82f44c5fa0507211d78ef1ef535a81bb5b01573d;p=quix0rs-gnu-social.git

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index daafced3b4..a8996ecafa 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class MsnManager extends ImManager {
     public $conn = null;
-    private $lastping = null;
-    private $pingInterval;
+    protected $lastPing = null;
+    protected $pingInterval;
 
     /**
      * Initialise connection to server.
@@ -42,6 +42,7 @@ class MsnManager extends ImManager {
      */
     public function start($master) {
         if (parent::start($master)) {
+            $this->requeue_waiting_messages();
             $this->connect();
             return true;
         } else {
@@ -71,11 +72,19 @@ class MsnManager extends ImManager {
      * @return void
      */
     public function idle($timeout = 0) {
-        if (empty($this->lastping) || time() - $this->lastping > $this->pingInterval) {
+        if (empty($this->lastPing) || time() - $this->lastPing > $this->pingInterval) {
             $this->send_ping();
         }
     }
 
+    /**
+     * Message pump is triggered on socket input, so we only need an idle()
+     * call often enough to trigger our outgoing pings.
+     */
+    public function timeout() {
+        return $this->pingInterval;
+    }
+
     /**
      * Process MSN events that have come in over the wire.
      *
@@ -101,15 +110,16 @@ class MsnManager extends ImManager {
                     'password' => $this->plugin->password,
                     'alias' => $this->plugin->nickname,
                     'psm' => 'Send me a message to post a notice',
-                    'debug' => true
+                    'debug' => false
                 )
             );
             $this->conn->registerHandler('IMin', array($this, 'handle_msn_message'));
+            $this->conn->registerHandler('SessionReady', array($this, 'handle_session_ready'));
             $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
             $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
             $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
             $this->conn->signon();
-            $this->lastping = time();
+            $this->lastPing = time();
         }
         return $this->conn;
     }
@@ -120,21 +130,21 @@ class MsnManager extends ImManager {
     *
     * @return void
     */
-    private function send_ping() {
+    protected function send_ping() {
         $this->connect();
         if (!$this->conn) {
             return false;
         }
 
         $this->conn->sendPing();
-        $this->lastping = time();
+        $this->lastPing = time();
         $this->pingInterval = 50;
         return true;
     }
 
     /**
      * Update the time till the next ping
-     * 
+     *
      * @param $data Time till next ping
      * @return void
      */
@@ -151,18 +161,54 @@ class MsnManager extends ImManager {
     * @return boolean
     */
     public function handle_msn_message($data) {
-        $this->plugin->enqueue_incoming_raw($data);
+        $this->plugin->enqueueIncomingRaw($data);
         return true;
     }
 
+    /**
+    * Called via a callback when a session becomes ready
+    *
+    * @param array $data Data
+    */
+    public function handle_session_ready($data) {
+        $sessionFailed = false;
+        $wm = Msn_waiting_message::top($data['to']);
+        while ($wm != NULL) {
+            if ($sessionFailed) {
+                $this->plugin->sendMessage($wm->screenname, $wm->message);
+                $sessionFailed = true;
+            } elseif (!$this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
+                $this->plugin->sendMessage($wm->screenname, $wm->message);
+            }
+
+            $wm->delete();
+            $wm = Msn_waiting_message::top($data['to']);
+        }
+    }
+
+    /**
+    * Requeue messages from the waiting table so we try
+    * to send them again
+    *
+    * @return void
+    */
+    protected function requeue_waiting_messages() {
+        $wm = Msn_waiting_message::top();
+        while ($wm != NULL) {
+            $this->plugin->sendMessage($wm->screenname, $wm->message);
+            $wm->delete();
+            $wm = Msn_waiting_message::top();
+        }
+    }
+
     /**
     * Called by callback to log failure during connect
     *
-    * @param void $data Not used (there to keep callback happy)
+    * @param string $message error message reported
     * @return void
     */
-    public function handle_connect_failed($data) {
-        common_log(LOG_NOTICE, 'MSN connect failed, retrying');
+    public function handle_connect_failed($message) {
+        common_log(LOG_NOTICE, 'MSN connect failed, retrying: ' . $message);
     }
 
     /**
@@ -173,12 +219,37 @@ class MsnManager extends ImManager {
     */
     public function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');
+        // Requeue messages waiting in the DB
+        $this->requeue_waiting_messages();
     }
-    
+
+    /**
+    * Enters a message into the database for sending via a callback
+    * when the session is established
+    *
+    * @param string $to Intended recipient
+    * @param string $message Message
+    */
+    protected function enqueue_waiting_message($to, $message) {
+        $wm = new Msn_waiting_message();
+
+        $wm->screenname = $to;
+        $wm->message    = $message;
+        $wm->created    = common_sql_now();
+        $result         = $wm->insert();
+
+        if (!$result) {
+            common_log_db_error($wm, 'INSERT', __FILE__);
+            throw new ServerException('DB error inserting queue item');
+        }
+
+        return true;
+    }
+
     /**
      * Send a message using the daemon
-     * 
-     * @param $data Message
+     *
+     * @param $data Message data
      * @return boolean true on success
      */
     public function send_raw_message($data) {
@@ -187,12 +258,17 @@ class MsnManager extends ImManager {
             return false;
         }
 
-        if (!$this->conn->sendMessage($data['to'], $data['message'])) {
-            return false;
+        $waitForSession = false;
+        if (!$this->conn->sendMessage($data['to'], $data['message'], $waitForSession)) {
+            if ($waitForSession) {
+                $this->enqueue_waiting_message($data['to'], $data['message']);
+            } else {
+                return false;
+            }
         }
-        
+
         // Sending a command updates the time till next ping
-        $this->lastping = time();
+        $this->lastPing = time();
         $this->pingInterval = 50;
         return true;
     }