Added API for file download
This commit is contained in:
parent
5cb1b8b4da
commit
09d3b49977
3 changed files with 242 additions and 16 deletions
|
@ -21,12 +21,11 @@ class FileListRequest {
|
|||
}
|
||||
|
||||
namespace transfer {
|
||||
export interface DownloadKey {
|
||||
export interface TransferKey {
|
||||
client_transfer_id: number;
|
||||
server_transfer_id: number;
|
||||
|
||||
key: string;
|
||||
total_size: number;
|
||||
|
||||
file_path: string;
|
||||
file_name: string;
|
||||
|
@ -35,7 +34,23 @@ namespace transfer {
|
|||
hosts: string[],
|
||||
port: number;
|
||||
};
|
||||
|
||||
total_size: number;
|
||||
}
|
||||
|
||||
export interface UploadOptions {
|
||||
name: string;
|
||||
path: string;
|
||||
|
||||
channel?: ChannelEntry;
|
||||
channel_password?: string;
|
||||
|
||||
size: number;
|
||||
overwrite: boolean;
|
||||
}
|
||||
|
||||
export type DownloadKey = TransferKey;
|
||||
export type UploadKey = TransferKey;
|
||||
}
|
||||
|
||||
class StreamedFileDownload {
|
||||
|
@ -160,14 +175,58 @@ class RequestFileDownload {
|
|||
}
|
||||
}
|
||||
|
||||
class RequestFileUpload {
|
||||
readonly transfer_key: transfer.UploadKey;
|
||||
constructor(key: transfer.DownloadKey) {
|
||||
this.transfer_key = key;
|
||||
}
|
||||
|
||||
async put_data(data: BufferSource | File) {
|
||||
const form_data = new FormData();
|
||||
|
||||
if(data instanceof File) {
|
||||
if(data.size != this.transfer_key.total_size)
|
||||
throw "invalid size";
|
||||
|
||||
form_data.append("file", data);
|
||||
} else {
|
||||
const buffer = <BufferSource>data;
|
||||
if(buffer.byteLength != this.transfer_key.total_size)
|
||||
throw "invalid size";
|
||||
|
||||
form_data.append("file", new Blob([buffer], { type: "application/octet-stream" }));
|
||||
}
|
||||
|
||||
await this.try_put(form_data, "https://" + this.transfer_key.peer.hosts[0] + ":" + this.transfer_key.peer.port);
|
||||
}
|
||||
|
||||
async try_put(data: FormData, url: string) : Promise<void> {
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
cache: "no-cache",
|
||||
mode: 'cors',
|
||||
body: data,
|
||||
headers: {
|
||||
'transfer-key': this.transfer_key.key,
|
||||
'Access-Control-Allow-Headers': '*',
|
||||
'Access-Control-Expose-Headers': '*'
|
||||
}
|
||||
});
|
||||
if(!response.ok)
|
||||
throw (response.type == 'opaque' || response.type == 'opaqueredirect' ? "invalid cross origin flag! May target isn't a TeaSpeak server?" : response.statusText || "response is not ok");
|
||||
}
|
||||
}
|
||||
|
||||
class FileManager extends connection.AbstractCommandHandler {
|
||||
handle: TSClient;
|
||||
icons: IconManager;
|
||||
avatars: AvatarManager;
|
||||
|
||||
private listRequests: FileListRequest[] = [];
|
||||
private pendingDownloadTransfers: transfer.DownloadKey[] = [];
|
||||
private downloadCounter : number = 0;
|
||||
private pending_download_requests: transfer.DownloadKey[] = [];
|
||||
private pending_upload_requests: transfer.UploadKey[] = [];
|
||||
|
||||
private transfer_counter : number = 0;
|
||||
|
||||
constructor(client: TSClient) {
|
||||
super(client.serverConnection);
|
||||
|
@ -190,6 +249,9 @@ class FileManager extends connection.AbstractCommandHandler {
|
|||
case "notifystartdownload":
|
||||
this.notifyStartDownload(command.arguments);
|
||||
return true;
|
||||
case "notifystartupload":
|
||||
this.notifyStartUpload(command.arguments);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -260,27 +322,52 @@ class FileManager extends connection.AbstractCommandHandler {
|
|||
}
|
||||
|
||||
|
||||
/******************************** File download ********************************/
|
||||
/******************************** File download/upload ********************************/
|
||||
download_file(path: string, file: string, channel?: ChannelEntry, password?: string) : Promise<transfer.DownloadKey> {
|
||||
const _this = this;
|
||||
|
||||
const transfer_data: transfer.DownloadKey = {
|
||||
file_name: file,
|
||||
file_path: file,
|
||||
client_transfer_id: this.downloadCounter++
|
||||
file_path: path,
|
||||
client_transfer_id: this.transfer_counter++
|
||||
} as any;
|
||||
|
||||
this.pendingDownloadTransfers.push(transfer_data);
|
||||
this.pending_download_requests.push(transfer_data);
|
||||
return new Promise<transfer.DownloadKey>((resolve, reject) => {
|
||||
transfer_data["_promiseCallback"] = resolve;
|
||||
_this.handle.serverConnection.send_command("ftinitdownload", {
|
||||
transfer_data["_callback"] = resolve;
|
||||
this.handle.serverConnection.send_command("ftinitdownload", {
|
||||
"path": path,
|
||||
"name": file,
|
||||
"cid": (channel ? channel.channelId : "0"),
|
||||
"cpw": (password ? password : ""),
|
||||
"clientftfid": transfer_data.client_transfer_id
|
||||
}).catch(reason => {
|
||||
_this.pendingDownloadTransfers.remove(transfer_data);
|
||||
this.pending_download_requests.remove(transfer_data);
|
||||
reject(reason);
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
upload_file(options: transfer.UploadOptions) : Promise<transfer.UploadKey> {
|
||||
const transfer_data: transfer.UploadKey = {
|
||||
file_path: options.path,
|
||||
file_name: options.name,
|
||||
client_transfer_id: this.transfer_counter++,
|
||||
total_size: options.size
|
||||
} as any;
|
||||
|
||||
this.pending_upload_requests.push(transfer_data);
|
||||
return new Promise<transfer.UploadKey>((resolve, reject) => {
|
||||
transfer_data["_callback"] = resolve;
|
||||
this.handle.serverConnection.send_command("ftinitupload", {
|
||||
"path": options.path,
|
||||
"name": options.name,
|
||||
"cid": (options.channel ? options.channel.channelId : "0"),
|
||||
"cpw": options.channel_password || "",
|
||||
"clientftfid": transfer_data.client_transfer_id,
|
||||
"size": options.size,
|
||||
"overwrite": options.overwrite,
|
||||
"resume": false
|
||||
}).catch(reason => {
|
||||
this.pending_upload_requests.remove(transfer_data);
|
||||
reject(reason);
|
||||
})
|
||||
});
|
||||
|
@ -290,7 +377,7 @@ class FileManager extends connection.AbstractCommandHandler {
|
|||
json = json[0];
|
||||
|
||||
let transfer: transfer.DownloadKey;
|
||||
for(let e of this.pendingDownloadTransfers)
|
||||
for(let e of this.pending_download_requests)
|
||||
if(e.client_transfer_id == json["clientftfid"]) {
|
||||
transfer = e;
|
||||
break;
|
||||
|
@ -311,8 +398,36 @@ class FileManager extends connection.AbstractCommandHandler {
|
|||
if(transfer.peer.hosts[0].length == 0 || transfer.peer.hosts[0] == '0.0.0.0')
|
||||
transfer.peer.hosts[0] = this.handle.serverConnection._remote_address.host;
|
||||
|
||||
(transfer["_promiseCallback"] as (val: transfer.DownloadKey) => void)(transfer);
|
||||
this.pendingDownloadTransfers.remove(transfer);
|
||||
(transfer["_callback"] as (val: transfer.DownloadKey) => void)(transfer);
|
||||
this.pending_download_requests.remove(transfer);
|
||||
}
|
||||
|
||||
private notifyStartUpload(json) {
|
||||
json = json[0];
|
||||
|
||||
let transfer: transfer.UploadKey;
|
||||
for(let e of this.pending_upload_requests)
|
||||
if(e.client_transfer_id == json["clientftfid"]) {
|
||||
transfer = e;
|
||||
break;
|
||||
}
|
||||
|
||||
transfer.server_transfer_id = json["serverftfid"];
|
||||
transfer.key = json["ftkey"];
|
||||
|
||||
transfer.peer = {
|
||||
hosts: (json["ip"] || "").split(","),
|
||||
port: json["port"]
|
||||
};
|
||||
|
||||
if(transfer.peer.hosts.length == 0)
|
||||
transfer.peer.hosts.push("0.0.0.0");
|
||||
|
||||
if(transfer.peer.hosts[0].length == 0 || transfer.peer.hosts[0] == '0.0.0.0')
|
||||
transfer.peer.hosts[0] = this.handle.serverConnection._remote_address.host;
|
||||
|
||||
(transfer["_callback"] as (val: transfer.UploadKey) => void)(transfer);
|
||||
this.pending_upload_requests.remove(transfer);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
88
shared/js/crypto/src32.ts
Normal file
88
shared/js/crypto/src32.ts
Normal file
|
@ -0,0 +1,88 @@
|
|||
class Crc32 {
|
||||
private static readonly lookup = [
|
||||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
|
||||
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
|
||||
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
|
||||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
|
||||
0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
|
||||
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
|
||||
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
|
||||
0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
|
||||
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
|
||||
0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
|
||||
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
|
||||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
|
||||
0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
|
||||
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
|
||||
0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
|
||||
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
|
||||
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
|
||||
0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
|
||||
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
|
||||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
|
||||
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
|
||||
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
|
||||
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
|
||||
0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
|
||||
0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
|
||||
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
|
||||
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
|
||||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
|
||||
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
|
||||
0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
|
||||
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
|
||||
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
|
||||
0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
|
||||
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
|
||||
0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
|
||||
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
|
||||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
|
||||
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
|
||||
0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
|
||||
0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
|
||||
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
|
||||
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
|
||||
0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
|
||||
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
|
||||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
|
||||
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
|
||||
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
|
||||
0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
|
||||
0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
|
||||
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
|
||||
];
|
||||
|
||||
private crc: number;
|
||||
constructor() {
|
||||
this.crc = -1 >>> 0;
|
||||
}
|
||||
|
||||
update(data: ArrayBufferLike) {
|
||||
const dataView = new Uint8Array(data, 0);
|
||||
const len = dataView.length;
|
||||
for (let i = 0; i < len; i++) {
|
||||
this.crc = (this.crc >>> 8) ^ Crc32.lookup[(this.crc ^ dataView[i]) & 0xFF];
|
||||
}
|
||||
};
|
||||
|
||||
digest(radix: number) {
|
||||
const buffer = new ArrayBuffer(4);
|
||||
const dv = new DataView(buffer);
|
||||
dv.setUint32(0, ~this.crc >>> 0, false);
|
||||
return dv.getUint32(0).toString(radix || 16);
|
||||
};
|
||||
}
|
|
@ -288,6 +288,29 @@ function main() {
|
|||
Modals.spawnAvatarList(globalClient);
|
||||
}, 1000);
|
||||
*/
|
||||
window.test_upload = () => {
|
||||
const data = "Hello World";
|
||||
globalClient.fileManager.upload_file({
|
||||
size: data.length,
|
||||
overwrite: true,
|
||||
channel: globalClient.getClient().currentChannel(),
|
||||
name: '/HelloWorld.txt',
|
||||
path: ''
|
||||
}).then(key => {
|
||||
console.log("Got key: %o", key);
|
||||
const upload = new RequestFileUpload(key);
|
||||
|
||||
const buffer = new Uint8Array(data.length);
|
||||
{
|
||||
for(let index = 0; index < data.length; index++)
|
||||
buffer[index] = data.charCodeAt(index);
|
||||
}
|
||||
|
||||
upload.put_data(buffer).catch(error => {
|
||||
console.error(error);
|
||||
});
|
||||
})
|
||||
};
|
||||
}
|
||||
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
|
|
Loading…
Add table
Reference in a new issue