forked from
tokono.ma/diffuse
A music player that connects to your cloud/distributed storage.
fix: cross-origin improvements
+24
-14
+1
-4
src/pages/orchestrator/queue-tracks/_applet.astro
+1
-4
src/pages/orchestrator/queue-tracks/_applet.astro
···
1
1
<script>
2
-
import type { Applet } from "@web-applets/sdk";
3
2
import type { GroupConsult, ManagedOutput, Track } from "@applets/core/types.d.ts";
4
3
import { applet, reactive, register, wait } from "@scripts/applet/common";
5
4
···
73
72
////////////////////////////////////////////
74
73
// 🚀
75
74
////////////////////////////////////////////
76
-
context.settled().then(() => {
77
-
monitorTracks();
78
-
});
75
+
monitorTracks();
79
76
</script>
+11
-4
src/scripts/applet/common.ts
+11
-4
src/scripts/applet/common.ts
···
40
40
src = QS.stringifyUrl({ url: src, query });
41
41
}
42
42
43
-
const context = opts.newInstance ? self : opts.context || self.top || self.parent;
44
-
const existingFrame: HTMLIFrameElement | null = opts.newInstance
45
-
? null
46
-
: context.document.querySelector(`[src="${src}"]`);
43
+
let context = opts.newInstance ? self : opts.context || self.top || self.parent;
44
+
45
+
let existingFrame: HTMLIFrameElement | null;
46
+
47
+
// TODO: Ideally we do some cross-origin detection here
48
+
try {
49
+
existingFrame = opts.newInstance ? null : context.document.querySelector(`[src="${src}"]`);
50
+
} catch (err) {
51
+
existingFrame = null;
52
+
context = self;
53
+
}
47
54
48
55
let frame;
49
56
+12
-6
src/scripts/theme/blur/index.ts
+12
-6
src/scripts/theme/blur/index.ts
···
12
12
const labelA = "Deck A";
13
13
const labelB = "Deck B";
14
14
15
-
const configurator = {
16
-
output: await applet<ManagedOutput>("/configurator/output"),
17
-
};
15
+
// const configurator = {
16
+
// output: await applet<ManagedOutput>("/configurator/output"),
17
+
// };
18
18
19
-
const _constituent = {
20
-
a: applet("/constituent/blur/artwork-controller", { container, groupId: labelA }),
21
-
b: applet("/constituent/blur/artwork-controller", { container, groupId: labelB }),
19
+
const constituent = {
20
+
a: applet("/constituent/blur/artwork-controller", {
21
+
container,
22
+
groupId: labelA,
23
+
}),
24
+
b: applet("/constituent/blur/artwork-controller", {
25
+
container,
26
+
groupId: labelB,
27
+
}),
22
28
};
23
29
24
30
// TODO: