add db
This commit is contained in:
sparshg
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
/target
|
/target
|
||||||
.vscode
|
.vscode
|
||||||
|
.env
|
||||||
360
Cargo.lock
generated
360
Cargo.lock
generated
@@ -29,6 +29,15 @@ dependencies = [
|
|||||||
"zerocopy",
|
"zerocopy",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "aho-corasick"
|
||||||
|
version = "1.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||||
|
dependencies = [
|
||||||
|
"memchr",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "allocator-api2"
|
name = "allocator-api2"
|
||||||
version = "0.2.18"
|
version = "0.2.18"
|
||||||
@@ -77,7 +86,7 @@ dependencies = [
|
|||||||
"hyper",
|
"hyper",
|
||||||
"hyper-util",
|
"hyper-util",
|
||||||
"itoa",
|
"itoa",
|
||||||
"matchit",
|
"matchit 0.7.3",
|
||||||
"memchr",
|
"memchr",
|
||||||
"mime",
|
"mime",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
@@ -149,10 +158,16 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"axum",
|
"axum",
|
||||||
"dotenv",
|
"dotenv",
|
||||||
|
"futures-util",
|
||||||
"rand",
|
"rand",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"socketioxide",
|
||||||
"sqlx",
|
"sqlx",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tower-http",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -184,6 +199,9 @@ name = "bytes"
|
|||||||
version = "1.7.1"
|
version = "1.7.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
|
checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
@@ -264,6 +282,12 @@ dependencies = [
|
|||||||
"typenum",
|
"typenum",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "data-encoding"
|
||||||
|
version = "2.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "der"
|
name = "der"
|
||||||
version = "0.7.9"
|
version = "0.7.9"
|
||||||
@@ -308,6 +332,33 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "engineioxide"
|
||||||
|
version = "0.14.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c9af9d31fdcf7ae420195c6df199b58372c74f4a1966f7107ebfbebbfceafa16"
|
||||||
|
dependencies = [
|
||||||
|
"base64",
|
||||||
|
"bytes",
|
||||||
|
"futures-core",
|
||||||
|
"futures-util",
|
||||||
|
"http",
|
||||||
|
"http-body",
|
||||||
|
"http-body-util",
|
||||||
|
"hyper",
|
||||||
|
"hyper-util",
|
||||||
|
"pin-project-lite",
|
||||||
|
"rand",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"smallvec",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tokio-tungstenite",
|
||||||
|
"tower",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "equivalent"
|
name = "equivalent"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@@ -422,6 +473,17 @@ version = "0.3.30"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "futures-macro"
|
||||||
|
version = "0.3.30"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-sink"
|
name = "futures-sink"
|
||||||
version = "0.3.30"
|
version = "0.3.30"
|
||||||
@@ -442,6 +504,7 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-io",
|
"futures-io",
|
||||||
|
"futures-macro",
|
||||||
"futures-sink",
|
"futures-sink",
|
||||||
"futures-task",
|
"futures-task",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -450,6 +513,19 @@ dependencies = [
|
|||||||
"slab",
|
"slab",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "generator"
|
||||||
|
version = "0.7.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
|
"rustversion",
|
||||||
|
"windows",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "generic-array"
|
name = "generic-array"
|
||||||
version = "0.14.7"
|
version = "0.14.7"
|
||||||
@@ -701,12 +777,42 @@ version = "0.4.22"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "loom"
|
||||||
|
version = "0.5.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"generator",
|
||||||
|
"scoped-tls",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "matchers"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
|
||||||
|
dependencies = [
|
||||||
|
"regex-automata 0.1.10",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "matchit"
|
name = "matchit"
|
||||||
version = "0.7.3"
|
version = "0.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
|
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "matchit"
|
||||||
|
version = "0.8.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "md-5"
|
name = "md-5"
|
||||||
version = "0.10.6"
|
version = "0.10.6"
|
||||||
@@ -766,6 +872,16 @@ dependencies = [
|
|||||||
"minimal-lexical",
|
"minimal-lexical",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nu-ansi-term"
|
||||||
|
version = "0.46.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
|
||||||
|
dependencies = [
|
||||||
|
"overload",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-bigint-dig"
|
name = "num-bigint-dig"
|
||||||
version = "0.8.4"
|
version = "0.8.4"
|
||||||
@@ -828,6 +944,12 @@ version = "1.19.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "overload"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking"
|
name = "parking"
|
||||||
version = "2.2.1"
|
version = "2.2.1"
|
||||||
@@ -1003,6 +1125,50 @@ dependencies = [
|
|||||||
"bitflags",
|
"bitflags",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex"
|
||||||
|
version = "1.10.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
|
||||||
|
dependencies = [
|
||||||
|
"aho-corasick",
|
||||||
|
"memchr",
|
||||||
|
"regex-automata 0.4.7",
|
||||||
|
"regex-syntax 0.8.4",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-automata"
|
||||||
|
version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||||
|
dependencies = [
|
||||||
|
"regex-syntax 0.6.29",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-automata"
|
||||||
|
version = "0.4.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
|
||||||
|
dependencies = [
|
||||||
|
"aho-corasick",
|
||||||
|
"memchr",
|
||||||
|
"regex-syntax 0.8.4",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-syntax"
|
||||||
|
version = "0.6.29"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-syntax"
|
||||||
|
version = "0.8.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rsa"
|
name = "rsa"
|
||||||
version = "0.9.6"
|
version = "0.9.6"
|
||||||
@@ -1054,6 +1220,12 @@ version = "1.0.18"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "scoped-tls"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "scopeguard"
|
name = "scopeguard"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@@ -1136,6 +1308,15 @@ dependencies = [
|
|||||||
"digest",
|
"digest",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sharded-slab"
|
||||||
|
version = "0.1.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shlex"
|
name = "shlex"
|
||||||
version = "1.3.0"
|
version = "1.3.0"
|
||||||
@@ -1189,6 +1370,31 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "socketioxide"
|
||||||
|
version = "0.14.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eae037b680e678f04b270f9740cbe6ddd71cf77a2e89f65092a0fcd1639af561"
|
||||||
|
dependencies = [
|
||||||
|
"bytes",
|
||||||
|
"engineioxide",
|
||||||
|
"futures-core",
|
||||||
|
"futures-util",
|
||||||
|
"http",
|
||||||
|
"http-body",
|
||||||
|
"hyper",
|
||||||
|
"itoa",
|
||||||
|
"matchit 0.8.4",
|
||||||
|
"pin-project-lite",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"state",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tower",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "spin"
|
name = "spin"
|
||||||
version = "0.9.8"
|
version = "0.9.8"
|
||||||
@@ -1264,6 +1470,8 @@ dependencies = [
|
|||||||
"smallvec",
|
"smallvec",
|
||||||
"sqlformat",
|
"sqlformat",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tokio-stream",
|
||||||
"tracing",
|
"tracing",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
@@ -1303,6 +1511,7 @@ dependencies = [
|
|||||||
"sqlx-sqlite",
|
"sqlx-sqlite",
|
||||||
"syn",
|
"syn",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
|
"tokio",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1409,6 +1618,15 @@ dependencies = [
|
|||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "state"
|
||||||
|
version = "0.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
|
||||||
|
dependencies = [
|
||||||
|
"loom",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stringprep"
|
name = "stringprep"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@@ -1482,6 +1700,16 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thread_local"
|
||||||
|
version = "1.1.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"once_cell",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinyvec"
|
name = "tinyvec"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
@@ -1526,6 +1754,29 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-stream"
|
||||||
|
version = "0.1.16"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
|
||||||
|
dependencies = [
|
||||||
|
"futures-core",
|
||||||
|
"pin-project-lite",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-tungstenite"
|
||||||
|
version = "0.23.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
|
||||||
|
dependencies = [
|
||||||
|
"futures-util",
|
||||||
|
"log",
|
||||||
|
"tokio",
|
||||||
|
"tungstenite",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower"
|
name = "tower"
|
||||||
version = "0.4.13"
|
version = "0.4.13"
|
||||||
@@ -1542,6 +1793,22 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tower-http"
|
||||||
|
version = "0.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"bytes",
|
||||||
|
"http",
|
||||||
|
"http-body",
|
||||||
|
"http-body-util",
|
||||||
|
"pin-project-lite",
|
||||||
|
"tower-layer",
|
||||||
|
"tower-service",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-layer"
|
name = "tower-layer"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
@@ -1584,6 +1851,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
|
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
"valuable",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tracing-log"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"once_cell",
|
||||||
|
"tracing-core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tracing-subscriber"
|
||||||
|
version = "0.3.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
|
||||||
|
dependencies = [
|
||||||
|
"matchers",
|
||||||
|
"nu-ansi-term",
|
||||||
|
"once_cell",
|
||||||
|
"regex",
|
||||||
|
"sharded-slab",
|
||||||
|
"smallvec",
|
||||||
|
"thread_local",
|
||||||
|
"tracing",
|
||||||
|
"tracing-core",
|
||||||
|
"tracing-log",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tungstenite"
|
||||||
|
version = "0.23.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
|
||||||
|
dependencies = [
|
||||||
|
"byteorder",
|
||||||
|
"bytes",
|
||||||
|
"data-encoding",
|
||||||
|
"http",
|
||||||
|
"httparse",
|
||||||
|
"log",
|
||||||
|
"rand",
|
||||||
|
"sha1",
|
||||||
|
"thiserror",
|
||||||
|
"utf-8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1636,6 +1951,18 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "utf-8"
|
||||||
|
version = "0.7.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "valuable"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vcpkg"
|
name = "vcpkg"
|
||||||
version = "0.2.15"
|
version = "0.2.15"
|
||||||
@@ -1670,6 +1997,37 @@ dependencies = [
|
|||||||
"wasite",
|
"wasite",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||||
|
dependencies = [
|
||||||
|
"winapi-i686-pc-windows-gnu",
|
||||||
|
"winapi-x86_64-pc-windows-gnu",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows"
|
||||||
|
version = "0.48.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
|
||||||
|
dependencies = [
|
||||||
|
"windows-targets 0.48.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-sys"
|
name = "windows-sys"
|
||||||
version = "0.48.0"
|
version = "0.48.0"
|
||||||
|
|||||||
@@ -6,7 +6,13 @@ edition = "2021"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
axum = "0.7.5"
|
axum = "0.7.5"
|
||||||
dotenv = "0.15.0"
|
dotenv = "0.15.0"
|
||||||
|
futures-util = "0.3.30"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
serde = { version = "1.0.210", features = ["derive"] }
|
serde = { version = "1.0.210", features = ["derive"] }
|
||||||
sqlx = "0.8.2"
|
serde_json = "1.0.128"
|
||||||
|
socketioxide = { version = "0.14.1", features = ["state", "tracing"] }
|
||||||
|
sqlx = { version = "0.8.2", features = ["macros", "postgres", "runtime-tokio"] }
|
||||||
tokio = { version = "1.40.0", features = ["full"] }
|
tokio = { version = "1.40.0", features = ["full"] }
|
||||||
|
tower-http = { version = "0.5.2", features = ["cors"] }
|
||||||
|
tracing = "0.1.40"
|
||||||
|
tracing-subscriber = "0.3.18"
|
||||||
|
|||||||
90
app/package-lock.json
generated
90
app/package-lock.json
generated
@@ -8,7 +8,8 @@
|
|||||||
"name": "app",
|
"name": "app",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lucide-svelte": "^0.441.0"
|
"lucide-svelte": "^0.441.0",
|
||||||
|
"socket.io-client": "^4.7.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@sveltejs/adapter-auto": "^3.0.0",
|
"@sveltejs/adapter-auto": "^3.0.0",
|
||||||
@@ -977,6 +978,12 @@
|
|||||||
"win32"
|
"win32"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"node_modules/@socket.io/component-emitter": {
|
||||||
|
"version": "3.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
|
||||||
|
"integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@sveltejs/adapter-auto": {
|
"node_modules/@sveltejs/adapter-auto": {
|
||||||
"version": "3.2.4",
|
"version": "3.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.2.4.tgz",
|
||||||
@@ -1804,7 +1811,6 @@
|
|||||||
"version": "4.3.7",
|
"version": "4.3.7",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
||||||
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ms": "^2.1.3"
|
"ms": "^2.1.3"
|
||||||
@@ -1886,6 +1892,28 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/engine.io-client": {
|
||||||
|
"version": "6.5.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz",
|
||||||
|
"integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@socket.io/component-emitter": "~3.1.0",
|
||||||
|
"debug": "~4.3.1",
|
||||||
|
"engine.io-parser": "~5.2.1",
|
||||||
|
"ws": "~8.17.1",
|
||||||
|
"xmlhttprequest-ssl": "~2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/engine.io-parser": {
|
||||||
|
"version": "5.2.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
|
||||||
|
"integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/esbuild": {
|
"node_modules/esbuild": {
|
||||||
"version": "0.21.5",
|
"version": "0.21.5",
|
||||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
|
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
|
||||||
@@ -2904,7 +2932,6 @@
|
|||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/mz": {
|
"node_modules/mz": {
|
||||||
@@ -3623,6 +3650,34 @@
|
|||||||
"node": ">= 10"
|
"node": ">= 10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/socket.io-client": {
|
||||||
|
"version": "4.7.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.5.tgz",
|
||||||
|
"integrity": "sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@socket.io/component-emitter": "~3.1.0",
|
||||||
|
"debug": "~4.3.2",
|
||||||
|
"engine.io-client": "~6.5.2",
|
||||||
|
"socket.io-parser": "~4.2.4"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/socket.io-parser": {
|
||||||
|
"version": "4.2.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
|
||||||
|
"integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@socket.io/component-emitter": "~3.1.0",
|
||||||
|
"debug": "~4.3.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/source-map-js": {
|
"node_modules/source-map-js": {
|
||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
||||||
@@ -4405,6 +4460,35 @@
|
|||||||
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
|
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/ws": {
|
||||||
|
"version": "8.17.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
|
||||||
|
"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"bufferutil": "^4.0.1",
|
||||||
|
"utf-8-validate": ">=5.0.2"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"bufferutil": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"utf-8-validate": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/xmlhttprequest-ssl": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/yaml": {
|
"node_modules/yaml": {
|
||||||
"version": "1.10.2",
|
"version": "1.10.2",
|
||||||
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
|
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lucide-svelte": "^0.441.0"
|
"lucide-svelte": "^0.441.0",
|
||||||
|
"socket.io-client": "^4.7.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
let { board, callback }: { board: Board; callback: (i: number, j: number) => void } = $props();
|
let { board, callback }: { board: Board; callback: (i: number, j: number) => void } = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="grid grid-cols-10 gap-1 bg-blue-200 p-2 rounded-lg">
|
<div class="grid grid-cols-10 gap-1 bg-primary p-2 rounded-lg">
|
||||||
{#each board.board as row, i}
|
{#each board.board as row, i}
|
||||||
{#each row as cell, j}
|
{#each row as cell, j}
|
||||||
<button
|
<button
|
||||||
class="aspect-square bg-blue-300 flex items-center justify-center {!board.isOpponent
|
class="aspect-square bg-blue-950 flex items-center justify-center {!board.isOpponent
|
||||||
? 'cursor-default'
|
? 'cursor-default'
|
||||||
: ''}"
|
: ''}"
|
||||||
onclick={() => callback(i, j)}
|
onclick={() => callback(i, j)}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { io, Socket } from "socket.io-client";
|
||||||
|
|
||||||
export type Phase = 'placement' | 'battle' | 'gameover';
|
export type Phase = 'placement' | 'battle' | 'gameover';
|
||||||
export type CellType = 'e' | 's' | 'h' | 'm'; // empty, ship, hit, miss
|
export type CellType = 'e' | 's' | 'h' | 'm'; // empty, ship, hit, miss
|
||||||
|
|
||||||
@@ -6,15 +8,57 @@ export class State {
|
|||||||
playerBoard = $state(new Board(false));
|
playerBoard = $state(new Board(false));
|
||||||
opponentBoard = $state(new Board(true));
|
opponentBoard = $state(new Board(true));
|
||||||
room = $state('');
|
room = $state('');
|
||||||
|
turn = $state(false);
|
||||||
|
socket = io('ws://127.0.0.1:3000/', {
|
||||||
|
transports: ['websocket']
|
||||||
|
});
|
||||||
|
|
||||||
createRoom() {
|
constructor() {
|
||||||
this.room = Math.random().toString(36).substring(2, 6).toUpperCase();
|
this.socket.on('created-room', (room: string) => {
|
||||||
|
this.room = room;
|
||||||
|
});
|
||||||
|
this.socket.on('upload', (_, callback) => {
|
||||||
|
callback(this.playerBoard.board);
|
||||||
|
})
|
||||||
|
this.socket.on('turn', (id) => {
|
||||||
|
this.turn = id == this.socket.id;
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
joinRoom(room: string) {
|
async attack(i: number, j: number) {
|
||||||
if (room.length != 4) return;
|
if (!this.turn) return;
|
||||||
if (room == this.room) return;
|
this.turn = false;
|
||||||
this.room = room;
|
const res = await this.socket.emitWithAck('attack', [i, j]);
|
||||||
|
if (res) {
|
||||||
|
this.opponentBoard.board[i][j] = 'h';
|
||||||
|
} else {
|
||||||
|
this.opponentBoard.board[i][j] = 'm';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async createRoom() {
|
||||||
|
this.socket.emit('create');
|
||||||
|
// this.socket.emit('upload', this.playerBoard.board);
|
||||||
|
// send the board to the server
|
||||||
|
// let api = 'http://127.0.0.1:3000/';
|
||||||
|
// await fetch(api, {
|
||||||
|
// method: 'POST',
|
||||||
|
// headers: {
|
||||||
|
// 'Content-Type': 'application/json',
|
||||||
|
// 'Access-Control-Allow-Origin': '*',
|
||||||
|
// },
|
||||||
|
// body: JSON.stringify(this.playerBoard.board),
|
||||||
|
// }).then((response) => {
|
||||||
|
// console.log(response);
|
||||||
|
// response.json().then((data) => {
|
||||||
|
// console.log(data);
|
||||||
|
// });
|
||||||
|
// });
|
||||||
|
}
|
||||||
|
|
||||||
|
joinRoom() {
|
||||||
|
if (this.room.length != 4) return;
|
||||||
|
this.socket.emit('join', this.room);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,9 +72,9 @@ export class Board {
|
|||||||
if (!isOpponent) this.randomize();
|
if (!isOpponent) this.randomize();
|
||||||
}
|
}
|
||||||
|
|
||||||
set(x: number, y: number, type: CellType) {
|
// set(x: number, y: number, type: CellType) {
|
||||||
this.board[x][y] = type;
|
// this.board[x][y] = type;
|
||||||
}
|
// }
|
||||||
|
|
||||||
randomize() {
|
randomize() {
|
||||||
this.board = Array.from({ length: 10 }, () => Array.from({ length: 10 }, () => 'e'));
|
this.board = Array.from({ length: 10 }, () => Array.from({ length: 10 }, () => 'e'));
|
||||||
|
|||||||
@@ -29,10 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h3 class="text-lg font-medium mb-2">Opponent's Board</h3>
|
<h3 class="text-lg font-medium mb-2">Opponent's Board</h3>
|
||||||
<Board
|
<Board board={gameState.opponentBoard} callback={(i, j) => gameState.attack(i, j)} />
|
||||||
board={gameState.opponentBoard}
|
|
||||||
callback={(i, j) => gameState.opponentBoard.set(i, j, 'h')}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -50,9 +47,9 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={gameState.room}
|
bind:value={gameState.room}
|
||||||
placeholder="Code"
|
placeholder="Code"
|
||||||
class="input input-bordered w-full max-w-20"
|
class="input input-bordered w-full max-w-24 text-center"
|
||||||
/>
|
/>
|
||||||
<button class="btn btn-outline">Join Room</button>
|
<button class="btn btn-outline" onclick={() => gameState.joinRoom()}>Join Room</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ export default {
|
|||||||
],
|
],
|
||||||
|
|
||||||
daisyui: {
|
daisyui: {
|
||||||
themes: ["nord"], // false: only light + dark | true: all themes | array: specific themes like this ["light", "dark", "cupcake"]
|
themes: ["night"], // false: only light + dark | true: all themes | array: specific themes like this ["light", "dark", "cupcake"]
|
||||||
darkTheme: "nord", // name of one of the included themes for dark mode
|
darkTheme: "night", // name of one of the included themes for dark mode
|
||||||
base: true, // applies background color and foreground color for root element by default
|
base: true, // applies background color and foreground color for root element by default
|
||||||
styled: true, // include daisyUI colors and design decisions for all components
|
styled: true, // include daisyUI colors and design decisions for all components
|
||||||
utils: true, // adds responsive and modifier utility classes
|
utils: true, // adds responsive and modifier utility classes
|
||||||
|
|||||||
5
build.rs
Normal file
5
build.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// generated by `sqlx migrate build-script`
|
||||||
|
fn main() {
|
||||||
|
// trigger recompilation when a new migration is added
|
||||||
|
println!("cargo:rerun-if-changed=migrations");
|
||||||
|
}
|
||||||
28
migrations/0001_battleship.sql
Normal file
28
migrations/0001_battleship.sql
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
-- DROP OWNED BY CURRENT_USER CASCADE;
|
||||||
|
CREATE TYPE STAT AS ENUM ('waiting', 'p1turn', 'p2turn');
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS players (
|
||||||
|
id CHAR(16) PRIMARY KEY,
|
||||||
|
board CHAR(10) [10],
|
||||||
|
room_code CHAR(4)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS rooms (
|
||||||
|
code CHAR(4) PRIMARY KEY,
|
||||||
|
player1_id CHAR(16),
|
||||||
|
player2_id CHAR(16),
|
||||||
|
stat STAT DEFAULT 'waiting'
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE players
|
||||||
|
ADD CONSTRAINT fk_room_code FOREIGN KEY (room_code) REFERENCES rooms (code) ON DELETE
|
||||||
|
SET NULL;
|
||||||
|
|
||||||
|
ALTER TABLE rooms
|
||||||
|
ADD CONSTRAINT fk_player1 FOREIGN KEY (player1_id) REFERENCES players (id) ON DELETE
|
||||||
|
SET NULL,
|
||||||
|
ADD CONSTRAINT fk_player2 FOREIGN KEY (player2_id) REFERENCES players (id) ON DELETE
|
||||||
|
SET NULL;
|
||||||
|
|
||||||
|
CREATE INDEX idx_player_room_code ON players (room_code);
|
||||||
|
CREATE INDEX idx_room_status ON rooms (stat);
|
||||||
203
src/game.rs
203
src/game.rs
@@ -1,13 +1,190 @@
|
|||||||
|
use std::{collections::HashMap, sync::Arc};
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::Deserialize;
|
||||||
|
use socketioxide::socket::Sid;
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
pub const ROOM_CODE_LENGTH: usize = 4;
|
||||||
|
|
||||||
|
// #[derive(Default, Clone)]
|
||||||
|
// pub struct Store {
|
||||||
|
// rooms: Arc<RwLock<HashMap<String, Room>>>,
|
||||||
|
// sockets: Arc<RwLock<HashMap<Sid, String>>>,
|
||||||
|
// }
|
||||||
|
|
||||||
|
// impl Store {
|
||||||
|
// pub async fn add_room(&self, code: String) {
|
||||||
|
// let mut store = self.rooms.write().await;
|
||||||
|
// store.insert(
|
||||||
|
// code.clone(),
|
||||||
|
// Room {
|
||||||
|
// code,
|
||||||
|
// ..Default::default()
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
// }
|
||||||
|
pub async fn add_room(code: String, pool: &sqlx::PgPool) -> Result<(), sqlx::Error> {
|
||||||
|
sqlx::query!("INSERT INTO rooms (code) VALUES ($1)", code)
|
||||||
|
.execute(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn join_room(sid: Sid, code: String, pool: &sqlx::PgPool) -> Result<(), sqlx::Error> {
|
||||||
|
let room = sqlx::query!(
|
||||||
|
r#"SELECT player1_id, player2_id FROM rooms WHERE code = $1"#,
|
||||||
|
code
|
||||||
|
)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if room.player1_id.is_some() && room.player2_id.is_some() {
|
||||||
|
return Err(sqlx::Error::RowNotFound); // room full
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut txn = pool.begin().await?;
|
||||||
|
|
||||||
|
sqlx::query!(
|
||||||
|
r#"INSERT INTO players (id, room_code) VALUES ($1, $2) ON CONFLICT (id) DO UPDATE SET room_code = $2"#,
|
||||||
|
sid.as_str(),
|
||||||
|
code
|
||||||
|
)
|
||||||
|
.execute(&mut *txn)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
sqlx::query(&format!(
|
||||||
|
"UPDATE rooms SET player{}_id = $1 WHERE code = $2",
|
||||||
|
if room.player1_id.is_none() { "1" } else { "2" }
|
||||||
|
))
|
||||||
|
.bind(sid.as_str())
|
||||||
|
.bind(code)
|
||||||
|
.execute(&mut *txn)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
txn.commit().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
// pub async fn join_room(&self, sid: Sid, code: String) -> Result<(), ()> {
|
||||||
|
// if self.rooms.read().await.get(&code).is_none() {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
// let mut sockets = self.sockets.write().await;
|
||||||
|
// let player = sockets
|
||||||
|
// .entry(sid)
|
||||||
|
// .and_modify(|p| p.room = Some(code.clone()))
|
||||||
|
// .or_insert(Arc::new(Player {
|
||||||
|
// sid,
|
||||||
|
// room: Some(code.clone()),
|
||||||
|
// board: None,
|
||||||
|
// }));
|
||||||
|
// let mut rooms = self.rooms.write().await;
|
||||||
|
// let Some(room) = rooms.get_mut(&code) else {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
|
||||||
|
// if room.player1.is_none() {
|
||||||
|
// room.player1 = Some(Arc::clone(player));
|
||||||
|
// }
|
||||||
|
// Ok(())
|
||||||
|
// }
|
||||||
|
|
||||||
|
// pub async fn add_board(&self, sid: Sid, board: Board) -> Result<(), ()> {
|
||||||
|
// let mut store = self.sockets.write().await;
|
||||||
|
// if let Some(player) = store.get_mut(&sid) {
|
||||||
|
// player.board = Some(board);
|
||||||
|
// } else {
|
||||||
|
// return Err(());
|
||||||
|
// }
|
||||||
|
// Ok(())
|
||||||
|
// }
|
||||||
|
|
||||||
|
// pub async fn start(&self, code: String, sid: Sid) -> Result<(), ()> {
|
||||||
|
// let mut store = self.rooms.write().await;
|
||||||
|
// let Some(room) = store.get_mut(&code) else {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
// dbg!(&room);
|
||||||
|
// let (Some(player1), Some(player2)) = (room.player1, room.player2) else {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
|
||||||
|
// if player1.sid == sid {
|
||||||
|
// room.status = Status::Player1Turn;
|
||||||
|
// } else if player2.sid == sid {
|
||||||
|
// room.status = Status::Player2Turn;
|
||||||
|
// } else {
|
||||||
|
// return Err(());
|
||||||
|
// }
|
||||||
|
// Ok(())
|
||||||
|
// }
|
||||||
|
|
||||||
|
// pub async fn attack(&self, sid: Sid, (i, j): (usize, usize)) -> Result<bool, ()> {
|
||||||
|
// let sockets = self.sockets.read().await;
|
||||||
|
// let Some(player) = sockets.get(&sid) else {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
// let mut rooms = self.rooms.write().await;
|
||||||
|
// let Some(room) = rooms.get_mut(player.room.as_ref().unwrap()) else {
|
||||||
|
// return Err(());
|
||||||
|
// };
|
||||||
|
|
||||||
|
// match room.status {
|
||||||
|
// Status::Player1Turn if player.sid == room.player1.as_ref().unwrap().sid => {
|
||||||
|
// room.status = Status::Player2Turn;
|
||||||
|
// return Ok(room.player2.as_ref().unwrap().board.as_ref().unwrap().0[i][j] == 's');
|
||||||
|
// }
|
||||||
|
// Status::Player2Turn if player.sid == room.player2.as_ref().unwrap().sid => {
|
||||||
|
// room.status = Status::Player1Turn;
|
||||||
|
// return Ok(room.player1.as_ref().unwrap().board.as_ref().unwrap().0[i][j] == 's');
|
||||||
|
// }
|
||||||
|
// _ => return Err(()),
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Err(())
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// #[derive(Default, Debug)]
|
||||||
|
// struct Room {
|
||||||
|
// code: String,
|
||||||
|
// player1: Option<Arc<Player>>,
|
||||||
|
// player2: Option<Arc<Player>>,
|
||||||
|
// status: Status,
|
||||||
|
// }
|
||||||
|
|
||||||
|
// #[derive(Debug)]
|
||||||
|
// struct Player {
|
||||||
|
// sid: Sid,
|
||||||
|
// board: Option<Board>,
|
||||||
|
// room: Option<String>,
|
||||||
|
// }
|
||||||
|
|
||||||
|
#[derive(Debug, sqlx::Type)]
|
||||||
|
#[sqlx(type_name = "STAT", rename_all = "lowercase")]
|
||||||
|
enum Status {
|
||||||
|
Waiting,
|
||||||
|
P1Turn,
|
||||||
|
P2Turn,
|
||||||
|
}
|
||||||
|
|
||||||
|
// impl Default for Status {
|
||||||
|
// fn default() -> Self {
|
||||||
|
// Status::Waiting
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct Board(pub [[char; 10]; 10]);
|
pub struct Board(pub [[char; 10]; 10]);
|
||||||
|
|
||||||
impl Board {
|
impl Board {
|
||||||
const SHIPS: [i32; 5] = [5, 4, 3, 3, 2];
|
const SHIPS: [i32; 5] = [5, 4, 3, 3, 2];
|
||||||
|
|
||||||
|
pub fn from_json(Json(board): Json<Board>) -> Self {
|
||||||
|
board
|
||||||
|
}
|
||||||
|
|
||||||
pub fn randomize() -> Self {
|
pub fn randomize() -> Self {
|
||||||
let mut board = Board([['e'; 10]; 10]);
|
let mut board = Board([['e'; 10]; 10]);
|
||||||
for &length in Self::SHIPS.iter() {
|
for &length in Self::SHIPS.iter() {
|
||||||
@@ -43,18 +220,14 @@ impl Board {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn from_json(Json(board): Json<Board>) -> Self {
|
// fn validate_syntax(&self) -> bool {
|
||||||
board
|
// self.0
|
||||||
}
|
// .iter()
|
||||||
|
// .all(|row| row.iter().all(|cell| matches!(cell, 'e' | 'h' | 'm' | 's')))
|
||||||
fn validate_syntax(&self) -> bool {
|
// }
|
||||||
self.0
|
|
||||||
.iter()
|
|
||||||
.all(|row| row.iter().all(|cell| matches!(cell, 'e' | 'h' | 'm' | 's')))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn create_board_route(board: Json<Board>) -> String {
|
// pub async fn create_board_route(board: Json<Board>) -> Json<String> {
|
||||||
let board = Board::from_json(board).await;
|
// let board = Board::from_json(board).await;
|
||||||
format!("{:?}", board)
|
// Json(format!("{:?}", board.0))
|
||||||
}
|
// }
|
||||||
|
|||||||
137
src/main.rs
137
src/main.rs
@@ -1,18 +1,135 @@
|
|||||||
mod game;
|
mod game;
|
||||||
|
use std::{str::FromStr, sync::Arc};
|
||||||
|
|
||||||
use axum::{
|
use axum::Router;
|
||||||
routing::{get, post},
|
use dotenv::dotenv;
|
||||||
Json, Router,
|
use futures_util::stream::StreamExt;
|
||||||
|
use game::{join_room, Board, ROOM_CODE_LENGTH};
|
||||||
|
use rand::Rng;
|
||||||
|
use serde_json::Value;
|
||||||
|
use socketioxide::{
|
||||||
|
adapter::Room,
|
||||||
|
extract::{AckSender, Data, SocketRef, State},
|
||||||
|
socket::Sid,
|
||||||
|
SocketIo,
|
||||||
};
|
};
|
||||||
use game::Board;
|
|
||||||
use serde::Serialize;
|
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
|
use tower_http::cors::CorsLayer;
|
||||||
|
use tracing_subscriber::FmtSubscriber;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let app = Router::new().route("/", post(game::create_board_route));
|
tracing::subscriber::set_global_default(
|
||||||
|
FmtSubscriber::builder()
|
||||||
|
.with_max_level(tracing::Level::INFO)
|
||||||
|
.finish(),
|
||||||
|
)?;
|
||||||
|
let _ = dotenv();
|
||||||
|
let url = std::env::var("DATABASE_URL")?;
|
||||||
|
let pool = sqlx::postgres::PgPool::connect(&url).await?;
|
||||||
|
sqlx::migrate!("./migrations").run(&pool).await?;
|
||||||
|
join_room(
|
||||||
|
Sid::from_str("aaaaaaaaaaaaaaaa").unwrap(),
|
||||||
|
"AAAB".to_string(),
|
||||||
|
&pool,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
let (layer, io) = SocketIo::builder().with_state(pool).build_layer();
|
||||||
|
// io.ns("/", on_connect);
|
||||||
|
let app = Router::new()
|
||||||
|
// .route("/", post(game::create_board_route))
|
||||||
|
.layer(layer)
|
||||||
|
.layer(CorsLayer::very_permissive());
|
||||||
|
|
||||||
let listener = TcpListener::bind("127.0.0.1:3000").await.unwrap();
|
let listener = TcpListener::bind("127.0.0.1:3000").await?;
|
||||||
println!("listening on {}", listener.local_addr().unwrap());
|
println!("listening on {}", listener.local_addr()?);
|
||||||
axum::serve(listener, app).await.unwrap();
|
axum::serve(listener, app).await?;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// fn on_connect(socket: SocketRef, io: SocketIo) {
|
||||||
|
// tracing::info!("Connected: {:?}", socket.id);
|
||||||
|
// // tracing::info!(
|
||||||
|
// // "All rooms and sockets: {:?}",
|
||||||
|
// // io.rooms()
|
||||||
|
// // .unwrap()
|
||||||
|
// // .iter()
|
||||||
|
// // .map(|room| { (room, io.within(room.clone()).sockets().unwrap()) })
|
||||||
|
// // );
|
||||||
|
|
||||||
|
// socket.on(
|
||||||
|
// "create",
|
||||||
|
// |socket: SocketRef, store: State<Store>| async move {
|
||||||
|
// if !socket.rooms().unwrap().is_empty() {
|
||||||
|
// socket
|
||||||
|
// .emit("created-room", socket.rooms().unwrap().first())
|
||||||
|
// .unwrap();
|
||||||
|
// println!("{} Already in a room", socket.id);
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// let room: String = rand::thread_rng()
|
||||||
|
// .sample_iter(&rand::distributions::Alphanumeric)
|
||||||
|
// .take(ROOM_CODE_LENGTH)
|
||||||
|
// .map(|x| char::to_ascii_uppercase(&(x as char)))
|
||||||
|
// .collect();
|
||||||
|
// tracing::info!("Creating room: {:?}", room);
|
||||||
|
// store.add_room(room.clone()).await;
|
||||||
|
// store.join_room(socket.id, room.clone()).await.unwrap();
|
||||||
|
// socket.leave_all().unwrap();
|
||||||
|
// socket.join(room.clone()).unwrap();
|
||||||
|
// socket.emit("created-room", &room).unwrap();
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
|
||||||
|
// socket.on(
|
||||||
|
// "join",
|
||||||
|
// |socket: SocketRef, Data::<String>(room), store: State<Store>| async move {
|
||||||
|
// if room.len() != ROOM_CODE_LENGTH {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// tracing::info!("Joining room: {:?}", room);
|
||||||
|
// store.join_room(socket.id, room.clone()).await.unwrap();
|
||||||
|
// socket.leave_all().unwrap();
|
||||||
|
// socket.join(room.clone()).unwrap();
|
||||||
|
// if socket.within(room.clone()).sockets().unwrap().len() != 2 {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// let ack_stream = socket
|
||||||
|
// .within(room.clone())
|
||||||
|
// .emit_with_ack::<Vec<Board>>("upload", ())
|
||||||
|
// .unwrap();
|
||||||
|
// ack_stream
|
||||||
|
// .for_each(|(id, ack)| {
|
||||||
|
// let store = store.clone();
|
||||||
|
// async move {
|
||||||
|
// match ack {
|
||||||
|
// Ok(mut ack) => {
|
||||||
|
// store.add_board(id, ack.data.pop().unwrap()).await.unwrap();
|
||||||
|
// }
|
||||||
|
// Err(err) => tracing::error!("Ack error, {}", err),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// .await;
|
||||||
|
// store.start(room.clone(), socket.id).await.unwrap();
|
||||||
|
// tracing::info!("Game started");
|
||||||
|
// socket.within(room.clone()).emit("turn", socket.id).unwrap();
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
|
||||||
|
// socket.on(
|
||||||
|
// "attack",
|
||||||
|
// |socket: SocketRef, Data::<[usize; 2]>([i, j]), ack: AckSender, store: State<Store>| async move {
|
||||||
|
// let res = store.attack(socket.id, (i, j)).await.unwrap();
|
||||||
|
// tracing::info!("Attacking at: ({}, {}), result: {}", i, j, res);
|
||||||
|
// ack.send(res).unwrap();
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
|
||||||
|
// socket.on_disconnect(|socket: SocketRef, store: State<Store>| {
|
||||||
|
// tracing::info!("Disconnecting: {:?}", socket.id);
|
||||||
|
// socket.leave_all().unwrap();
|
||||||
|
// // TODO: Delete room
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|||||||
Reference in New Issue
Block a user