feat(object): make hash type optional and add expiration to url parser

Author: joaotonaco

.changeset/blue-glasses-study.md

@@ -0,0 +1,5 @@
+---
+"@squarecloud/blob": patch
+---
+
+Fix object url parse error when hash is not provided and add support for expiration.

src/structures/object.ts

@@ -12,7 +12,7 @@ export class BlobObject {
 	/** The prefix of the object (Optional) */
 	prefix?: string;
 	/** The hash of the object */
-	hash: string;
+	hash?: string;
 	/** The id of the user who created the object */
 	userId: string;
 	/** The file extension of the object */

src/utils/object-url.ts

@@ -1,14 +1,24 @@
 import { SquareCloudBlobError } from "../structures/error";
 
 const objectUrlRegex =
-	/^(?<url>https:\/\/public-blob\.squarecloud\.dev)?\/?(?<userId>[\w\d]+\/)(?<prefix>[\w\d\-_]+\/)?(?<name>[\w\d_]+)(?:-(?<hash>[\w\d]+))?(?:-ex\d+)?\.(?<extension>\w+)$/;
+	/^(?<url>https:\/\/public-blob\.squarecloud\.dev)?\/?(?<userId>[\w\d]+\/)(?<prefix>[\w\d\-_]+\/)?(?<name>[\w\d_]+)(?:-(?<hash>(?!ex\d+)[\w\d]+))?(?:-ex(?<expiration>\d+))?\.(?<extension>\w+)$/;
+
+type ParsedObjectUrl = {
+	id: string;
+	userId: string;
+	prefix?: string;
+	name: string;
+	hash?: string;
+	extension: string;
+	expiration?: number;
+};
 
 /**
  * Parses the object URL to extract id, userId, prefix, name, hash and extension.
  *
  * @param url - The object URL to parse.
  */
-export function parseObjectUrl(url: string) {
+export function parseObjectUrl(url: string): ParsedObjectUrl {
 	const match = url.match(objectUrlRegex);
 
 	if (!match?.groups) {
@@ -20,13 +30,17 @@ export function parseObjectUrl(url: string) {
 	const name = match.groups.name;
 	const hash = match.groups.hash;
 	const extension = match.groups.extension;
+	const expiration = match.groups.expiration
+		? Number(match.groups.expiration)
+		: undefined;
 
 	return {
-		id: `${userId}/${prefix ? `${prefix}/` : ""}${name}-${hash}.${extension}`,
+		id: `${userId}/${prefix ? `${prefix}/` : ""}${name}${hash ? `-${hash}` : ""}${expiration ? `-ex${expiration}` : ""}.${extension}`,
 		userId,
 		prefix,
 		name,
 		hash,
 		extension,
+		expiration,
 	};
 }