Merge branch 'main' of https://github.com/noctisynth/oblivion-rust

Dockerfile

@@ -0,0 +1,8 @@
+FROM ubuntu:22.04
+RUN mkdir /root/.cargo
+COPY ./ /root/oblivion-rust
+COPY ./rsproxy.config /root/.cargo/config
+COPY ./ubuntu.list /etc/apt/source.list
+RUN apt-get update && apt-get install -y rustc cargo
+WORKDIR /root/oblivion-rust
+ENTRYPOINT ["cargo", "run", "--release"]

README.md

@@ -17,3 +17,8 @@ You can use the following command to create `Oblivion` documents:
 ```bash
 cargo doc -r
 ```
+
+## Docker && docker-compose
+```bash
+docker-compose up -d
+```

codehere.bat

@@ -1 +1 @@
-code .
+powershell -c "Start-Process -WindowStyle hidden -FilePath "code .""

docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3'
+services:
+  oblivion-rust:
+    build: .
+    container_name: oblivion-rust
+    ports:
+      - "7076:7076"

rsproxy.config

@@ -0,0 +1,10 @@
+[source.crates-io]
+replace-with = 'rsproxy-sparse'
+[source.rsproxy]
+registry = "https://rsproxy.cn/crates.io-index"
+[source.rsproxy-sparse]
+registry = "sparse+https://rsproxy.cn/index/"
+[registries.rsproxy]
+index = "https://rsproxy.cn/crates.io-index"
+[net]
+git-fetch-with-cli = true

src/exceptions.rs

@@ -1,10 +1,10 @@
 //! # Oblivion exception
 //! All exceptions to the Oblivion function return `OblivionException`.
+#[cfg(feature = "python")]
+use pyo3::prelude::*;
 use ring::error::Unspecified;
 use scrypt::errors::InvalidOutputLen;
 use thiserror::Error;
-#[cfg(feature = "python")]
-use pyo3::prelude::*;
 
 /// ## Oblivion exception iterator
 /// Use an iterator as the type of exception returned by a function.
@@ -55,6 +55,8 @@ pub enum OblivionException {
     EncryptError { error: Unspecified },
     #[error("Exception while decrypting: {error:?}")]
     DecryptError { error: Unspecified },
+    #[error("Failed to send some data: {message}")]
+    TCPWriteFailed { message: String },
 }
 
 #[cfg(feature = "python")]

src/utils/gear.rs

@@ -35,7 +35,7 @@ impl AbsoluteNonceSequence {
 ///
 /// Used to abstract Oblivion's handling of transmitted data, wrapping all data type conversions.
 pub struct Socket {
-    tcp: TcpStream,
+    pub tcp: TcpStream,
 }
 
 impl Socket {
@@ -101,9 +101,16 @@ impl Socket {
     }
 
     pub async fn send(&mut self, data: &[u8]) -> Result<(), OblivionException> {
-        match self.tcp.write(data).await {
-            Ok(_) => Ok(()),
-            Err(_) => Err(OblivionException::UnexpectedDisconnection),
+        match self.tcp.write_all(&data).await {
+            Ok(_) => match self.tcp.flush().await {
+                Ok(_) => Ok(()),
+                Err(e) => Err(OblivionException::TCPWriteFailed {
+                    message: e.to_string(),
+                }),
+            },
+            Err(e) => Err(OblivionException::TCPWriteFailed {
+                message: e.to_string(),
+            }),
         }
     }
 

ubuntu.list

@@ -0,0 +1,15 @@
+deb https://mirrors.aliyun.com/ubuntu/ jammy main restricted universe multiverse
+deb-src https://mirrors.aliyun.com/ubuntu/ jammy main restricted universe multiverse
+
+deb https://mirrors.aliyun.com/ubuntu/ jammy-security main restricted universe multiverse
+deb-src https://mirrors.aliyun.com/ubuntu/ jammy-security main restricted universe multiverse
+
+deb https://mirrors.aliyun.com/ubuntu/ jammy-updates main restricted universe multiverse
+deb-src https://mirrors.aliyun.com/ubuntu/ jammy-updates main restricted universe multiverse
+
+# deb https://mirrors.aliyun.com/ubuntu/ jammy-proposed main restricted universe multiverse
+# deb-src https://mirrors.aliyun.com/ubuntu/ jammy-proposed main restricted universe multiverse
+
+deb https://mirrors.aliyun.com/ubuntu/ jammy-backports main restricted universe multiverse
+deb-src https://mirrors.aliyun.com/ubuntu/ jammy-backports main restricted universe multiverse
+