@react-grab/amp 0.0.82 → 0.0.83

package/dist/cli.cjs

@@ -603,7 +603,7 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 9567;
 
 // src/cli.ts
-var VERSION = "0.0.82";
+var VERSION = "0.0.83";
 var serverPath = path.join(__dirname, "server.js");
 (0, import_cross_spawn.default)(process.execPath, [serverPath], {
   detached: true,

package/dist/cli.js

@@ -601,7 +601,7 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 9567;
 
 // src/cli.ts
-var VERSION = "0.0.82";
+var VERSION = "0.0.83";
 var serverPath = join(__dirname, "server.js");
 (0, import_cross_spawn.default)(process.execPath, [serverPath], {
   detached: true,

package/dist/client.cjs

@@ -1,11 +1,7 @@
 'use strict';
 
-// src/constants.ts
-var DEFAULT_PORT = 9567;
+// ../utils/dist/client.js
 var CONNECTION_CHECK_TTL_MS = 5e3;
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var STORAGE_KEY = "react-grab:agent-sessions";
 var parseSSEEvent = (eventBlock) => {
   let eventType = "";
@@ -56,7 +52,14 @@ async function* streamSSE(stream, signal) {
     }
   }
 }
+
+// src/constants.ts
+var DEFAULT_PORT = 9567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 async function* streamFromServer(serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -80,7 +83,37 @@ async function* streamFromServer(serverUrl, context, signal) {
     if (!response.body) {
       throw new Error("No response body");
     }
-    yield* streamSSE(response.body, signal);
+    const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
+    let done = false;
+    let pendingNext = iterator.next();
+    while (!done) {
+      const result = await Promise.race([
+        pendingNext.then((iteratorResult) => ({
+          type: "status",
+          iteratorResult
+        })),
+        new Promise(
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+        )
+      ]);
+      if (result.type === "timeout") {
+        const elapsedSeconds = (Date.now() - startTime) / 1e3;
+        yield `Working\u2026 ${elapsedSeconds.toFixed(1)}s`;
+      } else {
+        const iteratorResult = result.iteratorResult;
+        done = iteratorResult.done ?? false;
+        if (!done && iteratorResult.value) {
+          const status = iteratorResult.value;
+          if (status === "Completed successfully") {
+            const totalSeconds = ((Date.now() - startTime) / 1e3).toFixed(1);
+            yield `Completed in ${totalSeconds}s`;
+          } else {
+            yield status;
+          }
+          pendingNext = iterator.next();
+        }
+      }
+    }
   } finally {
     signal.removeEventListener("abort", handleAbort);
   }

package/dist/client.global.js

@@ -1,4 +1,5 @@
-var ReactGrabAmp=(function(exports){'use strict';var u=`http://localhost:${9567}`,E="react-grab:agent-sessions",b=s=>{let e="",o="";for(let n of s.split(`
-`))n.startsWith("event:")?e=n.slice(6).trim():n.startsWith("data:")&&(o=n.slice(5).trim());return {eventType:e,data:o}};async function*y(s,e){let o=s.getReader(),n=new TextDecoder,r="",t=false,a=()=>{t=true,o.cancel().catch(()=>{});};e.addEventListener("abort",a);try{if(e.aborted)throw new DOMException("Aborted","AbortError");for(;;){let i=await o.read();if(t||e.aborted)throw new DOMException("Aborted","AbortError");let{done:A,value:l}=i;l&&(r+=n.decode(l,{stream:!0}));let c;for(;(c=r.indexOf(`
+var ReactGrabAmp=(function(exports){'use strict';var A=5e3,u="react-grab:agent-sessions",y=c=>{let e="",n="";for(let o of c.split(`
+`))o.startsWith("event:")?e=o.slice(6).trim():o.startsWith("data:")&&(n=o.slice(5).trim());return {eventType:e,data:n}};async function*f(c,e){let n=c.getReader(),o=new TextDecoder,r="",t=false,i=()=>{t=true,n.cancel().catch(()=>{});};e.addEventListener("abort",i);try{if(e.aborted)throw new DOMException("Aborted","AbortError");for(;;){let a=await n.read();if(t||e.aborted)throw new DOMException("Aborted","AbortError");let{done:p,value:m}=a;m&&(r+=o.decode(m,{stream:!0}));let d;for(;(d=r.indexOf(`
 
-`))!==-1;){let{eventType:p,data:d}=b(r.slice(0,c));if(r=r.slice(c+2),p==="done")return;if(p==="error")throw new Error(d||"Agent error");d&&(yield d);}if(A)break}}finally{e.removeEventListener("abort",a);try{o.releaseLock();}catch{}}}async function*m(s,e,o){let n=e.sessionId,r=()=>{n&&fetch(`${s}/abort/${n}`,{method:"POST"}).catch(()=>{});};o.addEventListener("abort",r);try{let t=await fetch(`${s}/agent`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(e),signal:o});if(!t.ok)throw new Error(`Server error: ${t.status}`);if(!t.body)throw new Error("No response body");yield*y(t.body,o);}finally{o.removeEventListener("abort",r);}}var h=(s={})=>{let{serverUrl:e=u,getOptions:o}=s,n=null,r=t=>({...o?.()??{},...t??{}});return {send:async function*(t,a){let i={...t,options:r(t.options)};yield*m(e,i,a);},resume:async function*(t,a,i){let A=i.getItem(E);if(!A)throw new Error("No sessions to resume");let c=JSON.parse(A)[t];if(!c)throw new Error(`Session ${t} not found`);let p=c.context,d={...p,options:r(p.options)};yield "Resuming...",yield*m(e,d,a);},supportsResume:true,supportsFollowUp:true,checkConnection:async()=>{let t=Date.now();if(n&&t-n.timestamp<5e3)return n.result;try{let i=(await fetch(`${e}/health`,{method:"GET"})).ok;return n={result:i,timestamp:t},i}catch{return n={result:false,timestamp:t},false}},abort:async t=>{try{await fetch(`${e}/abort/${t}`,{method:"POST"});}catch{}}}},w=async()=>{if(typeof window>"u")return;let s=h(),e=r=>{r.setAgent({provider:s,storage:sessionStorage});},o=window.__REACT_GRAB__;if(o){e(o);return}window.addEventListener("react-grab:init",r=>{e(r.detail);},{once:true});let n=window.__REACT_GRAB__;n&&e(n);};w();exports.attachAgent=w;exports.createAmpAgentProvider=h;return exports;})({});
+`))!==-1;){let{eventType:s,data:l}=y(r.slice(0,d));if(r=r.slice(d+2),s==="done")return;if(s==="error")throw new Error(l||"Agent error");l&&(yield l);}if(p)break}}finally{e.removeEventListener("abort",i);try{n.releaseLock();}catch{}}}var E=`http://localhost:${9567}`;async function*g(c,e,n){let o=Date.now(),r=e.sessionId,t=()=>{r&&fetch(`${c}/abort/${r}`,{method:"POST"}).catch(()=>{});};n.addEventListener("abort",t);try{let i=await fetch(`${c}/agent`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(e),signal:n});if(!i.ok)throw new Error(`Server error: ${i.status}`);if(!i.body)throw new Error("No response body");let a=f(i.body,n)[Symbol.asyncIterator](),p=!1,m=a.next();for(;!p;){let d=await Promise.race([m.then(s=>({type:"status",iteratorResult:s})),new Promise(s=>setTimeout(()=>s({type:"timeout"}),100))]);if(d.type==="timeout")yield `Working\u2026 ${((Date.now()-o)/1e3).toFixed(1)}s`;else {let s=d.iteratorResult;if(p=s.done??!1,!p&&s.value){let l=s.value;l==="Completed successfully"?yield `Completed in ${((Date.now()-o)/1e3).toFixed(1)}s`:yield l,m=a.next();}}}}finally{n.removeEventListener("abort",t);}}var b=(c={})=>{let{serverUrl:e=E,getOptions:n}=c,o=null,r=t=>({...n?.()??{},...t??{}});return {send:async function*(t,i){let a={...t,options:r(t.options)};yield*g(e,a,i);},resume:async function*(t,i,a){let p=a.getItem(u);if(!p)throw new Error("No sessions to resume");let d=JSON.parse(p)[t];if(!d)throw new Error(`Session ${t} not found`);let s=d.context,l={...s,options:r(s.options)};yield "Resuming...",yield*g(e,l,i);},supportsResume:true,supportsFollowUp:true,checkConnection:async()=>{let t=Date.now();if(o&&t-o.timestamp<A)return o.result;try{let a=(await fetch(`${e}/health`,{method:"GET"})).ok;return o={result:a,timestamp:t},a}catch{return o={result:false,timestamp:t},false}},abort:async t=>{try{await fetch(`${e}/abort/${t}`,{method:"POST"});}catch{}}}},h=async()=>{if(typeof window>"u")return;let c=b(),e=r=>{r.setAgent({provider:c,storage:sessionStorage});},n=window.__REACT_GRAB__;if(n){e(n);return}window.addEventListener("react-grab:init",r=>{e(r.detail);},{once:true});let o=window.__REACT_GRAB__;o&&e(o);};h();
+exports.attachAgent=h;exports.createAmpAgentProvider=b;return exports;})({});

package/dist/client.js

@@ -1,9 +1,5 @@
-// src/constants.ts
-var DEFAULT_PORT = 9567;
+// ../utils/dist/client.js
 var CONNECTION_CHECK_TTL_MS = 5e3;
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var STORAGE_KEY = "react-grab:agent-sessions";
 var parseSSEEvent = (eventBlock) => {
   let eventType = "";
@@ -54,7 +50,14 @@ async function* streamSSE(stream, signal) {
     }
   }
 }
+
+// src/constants.ts
+var DEFAULT_PORT = 9567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 async function* streamFromServer(serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -78,7 +81,37 @@ async function* streamFromServer(serverUrl, context, signal) {
     if (!response.body) {
       throw new Error("No response body");
     }
-    yield* streamSSE(response.body, signal);
+    const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
+    let done = false;
+    let pendingNext = iterator.next();
+    while (!done) {
+      const result = await Promise.race([
+        pendingNext.then((iteratorResult) => ({
+          type: "status",
+          iteratorResult
+        })),
+        new Promise(
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+        )
+      ]);
+      if (result.type === "timeout") {
+        const elapsedSeconds = (Date.now() - startTime) / 1e3;
+        yield `Working\u2026 ${elapsedSeconds.toFixed(1)}s`;
+      } else {
+        const iteratorResult = result.iteratorResult;
+        done = iteratorResult.done ?? false;
+        if (!done && iteratorResult.value) {
+          const status = iteratorResult.value;
+          if (status === "Completed successfully") {
+            const totalSeconds = ((Date.now() - startTime) / 1e3).toFixed(1);
+            yield `Completed in ${totalSeconds}s`;
+          } else {
+            yield status;
+          }
+          pendingNext = iterator.next();
+        }
+      }
+    }
   } finally {
     signal.removeEventListener("abort", handleAbort);
   }

package/dist/server.cjs

@@ -19,8 +19,10 @@ var pc__default = /*#__PURE__*/_interopDefault(pc);
 
 // src/constants.ts
 var DEFAULT_PORT = 9567;
-var VERSION = "0.0.82";
+
+// ../utils/dist/server.js
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var VERSION = "0.0.83";
 var threadMap = /* @__PURE__ */ new Map();
 var abortControllers = /* @__PURE__ */ new Map();
 var extractTextFromContent = (content) => {

package/dist/server.js

@@ -11,8 +11,10 @@ import { pathToFileURL } from 'url';
 
 // src/constants.ts
 var DEFAULT_PORT = 9567;
-var VERSION = "0.0.82";
+
+// ../utils/dist/server.js
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var VERSION = "0.0.83";
 var threadMap = /* @__PURE__ */ new Map();
 var abortControllers = /* @__PURE__ */ new Map();
 var extractTextFromContent = (content) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-grab/amp",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "type": "module",
   "bin": {
     "react-grab-amp": "./dist/cli.cjs"
@@ -25,7 +25,8 @@
   ],
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
-    "tsup": "^8.4.0"
+    "tsup": "^8.4.0",
+    "@react-grab/utils": "0.0.83"
   },
   "dependencies": {
     "@hono/node-server": "^1.19.6",
@@ -34,7 +35,7 @@
     "fkill": "^9.0.0",
     "hono": "^4.0.0",
     "picocolors": "^1.1.1",
-    "react-grab": "0.0.82"
+    "react-grab": "0.0.83"
   },
   "scripts": {
     "dev": "tsup --watch",