Skip to content

Add example code for WAT parsing and server-side plugins #15

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
merged 19 commits into from
Oct 8, 2024
Merged

Add example code for WAT parsing and server-side plugins #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b477176
Split host and guest packages
MaxDesiatov Sep 9, 2024
b0f230e
fix up formatting in *.wat files
MaxDesiatov Sep 9, 2024
999d656
Update `$print` param comments in `demo.wat`
MaxDesiatov Sep 13, 2024
d628840
Formatting cleanups
MaxDesiatov Sep 13, 2024
278ef3e
Use Hummingbird as static server
MaxDesiatov Sep 17, 2024
6d812ae
Clean up formatting, serve HTML
MaxDesiatov Sep 19, 2024
118a549
Allow multiple canvas contexts in guest code
MaxDesiatov Sep 21, 2024
5226840
Allow multiple audio elements in `Guest`
MaxDesiatov Sep 22, 2024
b3f13e5
Implement rendering of multiple modules in HTML
MaxDesiatov Sep 22, 2024
b878df2
Compute module paths dynamically in Guest's `index.js`
MaxDesiatov Sep 23, 2024
898d79d
Split `plotter` and `swift-audio` into separate modules
MaxDesiatov Sep 23, 2024
d097808
Dynamically link `plotter` module in `index.js`
MaxDesiatov Sep 23, 2024
cbbb8b1
Fix multiple synth plugins loading in Guest's `index.js`
MaxDesiatov Sep 23, 2024
1e13b6f
Add mixed audio endpoint
MaxDesiatov Sep 24, 2024
5c1bb52
Clean up formatting
MaxDesiatov Sep 24, 2024
967916f
Simplify Host server router
MaxDesiatov Sep 24, 2024
8d43cbf
Refactor `MixedOutput` module results iteration
MaxDesiatov Sep 25, 2024
9dbdfab
Split WATExample and ServerHost, implement file uploads
MaxDesiatov Oct 1, 2024
51bef99
Clean up formatting
MaxDesiatov Oct 7, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Implement rendering of multiple modules in HTML
  • Loading branch information
@MaxDesiatov
MaxDesiatov committed Sep 22, 2024
commit b3f13e5e16dacdbd27a501af58c04b10f2b850f4
15 changes: 3 additions & 12 deletions Host/Sources/Server/App+Router.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ private func serveFile(path: FilePath) async throws -> Response {
})
}

private func serveHTML(_ string: String) -> Response {
.init(
status: .ok,
headers: .init(dictionaryLiteral: (.contentType, "text/html")),
body: .init(byteBuffer: .init(string: string))
)
}

enum UploadError: Error {
case invalidFileName
}
Expand All @@ -62,10 +54,9 @@ func buildRouter() -> Router<AppRequestContext> {
}

.get("/") { _, _ in
Response(
status: .temporaryRedirect,
headers: [.location: "/public/index.html"]
)
IndexPage(modules: [
.init(name: "Mix", path: "/public/.build/wasm32-unknown-none-wasm/release/swift-audio.wasm")
])
}

.get("/public/**") { req, ctx in
Expand Down
54 changes: 52 additions & 2 deletions Host/Sources/Server/IndexPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,59 @@
import Hummingbird
import SystemPackage

struct IndexPage {
private func serveHTML(_ string: String) -> Response {
.init(
status: .ok,
headers: .init(dictionaryLiteral: (.contentType, "text/html"), (.contentLength, "\(string.utf8.count)")),
body: .init(byteBuffer: .init(string: string))
)
}

struct IndexPage: ResponseGenerator {
struct Module {
let name: String
let path: FilePath
}

let modules: [Module]
}

func response(from request: Request, context: some RequestContext) throws -> Response {
serveHTML(
"""
<html>
<head>
<meta charset="utf-8">
<title>Swift Audio Workstation</title>
</head>
<body>
<script type="module" src="/public/Sources/JavaScript/index.js">
</script>
<style>
body {
background-color: black;
padding: 1rem;
}
#wasm-logger {
font-family: sans-serif;
color: white;
}
</style>
</body>
\(modules.map { module in
"""
<h1 id="wasm-logger">\(module.name)</h1>
<div
class="moduleNode"
data-module-path="\(module.path)"
style="display: flex; flex-direction: column; align-items: flex-start; gap: 1rem;"
>
<canvas class="plotter" width="1000" height="210"></canvas>
<audio class="audio" type="audio.wav" controls></audio>
</div>
"""
}.joined(separator: "\n"))
</html>
"""
)
}
}