LumeWeb
/
relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*Handle base36 ipns keys

This commit is contained in:
Derrick Hammer 2022-08-05 07:50:19 -04:00
parent ffd3eec605
commit 33fa36411b
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rpc/ipfs.ts
View File

@ -17,6 +17,7 @@ import last from "it-last";
import toStream from "it-to-stream"; import toStream from "it-to-stream";
import { addStream } from "../streams.js"; import { addStream } from "../streams.js";
import { ERR_INVALID_CHAIN } from "../error.js"; import { ERR_INVALID_CHAIN } from "../error.js";
import { bases } from "multiformats/basics";
let client: IPFS | Promise<any>; let client: IPFS | Promise<any>;
let resolver: typeof import("ipfs-http-response").resolver; let resolver: typeof import("ipfs-http-response").resolver;
@ -72,7 +73,7 @@ async function initIpfs() {
detectContentType = utils.detectContentType; detectContentType = utils.detectContentType;
client = IPFS.create({ client = IPFS.create({
relay: { hop: { enabled: false } }, // relay: { hop: { enabled: false } },
silent: true, silent: true,
repo, repo,
}); });
@ -202,12 +203,25 @@ async function fileExists(
} }
async function resolveIpns(hash: string, path: string): Promise<string> { async function resolveIpns(hash: string, path: string): Promise<string> {
switch (hash.substring(0, 1)) {
case bases.base36.prefix: {
hash = CID.parse(hash, bases.base36).toString();
}
}
let fullPath = `${hash}/${path}`.replace(/\/+/, "/"); let fullPath = `${hash}/${path}`.replace(/\/+/, "/");
client = client as IPFS; client = client as IPFS;
const controller = new AbortController();
setTimeout(() => controller.abort(), 5000);
return ( return (
(await last(client.name.resolve(fullPath, { recursive: true }))) || path (await last(
client.name.resolve(fullPath, {
recursive: true,
signal: controller.signal,
})
)) || path
); );
} }
@ -222,11 +236,6 @@ export default {
} }
}), }),
stat_ipns: validateChain(CHAIN, async (args: any, context: object) => { stat_ipns: validateChain(CHAIN, async (args: any, context: object) => {
// @ts-ignore
if ("ipfs" !== context.chain) {
return rpcError(ERR_INVALID_CHAIN);
}
let ipfsPath; let ipfsPath;
try { try {
@ -239,10 +248,6 @@ export default {
}), }),
fetch_ipfs: validateChain(CHAIN, async (args: any, context: object) => { fetch_ipfs: validateChain(CHAIN, async (args: any, context: object) => {
// @ts-ignore
if ("ipfs" !== context.chain) {
return rpcError(ERR_INVALID_CHAIN);
}
try { try {
const ret = await fetchFile(args?.hash, args?.path); const ret = await fetchFile(args?.hash, args?.path);
if (ret instanceof Error) { if (ret instanceof Error) {
@ -255,10 +260,6 @@ export default {
} }
}), }),
fetch_ipns: validateChain(CHAIN, async (args: any, context: object) => { fetch_ipns: validateChain(CHAIN, async (args: any, context: object) => {
// @ts-ignore
if ("ipfs" !== context.chain) {
return rpcError(ERR_INVALID_CHAIN);
}
let ipfsPath; let ipfsPath;
try { try {
ipfsPath = await resolveIpns(args.hash, args.path); ipfsPath = await resolveIpns(args.hash, args.path);