Skip to content

Fix wasm SSH #504

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
palchrb wants to merge 6 commits into
base: main
Choose a base branch
from
+23 −24
Open

Fix wasm SSH #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2094ba8
fix: copy WASM files to public/ instead of app/ in Docker build
claude Mar 20, 2026
0ac9c4a
Change copy destination for WASM files in Dockerfile
palchrb Mar 20, 2026
11fc298
fix: use __PREFIX__ for wasm asset paths in SSH console
claude Mar 20, 2026
dbaf476
Merge pull request #1 from palchrb/claude/check-docker-wasm-files-jx2Ph
palchrb Mar 20, 2026
b8bd498
fix: deduplicate @codemirror/state to fix ACL editor crash
claude Mar 20, 2026
37dd641
Merge pull request #2 from palchrb/claude/check-docker-wasm-files-jx2Ph
palchrb Mar 20, 2026
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: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ RUN corepack enable
COPY patches ./patches
COPY package.json pnpm-lock.yaml build.sh ./

COPY --from=go-base /bin/hp_ssh.wasm /run/app/hp_ssh.wasm
COPY --from=go-base /bin/wasm_exec.js /run/app/wasm_exec.js
COPY --from=go-base /bin/hp_ssh.wasm /run/public/hp_ssh.wasm
COPY --from=go-base /bin/wasm_exec.js /run/public/wasm_exec.js
RUN ./build.sh --app --app-install-only

COPY . .
Expand Down
8 changes: 4 additions & 4 deletions app/routes/ssh/console.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const shouldRevalidate: ShouldRevalidateFunction = () => {

export async function loader({ request, context }: Route.LoaderArgs) {
const origin = new URL(request.url).origin;
const assets = ["/wasm_exec.js", "/hp_ssh.wasm"];
const assets = [`${__PREFIX__}/wasm_exec.js`, `${__PREFIX__}/hp_ssh.wasm`];
const missing: string[] = [];

for (const file of assets) {
Expand Down Expand Up @@ -180,7 +180,7 @@ export async function action({ request, context }: Route.ActionArgs) {
export const links: Route.LinksFunction = () => [
{
rel: "preload",
href: "/hp_ssh.wasm",
href: `${__PREFIX__}/hp_ssh.wasm`,
as: "fetch",
type: "application/wasm",
crossOrigin: "anonymous",
Expand All @@ -190,7 +190,7 @@ export const links: Route.LinksFunction = () => [
export const handle: ExternalScriptsHandle = {
scripts: [
{
src: "/wasm_exec.js",
src: `${__PREFIX__}/wasm_exec.js`,
crossOrigin: "anonymous",
preload: true,
},
Expand All @@ -211,7 +211,7 @@ export default function Page({ loaderData: { ipnDetails, sshDetails } }: Route.C

pause();
const go = new Go(); // Go is defined by wasm_exec.js
WebAssembly.instantiateStreaming(fetch("/hp_ssh.wasm"), go.importObject).then((value) => {
WebAssembly.instantiateStreaming(fetch(`${__PREFIX__}/hp_ssh.wasm`), go.importObject).then((value) => {
go.run(value.instance);
const handle = TsWasmNet(ipnDetails, {
NotifyState: (state) => {
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
},
"ignoredBuiltDependencies": [
"better-sqlite3"
]
],
"overrides": {
Copy link
Owner

@tale tale Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this about?

Copy link
Author

@palchrb palchrb Mar 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, maybe that should not be part of this PR. What happened when I built the docker image based on your main branch + the above commits, is that the ACL editor stopped working. You might have/want to address that in a different way.

@shopify/lang-jsonc pulled in @codemirror/state@6.5.4 while the rest
of the codemirror packages used 6.6.0, causing "multiple instances of
@codemirror/state" errors that broke the ACL editor.

"@codemirror/state": "6.6.0"
}
}
}
30 changes: 13 additions & 17 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading