Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
[submodule "src/handlers/gimper"]
path = src/handlers/gimper
url = https://github.com/ConnorTippets/gimper.git
[submodule "src/handlers/turbowarp/unpackager"]
path = src/handlers/turbowarp/unpackager
url = https://github.com/TurboWarp/unpackager.git
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"@sqlite.org/sqlite-wasm": "^3.51.2-build6",
"@stringsync/vexml": "^0.1.8",
"@toon-format/toon": "^2.1.0",
"@turbowarp/unpackager": "./src/handlers/turbowarp/unpackager",
"@types/bun": "^1.3.9",
"@types/meyda": "^5.3.0",
"@types/pako": "^2.0.4",
Expand Down
42 changes: 28 additions & 14 deletions src/handlers/turbowarp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import type { FileData, FileFormat, FormatHandler } from "../FormatHandler.ts";
import CommonFormats from "src/CommonFormats.ts";
import { Packager, largeAssets, downloadProject } from "turbowarp-packager-browser";
import unpackager from "@turbowarp/unpackager";

// patching some assets
largeAssets.scaffolding.src = "/convert/js/turbowarp-scaffolding/scaffolding-full.js";
Expand All @@ -19,13 +20,15 @@ class turbowarpHandler implements FormatHandler {
extension: "sb3",
mime: "application/x.scratch.sb3",
from: true,
to: false,
to: true,
internal: "sb3",
category: "archive",
lossless: false,
lossless: true, // all project data is in the html
},
CommonFormats.HTML.builder("html")
.allowTo()
.allowFrom()
.markLossless()
];
public ready: boolean = false;

Expand All @@ -40,18 +43,29 @@ class turbowarpHandler implements FormatHandler {
): Promise<FileData[]> {
const outputFiles: FileData[] = [];
for (const inputFile of inputFiles) {
const project = await downloadProject(inputFile.bytes);

const packager = new Packager();
packager.project = project;
packager.options.target = "html";

const bytes = (await packager.package()).data;

outputFiles.push({
name: inputFile.name.replace(/\.sb3$/, ".html"),
bytes
});
if (inputFormat.internal === "sb3") {
const project = await downloadProject(inputFile.bytes);

const packager = new Packager();
packager.project = project;
packager.options.target = "html";

const bytes = (await packager.package()).data;

outputFiles.push({
name: inputFile.name.replace(/\.sb3$/, ".html"),
bytes
});
} else if (inputFormat.internal === "html") {
const data = (await unpackager(inputFile.bytes)).data;
const bytes = new Uint8Array(data);
outputFiles.push({
name: inputFile.name.replace(/\.html$/, ".sb3"),
bytes
});
} else {
throw new Error(`turbowarpHandler cannot convert from ${inputFormat.mime} to ${outputFormat.mime}`);
}
}
return outputFiles;
}
Expand Down
1 change: 1 addition & 0 deletions src/handlers/turbowarp/unpackager
Submodule unpackager added at 2eb03b
5 changes: 5 additions & 0 deletions src/handlers/turbowarp/unpackager.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare module '@turbowarp/unpackager' {
function unpackage(data: Uint8Array): Promise<{ data: Uint8Array }>;

export default unpackage;
}
Loading