diff --git a/src/http/api/resources/files.js b/src/http/api/resources/files.js index 1ea7cb0099..68ecc797bd 100644 --- a/src/http/api/resources/files.js +++ b/src/http/api/resources/files.js @@ -11,11 +11,6 @@ const toPull = require('stream-to-pull-stream') const pushable = require('pull-pushable') const EOL = require('os').EOL const toStream = require('pull-stream-to-stream') -// const fileType = require('file-type') -// const mime = require('mime-types') -// const GatewayResolver = require('../gateway/resolver') -// const PathUtils = require('../gateway/utils/path') -// const Stream = require('stream') exports = module.exports @@ -218,128 +213,3 @@ exports.add = { ) } } - -// exports.gateway = { -// checkHash: (request, reply) => { -// if (!request.params.hash) { -// return reply('Path Resolve error: path must contain at least one component').code(400).takeover() -// } -// -// return reply({ -// ref: `/ipfs/${request.params.hash}` -// }) -// }, -// handler: (request, reply) => { -// const ref = request.pre.args.ref -// const ipfs = request.server.app.ipfs -// -// return GatewayResolver -// .resolveMultihash(ipfs, ref) -// .then((data) => { -// ipfs -// .files -// .cat(data.multihash) -// .then((stream) => { -// if (ref.endsWith('/')) { -// // remove trailing slash for files -// return reply -// .redirect(PathUtils.removeTrailingSlash(ref)) -// .permanent(true) -// } else { -// if (!stream._read) { -// stream._read = () => {} -// stream._readableState = {} -// } -// // response.continue() -// let filetypeChecked = false -// let stream2 = new Stream.PassThrough({highWaterMark: 1}) -// let response = reply(stream2).hold() -// -// pull( -// toPull.source(stream), -// pull.drain((chunk) => { -// // Check file type. do this once. -// if (chunk.length > 0 && !filetypeChecked) { -// console.log('got first chunk') -// let fileSignature = fileType(chunk) -// console.log('file type: ', fileSignature) -// -// filetypeChecked = true -// const mimeType = mime.lookup((fileSignature) ? fileSignature.ext : null) -// console.log('ref ', ref) -// console.log('mime-type ', mimeType) -// -// if (mimeType) { -// console.log('writing mimeType') -// -// response -// .header('Content-Type', mime.contentType(mimeType)) -// .header('Access-Control-Allow-Headers', 'X-Stream-Output, X-Chunked-Ouput') -// .header('Access-Control-Allow-Methods', 'GET') -// .header('Access-Control-Allow-Origin', '*') -// .header('Access-Control-Expose-Headers', 'X-Stream-Output, X-Chunked-Ouput') -// .send() -// } else { -// response -// .header('Access-Control-Allow-Headers', 'X-Stream-Output, X-Chunked-Ouput') -// .header('Access-Control-Allow-Methods', 'GET') -// .header('Access-Control-Allow-Origin', '*') -// .header('Access-Control-Expose-Headers', 'X-Stream-Output, X-Chunked-Ouput') -// .send() -// } -// } -// -// stream2.write(chunk) -// }, (err) => { -// if (err) throw err -// console.log('stream ended.') -// stream2.end() -// }) -// ) -// } -// }) -// .catch((err) => { -// if (err) { -// log.error(err) -// return reply(err.toString()).code(500) -// } -// }) -// }).catch((err) => { -// console.log('err: ', err.toString(), ' fileName: ', err.fileName) -// -// const errorToString = err.toString() -// if (errorToString === 'Error: This dag node is a directory') { -// return GatewayResolver -// .resolveDirectory(ipfs, ref, err.fileName) -// .then((data) => { -// if (typeof data === 'string') { -// // no index file found -// if (!ref.endsWith('/')) { -// // for a directory, if URL doesn't end with a / -// // append / and redirect permanent to that URL -// return reply.redirect(`${ref}/`).permanent(true) -// } else { -// // send directory listing -// return reply(data) -// } -// } else { -// // found index file -// // redirect to URL/ -// return reply.redirect(PathUtils.joinURLParts(ref, data[0].name)) -// } -// }).catch((err) => { -// log.error(err) -// return reply(err.toString()).code(500) -// }) -// } else if (errorToString.startsWith('Error: no link named')) { -// return reply(errorToString).code(404) -// } else if (errorToString.startsWith('Error: multihash length inconsistent') || -// errorToString.startsWith('Error: Non-base58 character')) { -// return reply(errorToString).code(400) -// } else { -// log.error(err) -// return reply(errorToString).code(500) -// } -// }) -// } -// } diff --git a/test/gateway/index.js b/test/gateway/index.js index 356dc45a2f..afa9cb70d9 100644 --- a/test/gateway/index.js +++ b/test/gateway/index.js @@ -1,13 +1,11 @@ /* eslint-env mocha */ 'use strict' -const fs = require('fs') const chai = require('chai') const dirtyChai = require('dirty-chai') const expect = chai.expect chai.use(dirtyChai) const API = require('../../src/http') -// const APIctl = require('ipfs-api') const ncp = require('ncp').ncp const path = require('path') const clean = require('../utils/clean') @@ -17,6 +15,7 @@ describe('HTTP GATEWAY', () => { const repoTests = path.join(__dirname, '../repo-tests-run') let http = {} + let gateway before((done) => { http.api = new API(repoTests) @@ -24,7 +23,10 @@ describe('HTTP GATEWAY', () => { ncp(repoExample, repoTests, (err) => { expect(err).to.not.exist() - http.api.start(false, done) + http.api.start(false, () => { + gateway = http.api.server.select('Gateway') + done() + }) }) }) @@ -36,20 +38,39 @@ describe('HTTP GATEWAY', () => { }) }) - describe('## http-gateway spec tests', () => { - fs.readdirSync(path.join(__dirname, '/spec')) - .forEach((file) => require('./spec/' + file)(http)) - }) + describe('/ipfs/* route', () => { + it('returns 400 for request without argument', (done) => { + gateway.inject({ + method: 'GET', + url: '/ipfs' + }, (res) => { + expect(res.statusCode).to.equal(400) + expect(res.result.Message).to.be.a('string') + done() + }) + }) + + it('400 for request with invalid argument', (done) => { + gateway.inject({ + method: 'GET', + url: '/ipfs/invalid' + }, (res) => { + expect(res.statusCode).to.equal(400) + expect(res.result.Message).to.be.a('string') + done() + }) + }) - // describe('## interface tests', () => { - // fs.readdirSync(path.join(__dirname, '/interface')) - // .forEach((file) => require('./interface/' + file)) - // }) - // - // describe('## custom ipfs-api tests', () => { - // const ctl = APIctl('/ip4/127.0.0.1/tcp/6001') - // - // fs.readdirSync(path.join(__dirname, '/over-ipfs-api')) - // .forEach((file) => require('./over-ipfs-api/' + file)(ctl)) - // }) + it('valid hash', (done) => { + gateway.inject({ + method: 'GET', + url: '/ipfs/QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o' + }, (res) => { + expect(res.statusCode).to.equal(200) + expect(res.rawPayload).to.deep.equal(new Buffer('hello world' + '\n')) + expect(res.payload).to.equal('hello world' + '\n') + done() + }) + }) + }) }) diff --git a/test/gateway/spec/gateway.js b/test/gateway/spec/gateway.js deleted file mode 100644 index 822c67a498..0000000000 --- a/test/gateway/spec/gateway.js +++ /dev/null @@ -1,50 +0,0 @@ -/* eslint-env mocha */ -'use strict' - -const expect = require('chai').expect - -module.exports = (http) => { - describe('/files', () => { - let gateway - - before(() => { - gateway = http.api.server.select('Gateway') - }) - - describe('/ipfs', () => { - it('returns 400 for request without argument', (done) => { - gateway.inject({ - method: 'GET', - url: '/ipfs' - }, (res) => { - expect(res.statusCode).to.equal(400) - expect(res.result.Message).to.be.a('string') - done() - }) - }) - - it('400 for request with invalid argument', (done) => { - gateway.inject({ - method: 'GET', - url: '/ipfs/invalid' - }, (res) => { - expect(res.statusCode).to.equal(400) - expect(res.result.Message).to.be.a('string') - done() - }) - }) - - it('valid hash', (done) => { - gateway.inject({ - method: 'GET', - url: '/ipfs/QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o' - }, (res) => { - expect(res.statusCode).to.equal(200) - expect(res.rawPayload).to.deep.equal(new Buffer('hello world' + '\n')) - expect(res.payload).to.equal('hello world' + '\n') - done() - }) - }) - }) - }) -}