Skip to content

[Blueprints] Use the local worker in Builder during development mode #2495

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

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

[Blueprints] Use the local worker in Builder during development mode #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ef294b
Use the local server during development mode
mho22 Aug 12, 2025
42908ec
Merge branch 'trunk' into add-local-worker-in-development-mode
mho22 Aug 15, 2025
d1bf607
Use relative paths and config variables
mho22 Aug 15, 2025
8617531
Lint
mho22 Aug 15, 2025
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
4 changes: 4 additions & 0 deletions packages/playground/client/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import { ProgressTracker } from '@php-wasm/progress';
import type { MountDescriptor, PlaygroundClient } from '@wp-playground/remote';
import { collectPhpLogs, logger } from '@php-wasm/logger';
import { additionalRemoteOrigins } from './additional-remote-origins';
// eslint-disable-next-line @nx/enforce-module-boundaries
import { remoteDevServerHost, remoteDevServerPort } from '../../build-config';

export interface StartPlaygroundOptions {
iframe: HTMLIFrameElement;
Expand Down Expand Up @@ -215,6 +217,8 @@ const validRemoteOrigins = [
'https://localhost',
'http://127.0.0.1',
'https://127.0.0.1',
`http://${remoteDevServerHost}:${remoteDevServerPort}`,
`http://${remoteDevServerHost}:${remoteDevServerPort}`,
...additionalRemoteOrigins,
];
/**
Expand Down
30 changes: 16 additions & 14 deletions packages/playground/php-cors-proxy/cors-proxy-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function url_validate_and_resolve($url, $resolve_function='gethostbynamel') {
if (!filter_var($url, FILTER_VALIDATE_URL)) {
throw new CorsProxyException("Invalid URL: " . $url);
}

// Parse the URL to get its components
$parsedUrl = parse_url($url);

Expand Down Expand Up @@ -93,7 +93,7 @@ public static function isPrivateIp($ip)
} elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
return self::isPrivateIpv6($ip);
}

return false;
}

Expand All @@ -108,22 +108,22 @@ private static function isPrivateIpv4($ip)
$privateRanges = [
/**
* Private addresses according to RFC 1918.
*
*
* See https://datatracker.ietf.org/doc/html/rfc1918#section-3.
*/
['10.0.0.0', '10.255.255.255'],
['172.16.0.0', '172.31.255.255'],
['192.168.0.0', '192.168.255.255'],

/**
* IPv4 reserves the entire class A address block 127.0.0.0/8 for
* IPv4 reserves the entire class A address block 127.0.0.0/8 for
* use as private loopback addresses.
*/
['127.0.0.0', '127.255.255.255'],
/**
* In April 2012, IANA allocated the 100.64.0.0/10 block of IPv4 addresses
* In April 2012, IANA allocated the 100.64.0.0/10 block of IPv4 addresses
* specifically for use in carrier-grade NAT scenarios
*
*
* See https://datatracker.ietf.org/doc/html/rfc6598.
*/
['100.64.0.0', '100.127.255.255'],
Expand Down Expand Up @@ -178,7 +178,7 @@ private static function isPrivateIpv6($ip)
/**
* The Local IPv6 addresses are created using a pseudo-randomly
* allocated global ID (RFC 4193).
*
*
* See https://datatracker.ietf.org/doc/html/rfc4193#section-3
*/
['fc00::', 'fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'],
Expand Down Expand Up @@ -223,7 +223,7 @@ private static function isPrivateIpv6($ip)
*/
["2001::","2001:0:ffff:ffff:ffff:ffff:ffff:ffff"],
/*
* ORCHIDv2
* ORCHIDv2
* https://datatracker.ietf.org/doc/html/rfc7343
*/
["2001:20::","2001:2f:ffff:ffff:ffff:ffff:ffff:ffff"],
Expand Down Expand Up @@ -301,15 +301,15 @@ private static function ipv6InRange($ip, $start, $end)

/**
* Filters headers by name, removing disallowed headers and enforcing opt-in requirements.
*
*
* @param array $php_headers {
* An associative array of headers.
* @type string $key Header name.
* }
* @param array $disallowed_headers List of header names that are disallowed.
* @param array $headers_requiring_opt_in List of header names that require opt-in
* via the X-Cors-Proxy-Allowed-Request-Headers header.
*
*
* @return array {
* Filtered headers.
* @type string $key Header name.
Expand Down Expand Up @@ -337,7 +337,7 @@ function filter_headers_by_name(
function (
$key
) use (
$disallowed_headers,
$disallowed_headers,
$headers_requiring_opt_in,
$headers_with_opt_in,
) {
Expand Down Expand Up @@ -383,14 +383,14 @@ function rewrite_relative_redirect(
$request_path_parent = dirname($request_path);
$redirect_location = $request_path_parent . '/' . $redirect_path;
}

$redirect_location = $target_hostname . $redirect_location;
}

if (!parse_url($redirect_location, PHP_URL_SCHEME)) {
$target_scheme = parse_url($request_url, PHP_URL_SCHEME) ?: 'https';
$redirect_location = "$target_scheme://$redirect_location";
}
}

$last_char = $proxy_absolute_url[strlen($proxy_absolute_url) - 1];
if ($last_char !== '/' && $last_char !== '?') {
Expand All @@ -413,6 +413,8 @@ function should_respond_with_cors_headers($host, $origin) {
'http://127.0.0.1',
'http://127.0.0.1:5400',
'http://localhost:5400',
'http://127.0.0.1:4400',
'http://localhost:4400',
);
if (
defined('PLAYGROUND_CORS_PROXY_SUPPORTED_ORIGINS') &&
Expand Down
14 changes: 4 additions & 10 deletions packages/playground/website/builder/builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,7 @@ const getCompletions = async (editor, session, pos, prefix, callback) => {

debounce = setTimeout(async () => {
try {
const res = await fetch(
`https://playground.wordpress.net/plugin-proxy.php?${proxyParams}`
);
const res = await fetch(`plugin-proxy.php?${proxyParams}`);
const json = await res.json();
json?.plugins.forEach((p) => {
const doc = new DOMParser().parseFromString(
Expand Down Expand Up @@ -352,9 +350,7 @@ const getCompletions = async (editor, session, pos, prefix, callback) => {

debounce = setTimeout(async () => {
try {
const res = await fetch(
`https://playground.wordpress.net/plugin-proxy.php?${proxyParams}`
);
const res = await fetch(`plugin-proxy.php?${proxyParams}`);
const json = await res.json();
json?.themes.forEach((p) => {
const doc = new DOMParser().parseFromString(
Expand Down Expand Up @@ -542,7 +538,7 @@ const runBlueprint = async (editor) => {
const blueprintCopy = JSON.parse(blueprintString);
await startPlaygroundWeb({
iframe: playgroundIframe,
remoteUrl: `https://playground.wordpress.net/remote.html`,
remoteUrl: 'remote.html',
blueprint: blueprintCopy,
corsProxy: corsProxyUrl,
});
Expand Down Expand Up @@ -765,9 +761,7 @@ function onLoaded() {
const query = new URLSearchParams();

query.set('mode', 'seamless');
const url =
`https://playground.wordpress.net/?${query}#` +
JSON.stringify(getCurrentBlueprint(editor));
const url = `?${query}#${JSON.stringify(getCurrentBlueprint(editor))}`;
if (prevWin) {
prevWin.close();
}
Expand Down