Skip to content

Commit 128e96e

Browse files
authored
chore: move withTimeoutOption to core-utils (#3407)
Pulls non-grpc changes out of #3403 to ease the continued merging of master into that branch. - Moves withTimeoutOption into core-utils - Moves TimeoutError into core-utils - Adds missing ts project links - Adds more add-all tests to interface suite - Ignores unpassable tests for non-grpc or core implementations - Normalises mode and mtime in normalise-input function - Dedupes mtime normalisation between core and http client
1 parent a8a908b commit 128e96e

5 files changed

+6
-70
lines changed

src/files/write.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const modeToString = require('../lib/mode-to-string')
4-
const mtimeToObject = require('../lib/mtime-to-object')
4+
const { mtimeToObject } = require('ipfs-core-utils/src/files/normalise-input/utils')
55
const configure = require('../lib/configure')
66
const multipartRequest = require('../lib/multipart-request')
77
const toUrlSearchParams = require('../lib/to-url-search-params')

src/lib/mtime-to-object.js

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/lib/multipart-request.browser.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// version and fail.
55
const normaliseInput = require('ipfs-core-utils/src/files/normalise-input/index.browser')
66
const modeToString = require('./mode-to-string')
7-
const mtimeToObject = require('./mtime-to-object')
87
const { File, FormData } = require('ipfs-utils/src/globalthis')
98

109
async function multipartRequest (source = '', abortController, headers = {}) {
@@ -28,9 +27,8 @@ async function multipartRequest (source = '', abortController, headers = {}) {
2827
qs.push(`mode=${modeToString(mode)}`)
2928
}
3029

31-
const time = mtimeToObject(mtime)
32-
if (time != null) {
33-
const { secs, nsecs } = time
30+
if ((mtime) != null) {
31+
const { secs, nsecs } = (mtime)
3432

3533
qs.push(`mtime=${secs}`)
3634

src/lib/multipart-request.node.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const normaliseInput = require('ipfs-core-utils/src/files/normalise-input')
44
const { nanoid } = require('nanoid')
55
const modeToString = require('./mode-to-string')
6-
const mtimeToObject = require('./mtime-to-object')
76
const merge = require('merge-options').bind({ ignoreUndefined: true })
87
const toStream = require('it-to-stream')
98

@@ -36,9 +35,8 @@ async function multipartRequest (source = '', abortController, headers = {}, bou
3635
qs.push(`mode=${modeToString(mode)}`)
3736
}
3837

39-
const time = mtimeToObject(mtime)
40-
if (time != null) {
41-
const { secs, nsecs } = time
38+
if (mtime != null) {
39+
const { secs, nsecs } = mtime
4240

4341
qs.push(`mtime=${secs}`)
4442

src/lib/to-url-search-params.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const modeToString = require('./mode-to-string')
4-
const mtimeToObject = require('./mtime-to-object')
4+
const { mtimeToObject } = require('ipfs-core-utils/src/files/normalise-input/utils')
55

66
/**
77
* @param {*} params

0 commit comments

Comments
 (0)