Update cleanup cron to remove blobs without owners if enabled

Author: hzrd149

.changeset/nasty-dragons-search.md

@@ -0,0 +1,5 @@
+---
+"blossom-server-ts": minor
+---
+
+Update cleanup cron to remove blobs without owners if enabled

.changeset/strange-bananas-exist.md

@@ -0,0 +1,5 @@
+---
+"blossom-server-ts": patch
+---
+
+Throw 404 when blob is not found on DELETE /<sha256>

.github/workflows/publish-next.yml

@@ -0,0 +1,39 @@
+name: Release next
+
+on:
+  push:
+    branches:
+      - master
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Release next
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Build package
+        run: pnpm build
+
+      - name: Publish next version
+        run: |
+          pnpm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN && \
+          pnpm changeset version --snapshot next && \
+          pnpm changeset publish --tag next
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

src/api/delete.ts

@@ -18,7 +18,7 @@ router.delete<CommonState>("/:hash", async (ctx, next) => {
   if (hasUsedToken(ctx.state.auth.id)) throw new Error("Auth already used");
 
   // skip if blob dose not exist
-  if (!blobDB.hasBlob(sha256)) return;
+  if (!blobDB.hasBlob(sha256)) throw new HttpErrors.NotFound("Blob does not exist");
 
   const pubkey = ctx.state.auth.pubkey;
 

src/storage/index.ts

@@ -10,6 +10,7 @@ import logger from "../logger.js";
 import { getExpirationTime } from "../rules/index.js";
 import { forgetBlobAccessed, updateBlobAccess } from "../db/methods.js";
 import { readUpload, removeUpload, UploadDetails } from "./upload.js";
+import { mapParams } from "../admin-api/helpers.js";
 
 async function createStorage() {
   if (config.storage.backend === "local") {
@@ -82,6 +83,7 @@ export async function pruneStorage() {
   const now = dayjs().unix();
   const checked = new Set<string>();
 
+  /** Remove all blobs that no longer fall under any rules */
   for (const rule of config.storage.rules) {
     const expiration = getExpirationTime(rule, now);
     let blobs: (BlobMetadata & { pubkey: string; accessed: number | null })[] = [];
@@ -137,6 +139,25 @@ export async function pruneStorage() {
     }
     if (n > 0) log("Checked", n, "blobs for rule #" + config.storage.rules.indexOf(rule));
   }
+
+  // remove blobs with no owners
+  if (config.storage.removeWhenNoOwners) {
+    const blobs = db
+      .prepare<[], { sha256: string }>(
+        `
+      SELECT blobs.sha256
+      FROM blobs
+        LEFT JOIN owners ON owners.blob = sha256
+      WHERE owners.blob is NULL
+    `,
+      )
+      .all();
+
+    if (blobs.length > 0) {
+      log(`Removing ${blobs.length} because they have no owners`);
+      db.prepare<string[]>(`DELETE FROM blobs WHERE sha256 IN ${mapParams(blobs)}`).run(...blobs.map((b) => b.sha256));
+    }
+  }
 }
 
 export default storage;