@editframe/elements 0.26.3-beta.0 → 0.30.0-beta.13

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.
Files changed (191) hide show
  1. package/dist/elements/EFSourceMixin.js +1 -1
  2. package/dist/elements/EFSourceMixin.js.map +1 -1
  3. package/dist/elements/EFSurface.d.ts +4 -4
  4. package/dist/elements/EFText.d.ts +52 -0
  5. package/dist/elements/EFText.js +319 -0
  6. package/dist/elements/EFText.js.map +1 -0
  7. package/dist/elements/EFTextSegment.d.ts +30 -0
  8. package/dist/elements/EFTextSegment.js +94 -0
  9. package/dist/elements/EFTextSegment.js.map +1 -0
  10. package/dist/elements/EFThumbnailStrip.d.ts +4 -4
  11. package/dist/elements/EFWaveform.d.ts +4 -4
  12. package/dist/elements/FetchMixin.js +22 -7
  13. package/dist/elements/FetchMixin.js.map +1 -1
  14. package/dist/elements/easingUtils.js +62 -0
  15. package/dist/elements/easingUtils.js.map +1 -0
  16. package/dist/elements/updateAnimations.js +57 -10
  17. package/dist/elements/updateAnimations.js.map +1 -1
  18. package/dist/gui/ContextMixin.js +11 -2
  19. package/dist/gui/ContextMixin.js.map +1 -1
  20. package/dist/gui/EFConfiguration.d.ts +4 -4
  21. package/dist/gui/EFControls.d.ts +2 -2
  22. package/dist/gui/EFDial.d.ts +4 -4
  23. package/dist/gui/EFDial.js +4 -2
  24. package/dist/gui/EFDial.js.map +1 -1
  25. package/dist/gui/EFFilmstrip.d.ts +32 -6
  26. package/dist/gui/EFFilmstrip.js +314 -50
  27. package/dist/gui/EFFilmstrip.js.map +1 -1
  28. package/dist/gui/EFFitScale.js +39 -15
  29. package/dist/gui/EFFitScale.js.map +1 -1
  30. package/dist/gui/EFFocusOverlay.d.ts +4 -4
  31. package/dist/gui/EFPause.d.ts +4 -4
  32. package/dist/gui/EFPlay.d.ts +4 -4
  33. package/dist/gui/EFPreview.d.ts +4 -4
  34. package/dist/gui/EFPreview.js +2 -2
  35. package/dist/gui/EFPreview.js.map +1 -1
  36. package/dist/gui/EFResizableBox.d.ts +4 -4
  37. package/dist/gui/EFResizableBox.js +6 -3
  38. package/dist/gui/EFResizableBox.js.map +1 -1
  39. package/dist/gui/EFScrubber.d.ts +8 -5
  40. package/dist/gui/EFScrubber.js +64 -12
  41. package/dist/gui/EFScrubber.js.map +1 -1
  42. package/dist/gui/EFTimeDisplay.d.ts +4 -4
  43. package/dist/gui/EFToggleLoop.d.ts +4 -4
  44. package/dist/gui/EFTogglePlay.d.ts +4 -4
  45. package/dist/gui/EFWorkbench.d.ts +4 -4
  46. package/dist/gui/EFWorkbench.js +16 -3
  47. package/dist/gui/EFWorkbench.js.map +1 -1
  48. package/dist/gui/TWMixin.js +1 -1
  49. package/dist/gui/TWMixin.js.map +1 -1
  50. package/dist/index.d.ts +3 -1
  51. package/dist/index.js +3 -1
  52. package/dist/index.js.map +1 -1
  53. package/dist/style.css +7 -120
  54. package/package.json +3 -3
  55. package/scripts/build-css.js +5 -9
  56. package/test/constants.ts +8 -0
  57. package/test/recordReplayProxyPlugin.js +76 -10
  58. package/test/setup.ts +32 -0
  59. package/test/useMSW.ts +3 -0
  60. package/test/useTranscodeMSW.ts +191 -0
  61. package/tsdown.config.ts +7 -5
  62. package/types.json +1 -1
  63. package/src/elements/ContextProxiesController.ts +0 -124
  64. package/src/elements/CrossUpdateController.ts +0 -22
  65. package/src/elements/EFAudio.browsertest.ts +0 -706
  66. package/src/elements/EFAudio.ts +0 -56
  67. package/src/elements/EFCaptions.browsertest.ts +0 -1960
  68. package/src/elements/EFCaptions.ts +0 -823
  69. package/src/elements/EFImage.browsertest.ts +0 -120
  70. package/src/elements/EFImage.ts +0 -113
  71. package/src/elements/EFMedia/AssetIdMediaEngine.test.ts +0 -224
  72. package/src/elements/EFMedia/AssetIdMediaEngine.ts +0 -110
  73. package/src/elements/EFMedia/AssetMediaEngine.browsertest.ts +0 -140
  74. package/src/elements/EFMedia/AssetMediaEngine.ts +0 -385
  75. package/src/elements/EFMedia/BaseMediaEngine.browsertest.ts +0 -400
  76. package/src/elements/EFMedia/BaseMediaEngine.ts +0 -505
  77. package/src/elements/EFMedia/BufferedSeekingInput.browsertest.ts +0 -386
  78. package/src/elements/EFMedia/BufferedSeekingInput.ts +0 -430
  79. package/src/elements/EFMedia/JitMediaEngine.browsertest.ts +0 -226
  80. package/src/elements/EFMedia/JitMediaEngine.ts +0 -256
  81. package/src/elements/EFMedia/audioTasks/makeAudioBufferTask.browsertest.ts +0 -679
  82. package/src/elements/EFMedia/audioTasks/makeAudioBufferTask.ts +0 -117
  83. package/src/elements/EFMedia/audioTasks/makeAudioFrequencyAnalysisTask.ts +0 -246
  84. package/src/elements/EFMedia/audioTasks/makeAudioInitSegmentFetchTask.browsertest.ts +0 -59
  85. package/src/elements/EFMedia/audioTasks/makeAudioInitSegmentFetchTask.ts +0 -27
  86. package/src/elements/EFMedia/audioTasks/makeAudioInputTask.browsertest.ts +0 -55
  87. package/src/elements/EFMedia/audioTasks/makeAudioInputTask.ts +0 -53
  88. package/src/elements/EFMedia/audioTasks/makeAudioSeekTask.chunkboundary.regression.browsertest.ts +0 -207
  89. package/src/elements/EFMedia/audioTasks/makeAudioSeekTask.ts +0 -72
  90. package/src/elements/EFMedia/audioTasks/makeAudioSegmentFetchTask.ts +0 -32
  91. package/src/elements/EFMedia/audioTasks/makeAudioSegmentIdTask.ts +0 -29
  92. package/src/elements/EFMedia/audioTasks/makeAudioTasksVideoOnly.browsertest.ts +0 -95
  93. package/src/elements/EFMedia/audioTasks/makeAudioTimeDomainAnalysisTask.ts +0 -184
  94. package/src/elements/EFMedia/shared/AudioSpanUtils.ts +0 -129
  95. package/src/elements/EFMedia/shared/BufferUtils.ts +0 -342
  96. package/src/elements/EFMedia/shared/GlobalInputCache.ts +0 -77
  97. package/src/elements/EFMedia/shared/MediaTaskUtils.ts +0 -44
  98. package/src/elements/EFMedia/shared/PrecisionUtils.ts +0 -46
  99. package/src/elements/EFMedia/shared/RenditionHelpers.browsertest.ts +0 -246
  100. package/src/elements/EFMedia/shared/RenditionHelpers.ts +0 -56
  101. package/src/elements/EFMedia/shared/ThumbnailExtractor.ts +0 -227
  102. package/src/elements/EFMedia/tasks/makeMediaEngineTask.browsertest.ts +0 -167
  103. package/src/elements/EFMedia/tasks/makeMediaEngineTask.ts +0 -88
  104. package/src/elements/EFMedia/videoTasks/MainVideoInputCache.ts +0 -76
  105. package/src/elements/EFMedia/videoTasks/ScrubInputCache.ts +0 -61
  106. package/src/elements/EFMedia/videoTasks/makeScrubVideoBufferTask.ts +0 -114
  107. package/src/elements/EFMedia/videoTasks/makeScrubVideoInitSegmentFetchTask.ts +0 -35
  108. package/src/elements/EFMedia/videoTasks/makeScrubVideoInputTask.ts +0 -52
  109. package/src/elements/EFMedia/videoTasks/makeScrubVideoSeekTask.ts +0 -124
  110. package/src/elements/EFMedia/videoTasks/makeScrubVideoSegmentFetchTask.ts +0 -44
  111. package/src/elements/EFMedia/videoTasks/makeScrubVideoSegmentIdTask.ts +0 -32
  112. package/src/elements/EFMedia/videoTasks/makeUnifiedVideoSeekTask.ts +0 -370
  113. package/src/elements/EFMedia/videoTasks/makeVideoBufferTask.ts +0 -109
  114. package/src/elements/EFMedia.browsertest.ts +0 -872
  115. package/src/elements/EFMedia.ts +0 -341
  116. package/src/elements/EFSourceMixin.ts +0 -60
  117. package/src/elements/EFSurface.browsertest.ts +0 -151
  118. package/src/elements/EFSurface.ts +0 -142
  119. package/src/elements/EFTemporal.browsertest.ts +0 -215
  120. package/src/elements/EFTemporal.ts +0 -800
  121. package/src/elements/EFThumbnailStrip.browsertest.ts +0 -585
  122. package/src/elements/EFThumbnailStrip.media-engine.browsertest.ts +0 -714
  123. package/src/elements/EFThumbnailStrip.ts +0 -906
  124. package/src/elements/EFTimegroup.browsertest.ts +0 -934
  125. package/src/elements/EFTimegroup.ts +0 -882
  126. package/src/elements/EFVideo.browsertest.ts +0 -1482
  127. package/src/elements/EFVideo.ts +0 -564
  128. package/src/elements/EFWaveform.ts +0 -547
  129. package/src/elements/FetchContext.browsertest.ts +0 -401
  130. package/src/elements/FetchMixin.ts +0 -38
  131. package/src/elements/SampleBuffer.ts +0 -94
  132. package/src/elements/TargetController.browsertest.ts +0 -230
  133. package/src/elements/TargetController.ts +0 -224
  134. package/src/elements/TimegroupController.ts +0 -26
  135. package/src/elements/durationConverter.ts +0 -35
  136. package/src/elements/parseTimeToMs.ts +0 -9
  137. package/src/elements/printTaskStatus.ts +0 -16
  138. package/src/elements/renderTemporalAudio.ts +0 -108
  139. package/src/elements/updateAnimations.browsertest.ts +0 -1884
  140. package/src/elements/updateAnimations.ts +0 -217
  141. package/src/elements/util.ts +0 -24
  142. package/src/gui/ContextMixin.browsertest.ts +0 -860
  143. package/src/gui/ContextMixin.ts +0 -562
  144. package/src/gui/Controllable.browsertest.ts +0 -258
  145. package/src/gui/Controllable.ts +0 -41
  146. package/src/gui/EFConfiguration.ts +0 -40
  147. package/src/gui/EFControls.browsertest.ts +0 -389
  148. package/src/gui/EFControls.ts +0 -195
  149. package/src/gui/EFDial.browsertest.ts +0 -84
  150. package/src/gui/EFDial.ts +0 -172
  151. package/src/gui/EFFilmstrip.browsertest.ts +0 -712
  152. package/src/gui/EFFilmstrip.ts +0 -1349
  153. package/src/gui/EFFitScale.ts +0 -152
  154. package/src/gui/EFFocusOverlay.ts +0 -79
  155. package/src/gui/EFPause.browsertest.ts +0 -202
  156. package/src/gui/EFPause.ts +0 -73
  157. package/src/gui/EFPlay.browsertest.ts +0 -202
  158. package/src/gui/EFPlay.ts +0 -73
  159. package/src/gui/EFPreview.ts +0 -74
  160. package/src/gui/EFResizableBox.browsertest.ts +0 -79
  161. package/src/gui/EFResizableBox.ts +0 -898
  162. package/src/gui/EFScrubber.ts +0 -151
  163. package/src/gui/EFTimeDisplay.browsertest.ts +0 -237
  164. package/src/gui/EFTimeDisplay.ts +0 -55
  165. package/src/gui/EFToggleLoop.ts +0 -35
  166. package/src/gui/EFTogglePlay.ts +0 -70
  167. package/src/gui/EFWorkbench.ts +0 -115
  168. package/src/gui/PlaybackController.ts +0 -527
  169. package/src/gui/TWMixin.css +0 -6
  170. package/src/gui/TWMixin.ts +0 -61
  171. package/src/gui/TargetOrContextMixin.ts +0 -185
  172. package/src/gui/currentTimeContext.ts +0 -5
  173. package/src/gui/durationContext.ts +0 -3
  174. package/src/gui/efContext.ts +0 -6
  175. package/src/gui/fetchContext.ts +0 -5
  176. package/src/gui/focusContext.ts +0 -7
  177. package/src/gui/focusedElementContext.ts +0 -5
  178. package/src/gui/playingContext.ts +0 -5
  179. package/src/otel/BridgeSpanExporter.ts +0 -150
  180. package/src/otel/setupBrowserTracing.ts +0 -73
  181. package/src/otel/tracingHelpers.ts +0 -251
  182. package/src/transcoding/cache/RequestDeduplicator.test.ts +0 -170
  183. package/src/transcoding/cache/RequestDeduplicator.ts +0 -65
  184. package/src/transcoding/cache/URLTokenDeduplicator.test.ts +0 -182
  185. package/src/transcoding/cache/URLTokenDeduplicator.ts +0 -101
  186. package/src/transcoding/types/index.ts +0 -312
  187. package/src/transcoding/utils/MediaUtils.ts +0 -63
  188. package/src/transcoding/utils/UrlGenerator.ts +0 -68
  189. package/src/transcoding/utils/constants.ts +0 -36
  190. package/src/utils/LRUCache.test.ts +0 -274
  191. package/src/utils/LRUCache.ts +0 -696
@@ -1,170 +0,0 @@
1
- import { beforeEach, describe, expect, it, vi } from "vitest";
2
- import { RequestDeduplicator } from "./RequestDeduplicator.js";
3
-
4
- describe("RequestDeduplicator", () => {
5
- let deduplicator: RequestDeduplicator;
6
-
7
- beforeEach(() => {
8
- deduplicator = new RequestDeduplicator();
9
- });
10
-
11
- describe("executeRequest", () => {
12
- it("should execute request and return result for new key", async () => {
13
- const mockFactory = vi.fn().mockResolvedValue("result");
14
-
15
- const result = await deduplicator.executeRequest("key1", mockFactory);
16
-
17
- expect(result).toBe("result");
18
- expect(mockFactory).toHaveBeenCalledTimes(1);
19
- });
20
-
21
- it("should return same promise for concurrent requests with same key", async () => {
22
- const mockFactory = vi.fn().mockResolvedValue("result");
23
-
24
- const [result1, result2] = await Promise.all([
25
- deduplicator.executeRequest("key1", mockFactory),
26
- deduplicator.executeRequest("key1", mockFactory),
27
- ]);
28
-
29
- expect(result1).toBe("result");
30
- expect(result2).toBe("result");
31
- expect(mockFactory).toHaveBeenCalledTimes(1); // Should only be called once
32
- });
33
-
34
- it("should allow separate requests for different keys", async () => {
35
- const mockFactory1 = vi.fn().mockResolvedValue("result1");
36
- const mockFactory2 = vi.fn().mockResolvedValue("result2");
37
-
38
- const [result1, result2] = await Promise.all([
39
- deduplicator.executeRequest("key1", mockFactory1),
40
- deduplicator.executeRequest("key2", mockFactory2),
41
- ]);
42
-
43
- expect(result1).toBe("result1");
44
- expect(result2).toBe("result2");
45
- expect(mockFactory1).toHaveBeenCalledTimes(1);
46
- expect(mockFactory2).toHaveBeenCalledTimes(1);
47
- });
48
-
49
- it("should handle request failures and clean up", async () => {
50
- const error = new Error("Request failed");
51
- const mockFactory = vi.fn().mockRejectedValue(error);
52
-
53
- await expect(
54
- deduplicator.executeRequest("key1", mockFactory),
55
- ).rejects.toThrow("Request failed");
56
-
57
- // Should allow new request with same key after failure
58
- const mockFactory2 = vi.fn().mockResolvedValue("success");
59
- const result = await deduplicator.executeRequest("key1", mockFactory2);
60
-
61
- expect(result).toBe("success");
62
- expect(mockFactory).toHaveBeenCalledTimes(1);
63
- expect(mockFactory2).toHaveBeenCalledTimes(1);
64
- });
65
-
66
- it("should clean up pending requests after success", async () => {
67
- const mockFactory = vi.fn().mockResolvedValue("result");
68
-
69
- await deduplicator.executeRequest("key1", mockFactory);
70
-
71
- expect(deduplicator.isPending("key1")).toBe(false);
72
- expect(deduplicator.getPendingCount()).toBe(0);
73
- });
74
- });
75
-
76
- describe("isPending", () => {
77
- it("should return true for pending requests", async () => {
78
- const mockFactory = vi.fn().mockImplementation(
79
- () =>
80
- new Promise((resolve) => {
81
- setTimeout(() => resolve("result"), 100);
82
- }),
83
- );
84
-
85
- const promise = deduplicator.executeRequest("key1", mockFactory);
86
-
87
- expect(deduplicator.isPending("key1")).toBe(true);
88
-
89
- await promise;
90
-
91
- expect(deduplicator.isPending("key1")).toBe(false);
92
- });
93
-
94
- it("should return false for non-existent keys", () => {
95
- expect(deduplicator.isPending("nonexistent")).toBe(false);
96
- });
97
- });
98
-
99
- describe("getPendingCount", () => {
100
- it("should return 0 initially", () => {
101
- expect(deduplicator.getPendingCount()).toBe(0);
102
- });
103
-
104
- it("should track pending request count", async () => {
105
- const mockFactory = vi.fn().mockImplementation(
106
- () =>
107
- new Promise((resolve) => {
108
- setTimeout(() => resolve("result"), 100);
109
- }),
110
- );
111
-
112
- const promise1 = deduplicator.executeRequest("key1", mockFactory);
113
- const promise2 = deduplicator.executeRequest("key2", mockFactory);
114
-
115
- expect(deduplicator.getPendingCount()).toBe(2);
116
-
117
- await Promise.all([promise1, promise2]);
118
-
119
- expect(deduplicator.getPendingCount()).toBe(0);
120
- });
121
- });
122
-
123
- describe("getPendingKeys", () => {
124
- it("should return empty array initially", () => {
125
- expect(deduplicator.getPendingKeys()).toEqual([]);
126
- });
127
-
128
- it("should return pending keys", async () => {
129
- const mockFactory = vi.fn().mockImplementation(
130
- () =>
131
- new Promise((resolve) => {
132
- setTimeout(() => resolve("result"), 100);
133
- }),
134
- );
135
-
136
- const promise1 = deduplicator.executeRequest("key1", mockFactory);
137
- const promise2 = deduplicator.executeRequest("key2", mockFactory);
138
-
139
- const pendingKeys = deduplicator.getPendingKeys();
140
- expect(pendingKeys).toHaveLength(2);
141
- expect(pendingKeys).toContain("key1");
142
- expect(pendingKeys).toContain("key2");
143
-
144
- await Promise.all([promise1, promise2]);
145
-
146
- expect(deduplicator.getPendingKeys()).toEqual([]);
147
- });
148
- });
149
-
150
- describe("clear", () => {
151
- it("should clear all pending requests", async () => {
152
- const mockFactory = vi.fn().mockImplementation(
153
- () =>
154
- new Promise((resolve) => {
155
- setTimeout(() => resolve("result"), 100);
156
- }),
157
- );
158
-
159
- deduplicator.executeRequest("key1", mockFactory);
160
- deduplicator.executeRequest("key2", mockFactory);
161
-
162
- expect(deduplicator.getPendingCount()).toBe(2);
163
-
164
- deduplicator.clear();
165
-
166
- expect(deduplicator.getPendingCount()).toBe(0);
167
- expect(deduplicator.getPendingKeys()).toEqual([]);
168
- });
169
- });
170
- });
@@ -1,65 +0,0 @@
1
- /**
2
- * Request deduplication utility
3
- * Manages pending requests to prevent concurrent duplicate requests
4
- */
5
-
6
- export class RequestDeduplicator {
7
- private pendingRequests = new Map<string, Promise<any>>();
8
-
9
- /**
10
- * Execute a request with deduplication
11
- * If a request with the same key is already pending, return the existing promise
12
- * Otherwise, execute the request factory and track the promise
13
- */
14
- async executeRequest<T>(
15
- key: string,
16
- requestFactory: () => Promise<T>,
17
- ): Promise<T> {
18
- // Check if there's already a pending request for this key
19
- const existingRequest = this.pendingRequests.get(key);
20
- if (existingRequest) {
21
- return existingRequest;
22
- }
23
-
24
- // Create and track the new request
25
- const requestPromise = requestFactory();
26
- this.pendingRequests.set(key, requestPromise);
27
-
28
- try {
29
- const result = await requestPromise;
30
- this.pendingRequests.delete(key);
31
- return result;
32
- } catch (error) {
33
- this.pendingRequests.delete(key);
34
- throw error;
35
- }
36
- }
37
-
38
- /**
39
- * Clear all pending requests (used in cache clearing)
40
- */
41
- clear(): void {
42
- this.pendingRequests.clear();
43
- }
44
-
45
- /**
46
- * Get number of pending requests
47
- */
48
- getPendingCount(): number {
49
- return this.pendingRequests.size;
50
- }
51
-
52
- /**
53
- * Check if a request is pending
54
- */
55
- isPending(key: string): boolean {
56
- return this.pendingRequests.has(key);
57
- }
58
-
59
- /**
60
- * Get all pending request keys
61
- */
62
- getPendingKeys(): string[] {
63
- return Array.from(this.pendingRequests.keys());
64
- }
65
- }
@@ -1,182 +0,0 @@
1
- import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
2
- import { URLTokenDeduplicator } from "./URLTokenDeduplicator.js";
3
-
4
- describe("URLTokenDeduplicator", () => {
5
- let deduplicator: URLTokenDeduplicator;
6
-
7
- beforeEach(() => {
8
- deduplicator = new URLTokenDeduplicator();
9
- vi.useFakeTimers();
10
- });
11
-
12
- afterEach(() => {
13
- vi.useRealTimers();
14
- });
15
-
16
- it("should deduplicate concurrent requests for same cache key", async () => {
17
- const mockTokenFactory = vi.fn().mockResolvedValue("test-token");
18
- const mockParseExpiration = vi.fn().mockReturnValue(Date.now() + 60000);
19
-
20
- // Make 3 concurrent requests for the same cache key
21
- const promises = [
22
- deduplicator.getToken("key1", mockTokenFactory, mockParseExpiration),
23
- deduplicator.getToken("key1", mockTokenFactory, mockParseExpiration),
24
- deduplicator.getToken("key1", mockTokenFactory, mockParseExpiration),
25
- ];
26
-
27
- const results = await Promise.all(promises);
28
-
29
- // All should return the same token
30
- expect(results).toEqual(["test-token", "test-token", "test-token"]);
31
-
32
- // Factory should only be called once due to deduplication
33
- expect(mockTokenFactory).toHaveBeenCalledTimes(1);
34
- expect(mockParseExpiration).toHaveBeenCalledTimes(1);
35
- });
36
-
37
- it("should use separate tokens for different cache keys", async () => {
38
- const mockTokenFactory1 = vi.fn().mockResolvedValue("token1");
39
- const mockTokenFactory2 = vi.fn().mockResolvedValue("token2");
40
- const mockParseExpiration = vi.fn().mockReturnValue(Date.now() + 60000);
41
-
42
- const [token1, token2] = await Promise.all([
43
- deduplicator.getToken("key1", mockTokenFactory1, mockParseExpiration),
44
- deduplicator.getToken("key2", mockTokenFactory2, mockParseExpiration),
45
- ]);
46
-
47
- expect(token1).toBe("token1");
48
- expect(token2).toBe("token2");
49
- expect(mockTokenFactory1).toHaveBeenCalledTimes(1);
50
- expect(mockTokenFactory2).toHaveBeenCalledTimes(1);
51
- });
52
-
53
- it("should reuse cached tokens that haven't expired", async () => {
54
- const futureTime = Date.now() + 60000;
55
- const mockTokenFactory = vi.fn().mockResolvedValue("cached-token");
56
- const mockParseExpiration = vi.fn().mockReturnValue(futureTime);
57
-
58
- // First request
59
- const token1 = await deduplicator.getToken(
60
- "key1",
61
- mockTokenFactory,
62
- mockParseExpiration,
63
- );
64
-
65
- // Second request for same key should reuse cached token
66
- const token2 = await deduplicator.getToken(
67
- "key1",
68
- vi.fn(),
69
- mockParseExpiration,
70
- );
71
-
72
- expect(token1).toBe("cached-token");
73
- expect(token2).toBe("cached-token");
74
- expect(mockTokenFactory).toHaveBeenCalledTimes(1);
75
- });
76
-
77
- it("should fetch new token when cached token is expired", async () => {
78
- const pastTime = Date.now() - 1000; // Expired 1 second ago
79
- const futureTime = Date.now() + 60000; // New token expires in 1 minute
80
-
81
- const mockTokenFactory1 = vi.fn().mockResolvedValue("expired-token");
82
- const mockTokenFactory2 = vi.fn().mockResolvedValue("fresh-token");
83
- const mockParseExpiration1 = vi.fn().mockReturnValue(pastTime);
84
- const mockParseExpiration2 = vi.fn().mockReturnValue(futureTime);
85
-
86
- // First request with expired token
87
- await deduplicator.getToken(
88
- "key1",
89
- mockTokenFactory1,
90
- mockParseExpiration1,
91
- );
92
-
93
- // Advance time to simulate token expiration
94
- vi.advanceTimersByTime(2000);
95
-
96
- // Second request should fetch new token due to expiration
97
- const token2 = await deduplicator.getToken(
98
- "key1",
99
- mockTokenFactory2,
100
- mockParseExpiration2,
101
- );
102
-
103
- expect(token2).toBe("fresh-token");
104
- expect(mockTokenFactory1).toHaveBeenCalledTimes(1);
105
- expect(mockTokenFactory2).toHaveBeenCalledTimes(1);
106
- });
107
-
108
- it("should handle token factory errors by removing from cache", async () => {
109
- const mockTokenFactory1 = vi
110
- .fn()
111
- .mockRejectedValue(new Error("Network error"));
112
- const mockTokenFactory2 = vi.fn().mockResolvedValue("retry-token");
113
- const mockParseExpiration = vi.fn().mockReturnValue(Date.now() + 60000);
114
-
115
- // First request fails
116
- await expect(
117
- deduplicator.getToken("key1", mockTokenFactory1, mockParseExpiration),
118
- ).rejects.toThrow("Network error");
119
-
120
- // Retry should work and not be blocked by failed request
121
- const token = await deduplicator.getToken(
122
- "key1",
123
- mockTokenFactory2,
124
- mockParseExpiration,
125
- );
126
-
127
- expect(token).toBe("retry-token");
128
- expect(mockTokenFactory1).toHaveBeenCalledTimes(1);
129
- expect(mockTokenFactory2).toHaveBeenCalledTimes(1);
130
- });
131
-
132
- it("should provide utility methods for cache management", () => {
133
- const mockParseExpiration = vi.fn().mockReturnValue(Date.now() + 60000);
134
-
135
- expect(deduplicator.getCachedCount()).toBe(0);
136
- expect(deduplicator.getCachedKeys()).toEqual([]);
137
- expect(deduplicator.hasValidToken("nonexistent")).toBe(false);
138
-
139
- // Add a token to cache
140
- deduplicator.getToken(
141
- "key1",
142
- vi.fn().mockResolvedValue("token"),
143
- mockParseExpiration,
144
- );
145
-
146
- expect(deduplicator.getCachedCount()).toBe(1);
147
- expect(deduplicator.getCachedKeys()).toEqual(["key1"]);
148
- expect(deduplicator.hasValidToken("key1")).toBe(true);
149
-
150
- // Clear cache
151
- deduplicator.clear();
152
- expect(deduplicator.getCachedCount()).toBe(0);
153
- });
154
-
155
- it("should cleanup expired tokens", async () => {
156
- const pastTime = Date.now() - 1000;
157
- const futureTime = Date.now() + 60000;
158
-
159
- const mockParseExpiration1 = vi.fn().mockReturnValue(pastTime);
160
- const mockParseExpiration2 = vi.fn().mockReturnValue(futureTime);
161
-
162
- // Add expired and valid tokens
163
- await deduplicator.getToken(
164
- "expired",
165
- vi.fn().mockResolvedValue("token1"),
166
- mockParseExpiration1,
167
- );
168
- await deduplicator.getToken(
169
- "valid",
170
- vi.fn().mockResolvedValue("token2"),
171
- mockParseExpiration2,
172
- );
173
-
174
- expect(deduplicator.getCachedCount()).toBe(2);
175
-
176
- // Cleanup should remove expired tokens
177
- deduplicator.cleanup();
178
-
179
- expect(deduplicator.getCachedCount()).toBe(1);
180
- expect(deduplicator.getCachedKeys()).toEqual(["valid"]);
181
- });
182
- });
@@ -1,101 +0,0 @@
1
- /**
2
- * Global URL token deduplication utility
3
- * Ensures that multiple EFMedia elements requesting tokens for the same resource
4
- * share a single token request, preventing unnecessary duplicate token generation
5
- */
6
-
7
- export interface TokenCacheEntry {
8
- tokenPromise: Promise<string>;
9
- expiration: number;
10
- }
11
-
12
- export class URLTokenDeduplicator {
13
- private tokenCache = new Map<string, TokenCacheEntry>();
14
-
15
- /**
16
- * Get or create a URL token with global deduplication
17
- * Multiple requests for the same cache key will share the same token promise
18
- */
19
- async getToken(
20
- cacheKey: string,
21
- tokenFactory: () => Promise<string>,
22
- parseExpiration: (token: string) => number,
23
- ): Promise<string> {
24
- const now = Date.now();
25
- const cached = this.tokenCache.get(cacheKey);
26
-
27
- // Check if we have a valid cached token
28
- if (cached && now < cached.expiration) {
29
- return cached.tokenPromise;
30
- }
31
-
32
- // Create new token request
33
- const tokenPromise = tokenFactory()
34
- .then(async (token) => {
35
- // Update expiration after we get the token
36
- const expiration = parseExpiration(token);
37
- this.tokenCache.set(cacheKey, { tokenPromise, expiration });
38
- return token;
39
- })
40
- .catch((error) => {
41
- // Remove failed request from cache
42
- this.tokenCache.delete(cacheKey);
43
- throw error;
44
- });
45
-
46
- // Cache the promise immediately to deduplicate concurrent requests
47
- this.tokenCache.set(cacheKey, {
48
- tokenPromise,
49
- expiration: now + 60000, // Temporary 1-minute expiration, will be updated when token is received
50
- });
51
-
52
- return tokenPromise;
53
- }
54
-
55
- /**
56
- * Clear all cached tokens (used in testing)
57
- */
58
- clear(): void {
59
- this.tokenCache.clear();
60
- }
61
-
62
- /**
63
- * Get number of cached tokens
64
- */
65
- getCachedCount(): number {
66
- return this.tokenCache.size;
67
- }
68
-
69
- /**
70
- * Check if a token is cached and valid
71
- */
72
- hasValidToken(cacheKey: string): boolean {
73
- const cached = this.tokenCache.get(cacheKey);
74
- if (!cached) return false;
75
-
76
- const now = Date.now();
77
- return now < cached.expiration;
78
- }
79
-
80
- /**
81
- * Get all cached token keys
82
- */
83
- getCachedKeys(): string[] {
84
- return Array.from(this.tokenCache.keys());
85
- }
86
-
87
- /**
88
- * Remove expired tokens from cache
89
- */
90
- cleanup(): void {
91
- const now = Date.now();
92
- for (const [key, entry] of this.tokenCache.entries()) {
93
- if (now >= entry.expiration) {
94
- this.tokenCache.delete(key);
95
- }
96
- }
97
- }
98
- }
99
-
100
- // Global instance shared across all context providers
101
- export const globalURLTokenDeduplicator = new URLTokenDeduplicator();