facebetter 1.4.1 → 1.4.2

package/dist/facebetter.esm.js

@@ -212,6 +212,158 @@ var constants = /*#__PURE__*/Object.freeze({
   VirtualBackgroundOptions: VirtualBackgroundOptions$1
 });
 
+/**
+ * Browser localStorage cache for online license JSON (WASM path).
+ * Aligns with native: full server response body, TTL from response.timestamp (seconds).
+ */
+
+/** @type {number} Same semantics as C++ kOnlineLicenseCacheTtlSecs */
+const ONLINE_LICENSE_CACHE_TTL_SEC = 7 * 24 * 3600;
+
+const STORAGE_PREFIX = 'facebetter.onlineLicense.v1:';
+
+/**
+ * @returns {boolean}
+ */
+function isLocalStorageAvailable() {
+  try {
+    if (typeof globalThis.localStorage === 'undefined') {
+      return false;
+    }
+    const k = '__fb_ls_test__';
+    globalThis.localStorage.setItem(k, '1');
+    globalThis.localStorage.removeItem(k);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * @param {string} appId
+ * @returns {string}
+ */
+function storageKey(appId) {
+  return `${STORAGE_PREFIX}${appId}`;
+}
+
+/**
+ * @param {string} responseText
+ * @param {string} expectedAppId
+ * @returns {{ ok: boolean, ts: number } | null}
+ */
+function parseAndValidateResponse(responseText, expectedAppId) {
+  try {
+    const o = JSON.parse(responseText);
+    if (!o || typeof o !== 'object') {
+      return null;
+    }
+    if (o.success !== true) {
+      return null;
+    }
+    if (typeof o.app_id !== 'string' || o.app_id !== expectedAppId) {
+      return null;
+    }
+    if (typeof o.timestamp !== 'number' || !Number.isFinite(o.timestamp)) {
+      return null;
+    }
+    return { ok: true, ts: o.timestamp };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Returns cached raw response body if still within TTL, else null.
+ * @param {string} appId
+ * @returns {string | null}
+ */
+function readOnlineLicenseCache(appId) {
+  if (!appId || !isLocalStorageAvailable()) {
+    return null;
+  }
+  let raw;
+  try {
+    raw = globalThis.localStorage.getItem(storageKey(appId));
+  } catch {
+    return null;
+  }
+  if (!raw || typeof raw !== 'string') {
+    return null;
+  }
+  const meta = parseAndValidateResponse(raw, appId);
+  if (!meta) {
+    return null;
+  }
+  const nowSec = Math.floor(Date.now() / 1000);
+  const ts = meta.ts;
+  const ageSec = ts <= nowSec ? nowSec - ts : 0;
+  if (ageSec > ONLINE_LICENSE_CACHE_TTL_SEC) {
+    return null;
+  }
+  return raw;
+}
+
+/**
+ * Persists successful auth response; no-op if storage unavailable or payload invalid.
+ * @param {string} appId
+ * @param {string} responseText
+ * @returns {boolean}
+ */
+function writeOnlineLicenseCache(appId, responseText) {
+  if (!appId || !isLocalStorageAvailable() || typeof responseText !== 'string') {
+    return false;
+  }
+  if (!parseAndValidateResponse(responseText, appId)) {
+    return false;
+  }
+  try {
+    globalThis.localStorage.setItem(storageKey(appId), responseText);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Browser-side console lines aligned with C++ Logger (src/base/logging.cc) Release pattern:
+ * [%Y-%m-%d %H:%M:%S.%e] [facebetter] [%l] [%t] - %v
+ * spdlog level names: info, warning, error (see spdlog SPDLOG_LEVEL_NAMES).
+ */
+
+function pad2(n) {
+  return String(n).padStart(2, '0');
+}
+
+/**
+ * @param {'info'|'warning'|'error'} levelTag — must match spdlog long level strings
+ * @param {string} message
+ * @returns {string}
+ */
+function formatLogLine(levelTag, message) {
+  const d = new Date();
+  const ms = String(d.getMilliseconds()).padStart(3, '0');
+  const ts = `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())} ${pad2(
+    d.getHours()
+  )}:${pad2(d.getMinutes())}:${pad2(d.getSeconds())}.${ms}`;
+  return `[${ts}] [facebetter] [${levelTag}] [0] - ${message}`;
+}
+
+/** @param {string} message */
+function logInfo(message) {
+  console.info(formatLogLine('info', message));
+}
+
+/** @param {string} message */
+function logWarn(message) {
+  console.warn(formatLogLine('warning', message));
+}
+
+/** @param {string} message */
+function logError(message) {
+  console.error(formatLogLine('error', message));
+}
+
 /**
  * Beauty Effect Engine Core
  * Platform-agnostic engine implementation with dependency injection
@@ -403,26 +555,71 @@ class BeautyEffectEngine {
           };
         }
 
-        // Setup online auth proxy for WASM
+        // Setup online auth proxy for WASM (localStorage cache + fetch, same TTL as native).
+        // 返回 { response, fromCache } 供 WASM 桥区分：仅 fromCache===true 时 C++ 跳过 5 分钟防重放。
         if (!Module.onOnlineAuth) {
           Module.onOnlineAuth = async (payloadJson) => {
+            let appId = '';
             try {
-              const url = 'https://facebetter.pixpark.net/facebetter/v1/auth';
-              const response = await fetch(url, {
+              const p = JSON.parse(payloadJson);
+              if (p && typeof p.app_id === 'string') {
+                appId = p.app_id;
+              }
+            } catch {
+              // ignore malformed payload
+            }
+
+            const authResult = (body, fromCache) =>
+              body ? { response: body, fromCache } : '';
+
+            const cached = appId ? readOnlineLicenseCache(appId) : null;
+            if (cached) {
+              // 与 C++ 中「disk cache」对应；WASM 侧日志仍显示 online，以这里为准区分是否发 HTTP
+              logInfo(
+                'Online license: localStorage cache hit (no auth HTTP)'
+              );
+              return authResult(cached, true);
+            }
+
+            const authUrl = 'https://facebetter.pixpark.net/facebetter/v1/auth';
+            logInfo('Online license: requesting auth server');
+            try {
+              const response = await fetch(authUrl, {
                 method: 'POST',
                 headers: {
-                  'Content-Type': 'application/json'
+                  'Content-Type': 'application/json',
                 },
-                body: payloadJson
+                body: payloadJson,
               });
               if (!response.ok) {
-                console.warn('[JS Engine] Online auth fetch failed with status:', response.status);
-                return "";
+                const fallback = appId ? readOnlineLicenseCache(appId) : null;
+                if (fallback) {
+                  logInfo(
+                    `Online license: using cache after HTTP error (status ${response.status})`
+                  );
+                } else {
+                  logWarn(
+                    `Online license: HTTP ${response.status}, no cache`
+                  );
+                }
+                return authResult(fallback, true);
               }
-              return await response.text();
-            } catch (error) {
-              console.error('[JS Engine] Online auth fetch exception:', error);
-              return "";
+              const text = await response.text();
+              if (appId && text) {
+                writeOnlineLicenseCache(appId, text);
+              }
+              logInfo(
+                'Online license: server response ok, cache updated'
+              );
+              return authResult(text, false);
+            } catch {
+              const fallback = appId ? readOnlineLicenseCache(appId) : null;
+              if (fallback) {
+                logInfo(
+                  'Online license: using cache after network error'
+                );
+              }
+              return authResult(fallback, true);
             }
           };
         }
@@ -855,7 +1052,7 @@ class BeautyEffectEngine {
      try {
        return JSON.parse(jsonStr || '[]');
      } catch (e) {
-       console.error('Failed to parse registered filters JSON:', e);
+       logError(`Failed to parse registered filters JSON: ${e}`);
        return [];
      }
    }
@@ -876,7 +1073,7 @@ class BeautyEffectEngine {
      try {
        return JSON.parse(jsonStr || '[]');
      } catch (e) {
-       console.error('Failed to parse registered stickers JSON:', e);
+       logError(`Failed to parse registered stickers JSON: ${e}`);
        return [];
      }
    }