Skip to content

Commit e232acf

Browse files
committed
fix: update protons to latest version
1 parent a6c4208 commit e232acf

File tree

3 files changed

+18
-30
lines changed

3 files changed

+18
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"safe-buffer": "^5.1.2"
4343
},
4444
"dependencies": {
45-
"protons": "^1.0.1"
45+
"protons": "^1.1.0"
4646
},
4747
"contributors": [
4848
"David Dias <daviddias.p@gmail.com>",

src/index.js

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ function Data (type, data) {
5151
this.blockSizes.forEach((size) => {
5252
sum += size
5353
})
54-
if (data) {
55-
sum += data.length
54+
if (this.data) {
55+
sum += this.data.length
5656
}
5757
return sum
5858
}
@@ -87,17 +87,13 @@ function Data (type, data) {
8787
let mode
8888

8989
if (!isNaN(this.mode)) {
90-
mode = {
91-
value: this.mode
92-
}
90+
mode = this.mode
9391
}
9492

9593
let mtime
9694

9795
if (this.mtime) {
98-
mtime = {
99-
seconds: Math.round(this.mtime.getTime() / 1000)
100-
}
96+
mtime = Math.round(this.mtime.getTime() / 1000)
10197
}
10298

10399
return unixfsData.encode({
@@ -116,20 +112,16 @@ function Data (type, data) {
116112
// decode from protobuf https://github.com/ipfs/go-ipfs/blob/master/unixfs/format.go#L24
117113
Data.unmarshal = (marshaled) => {
118114
const decoded = unixfsData.decode(marshaled)
119-
120-
if (!decoded.Data) {
121-
decoded.Data = undefined
122-
}
123-
124-
const obj = new Data(types[decoded.Type], decoded.Data)
115+
const data = decoded.hasData() ? decoded.Data : undefined
116+
const obj = new Data(types[decoded.Type], data)
125117
obj.blockSizes = decoded.blocksizes
126118

127-
if (decoded.mode) {
128-
obj.mode = decoded.mode.value
119+
if (decoded.hasMode()) {
120+
obj.mode = decoded.mode
129121
}
130122

131-
if (decoded.mtime) {
132-
obj.mtime = new Date(decoded.mtime.seconds * 1000)
123+
if (decoded.hasMtime()) {
124+
obj.mtime = new Date(decoded.mtime * 1000)
133125
}
134126

135127
return obj

src/unixfs.proto.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
'use strict'
22

3-
module.exports = `message Data {
3+
module.exports = `
4+
syntax = "proto2";
5+
6+
message Data {
47
enum DataType {
58
Raw = 0;
69
Directory = 1;
@@ -16,18 +19,11 @@ module.exports = `message Data {
1619
repeated uint64 blocksizes = 4;
1720
optional uint64 hashType = 5;
1821
optional uint64 fanout = 6;
19-
optional Mode mode = 7;
20-
optional Mtime mtime = 8;
22+
optional uint32 mode = 7;
23+
optional int64 mtime = 8;
2124
}
2225
2326
message Metadata {
2427
required string MimeType = 1;
2528
}
26-
27-
message Mode {
28-
required uint32 value = 1;
29-
}
30-
31-
message Mtime {
32-
required int64 seconds = 1;
33-
}`
29+
`

0 commit comments

Comments
 (0)