@xuda.io/account_module 1.2.273 → 1.2.275

package/index.mjs

@@ -1,8 +1,15 @@
 import path from 'path';
 import _ from 'lodash';
-import { removeBackground } from '@imgly/background-removal-node';
+// import { removeBackground } from '@imgly/background-removal-node';
 import fs from 'node:fs';
 
+import os from 'os';
+import { exec } from 'child_process';
+import util from 'util';
+
+// Convert exec to a promise for cleaner async/await usage
+const execAsync = util.promisify(exec);
+
 global._conf = (
   await import(path.join(process.env.XUDA_HOME, process.env.XUDA_CONFIG), {
     with: { type: 'json' },
@@ -114,7 +121,7 @@ export const update_account_info = async function (req, job_id, headers) {
   }
 
   if (account_obj.account_info?.profile_picture) {
-    await removeBg({ url: account_obj.account_info?.profile_picture }, job_id, headers);
+    await removeBg({ url: account_obj.account_info?.profile_picture, uid }, job_id, headers);
   } else {
     const ai_module = await import(`${module_path}/ai_module/index.mjs`);
     const profile_avatar_ret = ai_module.update_thumbnail('account', account_obj, account_obj.account_project_id, uid, job_id, headers, 'xuda_accounts');
@@ -1554,61 +1561,123 @@ export const get_user_name = async function (uid) {
   }
 };
 
-const removeBg = async function (req, job_id, headers) {
-  // const ASSET_PATH = path.join(process.cwd(), 'assets/imgly-bg');
-  // const config = {
-  //   publicPath: `file://${ASSET_PATH}/`, // Points to your local folder
-  //   debug: true, // Optional: Logs fetch attempts for debugging
-  // };
+// const removeBg = async function (req, job_id, headers) {
+//   // const ASSET_PATH = path.join(process.cwd(), 'assets/imgly-bg');
+//   // const config = {
+//   //   publicPath: `file://${ASSET_PATH}/`, // Points to your local folder
+//   //   debug: true, // Optional: Logs fetch attempts for debugging
+//   // };
 
-  const ASSET_PATH = '/var/xuda/assets/imgly-bg'; // <-- your folder
+//   const ASSET_PATH = '/var/xuda/assets/imgly-bg'; // <-- your folder
 
-  const config = {
-    publicPath: `file://${ASSET_PATH}/`, // ← this fixes everything
-    debug: false,
-    model: 'medium', // or "small" if you want faster/smaller
-  };
-  debugger;
+//   const config = {
+//     publicPath: `file://${ASSET_PATH}/`, // ← this fixes everything
+//     debug: false,
+//     model: 'medium', // or "small" if you want faster/smaller
+//   };
+//   debugger;
+//   const drive_module = await import(`${module_path}/drive_module/index.mjs`);
+//   const { url } = req;
+//   try {
+//     let imageBuffer;
+//     // if (inputPath) {
+//     //   imageBuffer = fs.readFileSync(inputPath);
+//     // }
+
+//     if (url) {
+//       const res = await fetch(url);
+//       if (!res.ok) {
+//         throw new Error(`Failed to fetch image URL: ${res.status} ${res.statusText}`);
+//       }
+//       const arrayBuffer = await res.arrayBuffer();
+//       imageBuffer = Buffer.from(arrayBuffer);
+//     }
+//     const blob = await removeBackground(imageBuffer, config);
+
+//     // Convert to buffer and save
+//     const outputBuffer = Buffer.from(await blob.arrayBuffer());
+
+//     const originalname = 'avatar_' + path.basename(url);
+//     const tempPath = path.join(os.tmpdir(), originalname + Date.now());
+//     fs.writeFileSync(tempPath, outputBuffer);
+
+//     const ext = drive_module.getExtensionFromUrl(url);
+
+//     const file_obj = {
+//       originalname,
+//       path: tempPath,
+//       mimetype: `image/${ext}`,
+//     };
+
+//     const drive_ret = await drive_module.upload_drive_file_user({ uid, path: '/Profile Images' }, job_id, headers, file_obj);
+//     console.log(`Background removed! `, drive_ret);
+//   } catch (error) {
+//     console.error('Error:', error);
+//   }
+// };
+
+const removeBg = async function (req, job_id, headers) {
+  // 1. Load your drive module
   const drive_module = await import(`${module_path}/drive_module/index.mjs`);
-  const { url } = req;
+
+  const { url, uid } = req;
+
   try {
-    let imageBuffer;
-    // if (inputPath) {
-    //   imageBuffer = fs.readFileSync(inputPath);
-    // }
-
-    if (url) {
-      const res = await fetch(url);
-      if (!res.ok) {
-        throw new Error(`Failed to fetch image URL: ${res.status} ${res.statusText}`);
-      }
-      const arrayBuffer = await res.arrayBuffer();
-      imageBuffer = Buffer.from(arrayBuffer);
+    if (!url) {
+      throw new Error('No URL provided in request');
+    }
+
+    // 3. Download the image to a Buffer
+    const res = await fetch(url);
+    if (!res.ok) {
+      throw new Error(`Failed to fetch image URL: ${res.status} ${res.statusText}`);
     }
-    const blob = await removeBackground(imageBuffer, config);
+    const arrayBuffer = await res.arrayBuffer();
+    const imageBuffer = Buffer.from(arrayBuffer);
+
+    // 4. Create Temporary File Paths
+    // rembg works with files, so we must save the buffer to disk first.
+    const tempDir = os.tmpdir();
+    const uniqueId = Date.now() + '_' + Math.random().toString(36).substring(7);
 
-    // Convert to buffer and save
-    const outputBuffer = Buffer.from(await blob.arrayBuffer());
+    const inputExt = path.extname(url) || '.jpg';
+    const tempInputPath = path.join(tempDir, `input_${uniqueId}${inputExt}`);
+    const tempOutputPath = path.join(tempDir, `output_${uniqueId}.png`); // Output is always PNG (transparent)
 
-    const originalname = 'avatar_' + path.basename(url);
-    const tempPath = path.join(os.tmpdir(), originalname + Date.now());
-    fs.writeFileSync(tempPath, outputBuffer);
+    // 5. Write the downloaded image to disk
+    fs.writeFileSync(tempInputPath, imageBuffer);
 
-    const ext = drive_module.getExtensionFromUrl(url);
+    // 6. EXECUTE REMBG via CLI
+    // "rembg i [input] [output]"
+    console.log(`Processing with rembg: ${tempInputPath} -> ${tempOutputPath}`);
+    await execAsync(`rembg i "${tempInputPath}" "${tempOutputPath}"`);
+
+    // 7. Prepare File Object for Drive Upload
+    // Note: The output file now exists at tempOutputPath
+    const originalname = 'avatar_' + path.basename(url, inputExt) + '.png';
 
     const file_obj = {
-      originalname,
-      path: tempPath,
-      mimetype: `image/${ext}`,
+      originalname: originalname,
+      path: tempOutputPath,
+      mimetype: 'image/png', // rembg output is always PNG
     };
 
+    // 8. Upload to Drive
     const drive_ret = await drive_module.upload_drive_file_user({ uid, path: '/Profile Images' }, job_id, headers, file_obj);
-    console.log(`Background removed! `, drive_ret);
+
+    console.log(`Background removed!`, drive_ret);
+
+    // 9. Clean up Input File (Output file might be needed by upload, so clean input only)
+    try {
+      fs.unlinkSync(tempInputPath);
+      // Optional: fs.unlinkSync(tempOutputPath); // Only if upload_drive_file_user handles the file reading fully
+    } catch (cleanupErr) {
+      console.warn('Warning: Failed to cleanup temp input file', cleanupErr);
+    }
+
+    return drive_ret;
   } catch (error) {
-    console.error('Error:', error);
+    console.error('Error processing background removal:', error);
+    throw error;
   }
 };
-
-// Step 1: Create a local assets folder (e.g., in your project root)
-const ASSET_PATH = path.join(process.cwd(), 'assets/imgly-bg'); // e.g., ./assets/imgly-bg
-fs.mkdirSync(ASSET_PATH, { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.273",
+  "version": "1.2.275",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {