Skip to content

fix(components): use registered local Machine RPC bridge #77

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.

Sign up for GitHub

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

Merged
wibus-wee merged 1 commit into from
Aug 27, 2026
Merged

fix(components): use registered local Machine RPC bridge #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions packages/components/src/providers/workspace-machine-rpc-facade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,8 @@ const toCodeCollabTransportError = (error: unknown): CodeCollabV2Error => ({
retryable: true,
});

const getLocalMachineRpcSender = (): LocalMachineRpcSender | null => {
if (typeof window === 'undefined') return null;
const api = (window as unknown as { readonly api?: { readonly sendLocalMachineRpc?: unknown } })
.api;
return typeof api?.sendLocalMachineRpc === 'function'
? (api.sendLocalMachineRpc as LocalMachineRpcSender)
: null;
};
const getLocalMachineRpcSender = (): LocalMachineRpcSender | undefined =>
getIpcServices()?.machineRpc.send;

export function createWorkspaceMachineRpcFacade(deps: WorkspaceMachineRpcFacadeDeps) {
const { workspaceId, targetRouter, getMachineRpcClient } = deps;
Expand Down
33 changes: 18 additions & 15 deletions packages/components/tests/workspace-machine-rpc-facade.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ afterEach(() => {

describe('createWorkspaceMachineRpcFacade', () => {
it('uses the local-only IPC preview method without creating a cloud client', async () => {
const sendLocalMachineRpc = vi.fn(async () => ({
const invoke = vi.fn(async () => ({
ok: true as const,
result: {
status: 'ok' as const,
Expand All @@ -30,7 +30,7 @@ describe('createWorkspaceMachineRpcFacade', () => {
}));
vi.stubGlobal('window', {
__LODY_ELECTRON__: true,
api: { sendLocalMachineRpc },
ipc: { invoke },
});
const getMachineRpcClient = vi.fn();
const facade = createWorkspaceMachineRpcFacade({
Expand All @@ -48,7 +48,8 @@ describe('createWorkspaceMachineRpcFacade', () => {
path: '/Users/me/Documents/notes.md',
})
).resolves.toMatchObject({ status: 'ok', external: true, readonly: true });
expect(sendLocalMachineRpc).toHaveBeenCalledWith(
expect(invoke).toHaveBeenCalledWith(
'machineRpc.send',
expect.objectContaining({
machineId: localMachineId,
workspaceId,
Expand All @@ -60,10 +61,10 @@ describe('createWorkspaceMachineRpcFacade', () => {
});

it('does not fall back to a cloud preview while Electron local routing is unresolved', async () => {
const sendLocalMachineRpc = vi.fn();
const invoke = vi.fn();
vi.stubGlobal('window', {
__LODY_ELECTRON__: true,
api: { sendLocalMachineRpc },
ipc: { invoke },
});
const getMachineRpcClient = vi.fn();
const facade = createWorkspaceMachineRpcFacade({
Expand All @@ -80,12 +81,12 @@ describe('createWorkspaceMachineRpcFacade', () => {
await expect(
facade.requestFilePreview(localMachineId, { sessionId, path: '/tmp/local.txt' })
).resolves.toMatchObject({ status: 'error', code: 'transient_io' });
expect(sendLocalMachineRpc).not.toHaveBeenCalled();
expect(invoke).not.toHaveBeenCalled();
expect(getMachineRpcClient).not.toHaveBeenCalled();
});

it('uses the local bridge for a file-index snapshot without creating a cloud client', async () => {
const sendLocalMachineRpc = vi.fn(async () => ({
const invoke = vi.fn(async () => ({
ok: true as const,
result: {
status: 'ok' as const,
Expand All @@ -96,7 +97,7 @@ describe('createWorkspaceMachineRpcFacade', () => {
}));
vi.stubGlobal('window', {
__LODY_ELECTRON__: true,
api: { sendLocalMachineRpc },
ipc: { invoke },
});
const getMachineRpcClient = vi.fn();
const facade = createWorkspaceMachineRpcFacade({
Expand All @@ -118,7 +119,8 @@ describe('createWorkspaceMachineRpcFacade', () => {
status: 'ok',
fileIndex: { 'src/local.ts': { kind: 'file' } },
});
expect(sendLocalMachineRpc).toHaveBeenCalledWith(
expect(invoke).toHaveBeenCalledWith(
'machineRpc.send',
expect.objectContaining({
machineId: localMachineId,
workspaceId,
Expand All @@ -131,7 +133,7 @@ describe('createWorkspaceMachineRpcFacade', () => {
});

it('uses the local bridge without creating a cloud client for the local machine', async () => {
const sendLocalMachineRpc = vi.fn(async () => ({
const invoke = vi.fn(async () => ({
ok: true as const,
result: {
type: 'session/cancel_response' as const,
Expand All @@ -141,7 +143,7 @@ describe('createWorkspaceMachineRpcFacade', () => {
}));
vi.stubGlobal('window', {
__LODY_ELECTRON__: true,
api: { sendLocalMachineRpc },
ipc: { invoke },
});
const getMachineRpcClient = vi.fn();
const facade = createWorkspaceMachineRpcFacade({
Expand All @@ -160,7 +162,8 @@ describe('createWorkspaceMachineRpcFacade', () => {
success: true,
}
);
expect(sendLocalMachineRpc).toHaveBeenCalledWith(
expect(invoke).toHaveBeenCalledWith(
'machineRpc.send',
expect.objectContaining({
machineId: localMachineId,
workspaceId,
Expand All @@ -171,10 +174,10 @@ describe('createWorkspaceMachineRpcFacade', () => {
});

it('uses the cloud Machine RPC client for a remote machine', async () => {
const sendLocalMachineRpc = vi.fn();
const invoke = vi.fn();
vi.stubGlobal('window', {
__LODY_ELECTRON__: true,
api: { sendLocalMachineRpc },
ipc: { invoke },
});
const requestSessionCancel = vi.fn(async () => ({
type: 'session/cancel_response' as const,
Expand Down Expand Up @@ -204,6 +207,6 @@ describe('createWorkspaceMachineRpcFacade', () => {
turnId: 'turn-1',
timeoutMs: 2_000,
});
expect(sendLocalMachineRpc).not.toHaveBeenCalled();
expect(invoke).not.toHaveBeenCalled();
});
});
Loading