nuxt-filer 0.0.13 → 0.0.15

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-filer",
   "configKey": "filer",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/server/providers/s3.js

@@ -1,11 +1,25 @@
 import { randomUUID } from "node:crypto";
+async function mapWithConcurrency(items, limit, fn) {
+  const results = new Array(items.length);
+  let next = 0;
+  const worker = async () => {
+    while (next < items.length) {
+      const index = next++;
+      results[index] = await fn(items[index], index);
+    }
+  };
+  const workers = Array.from({ length: Math.min(limit, items.length) || 1 }, worker);
+  await Promise.all(workers);
+  return results;
+}
 export function createS3Provider(options) {
   const prefix = options.prefix ? options.prefix.replace(/\/+$/, "") + "/" : "";
   let clientPromise;
   const getClient = () => clientPromise ??= options.client ? Promise.resolve(options.client) : createAwsS3Client(options);
-  const dataKey = (groupId, id) => `${prefix}${groupId}/data/${id}`;
-  const metaKey = (groupId, id) => `${prefix}${groupId}/meta/${id}`;
-  const metaPrefix = (groupId) => `${prefix}${groupId}/meta/`;
+  const seg = (value) => value.replace(/^\/+|\/+$/g, "");
+  const dataKey = (groupId, id) => `${prefix}${seg(groupId)}/data/${seg(id)}`;
+  const metaKey = (groupId, id) => `${prefix}${seg(groupId)}/meta/${seg(id)}`;
+  const metaPrefix = (groupId) => `${prefix}${seg(groupId)}/meta/`;
   const groupIdFromMetaKey = (key) => {
     const rel = key.slice(prefix.length);
     return rel.slice(0, rel.lastIndexOf("/meta/"));
@@ -66,11 +80,14 @@ export function createS3Provider(options) {
     },
     async list(groupId) {
       const client = await getClient();
+      const keys = [];
+      for await (const key of client.listKeys(metaPrefix(groupId))) keys.push(key);
+      const metas = await mapWithConcurrency(keys, 32, (key) => readMeta(client, key));
       const files = [];
-      for await (const key of client.listKeys(metaPrefix(groupId))) {
-        const meta = await readMeta(client, key);
+      for (let i = 0; i < keys.length; i++) {
+        const meta = metas[i];
         if (!meta) continue;
-        files.push(toStoredFile(idFromKey(key), groupId, meta));
+        files.push(toStoredFile(idFromKey(keys[i]), groupId, meta));
       }
       return files;
     },
@@ -99,7 +116,7 @@ export function createS3Provider(options) {
     },
     async clear(groupId) {
       const client = await getClient();
-      for await (const key of client.listKeys(`${prefix}${groupId}/`)) {
+      for await (const key of client.listKeys(`${prefix}${seg(groupId)}/`)) {
         await client.delete(key);
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-filer",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "File storage module for Nuxt",
   "repository": {
     "type": "git",

package/src/runtime/server/providers/s3.ts

@@ -38,6 +38,31 @@ export interface S3ProviderOptions {
 
 type InternalMeta = FileMeta & { _createdAt?: string; _updatedAt?: string };
 
+/**
+ * Map over `items` with at most `limit` promises in flight, preserving order.
+ * Used to read many meta objects concurrently instead of one-at-a-time — on a
+ * remote store (R2/S3) the per-object round-trip latency dominates, so a
+ * sequential `for await` over N files is ~N × RTT. Bounded so a huge group
+ * doesn't open thousands of sockets at once.
+ */
+async function mapWithConcurrency<T, R>(
+  items: T[],
+  limit: number,
+  fn: (item: T, index: number) => Promise<R>,
+): Promise<R[]> {
+  const results = new Array<R>(items.length);
+  let next = 0;
+  const worker = async () => {
+    while (next < items.length) {
+      const index = next++;
+      results[index] = await fn(items[index], index);
+    }
+  };
+  const workers = Array.from({ length: Math.min(limit, items.length) || 1 }, worker);
+  await Promise.all(workers);
+  return results;
+}
+
 /**
  * S3-backed {@link FileStorageProvider}. Binary data and a JSON metadata
  * sidecar are stored as separate objects per file, mirroring the built-in
@@ -56,9 +81,13 @@ export function createS3Provider(options: S3ProviderOptions): FileStorageProvide
       ? Promise.resolve(options.client)
       : createAwsS3Client(options));
 
-  const dataKey = (groupId: string, id: string) => `${prefix}${groupId}/data/${id}`;
-  const metaKey = (groupId: string, id: string) => `${prefix}${groupId}/meta/${id}`;
-  const metaPrefix = (groupId: string) => `${prefix}${groupId}/meta/`;
+  // Strip leading/trailing slashes so callers can pass `studio` or `/studio`
+  // interchangeably (the IPX integration hands group ids through with a leading
+  // slash). Without this, keys like `/studio/data/x` miss the stored object.
+  const seg = (value: string) => value.replace(/^\/+|\/+$/g, '');
+  const dataKey = (groupId: string, id: string) => `${prefix}${seg(groupId)}/data/${seg(id)}`;
+  const metaKey = (groupId: string, id: string) => `${prefix}${seg(groupId)}/meta/${seg(id)}`;
+  const metaPrefix = (groupId: string) => `${prefix}${seg(groupId)}/meta/`;
 
   /** `${prefix}${groupId}/meta/${id}` → groupId (groups may contain '/'). */
   const groupIdFromMetaKey = (key: string) => {
@@ -139,11 +168,17 @@ export function createS3Provider(options: S3ProviderOptions): FileStorageProvide
 
     async list(groupId) {
       const client = await getClient();
+      // Enumerate the group's meta keys (cheap paginated LIST), then read every
+      // meta object in parallel. The previous sequential read was one blocking
+      // GET per file, so listing a group cost ~N round-trips to the store.
+      const keys: string[] = [];
+      for await (const key of client.listKeys(metaPrefix(groupId))) keys.push(key);
+      const metas = await mapWithConcurrency(keys, 32, (key) => readMeta(client, key));
       const files: StoredFile[] = [];
-      for await (const key of client.listKeys(metaPrefix(groupId))) {
-        const meta = await readMeta(client, key);
+      for (let i = 0; i < keys.length; i++) {
+        const meta = metas[i];
         if (!meta) continue;
-        files.push(toStoredFile(idFromKey(key), groupId, meta));
+        files.push(toStoredFile(idFromKey(keys[i]), groupId, meta));
       }
       return files;
     },
@@ -175,7 +210,7 @@ export function createS3Provider(options: S3ProviderOptions): FileStorageProvide
 
     async clear(groupId) {
       const client = await getClient();
-      for await (const key of client.listKeys(`${prefix}${groupId}/`)) {
+      for await (const key of client.listKeys(`${prefix}${seg(groupId)}/`)) {
         await client.delete(key);
       }
     },