@lazyneoaz/metachat 6.0.3 → 6.0.5

package/dist/index.cjs

@@ -85890,7 +85890,7 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
     }
   }
   if (!state.inflight) {
-    state.inflight = scrapeTokens(ctx, defaultFuncs, state).finally(() => {
+    state.inflight = scrapeTokens(ctx, defaultFuncs, state, force).finally(() => {
       state.inflight = null;
     });
   }
@@ -85900,10 +85900,11 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
   }
   applyCached(ctx, state);
 }
-async function scrapeTokens(ctx, defaultFuncs, state) {
+async function scrapeTokens(ctx, defaultFuncs, state, force = false) {
   state.attemptedAt = Date.now();
   try {
-    const res = await defaultFuncs.get("https://www.facebook.com/", ctx.jar);
+    const url2 = force ? `https://www.facebook.com/?_nc_hashed_token=${Date.now().toString(36)}${Math.floor(Math.random() * 1e6).toString(36)}` : "https://www.facebook.com/";
+    const res = await defaultFuncs.get(url2, ctx.jar);
     const html3 = htmlOf(res);
     if (!html3) {
       state.failures++;
@@ -90205,10 +90206,24 @@ function collectTracks(payload) {
 }
 
 // src/deltas/apis/music/searchMusic.ts
+var MUSIC_CACHE_TTL_MS = 5 * 60 * 1e3;
 function nextRequestId(ctx) {
   ctx.__reqCounter = (typeof ctx.__reqCounter === "number" ? ctx.__reqCounter : 0) + 1;
   return ctx.__reqCounter.toString(36);
 }
+var MUSIC_MIN_INTERVAL_MS = 1100;
+async function paceMusic(ctx) {
+  const configured = Number(ctx?.globalOptions?.musicMinIntervalMs);
+  const min = Number.isFinite(configured) && configured >= 0 ? configured : MUSIC_MIN_INTERVAL_MS;
+  const last2 = typeof ctx.__musicLastCallAt === "number" ? ctx.__musicLastCallAt : 0;
+  const wait = last2 + min - Date.now();
+  if (wait > 0) await sleep(wait);
+  ctx.__musicLastCallAt = Date.now();
+}
+function cacheResult(ctx, key, result) {
+  const cache = ctx.__musicCache || (ctx.__musicCache = {});
+  cache[key] = { at: Date.now(), result };
+}
 function normalizeError(error2) {
   if (!error2 || typeof error2 !== "object") {
     const message2 = String(error2);
@@ -90230,6 +90245,13 @@ function normalizeError(error2) {
 }
 function searchMusic_default(defaultFuncs, _api, ctx) {
   async function runSearch(text3, count, selectedOptions, callback) {
+    const cacheKey = `${selectedOptions.product || PRODUCT}|${count}|${text3}|${selectedOptions.cursor || ""}`;
+    if (!selectedOptions.noCache) {
+      const cache = ctx.__musicCache || (ctx.__musicCache = {});
+      const hit = cache[cacheKey];
+      if (hit && Date.now() - hit.at < MUSIC_CACHE_TTL_MS) return hit.result;
+    }
+    await paceMusic(ctx);
     const params = { first: count };
     if (text3) params.search_text = text3;
     if (selectedOptions.cursor) params.after = String(selectedOptions.cursor);
@@ -90302,11 +90324,12 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
       result.endCursor = page.endCursor;
       result.hasNextPage = page.hasNextPage;
       result.query = text3;
+      cacheResult(ctx, cacheKey, result);
       return result;
     }
-    for (let retry = 0; retry < 3; retry++) {
-      await sleep(600 + retry * 900);
-      const retried = await attempt(true);
+    for (let retry = 0; retry < 6; retry++) {
+      await sleep(1e3 + retry * 600 + Math.floor(Math.random() * 350));
+      const retried = await attempt(retry >= 3 || !hasCometTokens(ctx));
       if (isStaleTokenError(retried) || retried?.error || (retried?.errors || []).length) continue;
       const retryPage = collectTracks(retried);
       const retryTracks = retryPage.tracks.slice(0, count);
@@ -90316,6 +90339,7 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
         result.endCursor = retryPage.endCursor;
         result.hasNextPage = retryPage.hasNextPage;
         result.query = text3;
+        cacheResult(ctx, cacheKey, result);
         return result;
       }
     }

package/dist/index.mjs

@@ -85858,7 +85858,7 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
     }
   }
   if (!state.inflight) {
-    state.inflight = scrapeTokens(ctx, defaultFuncs, state).finally(() => {
+    state.inflight = scrapeTokens(ctx, defaultFuncs, state, force).finally(() => {
       state.inflight = null;
     });
   }
@@ -85868,10 +85868,11 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
   }
   applyCached(ctx, state);
 }
-async function scrapeTokens(ctx, defaultFuncs, state) {
+async function scrapeTokens(ctx, defaultFuncs, state, force = false) {
   state.attemptedAt = Date.now();
   try {
-    const res = await defaultFuncs.get("https://www.facebook.com/", ctx.jar);
+    const url2 = force ? `https://www.facebook.com/?_nc_hashed_token=${Date.now().toString(36)}${Math.floor(Math.random() * 1e6).toString(36)}` : "https://www.facebook.com/";
+    const res = await defaultFuncs.get(url2, ctx.jar);
     const html3 = htmlOf(res);
     if (!html3) {
       state.failures++;
@@ -90173,10 +90174,24 @@ function collectTracks(payload) {
 }
 
 // src/deltas/apis/music/searchMusic.ts
+var MUSIC_CACHE_TTL_MS = 5 * 60 * 1e3;
 function nextRequestId(ctx) {
   ctx.__reqCounter = (typeof ctx.__reqCounter === "number" ? ctx.__reqCounter : 0) + 1;
   return ctx.__reqCounter.toString(36);
 }
+var MUSIC_MIN_INTERVAL_MS = 1100;
+async function paceMusic(ctx) {
+  const configured = Number(ctx?.globalOptions?.musicMinIntervalMs);
+  const min = Number.isFinite(configured) && configured >= 0 ? configured : MUSIC_MIN_INTERVAL_MS;
+  const last2 = typeof ctx.__musicLastCallAt === "number" ? ctx.__musicLastCallAt : 0;
+  const wait = last2 + min - Date.now();
+  if (wait > 0) await sleep(wait);
+  ctx.__musicLastCallAt = Date.now();
+}
+function cacheResult(ctx, key, result) {
+  const cache = ctx.__musicCache || (ctx.__musicCache = {});
+  cache[key] = { at: Date.now(), result };
+}
 function normalizeError(error2) {
   if (!error2 || typeof error2 !== "object") {
     const message2 = String(error2);
@@ -90198,6 +90213,13 @@ function normalizeError(error2) {
 }
 function searchMusic_default(defaultFuncs, _api, ctx) {
   async function runSearch(text3, count, selectedOptions, callback) {
+    const cacheKey = `${selectedOptions.product || PRODUCT}|${count}|${text3}|${selectedOptions.cursor || ""}`;
+    if (!selectedOptions.noCache) {
+      const cache = ctx.__musicCache || (ctx.__musicCache = {});
+      const hit = cache[cacheKey];
+      if (hit && Date.now() - hit.at < MUSIC_CACHE_TTL_MS) return hit.result;
+    }
+    await paceMusic(ctx);
     const params = { first: count };
     if (text3) params.search_text = text3;
     if (selectedOptions.cursor) params.after = String(selectedOptions.cursor);
@@ -90270,11 +90292,12 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
       result.endCursor = page.endCursor;
       result.hasNextPage = page.hasNextPage;
       result.query = text3;
+      cacheResult(ctx, cacheKey, result);
       return result;
     }
-    for (let retry = 0; retry < 3; retry++) {
-      await sleep(600 + retry * 900);
-      const retried = await attempt(true);
+    for (let retry = 0; retry < 6; retry++) {
+      await sleep(1e3 + retry * 600 + Math.floor(Math.random() * 350));
+      const retried = await attempt(retry >= 3 || !hasCometTokens(ctx));
       if (isStaleTokenError(retried) || retried?.error || (retried?.errors || []).length) continue;
       const retryPage = collectTracks(retried);
       const retryTracks = retryPage.tracks.slice(0, count);
@@ -90284,6 +90307,7 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
         result.endCursor = retryPage.endCursor;
         result.hasNextPage = retryPage.hasNextPage;
         result.query = text3;
+        cacheResult(ctx, cacheKey, result);
         return result;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "A modern TypeScript Facebook Chat API client for building reliable Messenger bots, with built-in anti-detection protection, automatic cookie refresh, music search, and AI theme support.",
   "license": "MIT",
   "author": {