* Add craft-vectorcraft-format: the .vectorcraft envelope, with the document as a type parameter File<D>, Head and Image hold the members VectorCraft writes, in its order, with its skip rules: serde_json output of a File<D> is the JSON VectorCraft writes, compact or pretty. Tail places entries after the JSON from version 4 (INLINE_MAX bytes or more, after BLOB_MAGIC), and split_tail and Image::bytes read them back. The crate also has the version and name constants, check() for the format name and newer versions, sniff() for plain and gzip files (the top-level "format" member must be vectorcraft or drawcraft), and standard base64. No dependency on any app; builds for wasm32-unknown-unknown. * ci: do not keep the checkout token in the vectorcraft-format workflow The checkout step sets persist-credentials: false, as jpeg.yml and media.yml do. No later step in the job uses the token. * vectorcraft-format: limit the bytes copied from the data after the JSON Entries::bytes reads a file's entries and returns Error::TooBig once the blob ranges it has copied add up to more than the data after the JSON holds, so entries that name the same bytes again and again are refused, as VectorCraft's reader refuses them. A generator, preview or pdf of the wrong shape now reads as None in File and Head, as VectorCraft opens such a file. File::tail gives a Tail for the file's own version. * ci: pin actions/checkout by commit and Rust to 1.95 in the vectorcraft-format workflow * vectorcraft-format: document that base64 decode ignores the bits before the padding decode reads a group such as Zh== like Zg==, and Zm9= like Zm8=, as VectorCraft's own base64_decode does. The doc comment says so, and a test pins both cases to the canonical bytes. * vectorcraft-format: entries naming the same range share one buffer VectorCraft's reader keeps the bytes of each [offset, length] it has read and gives a repeated entry the same buffer without counting it again (crates/format/src/unpack.rs). Entries::bytes refused such a file once the repeats passed the size of the data after the JSON. It now returns Arc<[u8]>, caches each range, and counts it once. Overlapping ranges that differ are still copied and counted each time. * vectorcraft-format: a refused entry does not count against the copy limit Entries::bytes added a refused entry's length to the bytes copied, so a later entry that fit was refused too. It now counts an entry only once it is read. * vectorcraft-format: Contents reads the document without keeping the preview and PDF File<D> checks the shape of generator, preview and pdf by holding each value in memory, and keeps the preview and PDF base64 it reads. Contents<D> reads format, version, profiles, document and images, and skips the other three as the JSON is read. It accepts and refuses the same files as File<D>. * vectorcraft-format: Contents reads a repeated generator, preview or pdf VectorCraft opens a file whose generator, preview or pdf member is repeated, since its reader does not declare those members, and refuses a repeated format, version, profiles, document or images. Contents now leaves the three members undeclared, so serde skips every copy of them, and still refuses the other repeated members. File and Head are unchanged. * vectorcraft-format: sniff decodes JSON escapes in the format member serde_json reads a file whose format key or value is written with escapes, such as \u0066ormat, as a VectorCraft file, and sniff compared the raw bytes and refused it. sniff now decodes the key and the value before comparing them. * vectorcraft-format: File::read and Contents::read check the version File::read and Contents::read are the readers of a file's JSON. Both refuse another format or a version newer than VERSION after the JSON reads, with ReadError::Envelope holding the Error (Format or TooNew), and return ReadError::Json otherwise. File and Contents no longer implement Deserialize, so a reader cannot skip the check. Both read one implementation and treat repeated members the same way: a repeated generator, preview or pdf is accepted, and File keeps the last value, as serde_json reads a repeated key into a Value. A repeated format, version, document, images or profiles is refused. A top-level array holds format, version, document, images and profiles in that order, as VectorCraft reads it; Contents' fields follow that order. - Image::bytes returns None for an entry of more than MAX_ENTRY (1 GiB, VectorCraft's limit on one entry of a compressed file), and Image::bytes_at_most takes another limit. Entries keeps no per-entry limit, as VectorCraft opens larger entries in uncompressed files. - Entries::blob reads a range; Entries returns Arc<Vec<u8>>. - marker_at finds BLOB_MAGIC where the writer puts it in a file's first bytes; split_tail uses it. - File, Contents, Head, Image, Part and ReadError are #[non_exhaustive].
6.3 KiB
craft-vectorcraft-format
The envelope of VectorCraft's .vectorcraft file, for VectorCraft and for the apps that read its
files. The document is a type parameter: VectorCraft supplies its own document type, and a reader
that needs only the envelope uses serde::de::IgnoredAny. The crate takes and returns bytes; it
does not open files. No unsafe, no panics on malformed input, and it builds for
wasm32-unknown-unknown. The dependencies are serde, serde_json, thiserror and flate2
(its pure-Rust backend).
craft-vectorcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "<commit>" }
The file
A .vectorcraft file is UTF-8 JSON, gzip-compressed when saved with Use Compression. Since
version 4, entries of INLINE_MAX (8 KiB) or more follow the JSON after BLOB_MAGIC
(\n\0VCBLOBS\0) and give "blob": [offset, length] instead of base64 data.
| Member | Type | Written |
|---|---|---|
format |
String |
"vectorcraft", or "drawcraft" in versions 1 and 2 |
version |
u32 |
1 to VERSION (4) |
generator |
Option<String> |
"VectorCraft <app version>" |
preview |
Option<Image> |
a PNG of the first artboard, at most PREVIEW_MAX (256) pixels on its longer side |
profiles |
BTreeMap<String, Image> |
ICC files by profile name, when there are any |
pdf |
Option<Image> |
a PDF of every artboard |
document |
D |
the document |
images |
BTreeMap<String, Image> |
the images the document uses, always written |
File<D> holds these members in this order. serde_json::to_vec and to_vec_pretty of a
File<D> give the bytes VectorCraft writes before the data after the JSON. File::read(json)
reads one, and Contents::read(json) reads format, version, document, images and
profiles and skips generator, preview and pdf as the JSON is read, so their base64 is not
buffered or kept. Both read the files VectorCraft opens:
- They return
ReadError::Envelope(Error::Format)for another format name andReadError::Envelope(Error::TooNew)for a version newer thanVERSION, after the JSON reads;ReadError::Jsonotherwise. - A repeated
generator,previeworpdfis accepted, andFilekeeps the last value, asserde_jsonreads a repeated key into aValue. Any other repeated member is refused. - A top-level JSON array holds
format,version,document,imagesandprofiles, in that order.
Head reads only preview and pdf. Image has mime, data (base64), blob and proxy
(a linked image's low-resolution preview). File, Contents, Head, Image, Part and
ReadError are #[non_exhaustive]: other crates build a File with File::new and an Image
with Image::inline, Tail::image or Image::default().
Use
use craft_vectorcraft_format::{Entries, File, split_tail};
// Writing
let mut file = File::new(document);
let mut tail = file.tail();
file.generator = Some(format!("VectorCraft {version}"));
file.pdf = Some(tail.image("application/pdf", &pdf, false));
let mut out = serde_json::to_vec(&file)?;
tail.write_to(&mut out)?;
// Reading (decompress first when `is_compressed(&bytes)`)
let (json, after) = split_tail(&bytes);
let file = File::<serde::de::IgnoredAny>::read(json)?;
let mut entries = Entries::new(after);
let pdf = file.pdf.map(|p| entries.bytes(&p)).transpose()?.flatten();
sniff(head)recognizes a file, plain or gzip, from its first 256 bytes after decompression: they start with{and the first"format"member is"vectorcraft"or"drawcraft", with JSON escapes in the key and value decoded.is_compressed(bytes)checks for the gzip magic bytes.split_tail(bytes)andjson_part(bytes)find the JSON and the data after it in an uncompressed or decompressed file.marker_at(bytes)gives the offset ofBLOB_MAGICwhen it follows the JSON as VectorCraft writes it, and works on the first bytes of a file that is being decompressed.File::checkandcheckreturnError::Formatfor another format name andError::TooNewfor a version newer thanVERSION.- A
generator,previeworpdfof the wrong shape reads asNoneinFileandHead.FileandHeadhold each of these values in memory while checking its shape;Contentsskips them. Image::lengives the size an entry states without decoding it;Image::bytes(after)decodesdataor copies theblobrange, and returnsNonefor an entry of more thanMAX_ENTRY(1 GiB, VectorCraft's limit on one entry of a compressed file).Image::bytes_at_mosttakes another limit.entry(after, [offset, length])returns the range.Entries::new(after)reads a file's entries:Entries::bytesandEntries::blobreturn each entry's bytes as anArc<Vec<u8>>, give entries that name the same[offset, length]one shared buffer, and returnError::TooBigonce theblobranges copied add up to more thanafterholds, as when many different ranges overlap.Entrieshas no limit on one entry.base64::decodedoes not check the unused bits before the padding:Zh==decodes likeZg==, as in VectorCraft's own decoder.File::tail(), orTail::new(version), places each entry withTail::image: after the JSON for version 4 and entries of at leastINLINE_MAXbytes, inline otherwise.Tail::write_towrites the marker and the entries.base64::encode,decodeanddecoded_lenhandle thedatamembers.
Size limits on the JSON and on decompression stay with each reader.
Testing
cargo test -p craft-vectorcraft-format runs tests/envelope.rs, which compares files written
through File and Tail with JSON written out by hand in VectorCraft's layout (compact and
pretty, version 4 with data after the JSON, version 2 under the former name), reads them back,
and checks split_tail, marker_at, sniff on plain, gzip and truncated gzip input, the limits
Entries and Image::bytes put on the bytes copied, members of the wrong shape or repeated, the
array form, the format and version checks of File::read and Contents::read, and the base64
vectors of RFC 4648. The doctests check that the public structs and ReadError cannot be built or
matched exhaustively from another crate.
.github/workflows/vectorcraft-format.yml runs fmt, clippy and the tests on Linux and Windows,
and a wasm32-unknown-unknown check.