Support node 12

Author: sebastianquek

deno.json

@@ -16,5 +16,11 @@
     "files": {
       "exclude": ["npm/", "examples/node"]
     }
+  },
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "deno.ns"
+    ]
   }
 }

examples/node/pagination_js_commonjs/example.js

@@ -18,42 +18,48 @@ const run = async () => {
     "First page links",
     extractLinks(page1.organic_results),
   );
-  let page2 = await page1.next?.();
-  console.log(
-    "Second page links",
-    extractLinks(page2?.organic_results),
-  );
+  if (page1.next) {
+    let page2 = await page1.next();
+    console.log(
+      "Second page links",
+      extractLinks(page2.organic_results),
+    );
+  }
 
   // Pagination (callback)
   getJson("google", params, (page1) => {
     console.log(
       "First page links",
       extractLinks(page1.organic_results),
     );
-    page1.next?.((page2) => {
-      console.log(
-        "Second page links",
-        extractLinks(page2.organic_results),
-      );
-    });
+    if (page1.next) {
+      page1.next((page2) => {
+        console.log(
+          "Second page links",
+          extractLinks(page2.organic_results),
+        );
+      });
+    }
   });
 
   // Use global config
   config.api_key = apiKey;
   page1 = await getJson("google", { q: "Coffee" });
-  page2 = await page1.next?.();
-  console.log(
-    "Second page links",
-    extractLinks(page2?.organic_results),
-  );
+  if (page1.next) {
+    page2 = await page1.next();
+    console.log(
+      "Second page links",
+      extractLinks(page2.organic_results),
+    );
+  }
 
   // Pagination loop (async/await)
   let links = [];
   let page = await getJson("google", { q: "Coffee" });
   while (page) {
     links.push(...extractLinks(page.organic_results));
     if (links.length >= 30) break;
-    page = await page.next?.();
+    page = page.next ? await page.next(): undefined;
   }
   console.log(links);
 

scripts/build_npm.ts

@@ -4,6 +4,7 @@ import { version } from "../version.ts";
 await emptyDir("./npm");
 
 await build({
+  test: false, // Turned off to avoid publishing tests
   entryPoints: ["./mod.ts"],
   rootTestDir: "./tests",
   outDir: "./npm",
@@ -16,8 +17,11 @@ await build({
     // https://deno.land/std/async/delay.ts relies on DOMException.
     // This is only used in tests.
     domException: "dev", //  Only used in tests.
-
-    undici: true, // Required for `fetch`
+  },
+  compilerOptions: {
+    // https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping
+    lib: ["es2019"],
+    target: "ES2019",
   },
   package: {
     name: "serpapi",

src/utils.ts

@@ -1,5 +1,6 @@
 import type { EngineName, EngineParameters } from "./types.ts";
 import { version } from "../version.ts";
+import fetch from "npm:cross-fetch@3.1.4";
 
 type UrlParameters = Record<
   string,
@@ -110,7 +111,7 @@ export function buildUrl<P extends UrlParameters>(
   return `${_internals.getBaseUrl()}${path}?${searchParams}`;
 }
 
-export async function execute<P extends UrlParameters>(
+export function execute<P extends UrlParameters>(
   path: string,
   parameters: P,
   timeout: number,
@@ -119,7 +120,17 @@ export async function execute<P extends UrlParameters>(
     ...parameters,
     source: getSource(),
   });
-  return await _internals.fetch(url, {
-    signal: AbortSignal.timeout(timeout),
+  // https://github.com/github/fetch/issues/175#issuecomment-216791333
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error("Timeout")), timeout);
+    _internals.fetch(url)
+      .then((res) => {
+        clearTimeout(timer);
+        resolve(res);
+      })
+      .catch((err) => {
+        clearTimeout(timer);
+        reject(err);
+      });
   });
 }

tests/utils_test.ts

@@ -23,6 +23,7 @@ import {
   extractNextParameters,
   haveParametersChanged,
 } from "../src/utils.ts";
+import { Response } from "npm:cross-fetch@3.1.4";
 
 loadSync({ export: true });
 const BASE_URL = Deno.env.get("ENV_TYPE") === "local"