Revert "refactor: move assetdb to shared-server"

This reverts commit a04d3c35fc9082e529a713605a038d236bb072c7.

2 files changed, 13 insertions, 29 deletions

diff --git a/packages/shared-server/package.json b/packages/shared-server/package.json
index 0afc2bf2..357248b4 100644
--- a/packages/shared-server/package.json
+++ b/packages/shared-server/package.json
@@ -5,7 +5,6 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.842.0",
     "@karakeep/db": "workspace:^0.1.0",
     "@karakeep/plugins": "workspace:^0.1.0",
     "@karakeep/shared": "workspace:^0.1.0",
@@ -14,9 +13,7 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/sdk-trace-node": "^2.2.0",
-    "@opentelemetry/semantic-conventions": "^1.38.0",
-    "glob": "^11.0.0",
-    "zod": "^3.24.2"
+    "@opentelemetry/semantic-conventions": "^1.38.0"
   },
   "devDependencies": {
     "@karakeep/prettier-config": "workspace:^0.1.0",
@@ -32,8 +29,7 @@
   },
   "main": "index.ts",
   "exports": {
-    ".": "./index.ts",
-    "./assetdb": "./assetdb.ts"
+    ".": "./index.ts"
   },
   "prettier": "@karakeep/prettier-config"
 }
diff --git a/packages/shared-server/assetdb.ts b/packages/shared/assetdb.ts
index bb6bb75e..2e22faf7 100644
--- a/packages/shared-server/assetdb.ts
+++ b/packages/shared/assetdb.ts
@@ -11,12 +11,12 @@ import {
   PutObjectCommand,
   S3Client,
 } from "@aws-sdk/client-s3";
-import glob from "glob";
+import { Glob } from "glob";
 import { z } from "zod";
 
-import serverConfig from "@karakeep/shared/config";
-import logger from "@karakeep/shared/logger";
-import { QuotaApproved } from "@karakeep/shared/storageQuota";
+import serverConfig from "./config";
+import logger from "./logger";
+import { QuotaApproved } from "./storageQuota";
 
 const ROOT_PATH = serverConfig.assetsDir;
 
@@ -283,30 +283,18 @@ class LocalFileSystemAssetStore implements AssetStore {
   }
 
   async *getAllAssets() {
-    const files = await new Promise<string[]>((resolve, reject) => {
-      glob(
-        "*/*/asset.bin",
-        {
-          cwd: this.rootPath,
-          nodir: true,
-        },
-        (err, matches) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-          resolve(matches);
-        },
-      );
+    const g = new Glob(`/**/**/asset.bin`, {
+      maxDepth: 3,
+      root: this.rootPath,
+      cwd: this.rootPath,
+      absolute: false,
     });
-
-    for (const file of files) {
+    for await (const file of g) {
       const [userId, assetId] = file.split("/").slice(0, 2);
       const [size, metadata] = await Promise.all([
         this.getAssetSize({ userId, assetId }),
         this.readAssetMetadata({ userId, assetId }),
       ]);
-
       yield {
         userId,
         assetId,
@@ -617,7 +605,7 @@ export { LocalFileSystemAssetStore, S3AssetStore };
  * Example usage of S3AssetStore:
  *
  * import { S3Client } from "@aws-sdk/client-s3";
- * import { S3AssetStore } from "@karakeep/shared-server/assetdb";
+ * import { S3AssetStore } from "@karakeep/shared/assetdb";
  *
  * const s3Client = new S3Client({
  *   region: "us-east-1",