@fullstackunicorn/webapp 2.0.1 → 2.0.3

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 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
- export const Load = () => {
12
+ const ready = () => {}
13
+
14
+ export const Load = ({ onReady = ready }) => {
13
15
 
14
16
  const { lang } = useUrl()
15
17
  const refresh = useRefreshContent()
@@ -21,7 +23,7 @@ export const Load = () => {
21
23
  useEffect(() => {
22
24
  let active = true
23
25
  const controller = new AbortController()
24
- let timer, running = false
26
+ let timer, running = false, prepared = false
25
27
  const schedule = () => {
26
28
  clearTimeout(timer)
27
29
  if (active && visibility.isVisible()) timer = setTimeout(check, engine.interval)
@@ -32,8 +34,17 @@ export const Load = () => {
32
34
  try {
33
35
  await priority.ready()
34
36
  if (!active) return
35
- if (await engine.run(lang, dimensionsRef.current.width, controller.signal)) {
36
- if (active) await refresh(lang)
37
+ await engine.run(lang, dimensionsRef.current.width, controller.signal, async refreshNeeded => {
38
+ if (prepared || !active) return
39
+ if (refreshNeeded) await refresh(lang)
40
+ if (active) {
41
+ prepared = true
42
+ onReady(true)
43
+ }
44
+ })
45
+ if (!prepared && active) {
46
+ prepared = true
47
+ onReady(true)
37
48
  }
38
49
  } catch (error) { if (error.name !== 'AbortError') console.error('load-failed', error) }
39
50
  finally {
@@ -55,7 +66,7 @@ export const Load = () => {
55
66
  clearTimeout(timer)
56
67
  stop()
57
68
  }
58
- }, [lang, geometry, refresh])
69
+ }, [lang, geometry, onReady, refresh])
59
70
 
60
71
  return null
61
72
  }
package/load/engine.js CHANGED
@@ -43,16 +43,16 @@ class Engine {
43
43
  return !previous?.complete || this.signature(previous.state) !== this.signature(current)
44
44
  }
45
45
 
46
- run = async (lang, width, signal) => {
46
+ run = async (lang, width, signal, onResources) => {
47
47
  const previous = this.jobs.get(lang)
48
48
  if (previous) await previous.catch(error => { if (error.name !== 'AbortError') throw error })
49
49
  if (signal?.aborted) throw new DOMException('Aborted', 'AbortError')
50
- const job = this.check(lang, width, signal).finally(() => { if (this.jobs.get(lang) === job) this.jobs.delete(lang) })
50
+ const job = this.check(lang, width, signal, onResources).finally(() => { if (this.jobs.get(lang) === job) this.jobs.delete(lang) })
51
51
  this.jobs.set(lang, job)
52
52
  return job
53
53
  }
54
54
 
55
- check = async (lang, width, signal) => {
55
+ check = async (lang, width, signal, onResources) => {
56
56
  await cache.initialize()
57
57
  const key = this.key(lang)
58
58
  const before = await get(key) || { state: null, complete: false, items: {}, geometry: null }
@@ -62,31 +62,36 @@ 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 changed = !before.complete || this.signature(before.state) !== signature
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 items = before.items || {}
70
+ let nextItems = items
68
71
  let refresh = false
69
72
 
70
73
  if (changed) {
71
- const inventory = Object.fromEntries(Object.entries(items).map(([itemKey, item]) => [itemKey, item.sha256]))
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
- items = await resources.apply(preload, width, items, signal)
81
83
  refresh = [...preload.delete, ...preload.replace, ...preload.new].some(value => {
82
84
  const item = typeof value === 'string' ? before.items?.[value] : value
83
85
  return item?.kind === 'resource'
84
86
  })
85
- await set(key, { state: response.current, complete: true, items, geometry })
87
+ nextItems = await resources.apply(preload, width, nextItems, signal, () => onResources?.(refresh))
88
+ await set(key, { state: response.current, complete: true, items: nextItems, geometry })
86
89
  } else if (geometryChanged) {
87
- items = await resources.resize(items, width, signal)
88
- await set(key, { ...before, state: current, complete: true, items, geometry })
90
+ await onResources?.(false)
91
+ nextItems = await resources.resize(nextItems, width, signal)
92
+ await set(key, { ...before, state: current, complete: true, items: nextItems, geometry })
89
93
  } else {
94
+ await onResources?.(false)
90
95
  await set(key, { ...before, state: current })
91
96
  }
92
97
 
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) {
@@ -48,7 +63,7 @@ class Resources {
48
63
  return { ...item, size: selected.size, url: selected.src, version: selected.version, hash: selected.hash }
49
64
  }
50
65
 
51
- apply = async (preload, width, current = {}, signal) => {
66
+ apply = async (preload, width, current = {}, signal, onResources) => {
52
67
  const next = { ...current }
53
68
  for (const key of preload.delete || []) {
54
69
  await this.remove(next[key])
@@ -62,6 +77,7 @@ class Resources {
62
77
  await client.cacheDataSet({ endpoint: resource.url(item.path), value: item.value, version: item.sha256 })
63
78
  next[item.key] = item
64
79
  })
80
+ await onResources?.()
65
81
 
66
82
  const pictures = changed.filter(item => item.kind === 'image')
67
83
  await this.queue(pictures, images.concurrency, async item => {
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "2.0.1",
2
+ "version": "2.0.3",
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,13 @@ 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`. The shared
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
+ the required JSON resources have been reconciled. Image warming continues in
18
+ parallel and shares the same requests and cache with mounted `Img` components.
19
+ The shared
14
20
  `Img` component measures its mounted container, treats `src + hash` as binary
15
21
  identity and keeps the decoded displayed image visible until a changed pending
16
22
  binary has decoded and cross-faded.