diff --git a/src/background/api.js b/src/background/api.js
index eefc25a..a0375bc 100644
--- a/src/background/api.js
+++ b/src/background/api.js
@@ -5,6 +5,7 @@ const getTorrent = require('./gettorrent')
 const _ = require('lodash')
 const asyncForEach = require('./asyncForEach')
 const cpuUsage = require('./bt/cpu-usage-global')
+const magnetParse = require('./magnetParse')
 
 module.exports = async ({
 	sphinx,
@@ -291,15 +292,6 @@ module.exports = async ({
 		return /[0-9a-f]+/i.test(hash)
 	}
 
-	const magnetParse = (magnet) => {
-		const match = /magnet:\?xt=urn:btih:([0-9a-f]+)/i.exec(magnet)
-		if(!match)
-			return
-		if(match[1].length === 40)
-			return match[1].toLowerCase()
-		return
-	}
-
 	const searchTorrentCall = function(text, navigation, callback, isP2P)
 	{
 		if(typeof callback != 'function')
diff --git a/src/background/magnetParse.js b/src/background/magnetParse.js
new file mode 100644
index 0000000..bc33d41
--- /dev/null
+++ b/src/background/magnetParse.js
@@ -0,0 +1,8 @@
+module.exports = (magnet) => {
+	const match = /magnet:\?xt=urn:btih:([0-9a-f]+)/i.exec(magnet)
+	if(!match)
+		return
+	if(match[1].length === 40)
+		return match[1].toLowerCase()
+	return
+}
\ No newline at end of file
diff --git a/src/background/p2p.js b/src/background/p2p.js
index 2bdb32d..131415b 100644
--- a/src/background/p2p.js
+++ b/src/background/p2p.js
@@ -130,6 +130,18 @@ class p2p {
 				++alias;
 			});
 		});
+
+		this.on('file', (path, callback) => {
+			const readable = new fs.ReadStream(path)
+			logT('transfer', 'server transfer file', path)
+			readable.on('data', (chunk) => {
+				callback({data: chunk})
+			});
+			readable.on('end', () => {
+				logT('transfer', 'server finish transfer file', path)
+				callback(undefined)
+			});
+		})
 	}
 
 	listen() {
@@ -261,23 +273,29 @@ class p2p {
 		const socket = new JsonSocket(rawSocket); //Decorate a standard net.Socket with JsonSocket
 		socket.on('connect', () => { //Don't send until we're connected
 			const callbacks = {}
+			const callbacksPermanent = {}
 			socket.on('message', (message) => {
 				if(message.id && callbacks[message.id])
 				{
 					callbacks[message.id](message.data, socket, address);
-					delete callbacks[message.id];
+					if(!callbacksPermanent[message.id])
+						delete callbacks[message.id];
 				}
 			});
             
-			const emit = (type, data, callback) => {
+			const emit = (type, data, callback, callbackPermanent) => {
 				const id = Math.random().toString(36).substring(5)
 				if(callback)
 					callbacks[id] = callback;
+				if(callback && callbackPermanent)
+					callbacksPermanent[id] = true // dont delete callback on message
 				socket.sendMessage({
 					id,
 					type,
 					data
 				});
+
+				return () => delete callbacks[id];
 			}
 
 			// check protocol
@@ -360,6 +378,31 @@ class p2p {
 		}
 	}
 
+	file(peer, path)
+	{
+		const fileStream = fs.createWriteStream(path)
+		let deleteCallback = peer.emit('file', path, (chunk) => {
+			if(!chunk)
+			{
+				logT('transfer', 'closing transfering file stream', path)
+				deleteCallback()
+				fileStream.end()
+				return
+			}
+
+			const {data} = chunk
+			if(!data)
+			{
+				logTE('transfer', 'error on file transfer', path)
+				deleteCallback()
+				fileStream.end()
+				return
+			}
+
+			fileStream.write(data)
+		}, true) // dont clear callback
+	}
+
 	peersList()
 	{
 		return this.peers.filter(peer => !!peer.emit)