diff --git a/.env.docker.sample b/.env.docker.sample index c448c30..e69d0fe 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -4,9 +4,10 @@ FRONTEND_URL=http://localhost:4200 RUST_LOG=debug ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h -ROOT_DIRECTORY=/home/icarus/mydata -POSTGRES_MAIN_USER=icarus +ROOT_DIRECTORY=/home/soaricarus/mydata +POSTGRES_MAIN_USER=soaricarus POSTGRES_MAIN_PASSWORD=password -POSTGRES_MAIN_DB=icarus_db +POSTGRES_MAIN_DB=soaricarus_db POSTGRES_MAIN_HOST=main_db -DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} +POSTGRES_MAIN_PORT=5432 +DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB} diff --git a/.env.local.sample b/.env.local.sample index c448c30..e69d0fe 100644 --- a/.env.local.sample +++ b/.env.local.sample @@ -4,9 +4,10 @@ FRONTEND_URL=http://localhost:4200 RUST_LOG=debug ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h -ROOT_DIRECTORY=/home/icarus/mydata -POSTGRES_MAIN_USER=icarus +ROOT_DIRECTORY=/home/soaricarus/mydata +POSTGRES_MAIN_USER=soaricarus POSTGRES_MAIN_PASSWORD=password -POSTGRES_MAIN_DB=icarus_db +POSTGRES_MAIN_DB=soaricarus_db POSTGRES_MAIN_HOST=main_db -DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} +POSTGRES_MAIN_PORT=5432 +DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB} diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 8be2df0..0000000 --- a/.env.sample +++ /dev/null @@ -1,12 +0,0 @@ -APP_ENV=production -BACKEND_PORT=8000 -FRONTEND_URL=http://localhost:4200 -RUST_LOG=debug -ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com,http://localhost:8000,http://127.0.0.1:8000 -SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h -ROOT_DIRECTORY=/home/icarus/mydata -POSTGRES_MAIN_USER=icarus -POSTGRES_MAIN_PASSWORD=password -POSTGRES_MAIN_DB=icarus_db -POSTGRES_MAIN_HOST=localhost -DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a31c9a..6014cc9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 components: cargo - name: Extract Version from Cargo.toml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 939fbdf..4c3c6c3 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,4 +1,4 @@ -name: Rust CI +name: soaricarus_api CI on: push: @@ -19,16 +19,16 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key - chmod 600 ~/.ssh/icarus_models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key + chmod 600 ~/.ssh/soaricarus_models_deploy_key ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/icarus_models_deploy_key + ssh-add -v ~/.ssh/soaricarus_models_deploy_key cargo check @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - name: Verify Docker Environment run: | @@ -75,12 +75,12 @@ jobs: ROOT_DIRECTORY: "/tmp" run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key - chmod 600 ~/.ssh/icarus_models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key + chmod 600 ~/.ssh/soaricarus_models_deploy_key ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/icarus_models_deploy_key + ssh-add -v ~/.ssh/soaricarus_models_deploy_key cargo test @@ -91,17 +91,17 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: rustup component add rustfmt - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key - chmod 600 ~/.ssh/icarus_models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key + chmod 600 ~/.ssh/soaricarus_models_deploy_key ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/icarus_models_deploy_key + ssh-add -v ~/.ssh/soaricarus_models_deploy_key cargo fmt --all -- --check clippy: @@ -111,17 +111,17 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: rustup component add clippy - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key - chmod 600 ~/.ssh/icarus_models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key + chmod 600 ~/.ssh/soaricarus_models_deploy_key ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/icarus_models_deploy_key + ssh-add -v ~/.ssh/soaricarus_models_deploy_key cargo clippy -- -D warnings build: @@ -131,14 +131,14 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key - chmod 600 ~/.ssh/icarus_models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key + chmod 600 ~/.ssh/soaricarus_models_deploy_key ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/icarus_models_deploy_key + ssh-add -v ~/.ssh/soaricarus_models_deploy_key cargo build --release diff --git a/Cargo.lock b/Cargo.lock index 3091dfa..5af1cf8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,9 +154,9 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" dependencies = [ "serde_core", ] @@ -193,15 +193,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.2.66" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8" dependencies = [ "find-msvc-tools", "shlex", @@ -253,7 +253,7 @@ dependencies = [ "http", "mime", "mime_guess", - "rand 0.8.6", + "rand 0.8.7", "thiserror 1.0.69", ] @@ -272,6 +272,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const_format" version = "0.2.36" @@ -456,7 +462,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] @@ -488,7 +494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid", + "const-oid 0.9.6", "crypto-common 0.1.6", "subtle", ] @@ -500,6 +506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.1", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", ] @@ -723,9 +730,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" dependencies = [ "futures-channel", "futures-core", @@ -738,9 +745,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" dependencies = [ "futures-core", "futures-sink", @@ -748,15 +755,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" [[package]] name = "futures-executor" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" dependencies = [ "futures-core", "futures-task", @@ -776,15 +783,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" +checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" [[package]] name = "futures-macro" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" dependencies = [ "proc-macro2", "quote", @@ -793,21 +800,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" dependencies = [ "futures-channel", "futures-core", @@ -893,9 +900,9 @@ dependencies = [ [[package]] name = "hdrhistogram" -version = "7.5.4" +version = "7.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +checksum = "f49d1053f4708f0af3cf9fc5bffc7e68a914a3c45becb231c80068c9c3f78bea" dependencies = [ "byteorder", "num-traits", @@ -961,9 +968,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -971,9 +978,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" dependencies = [ "bytes", "futures-core", @@ -1038,71 +1045,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "icarus" -version = "0.5.2" -dependencies = [ - "axum", - "axum-extra", - "common-multipart-rfc7578", - "futures", - "icarus_envy", - "icarus_meta", - "icarus_models", - "josekit", - "jsonwebtoken", - "mime_guess", - "openssl", - "serde", - "serde_json", - "sqlx", - "tempfile", - "time", - "tokio", - "tokio-util", - "tower", - "tower-http", - "tracing-subscriber", - "url", - "utoipa", - "utoipa-swagger-ui", - "uuid", -] - -[[package]] -name = "icarus_envy" -version = "0.8.0" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309" -dependencies = [ - "const_format", - "dotenvy", -] - -[[package]] -name = "icarus_meta" -version = "0.6.1" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.6.1#946c46a23b387323c20720cd78bbac3c34595854" -dependencies = [ - "imghdr", - "infer", - "lofty", - "rand 0.10.2", -] - -[[package]] -name = "icarus_models" -version = "0.11.3" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.11.3#859b0fb1b377370d8171e22e59893d86e41b258b" -dependencies = [ - "josekit", - "rand 0.10.2", - "serde", - "serde_json", - "time", - "utoipa", - "uuid", -] - [[package]] name = "icu_collections" version = "2.2.0" @@ -1281,7 +1223,7 @@ dependencies = [ "p256", "p384", "pem", - "rand 0.8.6", + "rand 0.8.7", "rsa", "serde", "serde_json", @@ -1440,9 +1382,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "wasi", @@ -1513,7 +1455,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.6", + "rand 0.8.7", "smallvec", "zeroize", ] @@ -1797,9 +1739,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" dependencies = [ "libc", "rand_chacha", @@ -1853,9 +1795,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.4" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -1865,9 +1807,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -1896,7 +1838,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", + "const-oid 0.9.6", "digest 0.10.7", "num-bigint-dig", "num-integer", @@ -1912,9 +1854,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" +checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1923,10 +1865,11 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" dependencies = [ + "mime_guess", "proc-macro2", "quote", "rust-embed-utils", @@ -1936,11 +1879,11 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" dependencies = [ - "sha2 0.10.9", + "sha2 0.11.0", "walkdir", ] @@ -2160,6 +2103,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" +[[package]] +name = "sienvy" +version = "0.8.0" +source = "git+ssh://git@git.kundeng.us/phoenix/sienvy.git?tag=v0.8.0-main-d06c8fdf49-006#d06c8fdf49920cf4d8ba0487c20f5bdc851c36de" +dependencies = [ + "const_format", + "dotenvy", +] + [[package]] name = "signal-hook-registry" version = "1.4.8" @@ -2182,9 +2134,34 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" + +[[package]] +name = "simeta" +version = "0.6.1" +source = "git+ssh://git@git.kundeng.us/phoenix/simeta.git?tag=v0.6.1-main-b690995806-680#b6909958064b1a3a4bffd6cbc0f6e12b95477e68" +dependencies = [ + "imghdr", + "infer", + "lofty", + "rand 0.10.2", +] + +[[package]] +name = "simodels" +version = "0.11.3" +source = "git+ssh://git@git.kundeng.us/phoenix/simodels.git?tag=v0.11.3-main-fe9d101bd0-111#fe9d101bd019f91fe8c99c29721ccb0e6e90c92c" +dependencies = [ + "josekit", + "rand 0.10.2", + "serde", + "serde_json", + "time", + "utoipa", + "uuid", +] [[package]] name = "simple_asn1" @@ -2213,11 +2190,42 @@ dependencies = [ "serde", ] +[[package]] +name = "soaricarus_api" +version = "0.5.2" +dependencies = [ + "axum", + "axum-extra", + "common-multipart-rfc7578", + "futures", + "josekit", + "jsonwebtoken", + "mime_guess", + "openssl", + "serde", + "serde_json", + "sienvy", + "simeta", + "simodels", + "sqlx", + "tempfile", + "time", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tracing-subscriber", + "url", + "utoipa", + "utoipa-swagger-ui", + "uuid", +] + [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys", @@ -2225,9 +2233,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" dependencies = [ "lock_api", ] @@ -2447,9 +2455,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -2528,9 +2536,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] @@ -2577,9 +2585,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" dependencies = [ "tinyvec_macros", ] @@ -2592,9 +2600,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.3" +version = "1.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "d988bcd52dbe076d3d46903332f58c912b87a2c49b1428419a5845154762ffee" dependencies = [ "bytes", "libc", @@ -2609,9 +2617,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "6328af13490e73a9b4694030fafd93f8c8c6a9dede33e821c3fc63eddf8042ba" dependencies = [ "proc-macro2", "quote", @@ -2857,9 +2865,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.4" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -3007,18 +3015,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.53" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1" +checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.53" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71" +checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5" dependencies = [ "proc-macro2", "quote", @@ -3115,15 +3123,15 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5431d5661c32445236631278f27946e444ddafe4684cac70b185272d4f9c52d5" +checksum = "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5" [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zopfli" diff --git a/Cargo.toml b/Cargo.toml index a89619d..abba574 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,10 @@ [package] -name = "icarus" +name = "soaricarus_api" version = "0.5.2" edition = "2024" rust-version = "1.95" +license = "MIT" +description = "Core API for interacting with soaricarus" [dependencies] axum = { version = "0.8.9", features = ["multipart"] } @@ -17,16 +19,16 @@ tower-http = { version = "0.7.0", features = ["cors", "timeout"] } tracing-subscriber = "0.3.23" futures = { version = "0.3.32" } mime_guess = { version = "2.0.5" } -uuid = { version = "1.23.4", features = ["v4", "serde"] } +uuid = { version = "1.23.5", features = ["v4", "serde"] } sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] } time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] } jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.6.1" } -icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.3" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" } +simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.1-main-b690995806-680" } +simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" } +sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" } [dev-dependencies] common-multipart-rfc7578 = { version = "0.7.0" } diff --git a/Dockerfile b/Dockerfile index 60baf2b..11cfe6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# Stage 1: Build the application -FROM rust:1.95 as builder +FROM rust:1.97 as builder # Set the working directory inside the container WORKDIR /usr/src/app @@ -17,34 +16,24 @@ RUN mkdir -p -m 0700 ~/.ssh && \ echo " User git" >> ~/.ssh/config && \ chmod 600 ~/.ssh/config -# << --- ADD HOST KEY HERE --- >> RUN ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts # Copy Cargo manifests COPY Cargo.toml Cargo.lock ./ -# Build *only* dependencies to leverage Docker cache -# This dummy build caches dependencies as a separate layer RUN --mount=type=ssh mkdir src && \ echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ cargo build --release --quiet && \ - rm -rf src target/release/deps/icarus* # Clean up dummy build artifacts (replace icarus) + rm -rf src target/release/deps/soaricarus_api* # Copy the actual source code COPY src ./src -# If you have other directories like `templates` or `static`, copy them too COPY .env ./.env COPY migrations ./migrations -# << --- SSH MOUNT ADDED HERE --- >> -# Build *only* dependencies to leverage Docker cache -# This dummy build caches dependencies as a separate layer -# Mount the SSH agent socket for this command RUN --mount=type=ssh \ cargo build --release --quiet -# Stage 2: Create the final, smaller runtime image -# Use a minimal base image like debian-slim or even distroless for security/size FROM debian:trixie-slim # Install runtime dependencies if needed (e.g., SSL certificates) @@ -53,18 +42,11 @@ RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && r # Set the working directory WORKDIR /usr/local/bin -# Copy the compiled binary from the builder stage -# Replace 'icarus' with the actual name of your binary (usually the crate name) -COPY --from=builder /usr/src/app/target/release/icarus . +COPY --from=builder /usr/src/app/target/release/soaricarus_api . -# Copy other necessary files like .env (if used for runtime config) or static assets -# It's generally better to configure via environment variables in Docker though COPY --from=builder /usr/src/app/.env . COPY --from=builder /usr/src/app/migrations ./migrations -# Expose the port your Axum app listens on (e.g., 3000 or 8000) EXPOSE 8000 -# Set the command to run your application -# Ensure this matches the binary name copied above -CMD ["./icarus"] +CMD ["./soaricarus_api"] diff --git a/README.md b/README.md index d863bee..797cb43 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# Icarus -Web API for the Icarus project. +# soaricarus_api +Core web API for the soaricarus project. ### Requires -`icarus_auth` v0.8.x +`soaricarus_auth` v0.8.x `songparser` v0.6.x ### Compatible with -`icarus-dm` v0.9.x +`sidm` v0.10.x ## Getting Started -Quickest way to get started is with docker. Make sure `icarus_auth` and `songparser` repositories +Quickest way to get started is with docker. Make sure `soaricarus_auth` and `songparser` repositories are located in the root of the parent directory. Check the respective repositories to ensure they -are setup correctly before configuring `Icarus`. +are setup correctly before configuring `soaricarus_api`. Copy the `.env.docker.sample` file to `.env`. Ensure that the `ROOT_DIRECTORY` variable is populated and exists on the docker image's filesystem. The credentials for the database doesn't need to be diff --git a/docker-compose.yaml b/docker-compose.yaml index 3920674..bb2612c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,7 +6,7 @@ services: build: context: . ssh: ["default"] - container_name: icarus + container_name: soaricarus ports: - "8000:8000" env_file: @@ -15,13 +15,13 @@ services: main_db: condition: service_healthy networks: - - icarus-network + - soaricarus-network restart: unless-stopped # --- Web API auth --- auth_api: build: - context: ../icarus_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile) + context: ../soaricarus_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile) ssh: ["default"] dockerfile: Dockerfile # Optional: Specify if your Dockerfile has a non-standard name container_name: auth_api @@ -29,12 +29,12 @@ services: ports: - "8001:8001" env_file: - - ../icarus_auth/.env + - ../soaricarus_auth/.env depends_on: auth_db: condition: service_healthy networks: - - icarus-network + - soaricarus-network # Optional: Mount local code for development (live reload) # volumes: # - ./path/to/your/web-api-repo:/app @@ -55,18 +55,18 @@ services: - auth_api - auth_db networks: - - icarus-network + - soaricarus-network # PostgreSQL Database Service main_db: image: postgres:18.4-alpine - container_name: icarus_db + container_name: soaricarus_db environment: # These MUST match the user, password, and database name in the DATABASE_URL above - POSTGRES_USER: ${POSTGRES_MAIN_USER:-icarus} + POSTGRES_USER: ${POSTGRES_MAIN_USER:-soaricarus} POSTGRES_PASSWORD: ${POSTGRES_MAIN_PASSWORD:-password} - POSTGRES_DB: ${POSTGRES_MAIN_DB:-icarus_db} + POSTGRES_DB: ${POSTGRES_MAIN_DB:-soaricarus_db} volumes: # Persist database data using a named volume - postgres_data:/var/lib/postgresql @@ -81,17 +81,17 @@ services: start_period: 10s restart: always networks: - - icarus-network + - soaricarus-network - # --- icarus web auth api db --- + # --- soaricarus web auth api db --- auth_db: image: postgres:18.4-alpine - container_name: icarus_auth_db + container_name: soaricarus_auth_db environment: # These MUST match the user, password, and database name in the DATABASE_URL above - POSTGRES_USER: ${POSTGRES_AUTH_USER:-icarus_op} + POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op} POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password} - POSTGRES_DB: ${POSTGRES_AUTH_DB:-icarus_auth_db} + POSTGRES_DB: ${POSTGRES_AUTH_DB:-soaricarus_auth_db} volumes: # Persist database data using a named volume - postgres_data_auth:/var/lib/postgresql @@ -106,7 +106,7 @@ services: start_period: 10s restart: always networks: - - icarus-network + - soaricarus-network volumes: postgres_data: @@ -115,5 +115,5 @@ volumes: driver: local # Use the default local driver networks: - icarus-network: + soaricarus-network: driver: bridge diff --git a/src/auth/mod.rs b/src/auth/mod.rs index 3839ec7..6a54bec 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -36,11 +36,11 @@ pub async fn auth( (StatusCode::UNAUTHORIZED, Json(json_error)) })?; - let secret_key = icarus_envy::environment::get_secret_main_key().value; + let secret_key = sienvy::environment::get_secret_main_key().value; let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256); - validation.set_audience(&["icarus"]); // Must match exactly what's in the token - let _claims = decode::( + validation.set_audience(&["soaricarus"]); + let _claims = decode::( &token, &DecodingKey::from_secret(secret_key.as_ref()), &validation, diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 5b2835d..2b66f08 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -20,7 +20,7 @@ pub mod response { #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } @@ -28,7 +28,7 @@ pub mod response { #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } } @@ -68,21 +68,21 @@ pub mod endpoint { let song_id = payload.song_id; match crate::repo::song::get_song(&pool, &song_id).await { Ok(song) => { - let directory = icarus_envy::environment::get_root_directory().value; + let directory = sienvy::environment::get_root_directory().value; let file_type = - icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); + simeta::detection::coverart::file_type_from_data(&data).unwrap(); let coverart_type = if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { - icarus_models::types::CoverArtType::JpegExtension + simodels::types::CoverArtType::JpegExtension } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE + == simeta::detection::coverart::constants::JPG_TYPE { - icarus_models::types::CoverArtType::JpgExtension + simodels::types::CoverArtType::JpgExtension } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE + == simeta::detection::coverart::constants::PNG_TYPE { - icarus_models::types::CoverArtType::PngExtension + simodels::types::CoverArtType::PngExtension } else { response.message = String::from("Invalid CoverArt type"); return ( @@ -91,13 +91,11 @@ pub mod endpoint { ); }; let filename = - icarus_models::coverart::generate_filename(coverart_type, true) - .unwrap(); + simodels::coverart::generate_filename(coverart_type, true).unwrap(); - let mut coverart = - icarus_models::coverart::init::init_coverart_dir_and_filename( - &directory, &filename, - ); + let mut coverart = simodels::coverart::init::init_coverart_dir_and_filename( + &directory, &filename, + ); coverart.title = song.album.clone(); coverart.file_type = file_type.file_type; coverart.data = data; @@ -200,23 +198,23 @@ pub mod endpoint { axum::extract::Path(id): axum::extract::Path, ) -> (axum::http::StatusCode, axum::response::Response) { match repo::coverart::get_coverart(&pool, &id).await { - Ok(coverart) => match icarus_models::coverart::io::to_data(&coverart) { + Ok(coverart) => match simodels::coverart::io::to_data(&coverart) { Ok(data) => { let (file_type, img_type) = - match icarus_meta::detection::coverart::file_type_from_data(&data) { + match simeta::detection::coverart::file_type_from_data(&data) { Ok(file_type) => { if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { - (file_type, icarus_models::types::CoverArtType::JpegExtension) + (file_type, simodels::types::CoverArtType::JpegExtension) } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE + == simeta::detection::coverart::constants::JPG_TYPE { - (file_type, icarus_models::types::CoverArtType::JpgExtension) + (file_type, simodels::types::CoverArtType::JpgExtension) } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE + == simeta::detection::coverart::constants::PNG_TYPE { - (file_type, icarus_models::types::CoverArtType::PngExtension) + (file_type, simodels::types::CoverArtType::PngExtension) } else { return ( axum::http::StatusCode::INTERNAL_SERVER_ERROR, @@ -235,8 +233,7 @@ pub mod endpoint { let bytes = axum::body::Bytes::from(data); let mut response = bytes.into_response(); let headers = response.headers_mut(); - let filename = - icarus_models::coverart::generate_filename(img_type, true).unwrap(); + let filename = simodels::coverart::generate_filename(img_type, true).unwrap(); headers.insert( axum::http::header::CONTENT_TYPE, file_type.mime.parse().unwrap(), diff --git a/src/callers/queue/coverart.rs b/src/callers/queue/coverart.rs index f333a94..46612b2 100644 --- a/src/callers/queue/coverart.rs +++ b/src/callers/queue/coverart.rs @@ -102,9 +102,9 @@ pub mod response { mod helper { pub fn is_coverart_file_type_valid(file_type: &String) -> bool { let valid_file_types = vec![ - String::from(icarus_meta::detection::coverart::constants::JPEG_TYPE), - String::from(icarus_meta::detection::coverart::constants::JPG_TYPE), - String::from(icarus_meta::detection::coverart::constants::PNG_TYPE), + String::from(simeta::detection::coverart::constants::JPEG_TYPE), + String::from(simeta::detection::coverart::constants::JPG_TYPE), + String::from(simeta::detection::coverart::constants::PNG_TYPE), ]; for valid_file_type in valid_file_types { @@ -150,18 +150,17 @@ pub mod endpoint { let content_type = field.content_type().unwrap().to_string(); let data = field.bytes().await.unwrap(); let raw_data = data.to_vec(); - let file_type = - match icarus_meta::detection::coverart::file_type_from_data(&raw_data) { - Ok(file_type) => file_type, - Err(err) => { - eprintln!("Error: {err:?}"); - response.message = err.to_string(); - return ( - axum::http::StatusCode::INTERNAL_SERVER_ERROR, - axum::Json(response), - ); - } - }; + let file_type = match simeta::detection::coverart::file_type_from_data(&raw_data) { + Ok(file_type) => file_type, + Err(err) => { + eprintln!("Error: {err:?}"); + response.message = err.to_string(); + return ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ); + } + }; if !super::helper::is_coverart_file_type_valid(&file_type.file_type) { response.message = format!("CoverArt file type not supported: {file_type:?}"); @@ -318,8 +317,7 @@ pub mod endpoint { ) -> (axum::http::StatusCode, axum::response::Response) { match repo::coverart::get_coverart_queue_data_with_id(&pool, &id).await { Ok(data) => { - let file_type = - icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); + let file_type = simeta::detection::coverart::file_type_from_data(&data).unwrap(); let bytes = axum::body::Bytes::from(data); let mut response = bytes.into_response(); let headers = response.headers_mut(); @@ -329,25 +327,20 @@ pub mod endpoint { ); let coverart_type = if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { - icarus_models::types::CoverArtType::JpegExtension - } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE - { - icarus_models::types::CoverArtType::JpgExtension - } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE - { - icarus_models::types::CoverArtType::PngExtension + simodels::types::CoverArtType::JpegExtension + } else if file_type.file_type == simeta::detection::coverart::constants::JPG_TYPE { + simodels::types::CoverArtType::JpgExtension + } else if file_type.file_type == simeta::detection::coverart::constants::PNG_TYPE { + simodels::types::CoverArtType::PngExtension } else { return ( axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::response::Response::default(), ); }; - let filename = - icarus_models::coverart::generate_filename(coverart_type, true).unwrap(); + let filename = simodels::coverart::generate_filename(coverart_type, true).unwrap(); headers.insert( axum::http::header::CONTENT_DISPOSITION, format!("attachment; filename=\"{filename}\"") diff --git a/src/callers/queue/song.rs b/src/callers/queue/song.rs index d82feb8..5ec55b3 100644 --- a/src/callers/queue/song.rs +++ b/src/callers/queue/song.rs @@ -97,9 +97,9 @@ pub mod response { } pub async fn is_song_valid(data: &[u8]) -> Result { - match icarus_meta::detection::song::file_type_from_data(data) { + match simeta::detection::song::file_type_from_data(data) { Ok(file_type) => { - if file_type.file_type == icarus_meta::detection::song::constants::FLAC_TYPE { + if file_type.file_type == simeta::detection::song::constants::FLAC_TYPE { Ok(true) } else { Ok(false) diff --git a/src/callers/song.rs b/src/callers/song.rs index d817aff..1a2171c 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -36,8 +36,8 @@ pub mod request { || !self.song_queue_id.is_nil() } - pub fn to_song(&self) -> icarus_models::song::Song { - icarus_models::song::Song { + pub fn to_song(&self) -> simodels::song::Song { + simodels::song::Song { id: uuid::Uuid::nil(), title: self.title.clone(), artist: self.artist.clone(), @@ -71,7 +71,7 @@ pub mod response { #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } @@ -79,15 +79,15 @@ pub mod response { #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } pub mod delete_song { #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct SongAndCoverArt { - pub song: icarus_models::song::Song, - pub coverart: icarus_models::coverart::CoverArt, + pub song: simodels::song::Song, + pub coverart: simodels::coverart::CoverArt, } #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] @@ -134,12 +134,10 @@ pub mod endpoint { if payload.is_valid() { let mut song = payload.to_song(); - song.filename = icarus_models::song::generate_filename( - icarus_models::types::MusicType::FlacExtension, - true, - ) - .unwrap(); - song.directory = icarus_envy::environment::get_root_directory().value; + song.filename = + simodels::song::generate_filename(simodels::types::MusicType::FlacExtension, true) + .unwrap(); + song.directory = sienvy::environment::get_root_directory().value; match repo_queue::song::get_data(&pool, &payload.song_queue_id).await { Ok(data) => { @@ -340,7 +338,7 @@ pub mod endpoint { axum::extract::Path(id): axum::extract::Path, ) -> (axum::http::StatusCode, axum::response::Response) { match repo::song::get_song(&pool, &id).await { - Ok(song) => match icarus_models::song::io::to_data(&song) { + Ok(song) => match simodels::song::io::to_data(&song) { Ok(data) => { let bytes = axum::body::Bytes::from(data); let mut response = bytes.into_response(); diff --git a/src/config/init.rs b/src/config/init.rs index a1b37af..862a669 100644 --- a/src/config/init.rs +++ b/src/config/init.rs @@ -28,20 +28,18 @@ mod cors { axum::http::Method::POST, axum::http::Method::PUT, axum::http::Method::DELETE, - ]) // Specify allowed methods:cite[2] + ]) .allow_headers([ axum::http::header::CONTENT_TYPE, axum::http::header::AUTHORIZATION, - ]) // Specify allowed headers:cite[2] - .allow_credentials(true) // If you need to send cookies or authentication headers:cite[2] + ]) + .allow_credentials(true) .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2] - // Dynamically set the allowed origin based on the environment - match std::env::var(icarus_envy::keys::APP_ENV).as_deref() { + match std::env::var(sienvy::keys::APP_ENV).as_deref() { Ok("production") => { - // In production, allow only your specific, trusted origins - let allowed_origins_env = icarus_envy::environment::get_allowed_origins(); - match icarus_envy::utility::delimitize(&allowed_origins_env) { + let allowed_origins_env = sienvy::environment::get_allowed_origins(); + match sienvy::utility::delimitize(&allowed_origins_env) { Ok(alwd) => { let allowed_origins: Vec = alwd .into_iter() @@ -55,17 +53,14 @@ mod cors { } } } - _ => { - // Development (default): Allow localhost origins - cors.allow_origin(vec![ - "http://localhost:8000".parse().unwrap(), - "http://127.0.0.1:8000".parse().unwrap(), - "http://localhost:8001".parse().unwrap(), - "http://127.0.0.1:8001".parse().unwrap(), - "http://localhost:4200".parse().unwrap(), - "http://127.0.0.1:4200".parse().unwrap(), - ]) - } + _ => cors.allow_origin(vec![ + "http://localhost:8000".parse().unwrap(), + "http://127.0.0.1:8000".parse().unwrap(), + "http://localhost:8001".parse().unwrap(), + "http://127.0.0.1:8001".parse().unwrap(), + "http://localhost:4200".parse().unwrap(), + "http://127.0.0.1:4200".parse().unwrap(), + ]), } } } @@ -86,7 +81,7 @@ mod cors { coverart_queue_responses::wipe_data_from_coverart_queue::Response, coverart_responses::get_coverart::Response, metadata_queue_responses::queue_metadata::Response, metadata_queue_responses::fetch_metadata::Response)), tags( - (name = "Icarus API", description = "Web API to manage music") + (name = "soaricarus API", description = "Web API to manage music") ) )] struct ApiDoc; diff --git a/src/db/mod.rs b/src/db/mod.rs index 2983446..5b1096d 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -5,7 +5,7 @@ pub mod connection_settings { } pub async fn create_pool() -> Result { - let database_url = icarus_envy::environment::get_db_url().value; + let database_url = sienvy::environment::get_db_url().value; println!("Database url: {database_url}"); PgPoolOptions::new() diff --git a/src/main.rs b/src/main.rs index 8ecd1cb..af7f0a4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,7 @@ mod tests { pub const LIMIT: usize = 6; pub async fn get_pool() -> Result { - let tm_db_url = icarus_envy::environment::get_db_url().value; + let tm_db_url = sienvy::environment::get_db_url().value; let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); sqlx::PgPool::connect_with(tm_options).await } @@ -51,7 +51,7 @@ mod tests { } pub async fn connect_to_db(db_name: &str) -> Result { - let db_url = icarus_envy::environment::get_db_url().value; + let db_url = sienvy::environment::get_db_url().value; let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -83,7 +83,7 @@ mod tests { } pub async fn get_database_name() -> Result> { - let database_url = icarus_envy::environment::get_db_url().value; + let database_url = sienvy::environment::get_db_url().value; let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -149,25 +149,25 @@ mod tests { pub fn token_fields() -> (String, String, String) { ( String::from("What a twist!"), - String::from("icarus_test"), - String::from("icarus"), + String::from("soaricarus_test"), + String::from("soaricarus"), ) } pub const TEST_USER_ID: uuid::Uuid = uuid::uuid!("cc938368-615a-4694-b2ca-6e122fa31c52"); pub async fn test_token() -> Result { - let key: String = icarus_envy::environment::get_secret_main_key().value; + let key: String = sienvy::environment::get_secret_main_key().value; let (message, issuer, audience) = token_fields(); - let token_resource = icarus_models::token::TokenResource { + let token_resource = simodels::token::TokenResource { message: message, issuer: issuer, audiences: vec![audience], id: TEST_USER_ID, }; - match icarus_models::token::create_token(&key, &token_resource, time::Duration::hours(1)) { + match simodels::token::create_token(&key, &token_resource, time::Duration::hours(1)) { Ok((access_token, _some_time)) => Ok(access_token), Err(err) => Err(err), } @@ -289,7 +289,7 @@ mod tests { .uri(uri) .header( axum::http::header::CONTENT_TYPE, - icarus_meta::detection::song::constants::mime::FLAC, + simeta::detection::song::constants::mime::FLAC, ) .header( axum::http::header::AUTHORIZATION, @@ -306,7 +306,7 @@ mod tests { ) -> Result { let mut form = MultipartForm::default(); let _ = form.add_file( - icarus_meta::detection::coverart::constants::JPEG_TYPE, + simeta::detection::coverart::constants::JPEG_TYPE, "tests/I/Coverart-1.jpg", ); @@ -913,10 +913,10 @@ mod tests { let temp_file = tempfile::tempdir().expect("Could not create test directory"); let test_dir = String::from(temp_file.path().to_str().unwrap()); - let song = icarus_models::song::Song { + let song = simodels::song::Song { directory: test_dir, - filename: icarus_models::song::generate_filename( - icarus_models::types::MusicType::FlacExtension, + filename: simodels::song::generate_filename( + simodels::types::MusicType::FlacExtension, true, ) .unwrap(), @@ -2219,20 +2219,20 @@ mod tests { coverart_directory: &String, coverart_filename: &String, ) -> Result<(Vec, Vec), std::io::Error> { - let song = icarus_models::song::Song { + let song = simodels::song::Song { directory: song_directory.clone(), filename: song_filename.clone(), ..Default::default() }; - let coverart = icarus_models::coverart::CoverArt { + let coverart = simodels::coverart::CoverArt { directory: coverart_directory.clone(), filename: coverart_filename.clone(), ..Default::default() }; - match icarus_models::song::io::to_data(&song) { - Ok(song_data) => match icarus_models::coverart::io::to_data(&coverart) { + match simodels::song::io::to_data(&song) { + Ok(song_data) => match simodels::coverart::io::to_data(&coverart) { Ok(coverart_data) => Ok((song_data, coverart_data)), Err(err) => Err(err), }, @@ -2248,14 +2248,14 @@ mod tests { coverart_filename: &String, coverart_data: Vec, ) -> Result<(), std::io::Error> { - let song = icarus_models::song::Song { + let song = simodels::song::Song { directory: song_directory.clone(), filename: song_filename.clone(), data: song_data, ..Default::default() }; - let coverart = icarus_models::coverart::CoverArt { + let coverart = simodels::coverart::CoverArt { directory: coverart_directory.clone(), filename: coverart_filename.clone(), data: coverart_data, diff --git a/src/repo/coverart.rs b/src/repo/coverart.rs index bc6dfd7..09e7b6f 100644 --- a/src/repo/coverart.rs +++ b/src/repo/coverart.rs @@ -2,7 +2,7 @@ use sqlx::Row; pub async fn create( pool: &sqlx::PgPool, - coverart: &icarus_models::coverart::CoverArt, + coverart: &simodels::coverart::CoverArt, song_id: &uuid::Uuid, ) -> Result { let result = sqlx::query( @@ -36,7 +36,7 @@ pub async fn create( pub async fn get_coverart( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { let result = sqlx::query( r#" SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1; @@ -50,7 +50,7 @@ pub async fn get_coverart( }); match result { - Ok(row) => Ok(icarus_models::coverart::CoverArt { + Ok(row) => Ok(simodels::coverart::CoverArt { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound) @@ -84,7 +84,7 @@ pub async fn get_coverart( pub async fn get_coverart_with_song_id( pool: &sqlx::PgPool, song_id: &uuid::Uuid, -) -> Result { +) -> Result { let result = sqlx::query( r#" SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE song_id = $1; @@ -98,7 +98,7 @@ pub async fn get_coverart_with_song_id( }); match result { - Ok(row) => Ok(icarus_models::coverart::CoverArt { + Ok(row) => Ok(simodels::coverart::CoverArt { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound) @@ -132,7 +132,7 @@ pub async fn get_coverart_with_song_id( pub async fn delete_coverart( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { let result = sqlx::query( r#" DELETE FROM "coverart" @@ -148,7 +148,7 @@ pub async fn delete_coverart( }); match result { - Ok(row) => Ok(icarus_models::coverart::CoverArt { + Ok(row) => Ok(simodels::coverart::CoverArt { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound) diff --git a/src/repo/song.rs b/src/repo/song.rs index 77d9561..fa70fd5 100644 --- a/src/repo/song.rs +++ b/src/repo/song.rs @@ -2,7 +2,7 @@ use sqlx::Row; pub async fn insert( pool: &sqlx::PgPool, - song: &icarus_models::song::Song, + song: &simodels::song::Song, ) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> { let result = sqlx::query( r#" @@ -52,7 +52,7 @@ pub async fn insert( pub async fn get_song( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { let result = sqlx::query( r#" SELECT * FROM "song" WHERE id = $1 @@ -72,7 +72,7 @@ pub async fn get_song( .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(); - Ok(icarus_models::song::Song { + Ok(simodels::song::Song { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound) @@ -145,9 +145,7 @@ pub async fn get_song( } } -pub async fn get_all_songs( - pool: &sqlx::PgPool, -) -> Result, sqlx::Error> { +pub async fn get_all_songs(pool: &sqlx::PgPool) -> Result, sqlx::Error> { let result = sqlx::query( r#" SELECT * FROM "song"; @@ -161,7 +159,7 @@ pub async fn get_all_songs( match result { Ok(rows) => { - let mut songs: Vec = Vec::new(); + let mut songs: Vec = Vec::new(); for row in rows { let date_created_time: time::OffsetDateTime = row @@ -169,7 +167,7 @@ pub async fn get_all_songs( .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(); - let song = icarus_models::song::Song { + let song = simodels::song::Song { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound) @@ -250,9 +248,9 @@ pub async fn get_all_songs( pub async fn delete_song( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { let result = sqlx::query( - // icarus_models::song::Song, + // simodels::song::Song, r#" DELETE FROM "song" WHERE id = $1 @@ -273,7 +271,7 @@ pub async fn delete_song( .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(); - Ok(icarus_models::song::Song { + Ok(simodels::song::Song { id: row .try_get("id") .map_err(|_e| sqlx::Error::RowNotFound)