@fullstackunicorn/webapp 2.0.1 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/imports/client.js +13 -0
- package/load/Load.js +5 -2
- package/load/engine.js +11 -8
- package/load/resources.js +15 -0
- package/package.json +1 -1
- package/package.md +5 -1
package/imports/client.js
CHANGED
|
@@ -249,6 +249,19 @@ class Client {
|
|
|
249
249
|
return key
|
|
250
250
|
}
|
|
251
251
|
|
|
252
|
+
cacheDataHas = async ({ endpoint, version }) => {
|
|
253
|
+
await cache.initialize()
|
|
254
|
+
const key = abs.makeKey(endpoint, 'get')
|
|
255
|
+
if (version && cache.version(key) !== version) return false
|
|
256
|
+
const cacheStore = await cache.open(this.cacheNameObjects)
|
|
257
|
+
try {
|
|
258
|
+
return (await cache.get(cacheStore, key, false)) !== null
|
|
259
|
+
} catch {
|
|
260
|
+
await cache.remove(cacheStore, key)
|
|
261
|
+
return false
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
|
|
252
265
|
cacheClear = async (cacheName) => await cache.clear(cacheName)
|
|
253
266
|
|
|
254
267
|
cachePreloadGet = async (items = []) => {
|
package/load/Load.js
CHANGED
|
@@ -9,7 +9,9 @@ import { engine } from '#load/engine.js'
|
|
|
9
9
|
import { useRefreshContent } from '#load/use.js'
|
|
10
10
|
import { loadGeometry } from '#load/Geometry.js'
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
const ready = () => {}
|
|
13
|
+
|
|
14
|
+
export const Load = ({ onReady = ready }) => {
|
|
13
15
|
|
|
14
16
|
const { lang } = useUrl()
|
|
15
17
|
const refresh = useRefreshContent()
|
|
@@ -35,6 +37,7 @@ export const Load = () => {
|
|
|
35
37
|
if (await engine.run(lang, dimensionsRef.current.width, controller.signal)) {
|
|
36
38
|
if (active) await refresh(lang)
|
|
37
39
|
}
|
|
40
|
+
if (active) onReady(true)
|
|
38
41
|
} catch (error) { if (error.name !== 'AbortError') console.error('load-failed', error) }
|
|
39
42
|
finally {
|
|
40
43
|
running = false
|
|
@@ -55,7 +58,7 @@ export const Load = () => {
|
|
|
55
58
|
clearTimeout(timer)
|
|
56
59
|
stop()
|
|
57
60
|
}
|
|
58
|
-
}, [lang, geometry, refresh])
|
|
61
|
+
}, [lang, geometry, onReady, refresh])
|
|
59
62
|
|
|
60
63
|
return null
|
|
61
64
|
}
|
package/load/engine.js
CHANGED
|
@@ -62,30 +62,33 @@ class Engine {
|
|
|
62
62
|
const completion = key + ':' + signature + ':' + geometry + ':' + cache.generation
|
|
63
63
|
if (this.completed.has(completion) && before.complete) return false
|
|
64
64
|
|
|
65
|
-
const
|
|
65
|
+
const previousItems = before.items || {}
|
|
66
|
+
const items = await resources.available(previousItems)
|
|
67
|
+
const inventoryComplete = Object.keys(items).length === Object.keys(previousItems).length
|
|
68
|
+
const changed = !before.complete || !inventoryComplete || this.signature(before.state) !== signature
|
|
66
69
|
const geometryChanged = before.geometry !== geometry
|
|
67
|
-
let
|
|
70
|
+
let nextItems = items
|
|
68
71
|
let refresh = false
|
|
69
72
|
|
|
70
73
|
if (changed) {
|
|
71
|
-
const inventory = Object.fromEntries(Object.entries(
|
|
74
|
+
const inventory = Object.fromEntries(Object.entries(nextItems).map(([itemKey, item]) => [itemKey, item.sha256]))
|
|
72
75
|
const response = await client.post(uri.data.update, {
|
|
73
76
|
locale: lang,
|
|
74
77
|
from: before.state,
|
|
75
|
-
cache: { complete: before.complete === true, items: inventory },
|
|
78
|
+
cache: { complete: before.complete === true && inventoryComplete, items: inventory },
|
|
76
79
|
}, { headers: { 'Content-Type': 'application/json' }, signal })
|
|
77
80
|
const preload = response?.preload
|
|
78
81
|
if (!response?.current?.site || !preload || !Array.isArray(preload.delete)
|
|
79
82
|
|| !Array.isArray(preload.replace) || !Array.isArray(preload.new)) throw new Error('Invalid Data load bundle')
|
|
80
|
-
|
|
83
|
+
nextItems = await resources.apply(preload, width, nextItems, signal)
|
|
81
84
|
refresh = [...preload.delete, ...preload.replace, ...preload.new].some(value => {
|
|
82
85
|
const item = typeof value === 'string' ? before.items?.[value] : value
|
|
83
86
|
return item?.kind === 'resource'
|
|
84
87
|
})
|
|
85
|
-
await set(key, { state: response.current, complete: true, items, geometry })
|
|
88
|
+
await set(key, { state: response.current, complete: true, items: nextItems, geometry })
|
|
86
89
|
} else if (geometryChanged) {
|
|
87
|
-
|
|
88
|
-
await set(key, { ...before, state: current, complete: true, items, geometry })
|
|
90
|
+
nextItems = await resources.resize(nextItems, width, signal)
|
|
91
|
+
await set(key, { ...before, state: current, complete: true, items: nextItems, geometry })
|
|
89
92
|
} else {
|
|
90
93
|
await set(key, { ...before, state: current })
|
|
91
94
|
}
|
package/load/resources.js
CHANGED
|
@@ -34,6 +34,21 @@ class Resources {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
available = async items => {
|
|
38
|
+
const verified = {}
|
|
39
|
+
await this.queue(Object.entries(items), settings.concurrency, async ([key, item]) => {
|
|
40
|
+
let exists = false
|
|
41
|
+
if (item?.kind === 'resource' && item.path && item.sha256) {
|
|
42
|
+
exists = await client.cacheDataHas({ endpoint: resource.url(item.path), version: item.sha256 })
|
|
43
|
+
}
|
|
44
|
+
if (item?.kind === 'image' && item.url && item.version) {
|
|
45
|
+
exists = Boolean(await client.image({ endpoint: item.url, version: item.version }, 'get'))
|
|
46
|
+
}
|
|
47
|
+
if (exists) verified[key] = item
|
|
48
|
+
})
|
|
49
|
+
return verified
|
|
50
|
+
}
|
|
51
|
+
|
|
37
52
|
image = async (item, width, current, signal) => {
|
|
38
53
|
const selected = img.getImage(item.picture, loadGeometry.width(item, width), current?.size)
|
|
39
54
|
if (current?.url === selected.src && current?.hash === selected.hash) {
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "2.0.
|
|
2
|
+
"version": "2.0.2",
|
|
3
3
|
"name": "@fullstackunicorn/webapp",
|
|
4
4
|
"author": "lucanigido (https://fullstackunicorn.dev/author/lucanigido)",
|
|
5
5
|
"description": "Shared Web and Native runtime engines and core components for Fullstack Unicorn applications",
|
package/package.md
CHANGED
|
@@ -10,7 +10,11 @@ The load engine lives in `load/` and its component entry point is `load/Load.js`
|
|
|
10
10
|
It reads host settings from `configure/load.json`, checks `/pulse`, reports a
|
|
11
11
|
complete or partial cache inventory to `POST /api/data/load/get`, applies only
|
|
12
12
|
`delete`, `replace` and `new` operations from the one BFF response, and resolves
|
|
13
|
-
initial image sizes through the host's `load/geometry.scope.js`.
|
|
13
|
+
initial image sizes through the host's `load/geometry.scope.js`. Before reporting
|
|
14
|
+
an inventory as complete, it verifies that every declared JSON resource and image
|
|
15
|
+
binary is actually present at the declared version in browser cache. Hosts may use
|
|
16
|
+
the `Load` component's `onReady` callback to initialize page content only after
|
|
17
|
+
that reconciliation has finished. The shared
|
|
14
18
|
`Img` component measures its mounted container, treats `src + hash` as binary
|
|
15
19
|
identity and keeps the decoded displayed image visible until a changed pending
|
|
16
20
|
binary has decoded and cross-faded.
|