fetchfox-sdk 1.0.30 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetchfox-sdk",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "AI scraper",
   "main": "src/index.js",
   "type": "module",

package/src/agent.js

@@ -7,5 +7,5 @@ export async function agent(args) {
 
 agent.detach = async (args) => {
   const data = await call('POST', '/api/agent', { ...args, detach: true });
-  return new Job(data.jobId, { ...args, name: 'agent' });
+  return new Job(data.jobId, { ...args, method: 'agent' });
 };

package/src/api.js

@@ -18,16 +18,12 @@ const FetchFoxAPIError = class extends Error {
 };
 
 export const call = async (method, path, params) => {
+  const headers = { 'Content-Type': 'application/json' };
   const key = apiKey(params);
-
-  const args = {
-    method,
-    headers: {
-      Authorization: `Bearer ${key}`,
-      'Content-Type': 'application/json',
-    },
-  };
-
+  if (key) {
+    headers['Authorization'] = `Bearer ${key}`;
+  }
+  const args = { method, headers };
   let url = endpoint(path, params);
   if (method == 'GET') {
     const clean = {};

package/src/configure.js

@@ -26,6 +26,6 @@ export const host = (options) =>
   'https://api.fetchfox.ai';
 
 export const appHost = (options) =>
-  host(options).replace('api.fetchfox.ai', 'app.fetchfox.ai');
+  host(options).replace('api.fetchfox.ai', 'fetchfox.ai');
 
 export const ws = (options) => host(options).replace('http', 'ws');

package/src/crawl.js

@@ -7,5 +7,5 @@ export async function crawl(args) {
 
 crawl.detach = async (args) => {
   const data = await call('POST', '/api/crawl', { ...args, detach: true });
-  return new Job(data.jobId, { ...args, name: 'crawl' });
+  return new Job(data.jobId, { ...args, method: 'crawl' });
 };

package/src/detach.js

@@ -17,7 +17,7 @@ export const Job = class {
 
   constructor(id, options) {
     this.id = id;
-    this.name = options?.name;
+    this.method = options?.method;
     this.#callbacks = {
       item: [],
       completed: [],
@@ -73,9 +73,11 @@ export const Job = class {
   }
 
   get appUrl() {
-    return [appHost(), this.name == 'agent' ? 'agents' : 'jobs', this.id].join(
-      '/'
-    );
+    return [
+      appHost(),
+      this.method == 'agent' ? 'agents' : 'jobs',
+      this.id,
+    ].join('/');
   }
 
   #select(data) {
@@ -139,6 +141,6 @@ export const Job = class {
   }
 
   async finished() {
-    return this.waitFor('finished');
+    return Promise.race([this.completed(), this.failed()]);
   }
 };

package/src/extract.js

@@ -7,5 +7,5 @@ export async function extract(args) {
 
 extract.detach = async (args) => {
   const data = await call('POST', '/api/extract', { ...args, detach: true });
-  return new Job(data.jobId, { ...args, name: 'extract' });
+  return new Job(data.jobId, { ...args, method: 'extract' });
 };

package/src/index.js

@@ -3,6 +3,7 @@ export * from './crawl.js';
 export * from './extract.js';
 export * from './scrape.js';
 export * from './agent.js';
+export * from './plan.js';
 
 export * from './jobs.js';
 export * from './items.js';

package/src/plan.js

@@ -0,0 +1,11 @@
+import { call } from './api.js';
+import { Job } from './detach.js';
+
+export async function plan(args) {
+  return call('POST', '/api/plan', args);
+}
+
+plan.detach = async (args) => {
+  const data = await call('POST', '/api/plan', { ...args, detach: true });
+  return new Job(data.jobId, { ...args, method: 'plan' });
+};

package/src/scrape.js

@@ -7,5 +7,5 @@ export async function scrape(args) {
 
 scrape.detach = async (args) => {
   const data = await call('POST', '/api/scrape', { ...args, detach: true });
-  return new Job(data.jobId, { ...args, name: 'scrape' });
+  return new Job(data.jobId, { ...args, method: 'scrape' });
 };

package/src/visit.js

@@ -7,5 +7,5 @@ export async function visit(args) {
 
 visit.detach = async (args) => {
   const data = await call('POST', '/api/visit', { ...args, detach: true });
-  return new Job(data.jobId, { ...args, name: 'visit' });
+  return new Job(data.jobId, { ...args, method: 'visit' });
 };