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.

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

IPFS paths #164

Merged
merged 4 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion minipfs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kodadot1/minipfs",
"version": "0.4.0-rc.1",
"version": "0.4.1-rc.0",
"description": "",
"repository": "kodadot/packages",
"license": "MIT",
Expand Down
7 changes: 6 additions & 1 deletion minipfs/src/cid.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import { path, url } from '@vikiival/is-ipfs'
import { HTTP_REGEX, IPFS_FS_PREFIX, IPFS_NS_PREFIX, IPFS_PREFIX, SMART_IPFS_REGEX } from './constants'
import { HTTP_REGEX, IPFS_FS_PREFIX, IPFS_NS_PREFIX, IPFS_PREFIX, IPNS_PREFIX, SMART_IPFS_REGEX } from './constants'
import { PINATA_GATEWAY } from './gateways'
import { IPFS_HASH, IPFS_PATH, IPNS_PATH } from './types'

Expand Down Expand Up @@ -59,5 +59,10 @@ export const extractIPFS = (uri: string): IPFS_HASH | IPFS_PATH | IPNS_PATH => {
return uri.replace('ipfs:/', '') as IPFS_PATH | IPNS_PATH
}

if (uri.startsWith(IPFS_PREFIX) || uri.startsWith(IPNS_PREFIX)) {
const value = uri.replace(':/', '')
return '/' + value as IPFS_PATH | IPNS_PATH
}

return uri.replace(IPFS_PREFIX, '') as IPFS_HASH
}
1 change: 1 addition & 0 deletions minipfs/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export const IPFS_FS_PREFIX = 'ipfs://ipfs/'
export const IPFS_NS_PREFIX = 'ipfs://ipns/'
export const IPFS_PREFIX = 'ipfs://'
export const IPNS_PREFIX = 'ipns://'

// regex
export const HTTP_REGEX = /^https?:\/\//
Expand Down
3 changes: 2 additions & 1 deletion minipfs/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { isFullPath } from '../src'
describe('isFullPath', () => {
const tests = [
{ input: 'ipfs://ipfs/bafybeihrnpphrgs5os47w35a5ypqt3mqashd5tn3v27pqt2iiw3hikavhm', output: true },
{ input: 'ipfs://bafybeihrnpphrgs5os47w35a5ypqt3mqashd5tn3v27pqt2iiw3hikavhm', output: true }
{ input: 'ipfs://bafybeihrnpphrgs5os47w35a5ypqt3mqashd5tn3v27pqt2iiw3hikavhm', output: true },
{ input: 'ipfs://bafybeibe6ihmid6i5a777n4znvnovok6szkju6ijde4wzprd2zkntqj4gi/4.json', output: true }
]

for (const test of tests) {
Expand Down
4 changes: 4 additions & 0 deletions minipfs/test/sanitize.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ describe('Sanitize', () => {
'ipfs://ipfs/bafybeiennmmolv3keadouvgrhqkkfhprobvikl6hmblg4x2nxsn7s7lrjq',
output:
'/ipfs/bafybeiennmmolv3keadouvgrhqkkfhprobvikl6hmblg4x2nxsn7s7lrjq'
},
{
input: 'ipfs://bafybeibe6ihmid6i5a777n4znvnovok6szkju6ijde4wzprd2zkntqj4gi/4.json',
output: '/ipfs/bafybeibe6ihmid6i5a777n4znvnovok6szkju6ijde4wzprd2zkntqj4gi/4.json'
}
]

Expand Down