index: squash several more bugs (#19)

- remove freighter readme from toml so that more tools work
- don't return duplicate versions from the list_all endpoint
- fix error in test config.toml
- fix broken search sorting
- ensure people cant yank or attempt to pull crates that aren't actually
in the registry

Author: Noah-Kennedy

.cargo/config.toml

@@ -1,2 +1,2 @@
 [registries]
-freighter = { index = "sparse+https://127.0.0.1:3000/index/" }
+freighter = { index = "sparse+http://127.0.0.1:3000/index/" }

freighter-index/sql/confirm-existence.sql

@@ -3,3 +3,4 @@ from crates
          join crate_versions cv on crates.id = cv.crate
 where crates.name = $1
   and cv.version = $2
+  and crates.registry = ''

freighter-index/sql/list.sql

@@ -5,7 +5,7 @@ select c.name,
        c.repository,
        c.created_at,
        c.updated_at,
-       array_agg(cv.version)                                              as versions,
+       array_agg(distinct cv.version)                                     as versions,
        array_agg(distinct cat.name) filter ( where cat.name is not null ) as categories,
        array_agg(distinct k.name) filter ( where k.name is not null )     as keywords
 from crates c

freighter-index/sql/search.sql

@@ -1,7 +1,7 @@
 select crates.name,
        crates.description,
-       array_agg(cv.version) as versions,
-       count(dependency)
+       array_agg(distinct cv.version) as versions,
+       count(distinct concat(d.dependent, crates.id))
 from crates
          join crate_versions cv on crates.id = cv.crate
          left join dependencies d on crates.id = d.dependency

freighter-index/sql/set-yank.sql

@@ -2,6 +2,7 @@ update crate_versions cv
 set yanked = $3
 from crates c
 where c.name = $1
+  and c.registry = ''
   and cv.crate = c.id
   and cv.version = $2
 returning c.name, cv.version, cv.yanked;

freighter-index/src/postgres_client.rs

@@ -11,6 +11,7 @@ use futures_util::StreamExt;
 use metrics::histogram;
 use postgres_types::ToSql;
 use semver::{Version, VersionReq};
+use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
@@ -219,7 +220,15 @@ impl IndexProvider for PgIndexProvider {
 
         // we can't scale the DB as easily as we can this server, so let's sort in here
         // warning: may be expensive!
-        rows.sort_unstable_by_key(|r| (r.get::<_, i64>("count"), r.get::<_, String>("name")));
+        //
+        // sort first by version in descending order, then by name alphabetically
+        rows.sort_unstable_by(|a, b| {
+            match a.get::<_, i64>("count").cmp(&b.get::<_, i64>("count")) {
+                Ordering::Less => Ordering::Greater,
+                Ordering::Equal => a.get::<_, String>("name").cmp(&b.get::<_, String>("name")),
+                Ordering::Greater => Ordering::Less,
+            }
+        });
 
         let total = rows.len();
 

freighter/Cargo.toml

@@ -9,7 +9,6 @@ repository = "https://github.com/cloudflare/freighter"
 description = "Crate index traits and implementations for the freighter registry"
 categories = ["asynchronous", "authentication"]
 keywords = ["registries", "freighter"]
-readme = "../README.md"
 
 [dependencies]
 freighter-auth = { workspace = true, features = ["pg-backend"] }