@jqhtml/core 2.3.70 → 2.3.71
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/dist/index.cjs +691 -604
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +691 -604
- package/dist/index.js.map +1 -1
- package/dist/jqhtml-core.esm.js +692 -605
- package/dist/jqhtml-core.esm.js.map +1 -1
- package/dist/load-coordinator.d.ts +9 -0
- package/dist/load-coordinator.d.ts.map +1 -1
- package/dist/local-storage.d.ts +61 -4
- package/dist/local-storage.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1505,309 +1505,6 @@ function serialize_for_cache_key(value) {
|
|
|
1505
1505
|
}
|
|
1506
1506
|
}
|
|
1507
1507
|
|
|
1508
|
-
/**
|
|
1509
|
-
* Load Coordinator - Request deduplication for component on_load() calls
|
|
1510
|
-
*
|
|
1511
|
-
* Coordinates parallel component loading to prevent duplicate requests.
|
|
1512
|
-
* When multiple components with identical names and args load simultaneously,
|
|
1513
|
-
* only the first (leader) executes on_load(). Others (followers) wait for
|
|
1514
|
-
* the leader's result.
|
|
1515
|
-
*
|
|
1516
|
-
* Key Concepts:
|
|
1517
|
-
* - **INVOCATION_KEY**: Unique identifier for component name + args combination
|
|
1518
|
-
* - **Leader**: First component to reach on_load() for a given INVOCATION_KEY
|
|
1519
|
-
* - **Follower**: Subsequent components that wait for leader's result
|
|
1520
|
-
*
|
|
1521
|
-
* Lifecycle:
|
|
1522
|
-
* 1. Leader reaches on_load() → create coordination entry
|
|
1523
|
-
* 2. Followers reach on_load() → join waiting queue
|
|
1524
|
-
* 3. Leader completes → distribute data to all followers
|
|
1525
|
-
* 4. Clear coordination entry (no caching)
|
|
1526
|
-
*
|
|
1527
|
-
* @internal This class is not exposed in the public API
|
|
1528
|
-
*/
|
|
1529
|
-
class Load_Coordinator {
|
|
1530
|
-
/**
|
|
1531
|
-
* Generate INVOCATION_KEY from component name and args
|
|
1532
|
-
* Uses deterministic JSON serialization (sorted keys)
|
|
1533
|
-
* Excludes internal properties (those starting with _)
|
|
1534
|
-
*
|
|
1535
|
-
* For functions/objects:
|
|
1536
|
-
* - Checks for ._jqhtml_cache_id property (assigned by RSpade)
|
|
1537
|
-
* - Falls back to .jqhtml_cache_id() method if property doesn't exist
|
|
1538
|
-
* - If neither exists, marks property as uncacheable
|
|
1539
|
-
*
|
|
1540
|
-
* Returns object with:
|
|
1541
|
-
* - key: Cache key string, or null if uncacheable
|
|
1542
|
-
* - uncacheable_property: Name of first property that prevented caching (for debugging)
|
|
1543
|
-
*/
|
|
1544
|
-
static generate_invocation_key(component_name, args, options = {}) {
|
|
1545
|
-
let uncacheable_property;
|
|
1546
|
-
let uncacheable_reason;
|
|
1547
|
-
// Filter out internal properties (starting with _) and serialize args
|
|
1548
|
-
const serializable_args = {};
|
|
1549
|
-
for (const key of Object.keys(args).sort()) {
|
|
1550
|
-
if (key.startsWith('_')) {
|
|
1551
|
-
continue; // Skip internal properties
|
|
1552
|
-
}
|
|
1553
|
-
// Skip framework properties that shouldn't affect cache identity
|
|
1554
|
-
// Note: _load_only and _load_render_only are already filtered by the _ prefix check above
|
|
1555
|
-
if (key === 'use_cached_data') {
|
|
1556
|
-
continue;
|
|
1557
|
-
}
|
|
1558
|
-
const value = args[key];
|
|
1559
|
-
const value_type = typeof value;
|
|
1560
|
-
// Handle primitives (string, number, boolean, null, undefined)
|
|
1561
|
-
if (value === null || value === undefined ||
|
|
1562
|
-
value_type === 'string' || value_type === 'number' ||
|
|
1563
|
-
value_type === 'boolean') {
|
|
1564
|
-
serializable_args[key] = value;
|
|
1565
|
-
continue;
|
|
1566
|
-
}
|
|
1567
|
-
// Handle functions and objects
|
|
1568
|
-
if (value_type === 'function' || value_type === 'object') {
|
|
1569
|
-
// Check for ._jqhtml_cache_id property (fastest, what RSpade assigns)
|
|
1570
|
-
if (value._jqhtml_cache_id !== undefined) {
|
|
1571
|
-
serializable_args[key] = `__JQHTML_CACHE_ID__:${String(value._jqhtml_cache_id)}`;
|
|
1572
|
-
continue;
|
|
1573
|
-
}
|
|
1574
|
-
// Check for .jqhtml_cache_id() method (more flexible, for custom objects)
|
|
1575
|
-
if (typeof value.jqhtml_cache_id === 'function') {
|
|
1576
|
-
try {
|
|
1577
|
-
const cache_id = value.jqhtml_cache_id();
|
|
1578
|
-
serializable_args[key] = `__JQHTML_CACHE_ID__:${String(cache_id)}`;
|
|
1579
|
-
continue;
|
|
1580
|
-
}
|
|
1581
|
-
catch (error) {
|
|
1582
|
-
// Method threw error - treat as uncacheable
|
|
1583
|
-
if (!uncacheable_property) {
|
|
1584
|
-
uncacheable_property = key;
|
|
1585
|
-
uncacheable_reason = 'cache-id-threw';
|
|
1586
|
-
}
|
|
1587
|
-
return { key: null, uncacheable_property, uncacheable_reason };
|
|
1588
|
-
}
|
|
1589
|
-
}
|
|
1590
|
-
// No author-supplied id. The cache may fall back to keying by
|
|
1591
|
-
// deterministic content; deduplication deliberately may not.
|
|
1592
|
-
if (options.allow_content_serialization) {
|
|
1593
|
-
const serialized = serialize_for_cache_key(value);
|
|
1594
|
-
if (serialized.ok) {
|
|
1595
|
-
serializable_args[key] = `__JQHTML_CONTENT__:${serialized.text}`;
|
|
1596
|
-
continue;
|
|
1597
|
-
}
|
|
1598
|
-
if (!uncacheable_property) {
|
|
1599
|
-
uncacheable_property = key;
|
|
1600
|
-
// This package compiles with strictNullChecks off, and without it
|
|
1601
|
-
// TypeScript will not narrow a discriminated union by its boolean
|
|
1602
|
-
// discriminant - so `serialized` is still the full Serialize_Result
|
|
1603
|
-
// here even though `ok` has been ruled out above. The cast states
|
|
1604
|
-
// what the control flow already guarantees.
|
|
1605
|
-
uncacheable_reason = serialized.reason;
|
|
1606
|
-
}
|
|
1607
|
-
return { key: null, uncacheable_property, uncacheable_reason };
|
|
1608
|
-
}
|
|
1609
|
-
if (!uncacheable_property) {
|
|
1610
|
-
uncacheable_property = key;
|
|
1611
|
-
uncacheable_reason = value_type === 'function' ? 'function' : 'object';
|
|
1612
|
-
}
|
|
1613
|
-
return { key: null, uncacheable_property, uncacheable_reason };
|
|
1614
|
-
}
|
|
1615
|
-
// Unknown type (symbol, bigint, etc.) - uncacheable
|
|
1616
|
-
if (!uncacheable_property) {
|
|
1617
|
-
uncacheable_property = key;
|
|
1618
|
-
uncacheable_reason = value_type;
|
|
1619
|
-
}
|
|
1620
|
-
return { key: null, uncacheable_property, uncacheable_reason };
|
|
1621
|
-
}
|
|
1622
|
-
// Try to serialize - if it fails (shouldn't happen now, but safety net), return null
|
|
1623
|
-
try {
|
|
1624
|
-
const sorted_args = JSON.stringify(serializable_args);
|
|
1625
|
-
return { key: `${component_name}::${sorted_args}` };
|
|
1626
|
-
}
|
|
1627
|
-
catch (error) {
|
|
1628
|
-
// Serialization failed unexpectedly
|
|
1629
|
-
return { key: null, uncacheable_property };
|
|
1630
|
-
}
|
|
1631
|
-
}
|
|
1632
|
-
/**
|
|
1633
|
-
* Check if a component should execute on_load() or wait for existing request
|
|
1634
|
-
* Returns true if component should execute (is leader), false if should wait (is follower)
|
|
1635
|
-
*
|
|
1636
|
-
* @param key - The dedup key the caller captured for this load. Every coordinator
|
|
1637
|
-
* method takes it, because args may legally change during on_load()
|
|
1638
|
-
* and a recomputed key would address a different (or no) entry.
|
|
1639
|
-
*/
|
|
1640
|
-
static should_execute_on_load(component, key) {
|
|
1641
|
-
const entry = this._registry.get(key);
|
|
1642
|
-
if (!entry) {
|
|
1643
|
-
// No existing request - this component becomes the leader
|
|
1644
|
-
return true;
|
|
1645
|
-
}
|
|
1646
|
-
if (entry.status === 'loading') {
|
|
1647
|
-
// Request in progress - this component becomes a follower
|
|
1648
|
-
entry.waiting.push(component);
|
|
1649
|
-
return false;
|
|
1650
|
-
}
|
|
1651
|
-
// Entry exists but completed/failed - should have been cleaned up
|
|
1652
|
-
// Treat as new leader
|
|
1653
|
-
return true;
|
|
1654
|
-
}
|
|
1655
|
-
/**
|
|
1656
|
-
* Register a leader component that will execute on_load()
|
|
1657
|
-
* Creates coordination entry and returns a function to call when data is ready
|
|
1658
|
-
*
|
|
1659
|
-
* @param key - The dedup key captured by the caller (see should_execute_on_load)
|
|
1660
|
-
* @returns A function that accepts the final data and completes coordination
|
|
1661
|
-
*/
|
|
1662
|
-
static register_leader(component, key) {
|
|
1663
|
-
// Create a promise that we control - it settles when coordination completes or fails
|
|
1664
|
-
let resolve_promise;
|
|
1665
|
-
let reject_promise;
|
|
1666
|
-
const coordination_promise = new Promise((resolve, reject) => {
|
|
1667
|
-
resolve_promise = resolve;
|
|
1668
|
-
reject_promise = reject;
|
|
1669
|
-
});
|
|
1670
|
-
// A leader with no followers still has to be able to reject this promise on
|
|
1671
|
-
// error; without a handler that rejection surfaces as an unhandled rejection.
|
|
1672
|
-
coordination_promise.catch(() => { });
|
|
1673
|
-
const entry = {
|
|
1674
|
-
status: 'loading',
|
|
1675
|
-
promise: coordination_promise, // Followers await THIS promise, not on_load's
|
|
1676
|
-
resolve_promise,
|
|
1677
|
-
reject_promise,
|
|
1678
|
-
leader_component: component,
|
|
1679
|
-
leader_data: null,
|
|
1680
|
-
waiting: []
|
|
1681
|
-
};
|
|
1682
|
-
this._registry.set(key, entry);
|
|
1683
|
-
// Return cleanup function that accepts the final data
|
|
1684
|
-
return (final_data) => this._complete_coordination(key, component, final_data);
|
|
1685
|
-
}
|
|
1686
|
-
/**
|
|
1687
|
-
* Get the coordination promise for a follower component
|
|
1688
|
-
* Returns a promise that resolves when the leader completes, or rejects if it failed
|
|
1689
|
-
*/
|
|
1690
|
-
static get_coordination_promise(key) {
|
|
1691
|
-
const entry = this._registry.get(key);
|
|
1692
|
-
if (!entry || entry.status !== 'loading') {
|
|
1693
|
-
return null;
|
|
1694
|
-
}
|
|
1695
|
-
return entry.promise;
|
|
1696
|
-
}
|
|
1697
|
-
/**
|
|
1698
|
-
* Complete coordination after leader's on_load() finishes
|
|
1699
|
-
* Stores leader's data, marks entry as completed, and resolves the promise.
|
|
1700
|
-
* Followers retrieve the data themselves via get_leader_data().
|
|
1701
|
-
*
|
|
1702
|
-
* @param key - The coordination key captured at registration
|
|
1703
|
-
* @param leader - The leader component
|
|
1704
|
-
* @param final_data - The final data after on_load and normalization
|
|
1705
|
-
* @private
|
|
1706
|
-
*/
|
|
1707
|
-
static _complete_coordination(key, leader, final_data) {
|
|
1708
|
-
const entry = this._registry.get(key);
|
|
1709
|
-
if (!entry) {
|
|
1710
|
-
return;
|
|
1711
|
-
}
|
|
1712
|
-
// Stored as TEXT so each follower parses its own object graph - sharing one
|
|
1713
|
-
// decoded object would let one component's mutation reach every other.
|
|
1714
|
-
try {
|
|
1715
|
-
entry.leader_data = JSON.stringify(final_data);
|
|
1716
|
-
}
|
|
1717
|
-
catch (error) {
|
|
1718
|
-
// Unserializable data cannot be shared; followers load independently.
|
|
1719
|
-
entry.leader_data = null;
|
|
1720
|
-
}
|
|
1721
|
-
entry.status = 'completed';
|
|
1722
|
-
if (window.jqhtml?.debug?.verbose) {
|
|
1723
|
-
console.log(`[Load Coordinator] Leader ${leader._cid} completed, data available for ${entry.waiting.length} followers`, { key, data: entry.leader_data });
|
|
1724
|
-
}
|
|
1725
|
-
// Resolve the promise - followers waiting on it will now wake up
|
|
1726
|
-
entry.resolve_promise();
|
|
1727
|
-
// Nobody is waiting, so nothing will ever come back to collect the data.
|
|
1728
|
-
// Without this the registry grows once per distinct name+args, forever.
|
|
1729
|
-
if (entry.waiting.length === 0) {
|
|
1730
|
-
this._registry.delete(key);
|
|
1731
|
-
}
|
|
1732
|
-
}
|
|
1733
|
-
/**
|
|
1734
|
-
* Get leader's data for a follower component
|
|
1735
|
-
* Called by follower after coordination promise resolves
|
|
1736
|
-
* Returns a freshly parsed copy and cleans up if this is the last follower
|
|
1737
|
-
*
|
|
1738
|
-
* @param key - The dedup key captured by the follower before it began waiting
|
|
1739
|
-
*/
|
|
1740
|
-
static get_leader_data(component, key) {
|
|
1741
|
-
const entry = this._registry.get(key);
|
|
1742
|
-
if (!entry || entry.status !== 'completed' || entry.leader_data === null) {
|
|
1743
|
-
return null;
|
|
1744
|
-
}
|
|
1745
|
-
// Remove this follower from the waiting list
|
|
1746
|
-
const follower_index = entry.waiting.indexOf(component);
|
|
1747
|
-
if (follower_index !== -1) {
|
|
1748
|
-
entry.waiting.splice(follower_index, 1);
|
|
1749
|
-
}
|
|
1750
|
-
// One parse per follower: each gets its OWN object, never a shared reference.
|
|
1751
|
-
const data = JSON.parse(entry.leader_data);
|
|
1752
|
-
if (window.jqhtml?.debug?.verbose) {
|
|
1753
|
-
console.log(`[Load Coordinator] Follower ${component._cid} retrieving data from leader ${entry.leader_component._cid}`, { key, remaining_followers: entry.waiting.length });
|
|
1754
|
-
}
|
|
1755
|
-
// If this was the last follower, clean up the entry
|
|
1756
|
-
if (entry.waiting.length === 0) {
|
|
1757
|
-
this._registry.delete(key);
|
|
1758
|
-
if (window.jqhtml?.debug?.verbose) {
|
|
1759
|
-
console.log(`[Load Coordinator] Coordination complete for key: ${key}`, { registry_size: this._registry.size });
|
|
1760
|
-
}
|
|
1761
|
-
}
|
|
1762
|
-
return data;
|
|
1763
|
-
}
|
|
1764
|
-
/**
|
|
1765
|
-
* Handle leader on_load() error
|
|
1766
|
-
* Rejects every waiting follower and clears the entry so the next component retries
|
|
1767
|
-
*
|
|
1768
|
-
* @param key - The dedup key captured at registration
|
|
1769
|
-
*/
|
|
1770
|
-
static handle_leader_error(key, error) {
|
|
1771
|
-
const entry = this._registry.get(key);
|
|
1772
|
-
if (!entry) {
|
|
1773
|
-
return;
|
|
1774
|
-
}
|
|
1775
|
-
entry.status = 'failed';
|
|
1776
|
-
console.error(`[Load Coordinator] Leader ${entry.leader_component._cid} on_load() failed for key: ${key}`, error);
|
|
1777
|
-
// Reject FIRST: followers are parked on this promise and their catch in _load()
|
|
1778
|
-
// propagates the failure exactly as if their own on_load() had thrown. Deleting
|
|
1779
|
-
// without rejecting left them awaiting a promise nobody could ever settle.
|
|
1780
|
-
entry.reject_promise(error);
|
|
1781
|
-
// Clear coordination entry so future requests can retry
|
|
1782
|
-
this._registry.delete(key);
|
|
1783
|
-
if (window.jqhtml?.debug?.verbose) {
|
|
1784
|
-
console.log(`[Load Coordinator] Cleared failed coordination for key: ${key}`, { followers_count: entry.waiting.length });
|
|
1785
|
-
}
|
|
1786
|
-
}
|
|
1787
|
-
/**
|
|
1788
|
-
* Get current registry state (for debugging)
|
|
1789
|
-
*/
|
|
1790
|
-
static get_registry_state() {
|
|
1791
|
-
const state = {};
|
|
1792
|
-
for (const [key, entry] of this._registry.entries()) {
|
|
1793
|
-
state[key] = {
|
|
1794
|
-
status: entry.status,
|
|
1795
|
-
leader_cid: entry.leader_component._cid,
|
|
1796
|
-
waiting_count: entry.waiting.length,
|
|
1797
|
-
waiting_cids: entry.waiting.map(c => c._cid)
|
|
1798
|
-
};
|
|
1799
|
-
}
|
|
1800
|
-
return state;
|
|
1801
|
-
}
|
|
1802
|
-
/**
|
|
1803
|
-
* Clear all coordination entries (for testing/debugging)
|
|
1804
|
-
*/
|
|
1805
|
-
static clear_all() {
|
|
1806
|
-
this._registry.clear();
|
|
1807
|
-
}
|
|
1808
|
-
}
|
|
1809
|
-
Load_Coordinator._registry = new Map();
|
|
1810
|
-
|
|
1811
1508
|
/**
|
|
1812
1509
|
* Jqhtml_Local_Storage - Scoped local storage for JQHTML component caching
|
|
1813
1510
|
*
|
|
@@ -1826,7 +1523,19 @@ Load_Coordinator._registry = new Map();
|
|
|
1826
1523
|
* ES6 class instances can be serialized and deserialized if registered via
|
|
1827
1524
|
* register_cache_class(). Classes are wrapped as {__jqhtml_class__: "Name", __jqhtml_props__: {...}}
|
|
1828
1525
|
* and restored to proper instances on retrieval. Nested class instances in objects
|
|
1829
|
-
* and arrays are handled recursively.
|
|
1526
|
+
* and arrays are handled recursively. A class whose wire form is not its own
|
|
1527
|
+
* properties (one that defines toJSON(), or keeps state in private fields)
|
|
1528
|
+
* registers a {to_plain, from_plain} pair and is rebuilt through it. Date, Map and
|
|
1529
|
+
* Set are pre-registered the same way - there is no second mechanism.
|
|
1530
|
+
*
|
|
1531
|
+
* ONE SERIALIZER. Every copy of on_load() data the framework makes goes through
|
|
1532
|
+
* this file: the localStorage cache (set()/get()), the normalization of every
|
|
1533
|
+
* on_load() result into this.data (normalize_for_cache()), and the copy a
|
|
1534
|
+
* deduplicated follower takes of its leader's data (serialize()/deserialize(),
|
|
1535
|
+
* used by load-coordinator.ts). Anything that survives one of those survives all
|
|
1536
|
+
* of them, and anything dropped is dropped identically on all of them. A plain
|
|
1537
|
+
* JSON.stringify anywhere on those paths would consult toJSON() and hand out a
|
|
1538
|
+
* wire form nothing knows how to restore.
|
|
1830
1539
|
*
|
|
1831
1540
|
* Scoping Strategy:
|
|
1832
1541
|
* Storage is scoped by a user-provided cache key (typically a session identifier,
|
|
@@ -1902,14 +1611,11 @@ Load_Coordinator._registry = new Map();
|
|
|
1902
1611
|
* silently. Neither ever throws.
|
|
1903
1612
|
* ---------------------------------------------------------------------------
|
|
1904
1613
|
*/
|
|
1905
|
-
//
|
|
1906
|
-
// Class Registry for Serialization
|
|
1907
|
-
// ============================================================================
|
|
1908
|
-
// Registry mapping class names to constructors
|
|
1614
|
+
// Registry mapping class names to constructors and their restore hooks
|
|
1909
1615
|
const class_registry = Object.create(null);
|
|
1910
1616
|
// Markers for serialized class instances (unique to avoid collisions with user data)
|
|
1911
1617
|
// Replaced at build time by rollup (see rollup.config.js).
|
|
1912
|
-
const CORE_VERSION = '2.3.
|
|
1618
|
+
const CORE_VERSION = '2.3.71';
|
|
1913
1619
|
const CLASS_MARKER = '__jqhtml_class__';
|
|
1914
1620
|
const PROPS_MARKER = '__jqhtml_props__';
|
|
1915
1621
|
/**
|
|
@@ -1917,13 +1623,56 @@ const PROPS_MARKER = '__jqhtml_props__';
|
|
|
1917
1623
|
* Must be called before attempting to cache instances of this class.
|
|
1918
1624
|
*
|
|
1919
1625
|
* @param klass - The class constructor to register
|
|
1920
|
-
* @
|
|
1626
|
+
* @param options - How to convert instances to and from their plain form; see
|
|
1627
|
+
* Cache_Class_Options. Omit for a class whose state is its own
|
|
1628
|
+
* enumerable properties.
|
|
1629
|
+
* @throws Error if klass is not a named function/class, or if to_plain is given
|
|
1630
|
+
* without the from_plain that undoes it
|
|
1921
1631
|
*/
|
|
1922
|
-
function register_cache_class(klass) {
|
|
1632
|
+
function register_cache_class(klass, options = {}) {
|
|
1923
1633
|
if (typeof klass !== 'function' || !klass.name) {
|
|
1924
1634
|
throw new Error('[JQHTML Cache] register_cache_class requires a named class constructor');
|
|
1925
1635
|
}
|
|
1926
|
-
|
|
1636
|
+
const to_plain = typeof options.to_plain === 'function' ? options.to_plain : null;
|
|
1637
|
+
const from_plain = typeof options.from_plain === 'function' ? options.from_plain : null;
|
|
1638
|
+
if (to_plain && !from_plain) {
|
|
1639
|
+
throw new Error(`[JQHTML Cache] register_cache_class(${klass.name}): to_plain needs a from_plain. ` +
|
|
1640
|
+
`The serializer cannot rebuild an instance from a custom wire form on its own.`);
|
|
1641
|
+
}
|
|
1642
|
+
class_registry[klass.name] = { klass, to_plain, from_plain };
|
|
1643
|
+
}
|
|
1644
|
+
// Built-ins travel through the same hook as user classes. Their wire forms are
|
|
1645
|
+
// the ones the cache has always stored (ISO string, entry pairs, item list), so
|
|
1646
|
+
// entries written before this existed still restore.
|
|
1647
|
+
register_cache_class(Date, {
|
|
1648
|
+
to_plain: (date) => date.toISOString(),
|
|
1649
|
+
from_plain: (iso) => new Date(iso)
|
|
1650
|
+
});
|
|
1651
|
+
register_cache_class(Map, {
|
|
1652
|
+
to_plain: (map) => Array.from(map.entries()),
|
|
1653
|
+
from_plain: (entries) => new Map(entries)
|
|
1654
|
+
});
|
|
1655
|
+
register_cache_class(Set, {
|
|
1656
|
+
to_plain: (set) => Array.from(set),
|
|
1657
|
+
from_plain: (items) => new Set(items)
|
|
1658
|
+
});
|
|
1659
|
+
/**
|
|
1660
|
+
* Find the registry entry for a live value: by constructor name first, then by
|
|
1661
|
+
* instanceof for the built-ins so a subclass of Date/Map/Set (whose name is not
|
|
1662
|
+
* registered) still serializes as the built-in it is.
|
|
1663
|
+
*/
|
|
1664
|
+
function lookup_registered(value) {
|
|
1665
|
+
const ctor = value.constructor;
|
|
1666
|
+
if (ctor && ctor.name && class_registry[ctor.name]) {
|
|
1667
|
+
return { name: ctor.name, entry: class_registry[ctor.name] };
|
|
1668
|
+
}
|
|
1669
|
+
if (value instanceof Date)
|
|
1670
|
+
return { name: 'Date', entry: class_registry['Date'] };
|
|
1671
|
+
if (value instanceof Map)
|
|
1672
|
+
return { name: 'Map', entry: class_registry['Map'] };
|
|
1673
|
+
if (value instanceof Set)
|
|
1674
|
+
return { name: 'Set', entry: class_registry['Set'] };
|
|
1675
|
+
return null;
|
|
1927
1676
|
}
|
|
1928
1677
|
/**
|
|
1929
1678
|
* Serialize a value to JSON string, handling ES6 class instances recursively.
|
|
@@ -2050,48 +1799,20 @@ function process_for_serialization(value, verbose, seen, path = '', collector) {
|
|
|
2050
1799
|
}
|
|
2051
1800
|
return result;
|
|
2052
1801
|
}
|
|
2053
|
-
//
|
|
2054
|
-
|
|
2055
|
-
|
|
2056
|
-
|
|
2057
|
-
|
|
2058
|
-
|
|
2059
|
-
|
|
2060
|
-
// Handle Map objects
|
|
2061
|
-
if (value instanceof Map) {
|
|
2062
|
-
const entries = [];
|
|
2063
|
-
for (const [k, v] of value) {
|
|
2064
|
-
const entry_path = collector ? `${path}.get(${String(k)})` : '';
|
|
2065
|
-
const processedKey = process_for_serialization(k, verbose, seen, entry_path, collector);
|
|
2066
|
-
const processedValue = process_for_serialization(v, verbose, seen, entry_path, collector);
|
|
2067
|
-
entries.push([processedKey, processedValue]);
|
|
2068
|
-
}
|
|
2069
|
-
return {
|
|
2070
|
-
[CLASS_MARKER]: 'Map',
|
|
2071
|
-
[PROPS_MARKER]: entries
|
|
2072
|
-
};
|
|
2073
|
-
}
|
|
2074
|
-
// Handle Set objects
|
|
2075
|
-
if (value instanceof Set) {
|
|
2076
|
-
const items = [];
|
|
2077
|
-
let index = 0;
|
|
2078
|
-
for (const item of value) {
|
|
2079
|
-
items.push(process_for_serialization(item, verbose, seen, collector ? `${path}[Set ${index++}]` : '', collector));
|
|
1802
|
+
// Registered classes - Date, Map and Set included - go out as
|
|
1803
|
+
// {__jqhtml_class__, __jqhtml_props__} through their restore hook.
|
|
1804
|
+
const registered = lookup_registered(value);
|
|
1805
|
+
if (registered) {
|
|
1806
|
+
const plain = registered_plain_form(registered, value, verbose, seen, path, collector);
|
|
1807
|
+
if (plain === undefined) {
|
|
1808
|
+
return undefined; // to_plain threw; the value is dropped, and reported
|
|
2080
1809
|
}
|
|
2081
1810
|
return {
|
|
2082
|
-
[CLASS_MARKER]:
|
|
2083
|
-
[PROPS_MARKER]:
|
|
1811
|
+
[CLASS_MARKER]: registered.name,
|
|
1812
|
+
[PROPS_MARKER]: plain
|
|
2084
1813
|
};
|
|
2085
1814
|
}
|
|
2086
|
-
// Get the constructor
|
|
2087
1815
|
const ctor = value.constructor;
|
|
2088
|
-
// Handle registered class instances
|
|
2089
|
-
if (ctor && ctor.name && class_registry[ctor.name]) {
|
|
2090
|
-
return {
|
|
2091
|
-
[CLASS_MARKER]: ctor.name,
|
|
2092
|
-
[PROPS_MARKER]: process_own_properties(value, verbose, seen, path, collector)
|
|
2093
|
-
};
|
|
2094
|
-
}
|
|
2095
1816
|
// Handle plain objects (constructor is Object or no constructor)
|
|
2096
1817
|
if (ctor === Object || ctor === undefined || ctor === null) {
|
|
2097
1818
|
return process_own_properties(value, verbose, seen, path, collector);
|
|
@@ -2105,12 +1826,54 @@ function process_for_serialization(value, verbose, seen, path = '', collector) {
|
|
|
2105
1826
|
console.warn(`[JQHTML Cache] Converting unregistered class "${ctor.name}" to plain object. ` +
|
|
2106
1827
|
`Methods will be lost. Call jqhtml.register_cache_class(${ctor.name}) to preserve the class.`);
|
|
2107
1828
|
}
|
|
2108
|
-
return process_own_properties(value, verbose, seen, path, collector);
|
|
1829
|
+
return process_own_properties(value, verbose, seen, path, collector);
|
|
1830
|
+
}
|
|
1831
|
+
finally {
|
|
1832
|
+
// Pop this object off the ancestor path now that its subtree is done.
|
|
1833
|
+
seen.delete(value);
|
|
1834
|
+
}
|
|
1835
|
+
}
|
|
1836
|
+
/**
|
|
1837
|
+
* The plain value stored for a registered instance.
|
|
1838
|
+
*
|
|
1839
|
+
* No from_plain: own enumerable properties (toJSON() is deliberately bypassed,
|
|
1840
|
+
* because Object.assign is the only way back and it needs the properties).
|
|
1841
|
+
* With from_plain: to_plain(instance), or toJSON() when the class defines one,
|
|
1842
|
+
* or own properties as the last resort. Whatever comes back is walked by the
|
|
1843
|
+
* serializer like any other value.
|
|
1844
|
+
*
|
|
1845
|
+
* Returns undefined when to_plain threw - the caller drops the value.
|
|
1846
|
+
*/
|
|
1847
|
+
function registered_plain_form(registered, value, verbose, seen, path, collector) {
|
|
1848
|
+
const { name, entry } = registered;
|
|
1849
|
+
if (!entry.from_plain) {
|
|
1850
|
+
return process_own_properties(value, verbose, seen, path, collector);
|
|
1851
|
+
}
|
|
1852
|
+
let plain;
|
|
1853
|
+
try {
|
|
1854
|
+
if (entry.to_plain) {
|
|
1855
|
+
plain = entry.to_plain(value);
|
|
1856
|
+
}
|
|
1857
|
+
else if (typeof value.toJSON === 'function') {
|
|
1858
|
+
plain = value.toJSON();
|
|
1859
|
+
}
|
|
1860
|
+
else {
|
|
1861
|
+
return process_own_properties(value, verbose, seen, path, collector);
|
|
1862
|
+
}
|
|
1863
|
+
}
|
|
1864
|
+
catch (e) {
|
|
1865
|
+
collector?.(path, 'to-plain-threw', name);
|
|
1866
|
+
if (verbose) {
|
|
1867
|
+
console.warn(`[JQHTML Cache] to_plain for class "${name}" threw - value will be omitted:`, e);
|
|
1868
|
+
}
|
|
1869
|
+
return undefined;
|
|
2109
1870
|
}
|
|
2110
|
-
|
|
2111
|
-
|
|
2112
|
-
|
|
1871
|
+
// A toJSON() that returns `this` has no separate wire form; own properties it is.
|
|
1872
|
+
if (plain === value) {
|
|
1873
|
+
return process_own_properties(value, verbose, seen, path, collector);
|
|
2113
1874
|
}
|
|
1875
|
+
const processed = process_for_serialization(plain, verbose, seen, path, collector);
|
|
1876
|
+
return processed === undefined ? null : processed;
|
|
2114
1877
|
}
|
|
2115
1878
|
/**
|
|
2116
1879
|
* Walk an object's own enumerable properties (bypassing any toJSON) into a plain
|
|
@@ -2167,7 +1930,11 @@ function strip_advice(kind, detail) {
|
|
|
2167
1930
|
case 'unregistered-class':
|
|
2168
1931
|
return `it is an instance of the unregistered class "${detail}", so it was degraded to a plain ` +
|
|
2169
1932
|
`object and its methods are gone. Call jqhtml.register_cache_class(${detail}) at startup ` +
|
|
2170
|
-
`to get real instances back
|
|
1933
|
+
`to get real instances back - with { from_plain } if the class defines toJSON() or keeps ` +
|
|
1934
|
+
`state outside its own properties.`;
|
|
1935
|
+
case 'to-plain-threw':
|
|
1936
|
+
return `the to_plain hook registered for class "${detail}" threw, so the value was dropped. ` +
|
|
1937
|
+
`Make to_plain total over every instance the class can produce.`;
|
|
2171
1938
|
}
|
|
2172
1939
|
}
|
|
2173
1940
|
/**
|
|
@@ -2239,27 +2006,9 @@ function process_for_deserialization(value, verbose) {
|
|
|
2239
2006
|
if (value[CLASS_MARKER] !== undefined && value[PROPS_MARKER] !== undefined) {
|
|
2240
2007
|
const class_name = value[CLASS_MARKER];
|
|
2241
2008
|
const props = value[PROPS_MARKER];
|
|
2242
|
-
//
|
|
2243
|
-
|
|
2244
|
-
|
|
2245
|
-
}
|
|
2246
|
-
if (class_name === 'Map') {
|
|
2247
|
-
const map = new Map();
|
|
2248
|
-
for (const [k, v] of props) {
|
|
2249
|
-
map.set(process_for_deserialization(k, verbose), process_for_deserialization(v, verbose));
|
|
2250
|
-
}
|
|
2251
|
-
return map;
|
|
2252
|
-
}
|
|
2253
|
-
if (class_name === 'Set') {
|
|
2254
|
-
const set = new Set();
|
|
2255
|
-
for (const item of props) {
|
|
2256
|
-
set.add(process_for_deserialization(item, verbose));
|
|
2257
|
-
}
|
|
2258
|
-
return set;
|
|
2259
|
-
}
|
|
2260
|
-
// Look up registered class
|
|
2261
|
-
const klass = class_registry[class_name];
|
|
2262
|
-
if (!klass) {
|
|
2009
|
+
// Look up registered class (Date, Map and Set are registered like any other)
|
|
2010
|
+
const entry = class_registry[class_name];
|
|
2011
|
+
if (!entry) {
|
|
2263
2012
|
if (verbose) {
|
|
2264
2013
|
console.warn(`[JQHTML Cache] Cannot restore class "${class_name}" - not registered. ` +
|
|
2265
2014
|
`Data will be returned as plain object. ` +
|
|
@@ -2268,10 +2017,14 @@ function process_for_deserialization(value, verbose) {
|
|
|
2268
2017
|
// Return as plain object rather than failing completely
|
|
2269
2018
|
return process_for_deserialization(props, verbose);
|
|
2270
2019
|
}
|
|
2271
|
-
//
|
|
2020
|
+
// Restore through from_plain when the class has one; otherwise create an
|
|
2021
|
+
// instance without calling the constructor and assign the properties back.
|
|
2272
2022
|
try {
|
|
2273
|
-
const instance = Object.create(klass.prototype);
|
|
2274
2023
|
const processed_props = process_for_deserialization(props, verbose);
|
|
2024
|
+
if (entry.from_plain) {
|
|
2025
|
+
return entry.from_plain(processed_props);
|
|
2026
|
+
}
|
|
2027
|
+
const instance = Object.create(entry.klass.prototype);
|
|
2275
2028
|
Object.assign(instance, processed_props);
|
|
2276
2029
|
return instance;
|
|
2277
2030
|
}
|
|
@@ -2344,290 +2097,624 @@ class Jqhtml_Local_Storage {
|
|
|
2344
2097
|
* @returns {boolean}
|
|
2345
2098
|
* @private
|
|
2346
2099
|
*/
|
|
2347
|
-
static _is_storage_available() {
|
|
2100
|
+
static _is_storage_available() {
|
|
2101
|
+
try {
|
|
2102
|
+
const storage = window.localStorage;
|
|
2103
|
+
const test = '__jqhtml_storage_test__';
|
|
2104
|
+
storage.setItem(test, test);
|
|
2105
|
+
storage.removeItem(test);
|
|
2106
|
+
return true;
|
|
2107
|
+
}
|
|
2108
|
+
catch (e) {
|
|
2109
|
+
return false;
|
|
2110
|
+
}
|
|
2111
|
+
}
|
|
2112
|
+
/**
|
|
2113
|
+
* Check if verbose mode is enabled
|
|
2114
|
+
* @private
|
|
2115
|
+
*/
|
|
2116
|
+
static _is_verbose() {
|
|
2117
|
+
return window.jqhtml?.debug?.verbose === true;
|
|
2118
|
+
}
|
|
2119
|
+
/**
|
|
2120
|
+
* Validate storage scope and clear JQHTML keys if cache key changed
|
|
2121
|
+
* Only clears keys prefixed with 'jqhtml::' to preserve other libraries' data
|
|
2122
|
+
* @private
|
|
2123
|
+
*/
|
|
2124
|
+
static _validate_scope() {
|
|
2125
|
+
if (!this._storage_available) {
|
|
2126
|
+
return;
|
|
2127
|
+
}
|
|
2128
|
+
try {
|
|
2129
|
+
const stored_key = localStorage.getItem('_jqhtml_cache_key');
|
|
2130
|
+
// If the scope marker (core version + developer key) changed, clear only JQHTML keys
|
|
2131
|
+
if (stored_key !== null && stored_key !== this._scope_marker) {
|
|
2132
|
+
console.log('[JQHTML Local Storage] Cache scope changed, clearing JQHTML keys:', {
|
|
2133
|
+
old_key: stored_key,
|
|
2134
|
+
new_key: this._scope_marker,
|
|
2135
|
+
});
|
|
2136
|
+
this._clear_jqhtml_keys();
|
|
2137
|
+
localStorage.setItem('_jqhtml_cache_key', this._scope_marker);
|
|
2138
|
+
}
|
|
2139
|
+
else if (stored_key === null) {
|
|
2140
|
+
// First time JQHTML is using this storage - just set the key, don't clear
|
|
2141
|
+
console.log('[JQHTML Local Storage] Initializing cache scope (first use):', {
|
|
2142
|
+
new_key: this._scope_marker,
|
|
2143
|
+
});
|
|
2144
|
+
localStorage.setItem('_jqhtml_cache_key', this._scope_marker);
|
|
2145
|
+
}
|
|
2146
|
+
}
|
|
2147
|
+
catch (e) {
|
|
2148
|
+
console.error('[JQHTML Local Storage] Failed to validate scope:', e);
|
|
2149
|
+
}
|
|
2150
|
+
}
|
|
2151
|
+
/**
|
|
2152
|
+
* Clear only JQHTML keys from storage (keys starting with 'jqhtml::')
|
|
2153
|
+
* Preserves keys from other libraries
|
|
2154
|
+
* @private
|
|
2155
|
+
*/
|
|
2156
|
+
static _clear_jqhtml_keys() {
|
|
2157
|
+
if (!this._storage_available) {
|
|
2158
|
+
return;
|
|
2159
|
+
}
|
|
2160
|
+
const keys_to_remove = [];
|
|
2161
|
+
// Collect all JQHTML keys
|
|
2162
|
+
for (let i = 0; i < localStorage.length; i++) {
|
|
2163
|
+
const key = localStorage.key(i);
|
|
2164
|
+
if (key && key.startsWith('jqhtml::')) {
|
|
2165
|
+
keys_to_remove.push(key);
|
|
2166
|
+
}
|
|
2167
|
+
}
|
|
2168
|
+
// Remove collected keys
|
|
2169
|
+
keys_to_remove.forEach(key => {
|
|
2170
|
+
try {
|
|
2171
|
+
localStorage.removeItem(key);
|
|
2172
|
+
}
|
|
2173
|
+
catch (e) {
|
|
2174
|
+
console.error('[JQHTML Local Storage] Failed to remove key:', key, e);
|
|
2175
|
+
}
|
|
2176
|
+
});
|
|
2177
|
+
console.log(`[JQHTML Local Storage] Cleared ${keys_to_remove.length} JQHTML keys`);
|
|
2178
|
+
}
|
|
2179
|
+
/**
|
|
2180
|
+
* Build scoped key with JQHTML namespace prefix
|
|
2181
|
+
* @param {string} key - Developer-provided key
|
|
2182
|
+
* @returns {string}
|
|
2183
|
+
* @private
|
|
2184
|
+
*/
|
|
2185
|
+
static _build_key(key) {
|
|
2186
|
+
return `jqhtml::${key}::${this._cache_key}`;
|
|
2187
|
+
}
|
|
2188
|
+
/**
|
|
2189
|
+
* Check if storage is ready for use
|
|
2190
|
+
* @returns {boolean}
|
|
2191
|
+
* @private
|
|
2192
|
+
*/
|
|
2193
|
+
static _is_ready() {
|
|
2194
|
+
return this._storage_available === true && this._cache_key !== null && this._initialized;
|
|
2195
|
+
}
|
|
2196
|
+
/**
|
|
2197
|
+
* Set item in localStorage with class-aware serialization.
|
|
2198
|
+
*
|
|
2199
|
+
* If serialization fails (e.g., unregistered class instances, circular refs),
|
|
2200
|
+
* the existing cache entry is removed and nothing is stored.
|
|
2201
|
+
*
|
|
2202
|
+
* @param {string} key - Storage key
|
|
2203
|
+
* @param {*} value - Value to store (primitives, objects, arrays, or registered class instances)
|
|
2204
|
+
*/
|
|
2205
|
+
static set(key, value) {
|
|
2206
|
+
if (!this._is_ready()) {
|
|
2207
|
+
return;
|
|
2208
|
+
}
|
|
2209
|
+
const verbose = this._is_verbose();
|
|
2210
|
+
const scoped_key = this._build_key(key);
|
|
2211
|
+
// Serialize with class-aware processing
|
|
2212
|
+
const serialized = serialize_value(value, verbose);
|
|
2213
|
+
if (serialized === null) {
|
|
2214
|
+
// Serialization failed - remove any existing cache entry
|
|
2215
|
+
if (verbose) {
|
|
2216
|
+
console.warn(`[JQHTML Cache] Failed to serialize value for key "${key}". ` +
|
|
2217
|
+
`Removing existing cache entry if present.`);
|
|
2218
|
+
}
|
|
2219
|
+
try {
|
|
2220
|
+
localStorage.removeItem(scoped_key);
|
|
2221
|
+
}
|
|
2222
|
+
catch (e) {
|
|
2223
|
+
// Ignore removal errors
|
|
2224
|
+
}
|
|
2225
|
+
return;
|
|
2226
|
+
}
|
|
2227
|
+
// Check size before attempting to store (1MB limit)
|
|
2228
|
+
const size_bytes = new Blob([serialized]).size;
|
|
2229
|
+
const size_mb = size_bytes / (1024 * 1024);
|
|
2230
|
+
if (size_mb > 1) {
|
|
2231
|
+
if (verbose) {
|
|
2232
|
+
console.warn(`[JQHTML Cache] Skipping set - value too large (${size_mb.toFixed(2)}MB > 1MB limit)`, { key, size_bytes, size_mb });
|
|
2233
|
+
}
|
|
2234
|
+
// Remove existing cache entry since we can't update it
|
|
2235
|
+
try {
|
|
2236
|
+
localStorage.removeItem(scoped_key);
|
|
2237
|
+
}
|
|
2238
|
+
catch (e) {
|
|
2239
|
+
// Ignore removal errors
|
|
2240
|
+
}
|
|
2241
|
+
return;
|
|
2242
|
+
}
|
|
2243
|
+
this._set_item(key, serialized);
|
|
2244
|
+
}
|
|
2245
|
+
/**
|
|
2246
|
+
* Get item from localStorage with class-aware deserialization.
|
|
2247
|
+
*
|
|
2248
|
+
* If deserialization fails, returns null (as if no cache exists).
|
|
2249
|
+
*
|
|
2250
|
+
* @param {string} key - Storage key
|
|
2251
|
+
* @returns {*|null} Deserialized value with class instances restored, or null if not found/failed
|
|
2252
|
+
*/
|
|
2253
|
+
static get(key) {
|
|
2254
|
+
if (!this._is_ready()) {
|
|
2255
|
+
return null;
|
|
2256
|
+
}
|
|
2257
|
+
const verbose = this._is_verbose();
|
|
2258
|
+
const scoped_key = this._build_key(key);
|
|
2259
|
+
try {
|
|
2260
|
+
const serialized = localStorage.getItem(scoped_key);
|
|
2261
|
+
if (serialized === null) {
|
|
2262
|
+
return null;
|
|
2263
|
+
}
|
|
2264
|
+
const result = deserialize_value(serialized, verbose);
|
|
2265
|
+
if (result === null) {
|
|
2266
|
+
// Deserialization failed - treat as cache miss
|
|
2267
|
+
if (verbose) {
|
|
2268
|
+
console.warn(`[JQHTML Cache] Failed to deserialize value for key "${key}". ` +
|
|
2269
|
+
`Treating as cache miss.`);
|
|
2270
|
+
}
|
|
2271
|
+
return null;
|
|
2272
|
+
}
|
|
2273
|
+
return result;
|
|
2274
|
+
}
|
|
2275
|
+
catch (e) {
|
|
2276
|
+
if (verbose) {
|
|
2277
|
+
console.warn('[JQHTML Cache] Failed to get item:', e);
|
|
2278
|
+
}
|
|
2279
|
+
return null;
|
|
2280
|
+
}
|
|
2281
|
+
}
|
|
2282
|
+
/**
|
|
2283
|
+
* Remove item from localStorage
|
|
2284
|
+
* @param {string} key - Storage key
|
|
2285
|
+
*/
|
|
2286
|
+
static remove(key) {
|
|
2287
|
+
if (!this._is_ready()) {
|
|
2288
|
+
return;
|
|
2289
|
+
}
|
|
2290
|
+
this._remove_item(key);
|
|
2291
|
+
}
|
|
2292
|
+
/**
|
|
2293
|
+
* Serialize a value to its class-aware TEXT form - the same text set() stores.
|
|
2294
|
+
*
|
|
2295
|
+
* This is the copy-by-value primitive the rest of the framework uses whenever
|
|
2296
|
+
* data has to cross from one component to another (load-coordinator.ts hands a
|
|
2297
|
+
* leader's data to its followers through it). Plain JSON.stringify is not a
|
|
2298
|
+
* substitute: it consults toJSON() and produces a wire form that deserialize()
|
|
2299
|
+
* cannot recognise, so a registered class would come back as a plain object.
|
|
2300
|
+
*
|
|
2301
|
+
* @returns The text, or null when the value as a whole cannot be expressed.
|
|
2302
|
+
*/
|
|
2303
|
+
static serialize(value) {
|
|
2304
|
+
return serialize_value(value, this._is_verbose());
|
|
2305
|
+
}
|
|
2306
|
+
/**
|
|
2307
|
+
* Rebuild a value from text produced by serialize(), restoring Date, Map, Set
|
|
2308
|
+
* and every register_cache_class() class. Returns null when the text is not
|
|
2309
|
+
* restorable (a registered from_plain threw at the root) - the same signal
|
|
2310
|
+
* get() gives for a corrupt entry.
|
|
2311
|
+
*/
|
|
2312
|
+
static deserialize(text) {
|
|
2313
|
+
return deserialize_value(text, this._is_verbose());
|
|
2314
|
+
}
|
|
2315
|
+
/**
|
|
2316
|
+
* Perform a serialize/deserialize round-trip on a value.
|
|
2317
|
+
*
|
|
2318
|
+
* The result is ALWAYS jqhtml's own copy: nothing of the caller's object graph
|
|
2319
|
+
* is aliased through, and a value the serializer cannot express is dropped
|
|
2320
|
+
* rather than smuggled out. That is what makes `this.data` identical whether it
|
|
2321
|
+
* came from on_load() or from a cache hit - the old "on failure return the
|
|
2322
|
+
* original" branch broke exactly that promise, and only on the hard cases.
|
|
2323
|
+
*
|
|
2324
|
+
* @param {any} value - The value to normalize
|
|
2325
|
+
* @param {string} [component_name] - Names the component in development warnings.
|
|
2326
|
+
* Omit to convert silently (the unit tests and non-component callers).
|
|
2327
|
+
* @returns {any} The round-tripped value. Never the original object.
|
|
2328
|
+
*/
|
|
2329
|
+
static normalize_for_cache(value, component_name) {
|
|
2330
|
+
const verbose = this._is_verbose();
|
|
2331
|
+
const collector = make_strip_collector(component_name);
|
|
2332
|
+
// Serialize to JSON string
|
|
2333
|
+
const serialized = serialize_value(value, verbose, 'this.data', collector);
|
|
2334
|
+
if (serialized === null) {
|
|
2335
|
+
// The value as a WHOLE could not be expressed (it was itself a function,
|
|
2336
|
+
// a promise, a DOM node...). The round trip of such a value is nothing;
|
|
2337
|
+
// returning the original would put an uncacheable object into this.data.
|
|
2338
|
+
return {};
|
|
2339
|
+
}
|
|
2340
|
+
// Deserialize back to object
|
|
2341
|
+
const deserialized = deserialize_value(serialized, verbose);
|
|
2342
|
+
// `null` from deserialize_value() is ambiguous: it means "failed", but a value
|
|
2343
|
+
// that legitimately serialized to the text `null` also comes back as null. The
|
|
2344
|
+
// serialized text disambiguates.
|
|
2345
|
+
if (deserialized === null && serialized !== 'null') {
|
|
2346
|
+
// Only reachable when a registered class constructor blew up on restore.
|
|
2347
|
+
return {};
|
|
2348
|
+
}
|
|
2349
|
+
return deserialized;
|
|
2350
|
+
}
|
|
2351
|
+
/**
|
|
2352
|
+
* Internal set implementation with scope validation and quota handling
|
|
2353
|
+
* @param {string} key
|
|
2354
|
+
* @param {string} serialized - Pre-serialized JSON string
|
|
2355
|
+
* @private
|
|
2356
|
+
*/
|
|
2357
|
+
static _set_item(key, serialized) {
|
|
2358
|
+
// Validate scope before every write
|
|
2359
|
+
this._validate_scope();
|
|
2360
|
+
const scoped_key = this._build_key(key);
|
|
2348
2361
|
try {
|
|
2349
|
-
|
|
2350
|
-
const test = '__jqhtml_storage_test__';
|
|
2351
|
-
storage.setItem(test, test);
|
|
2352
|
-
storage.removeItem(test);
|
|
2353
|
-
return true;
|
|
2362
|
+
localStorage.setItem(scoped_key, serialized);
|
|
2354
2363
|
}
|
|
2355
2364
|
catch (e) {
|
|
2356
|
-
|
|
2365
|
+
// Check if quota exceeded
|
|
2366
|
+
if (e.name === 'QuotaExceededError' || e.code === 22) {
|
|
2367
|
+
console.warn('[JQHTML Local Storage] Quota exceeded, clearing JQHTML keys and retrying');
|
|
2368
|
+
// Clear only JQHTML keys and retry once
|
|
2369
|
+
this._clear_jqhtml_keys();
|
|
2370
|
+
// Re-stamp the SCOPE MARKER, not the raw developer key: _validate_scope()
|
|
2371
|
+
// compares against `${CORE_VERSION}::${key}`, so writing the bare key here
|
|
2372
|
+
// made the very next write look like a scope change and wipe the cache again.
|
|
2373
|
+
localStorage.setItem('_jqhtml_cache_key', this._scope_marker);
|
|
2374
|
+
try {
|
|
2375
|
+
localStorage.setItem(scoped_key, serialized);
|
|
2376
|
+
}
|
|
2377
|
+
catch (retry_error) {
|
|
2378
|
+
console.error('[JQHTML Local Storage] Failed to set item after clearing JQHTML keys:', retry_error);
|
|
2379
|
+
}
|
|
2380
|
+
}
|
|
2381
|
+
else {
|
|
2382
|
+
console.error('[JQHTML Local Storage] Failed to set item:', e);
|
|
2383
|
+
}
|
|
2357
2384
|
}
|
|
2358
2385
|
}
|
|
2359
2386
|
/**
|
|
2360
|
-
*
|
|
2387
|
+
* Internal remove implementation
|
|
2388
|
+
* @param {string} key
|
|
2361
2389
|
* @private
|
|
2362
2390
|
*/
|
|
2363
|
-
static
|
|
2364
|
-
|
|
2391
|
+
static _remove_item(key) {
|
|
2392
|
+
const scoped_key = this._build_key(key);
|
|
2393
|
+
try {
|
|
2394
|
+
localStorage.removeItem(scoped_key);
|
|
2395
|
+
}
|
|
2396
|
+
catch (e) {
|
|
2397
|
+
console.error('[JQHTML Local Storage] Failed to remove item:', e);
|
|
2398
|
+
}
|
|
2365
2399
|
}
|
|
2400
|
+
}
|
|
2401
|
+
Jqhtml_Local_Storage._cache_key = null;
|
|
2402
|
+
/** Versioned scope identity - compared in _validate_scope() to clear on a core upgrade. */
|
|
2403
|
+
Jqhtml_Local_Storage._scope_marker = null;
|
|
2404
|
+
Jqhtml_Local_Storage._cache_mode = 'data';
|
|
2405
|
+
Jqhtml_Local_Storage._storage_available = null;
|
|
2406
|
+
Jqhtml_Local_Storage._initialized = false;
|
|
2407
|
+
|
|
2408
|
+
/**
|
|
2409
|
+
* Load Coordinator - Request deduplication for component on_load() calls
|
|
2410
|
+
*
|
|
2411
|
+
* Coordinates parallel component loading to prevent duplicate requests.
|
|
2412
|
+
* When multiple components with identical names and args load simultaneously,
|
|
2413
|
+
* only the first (leader) executes on_load(). Others (followers) wait for
|
|
2414
|
+
* the leader's result.
|
|
2415
|
+
*
|
|
2416
|
+
* Key Concepts:
|
|
2417
|
+
* - **INVOCATION_KEY**: Unique identifier for component name + args combination
|
|
2418
|
+
* - **Leader**: First component to reach on_load() for a given INVOCATION_KEY
|
|
2419
|
+
* - **Follower**: Subsequent components that wait for leader's result
|
|
2420
|
+
*
|
|
2421
|
+
* Lifecycle:
|
|
2422
|
+
* 1. Leader reaches on_load() → create coordination entry
|
|
2423
|
+
* 2. Followers reach on_load() → join waiting queue
|
|
2424
|
+
* 3. Leader completes → distribute data to all followers
|
|
2425
|
+
* 4. Clear coordination entry (no caching)
|
|
2426
|
+
*
|
|
2427
|
+
* The hand-off is a copy, and it is made by the cache serializer
|
|
2428
|
+
* (Jqhtml_Local_Storage.serialize()/deserialize()), never by JSON.stringify.
|
|
2429
|
+
* A follower never runs on_load() and never revalidates, so whatever it is
|
|
2430
|
+
* handed is final: the copy has to rebuild Date, Map, Set and every
|
|
2431
|
+
* register_cache_class() instance exactly as the leader's this.data holds them.
|
|
2432
|
+
* JSON.stringify would consult toJSON() and hand out a wire form that
|
|
2433
|
+
* normalize_for_cache() cannot recognise - the follower would then render
|
|
2434
|
+
* against plain objects while the leader renders against instances.
|
|
2435
|
+
*
|
|
2436
|
+
* @internal This class is not exposed in the public API
|
|
2437
|
+
*/
|
|
2438
|
+
class Load_Coordinator {
|
|
2366
2439
|
/**
|
|
2367
|
-
*
|
|
2368
|
-
*
|
|
2369
|
-
*
|
|
2440
|
+
* Generate INVOCATION_KEY from component name and args
|
|
2441
|
+
* Uses deterministic JSON serialization (sorted keys)
|
|
2442
|
+
* Excludes internal properties (those starting with _)
|
|
2443
|
+
*
|
|
2444
|
+
* For functions/objects:
|
|
2445
|
+
* - Checks for ._jqhtml_cache_id property (assigned by RSpade)
|
|
2446
|
+
* - Falls back to .jqhtml_cache_id() method if property doesn't exist
|
|
2447
|
+
* - If neither exists, marks property as uncacheable
|
|
2448
|
+
*
|
|
2449
|
+
* Returns object with:
|
|
2450
|
+
* - key: Cache key string, or null if uncacheable
|
|
2451
|
+
* - uncacheable_property: Name of first property that prevented caching (for debugging)
|
|
2370
2452
|
*/
|
|
2371
|
-
static
|
|
2372
|
-
|
|
2373
|
-
|
|
2374
|
-
|
|
2375
|
-
|
|
2376
|
-
|
|
2377
|
-
|
|
2378
|
-
|
|
2379
|
-
console.log('[JQHTML Local Storage] Cache scope changed, clearing JQHTML keys:', {
|
|
2380
|
-
old_key: stored_key,
|
|
2381
|
-
new_key: this._scope_marker,
|
|
2382
|
-
});
|
|
2383
|
-
this._clear_jqhtml_keys();
|
|
2384
|
-
localStorage.setItem('_jqhtml_cache_key', this._scope_marker);
|
|
2453
|
+
static generate_invocation_key(component_name, args, options = {}) {
|
|
2454
|
+
let uncacheable_property;
|
|
2455
|
+
let uncacheable_reason;
|
|
2456
|
+
// Filter out internal properties (starting with _) and serialize args
|
|
2457
|
+
const serializable_args = {};
|
|
2458
|
+
for (const key of Object.keys(args).sort()) {
|
|
2459
|
+
if (key.startsWith('_')) {
|
|
2460
|
+
continue; // Skip internal properties
|
|
2385
2461
|
}
|
|
2386
|
-
|
|
2387
|
-
|
|
2388
|
-
|
|
2389
|
-
|
|
2390
|
-
|
|
2391
|
-
|
|
2462
|
+
// Skip framework properties that shouldn't affect cache identity
|
|
2463
|
+
// Note: _load_only and _load_render_only are already filtered by the _ prefix check above
|
|
2464
|
+
if (key === 'use_cached_data') {
|
|
2465
|
+
continue;
|
|
2466
|
+
}
|
|
2467
|
+
const value = args[key];
|
|
2468
|
+
const value_type = typeof value;
|
|
2469
|
+
// Handle primitives (string, number, boolean, null, undefined)
|
|
2470
|
+
if (value === null || value === undefined ||
|
|
2471
|
+
value_type === 'string' || value_type === 'number' ||
|
|
2472
|
+
value_type === 'boolean') {
|
|
2473
|
+
serializable_args[key] = value;
|
|
2474
|
+
continue;
|
|
2475
|
+
}
|
|
2476
|
+
// Handle functions and objects
|
|
2477
|
+
if (value_type === 'function' || value_type === 'object') {
|
|
2478
|
+
// Check for ._jqhtml_cache_id property (fastest, what RSpade assigns)
|
|
2479
|
+
if (value._jqhtml_cache_id !== undefined) {
|
|
2480
|
+
serializable_args[key] = `__JQHTML_CACHE_ID__:${String(value._jqhtml_cache_id)}`;
|
|
2481
|
+
continue;
|
|
2482
|
+
}
|
|
2483
|
+
// Check for .jqhtml_cache_id() method (more flexible, for custom objects)
|
|
2484
|
+
if (typeof value.jqhtml_cache_id === 'function') {
|
|
2485
|
+
try {
|
|
2486
|
+
const cache_id = value.jqhtml_cache_id();
|
|
2487
|
+
serializable_args[key] = `__JQHTML_CACHE_ID__:${String(cache_id)}`;
|
|
2488
|
+
continue;
|
|
2489
|
+
}
|
|
2490
|
+
catch (error) {
|
|
2491
|
+
// Method threw error - treat as uncacheable
|
|
2492
|
+
if (!uncacheable_property) {
|
|
2493
|
+
uncacheable_property = key;
|
|
2494
|
+
uncacheable_reason = 'cache-id-threw';
|
|
2495
|
+
}
|
|
2496
|
+
return { key: null, uncacheable_property, uncacheable_reason };
|
|
2497
|
+
}
|
|
2498
|
+
}
|
|
2499
|
+
// No author-supplied id. The cache may fall back to keying by
|
|
2500
|
+
// deterministic content; deduplication deliberately may not.
|
|
2501
|
+
if (options.allow_content_serialization) {
|
|
2502
|
+
const serialized = serialize_for_cache_key(value);
|
|
2503
|
+
if (serialized.ok) {
|
|
2504
|
+
serializable_args[key] = `__JQHTML_CONTENT__:${serialized.text}`;
|
|
2505
|
+
continue;
|
|
2506
|
+
}
|
|
2507
|
+
if (!uncacheable_property) {
|
|
2508
|
+
uncacheable_property = key;
|
|
2509
|
+
// This package compiles with strictNullChecks off, and without it
|
|
2510
|
+
// TypeScript will not narrow a discriminated union by its boolean
|
|
2511
|
+
// discriminant - so `serialized` is still the full Serialize_Result
|
|
2512
|
+
// here even though `ok` has been ruled out above. The cast states
|
|
2513
|
+
// what the control flow already guarantees.
|
|
2514
|
+
uncacheable_reason = serialized.reason;
|
|
2515
|
+
}
|
|
2516
|
+
return { key: null, uncacheable_property, uncacheable_reason };
|
|
2517
|
+
}
|
|
2518
|
+
if (!uncacheable_property) {
|
|
2519
|
+
uncacheable_property = key;
|
|
2520
|
+
uncacheable_reason = value_type === 'function' ? 'function' : 'object';
|
|
2521
|
+
}
|
|
2522
|
+
return { key: null, uncacheable_property, uncacheable_reason };
|
|
2523
|
+
}
|
|
2524
|
+
// Unknown type (symbol, bigint, etc.) - uncacheable
|
|
2525
|
+
if (!uncacheable_property) {
|
|
2526
|
+
uncacheable_property = key;
|
|
2527
|
+
uncacheable_reason = value_type;
|
|
2392
2528
|
}
|
|
2529
|
+
return { key: null, uncacheable_property, uncacheable_reason };
|
|
2393
2530
|
}
|
|
2394
|
-
|
|
2395
|
-
|
|
2531
|
+
// Try to serialize - if it fails (shouldn't happen now, but safety net), return null
|
|
2532
|
+
try {
|
|
2533
|
+
const sorted_args = JSON.stringify(serializable_args);
|
|
2534
|
+
return { key: `${component_name}::${sorted_args}` };
|
|
2535
|
+
}
|
|
2536
|
+
catch (error) {
|
|
2537
|
+
// Serialization failed unexpectedly
|
|
2538
|
+
return { key: null, uncacheable_property };
|
|
2396
2539
|
}
|
|
2397
2540
|
}
|
|
2398
2541
|
/**
|
|
2399
|
-
*
|
|
2400
|
-
*
|
|
2401
|
-
*
|
|
2542
|
+
* Check if a component should execute on_load() or wait for existing request
|
|
2543
|
+
* Returns true if component should execute (is leader), false if should wait (is follower)
|
|
2544
|
+
*
|
|
2545
|
+
* @param key - The dedup key the caller captured for this load. Every coordinator
|
|
2546
|
+
* method takes it, because args may legally change during on_load()
|
|
2547
|
+
* and a recomputed key would address a different (or no) entry.
|
|
2402
2548
|
*/
|
|
2403
|
-
static
|
|
2404
|
-
|
|
2405
|
-
|
|
2549
|
+
static should_execute_on_load(component, key) {
|
|
2550
|
+
const entry = this._registry.get(key);
|
|
2551
|
+
if (!entry) {
|
|
2552
|
+
// No existing request - this component becomes the leader
|
|
2553
|
+
return true;
|
|
2406
2554
|
}
|
|
2407
|
-
|
|
2408
|
-
|
|
2409
|
-
|
|
2410
|
-
|
|
2411
|
-
if (key && key.startsWith('jqhtml::')) {
|
|
2412
|
-
keys_to_remove.push(key);
|
|
2413
|
-
}
|
|
2555
|
+
if (entry.status === 'loading') {
|
|
2556
|
+
// Request in progress - this component becomes a follower
|
|
2557
|
+
entry.waiting.push(component);
|
|
2558
|
+
return false;
|
|
2414
2559
|
}
|
|
2415
|
-
//
|
|
2416
|
-
|
|
2417
|
-
|
|
2418
|
-
localStorage.removeItem(key);
|
|
2419
|
-
}
|
|
2420
|
-
catch (e) {
|
|
2421
|
-
console.error('[JQHTML Local Storage] Failed to remove key:', key, e);
|
|
2422
|
-
}
|
|
2423
|
-
});
|
|
2424
|
-
console.log(`[JQHTML Local Storage] Cleared ${keys_to_remove.length} JQHTML keys`);
|
|
2560
|
+
// Entry exists but completed/failed - should have been cleaned up
|
|
2561
|
+
// Treat as new leader
|
|
2562
|
+
return true;
|
|
2425
2563
|
}
|
|
2426
2564
|
/**
|
|
2427
|
-
*
|
|
2428
|
-
*
|
|
2429
|
-
*
|
|
2430
|
-
* @
|
|
2565
|
+
* Register a leader component that will execute on_load()
|
|
2566
|
+
* Creates coordination entry and returns a function to call when data is ready
|
|
2567
|
+
*
|
|
2568
|
+
* @param key - The dedup key captured by the caller (see should_execute_on_load)
|
|
2569
|
+
* @returns A function that accepts the final data and completes coordination
|
|
2431
2570
|
*/
|
|
2432
|
-
static
|
|
2433
|
-
|
|
2571
|
+
static register_leader(component, key) {
|
|
2572
|
+
// Create a promise that we control - it settles when coordination completes or fails
|
|
2573
|
+
let resolve_promise;
|
|
2574
|
+
let reject_promise;
|
|
2575
|
+
const coordination_promise = new Promise((resolve, reject) => {
|
|
2576
|
+
resolve_promise = resolve;
|
|
2577
|
+
reject_promise = reject;
|
|
2578
|
+
});
|
|
2579
|
+
// A leader with no followers still has to be able to reject this promise on
|
|
2580
|
+
// error; without a handler that rejection surfaces as an unhandled rejection.
|
|
2581
|
+
coordination_promise.catch(() => { });
|
|
2582
|
+
const entry = {
|
|
2583
|
+
status: 'loading',
|
|
2584
|
+
promise: coordination_promise, // Followers await THIS promise, not on_load's
|
|
2585
|
+
resolve_promise,
|
|
2586
|
+
reject_promise,
|
|
2587
|
+
leader_component: component,
|
|
2588
|
+
leader_data: null,
|
|
2589
|
+
waiting: []
|
|
2590
|
+
};
|
|
2591
|
+
this._registry.set(key, entry);
|
|
2592
|
+
// Return cleanup function that accepts the final data
|
|
2593
|
+
return (final_data) => this._complete_coordination(key, component, final_data);
|
|
2434
2594
|
}
|
|
2435
2595
|
/**
|
|
2436
|
-
*
|
|
2437
|
-
*
|
|
2438
|
-
* @private
|
|
2596
|
+
* Get the coordination promise for a follower component
|
|
2597
|
+
* Returns a promise that resolves when the leader completes, or rejects if it failed
|
|
2439
2598
|
*/
|
|
2440
|
-
static
|
|
2441
|
-
|
|
2599
|
+
static get_coordination_promise(key) {
|
|
2600
|
+
const entry = this._registry.get(key);
|
|
2601
|
+
if (!entry || entry.status !== 'loading') {
|
|
2602
|
+
return null;
|
|
2603
|
+
}
|
|
2604
|
+
return entry.promise;
|
|
2442
2605
|
}
|
|
2443
2606
|
/**
|
|
2444
|
-
*
|
|
2445
|
-
*
|
|
2446
|
-
*
|
|
2447
|
-
* the existing cache entry is removed and nothing is stored.
|
|
2607
|
+
* Complete coordination after leader's on_load() finishes
|
|
2608
|
+
* Stores leader's data, marks entry as completed, and resolves the promise.
|
|
2609
|
+
* Followers retrieve the data themselves via get_leader_data().
|
|
2448
2610
|
*
|
|
2449
|
-
* @param
|
|
2450
|
-
* @param
|
|
2611
|
+
* @param key - The coordination key captured at registration
|
|
2612
|
+
* @param leader - The leader component
|
|
2613
|
+
* @param final_data - The final data after on_load and normalization
|
|
2614
|
+
* @private
|
|
2451
2615
|
*/
|
|
2452
|
-
static
|
|
2453
|
-
|
|
2616
|
+
static _complete_coordination(key, leader, final_data) {
|
|
2617
|
+
const entry = this._registry.get(key);
|
|
2618
|
+
if (!entry) {
|
|
2454
2619
|
return;
|
|
2455
2620
|
}
|
|
2456
|
-
|
|
2457
|
-
|
|
2458
|
-
//
|
|
2459
|
-
|
|
2460
|
-
|
|
2461
|
-
|
|
2462
|
-
|
|
2463
|
-
|
|
2464
|
-
|
|
2465
|
-
}
|
|
2466
|
-
try {
|
|
2467
|
-
localStorage.removeItem(scoped_key);
|
|
2468
|
-
}
|
|
2469
|
-
catch (e) {
|
|
2470
|
-
// Ignore removal errors
|
|
2471
|
-
}
|
|
2472
|
-
return;
|
|
2621
|
+
// Stored as TEXT so each follower rebuilds its own object graph - sharing one
|
|
2622
|
+
// decoded object would let one component's mutation reach every other.
|
|
2623
|
+
// The cache serializer, not JSON.stringify: this.data holds live Date/Map/Set
|
|
2624
|
+
// and register_cache_class() instances, and only the serializer that made
|
|
2625
|
+
// them knows how to carry them across. null means the data as a whole could
|
|
2626
|
+
// not be expressed; followers then load independently.
|
|
2627
|
+
entry.leader_data = Jqhtml_Local_Storage.serialize(final_data);
|
|
2628
|
+
entry.status = 'completed';
|
|
2629
|
+
if (window.jqhtml?.debug?.verbose) {
|
|
2630
|
+
console.log(`[Load Coordinator] Leader ${leader._cid} completed, data available for ${entry.waiting.length} followers`, { key, data: entry.leader_data });
|
|
2473
2631
|
}
|
|
2474
|
-
//
|
|
2475
|
-
|
|
2476
|
-
|
|
2477
|
-
|
|
2478
|
-
|
|
2479
|
-
|
|
2480
|
-
}
|
|
2481
|
-
// Remove existing cache entry since we can't update it
|
|
2482
|
-
try {
|
|
2483
|
-
localStorage.removeItem(scoped_key);
|
|
2484
|
-
}
|
|
2485
|
-
catch (e) {
|
|
2486
|
-
// Ignore removal errors
|
|
2487
|
-
}
|
|
2488
|
-
return;
|
|
2632
|
+
// Resolve the promise - followers waiting on it will now wake up
|
|
2633
|
+
entry.resolve_promise();
|
|
2634
|
+
// Nobody is waiting, so nothing will ever come back to collect the data.
|
|
2635
|
+
// Without this the registry grows once per distinct name+args, forever.
|
|
2636
|
+
if (entry.waiting.length === 0) {
|
|
2637
|
+
this._registry.delete(key);
|
|
2489
2638
|
}
|
|
2490
|
-
this._set_item(key, serialized);
|
|
2491
2639
|
}
|
|
2492
2640
|
/**
|
|
2493
|
-
* Get
|
|
2494
|
-
*
|
|
2495
|
-
*
|
|
2641
|
+
* Get leader's data for a follower component
|
|
2642
|
+
* Called by follower after coordination promise resolves
|
|
2643
|
+
* Returns a freshly parsed copy and cleans up if this is the last follower
|
|
2496
2644
|
*
|
|
2497
|
-
* @param
|
|
2498
|
-
* @returns {*|null} Deserialized value with class instances restored, or null if not found/failed
|
|
2645
|
+
* @param key - The dedup key captured by the follower before it began waiting
|
|
2499
2646
|
*/
|
|
2500
|
-
static
|
|
2501
|
-
|
|
2647
|
+
static get_leader_data(component, key) {
|
|
2648
|
+
const entry = this._registry.get(key);
|
|
2649
|
+
if (!entry || entry.status !== 'completed' || entry.leader_data === null) {
|
|
2502
2650
|
return null;
|
|
2503
2651
|
}
|
|
2504
|
-
|
|
2505
|
-
const
|
|
2506
|
-
|
|
2507
|
-
|
|
2508
|
-
if (serialized === null) {
|
|
2509
|
-
return null;
|
|
2510
|
-
}
|
|
2511
|
-
const result = deserialize_value(serialized, verbose);
|
|
2512
|
-
if (result === null) {
|
|
2513
|
-
// Deserialization failed - treat as cache miss
|
|
2514
|
-
if (verbose) {
|
|
2515
|
-
console.warn(`[JQHTML Cache] Failed to deserialize value for key "${key}". ` +
|
|
2516
|
-
`Treating as cache miss.`);
|
|
2517
|
-
}
|
|
2518
|
-
return null;
|
|
2519
|
-
}
|
|
2520
|
-
return result;
|
|
2652
|
+
// Remove this follower from the waiting list
|
|
2653
|
+
const follower_index = entry.waiting.indexOf(component);
|
|
2654
|
+
if (follower_index !== -1) {
|
|
2655
|
+
entry.waiting.splice(follower_index, 1);
|
|
2521
2656
|
}
|
|
2522
|
-
|
|
2523
|
-
|
|
2524
|
-
|
|
2525
|
-
|
|
2526
|
-
|
|
2657
|
+
// One deserialize per follower: each gets its OWN object graph, never a
|
|
2658
|
+
// shared reference, with the same instances the leader's this.data holds.
|
|
2659
|
+
const data = Jqhtml_Local_Storage.deserialize(entry.leader_data);
|
|
2660
|
+
if (window.jqhtml?.debug?.verbose) {
|
|
2661
|
+
console.log(`[Load Coordinator] Follower ${component._cid} retrieving data from leader ${entry.leader_component._cid}`, { key, remaining_followers: entry.waiting.length });
|
|
2527
2662
|
}
|
|
2528
|
-
|
|
2529
|
-
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
|
|
2534
|
-
if (!this._is_ready()) {
|
|
2535
|
-
return;
|
|
2663
|
+
// If this was the last follower, clean up the entry
|
|
2664
|
+
if (entry.waiting.length === 0) {
|
|
2665
|
+
this._registry.delete(key);
|
|
2666
|
+
if (window.jqhtml?.debug?.verbose) {
|
|
2667
|
+
console.log(`[Load Coordinator] Coordination complete for key: ${key}`, { registry_size: this._registry.size });
|
|
2668
|
+
}
|
|
2536
2669
|
}
|
|
2537
|
-
|
|
2670
|
+
return data;
|
|
2538
2671
|
}
|
|
2539
2672
|
/**
|
|
2540
|
-
*
|
|
2541
|
-
*
|
|
2542
|
-
* The result is ALWAYS jqhtml's own copy: nothing of the caller's object graph
|
|
2543
|
-
* is aliased through, and a value the serializer cannot express is dropped
|
|
2544
|
-
* rather than smuggled out. That is what makes `this.data` identical whether it
|
|
2545
|
-
* came from on_load() or from a cache hit - the old "on failure return the
|
|
2546
|
-
* original" branch broke exactly that promise, and only on the hard cases.
|
|
2673
|
+
* Handle leader on_load() error
|
|
2674
|
+
* Rejects every waiting follower and clears the entry so the next component retries
|
|
2547
2675
|
*
|
|
2548
|
-
* @param
|
|
2549
|
-
* @param {string} [component_name] - Names the component in development warnings.
|
|
2550
|
-
* Omit to convert silently (the unit tests and non-component callers).
|
|
2551
|
-
* @returns {any} The round-tripped value. Never the original object.
|
|
2676
|
+
* @param key - The dedup key captured at registration
|
|
2552
2677
|
*/
|
|
2553
|
-
static
|
|
2554
|
-
const
|
|
2555
|
-
|
|
2556
|
-
|
|
2557
|
-
const serialized = serialize_value(value, verbose, 'this.data', collector);
|
|
2558
|
-
if (serialized === null) {
|
|
2559
|
-
// The value as a WHOLE could not be expressed (it was itself a function,
|
|
2560
|
-
// a promise, a DOM node...). The round trip of such a value is nothing;
|
|
2561
|
-
// returning the original would put an uncacheable object into this.data.
|
|
2562
|
-
return {};
|
|
2678
|
+
static handle_leader_error(key, error) {
|
|
2679
|
+
const entry = this._registry.get(key);
|
|
2680
|
+
if (!entry) {
|
|
2681
|
+
return;
|
|
2563
2682
|
}
|
|
2564
|
-
|
|
2565
|
-
|
|
2566
|
-
//
|
|
2567
|
-
//
|
|
2568
|
-
//
|
|
2569
|
-
|
|
2570
|
-
|
|
2571
|
-
|
|
2683
|
+
entry.status = 'failed';
|
|
2684
|
+
console.error(`[Load Coordinator] Leader ${entry.leader_component._cid} on_load() failed for key: ${key}`, error);
|
|
2685
|
+
// Reject FIRST: followers are parked on this promise and their catch in _load()
|
|
2686
|
+
// propagates the failure exactly as if their own on_load() had thrown. Deleting
|
|
2687
|
+
// without rejecting left them awaiting a promise nobody could ever settle.
|
|
2688
|
+
entry.reject_promise(error);
|
|
2689
|
+
// Clear coordination entry so future requests can retry
|
|
2690
|
+
this._registry.delete(key);
|
|
2691
|
+
if (window.jqhtml?.debug?.verbose) {
|
|
2692
|
+
console.log(`[Load Coordinator] Cleared failed coordination for key: ${key}`, { followers_count: entry.waiting.length });
|
|
2572
2693
|
}
|
|
2573
|
-
return deserialized;
|
|
2574
2694
|
}
|
|
2575
2695
|
/**
|
|
2576
|
-
*
|
|
2577
|
-
* @param {string} key
|
|
2578
|
-
* @param {string} serialized - Pre-serialized JSON string
|
|
2579
|
-
* @private
|
|
2696
|
+
* Get current registry state (for debugging)
|
|
2580
2697
|
*/
|
|
2581
|
-
static
|
|
2582
|
-
|
|
2583
|
-
this.
|
|
2584
|
-
|
|
2585
|
-
|
|
2586
|
-
|
|
2587
|
-
|
|
2588
|
-
|
|
2589
|
-
|
|
2590
|
-
if (e.name === 'QuotaExceededError' || e.code === 22) {
|
|
2591
|
-
console.warn('[JQHTML Local Storage] Quota exceeded, clearing JQHTML keys and retrying');
|
|
2592
|
-
// Clear only JQHTML keys and retry once
|
|
2593
|
-
this._clear_jqhtml_keys();
|
|
2594
|
-
// Re-stamp the SCOPE MARKER, not the raw developer key: _validate_scope()
|
|
2595
|
-
// compares against `${CORE_VERSION}::${key}`, so writing the bare key here
|
|
2596
|
-
// made the very next write look like a scope change and wipe the cache again.
|
|
2597
|
-
localStorage.setItem('_jqhtml_cache_key', this._scope_marker);
|
|
2598
|
-
try {
|
|
2599
|
-
localStorage.setItem(scoped_key, serialized);
|
|
2600
|
-
}
|
|
2601
|
-
catch (retry_error) {
|
|
2602
|
-
console.error('[JQHTML Local Storage] Failed to set item after clearing JQHTML keys:', retry_error);
|
|
2603
|
-
}
|
|
2604
|
-
}
|
|
2605
|
-
else {
|
|
2606
|
-
console.error('[JQHTML Local Storage] Failed to set item:', e);
|
|
2607
|
-
}
|
|
2698
|
+
static get_registry_state() {
|
|
2699
|
+
const state = {};
|
|
2700
|
+
for (const [key, entry] of this._registry.entries()) {
|
|
2701
|
+
state[key] = {
|
|
2702
|
+
status: entry.status,
|
|
2703
|
+
leader_cid: entry.leader_component._cid,
|
|
2704
|
+
waiting_count: entry.waiting.length,
|
|
2705
|
+
waiting_cids: entry.waiting.map(c => c._cid)
|
|
2706
|
+
};
|
|
2608
2707
|
}
|
|
2708
|
+
return state;
|
|
2609
2709
|
}
|
|
2610
2710
|
/**
|
|
2611
|
-
*
|
|
2612
|
-
* @param {string} key
|
|
2613
|
-
* @private
|
|
2711
|
+
* Clear all coordination entries (for testing/debugging)
|
|
2614
2712
|
*/
|
|
2615
|
-
static
|
|
2616
|
-
|
|
2617
|
-
try {
|
|
2618
|
-
localStorage.removeItem(scoped_key);
|
|
2619
|
-
}
|
|
2620
|
-
catch (e) {
|
|
2621
|
-
console.error('[JQHTML Local Storage] Failed to remove item:', e);
|
|
2622
|
-
}
|
|
2713
|
+
static clear_all() {
|
|
2714
|
+
this._registry.clear();
|
|
2623
2715
|
}
|
|
2624
2716
|
}
|
|
2625
|
-
|
|
2626
|
-
/** Versioned scope identity - compared in _validate_scope() to clear on a core upgrade. */
|
|
2627
|
-
Jqhtml_Local_Storage._scope_marker = null;
|
|
2628
|
-
Jqhtml_Local_Storage._cache_mode = 'data';
|
|
2629
|
-
Jqhtml_Local_Storage._storage_available = null;
|
|
2630
|
-
Jqhtml_Local_Storage._initialized = false;
|
|
2717
|
+
Load_Coordinator._registry = new Map();
|
|
2631
2718
|
|
|
2632
2719
|
/**
|
|
2633
2720
|
* JQHTML Component Event System
|
|
@@ -7243,7 +7330,7 @@ function init(jQuery, config) {
|
|
|
7243
7330
|
}
|
|
7244
7331
|
}
|
|
7245
7332
|
// Version - will be replaced during build with actual version from package.json
|
|
7246
|
-
const version = '2.3.
|
|
7333
|
+
const version = '2.3.71';
|
|
7247
7334
|
// Default export with all functionality
|
|
7248
7335
|
const jqhtml = {
|
|
7249
7336
|
// Core
|