Skip to content

feat(components): let a non-Electron host serve the local planes #1

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

Draft
pythonlearner1025 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(components): let a non-Electron host serve the local planes #1

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
2 changes: 1 addition & 1 deletion packages/components/src/providers/create-workspace-runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,7 @@ export async function createWorkspaceRuntime(deps: RuntimeDeps): Promise<Workspa
if (typeof window === 'undefined') {
return false;
}
if (!window.__LODY_ELECTRON__) {
if (!window.__LODY_ELECTRON__ && !window.__LODY_LOCAL_BRIDGE__) {
return false;
}
if (!getIpcServices()) {
Expand Down
10 changes: 6 additions & 4 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 @@ -117,7 +117,7 @@ export function createWorkspaceMachineRpcFacade(deps: WorkspaceMachineRpcFacadeD
await waitForMachineRoute(machineId);
return Boolean(
typeof window !== 'undefined' &&
window.__LODY_ELECTRON__ &&
(window.__LODY_ELECTRON__ || window.__LODY_LOCAL_BRIDGE__) &&
getLocalMachineRpcSender() &&
targetRouter.getPlaneForMachine(machineId) === 'local'
);
Expand Down Expand Up @@ -179,7 +179,9 @@ export function createWorkspaceMachineRpcFacade(deps: WorkspaceMachineRpcFacadeD
};
try {
const result = await (async () => {
const isElectron = typeof window !== 'undefined' && window.__LODY_ELECTRON__;
const isElectron =
typeof window !== 'undefined' &&
(window.__LODY_ELECTRON__ || window.__LODY_LOCAL_BRIDGE__);
if (isElectron) {
// A local Electron file preview must never fall through to the
// Streams RPC plane. Until the target router identifies the machine,
Expand Down Expand Up @@ -996,7 +998,7 @@ export function createWorkspaceMachineRpcFacade(deps: WorkspaceMachineRpcFacadeD
try {
await waitForMachineRoute(machineId);
if (
window.__LODY_ELECTRON__ &&
(window.__LODY_ELECTRON__ || window.__LODY_LOCAL_BRIDGE__) &&
getIpcServices() &&
targetRouter.getPlaneForMachine(machineId) === 'local'
) {
Expand Down Expand Up @@ -1052,7 +1054,7 @@ export function createWorkspaceMachineRpcFacade(deps: WorkspaceMachineRpcFacadeD
try {
await waitForMachineRoute(request.machineId);
if (
window.__LODY_ELECTRON__ &&
(window.__LODY_ELECTRON__ || window.__LODY_LOCAL_BRIDGE__) &&
getIpcServices() &&
targetRouter.getPlaneForMachine(request.machineId) === 'local'
) {
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/window-globals.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ declare global {
__LODY_NATIVE__?: boolean;
__LODY_CORDOVA_READY__?: boolean;
__LODY_ELECTRON__?: true;
__LODY_LOCAL_BRIDGE__?: true;
__LODY_PLATFORM__?: {
os: string;
homeDir: string;
Expand Down