Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(visual-editing): add package version mismatch warning #2040

Merged
merged 2 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions packages/comlink/src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export type Node<R extends Message, S extends Message> = {
actor: NodeActor<R, S>
fetch: <const T extends S['type'], U extends WithoutResponse<S>>(
data: U,
options?: {signal?: AbortSignal},
options?: {signal?: AbortSignal; suppressWarnings?: boolean},
) => S extends U ? (S['type'] extends T ? Promise<S['response']> : never) : never
machine: NodeActorLogic<R, S>
on: <T extends R['type'], U extends Extract<R, {type: T}>>(
Expand Down Expand Up @@ -97,7 +97,10 @@ export const createNodeMachine = <
buffer: Array<{
data: V
resolvable?: PromiseWithResolvers<S['response']>
signal?: AbortSignal
options?: {
signal?: AbortSignal
suppressWarnings?: boolean
}
}>
connectionId: string | null
connectTo: string
Expand Down Expand Up @@ -128,7 +131,10 @@ export const createNodeMachine = <
type: 'post'
data: V
resolvable?: PromiseWithResolvers<S['response']>
signal?: AbortSignal
options?: {
signal?: AbortSignal
suppressWarning?: boolean
}
}
| {type: 'request.aborted'; requestId: string}
| {type: 'request.failed'; requestId: string}
Expand Down Expand Up @@ -161,7 +167,7 @@ export const createNodeMachine = <
{
data: event.data,
resolvable: event.resolvable,
signal: event.signal,
options: event.options,
},
]
},
Expand Down Expand Up @@ -191,11 +197,12 @@ export const createNodeMachine = <
parentRef: self,
resolvable: request.resolvable,
responseTo: request.responseTo,
signal: request.options?.signal,
sources: context.target!,
suppressWarnings: request.options?.suppressWarnings,
targetOrigin: context.targetOrigin!,
to: context.connectTo,
type: request.type,
signal: request.signal,
},
})
})
Expand Down Expand Up @@ -227,12 +234,12 @@ export const createNodeMachine = <
'flush buffer': enqueueActions(({enqueue}) => {
enqueue.raise(({context}) => ({
type: 'request',
data: context.buffer.map(({data, resolvable, signal}) => ({
data: context.buffer.map(({data, resolvable, options}) => ({
data: data.data,
type: data.type,
expectResponse: resolvable ? true : false,
resolvable,
signal,
options,
})),
}))
enqueue.emit(({context}) => {
Expand Down Expand Up @@ -260,7 +267,7 @@ export const createNodeMachine = <
expectResponse: event.resolvable ? true : false,
type: event.data.type,
resolvable: event.resolvable,
signal: event.signal,
options: event.options,
},
}
}),
Expand Down Expand Up @@ -495,13 +502,16 @@ export const createNode = <R extends Message, S extends Message>(
actor.send({type: 'post', data})
}

const fetch = (data: WithoutResponse<S>, options?: {signal?: AbortSignal}) => {
const fetch = (
data: WithoutResponse<S>,
options?: {signal?: AbortSignal; suppressWarnings?: boolean},
) => {
const resolvable = Promise.withResolvers<S['response']>()
actor.send({
type: 'post',
data,
resolvable,
signal: options?.signal,
options,
})
return resolvable.promise as never
}
Expand Down
13 changes: 9 additions & 4 deletions packages/comlink/src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface RequestMachineContext<S extends Message> {
response: S['response'] | null
responseTo: string | undefined
signal: AbortSignal | undefined
suppressWarnings: boolean | undefined
sources: Set<MessageEventSource>
targetOrigin: string
to: string
Expand Down Expand Up @@ -84,6 +85,7 @@ export const createRequestMachine = <
responseTo?: string
signal?: AbortSignal
sources: Set<MessageEventSource> | MessageEventSource
suppressWarnings?: boolean
targetOrigin: string
to: string
type: S['type']
Expand Down Expand Up @@ -151,10 +153,12 @@ export const createRequestMachine = <
'on fail': sendTo(
({context}) => context.parentRef,
({context, self}) => {
// eslint-disable-next-line no-console
console.warn(
`Received no response to message '${context.type}' on client '${context.from}' (ID: '${context.id}').`,
)
if (!context.suppressWarnings) {
// eslint-disable-next-line no-console
console.warn(
`[@sanity/comlink] Received no response to message '${context.type}' on client '${context.from}' (ID: '${context.id}').`,
)
}
context.resolvable?.reject(new Error('No response received'))
return {type: 'request.failed', requestId: self.id}
},
Expand Down Expand Up @@ -190,6 +194,7 @@ export const createRequestMachine = <
responseTo: input.responseTo,
signal: input.signal,
sources: input.sources instanceof Set ? input.sources : new Set([input.sources]),
suppressWarnings: input.suppressWarnings,
targetOrigin: input.targetOrigin,
to: input.to,
type: input.type,
Expand Down
5 changes: 4 additions & 1 deletion packages/comlink/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ export interface RequestData<S extends Message> {
responseTo?: string
type: MessageType
resolvable?: PromiseWithResolvers<S['response']>
signal?: AbortSignal
options?: {
signal?: AbortSignal
suppressWarnings?: boolean
}
}

/**
Expand Down
15 changes: 10 additions & 5 deletions packages/visual-editing/src/ui/VisualEditing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,29 @@ export const VisualEditing: FunctionComponent<VisualEditingOptions> = (props) =>
})

// Fetch features to determine if optimistic updates are supported
const abortController = new AbortController()
const controller = new AbortController()
comlink
.fetch({type: 'visual-editing/features', data: undefined}, {signal: abortController.signal})
.fetch(
{type: 'visual-editing/features', data: undefined},
{signal: controller.signal, suppressWarnings: true},
)
.then((data) => {
if (data.features['optimistic']) {
setActor(actor)
}
})
.catch(() => {
// Fail silently as the app may be communicating with a version of
// Presentation that does not support this feature
// eslint-disable-next-line no-console
console.warn(
'[@sanity/visual-editing] Package version mismatch detected: Please update your Sanity studio to prevent potential compatibility issues.',
)
})

actor.start()
comlink.start()

return () => {
abortController.abort()
controller.abort()
actor.stop()
comlink.stop()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ export function createSharedListener(comlink: VisualEditingNode): Observable<Sha
const incomingConnection$ = new ReplaySubject<SharedListenEvent>(1)
const incomingMutations$ = new Subject<SharedListenEvent>()

comlink.fetch({type: 'visual-editing/snapshot-welcome', data: undefined}).then((data) => {
incomingConnection$.next(data.event)
})
comlink
.fetch({type: 'visual-editing/snapshot-welcome', data: undefined}, {suppressWarnings: true})
.then((data) => {
incomingConnection$.next(data.event)
})
.catch(() => {
// Fail silently as the app may be communicating with a version of
// Presentation that does not support this feature
})

comlink.on('presentation/snapshot-event', (data) => {
// Welcome events are still emitted by Presentation for backwards
Expand Down
4 changes: 2 additions & 2 deletions packages/visual-editing/src/ui/schema/SchemaProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const SchemaProvider: FunctionComponent<
type: 'visual-editing/schema',
data: undefined,
},
{signal},
{signal, suppressWarnings: true},
)
setSchema(response.schema)
} catch (e) {
Expand Down Expand Up @@ -110,7 +110,7 @@ export const SchemaProvider: FunctionComponent<
type: 'visual-editing/schema-union-types',
data: {paths},
},
{signal},
{signal, suppressWarnings: true},
)
setResolvedTypes(response.types)
reportedPathsRef.current = paths
Expand Down
23 changes: 19 additions & 4 deletions packages/visual-editing/src/ui/usePerspectiveSync.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,27 @@ export function usePerspectiveSync(
dispatch: (value: OverlayMsg | VisualEditingControllerMsg) => void,
): void {
useEffect(() => {
comlink?.fetch({type: 'visual-editing/fetch-perspective', data: undefined}).then((data) => {
dispatch({type: 'presentation/perspective', data})
})
const controller = new AbortController()
comlink
?.fetch(
{type: 'visual-editing/fetch-perspective', data: undefined},
{signal: controller.signal, suppressWarnings: true},
)
.then((data) => {
dispatch({type: 'presentation/perspective', data})
})
.catch(() => {
// Fail silently as the app may be communicating with a version of
// Presentation that does not support this feature
})

return comlink?.on('presentation/perspective', (data) => {
const unsub = comlink?.on('presentation/perspective', (data) => {
dispatch({type: 'presentation/perspective', data})
})

return () => {
unsub?.()
controller.abort()
}
}, [comlink, dispatch])
}