facebetter 1.4.6 → 1.4.7

package/README.md

@@ -127,6 +127,8 @@ processFrame();
 | `setBasicParam(param, value)` | Adjust skin retouching settings (Smoothing, Whitening, etc.). |
 | `setReshapeParam(param, value)` | Adjust face reshaping settings (Thinning, Eye Size, etc.). |
 | `setMakeupParam(param, value)` | Adjust makeup intensity (Lipstick, Blush, etc.). |
+| `setLipstickStyle(style)` | Switch lipstick style (Rouge / Coral / Pink). |
+| `setBlushStyle(style)` | Switch blush style (Classic / Peach / Rose). |
 | `setFilter(path, intensity)` | Apply a LUT filter with custom intensity. |
 | `setVirtualBackground(options)` | Configure background blur or image replacement. |
 | `processImage(source)` | Process an input source (Image, Video, Canvas, or ImageData). |

package/dist/facebetter.esm.js

@@ -134,6 +134,24 @@ const MakeupParam$1 = {
   Blush: 1        // Blush intensity (0.0: none, 1.0: maximum)
 };
 
+/**
+ * Lipstick style types
+ */
+const LipstickStyle$1 = {
+  Rouge: 0,  // Rose red
+  Coral: 1,  // Coral
+  Pink: 2    // Pink
+};
+
+/**
+ * Blush style types
+ */
+const BlushStyle$1 = {
+  Classic: 0,  // Classic
+  Peach: 1,    // Peach
+  Rose: 2      // Rose
+};
+
 /**
  * Chroma Key parameter enumeration
  */
@@ -204,127 +222,16 @@ var constants = /*#__PURE__*/Object.freeze({
   BackgroundMode: BackgroundMode$1,
   BasicParam: BasicParam$1,
   BeautyType: BeautyType$1,
+  BlushStyle: BlushStyle$1,
   ChromaKeyParam: ChromaKeyParam$1,
   FrameType: FrameType$1,
+  LipstickStyle: LipstickStyle$1,
   MakeupParam: MakeupParam$1,
   MirrorMode: MirrorMode$1,
   ReshapeParam: ReshapeParam$1,
   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
@@ -555,32 +462,9 @@ class BeautyEffectEngine {
           };
         }
 
-        // Setup online auth proxy for WASM (localStorage cache + fetch, same TTL as native).
-        // 返回 { response, fromCache } 供 WASM 桥区分：仅 fromCache===true 时 C++ 跳过 5 分钟防重放。
+        // Setup online auth proxy for WASM（纯在线，失败不回退本地缓存）。
         if (!Module.onOnlineAuth) {
           Module.onOnlineAuth = async (payloadJson) => {
-            let appId = '';
-            try {
-              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 {
@@ -592,34 +476,17 @@ class BeautyEffectEngine {
                 body: payloadJson,
               });
               if (!response.ok) {
-                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);
+                logWarn(`Online license: HTTP ${response.status}`);
+                return '';
               }
               const text = await response.text();
-              if (appId && text) {
-                writeOnlineLicenseCache(appId, text);
-              }
-              logInfo(
-                'Online license: server response ok, cache updated'
+              logInfo('Online license: server response ok');
+              return text;
+            } catch (err) {
+              logWarn(
+                `Online license: network error${err?.message ? `: ${err.message}` : ''}`
               );
-              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);
+              return '';
             }
           };
         }
@@ -832,6 +699,38 @@ class BeautyEffectEngine {
     this._setBeautyParam('SetBeautyParamMakeup', param, value);
   }
 
+  /**
+   * Sets lipstick style/texture
+   * @param {number} style - Style (use LipstickStyle enum, e.g., LipstickStyle.Rouge)
+   */
+  setLipstickStyle(style) {
+    this._ensureInitialized();
+    const Module = this._getWasmModule();
+    const result = Module.ccall(
+      'SetLipstickStyle',
+      'number',
+      ['number', 'number'],
+      [this.enginePtr, style]
+    );
+    checkResult(result, 'Failed to set lipstick style');
+  }
+
+  /**
+   * Sets blush style/texture
+   * @param {number} style - Style (use BlushStyle enum, e.g., BlushStyle.Classic)
+   */
+  setBlushStyle(style) {
+    this._ensureInitialized();
+    const Module = this._getWasmModule();
+    const result = Module.ccall(
+      'SetBlushStyle',
+      'number',
+      ['number', 'number'],
+      [this.enginePtr, style]
+    );
+    checkResult(result, 'Failed to set blush style');
+  }
+
   /**
    * Sets chroma key parameter
    * @param {number} param - Parameter (use ChromaKeyParam enum, e.g., ChromaKeyParam.Similarity)
@@ -1728,6 +1627,8 @@ const BeautyType = BeautyType$1;
 const BasicParam = BasicParam$1;
 const ReshapeParam = ReshapeParam$1;
 const MakeupParam = MakeupParam$1;
+const LipstickStyle = LipstickStyle$1;
+const BlushStyle = BlushStyle$1;
 const ChromaKeyParam = ChromaKeyParam$1;
 const BackgroundMode = BackgroundMode$1;
 const FrameType = FrameType$1;
@@ -1743,5 +1644,5 @@ var index = {
   loadWasmModule
 };
 
-export { BackgroundMode, BasicParam, ESMBeautyEffectEngine as BeautyEffectEngine, BeautyType, ChromaKeyParam, EngineConfig, FacebetterError, FrameType, MakeupParam, MirrorMode, ReshapeParam, VirtualBackgroundOptions, createBeautyEffectEngine, index as default, getWasmBuffer, getWasmModule, loadWasmModule };
+export { BackgroundMode, BasicParam, ESMBeautyEffectEngine as BeautyEffectEngine, BeautyType, BlushStyle, ChromaKeyParam, EngineConfig, FacebetterError, FrameType, LipstickStyle, MakeupParam, MirrorMode, ReshapeParam, VirtualBackgroundOptions, createBeautyEffectEngine, index as default, getWasmBuffer, getWasmModule, loadWasmModule };
 //# sourceMappingURL=facebetter.esm.js.map