feat: sending file working (and wip UI)

Signed-off-by: Martichou <m@rtin.fyi>

core_lib/Cargo.toml

@@ -34,6 +34,7 @@ ts-rs = { version = "7.1", features = ["serde-compat", "uuid-impl", "chrono-impl
 uuid = "1.7.0"
 serde = { version = "1.0", features = ["derive"] }
 mime_guess = "2.0.4"
+get_if_addrs = "0.5.3"
 
 [build-dependencies]
 prost-build = "0.12"

core_lib/bindings/ChannelMessage.ts

@@ -3,5 +3,6 @@ import type { ChannelAction } from "./ChannelAction";
 import type { ChannelDirection } from "./ChannelDirection";
 import type { State } from "./State";
 import type { TransferMetadata } from "./TransferMetadata";
+import type { TransferType } from "./TransferType";
 
-export interface ChannelMessage { id: string, direction: ChannelDirection, action: ChannelAction | null, state: State | null, meta: TransferMetadata | null, }
+export interface ChannelMessage { id: string, direction: ChannelDirection, action: ChannelAction | null, rtype: TransferType | null, state: State | null, meta: TransferMetadata | null, }

core_lib/bindings/EndpointInfo.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DeviceType } from "./DeviceType";
+
+export interface EndpointInfo { id: string, name: string | null, ip: string | null, port: string | null, rtype: DeviceType | null, present: boolean | null, }

core_lib/bindings/OutboundPayload.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type OutboundPayload = { "Files": Array<string> };

core_lib/bindings/SendInfo.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OutboundPayload } from "./OutboundPayload";
+
+export interface SendInfo { id: string, name: string, addr: string, ob: OutboundPayload, }

core_lib/bindings/State.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "Disconnected" | "Finished";
+export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "SentUkeyClientInit" | "SentUkeyClientFinish" | "SentPairedKeyEncryption" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "SentIntroduction" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "SendingFiles" | "Disconnected" | "Finished";

core_lib/bindings/TransferType.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type TransferType = "Inbound" | "Outbound";

core_lib/bindings/index.ts

@@ -1,7 +1,11 @@
 export * from "./ChannelDirection"
 export * from "./DeviceType"
 export * from "./ChannelMessage"
+export * from "./TransferType"
+export * from "./OutboundPayload"
 export * from "./TransferMetadata"
+export * from "./EndpointInfo"
 export * from "./ChannelAction"
 export * from "./RemoteDeviceInfo"
-export * from "./State"
+export * from "./State"
+export * from "./SendInfo"

core_lib/dist/ChannelMessage.d.ts

@@ -2,10 +2,12 @@ import type { ChannelAction } from "./ChannelAction";
 import type { ChannelDirection } from "./ChannelDirection";
 import type { State } from "./State";
 import type { TransferMetadata } from "./TransferMetadata";
+import type { TransferType } from "./TransferType";
 export interface ChannelMessage {
     id: string;
     direction: ChannelDirection;
     action: ChannelAction | null;
+    rtype: TransferType | null;
     state: State | null;
     meta: TransferMetadata | null;
 }

core_lib/dist/EndpointInfo.d.ts

@@ -0,0 +1,9 @@
+import type { DeviceType } from "./DeviceType";
+export interface EndpointInfo {
+    id: string;
+    name: string | null;
+    ip: string | null;
+    port: string | null;
+    rtype: DeviceType | null;
+    present: boolean | null;
+}

core_lib/dist/EndpointInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

core_lib/dist/State.d.ts

@@ -1 +1 @@
-export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "Disconnected" | "Finished";
+export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "SentUkeyClientInit" | "SentUkeyClientFinish" | "SentPairedKeyEncryption" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "SentIntroduction" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "SendingFiles" | "Disconnected" | "Finished";

core_lib/dist/TransferType.d.ts

@@ -0,0 +1 @@
+export type TransferType = "Inbound" | "Outbound";

core_lib/dist/TransferType.js

@@ -0,0 +1,3 @@
+"use strict";
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+Object.defineProperty(exports, "__esModule", { value: true });

core_lib/dist/index.d.ts

@@ -1,7 +1,9 @@
 export * from "./ChannelDirection";
 export * from "./DeviceType";
 export * from "./ChannelMessage";
+export * from "./TransferType";
 export * from "./TransferMetadata";
+export * from "./EndpointInfo";
 export * from "./ChannelAction";
 export * from "./RemoteDeviceInfo";
 export * from "./State";

core_lib/dist/index.js

@@ -17,7 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ChannelDirection"), exports);
 __exportStar(require("./DeviceType"), exports);
 __exportStar(require("./ChannelMessage"), exports);
+__exportStar(require("./TransferType"), exports);
 __exportStar(require("./TransferMetadata"), exports);
+__exportStar(require("./EndpointInfo"), exports);
 __exportStar(require("./ChannelAction"), exports);
 __exportStar(require("./RemoteDeviceInfo"), exports);
 __exportStar(require("./State"), exports);

core_lib/esm/ChannelMessage.d.ts

@@ -2,10 +2,12 @@ import type { ChannelAction } from "./ChannelAction";
 import type { ChannelDirection } from "./ChannelDirection";
 import type { State } from "./State";
 import type { TransferMetadata } from "./TransferMetadata";
+import type { TransferType } from "./TransferType";
 export interface ChannelMessage {
     id: string;
     direction: ChannelDirection;
     action: ChannelAction | null;
+    rtype: TransferType | null;
     state: State | null;
     meta: TransferMetadata | null;
 }

core_lib/esm/EndpointInfo.d.ts

@@ -0,0 +1,9 @@
+import type { DeviceType } from "./DeviceType";
+export interface EndpointInfo {
+    id: string;
+    name: string | null;
+    ip: string | null;
+    port: string | null;
+    rtype: DeviceType | null;
+    present: boolean | null;
+}

core_lib/esm/EndpointInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

core_lib/esm/State.d.ts

@@ -1 +1 @@
-export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "Disconnected" | "Finished";
+export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "SentUkeyClientInit" | "SentUkeyClientFinish" | "SentPairedKeyEncryption" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "SentIntroduction" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "SendingFiles" | "Disconnected" | "Finished";

core_lib/esm/TransferType.d.ts

@@ -0,0 +1 @@
+export type TransferType = "Inbound" | "Outbound";

core_lib/esm/TransferType.js

@@ -0,0 +1,3 @@
+"use strict";
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+Object.defineProperty(exports, "__esModule", { value: true });

core_lib/esm/index.d.ts

@@ -1,7 +1,9 @@
 export * from "./ChannelDirection";
 export * from "./DeviceType";
 export * from "./ChannelMessage";
+export * from "./TransferType";
 export * from "./TransferMetadata";
+export * from "./EndpointInfo";
 export * from "./ChannelAction";
 export * from "./RemoteDeviceInfo";
 export * from "./State";

core_lib/esm/index.js

@@ -17,7 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ChannelDirection"), exports);
 __exportStar(require("./DeviceType"), exports);
 __exportStar(require("./ChannelMessage"), exports);
+__exportStar(require("./TransferType"), exports);
 __exportStar(require("./TransferMetadata"), exports);
+__exportStar(require("./EndpointInfo"), exports);
 __exportStar(require("./ChannelAction"), exports);
 __exportStar(require("./RemoteDeviceInfo"), exports);
 __exportStar(require("./State"), exports);

core_lib/src/bin.rs

@@ -2,6 +2,7 @@
 extern crate log;
 
 use rquickshare::RQS;
+use tokio::sync::mpsc;
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
@@ -17,9 +18,13 @@ async fn main() -> Result<(), anyhow::Error> {
     tracing_subscriber::fmt::init();
 
     // Start the RQuickShare service
-    let rqs = RQS::default();
+    let mut rqs = RQS::default();
     rqs.run().await?;
 
+    let discovery_channel = mpsc::channel(10);
+
+    rqs.discovery(discovery_channel.0)?;
+
     // Wait for CTRL+C and then stop RQS
     let _ = tokio::signal::ctrl_c().await;
     info!("Stopping service.");

core_lib/src/channel.rs

@@ -20,6 +20,13 @@ pub enum ChannelAction {
     CancelTransfer,
 }
 
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, TS)]
+#[ts(export)]
+pub enum TransferType {
+    Inbound,
+    Outbound,
+}
+
 #[derive(Debug, Clone, Default, Deserialize, Serialize, TS)]
 #[ts(export)]
 pub struct ChannelMessage {
@@ -30,6 +37,7 @@ pub struct ChannelMessage {
     pub action: Option<ChannelAction>,
 
     // Only present when channelDirection is libToFront
+    pub rtype: Option<TransferType>,
     pub state: Option<State>,
     pub meta: Option<TransferMetadata>,
 }

core_lib/src/hdl/inbound.rs

@@ -44,7 +44,7 @@ const SANE_FRAME_LENGTH: i32 = 5 * 1024 * 1024;
 #[derive(Debug)]
 pub struct InboundRequest {
     socket: TcpStream,
-    state: InnerState,
+    pub state: InnerState,
     sender: Sender<ChannelMessage>,
     receiver: Receiver<ChannelMessage>,
 }
@@ -572,9 +572,9 @@ impl InboundRequest {
                                 current_offset
                             ));
                         }
-                        if current_offset + chunk.body().len() as i64 > file_internal.meta.size() {
+                        if current_offset + chunk.body().len() as i64 > file_internal.total_size {
                             return Err(anyhow!(
-                                "Transferred file size exceeds previously specified value"
+                                "Transferred file size exceeds previously specified value: {} vs {}", current_offset + chunk.body().len() as i64, file_internal.total_size
                             ));
                         }
 
@@ -753,10 +753,10 @@ impl InboundRequest {
                 }
 
                 let info = InternalFileInfo {
-                    meta: file.clone(),
                     payload_id: file.payload_id(),
-                    destination_url: dest,
+                    file_url: dest,
                     bytes_transferred: 0,
+                    total_size: file.size(),
                     file: None,
                 };
                 self.state.transferred_files.insert(file.payload_id(), info);
@@ -864,7 +864,7 @@ impl InboundRequest {
         for id in ids {
             let mfi = self.state.transferred_files.get_mut(&id).unwrap();
 
-            let file = File::create(&mfi.destination_url)?;
+            let file = File::create(&mfi.file_url)?;
             info!("Created file: {:?}", &file);
             mfi.file = Some(file);
         }
@@ -1190,6 +1190,7 @@ impl InboundRequest {
         let _ = self.sender.send(ChannelMessage {
             id: self.state.id.clone(),
             direction: ChannelDirection::LibToFront,
+            rtype: Some(crate::channel::TransferType::Inbound),
             state: Some(self.state.state.clone()),
             meta: self.state.transfer_metadata.clone(),
             ..Default::default()