code update

Author: cyfung1031

packages/filesystem/googledrive/googledrive.test.ts

@@ -137,7 +137,9 @@ describe("GoogleDriveFileSystem", () => {
 
   it("writer should update expected Google Drive file id with If-Match token", async () => {
     const fs = new GoogleDriveFileSystem("/", "token");
-    const writer = await fs.create("file.txt", { expectedVersion: "file-1:version-7" });
+    const writer = await fs.create("file.txt", {
+      expectedVersion: "file-1:version-7",
+    });
     const findSpy = vi.spyOn(fs, "findFileInDirectory");
     const requestSpy = vi.spyOn(fs, "request").mockResolvedValue({});
 
@@ -163,23 +165,49 @@ describe("GoogleDriveFileSystem", () => {
     });
   });
 
+  it("writer should create createOnly files with a generated Google Drive id", async () => {
+    const fs = new GoogleDriveFileSystem("/", "token");
+    const writer = await fs.create("file.txt", { createOnly: true });
+    vi.spyOn(fs, "findFileInDirectory").mockResolvedValue(null);
+    vi.spyOn(fs, "findFilesInDirectory").mockResolvedValue([{ id: "generated-file" }]);
+    const requestSpy = vi
+      .spyOn(fs, "request")
+      .mockResolvedValueOnce({ ids: ["generated-file"] })
+      .mockResolvedValueOnce({ id: "generated-file" });
+
+    await expect(writer.write("content")).resolves.toBeUndefined();
+
+    expect(requestSpy.mock.calls[0][0]).toBe(
+      "https://www.googleapis.com/drive/v3/files/generateIds?count=1&space=appDataFolder&fields=ids"
+    );
+    const createOptions = requestSpy.mock.calls[1][1] as RequestInit;
+    const headers = createOptions.headers as Headers;
+    expect(headers.get("If-None-Match")).toBe("*");
+    const formData = createOptions.body as FormData;
+    expect(formData.get("metadata")).toBeTruthy();
+  });
+
   it("writer should rollback and reject createOnly when Google Drive creates a duplicate name", async () => {
     const fs = new GoogleDriveFileSystem("/", "token");
     const writer = await fs.create("file.txt", { createOnly: true });
     vi.spyOn(fs, "findFileInDirectory").mockResolvedValue(null);
     vi.spyOn(fs, "findFilesInDirectory").mockResolvedValue([{ id: "other-file" }, { id: "created-file" }]);
-    const requestSpy = vi.spyOn(fs, "request").mockResolvedValueOnce({ id: "created-file" }).mockResolvedValueOnce({});
+    const requestSpy = vi
+      .spyOn(fs, "request")
+      .mockResolvedValueOnce({ ids: ["generated-file"] })
+      .mockResolvedValueOnce({ id: "created-file" })
+      .mockResolvedValueOnce({});
 
     await expect(writer.write("content")).rejects.toMatchObject({
       provider: "googledrive",
       conflict: true,
     });
 
-    expect(requestSpy).toHaveBeenCalledTimes(2);
-    expect(requestSpy.mock.calls[1][0]).toBe(
+    expect(requestSpy).toHaveBeenCalledTimes(3);
+    expect(requestSpy.mock.calls[2][0]).toBe(
       "https://www.googleapis.com/drive/v3/files/created-file?spaces=appDataFolder"
     );
-    expect((requestSpy.mock.calls[1][1] as RequestInit).method).toBe("DELETE");
+    expect((requestSpy.mock.calls[2][1] as RequestInit).method).toBe("DELETE");
   });
 
   it("list should clear stale path cache and retry once on provider 404", async () => {

packages/filesystem/googledrive/googledrive.ts

@@ -374,6 +374,21 @@ export default class GoogleDriveFileSystem implements FileSystem {
     return response.files || [];
   }
 
+  async generateFileId(): Promise<string> {
+    const response = await this.request(
+      "https://www.googleapis.com/drive/v3/files/generateIds?count=1&space=appDataFolder&fields=ids"
+    );
+    const id = response.ids?.[0];
+    if (!id) {
+      throw new FileSystemError({
+        provider: "googledrive",
+        message: "Google Drive did not return a generated file id",
+        retryable: true,
+      });
+    }
+    return id;
+  }
+
   clearPathCache(path?: string): void {
     if (!path) {
       this.pathToIdCache.clear();

packages/filesystem/googledrive/rw.ts

@@ -125,7 +125,10 @@ export class GoogleDriveFileWriter implements FileWriter {
   private async createNewFile(fileName: string, parentId: string, content: string | Blob): Promise<void> {
     // 不设置Content-Type，让浏览器自动处理multipart/form-data边界
 
+    const createOnly = this.opts?.createOnly || this.opts?.overwrite === false;
+    const generatedId = createOnly ? await this.fs.generateFileId() : undefined;
     const metadata = {
+      ...(generatedId ? { id: generatedId } : {}),
       name: fileName,
       parents: [parentId],
     };
@@ -134,8 +137,7 @@ export class GoogleDriveFileWriter implements FileWriter {
     formData.append("metadata", new Blob([JSON.stringify(metadata)], { type: "application/json" }));
     formData.append("file", content instanceof Blob ? content : new Blob([content]));
 
-    const headers =
-      this.opts?.createOnly || this.opts?.overwrite === false ? new Headers({ "If-None-Match": "*" }) : undefined;
+    const headers = createOnly ? new Headers({ "If-None-Match": "*" }) : undefined;
 
     const created = await this.fs.request(
       `https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&spaces=appDataFolder&fields=id`,
@@ -146,7 +148,7 @@ export class GoogleDriveFileWriter implements FileWriter {
       }
     );
 
-    if (this.opts?.createOnly || this.opts?.overwrite === false) {
+    if (createOnly) {
       await this.rejectDuplicateCreate(fileName, parentId, created?.id);
     }
 

packages/filesystem/s3/s3.test.ts

@@ -25,13 +25,14 @@ function createMockResponse(options: {
   statusText?: string;
   text?: string;
   blob?: Blob;
+  headers?: Headers;
 }): Response {
   const { ok = true, status = 200, statusText = "OK", text = "" } = options;
   return {
     ok,
     status,
     statusText,
-    headers: new Headers(),
+    headers: options.headers || new Headers(),
     text: vi.fn().mockResolvedValue(text),
     blob: vi.fn().mockResolvedValue(options.blob ?? new Blob([text])),
   } as unknown as Response;
@@ -206,7 +207,9 @@ describe("S3FileSystem", () => {
     it("S3FileWriter.write 应按 expectedVersion 设置 If-Match", async () => {
       (mockClient.request as ReturnType<typeof vi.fn>).mockResolvedValue(createMockResponse({ ok: true }));
 
-      const writer = await fs.create("output.txt", { expectedVersion: "etag-1" });
+      const writer = await fs.create("output.txt", {
+        expectedVersion: "etag-1",
+      });
       await writer.write("hello world");
 
       expect(mockClient.request).toHaveBeenCalledWith(
@@ -313,6 +316,31 @@ describe("S3FileSystem", () => {
       });
     });
 
+    it("应当从对象 metadata 读取 createtime", async () => {
+      const xml = `<?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult>
+          <IsTruncated>false</IsTruncated>
+          <Contents>
+            <Key>file1.txt</Key>
+            <LastModified>2024-01-02T00:00:00.000Z</LastModified>
+            <ETag>"abc123"</ETag>
+            <Size>1024</Size>
+          </Contents>
+        </ListBucketResult>`;
+      const headers = new Headers({
+        "x-amz-meta-createtime": "2024-01-01T00:00:00.000Z",
+      });
+      (mockClient.request as ReturnType<typeof vi.fn>)
+        .mockResolvedValueOnce(createMockResponse({ text: xml }))
+        .mockResolvedValueOnce(createMockResponse({ headers }));
+
+      const files = await fs.list();
+
+      expect(files[0].createtime).toBe(new Date("2024-01-01T00:00:00.000Z").getTime());
+      expect(files[0].updatetime).toBe(new Date("2024-01-02T00:00:00.000Z").getTime());
+      expect(mockClient.request).toHaveBeenCalledWith("HEAD", "test-bucket", "file1.txt");
+    });
+
     it("应当正确处理带 basePath 的目录列表", async () => {
       const subFs = new S3FileSystem("test-bucket", mockClient, "/docs");
 
@@ -391,14 +419,16 @@ describe("S3FileSystem", () => {
 
       (mockClient.request as ReturnType<typeof vi.fn>)
         .mockResolvedValueOnce(createMockResponse({ text: xmlPage1 }))
-        .mockResolvedValueOnce(createMockResponse({ text: xmlPage2 }));
+        .mockResolvedValueOnce(createMockResponse({}))
+        .mockResolvedValueOnce(createMockResponse({ text: xmlPage2 }))
+        .mockResolvedValueOnce(createMockResponse({}));
 
       const files = await fs.list();
 
       expect(files).toHaveLength(2);
       expect(files[0].name).toBe("file1.txt");
       expect(files[1].name).toBe("file2.txt");
-      expect(mockClient.request).toHaveBeenCalledTimes(2);
+      expect(mockClient.request).toHaveBeenCalledTimes(4);
     });
 
     it("应当返回空数组当目录为空时", async () => {

packages/filesystem/s3/s3.ts

@@ -231,14 +231,16 @@ export default class S3FileSystem implements FileSystem {
           if (!relativeKey) continue;
 
           const lastModified = new Date(obj.lastModified).getTime() || Date.now();
+          const metadataCreatetime = await this.getObjectCreatetime(obj.key);
+          const createtime = metadataCreatetime || lastModified;
 
           files.push({
             name: relativeKey,
             path: this.basePath,
             size: obj.size || 0,
             digest: obj.etag?.replace(/"/g, "") || "",
             version: obj.etag?.replace(/"/g, "") || "",
-            createtime: lastModified,
+            createtime,
             updatetime: lastModified,
           });
         }
@@ -259,6 +261,23 @@ export default class S3FileSystem implements FileSystem {
     }
   }
 
+  private async getObjectCreatetime(key: string): Promise<number | undefined> {
+    try {
+      const response = await this.client.request("HEAD", this.bucket, key);
+      const value = response.headers.get("x-amz-meta-createtime");
+      if (!value) {
+        return undefined;
+      }
+      const timestamp = new Date(value).getTime();
+      return Number.isFinite(timestamp) ? timestamp : undefined;
+    } catch (error) {
+      if (error instanceof S3Error && error.code === "NoSuchKey") {
+        return undefined;
+      }
+      throw error;
+    }
+  }
+
   /**
    * 获取当前目录的 URL
    * 自定义 endpoint 返回 endpoint + bucket/prefix 路径