@ai-ecoverse/sliccy-browser 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/sliccy-browser",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "sliccy:browser for jsh, over CDP",
   "type": "module",
   "license": "Apache-2.0",
@@ -29,6 +29,6 @@
     "src"
   ],
   "dependencies": {
-    "@ai-ecoverse/slicc-cdp": "1.5.4"
+    "@ai-ecoverse/slicc-cdp": "1.19.1"
   }
 }

package/src/browser.js

@@ -13,6 +13,8 @@ const routers = new Set();
 const subscribers = new Map();
 let seq = 1;
 let listening = false;
+let active = 0;
+let idle;
 
 function openClient() {
   if (!opening) {
@@ -24,6 +26,37 @@ function openClient() {
   return opening;
 }
 
+async function using(work) {
+  active += 1;
+  clearTimeout(idle);
+  idle = undefined;
+  try {
+    return await work();
+  } finally {
+    active -= 1;
+    release();
+  }
+}
+
+function release() {
+  if (active > 0 || subscribers.size > 0 || !opening || idle) return;
+  idle = setTimeout(closeIdle, 0);
+}
+
+function closeIdle() {
+  idle = undefined;
+  if (active > 0 || subscribers.size > 0 || !opening) return;
+  const closing = opening;
+  opening = undefined;
+  sessions.clear();
+  routers.clear();
+  listening = false;
+  closing.then(
+    (client) => client.close(),
+    () => undefined
+  );
+}
+
 function ignoreMethod(prefix) {
   return (error) => {
     const message = error instanceof Error ? error.message : String(error);
@@ -113,7 +146,11 @@ async function listTabs() {
     }));
 }
 
-export async function findTab(query = {}) {
+export async function findTab(query) {
+  return using(() => findTabNow(query));
+}
+
+async function findTabNow(query = {}) {
   const domain = typeof query.domain === 'string' ? query.domain : undefined;
   const urlMatch = patternOf(query.urlMatch);
   if (domain === undefined && urlMatch === undefined) {
@@ -128,7 +165,11 @@ export async function findTab(query = {}) {
   return tabs.find((tab) => re.test(tab.url)) ?? null;
 }
 
-export async function ensureTab(url, options = {}) {
+export async function ensureTab(url, options) {
+  return using(() => ensureTabNow(url, options));
+}
+
+async function ensureTabNow(url, options = {}) {
   if (typeof url !== 'string' || url.length === 0) {
     throw new TypeError('browser.ensureTab: url must be a string');
   }
@@ -146,13 +187,14 @@ export async function ensureTab(url, options = {}) {
     }
   }
   const client = await openClient();
-  const created = await client.send('Target.createTarget', { url });
+  const created = await client.send('Target.createTarget', { url: 'about:blank' });
   const targetId = created?.targetId;
   if (typeof targetId !== 'string' || targetId.length === 0) {
     throw new Error('Target.createTarget returned no targetId');
   }
   const { sessionId } = await sessionFor(targetId);
-  await waitForLoad(client, sessionId);
+  if (url === 'about:blank') await waitForLoad(client, sessionId);
+  else await navigateAndWait(client, sessionId, url);
   const live = (await listTabs()).find((tab) => tab.targetId === targetId);
   return live ?? { targetId, url, title: '' };
 }
@@ -167,7 +209,11 @@ function evalSourceAsync(tab, source) {
 
 export { evalSource as eval, evalSourceAsync as evalAsync };
 
-async function evaluate(tab, source, awaitPromise) {
+function evaluate(tab, source, awaitPromise) {
+  return using(() => evaluateNow(tab, source, awaitPromise));
+}
+
+async function evaluateNow(tab, source, awaitPromise) {
   const { client, sessionId } = await sessionFor(targetIdOf(tab));
   const result = await client.send(
     'Runtime.evaluate',
@@ -186,6 +232,10 @@ async function evaluate(tab, source, awaitPromise) {
 
 export async function cookie(tab, name) {
   if (typeof name !== 'string') throw new TypeError('browser.cookie: name must be a string');
+  return using(() => cookieNow(tab, name));
+}
+
+async function cookieNow(tab, name) {
   const { client, sessionId } = await sessionFor(targetIdOf(tab));
   const result = await client.send('Network.getCookies', {}, sessionId);
   const cookies = Array.isArray(result?.cookies) ? result.cookies : [];
@@ -284,6 +334,34 @@ function pageIsSettled(client, sessionId) {
     });
 }
 
+function navigateAndWait(client, sessionId, url) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    let timer;
+    const finish = (error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      client.off('Page.loadEventFired', listener);
+      if (error) reject(error);
+      else resolve();
+    };
+    const listener = (message) => {
+      if (typeof message?.sessionId === 'string' && message.sessionId !== sessionId) return;
+      finish();
+    };
+    client.on('Page.loadEventFired', listener);
+    timer = setTimeout(() => finish(), LOAD_TIMEOUT_MS);
+    client.send('Page.navigate', { url }, sessionId).then(
+      (result) => {
+        if (result?.errorText) finish(new Error(`navigate: ${result.errorText}`));
+        else if (!result?.loaderId) finish();
+      },
+      (error) => finish(error)
+    );
+  });
+}
+
 function waitForLoad(client, sessionId) {
   return new Promise((resolve, reject) => {
     let settled = false;
@@ -396,9 +474,11 @@ function makeHandle(sub) {
               : patch.urlMatch;
       }
       if (patch.filter !== undefined) wire.filter = patch.filter;
-      await callRouter(
-        sub.targetId,
-        `globalThis.__sliccWsRouter.update(${JSON.stringify(sub.id)}, ${JSON.stringify(wire)})`
+      await using(() =>
+        callRouter(
+          sub.targetId,
+          `globalThis.__sliccWsRouter.update(${JSON.stringify(sub.id)}, ${JSON.stringify(wire)})`
+        )
       );
       if (wire.urlMatch === null) delete sub.urlMatch;
       else if (wire.urlMatch !== undefined) sub.urlMatch = wire.urlMatch;
@@ -409,9 +489,8 @@ function makeHandle(sub) {
     async close() {
       if (!subscribers.has(sub.id)) return false;
       subscribers.delete(sub.id);
-      await callRouter(
-        sub.targetId,
-        `globalThis.__sliccWsRouter.unregister(${JSON.stringify(sub.id)})`
+      await using(() =>
+        callRouter(sub.targetId, `globalThis.__sliccWsRouter.unregister(${JSON.stringify(sub.id)})`)
       );
       return true;
     },
@@ -452,27 +531,30 @@ export const websocket = {
       },
       async forward(sink) {
         validateSink(sink);
-        await installRouter(targetId);
-        const id = `wssub-${seq++}-${Date.now().toString(36)}`;
-        const sub = {
-          id,
-          targetId,
-          forward: sink,
-          createdAt: new Date().toISOString(),
-        };
-        if (urlMatch !== undefined) sub.urlMatch = urlMatch;
-        if (selector !== undefined) sub.filter = selector;
-        const registered = { id };
-        if (urlMatch !== undefined) registered.urlMatch = urlMatch;
-        if (selector !== undefined) registered.filter = selector;
-        await callRouter(
-          targetId,
-          `globalThis.__sliccWsRouter.register(${JSON.stringify(registered)})`
-        );
-        subscribers.set(id, sub);
-        return makeHandle(sub);
+        return using(() => subscribe(sink));
       },
     };
+    async function subscribe(sink) {
+      await installRouter(targetId);
+      const id = `wssub-${seq++}-${Date.now().toString(36)}`;
+      const sub = {
+        id,
+        targetId,
+        forward: sink,
+        createdAt: new Date().toISOString(),
+      };
+      if (urlMatch !== undefined) sub.urlMatch = urlMatch;
+      if (selector !== undefined) sub.filter = selector;
+      const registered = { id };
+      if (urlMatch !== undefined) registered.urlMatch = urlMatch;
+      if (selector !== undefined) registered.filter = selector;
+      await callRouter(
+        targetId,
+        `globalThis.__sliccWsRouter.register(${JSON.stringify(registered)})`
+      );
+      subscribers.set(id, sub);
+      return makeHandle(sub);
+    }
     return builder;
   },
   async list() {