Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: iconVersionId wrong encode decode #156

Merged
merged 12 commits into from
Oct 10, 2023
Merged

fix: iconVersionId wrong encode decode #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97ebe0e
add Icon {proto,schema} and {encode,decode}-conversions
Oct 2, 2023
06f12eb
Update src/lib/decode-conversions.ts
tomasciccola Oct 3, 2023
ed93d11
Update proto/icon/v1.proto
tomasciccola Oct 3, 2023
0affb27
reverted icon/v1.proto PixelDensity enum
Oct 3, 2023
405370b
remove unnecessary type casting, add tests
Oct 3, 2023
e972e50
call pixelDensity x1,x2,x3 on proto
Oct 3, 2023
c64e173
encode `blobVersionId` as utf-8 since we have slashes
Oct 9, 2023
1fba090
Merge branch 'main' of github.com:digidem/mapeo-schema into chore/fix…
Oct 9, 2023
333cbd4
merge fix
Oct 9, 2023
f9d504b
make icon `blobVersionId` a struct with {coreId,index}
Oct 9, 2023
6c78564
fix missing `/${index}` on fixture of Icon.blobVersionId
Oct 9, 2023
c1a9f02
add check to blobVersionId
tomasciccola Oct 10, 2023
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
7 changes: 6 additions & 1 deletion proto/icon/v1.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ message Icon_1 {
png = 1;
}

message BlobVersionId {
bytes coreDiscoveryKey = 1;
int32 index = 2;
}

Size size = 1 [(required) = true];
PixelDensity pixelDensity = 2 [(required) = true];
bytes blobVersionId = 3 [(required) = true];
BlobVersionId blobVersionId = 3 [(required) = true];
MimeType mimeType = 4 [(required) = true];
}

Expand Down
1 change: 1 addition & 0 deletions schema/icon/v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"enum": [1,2,3]
},
"blobVersionId": {
"description": "Version id of the icon blob. Each id is id (hex-encoded 32 byte buffer) and index number, separated by '/'",
"type": "string"
},
"mimeType": {
Expand Down
5 changes: 4 additions & 1 deletion src/lib/decode-conversions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,11 @@ export const convertIcon: ConvertFunction<'icon'> = (message, versionObj) => {

function convertIconVariant(variant: Icon_1_IconVariant) {
const { blobVersionId, mimeType, size, pixelDensity } = variant
tomasciccola marked this conversation as resolved.
Show resolved Hide resolved
if (!blobVersionId) {
throw new Error('Missing required property `blobVersionId`')
}
return {
blobVersionId: blobVersionId.toString('hex'),
blobVersionId: getVersionId(blobVersionId),
mimeType: convertIconMimeType(mimeType),
size: size === 'UNRECOGNIZED' ? 'medium' : size,
pixelDensity: convertIconPixelDensity(pixelDensity),
Expand Down
2 changes: 1 addition & 1 deletion src/lib/encode-conversions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function convertIconVariants(variants: Icon['variants']): Icon_1_IconVariant[] {
return variants.map((variant) => {
const { blobVersionId, mimeType, size, pixelDensity } = variant
return {
blobVersionId: Buffer.from(blobVersionId, 'hex'),
blobVersionId: parseVersionId(blobVersionId),
mimeType: convertIconMimeType(mimeType),
size,
pixelDensity: convertIconPixelDensity(pixelDensity),
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/good-docs-completed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ export const goodDocsCompleted = [
{
size: 'small',
pixelDensity: 1,
blobVersionId: randomBytes(32).toString('hex'),
blobVersionId: randomBytes(32).toString('hex') + '/0',
mimeType: 'image/png',
},
{
size: 'large',
pixelDensity: 3,
blobVersionId: randomBytes(32).toString('hex'),
blobVersionId: randomBytes(32).toString('hex') + '/0',
mimeType: 'image/svg+xml',
},
],
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/good-docs-minimal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const goodDocsMinimal = [
{
size: 'small',
pixelDensity: 1,
blobVersionId: randomBytes(32).toString('hex'),
blobVersionId: randomBytes(32).toString('hex') + '/0',
mimeType: 'image/png',
},
],
Expand Down
Loading