clean up

Author: jsbroks

packages/storage/src/Storage.ts

@@ -16,7 +16,7 @@ export type FileMetadata = z.infer<typeof FileMetadata>;
  * Options accepted during the creation of a signed URL.
  */
 export type SignedURLOptions = {
-  expiresIn?: string | number;
+  expiresIn?: number;
   contentType?: string;
   contentDisposition?: string;
 } & Record<string, any>;

packages/storage/src/drivers/fs/driver.ts

@@ -14,11 +14,7 @@ import type { StorageFile } from "../../StorageFile.js";
 
 type FSDriverOptions = {
   location?: string;
-  generateSignedURL?(
-    key: string,
-    filePath: string,
-    options: SignedURLOptions,
-  ): Promise<string>;
+  generateSignedURL?(key: string, options: SignedURLOptions): Promise<string>;
 };
 
 export class FSDriver implements StorageDriver {
@@ -88,7 +84,7 @@ export class FSDriver implements StorageDriver {
       throw new Error("generateSignedURL is not defined");
 
     const location = path.join(this._location, key);
-    return this.options.generateSignedURL(location, location, opts);
+    return this.options.generateSignedURL(location, opts);
   }
 
   async getMetaData(key: string): Promise<ObjectMetadata> {

packages/storage/src/drivers/gcs/driver.ts

@@ -85,10 +85,7 @@ export class GCSStorageDriver implements StorageDriver {
 
   async getSignedUrl(path: string, opts: SignedURLOptions): Promise<string> {
     const expires = new Date();
-    const m =
-      typeof opts.expiresIn === "number"
-        ? opts.expiresIn
-        : ms(opts.expiresIn ?? "30m");
+    const m = opts.expiresIn ?? ms("30m");
     expires.setSeconds(new Date().getMilliseconds() + m);
     const [url] = await this.bucket.file(path).getSignedUrl({
       action: opts.action,