facebetter 1.0.7 → 1.0.9

package/lib/index.js

@@ -1,54 +1,24 @@
 /**
- * Node.js Entry Point
- * For Node.js and Electron main process
- * Uses fs.readFileSync for synchronous WASM loading
+ * Node.js CommonJS Entry Point
+ * For require() usage in Node.js
  */
 
-import { readFileSync } from 'fs';
-import { join, dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
-import { BeautyEffectEngine } from '../core/engine.js';
-import { EngineConfig } from '../core/config.js';
-import { FacebetterError } from '../core/errors.js';
-import * as constants from '../core/constants.js';
+const { readFileSync } = require('fs');
+const { join, dirname, resolve } = require('path');
 
-const __filename = fileURLToPath(import.meta.url);
+// Get __dirname equivalent
+const __filename = require.resolve('./index.js');
 const __dirname = dirname(__filename);
 
 // WASM files directory - in package dist/ folder
-// src/engine/web/src/node -> src/engine/web/src -> src/engine/web -> dist
-const wasmBinDir = resolve(__dirname, '../../dist');
+// src/engine/web/lib -> src/engine/web -> dist
+const wasmBinDir = resolve(__dirname, '../dist');
 
-// Node.js-specific WASM loader
+// Import ESM module (Node.js 12+ supports import() for CommonJS)
 let wasmModuleInstance = null;
 let wasmModulePromise = null;
 
-/**
- * Gets the base path of the current module
- * Node.js equivalent of __dirname
- * @returns {string} Base path of the current module
- */
-function getModuleBasePath() {
-  return __dirname;
-}
-
-/**
- * Resolves a relative path to absolute path (Node.js version)
- * @param {string} relativePath - Relative path
- * @returns {string} Absolute path
- */
-function resolvePath(relativePath) {
-  return join(__dirname, relativePath);
-}
-
-/**
- * Loads the WebAssembly module (Node.js version)
- * Uses fs.readFileSync for synchronous loading
- * @param {Object} [options] - Options
- * @param {string} [options.wasmPath] - Custom WASM path (auto-detected if not provided)
- * @returns {Promise<Object>} Promise that resolves with the WASM module
- */
-export async function loadWasmModule(options = {}) {
+async function loadWasmModule(options = {}) {
   if (wasmModuleInstance) {
     return wasmModuleInstance;
   }
@@ -66,13 +36,13 @@ export async function loadWasmModule(options = {}) {
       // Read WASM binary synchronously
       const wasmBinary = readFileSync(wasmPath);
       
-      // Import the WASM module factory
+      // Import the WASM module factory (dynamic import)
       const module = await import(wasmJsPath);
       const FaceBetterModuleFactory = module.default || module;
 
-      // Initialize the module with binary data
+      // Initialize the module
       wasmModuleInstance = await FaceBetterModuleFactory({
-        wasmBinary,  // Direct binary, no network request
+        wasmBinary,
         locateFile: (path) => {
           if (path.endsWith('.wasm')) {
             return wasmPath;
@@ -84,130 +54,45 @@ export async function loadWasmModule(options = {}) {
         }
       });
       
-      if (!wasmModuleInstance) {
-        throw new FacebetterError('Failed to initialize WASM module');
-      }
-
       wasmModuleInstance.ready = true;
       return wasmModuleInstance;
     } catch (e) {
-      throw new FacebetterError(`Failed to load WASM module: ${e.message}`);
+      throw new Error(`Failed to load WASM module: ${e.message}`);
     }
   })();
 
   return wasmModulePromise;
 }
 
-/**
- * Gets the current WASM module instance
- * @returns {Object} WASM module instance
- * @throws {Error} If module is not loaded
- */
-export function getWasmModule() {
-  if (!wasmModuleInstance) {
-    throw new Error('WASM module not loaded. Call loadWasmModule() first or use BeautyEffectEngine.init()');
-  }
-  return wasmModuleInstance;
+// Re-export from ESM module
+async function getExports() {
+  // Import the ESM version
+  const esmModule = await import('../src/node/index.js');
+  return esmModule;
 }
 
-/**
- * Gets the current WASM memory buffer
- * @returns {ArrayBuffer} Current WASM memory buffer
- */
-export function getWasmBuffer() {
-  const Module = getWasmModule();
-  
-  if (Module.buffer) {
-    return Module.buffer;
-  } else if (Module.HEAPU8 && Module.HEAPU8.buffer) {
-    return Module.HEAPU8.buffer;
-  } else if (Module.asm && Module.asm.memory) {
-    return Module.asm.memory.buffer;
-  }
-  
-  throw new Error('Unable to access WASM memory buffer');
-}
+// For CommonJS, we need to export a promise or use async exports
+// This is a limitation - Node.js CommonJS doesn't support async exports well
+// Users should use the ESM version or await the exports
 
-// Node.js doesn't have ImageData, so we need a different approach
-// For Node.js, users should work with raw buffers
-function toImageData(source, width, height) {
-  // In Node.js, we expect Uint8ClampedArray or Buffer
-  if (source instanceof Uint8ClampedArray) {
-    if (width === undefined || height === undefined) {
-      throw new FacebetterError('Width and height are required for Node.js');
-    }
-    // Create a simple object that mimics ImageData
-    return {
-      data: source,
-      width,
-      height
-    };
-  }
-  
-  if (Buffer.isBuffer(source)) {
-    if (width === undefined || height === undefined) {
-      throw new FacebetterError('Width and height are required for Node.js');
-    }
-    return {
-      data: new Uint8ClampedArray(source),
-      width,
-      height
-    };
-  }
+module.exports = {
+  // Export a function that returns the actual exports
+  async getFacebetter() {
+    const exports = await getExports();
+    return exports;
+  },
   
-  throw new FacebetterError('Unsupported image source type for Node.js. Use Uint8ClampedArray or Buffer.');
-}
-
-// Node.js doesn't support online auth (no fetch in older versions)
-// Users should provide licenseJson directly
-async function verifyAppKeyOnline(appId, appKey) {
-  throw new FacebetterError('Online authentication is not supported in Node.js. Please provide licenseJson directly.');
-}
-
-// No GPU canvas in Node.js
-function ensureGPUPixelCanvas() {
-  // No-op for Node.js
-}
-
-function cleanupGPUPixelCanvas() {
-  // No-op for Node.js
-}
-
-// Create platform API
-const platformAPI = {
-  loadWasmModule: () => loadWasmModule(),
-  getWasmModule,
-  getWasmBuffer,
-  toImageData,
-  verifyAppKeyOnline,
-  ensureGPUPixelCanvas,
-  cleanupGPUPixelCanvas
-};
-
-// Export factory function
-export function createBeautyEffectEngine(config) {
-  return new BeautyEffectEngine(config, platformAPI);
-}
-
-// Export all constants and classes
-export {
-  BeautyEffectEngine,
-  EngineConfig,
-  FacebetterError,
-  BeautyType: constants.BeautyType,
-  BasicParam: constants.BasicParam,
-  ReshapeParam: constants.ReshapeParam,
-  MakeupParam: constants.MakeupParam,
-  BackgroundMode: constants.BackgroundMode,
-  ProcessMode: constants.ProcessMode
+  // Export loadWasmModule
+  loadWasmModule
 };
 
-// Default export
-export default {
-  BeautyEffectEngine: (config) => new BeautyEffectEngine(config, platformAPI),
-  EngineConfig,
-  FacebetterError,
-  ...constants,
-  loadWasmModule
+// Also try to export synchronously (may not work if module needs async init)
+// This is a workaround for CommonJS compatibility
+let cachedExports = null;
+module.exports.getSync = () => {
+  if (!cachedExports) {
+    throw new Error('Module not initialized. Use getFacebetter() or loadWasmModule() first.');
+  }
+  return cachedExports;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "facebetter",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "description": "Face beauty effects SDK with WebAssembly support",
   "main": "lib/index.js",
@@ -20,7 +20,6 @@
       "require": "./lib/index.js",
       "default": "./dist/facebetter.js"
     },
-    "./wasm": "./dist/facebetter.wasm",
     "./wasm.js": "./dist/facebetter_wasm.js"
   },
   "scripts": {