vsf 0.3.4

Versatile Storage Format
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
//! Metadata parsers

use super::helpers::{decode_isize, decode_usize};
use crate::types::{EtType, VsfType, WorldCoord};
use std::io::{Error, ErrorKind};

// ==================== METADATA ====================

pub fn parse_string(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    #[cfg(feature = "text")]
    {
        use crate::text_encoding::decode_text_with_size;

        // Read character count
        let char_count = decode_usize(data, pointer)?;

        // Rest of data is Huffman-encoded bytes
        let huffman_bytes = &data[*pointer..];

        if huffman_bytes.is_empty() && char_count > 0 {
            return Err(Error::new(
                ErrorKind::UnexpectedEof,
                "No Huffman data for non-zero char count",
            ));
        }

        // Decode using Huffman decoder and get bytes consumed
        let (value, bytes_consumed) = decode_text_with_size(huffman_bytes, char_count)
            .map_err(|e| Error::new(ErrorKind::InvalidData, format!("Huffman decode: {}", e)))?;

        // Advance pointer by actual bytes consumed
        *pointer += bytes_consumed;

        Ok(VsfType::x(value))
    }
    #[cfg(not(feature = "text"))]
    {
        // Without text feature, decode as raw UTF-8 bytes
        let byte_count = decode_usize(data, pointer)?;

        if *pointer + byte_count > data.len() {
            return Err(Error::new(
                ErrorKind::UnexpectedEof,
                "Not enough data for string bytes",
            ));
        }

        let bytes = &data[*pointer..*pointer + byte_count];
        let value = String::from_utf8(bytes.to_vec())
            .map_err(|e| Error::new(ErrorKind::InvalidData, format!("Invalid UTF-8: {}", e)))?;

        *pointer += byte_count;
        Ok(VsfType::x(value))
    }
}

pub fn parse_eagle_time(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for eagle time type marker",
        ));
    }

    let time_type = data[*pointer];
    *pointer += 1;

    match time_type {
        b'u' => {
            let value = decode_usize(data, pointer)?;
            Ok(VsfType::e(EtType::u(value as u64)))
        }
        b'i' => {
            let value = decode_isize(data, pointer)?;
            Ok(VsfType::e(EtType::i(value as i64)))
        }
        b'f' => {
            // Eagle Time floats: [e][f][5 or 6][bytes]
            if *pointer >= data.len() {
                return Err(Error::new(
                    ErrorKind::UnexpectedEof,
                    "Not enough data for float precision marker",
                ));
            }

            let precision = data[*pointer];
            *pointer += 1;

            match precision {
                b'5' => {
                    // f32 (f5)
                    if *pointer + 4 > data.len() {
                        return Err(Error::new(
                            ErrorKind::UnexpectedEof,
                            "Not enough data for f5",
                        ));
                    }
                    let value = f32::from_be_bytes([
                        data[*pointer],
                        data[*pointer + 1],
                        data[*pointer + 2],
                        data[*pointer + 3],
                    ]);
                    *pointer += 4;
                    Ok(VsfType::e(EtType::f5(value)))
                }
                b'6' => {
                    // f64 (f6)
                    if *pointer + 8 > data.len() {
                        return Err(Error::new(
                            ErrorKind::UnexpectedEof,
                            "Not enough data for f6",
                        ));
                    }
                    let value = f64::from_be_bytes([
                        data[*pointer],
                        data[*pointer + 1],
                        data[*pointer + 2],
                        data[*pointer + 3],
                        data[*pointer + 4],
                        data[*pointer + 5],
                        data[*pointer + 6],
                        data[*pointer + 7],
                    ]);
                    *pointer += 8;
                    Ok(VsfType::e(EtType::f6(value)))
                }
                _ => Err(Error::new(
                    ErrorKind::InvalidData,
                    format!(
                        "Invalid Eagle Time float precision marker: {}",
                        precision as char
                    ),
                )),
            }
        }
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            "Invalid eagle time type",
        )),
    }
}

pub fn parse_world_coord(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    if *pointer + 8 > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for world coordinate",
        ));
    }

    let raw = u64::from_be_bytes([
        data[*pointer],
        data[*pointer + 1],
        data[*pointer + 2],
        data[*pointer + 3],
        data[*pointer + 4],
        data[*pointer + 5],
        data[*pointer + 6],
        data[*pointer + 7],
    ]);
    *pointer += 8;

    Ok(VsfType::w(WorldCoord::from_raw(raw)))
}

pub fn parse_dtype(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let length = decode_usize(data, pointer)?;
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for dtype",
        ));
    }

    let bytes = &data[*pointer..*pointer + length];

    // Validate ASCII-only (identifiers like "imaging.raw", "iso_speed")
    if !bytes.iter().all(|&b| b.is_ascii()) {
        return Err(Error::new(
            ErrorKind::InvalidData,
            "dtype must be ASCII (identifiers only)",
        ));
    }

    let value = String::from_utf8(bytes.to_vec()).unwrap(); // Safe: validated ASCII
    *pointer += length;
    Ok(VsfType::d(value))
}

pub fn parse_label(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let length = decode_usize(data, pointer)?;
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for label",
        ));
    }

    let bytes = &data[*pointer..*pointer + length];

    // Validate ASCII-only (identifiers like field names, keys)
    if !bytes.iter().all(|&b| b.is_ascii()) {
        return Err(Error::new(
            ErrorKind::InvalidData,
            "label must be ASCII (identifiers only)",
        ));
    }

    let value = String::from_utf8(bytes.to_vec()).unwrap(); // Safe: validated ASCII
    *pointer += length;
    Ok(VsfType::l(value))
}

pub fn parse_offset(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let offset = decode_usize(data, pointer)?;
    Ok(VsfType::o(offset))
}

pub fn parse_length(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let length = decode_usize(data, pointer)?;
    Ok(VsfType::b(length, false)) // Inclusive flag not relevant when parsing
}

pub fn parse_file_length(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let length = decode_usize(data, pointer)?;
    Ok(VsfType::L(length, false)) // Inclusive flag not relevant when parsing
}

pub fn parse_count(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let count = decode_usize(data, pointer)?;
    Ok(VsfType::n(count))
}

pub fn parse_version(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let version = decode_usize(data, pointer)?;
    Ok(VsfType::z(version))
}

pub fn parse_backward_version(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let version = decode_usize(data, pointer)?;
    Ok(VsfType::y(version))
}

pub fn parse_marker_def(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let value = decode_usize(data, pointer)?;
    Ok(VsfType::m(value))
}

pub fn parse_marker_ref(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    let value = decode_usize(data, pointer)?;
    Ok(VsfType::m(value))
}

/// Parse colour constant: `rc[a-z]`
///
/// Format: 3 bytes total - 'r', 'c', colour letter
/// Examples: rcn (green), rcr (red), rcb (blue), etc.
pub fn parse_colour_constant(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Already consumed 'r', now expect 'c' and colour letter
    if *pointer + 2 > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Incomplete colour constant (need 2 more bytes after 'r')",
        ));
    }

    let second = data[*pointer];
    let third = data[*pointer + 1];
    *pointer += 2;

    // Validate 'c' marker
    if second != b'c' {
        return Err(Error::new(
            ErrorKind::InvalidData,
            format!(
                "Invalid colour constant: expected 'c', got '{}'",
                second as char
            ),
        ));
    }

    // Match colour letter
    match third {
        b'k' => Ok(VsfType::rck), // Black
        b'w' => Ok(VsfType::rcw), // White
        b'r' => Ok(VsfType::rcr), // Red
        b'n' => Ok(VsfType::rcn), // Green
        b'b' => Ok(VsfType::rcb), // Blue
        b'c' => Ok(VsfType::rcc), // Cyan
        b'j' => Ok(VsfType::rcj), // Magenta
        b'y' => Ok(VsfType::rcy), // Yellow
        b'g' => Ok(VsfType::rcg), // Gray
        b'o' => Ok(VsfType::rco), // Orange
        b'v' => Ok(VsfType::rcv), // Violet
        b'l' => Ok(VsfType::rcl), // Lime
        b'q' => Ok(VsfType::rcq), // Aqua
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown colour constant: rc{}", third as char),
        )),
    }
}

/// Parse colour array types: ra (RGBA u8x4), rt (RGBA u16x4), rp (RGB565 u16)
pub fn parse_colour_array(
    data: &[u8],
    pointer: &mut usize,
    colour_type: u8,
) -> Result<VsfType, Error> {
    match colour_type {
        b'a' => {
            // ra: [u8; 4] RGBA
            if *pointer + 4 > data.len() {
                return Err(Error::new(
                    ErrorKind::UnexpectedEof,
                    "Incomplete ra colour (need 4 bytes)",
                ));
            }
            let rgba = [
                data[*pointer],
                data[*pointer + 1],
                data[*pointer + 2],
                data[*pointer + 3],
            ];
            *pointer += 4;
            Ok(VsfType::ra(rgba))
        }
        b't' => {
            // rt: [u16; 4] RGBA
            if *pointer + 8 > data.len() {
                return Err(Error::new(
                    ErrorKind::UnexpectedEof,
                    "Incomplete rt colour (need 8 bytes)",
                ));
            }
            let rt_rgba = [
                u16::from_le_bytes([data[*pointer], data[*pointer + 1]]),
                u16::from_le_bytes([data[*pointer + 2], data[*pointer + 3]]),
                u16::from_le_bytes([data[*pointer + 4], data[*pointer + 5]]),
                u16::from_le_bytes([data[*pointer + 6], data[*pointer + 7]]),
            ];
            *pointer += 8;
            Ok(VsfType::rt(rt_rgba))
        }
        b'p' => {
            // rp: u16 RGB565
            if *pointer + 2 > data.len() {
                return Err(Error::new(
                    ErrorKind::UnexpectedEof,
                    "Incomplete rp colour (need 2 bytes)",
                ));
            }
            let rgb565 = u16::from_le_bytes([data[*pointer], data[*pointer + 1]]);
            *pointer += 2;
            Ok(VsfType::rp(rgb565))
        }
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown colour array type: r{}", colour_type as char),
        )),
    }
}

pub fn parse_mac(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm byte (h for HMAC-SHA256, s for HMAC-SHA512, etc.)
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for MAC algorithm",
        ));
    }
    let algo = data[*pointer];
    *pointer += 1;

    // Read length (stored as len-1) using standard VSF variable-length encoding
    let length = decode_usize(data, pointer)? + 1; // Add 1 back

    // Read MAC tag data
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for MAC tag",
        ));
    }
    let mac_tag = data[*pointer..*pointer + length].to_vec();
    *pointer += length;

    // Return appropriate MAC type based on algorithm
    match algo {
        b'h' => Ok(VsfType::ah(mac_tag)), // HMAC-SHA (size disambiguates 256/512)
        b'p' => Ok(VsfType::ap(mac_tag)),
        b'b' => Ok(VsfType::ab(mac_tag)),
        b'c' => Ok(VsfType::ac(mac_tag)),
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown MAC algorithm: {}", algo as char),
        )),
    }
}

pub fn parse_hash(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm byte (b for BLAKE3, s for SHA)
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for hash algorithm",
        ));
    }
    let algo = data[*pointer];
    *pointer += 1;

    // Read length (stored as len-1) using standard VSF variable-length encoding
    let length = decode_usize(data, pointer)? + 1; // Add 1 back

    // Read hash data
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for hash",
        ));
    }
    let hash = data[*pointer..*pointer + length].to_vec();
    *pointer += length;

    // Return appropriate hash type based on algorithm
    match algo {
        b'p' => Ok(VsfType::hp(hash)),
        b'b' => Ok(VsfType::hb(hash)),
        b's' => Ok(VsfType::hs(hash)),
        b'm' => Ok(VsfType::hm(hash)),
        b'g' => Ok(VsfType::hg(hash)),
        b'P' => Ok(VsfType::hP(hash)), // Photon handle proof
        b'R' => Ok(VsfType::hR(hash)), // Random padding material
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown hash algorithm: {}", algo as char),
        )),
    }
}

pub fn parse_signature(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm byte (e for Ed25519, p for ECDSA-P256, r for RSA)
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for signature algorithm",
        ));
    }
    let algo = data[*pointer];
    *pointer += 1;

    // Read length (stored as len-1) using standard VSF variable-length encoding
    let length = decode_usize(data, pointer)? + 1; // Add 1 back

    // Read signature data
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for signature",
        ));
    }
    let sig = data[*pointer..*pointer + length].to_vec();
    *pointer += length;

    // Return appropriate signature type
    match algo {
        b'e' => Ok(VsfType::ge(sig)),
        b'p' => Ok(VsfType::gp(sig)),
        b'r' => Ok(VsfType::gr(sig)),
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown signature algorithm: {}", algo as char),
        )),
    }
}

pub fn parse_key(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm byte (e for Ed25519, x for X25519, s for shared secrets, etc.)
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for key algorithm",
        ));
    }
    let algo = data[*pointer];
    *pointer += 1;

    // Handle shared secrets (ks*) - these have a 3-byte prefix
    if algo == b's' {
        // This is a shared secret - dispatch to parse_shared_secret
        // Note: pointer is now at the third byte (algorithm variant)
        return parse_shared_secret(data, pointer);
    }

    // Read length (stored as len-1) using standard VSF variable-length encoding
    let length = decode_usize(data, pointer)? + 1; // Add 1 back

    // Read key data
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for key",
        ));
    }
    let key = data[*pointer..*pointer + length].to_vec();
    *pointer += length;

    // Return appropriate key type
    match algo {
        b'e' => Ok(VsfType::ke(key)),
        b'x' => Ok(VsfType::kx(key)),
        b'p' => Ok(VsfType::kp(key)),
        b'k' => Ok(VsfType::kk(key)),
        b'c' => Ok(VsfType::kc(key)),
        b'a' => Ok(VsfType::ka(key)),
        b'm' => Ok(VsfType::km(key)),
        b'f' => Ok(VsfType::kf(key)),
        b'l' => Ok(VsfType::kl(key)),
        b'n' => Ok(VsfType::kn(key)), // NTRU public key
        b'h' => Ok(VsfType::kh(key)), // HQC public key
        b'd' => Ok(VsfType::kd(key)), // Dilithium/ML-DSA public key
        b'b' => Ok(VsfType::kb(key)), // BIKE public key
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown key algorithm: {}", algo as char),
        )),
    }
}

/// Parse shared secret (ks* types - 3-byte prefix)
pub fn parse_shared_secret(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm byte (x for X25519, p for P-curve, k for secp256k1, etc.)
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for shared secret algorithm",
        ));
    }
    let algo = data[*pointer];
    *pointer += 1;

    // Read length (stored as len-1) using standard VSF variable-length encoding
    let length = decode_usize(data, pointer)? + 1; // Add 1 back

    // Read secret data
    if *pointer + length > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for shared secret",
        ));
    }
    let secret = data[*pointer..*pointer + length].to_vec();
    *pointer += length;

    // Return appropriate shared secret type
    match algo {
        b'x' => Ok(VsfType::ksx(secret)), // X25519
        b'p' => Ok(VsfType::ksp(secret)), // P-curve (P-256/P-384)
        b'k' => Ok(VsfType::ksk(secret)), // secp256k1
        b'f' => Ok(VsfType::ksf(secret)), // Frodo
        b'n' => Ok(VsfType::ksn(secret)), // NTRU
        b'l' => Ok(VsfType::ksl(secret)), // McEliece
        b'h' => Ok(VsfType::ksh(secret)), // HQC
        b'm' => Ok(VsfType::ksm(secret)), // ML-KEM
        _ => Err(Error::new(
            ErrorKind::InvalidData,
            format!("Unknown shared secret algorithm: {}", algo as char),
        )),
    }
}

/// Parse wrapped/encoded data (v type)
pub fn parse_wrapped(data: &[u8], pointer: &mut usize) -> Result<VsfType, Error> {
    // Read algorithm ID byte
    if *pointer >= data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for wrapped data algorithm ID",
        ));
    }
    let algorithm = data[*pointer];
    *pointer += 1;

    // Read wrapped data length and data
    let length_bits = decode_usize(data, pointer)?;
    let length_bytes = (length_bits + 7) >> 3; // Convert bits to bytes (round up)
    if *pointer + length_bytes > data.len() {
        return Err(Error::new(
            ErrorKind::UnexpectedEof,
            "Not enough data for wrapped data",
        ));
    }
    let wrapped_data = data[*pointer..*pointer + length_bytes].to_vec();
    *pointer += length_bytes;
    Ok(VsfType::v(algorithm, wrapped_data))
}

// ==================== PREAMBLE ====================

/// Parse a preamble from VSF data
///
/// Format: {n[count] b[size] h?[hash] g?[signature]}
///
/// Returns (count, size_bits, hash, signature, bytes_consumed)
pub fn parse_preamble(
    data: &[u8],
    pointer: &mut usize,
) -> Result<(usize, usize, Option<Vec<u8>>, Option<Vec<u8>>), Error> {
    // Expect opening brace
    if *pointer >= data.len() || data[*pointer] != b'{' {
        return Err(Error::new(
            ErrorKind::InvalidData,
            format!("Expected '{{' for preamble at byte {}", pointer),
        ));
    }
    *pointer += 1;

    let mut count = None;
    let mut size_bits = None;
    let mut hash = None;
    let mut signature = None;

    // Parse fields until closing brace
    while *pointer < data.len() && data[*pointer] != b'}' {
        let marker = data[*pointer];
        *pointer += 1;

        match marker {
            b'n' => {
                // Parse count
                count = Some(decode_usize(data, pointer)?);
            }
            b'b' => {
                // Parse size in bits
                size_bits = Some(decode_usize(data, pointer)?);
            }
            b'h' => {
                // Parse hash
                let hash_len = decode_usize(data, pointer)?;
                if *pointer + hash_len > data.len() {
                    return Err(Error::new(
                        ErrorKind::UnexpectedEof,
                        "Preamble hash extends beyond data",
                    ));
                }
                hash = Some(data[*pointer..*pointer + hash_len].to_vec());
                *pointer += hash_len;
            }
            b'g' => {
                // Parse signature
                let sig_len = decode_usize(data, pointer)?;
                if *pointer + sig_len > data.len() {
                    return Err(Error::new(
                        ErrorKind::UnexpectedEof,
                        "Preamble signature extends beyond data",
                    ));
                }
                signature = Some(data[*pointer..*pointer + sig_len].to_vec());
                *pointer += sig_len;
            }
            _ => {
                return Err(Error::new(
                    ErrorKind::InvalidData,
                    format!("Unknown preamble marker: {}", marker as char),
                ));
            }
        }
    }

    // Expect closing brace
    if *pointer >= data.len() || data[*pointer] != b'}' {
        return Err(Error::new(
            ErrorKind::InvalidData,
            format!("Expected '}}' to close preamble at byte {}", pointer),
        ));
    }
    *pointer += 1;

    // Verify required fields
    let count = count
        .ok_or_else(|| Error::new(ErrorKind::InvalidData, "Missing 'n' (count) in preamble"))?;

    let size_bits = size_bits
        .ok_or_else(|| Error::new(ErrorKind::InvalidData, "Missing 'b' (size) in preamble"))?;

    Ok((count, size_bits, hash, signature))
}