klemek/file-whizz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaning

Browse Source
This commit is contained in:
Klemek
2025-03-19 15:29:55 +01:00
parent 25975deab4
commit 93f2287c13
4 changed files with 64 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -4
View File
@@ -11,9 +11,10 @@
* [x] Multiple peers
* [x] Get peer data
* [x] See download speed
* [ ] Fix turn server settings to work on all servers
* [ ] Fix edge cases
* [x] DaisyUI redesign
* [x] QRCode
* [ ] More cleaning
* [ ] Multiple files
* [x] Fix turn server settings to work on all servers
* [x] More cleaning
* [ ] Fix edge cases
* [ ] Cancel download
eslint.config.mjs
-5
View File
@@ -21,15 +21,10 @@ export default [
rules: {
"no-magic-numbers": "off",
"sort-keys": "off",
"no-warning-comments": "off",
"no-inline-comments": "off", // TODO remove
"no-ternary": "off",
"one-var": "off",
"max-statements": ["warn", 200], // TODO remove
"max-lines-per-function": ["warn", 200], // TODO remove
"max-params": ["warn", 5],
"max-lines": "off",
"no-console": "off", // TODO remove
},
},
{
index.html
+9 -10
View File
@@ -52,8 +52,7 @@
<div :class="`status status-${statusColor(status)} status-lg`"></div>
</div> {{ status }}
</div>
<div v-if="error" class="mt-2 text-error">
{{ error }}
<div v-if="error" class="mt-2 text-error" v-html="error">
</div>
<div v-if="fileName" class="mt-2 w-full">
<code>{{ prettyFileSize }} - {{ fileName }}</code>
@@ -66,7 +65,7 @@
<div ref="qrcode" id="qrcode" :class="serverIsReady ? '' : 'hidden'" class="w-full mt-2">
</div>
<div v-if="serverIsReady" @click="onShare" class="mt-2 w-full btn btn-primary">
<i icon="share-2"></i> {{ shareText }}
<i icon="share-2"></i> {{ serverShareText }}
</div>
<ul v-if="serverIsReady && server.clients.length"
class="mt-2 list bg-base-100 rounded-box shadow-md text-left">
@@ -77,20 +76,20 @@
<div>
<div :class="`status status-${statusColor(client.status)}`"></div> {{ client.status }}
</div>
<progress :value="client.sent" :max="downloadTotal" aria-busy="!client.connected" class="progress"
:class="client.sent >=downloadTotal ? 'progress-success' : 'progress-primary'"></progress>
<progress :value="client.sent" :max="fileSize" aria-busy="!client.connected" class="progress"
:class="client.sent >= fileSize ? 'progress-success' : 'progress-primary'"></progress>
</div>
</li>
</ul>
</template>
<template v-else>
<div @click="onDownload" :class="readyToDownload ? 'btn-primary' : 'btn-disabled'" class="mt-2 w-full btn">
<div @click="onDownload" :class="clientIsReady ? 'btn-primary' : 'btn-disabled'" class="mt-2 w-full btn">
<i icon="file-down"></i> Download
</div>
<div v-if="downloading || client.downloadEnd" class="w-full">
<progress :class="client.downloadEnd ? 'progress-success' : 'progress-primary'" :value="downloadProgress"
:max="downloadTotal" class="progress w-full"></progress>
<label>{{ prettyDownloadSpeed }}<span v-if="!client.downloadEnd"> - {{ prettyRemainingTime
<div v-if="clientDownloading || clientFinished" class="w-full">
<progress :class="clientFinished ? 'progress-success' : 'progress-primary'"
:value="clientDownloadProgress" :max="fileSize" class="progress w-full"></progress>
<label>{{ prettyDownloadSpeed }}<span v-if="clientDownloading"> - {{ prettyRemainingTime
}}</span></label>
</div>
</template>
main.js
+49 -72
View File
@@ -113,7 +113,7 @@ const STATUS_COLOR = {
[STATUS.ClientDisconnected]: "neutral",
};
const MAX_CHUNK_SIZE = 12 * 1024; // 12 KB
const MAX_CHUNK_SIZE = 12 * 1024;
const app = createApp({
data() {
@@ -128,7 +128,7 @@ const app = createApp({
server: {
clients: [],
url: null,
data: null, // TODO multiple files
data: null,
copied: false,
},
client: {
@@ -138,7 +138,7 @@ const app = createApp({
downloadStart: null,
downloadEnd: null,
received: [],
buffer: null, // TODO multiple files
buffer: null,
},
};
},
@@ -146,28 +146,12 @@ const app = createApp({
canConnect() {
return this.peer !== null && this.localId !== null;
},
readyToDownload() {
return (
this.client.connection !== null &&
this.client.buffer !== null &&
this.client.downloadStart === null
);
},
serverIsReady() {
return this.canConnect && this.server.data !== null;
},
downloading() {
return (
this.client.downloadStart !== null && this.client.downloadEnd === null
this.error !== null && this.canConnect && this.server.data !== null
);
},
downloadProgress() {
return this.client.received.length * MAX_CHUNK_SIZE;
},
downloadTotal() {
return this.fileSize ?? 0;
},
shareText() {
serverShareText() {
if (navigator.canShare && navigator.canShare()) {
return "Share link";
}
@@ -176,34 +160,41 @@ const app = createApp({
}
return "Copy link";
},
clientIsReady() {
return (
this.error !== null &&
this.canConnect &&
this.client.connection !== null &&
this.client.buffer !== null &&
this.client.downloadStart === null
);
},
clientDownloading() {
return (
this.client.downloadStart !== null && this.client.downloadEnd === null
);
},
clientDownloadProgress() {
return this.client.received.length * MAX_CHUNK_SIZE;
},
clientFinished() {
return this.client.downloadEnd !== null;
},
status() {
if (this.error) {
return STATUS.Error;
}
if (!this.canConnect) {
return STATUS.Connecting;
}
if (this.isServer) {
if (!this.server.data) {
return STATUS.ServerNoFile;
}
if (this.error) return STATUS.Error;
if (!this.canConnect) return STATUS.Connecting;
return this.isServer ? this.serverStatus : this.clientStatus;
},
serverStatus() {
if (!this.server.data) return STATUS.ServerNoFile;
return STATUS.ServerReady;
}
if (!this.client.connected) {
return STATUS.ClientConnecting;
}
if (!this.client.connection) {
return STATUS.ClientDisconnected;
}
if (this.client.downloadEnd) {
return STATUS.ClientDownloaded;
}
if (this.readyToDownload) {
return STATUS.ClientReady;
}
if (!this.downloading) {
return STATUS.ClientWaiting;
}
},
clientStatus() {
if (!this.client.connected) return STATUS.ClientConnecting;
if (!this.client.connection) return STATUS.ClientDisconnected;
if (this.client.downloadEnd) return STATUS.ClientDownloaded;
if (this.clientIsReady) return STATUS.ClientReady;
if (!this.clientDownloading) return STATUS.ClientWaiting;
return STATUS.ClientDownloading;
},
prettyFileSize() {
@@ -215,7 +206,7 @@ const app = createApp({
}
const time =
(this.client.downloadEnd ?? new Date()) - this.client.downloadStart;
const speed = (1000 * this.downloadProgress) / time;
const speed = (1000 * this.clientDownloadProgress) / time;
return `${utils.prettyBytes(speed)}/s`;
},
prettyRemainingTime() {
@@ -224,13 +215,12 @@ const app = createApp({
}
const time =
(this.client.downloadEnd ?? new Date()) - this.client.downloadStart;
const speed = this.downloadProgress / time;
const remainingBytes = this.downloadTotal - this.downloadProgress;
const speed = this.clientDownloadProgress / time;
const remainingBytes = this.fileSize - this.clientDownloadProgress;
const remainingTime = remainingBytes / speed;
return `${utils.prettyTime(remainingTime)}`;
},
},
watch: {},
updated() {
utils.updateIcons();
},
@@ -261,7 +251,7 @@ const app = createApp({
},
initPeer() {
this.peer = new Peer({
debug: 3,
debug: window.location.href.includes("localhost") ? 3 : 0,
host: "peer.klemek.fr",
port: "443",
secure: true,
@@ -346,7 +336,6 @@ const app = createApp({
},
// PEER EVENTS
onPeerOpen(id) {
console.log("onPeerOpen", id);
this.localId = id;
this.error = null;
if (this.isServer) {
@@ -357,34 +346,28 @@ const app = createApp({
}
},
onPeerConnection(conn) {
console.log("onPeerConnection", conn);
if (this.isServer) {
this.initServerConnection(conn);
}
},
onPeerClose() {
console.log("onPeerClose");
this.peer = null;
},
onPeerDisconnected() {
console.log("onPeerDisconnected");
this.peer.reconnect();
},
onPeerError(err) {
console.log("onPeerError", err);
this.error = `Error connecting: ${err.type}. Reconnecting...`;
this.error = `${err.type}.<br>Reconnecting...`;
this.peer = null;
setTimeout(this.initPeer, 1000);
},
// SERVER CONNECTION EVENTS
onServerConnectionOpen(index) {
console.log("onServerConnectionOpen", index);
this.server.clients[index].connected = true;
this.server.clients[index].status = STATUS.ClientReady;
this.sendServerInfo(index);
},
onServerConnectionData(index, data) {
console.log("onServerConnectionData", index, data.type);
switch (data.type) {
case MESSAGE_TYPE.ClientInfo:
this.handleClientInfo(index, data);
@@ -396,26 +379,22 @@ const app = createApp({
this.handleClientDone(index, data);
break;
default:
console.error("Invalid message type");
this.server.clients[index].status = STATUS.Error;
break;
}
},
onServerConnectionClose(index) {
console.log("onServerConnectionClose", index);
this.server.clients[index].status = STATUS.ClientDisconnected;
},
onServerConnectionError(index, err) {
console.log("onServerConnectionError", index, err);
onServerConnectionError(index) {
this.server.clients[index].status = STATUS.Error;
},
// CLIENT CONNECTION EVENTS
onClientConnectionOpen() {
console.log("onClientConnectionOpen");
this.client.connected = true;
this.sendClientInfo();
},
onClientConnectionData(data) {
console.log("onClientConnectionData", data.type);
switch (data.type) {
case MESSAGE_TYPE.ServerInfo:
this.handleServerInfo(data);
@@ -427,17 +406,15 @@ const app = createApp({
this.handleServerDone(data);
break;
default:
console.error("Invalid message type");
this.error = "Invalid message received";
break;
}
},
onClientConnectionClose() {
console.log("onClientConnectionClose");
this.client.connection = null;
},
onClientConnectionError(err) {
console.log("onClientConnectionError", err);
this.error = `Connection failed: ${err.type}. Reconnecting...`;
this.error = `${err.type}.<br>Reconnecting...`;
setTimeout(this.clientOpenConnection, 1000);
},
// EXCHANGES
@@ -532,7 +509,7 @@ const app = createApp({
},
// UI EVENTS
onFileChange(event) {
const [file] = event.target.files; // TODO multiple files
const [file] = event.target.files;
if (!file) {
return;
}
@@ -549,7 +526,7 @@ const app = createApp({
reader.readAsArrayBuffer(file);
},
onDownload() {
if (!this.readyToDownload) {
if (!this.clientIsReady) {
return;
}
this.client.downloadStart = new Date();