From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sat, 5 Mar 2022 09:46:16 +0000 (+0100)
Subject: Fix crashes
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=3d1a130278fdec895e88854e3ebb65d01b603764;p=google_images.git

Fix crashes
---

diff --git a/init.js b/init.js
index cede7a1..d8ac681 100644
--- a/init.js
+++ b/init.js
@@ -8,7 +8,7 @@ const debug = arg => {
 }
 
 module.exports.search = (query, userAgent = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:97.0) Gecko/20100101 Firefox/97.0") =>
-	fetch("https://www.google.com/search?tbm=isch&q=" + encodeURIComponent(query), {headers: {"User-Agent": userAgent}}).then(res => res.text()).then(data =>
+	fetch("https://www.google.com/search?tbm=isch&q=" + encodeURIComponent(debug(query)), {headers: {"User-Agent": userAgent}}).then(res => res.text()).then(data =>
 		cheerio.load(data, null, false)                                               // parse HTML
 			("script")                                                                // find script tags
 			.toArray()                                                                // convert cheerio list to array
@@ -17,7 +17,7 @@ module.exports.search = (query, userAgent = "Mozilla/5.0 (X11; Ubuntu; Linux x86
 			.map(script => script.slice("AF_initDataCallback(".length, -");".length)) // remove call to init function
 			.map(jsonic)                                                              // jsonic is used because JSON.parse() requires strict JSON and eval() allows remote code execution
 			.find(data => data.key == "ds:1")                                         // for some reason there are two init datas, one is empty tho
-			.data[31][0][12][2].map(elem => new Object({                              // map the parts of the init data we know/care about to something readable
+			.data[31][0][12][2].map(elem => elem[1] && new Object({                   // map the parts of the init data we know/care about to something readable
 				image: {
 					url: elem[1][3][0],
 					size: {
@@ -36,6 +36,7 @@ module.exports.search = (query, userAgent = "Mozilla/5.0 (X11; Ubuntu; Linux x86
 				link: elem[1][9][2003][2],
 				title: elem[1][9][2003][3], // there is some more data in elem[1][9] that could potentially be useful
 			}))
+			.filter(elem => elem)
 	)
 /*
 
diff --git a/package-lock.json b/package-lock.json
index 2acc47d..e19f360 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "google_images",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index e5a021f..dbe808a 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "free-google-images",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Reverse Engineered Google Image Search API",
   "main": "init.js",
   "scripts": {
-    "test": "node test.js"
+    "test": "node test.js astolfo images"
   },
   "repository": {
     "type": "git",
diff --git a/test.js b/test.js
index 6d4e11e..6ad6496 100644
--- a/test.js
+++ b/test.js
@@ -1,5 +1,5 @@
 const {search} = require("./init.js")
 const util = require("util")
 
-search("astolfo+images")
+search(process.argv.slice(2).join("+"))
 	.then(obj => console.log(util.inspect(obj, {showHidden: false, depth: null, colors: true})))