fetchfox-sdk 1.0.25 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetchfox-sdk",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "AI scraper",
   "main": "src/index.js",
   "type": "module",
@@ -33,8 +33,5 @@
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,css,md}": "prettier --write"
-  },
-  "dependencies": {
-    "socket.io-client": "^4.8.1"
   }
 }

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('agent', data.jobId, args);
+  return new Job(data.jobId, { ...args, name: 'agent' });
 };

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('crawl', data.jobId, args);
+  return new Job(data.jobId, { ...args, name: 'crawl' });
 };

package/src/detach.js

@@ -11,28 +11,49 @@ export function getSocket() {}
 export const Job = class {
   #callbacks;
   #socket;
+  #socket2;
+  #socket3;
   #seen;
   #completed;
   #failed;
 
-  constructor(name, id, options) {
-    this.name = name;
+  constructor(id, options) {
     this.id = id;
+    this.name = options?.name;
     this.#callbacks = {
       item: [],
       completed: [],
       failed: [],
       finished: [],
       progress: [],
+
+      // new
+      update: [],
+      children: [],
     };
 
     this.#seen = {};
+    this.#socket2 = new WebSocket(ws(options) + '/ws/jobs/' + id);
+    this.#socket2.onmessage = (data) => {
+      let parsed;
+      try {
+        parsed = JSON.parse(data.data);
+      } catch {
+        return;
+      }
+      this.trigger('update', parsed);
+    };
 
-    this.#socket = new io(ws(options));
-    this.#socket.on('progress', (data) => {
-      this.handleProgress(data);
-    });
-    this.#socket.emit('sub', this.id);
+    this.#socket3 = new WebSocket(ws(options) + '/ws/children/' + id);
+    this.#socket3.onmessage = (data) => {
+      let parsed;
+      try {
+        parsed = JSON.parse(data.data);
+      } catch {
+        return;
+      }
+      this.trigger('children', parsed);
+    };
   }
 
   get _finished() {
@@ -119,8 +140,6 @@ export const Job = class {
         );
       }
 
-      this.#socket.disconnect();
-
       console.log('Set timeout before triggering completion');
       setTimeout(() => {
         this.get()

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('extract', data.jobId, args);
+  return new Job(data.jobId, { ...args, name: 'extract' });
 };

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('scrape', data.jobId, args);
+  return new Job(data.jobId, { ...args, name: '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);
+  return new Job(data.jobId, { ...args, name: 'visit' });
 };