mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow to gzip CSS/JS files 

Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.

This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-03-26 16:30:08 +02:00
parent e26f138fc5
commit 54f9b35f71
No known key found for this signature in database
GPG Key ID: F941078878347C0C
4 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/Controller/CssController.php
View File

@ -28,6 +28,8 @@ use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IRequest;
class CssController extends Controller {
@ -62,12 +64,16 @@ class CssController extends Controller {
public function getCss($fileName, $appName) {
try {
$folder = $this->appData->getFolder($appName);
$cssFile = $folder->getFile($fileName);
$gzip = false;
$file = $this->getFile($folder, $fileName, $gzip);
} catch(NotFoundException $e) {
return new NotFoundResponse();
}
$response = new FileDisplayResponse($cssFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
if ($gzip) {
$response->addHeader('Content-Encoding', 'gzip');
}
$response->cacheFor(86400);
$expires = new \DateTime();
$expires->setTimestamp($this->timeFactory->getTime());
@ -76,4 +82,26 @@ class CssController extends Controller {
$response->addHeader('Pragma', 'cache');
return $response;
}
/**
* @param ISimpleFolder $folder
* @param string $fileName
* @param bool $gzip is set to true if we use the gzip file
* @return ISimpleFile
*/
private function getFile(ISimpleFolder $folder, $fileName, &$gzip) {
$encoding = $this->request->getHeader('Accept-Encoding');
if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
try {
$gzip = true;
return $folder->getFile($fileName . '.gz');
} catch (NotFoundException $e) {
// continue
}
}
$gzip = false;
return $folder->getFile($fileName);
}
}

32
core/Controller/JsController.php
View File

@ -29,6 +29,8 @@ use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IRequest;
class JsController extends Controller {
@ -63,12 +65,16 @@ class JsController extends Controller {
public function getJs($fileName, $appName) {
try {
$folder = $this->appData->getFolder($appName);
$jsFile = $folder->getFile($fileName);
$gzip = false;
$file = $this->getFile($folder, $fileName, $gzip);
} catch(NotFoundException $e) {
return new NotFoundResponse();
}
$response = new FileDisplayResponse($jsFile, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
if ($gzip) {
$response->addHeader('Content-Encoding', 'gzip');
}
$response->cacheFor(86400);
$expires = new \DateTime();
$expires->setTimestamp($this->timeFactory->getTime());
@ -77,4 +83,26 @@ class JsController extends Controller {
$response->addHeader('Pragma', 'cache');
return $response;
}
/**
* @param ISimpleFolder $folder
* @param string $fileName
* @param bool $gzip is set to true if we use the gzip file
* @return ISimpleFile
*/
private function getFile(ISimpleFolder $folder, $fileName, &$gzip) {
$encoding = $this->request->getHeader('Accept-Encoding');
if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
try {
$gzip = true;
return $folder->getFile($fileName . '.gz');
} catch (NotFoundException $e) {
// continue
}
}
$gzip = false;
return $folder->getFile($fileName);
}
}

7
lib/private/Template/JSCombiner.php
View File

@ -154,9 +154,16 @@ class JSCombiner {
$depFile = $folder->newFile($depFileName);
}
try {
$gzipFile = $folder->getFile($fileName . '.gz');
} catch (NotFoundException $e) {
$gzipFile = $folder->newFile($fileName . '.gz');
}
try {
$cachedfile->putContent($res);
$depFile->putContent(json_encode($deps));
$gzipFile->putContent(gzencode($res, 9));
return true;
} catch (NotPermittedException $e) {
return false;

11
lib/private/Template/SCSSCacher.php
View File

@ -186,9 +186,18 @@ class SCSSCacher {
return false;
}
// Gzip file
try {
$cachedfile->putContent($this->rebaseUrls($compiledScss, $webDir));
$gzipFile = $folder->getFile($fileNameCSS . '.gz');
} catch (NotFoundException $e) {
$gzipFile = $folder->newFile($fileNameCSS . '.gz');
}
try {
$data = $this->rebaseUrls($compiledScss, $webDir);
$cachedfile->putContent($data);
$depFile->putContent(json_encode($scss->getParsedFiles()));
$gzipFile->putContent(gzencode($data), 9);
$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
return true;
} catch(NotPermittedException $e) {