Skip to content

🎥 Make videos programmatically with React

Fix Studio discovery with unknown capabilities

Igor Samokhovetsb3d46365ddfe
diff --git a/packages/studio-protocol/src/studio-discovery.ts b/packages/studio-protocol/src/studio-discovery.ts
index 68aa8029b1..e1fc3b30ff 100644
--- a/packages/studio-protocol/src/studio-discovery.ts
+++ b/packages/studio-protocol/src/studio-discovery.ts
@@ -150,6 +150,20 @@ export const isStudioProtocolDescriptor = (
return new Set(capabilityTypes).size === capabilityTypes.length;
};
+const parseStudioProtocolDescriptor = (
+ value: unknown,
+): StudioProtocolDescriptor | null => {
+ if (!isRecord(value) || !Array.isArray(value.capabilities)) {
+ return null;
+ }
+
+ const descriptor = {
+ ...value,
+ capabilities: value.capabilities.filter(isCapability),
+ };
+ return isStudioProtocolDescriptor(descriptor) ? descriptor : null;
+};
+
export const getInstallCapability = (
descriptor: StudioProtocolDescriptor,
): StudioProtocolInstallCapability | null =>
@@ -224,13 +238,14 @@ export const discoverStudios = async (
return null;
}
- if (!isStudioProtocolDescriptor(value)) {
+ const descriptor = parseStudioProtocolDescriptor(value);
+ if (descriptor === null) {
foundInvalidResponse = true;
return null;
}
return {
- descriptor: value,
+ descriptor,
discoveredAt: dependencies.now(),
origin,
};
diff --git a/packages/studio-protocol/src/test/install-in-studio.test.ts b/packages/studio-protocol/src/test/install-in-studio.test.ts
index b0e8a744a8..c8b53a5902 100644
--- a/packages/studio-protocol/src/test/install-in-studio.test.ts
+++ b/packages/studio-protocol/src/test/install-in-studio.test.ts
@@ -53,8 +53,14 @@ const dependencies = {
ports: [3000, 3001],
};
-test('delivers the payload to the exact most recently focused Studio target', async () => {
+test('delivers the payload when a newer Studio advertises an unknown capability', async () => {
const requests: Array<{url: string; options?: RequestInit}> = [];
+ const newestStudio = descriptor({
+ compositionId: 'Main',
+ lastFocusedAt: 950_000,
+ projectName: 'Newest project',
+ targetId: 'newest-target',
+ });
const fetchFn = (input: string | URL | Request, options?: RequestInit) => {
const url = String(input);
requests.push({url, options});
@@ -73,14 +79,13 @@ test('delivers the payload to the exact most recently focused Studio target', as
if (url === 'http://localhost:3001/api/studio-protocol') {
return Promise.resolve(
- jsonResponse(
- descriptor({
- compositionId: 'Main',
- lastFocusedAt: 950_000,
- projectName: 'Newest project',
- targetId: 'newest-target',
- }),
- ),
+ jsonResponse({
+ ...newestStudio,
+ capabilities: [
+ ...newestStudio.capabilities,
+ {type: 'future-capability'},
+ ],
+ }),
);
}