Improve error handling

Author: tanysheng

mod.ts

@@ -2,6 +2,7 @@ export type { Config } from "./src/config.ts";
 export { config } from "./src/config.ts";
 
 export {
+  ImageApiError,
   InvalidArgumentError,
   InvalidTimeoutError,
   MissingApiKeyError,

src/errors.ts

@@ -21,6 +21,14 @@ export class InvalidTimeoutError extends Error {
   }
 }
 
+export class ImageApiError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ImageApiError";
+    Object.setPrototypeOf(this, ImageApiError.prototype);
+  }
+}
+
 export class RequestTimeoutError extends Error {
   constructor() {
     super("The request was timed out");

src/serpapi.ts

@@ -1,4 +1,4 @@
-import { InvalidArgumentError } from "./errors.ts";
+import { ImageApiError, InvalidArgumentError } from "./errors.ts";
 import { readFile } from "node:fs";
 import type {
   AccountApiParameters,
@@ -362,14 +362,23 @@ export async function uploadImage(
   } else {
     image = parameters.image;
   }
-  const response = await _internals.uploadImage(
-    image,
-    {
-      api_key: key,
-      requestOptions: parameters.requestOptions,
-    },
-    timeout,
-  );
+  let response: string;
+  try {
+    response = await _internals.uploadImage(
+      image,
+      {
+        api_key: key,
+        requestOptions: parameters.requestOptions,
+      },
+      timeout,
+    );
+  } catch (error) {
+    let message = "Image upload failed";
+    try {
+      message = JSON.parse(String(error)).error || message;
+    } catch { /* */ }
+    throw new ImageApiError(message);
+  }
   const result = JSON.parse(response) as ImageApiResponse;
   callback?.(result);
   return result;

src/types.ts

@@ -29,7 +29,6 @@ export type ImageApiParameters = {
 };
 
 export type ImageApiResponse = {
-  message?: string;
-  image_id?: string;
-  error?: string;
+  message: string;
+  image_id: string;
 };

tests/serpapi_test.ts

@@ -32,6 +32,7 @@ import {
   getJson,
   getJsonBySearchId,
   getLocations,
+  ImageApiError,
   InvalidArgumentError,
   InvalidTimeoutError,
   MissingApiKeyError,
@@ -238,6 +239,24 @@ describe("uploadImage", () => {
       await Deno.remove(imagePath);
     }
   });
+
+  it("throws ImageApiError", async () => {
+    const executeStub = stub(
+      _internals,
+      "uploadImage",
+      () => Promise.reject('{"error":"Invalid image"}'),
+    );
+    config.api_key = "test_api_key";
+    try {
+      await assertRejects(
+        async () => await uploadImage({ image }),
+        ImageApiError,
+        "Invalid image",
+      );
+    } finally {
+      executeStub.restore();
+    }
+  });
 });
 
 describe(