(feat): redesign WASM module, add TypeScript SDK, migrate to pnpm
Some checks failed
CI / rustfmt (push) Successful in 17s
CI / wasm build (push) Successful in 1m16s
CI / clippy (push) Successful in 1m28s
CI / test (push) Successful in 1m48s
CI / example (push) Successful in 1m31s
CI / duplicate code (push) Failing after 33s
CI / web client (push) Failing after 34s
CI / cargo-machete (push) Successful in 1m18s
CI / cargo-deny (push) Failing after 3m2s
Some checks failed
CI / rustfmt (push) Successful in 17s
CI / wasm build (push) Successful in 1m16s
CI / clippy (push) Successful in 1m28s
CI / test (push) Successful in 1m48s
CI / example (push) Successful in 1m31s
CI / duplicate code (push) Failing after 33s
CI / web client (push) Failing after 34s
CI / cargo-machete (push) Successful in 1m18s
CI / cargo-deny (push) Failing after 3m2s
This commit is contained in:
parent
89a20044a5
commit
5caa1c9d5f
49 changed files with 3717 additions and 1501 deletions
409
src/vite/index.ts
Normal file
409
src/vite/index.ts
Normal file
|
|
@ -0,0 +1,409 @@
|
|||
import crypto from "node:crypto";
|
||||
import fs from "node:fs/promises";
|
||||
import { spawn } from "node:child_process";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
export interface MTPVitePluginOptions {
|
||||
typeMaps: string;
|
||||
release?: boolean;
|
||||
wasmPackArgs?: string[];
|
||||
outDir?: string;
|
||||
}
|
||||
|
||||
export interface VitePlugin {
|
||||
name: string;
|
||||
config?: (...args: any[]) => unknown;
|
||||
buildStart?: (...args: any[]) => unknown;
|
||||
configureServer?: (...args: any[]) => unknown;
|
||||
}
|
||||
|
||||
const packageRoot = process.env.MTP_PACKAGE_ROOT
|
||||
? path.resolve(process.env.MTP_PACKAGE_ROOT)
|
||||
: path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
|
||||
const rawEntryName = "mtp_wasm.js";
|
||||
const wasmEntryName = "mtp_wasm_bg.wasm";
|
||||
const typeMapEntryName = "mtp_type_map.js";
|
||||
|
||||
const reservedCommunicationTypes = [
|
||||
"Identification",
|
||||
"IdentificationResponse",
|
||||
"Register",
|
||||
"RegisterResponse",
|
||||
"Challenge",
|
||||
"ChallengeResponse",
|
||||
"Ping",
|
||||
"Pong",
|
||||
"Disconnect",
|
||||
"Redirect",
|
||||
"Shutdown",
|
||||
"Error",
|
||||
"ErrorParsing",
|
||||
"ErrorBadVersion",
|
||||
"BadRequest",
|
||||
"Unauthorized",
|
||||
"Forbidden",
|
||||
"NotFound",
|
||||
"TooManyRequests",
|
||||
"InternalServerError",
|
||||
"BadGateway",
|
||||
"ServiceUnavailable",
|
||||
"GatewayTimeout",
|
||||
];
|
||||
|
||||
const reservedDataTypes = [
|
||||
"Version",
|
||||
"Id",
|
||||
"ClientNonce",
|
||||
"ServerNonce",
|
||||
"PublicKeys",
|
||||
"Signature",
|
||||
"PqSignature",
|
||||
"Description",
|
||||
"Connected",
|
||||
"Timestamp",
|
||||
"Error",
|
||||
"ErrorParsing",
|
||||
"ErrorMessage",
|
||||
];
|
||||
|
||||
function normalizeOptions(options) {
|
||||
if (!options?.typeMaps) {
|
||||
throw new Error("mtp/vite requires a typeMaps option, for example mtp({ typeMaps: './type-maps.yaml' })");
|
||||
}
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
async function pathExists(filePath) {
|
||||
try {
|
||||
await fs.access(filePath);
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function devServerPath(root: string, filePath: string) {
|
||||
const relativePath = path.relative(root, filePath);
|
||||
if (relativePath.startsWith("..") || path.isAbsolute(relativePath)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return `/${relativePath.split(path.sep).join("/")}`;
|
||||
}
|
||||
|
||||
async function hashPackageInputs() {
|
||||
const hash = crypto.createHash("sha256");
|
||||
const inputs = [
|
||||
"wasm/Cargo.toml",
|
||||
"wasm/src",
|
||||
"common/Cargo.toml",
|
||||
"common/src",
|
||||
"codec/Cargo.toml",
|
||||
"codec/src",
|
||||
"crypto/Cargo.toml",
|
||||
"crypto/src",
|
||||
"type-map/Cargo.toml",
|
||||
"type-map/build.rs",
|
||||
"type-map/src",
|
||||
];
|
||||
|
||||
async function addPath(relativePath) {
|
||||
const absolutePath = path.join(packageRoot, relativePath);
|
||||
const stat = await fs.stat(absolutePath).catch(() => null);
|
||||
if (!stat) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (stat.isDirectory()) {
|
||||
const entries = await fs.readdir(absolutePath);
|
||||
for (const entry of entries.sort()) {
|
||||
await addPath(path.join(relativePath, entry));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
hash.update(relativePath);
|
||||
hash.update(await fs.readFile(absolutePath));
|
||||
}
|
||||
|
||||
for (const input of inputs) {
|
||||
await addPath(input);
|
||||
}
|
||||
|
||||
return hash.digest("hex");
|
||||
}
|
||||
|
||||
function quoteList(values) {
|
||||
return values.length === 0
|
||||
? "never"
|
||||
: values.map((value) => JSON.stringify(value)).join(" | ");
|
||||
}
|
||||
|
||||
function parseTypeMapYaml(source, filePath) {
|
||||
const communicationTypes = new Set(reservedCommunicationTypes);
|
||||
const dataTypes = new Set(reservedDataTypes);
|
||||
let section = null;
|
||||
let sectionIndent = -1;
|
||||
|
||||
for (const [index, originalLine] of source.split(/\r?\n/).entries()) {
|
||||
const withoutComment = originalLine.replace(/\s+#.*$/, "");
|
||||
if (!withoutComment.trim()) {
|
||||
continue;
|
||||
}
|
||||
if (/^\t/.test(withoutComment)) {
|
||||
throw new Error(`${filePath}:${index + 1}: tabs are not supported in type-maps.yaml indentation`);
|
||||
}
|
||||
|
||||
const indent = withoutComment.match(/^ */)?.[0].length ?? 0;
|
||||
const trimmed = withoutComment.trim();
|
||||
const sectionMatch = trimmed.match(/^(CommunicationTypes|DataTypes):\s*$/);
|
||||
if (sectionMatch) {
|
||||
section = sectionMatch[1];
|
||||
sectionIndent = indent;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (section && indent <= sectionIndent) {
|
||||
section = null;
|
||||
}
|
||||
if (!section) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const entryMatch = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*):\s*\d+\s*$/);
|
||||
if (!entryMatch) {
|
||||
throw new Error(`${filePath}:${index + 1}: expected '${section}' entries as 'Name: numeric_id'`);
|
||||
}
|
||||
|
||||
if (section === "CommunicationTypes") {
|
||||
communicationTypes.add(entryMatch[1]);
|
||||
} else {
|
||||
dataTypes.add(entryMatch[1]);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
communicationTypes: [...communicationTypes].sort(),
|
||||
dataTypes: [...dataTypes].sort(),
|
||||
};
|
||||
}
|
||||
|
||||
function generateTypeMapModule(metadata) {
|
||||
const js = `export const communicationTypes = ${JSON.stringify(metadata.communicationTypes, null, 2)};\nexport const dataTypes = ${JSON.stringify(metadata.dataTypes, null, 2)};\n`;
|
||||
const dts = `export type MTPCommunicationType = ${quoteList(metadata.communicationTypes)};\nexport type MTPDataType = ${quoteList(metadata.dataTypes)};\nexport declare const communicationTypes: readonly MTPCommunicationType[];\nexport declare const dataTypes: readonly MTPDataType[];\n`;
|
||||
return { js, dts };
|
||||
}
|
||||
|
||||
async function writeTypeMapModule(outDir, typeMapsPath) {
|
||||
const source = await fs.readFile(typeMapsPath, "utf8").catch((error) => {
|
||||
throw new Error(`Failed to read type map '${typeMapsPath}': ${error.message}`);
|
||||
});
|
||||
const metadata = parseTypeMapYaml(source, typeMapsPath);
|
||||
const module = generateTypeMapModule(metadata);
|
||||
await fs.mkdir(outDir, { recursive: true });
|
||||
await fs.writeFile(path.join(outDir, typeMapEntryName), module.js);
|
||||
await fs.writeFile(path.join(outDir, "mtp_type_map.d.ts"), module.dts);
|
||||
await fs.writeFile(path.join(outDir, `${typeMapEntryName}.d.ts`), module.dts);
|
||||
return source;
|
||||
}
|
||||
|
||||
async function copyWasmBuildInputs(buildRoot) {
|
||||
const inputs = [
|
||||
"Cargo.lock",
|
||||
"wasm",
|
||||
"common",
|
||||
"codec",
|
||||
"crypto",
|
||||
"type-map",
|
||||
];
|
||||
|
||||
for (const input of inputs) {
|
||||
const source = path.join(packageRoot, input);
|
||||
if (!await pathExists(source)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
await fs.cp(source, path.join(buildRoot, input), { recursive: true });
|
||||
}
|
||||
}
|
||||
|
||||
async function runWasmPack({ outDir, typeMapsPath, release, wasmPackArgs }) {
|
||||
const buildRoot = await fs.mkdtemp(path.join(os.tmpdir(), "mtp-wasm-"));
|
||||
const args = [
|
||||
"build",
|
||||
path.join(buildRoot, "wasm"),
|
||||
"--target",
|
||||
"web",
|
||||
"--out-dir",
|
||||
outDir,
|
||||
];
|
||||
if (release) {
|
||||
args.push("--release");
|
||||
} else {
|
||||
args.push("--dev");
|
||||
}
|
||||
args.push(...wasmPackArgs);
|
||||
|
||||
try {
|
||||
await copyWasmBuildInputs(buildRoot);
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const child = spawn("wasm-pack", args, {
|
||||
cwd: buildRoot,
|
||||
env: {
|
||||
...process.env,
|
||||
MTP_TYPE_MAPS: typeMapsPath,
|
||||
RUSTFLAGS: [process.env.RUSTFLAGS, "--cfg web_sys_unstable_apis"].filter(Boolean).join(" "),
|
||||
},
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
});
|
||||
|
||||
let stdout = "";
|
||||
let stderr = "";
|
||||
child.stdout.on("data", (chunk) => {
|
||||
stdout += chunk;
|
||||
});
|
||||
child.stderr.on("data", (chunk) => {
|
||||
stderr += chunk;
|
||||
});
|
||||
child.on("error", (error) => {
|
||||
if ((error as NodeJS.ErrnoException).code === "ENOENT") {
|
||||
reject(new Error("Failed to run wasm-pack. Install wasm-pack or enter the project Nix dev shell, then retry."));
|
||||
} else {
|
||||
reject(error);
|
||||
}
|
||||
});
|
||||
child.on("close", (code) => {
|
||||
if (code === 0) {
|
||||
resolve();
|
||||
} else {
|
||||
reject(new Error(`wasm-pack failed with exit code ${code}.\n${stdout}${stderr}`.trim()));
|
||||
}
|
||||
});
|
||||
});
|
||||
} finally {
|
||||
await fs.rm(buildRoot, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
async function buildIfNeeded(state, force = false) {
|
||||
if (state.buildPromise) {
|
||||
return state.buildPromise;
|
||||
}
|
||||
|
||||
state.buildPromise = (async () => {
|
||||
const typeMapSource = await writeTypeMapModule(state.outDir, state.typeMapsPath);
|
||||
const packageInputs = await hashPackageInputs();
|
||||
const fingerprint = crypto
|
||||
.createHash("sha256")
|
||||
.update(JSON.stringify({
|
||||
packageRoot,
|
||||
packageInputs,
|
||||
typeMapsPath: state.typeMapsPath,
|
||||
typeMapSource,
|
||||
release: state.release,
|
||||
wasmPackArgs: state.wasmPackArgs,
|
||||
}))
|
||||
.digest("hex");
|
||||
const stampPath = path.join(state.outDir, ".mtp-build.json");
|
||||
const rawEntryPath = path.join(state.outDir, rawEntryName);
|
||||
const wasmPath = path.join(state.outDir, wasmEntryName);
|
||||
let previousFingerprint = null;
|
||||
try {
|
||||
previousFingerprint = JSON.parse(await fs.readFile(stampPath, "utf8")).fingerprint;
|
||||
} catch {
|
||||
previousFingerprint = null;
|
||||
}
|
||||
|
||||
if (!force && previousFingerprint === fingerprint && await pathExists(rawEntryPath) && await pathExists(wasmPath)) {
|
||||
return;
|
||||
}
|
||||
|
||||
console.info("\x1b[1m\x1b[35mmtp\x1b[0m compiling wasm... (this could take a minute)");
|
||||
await runWasmPack(state);
|
||||
console.log("\x1b[1m\x1b[35mmtp\x1b[0m \x1b[32mcompilation finished.\x1b[0m");
|
||||
await fs.writeFile(stampPath, JSON.stringify({ fingerprint, builtAt: new Date().toISOString() }, null, 2));
|
||||
})().finally(() => {
|
||||
state.buildPromise = null;
|
||||
});
|
||||
|
||||
return state.buildPromise;
|
||||
}
|
||||
|
||||
export function mtp(options: MTPVitePluginOptions): VitePlugin {
|
||||
const normalized = normalizeOptions(options);
|
||||
const state = {
|
||||
outDir: null,
|
||||
typeMapsPath: null,
|
||||
release: true,
|
||||
wasmPackArgs: normalized.wasmPackArgs ?? [],
|
||||
buildPromise: null,
|
||||
};
|
||||
|
||||
return {
|
||||
name: "mtp",
|
||||
async config(config, env) {
|
||||
const root = path.resolve(config.root ?? process.cwd());
|
||||
state.typeMapsPath = path.resolve(root, normalized.typeMaps);
|
||||
state.outDir = path.resolve(root, normalized.outDir ?? path.join("node_modules", ".vite", "mtp"));
|
||||
state.release = normalized.release ?? env.command === "build";
|
||||
|
||||
if (!await pathExists(state.typeMapsPath)) {
|
||||
throw new Error(`mtp/vite could not find typeMaps file: ${state.typeMapsPath}`);
|
||||
}
|
||||
|
||||
await buildIfNeeded(state);
|
||||
|
||||
return {
|
||||
resolve: {
|
||||
preserveSymlinks: true,
|
||||
alias: {
|
||||
"mtp/raw": path.join(state.outDir, rawEntryName),
|
||||
"mtp/type-map": path.join(state.outDir, typeMapEntryName),
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
buildStart() {
|
||||
this.addWatchFile(state.typeMapsPath);
|
||||
},
|
||||
configureServer(server) {
|
||||
const wasmPath = path.join(state.outDir, wasmEntryName);
|
||||
const wasmUrl = devServerPath(server.config.root, wasmPath);
|
||||
if (wasmUrl) {
|
||||
server.middlewares.use(async (req, res, next) => {
|
||||
if (!req.url || new URL(req.url, "http://localhost").pathname !== wasmUrl) {
|
||||
next();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
res.setHeader("Content-Type", "application/wasm");
|
||||
res.end(await fs.readFile(wasmPath));
|
||||
} catch (error) {
|
||||
next(error);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
server.watcher.add(state.typeMapsPath);
|
||||
server.watcher.on("change", async (changedPath) => {
|
||||
if (path.resolve(changedPath) !== state.typeMapsPath) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await buildIfNeeded(state, true);
|
||||
server.moduleGraph.invalidateAll();
|
||||
server.ws.send({ type: "full-reload" });
|
||||
} catch (error) {
|
||||
server.config.logger.error(error instanceof Error ? error.message : String(error));
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export const mtpVitePlugin = mtp;
|
||||
export default mtpVitePlugin;
|
||||
Loading…
Reference in a new issue