fixes

Chetan11-dev · Chetan11-dev · commit f2604d6db6b6 · 2025-05-13T16:52:56.000+05:30
diff --git a/js/botasaurus-desktop-api/package.json b/js/botasaurus-desktop-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "botasaurus-desktop-api",
-  "version": "4.1.45",
+  "version": "4.1.46",
   "description": "The Botasaurus Desktop API Client provides programmatic access to Botasaurus Desktop scrapers with a developer-friendly API.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/js/botasaurus-js/package-lock.json b/js/botasaurus-js/package-lock.json
diff --git a/js/botasaurus-js/package.json b/js/botasaurus-js/package.json
@@ -1,88 +1,88 @@
 {
   "name": "botasaurus",
-  "version": "4.0.103",
+  "version": "4.0.110",
   "description": "controls adder for botasaurus.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
-    "./increment": "./dist/increment.js",
-    "./env": "./dist/env.js",
-    "./page": "./dist/page.js",
-    "./decorators-utils": "./dist/decorators-utils.js",
-    "./list-utils": "./dist/list-utils.js",
-    "./string-utils": "./dist/string-utils.js",
     "./output": "./dist/output.js",
-    "./decorators-common": "./dist/decorators-common.js",
-    "./beep-utils": "./dist/beep-utils.js",
-    "./formats": "./dist/formats.js",
-    "./task": "./dist/task.js",
+    "./list-utils": "./dist/list-utils.js",
     "./botasaurus-storage": "./dist/botasaurus-storage.js",
-    "./utils": "./dist/utils.js",
-    "./playwright": "./dist/playwright.js",
+    "./decorators-common": "./dist/decorators-common.js",
     "./on-close": "./dist/on-close.js",
     "./dontcache": "./dist/dontcache.js",
+    "./formats": "./dist/formats.js",
+    "./utils": "./dist/utils.js",
+    "./beep-utils": "./dist/beep-utils.js",
+    "./decorators-utils": "./dist/decorators-utils.js",
+    "./page": "./dist/page.js",
     "./cache": "./dist/cache.js",
-    "./paths": "./dist/paths.js"
+    "./increment": "./dist/increment.js",
+    "./paths": "./dist/paths.js",
+    "./env": "./dist/env.js",
+    "./playwright": "./dist/playwright.js",
+    "./string-utils": "./dist/string-utils.js",
+    "./task": "./dist/task.js"
   },
   "typesVersions": {
     "*": {
       "*": [
         "dist/*"
       ],
-      "increment": [
-        "dist/increment.d.ts"
-      ],
-      "env": [
-        "dist/env.d.ts"
-      ],
-      "page": [
-        "dist/page.d.ts"
-      ],
-      "decorators-utils": [
-        "dist/decorators-utils.d.ts"
+      "output": [
+        "dist/output.d.ts"
       ],
       "list-utils": [
         "dist/list-utils.d.ts"
       ],
-      "string-utils": [
-        "dist/string-utils.d.ts"
-      ],
-      "output": [
-        "dist/output.d.ts"
+      "botasaurus-storage": [
+        "dist/botasaurus-storage.d.ts"
       ],
       "decorators-common": [
         "dist/decorators-common.d.ts"
       ],
-      "beep-utils": [
-        "dist/beep-utils.d.ts"
+      "on-close": [
+        "dist/on-close.d.ts"
+      ],
+      "dontcache": [
+        "dist/dontcache.d.ts"
       ],
       "formats": [
         "dist/formats.d.ts"
       ],
-      "task": [
-        "dist/task.d.ts"
-      ],
-      "botasaurus-storage": [
-        "dist/botasaurus-storage.d.ts"
-      ],
       "utils": [
         "dist/utils.d.ts"
       ],
-      "playwright": [
-        "dist/playwright.d.ts"
+      "beep-utils": [
+        "dist/beep-utils.d.ts"
       ],
-      "on-close": [
-        "dist/on-close.d.ts"
+      "decorators-utils": [
+        "dist/decorators-utils.d.ts"
       ],
-      "dontcache": [
-        "dist/dontcache.d.ts"
+      "page": [
+        "dist/page.d.ts"
       ],
       "cache": [
         "dist/cache.d.ts"
       ],
+      "increment": [
+        "dist/increment.d.ts"
+      ],
       "paths": [
         "dist/paths.d.ts"
+      ],
+      "env": [
+        "dist/env.d.ts"
+      ],
+      "playwright": [
+        "dist/playwright.d.ts"
+      ],
+      "string-utils": [
+        "dist/string-utils.d.ts"
+      ],
+      "task": [
+        "dist/task.d.ts"
       ]
     }
   },
@@ -132,7 +132,7 @@
   "scripts": {
     "dev": "tsc -w",
     "build": "rimraf dist tsconfig.tsbuildinfo && tsc && rimraf tsconfig.tsbuildinfo",
-    "build-mv": "npm run build && mv -f ~/Documents/grow/botasaurus-js/dist/* ~/Documents/google-maps-extractor-desktop/node_modules/botasaurus/dist/",
+    "build-mv": "npm run build && mv -f ~/Documents/grow/botasaurus/js/botasaurus-js/dist/* ~/Documents/botasaurus-desktop-starter/node_modules/botasaurus/dist/",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
     "clean-install": "rm -rf dist/ node_modules/ package-lock.json yarn.lock .next/* && npm install",
     "prepublishOnly": "npm run build",
diff --git a/js/botasaurus-server-js/src/api-config.ts b/js/botasaurus-server-js/src/api-config.ts
@@ -33,9 +33,6 @@ function addCorsHeaders(reply: any) {
     reply.header("Access-Control-Allow-Headers", "Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token");
 }
 
-function sendJson(reply: any, result: any) {
-    return reply.type("application/json").send(result);
-}
 function addScraperRoutes(app:FastifyInstance) {
     Object.values(Server.scrapers).forEach(scraper => {
         const routePath = `/${kebabCase(scraper.scraper_name)}`
@@ -65,7 +62,7 @@ function addScraperRoutes(app:FastifyInstance) {
                     if (DirectCallCacheService.has(cacheKey)) {
                         try {
                             const cachedResult = DirectCallCacheService.get(cacheKey)
-                            return sendJson(reply, cachedResult ?? { result: null })
+                            return cachedResult ?? { result: null }
                         } catch (error) {
                             console.error(error)
                             // Continue with normal execution if cache fails
@@ -115,7 +112,7 @@ function addScraperRoutes(app:FastifyInstance) {
                         }
                     }
 
-                    return sendJson(reply, finalResults ?? { result: null })
+                    return finalResults ?? { result: null }
                 } finally {
                     executor.decrementCapacity(key)
                 }
@@ -171,46 +168,46 @@ export function buildApp(scrapers:any[]): FastifyInstance {
       return reply.type('text/html').send(html);
     });
 
-    app.post("/tasks/create-task-async", async (request, reply) => {
+    app.post("/tasks/create-task-async", async (request, _) => {
         const jsonData = request.body;
         const result = await createAsyncTask(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.post("/tasks/create-task-sync", async (request, reply) => {
+    app.post("/tasks/create-task-sync", async (request, _) => {
         const jsonData = request.body;
         const result = await createSyncTask(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.get("/tasks", async (request, reply) => {
+    app.get("/tasks", async (request, _) => {
         const queryParams = request.query;
         const result = await getTasks(queryParams);
-        return sendJson(reply, result);
+        return result;
     });
 
     app.get(
         "/tasks/:taskId",
         async (
             request: FastifyRequest<{ Params: { taskId: number } }>,
-            reply
+            _
         ) => {
             const taskId = request.params.taskId;
             const result = await getTask(taskId);
-            return sendJson(reply, result);
+            return result;
         }
     );
 
     app.post(
         "/tasks/:taskId/results",
         async (
             request: FastifyRequest<{ Params: { taskId: number }; Body: any }>,
-            reply
+            _
         ) => {
             const taskId = request.params.taskId;
             const jsonData = request.body;
             const results = await getTaskResults(taskId, jsonData);
-            return sendJson(reply, results);
+            return results;
         }
     );
 
@@ -230,67 +227,64 @@ export function buildApp(scrapers:any[]): FastifyInstance {
         "/tasks/:taskId/abort",
         async (
             request: FastifyRequest<{ Params: { taskId: number } }>,
-            reply
+            _
         ) => {
             
             const taskId = request.params.taskId;
             const result = await abortSingleTask(taskId);
-            return sendJson(reply, result);
+            return result;
         }
     );
 
     app.delete(
         "/tasks/:taskId",
         async (
             request: FastifyRequest<{ Params: { taskId: number } }>,
-            reply
+            _
         ) => {
             const taskId = request.params.taskId;
             const result = await deleteSingleTask(taskId);
-            return sendJson(reply, result);
+            return result;
         }
     );
 
-    app.post("/tasks/bulk-abort", async (request, reply) => {
+    app.post("/tasks/bulk-abort", async (request, _) => {
         const jsonData = request.body;
         const result = await bulkAbortTasks(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.post("/tasks/bulk-delete", async (request, reply) => {
+    app.post("/tasks/bulk-delete", async (request, _) => {
         const jsonData = request.body;
         const result = await bulkDeleteTasks(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.get("/ui/app-props", (_, reply) => {
-        const result = getAppProps();
-        return sendJson(reply, result);
-    });
+    app.get("/ui/app-props", getAppProps);
 
-    app.post("/ui/tasks/is-any-task-updated", async (request, reply) => {
+    app.post("/ui/tasks/is-any-task-updated", async (request, _) => {
         const jsonData = request.body;
         const result = await isAnyTaskUpdated(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.post("/ui/tasks/is-task-updated", async (request, reply) => {
+    app.post("/ui/tasks/is-task-updated", async (request, _) => {
         const jsonData = request.body;
         const result = await isTaskUpdated(jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.get("/ui/tasks", async (request, reply) => {
+    app.get("/ui/tasks", async (request, _) => {
         const queryParams = request.query;
         const result = await getTasksForUiDisplay(queryParams);
-        return sendJson(reply, result);
+        return result;
     });
 
-    app.patch("/ui/tasks", async (request, reply) => {
+    app.patch("/ui/tasks", async (request, _) => {
         const queryParams = request.query;
         const jsonData = request.body;
         const result = await patchTask(queryParams, jsonData);
-        return sendJson(reply, result);
+        return result;
     });
 
     app.post(
@@ -301,13 +295,13 @@ export function buildApp(scrapers:any[]): FastifyInstance {
                 Body: any;
                 Querystring: any;
             }>,
-            reply
+            _
         ) => {
             const taskId = request.params.taskId;
             const jsonData = request.body;
             const queryParams = request.query;
             const final = await getUiTaskResults(taskId, queryParams, jsonData);
-            return sendJson(reply, final);
+            return final;
         }
     );
 
diff --git a/js/botasaurus-server-js/src/server.ts b/js/botasaurus-server-js/src/server.ts
@@ -137,6 +137,17 @@ class _Server {
   }
 
   addWhatsAppSupport(options: WhatsAppSupportOptions) {
+    if (options.number.length !== 10) {
+      throw new Error('The WhatsApp number must be exactly 10 characters long.');
+    }
+    
+    if (options.countryCallingCode.length < 1) {
+      throw new Error('The country calling code must be at least 1 character long.');
+    }
+
+    if (options.countryCallingCode.includes('+')) {
+      throw new Error('The country calling code must not contain a plus sign (+).');
+    }
     this.whatsAppSupport = options;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "botasaurus-desktop-api",`
`3`		`- "version": "4.1.45",`
	`3`	`+ "version": "4.1.46",`
`4`	`4`	`"description": "The Botasaurus Desktop API Client provides programmatic access to Botasaurus Desktop scrapers with a developer-friendly API.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`