Initialize an event source when we start using it, not in the constructor

This commit is contained in:
Robin Appelman 2014-08-29 17:18:11 +02:00
parent 6cdb1d89ae
commit 54c918fe48
1 changed files with 46 additions and 42 deletions

View File

@ -1,25 +1,10 @@
<?php
/**
* ownCloud
*
* @author Robin Appelman
* @copyright 2012 Robin Appelman icewind1991@gmail.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
* Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
/**
* wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
@ -27,51 +12,70 @@
*
* use server side events with caution, to many open requests can hang the server
*/
class OC_EventSource{
class OC_EventSource {
/**
* @var bool
*/
private $fallback;
private $fallBackId=0;
public function __construct() {
/**
* @var int
*/
private $fallBackId = 0;
/**
* @var bool
*/
private $started = false;
protected function init() {
if ($this->started) {
return;
}
$this->started = true;
// prevent php output buffering, caching and nginx buffering
OC_Util::obEnd();
header('Cache-Control: no-cache');
header('X-Accel-Buffering: no');
$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
if($this->fallback) {
$this->fallBackId=$_GET['fallback_id'];
$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
if ($this->fallback) {
$this->fallBackId = $_GET['fallback_id'];
header("Content-Type: text/html");
echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy
}else{
echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
} else {
header("Content-Type: text/event-stream");
}
if( !OC_Util::isCallRegistered()) {
if (!OC_Util::isCallRegistered()) {
$this->send('error', 'Possible CSRF attack. Connection will be closed.');
$this->close();
exit();
}
flush();
}
/**
* send a message to the client
*
* @param string $type
* @param mixed $data
*
* if only one parameter is given, a typeless message will be send with that parameter as data
*/
public function send($type, $data=null) {
if(is_null($data)) {
$data=$type;
$type=null;
public function send($type, $data = null) {
$this->init();
if (is_null($data)) {
$data = $type;
$type = null;
}
if($this->fallback) {
if ($this->fallback) {
$fallBackId = OC_Util::sanitizeHTML($this->fallBackId);
$response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
.$fallBackId.',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL;
$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
. $fallBackId . ',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL;
echo $response;
}else{
if($type) {
echo 'event: ' . $type.PHP_EOL;
} else {
if ($type) {
echo 'event: ' . $type . PHP_EOL;
}
echo 'data: ' . OCP\JSON::encode($data) . PHP_EOL;
}
@ -80,9 +84,9 @@ class OC_EventSource{
}
/**
* close the connection of the even source
* close the connection of the event source
*/
public function close() {
$this->send('__internal__', 'close');//server side closing can be an issue, let the client do it
$this->send('__internal__', 'close'); //server side closing can be an issue, let the client do it
}
}