Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update fix #994

Merged
merged 19 commits into from
Oct 2, 2024
Merged

update fix #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4709fac
update trigger change
maxence-charriere Sep 25, 2024
c8599dd
try catch delete cache
maxence-charriere Sep 25, 2024
9b57e67
remove font from app worker cache
maxence-charriere Sep 25, 2024
e00db25
put back update when service worker is activated
maxence-charriere Sep 29, 2024
a2f7dc2
remove css preload
maxence-charriere Sep 30, 2024
d20eb24
add back font to service worker cache
maxence-charriere Sep 30, 2024
98df02d
Update http.go
maxence-charriere Sep 30, 2024
910c50e
clam client when update
maxence-charriere Sep 30, 2024
205d2de
load root from network first
maxence-charriere Sep 30, 2024
8ba9e1e
Update http_test.go
maxence-charriere Sep 30, 2024
c5cdedb
try fix mobile scrolling
maxence-charriere Oct 2, 2024
dfe1f2b
add apple-mobile-web-app-capable meta tag
maxence-charriere Oct 2, 2024
2b4f798
remove root bypass
maxence-charriere Oct 2, 2024
f5f2689
defer google analytic
maxence-charriere Oct 2, 2024
b242351
update service worker sooner
maxence-charriere Oct 2, 2024
e0c3055
Update engine.go
maxence-charriere Oct 2, 2024
468c770
Revert "update service worker sooner"
maxence-charriere Oct 2, 2024
b560fb3
prioritize service worker update
maxence-charriere Oct 2, 2024
2223956
Update engine_test.go
maxence-charriere Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/analytics/google-analytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// field to initialize Google Analytics.
func GoogleAnalyticsHeader(propertyID string) string {
return fmt.Sprintf(`<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=%s"></script>
<script defer src="https://www.googletagmanager.com/gtag/js?id=%s"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ func (e *engineX) Encode(w *bytes.Buffer, document HTMLHtml) error {
children = append(children, body.body()...)
body.setBody(children)

w.WriteString("<!DOCTYPE html>\n")
w.WriteString("<!doctype html>\n")
e.nodes.Encode(e.baseContext(), w, document)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func TestEngineEncode(t *testing.T) {
),
))
require.NoError(t, err)
require.Equal(t, "<!DOCTYPE html>\n<html>\n <body>\n <span></span>\n bye\n </body>\n</html>", b.String())
require.Equal(t, "<!doctype html>\n<html>\n <body>\n <span></span>\n bye\n </body>\n</html>", b.String())
})
}

Expand Down
35 changes: 24 additions & 11 deletions pkg/app/gen/app-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,41 @@
const cacheName = "app-" + "{{.Version}}";
const resourcesToCache = {{.ResourcesToCache}};

self.addEventListener("install", (event) => {
console.log("installing app worker {{.Version}}");
event.waitUntil(installWorker());
self.addEventListener("install", async (event) => {
try {
console.log("installing app worker {{.Version}}");
await installWorker();
await self.skipWaiting();
} catch (error) {
console.error("error during installation:", error);
}
});

async function installWorker() {
const cache = await caches.open(cacheName);
await cache.addAll(resourcesToCache);
await self.skipWaiting(); // Use this new service worker
}

self.addEventListener("activate", (event) => {
event.waitUntil(deletePreviousCaches());
console.log("app worker {{.Version}} is activated");
self.addEventListener("activate", async (event) => {
try {
await deletePreviousCaches(); // Await cache cleanup
await self.clients.claim(); // Ensure the service worker takes control of the clients
console.log("app worker {{.Version}} is activated");
} catch (error) {
console.error("error during activation:", error);
}
});

async function deletePreviousCaches() {
keys = await caches.keys();
keys.forEach(async (key) => {
if (key != cacheName) {
console.log("deleting", key, "cache");
await caches.delete(key);
try {
console.log("deleting", key, "cache");
await caches.delete(key);
} catch (err) {
console.error("deleting", key, "cache failed:", err);
}
}
});
}
Expand All @@ -35,11 +48,11 @@ self.addEventListener("fetch", (event) => {
});

async function fetchWithCache(request) {
cachedResponse = await caches.match(request);
const cachedResponse = await caches.match(request);
if (cachedResponse) {
return cachedResponse;
}
return fetch(request);
return await fetch(request);
}

// -----------------------------------------------------------------------------
Expand Down
29 changes: 14 additions & 15 deletions pkg/app/gen/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,16 @@ goappInitWebAssembly();
// -----------------------------------------------------------------------------
async function goappInitServiceWorker() {
if ("serviceWorker" in navigator) {
window.addEventListener("load", async () => {
try {
const registration = await navigator.serviceWorker.register(
"{{.WorkerJS}}"
);
goappServiceWorkerRegistration = registration;
goappSetupNotifyUpdate(registration);
goappSetupPushNotification();
} catch (err) {
console.error("goapp service worker registration failed: ", err);
}
});
try {
const registration = await navigator.serviceWorker.register(
"{{.WorkerJS}}"
);
goappServiceWorkerRegistration = registration;
goappSetupNotifyUpdate(registration);
goappSetupPushNotification();
} catch (err) {
console.error("goapp service worker registration failed: ", err);
}
}
}

Expand All @@ -64,10 +62,11 @@ function goappSetupNotifyUpdate(registration) {
if (!navigator.serviceWorker.controller) {
return;
}
if (newSW.state != "activated") {
return;

switch (newSW.state) {
case "installed":
goappOnUpdate();
}
goappOnUpdate();
});
});
}
Expand Down
20 changes: 7 additions & 13 deletions pkg/app/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,12 @@ func (h *Handler) makeAppWorkerJS() []byte {
"/app.js",
"/manifest.webmanifest",
"/wasm_exec.js",
"/",
"/web/app.wasm",
"/",
)
setResources(h.Fonts...)
setResources(h.Icon.Default, h.Icon.Large, h.Icon.Maskable)
setResources(h.Styles...)
setResources(h.Fonts...)
setResources(h.Scripts...)
setResources(h.CacheableResources...)

Expand All @@ -361,7 +361,7 @@ func (h *Handler) makeAppWorkerJS() []byte {
resourcesTocache = append(resourcesTocache, h.Resources.Resolve(k))
}
sort.Slice(resourcesTocache, func(a, b int) bool {
return strings.Compare(resourcesTocache[a], resourcesTocache[b]) < 0
return strings.Compare(resourcesTocache[a], resourcesTocache[b]) > 0
})

var b bytes.Buffer
Expand Down Expand Up @@ -647,7 +647,10 @@ func (h *Handler) servePage(w http.ResponseWriter, r *http.Request) {
Content(h.ThemeColor),
Meta().
Name("viewport").
Content("width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover"),
Content("width=device-width, initial-scale=1, viewport-fit=cover"),
Meta().
Name("apple-mobile-web-app-capable").
Content("yes"),
Meta().
Property("og:url").
Content(resolveOGResource(h.Domain, h.Resources.Resolve(page.URL().Path))),
Expand Down Expand Up @@ -706,15 +709,6 @@ func (h *Handler) servePage(w http.ResponseWriter, r *http.Request) {
}
return nil
}),
Range(h.Styles).Slice(func(i int) UI {
if resource := parseHTTPResource(h.Styles[i]); resource.URL != "" {
return resource.toLink().
Type("text/css").
Rel("preload").
As("style")
}
return nil
}),
Link().
Rel("icon").
Href(icon),
Expand Down
12 changes: 6 additions & 6 deletions pkg/app/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ func TestHandlerServeAppWorkerJSWithLocalDir(t *testing.T) {
body := w.Body.String()
require.Equal(t, http.StatusOK, w.Code)
require.Equal(t, "application/javascript", w.Header().Get("Content-Type"))
require.Contains(t, body, `self.addEventListener("install", (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", (event) => {`)
require.Contains(t, body, `self.addEventListener("install", async (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", async (event) => {`)
require.Contains(t, body, `self.addEventListener("fetch", (event) => {`)
require.Contains(t, body, `"/web/hello.css"`)
require.Contains(t, body, `"/web/hello.js"`)
Expand Down Expand Up @@ -294,8 +294,8 @@ func TestHandlerServeAppWorkerJSWithRemoteBucket(t *testing.T) {
body := w.Body.String()
require.Equal(t, http.StatusOK, w.Code)
require.Equal(t, "application/javascript", w.Header().Get("Content-Type"))
require.Contains(t, body, `self.addEventListener("install", (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", (event) => {`)
require.Contains(t, body, `self.addEventListener("install", async (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", async (event) => {`)
require.Contains(t, body, `self.addEventListener("fetch", (event) => {`)
require.Contains(t, body, `"https://storage.googleapis.com/go-app/web/hello.css"`)
require.Contains(t, body, `"https://storage.googleapis.com/go-app/web/hello.js"`)
Expand Down Expand Up @@ -325,8 +325,8 @@ func TestHandlerServeAppWorkerJSWithGitHubPages(t *testing.T) {
body := w.Body.String()
require.Equal(t, http.StatusOK, w.Code)
require.Equal(t, "application/javascript", w.Header().Get("Content-Type"))
require.Contains(t, body, `self.addEventListener("install", (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", (event) => {`)
require.Contains(t, body, `self.addEventListener("install", async (event) => {`)
require.Contains(t, body, `self.addEventListener("activate", async (event) => {`)
require.Contains(t, body, `self.addEventListener("fetch", (event) => {`)
require.Contains(t, body, `"/go-app/web/hello.css"`)
require.Contains(t, body, `"/go-app/web/hello.js"`)
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/scripts.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading