back round 1 view raw

rudimentry _redirects support, incremental uploading for cli #3

closed

opened by

nekomimi.pet 1 month ago targeting main

TODO _headers file place.wisp.settings lexicon as a lexiconal way of configuring this

options

unified split

Changed files

+73

cli

.gitignore

Cargo.lock

Cargo.toml

src

cid.rs

cli/.gitignore

cli/Cargo.lock

···

       4385
       4385
        
        "jacquard-oauth",

     

       4386
       4386
        
        "miette",

     

       4387
       4387
        
        "mime_guess",

     

       4388
       4388
       +
        "multibase",

     

       4389
       4389
       +
        "multihash",

     

       4388
       4390
        
        "reqwest",

     

       4389
       4391
        
        "rustversion",

     

       4390
       4392
        
        "serde",

     

       4391
       4393
        
        "serde_json",

     

       4394
       4394
       +
        "sha2",

     

       4392
       4395
        
        "shellexpand",

     

       4393
       4396
        
        "tokio",

     

       4394
       4397
        
        "walkdir",

cli/Cargo.toml

···

       30
       30
        
       mime_guess = "2.0"

     

       31
       31
        
       bytes = "1.10"

     

       32
       32
        
       futures = "0.3.31"

     

       33
       33
       +
       multihash = "0.19.3"

     

       34
       34
       +
       multibase = "0.9"

     

       35
       35
       +
       sha2 = "0.10"

+66

cli/src/cid.rs

···

       1
       1
       +
       use jacquard_common::types::cid::IpldCid;

     

       2
       2
       +
       use sha2::{Digest, Sha256};

     

       3
       3
       +
       

     

       4
       4
       +
       /// Compute CID (Content Identifier) for blob content

     

       5
       5
       +
       /// Uses the same algorithm as AT Protocol: CIDv1 with raw codec (0x55) and SHA-256

     

       6
       6
       +
       /// 

     

       7
       7
       +
       /// CRITICAL: This must be called on BASE64-ENCODED GZIPPED content, not just gzipped content

     

       8
       8
       +
       /// 

     

       9
       9
       +
       /// Based on @atproto/common/src/ipld.ts sha256RawToCid implementation

     

       10
       10
       +
       pub fn compute_cid(content: &[u8]) -> String {

     

       11
       11
       +
           // Use node crypto to compute sha256 hash (same as AT Protocol)

     

       12
       12
       +
           let hash = Sha256::digest(content);

     

       13
       13
       +
           

     

       14
       14
       +
           // Create multihash (code 0x12 = sha2-256)

     

       15
       15
       +
           let multihash = multihash::Multihash::wrap(0x12, &hash)

     

       16
       16
       +
               .expect("SHA-256 hash should always fit in multihash");

     

       17
       17
       +
           

     

       18
       18
       +
           // Create CIDv1 with raw codec (0x55)

     

       19
       19
       +
           let cid = IpldCid::new_v1(0x55, multihash);

     

       20
       20
       +
           

     

       21
       21
       +
           // Convert to base32 string representation

     

       22
       22
       +
           cid.to_string_of_base(multibase::Base::Base32Lower)

     

       23
       23
       +
               .unwrap_or_else(|_| cid.to_string())

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       #[cfg(test)]

     

       27
       27
       +
       mod tests {

     

       28
       28
       +
           use super::*;

     

       29
       29
       +
           use base64::Engine;

     

       30
       30
       +
       

     

       31
       31
       +
           #[test]

     

       32
       32
       +
           fn test_compute_cid() {

     

       33
       33
       +
               // Test with a simple string: "hello"

     

       34
       34
       +
               let content = b"hello";

     

       35
       35
       +
               let cid = compute_cid(content);

     

       36
       36
       +
               

     

       37
       37
       +
               // CID should start with 'baf' for raw codec base32

     

       38
       38
       +
               assert!(cid.starts_with("baf"));

     

       39
       39
       +
           }

     

       40
       40
       +
       

     

       41
       41
       +
           #[test]

     

       42
       42
       +
           fn test_compute_cid_base64_encoded() {

     

       43
       43
       +
               // Simulate the actual use case: gzipped then base64 encoded

     

       44
       44
       +
               use flate2::write::GzEncoder;

     

       45
       45
       +
               use flate2::Compression;

     

       46
       46
       +
               use std::io::Write;

     

       47
       47
       +
               

     

       48
       48
       +
               let original = b"hello world";

     

       49
       49
       +
               

     

       50
       50
       +
               // Gzip compress

     

       51
       51
       +
               let mut encoder = GzEncoder::new(Vec::new(), Compression::default());

     

       52
       52
       +
               encoder.write_all(original).unwrap();

     

       53
       53
       +
               let gzipped = encoder.finish().unwrap();

     

       54
       54
       +
               

     

       55
       55
       +
               // Base64 encode the gzipped data

     

       56
       56
       +
               let base64_bytes = base64::prelude::BASE64_STANDARD.encode(&gzipped).into_bytes();

     

       57
       57
       +
               

     

       58
       58
       +
               // Compute CID on the base64 bytes

     

       59
       59
       +
               let cid = compute_cid(&base64_bytes);

     

       60
       60
       +
               

     

       61
       61
       +
               // Should be a valid CID

     

       62
       62
       +
               assert!(cid.starts_with("baf"));

     

       63
       63
       +
               assert!(cid.len() > 10);

     

       64
       64
       +
           }

     

       65
       65
       +
       }

     

       66
       66
       +