@immagin/client 0.2.1 → 0.2.2

package/README.md

@@ -25,10 +25,7 @@ const url = await client.images.url('photos/hero.jpg', {
 // Upload an image
 import { readFileSync } from 'node:fs'
 const buffer = readFileSync('photo.jpg')
-await client.images.upload(buffer, {
-  key: 'photos/hero.jpg',
-  contentType: 'image/jpeg',
-})
+await client.images.upload(buffer, 'photos/hero.jpg')
 ```
 
 ## Images
@@ -85,14 +82,13 @@ Returns a pre-signed S3 URL for direct upload (expires in 5 minutes). Useful for
 
 ```ts
 // Server: get the presigned URL
-const { uploadUrl, key } = await client.images.signUrl('photos/hero.jpg', 'image/jpeg')
+const { uploadUrl, key } = await client.images.signUrl('photos/hero.jpg')
 // Return uploadUrl to the browser
 
 // Browser: upload directly to S3
 await fetch(uploadUrl, {
   method: 'PUT',
   body: file,
-  headers: { 'content-type': 'image/jpeg' },
 })
 ```
 
@@ -104,10 +100,7 @@ Convenience method that gets a signed URL and uploads in one call. The file goes
 import { readFileSync } from 'node:fs'
 
 const buffer = readFileSync('photo.jpg')
-await client.images.upload(buffer, {
-  key: 'uploads/photo.jpg',
-  contentType: 'image/jpeg',
-})
+await client.images.upload(buffer, 'uploads/photo.jpg')
 ```
 
 ### List

package/dist/index.d.mts

@@ -13,10 +13,6 @@ interface ImageEdits {
   text?: TextOverlay;
 }
 interface ImageUrlOptions extends ImageEdits {}
-interface UploadOptions {
-  key: string;
-  contentType?: string;
-}
 interface UploadResult {
   uploadUrl: string;
   key: string;
@@ -60,8 +56,8 @@ declare class ImagesResource {
   constructor(client: Immagin);
   signedUrl(key: string, edits?: ImageEdits): string;
   url(key: string, options?: ImageUrlOptions): Promise<string>;
-  signUrl(key: string, contentType?: string): Promise<UploadResult>;
-  upload(file: Blob | Buffer | ReadableStream, options: UploadOptions): Promise<UploadResult>;
+  signUrl(key: string): Promise<UploadResult>;
+  upload(file: Blob | Buffer | ReadableStream, key: string): Promise<UploadResult>;
   list(options?: ListImagesOptions): Promise<ListImagesResult>;
   delete(key: string): Promise<void>;
 }
@@ -102,4 +98,4 @@ declare class ImmaginError extends Error {
   constructor(message: string, status: number, body?: unknown | undefined);
 }
 //#endregion
-export { type ApiKey, type CreateKeyResult, type ImageEdits, type ImageEntry, type ImageUrlOptions, Immagin, type ImmaginConfig, ImmaginError, type ListImagesOptions, type ListImagesResult, type TextOverlay, type TextPosition, type UploadOptions, type UploadResult };
+export { type ApiKey, type CreateKeyResult, type ImageEdits, type ImageEntry, type ImageUrlOptions, Immagin, type ImmaginConfig, ImmaginError, type ListImagesOptions, type ListImagesResult, type TextOverlay, type TextPosition, type UploadResult };

package/dist/index.mjs

@@ -1,6 +1,43 @@
 import { createHmac } from "node:crypto";
 
 //#region src/resources/images.ts
+const MIME_TYPES = {
+	jpg: "image/jpeg",
+	jpeg: "image/jpeg",
+	png: "image/png",
+	gif: "image/gif",
+	webp: "image/webp",
+	avif: "image/avif",
+	svg: "image/svg+xml",
+	tiff: "image/tiff",
+	tif: "image/tiff",
+	bmp: "image/bmp",
+	ico: "image/x-icon",
+	heic: "image/heic",
+	heif: "image/heif"
+};
+function mimeFromKey(key) {
+	const ext = key.split(".").pop()?.toLowerCase();
+	return ext ? MIME_TYPES[ext] : void 0;
+}
+function mimeFromBuffer(buf) {
+	if (buf.length < 12) return void 0;
+	if (buf[0] === 255 && buf[1] === 216 && buf[2] === 255) return "image/jpeg";
+	if (buf[0] === 137 && buf[1] === 80 && buf[2] === 78 && buf[3] === 71) return "image/png";
+	if (buf[0] === 71 && buf[1] === 73 && buf[2] === 70) return "image/gif";
+	if (buf[0] === 82 && buf[1] === 73 && buf[2] === 70 && buf[3] === 70 && buf[8] === 87 && buf[9] === 69 && buf[10] === 66 && buf[11] === 80) return "image/webp";
+	if (buf[0] === 66 && buf[1] === 77) return "image/bmp";
+	if (buf[4] === 102 && buf[5] === 116 && buf[6] === 121 && buf[7] === 112) {
+		const brand = buf.slice(8, 12).toString("ascii");
+		if (brand === "avif" || brand === "avis") return "image/avif";
+		if (brand === "heic" || brand === "heix") return "image/heic";
+		if (brand === "heif" || brand === "mif1") return "image/heif";
+	}
+}
+function mimeFromFile(file) {
+	if (typeof Blob !== "undefined" && file instanceof Blob && file.type) return file.type;
+	if (typeof Buffer !== "undefined" && Buffer.isBuffer(file)) return mimeFromBuffer(file);
+}
 var ImagesResource = class {
 	constructor(client) {
 		this.client = client;
@@ -28,15 +65,19 @@ var ImagesResource = class {
 		}
 		return (await this.client.request("GET", "/v1/images/url", { params })).url;
 	}
-	async signUrl(key, contentType) {
-		return this.client.request("POST", "/v1/images/sign-url", { body: {
+	async signUrl(key) {
+		const contentType = mimeFromKey(key);
+		return this.client.request("POST", "/v1/images/sign-url", { body: contentType ? {
 			key,
-			contentType: contentType || "application/octet-stream"
-		} });
+			contentType
+		} : { key } });
 	}
-	async upload(file, options) {
-		const { key, contentType } = options;
-		const signResult = await this.signUrl(key, contentType);
+	async upload(file, key) {
+		const contentType = mimeFromFile(file) ?? mimeFromKey(key);
+		const signResult = await this.client.request("POST", "/v1/images/sign-url", { body: contentType ? {
+			key,
+			contentType
+		} : { key } });
 		await fetch(signResult.uploadUrl, {
 			method: "PUT",
 			body: file,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immagin/client",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Node.js and browser client for the Immagin image processing API",
   "type": "module",
   "license": "MIT",
@@ -34,15 +34,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "test": "vitest run",
-    "prepublishOnly": "tsdown"
-  },
   "devDependencies": {
     "tsdown": "^0.20.3",
     "typescript": "^5.7.2",
     "vitest": "^3.0.5"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "test": "vitest run"
   }
-}
+}