RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sw: fix static path 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/953/head
Varun Patil 2023-11-25 12:41:22 -08:00
parent a4ae2c800f
commit 7c94a4efcc
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Controller/OtherController.php
View File

@ -28,6 +28,7 @@ use OCA\Memories\Exceptions;
use OCA\Memories\Settings\SystemConfig; use OCA\Memories\Settings\SystemConfig;
use OCA\Memories\Util; use OCA\Memories\Util;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\StreamResponse; use OCP\AppFramework\Http\StreamResponse;
use OCP\IRequest; use OCP\IRequest;
@ -171,7 +172,20 @@ class OtherController extends GenericApiController
throw Exceptions::NotFound('Service worker is disabled in global configuration'); throw Exceptions::NotFound('Service worker is disabled in global configuration');
} }
$response = (new StreamResponse(__DIR__.'/../../js/memories-service-worker.js'))->setHeaders([ // Get relative URL to JS web root of the app
$prefix = \OC::$server->get(\OCP\IURLGenerator::class)->linkTo('memories', 'js/memories-main.js');
$prefix = preg_replace('/memories-main\.js.*$/', '', $prefix);
// Make sure prefix starts and ends with a slash
$prefix = '/'.ltrim($prefix, '/');
$prefix = rtrim($prefix, '/').'/';
// Replace relative URLs to have correct prefix
$sw = file_get_contents(__DIR__.'/../../js/memories-service-worker.js');
$sw = str_replace('/apps/memories/js/', $prefix, $sw);
// Return processed service worker
$response = (new DataDisplayResponse($sw))->setHeaders([
'Content-Type' => 'application/javascript', 'Content-Type' => 'application/javascript',
'Service-Worker-Allowed' => '/', 'Service-Worker-Allowed' => '/',
]); ]);

8
src/service-worker.ts
View File

@ -6,12 +6,12 @@ import { ExpirationPlugin } from 'workbox-expiration';
declare var self: ServiceWorkerGlobalScope; declare var self: ServiceWorkerGlobalScope;
type PrecacheEntry = Exclude<(typeof self.__WB_MANIFEST)[number], string>; type PrecacheEntry = Exclude<(typeof self.__WB_MANIFEST)[number], string>;
// Paths are updated in PHP. See OtherController.php
const manifest = self.__WB_MANIFEST as Array<PrecacheEntry>; const manifest = self.__WB_MANIFEST as Array<PrecacheEntry>;
// Exclude files that are not needed // Only include JS files
const filteredManifest = manifest.filter((entry) => { const filteredManifest = manifest.filter((entry) => /\.js(\?.*)?$/.test(entry.url));
return !/(LICENSE\.txt|\.map)(\?.*)?$/.test(entry.url ?? String());
});
precacheAndRoute(filteredManifest); precacheAndRoute(filteredManifest);
cleanupOutdatedCaches(); cleanupOutdatedCaches();