miijs 2.1.1 → 2.1.2

package/fflWrapper.js

@@ -0,0 +1,41 @@
+// Compatibility layer for ffl.js
+const structFu = require('struct-fu');
+
+// Monkey-patch struct-fu BEFORE ffl.js loads
+const originalStruct = structFu.struct;
+structFu.struct = function(...args) {
+    const result = originalStruct.apply(this, args);
+    const originalUnpack = result.unpack;
+    const originalPack = result.pack;
+    
+    result.unpack = function(data) {
+        if (data && !(data instanceof Buffer) && data.buffer) {
+            data = Buffer.from(data);
+        }
+        return originalUnpack.call(this, data);
+    };
+    
+    result.pack = function(obj) {
+        if (obj && typeof obj === 'object') {
+            for (let key in obj) {
+                if (key.startsWith('_padding') && Array.isArray(obj[key])) {
+                    obj[key] = Buffer.from(obj[key]);
+                }
+            }
+        }
+        return originalPack.call(this, obj);
+    };
+    
+    return result;
+};
+
+// Set up globals
+global._ = structFu;
+global.THREE = require('three');
+
+// Load ffl.js - it will use the patched struct-fu
+const fflPath = require.resolve('ffl.js/ffl.js');
+delete require.cache[fflPath]; // Clear cache
+const fflModule = require('ffl.js/ffl.js');
+
+module.exports = fflModule;

package/index.js

@@ -12,12 +12,11 @@ const asmCrypto=require("./asmCrypto.js");
 const path=require("path");
 const createGL = require('gl');
 
-const req=require("require-esm-in-cjs");
 const {
   createCharModel, initCharModelTextures,
   initializeFFL, exitFFL, parseHexOrB64ToUint8Array,
   setIsWebGL1State, getCameraForViewType, ViewType
-} = req("ffl.js/ffl.js");
+} = require("./fflWrapper.js");
 const ModuleFFL = require("ffl.js/examples/ffl-emscripten-single-file.js");
 const FFLShaderMaterial = require("ffl.js/FFLShaderMaterial.js");
 
@@ -65,8 +64,11 @@ function getFFLRes() {
     // If we've already tried loading, just return the result
     if (_fflRes !== undefined) return _fflRes;
     for (const path of [ "./FFLResHigh.dat", "./ffl/FFLResHigh.dat" ]) {
-        if (fs.existsSync(path))
-            return _fflRes = new Uint8Array(fs.readFileSync(path));
+        if (fs.existsSync(path)) {
+            // Convert Buffer to Uint8Array explicitly
+            const buffer = fs.readFileSync(path);
+            return _fflRes = new Uint8Array(buffer);
+        }
     }
     // If no file found, mark as null
     return _fflRes = null;
@@ -1955,9 +1957,9 @@ function convertMiiToStudio(jsonIn) {
     var mii = jsonIn;
     var studioMii = new Uint8Array([0x08, 0x00, 0x40, 0x03, 0x08, 0x04, 0x04, 0x02, 0x02, 0x0c, 0x03, 0x01, 0x06, 0x04, 0x06, 0x02, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x00, 0x0a, 0x01, 0x00, 0x21, 0x40, 0x04, 0x00, 0x02, 0x14, 0x03, 0x13, 0x04, 0x17, 0x0d, 0x04, 0x00, 0x0a, 0x04, 0x01, 0x09]);
     studioMii[0x16] = mii.general.gender;
-    studioMii[0x15] = mii.info.favoriteColor;
-    studioMii[0x1E] = mii.info.height;
-    studioMii[2] = mii.info.weight;
+    studioMii[0x15] = mii.general.favoriteColor;
+    studioMii[0x1E] = mii.general.height;
+    studioMii[2] = mii.general.weight;
     studioMii[0x13] = lookupTables.faces.values[mii.face.type];
     studioMii[0x11] = mii.face.color;
     studioMii[0x14] = mii.face.feature;
@@ -1985,7 +1987,7 @@ function convertMiiToStudio(jsonIn) {
     studioMii[0x2B] = mii.nose.size;
     studioMii[0x2D] = mii.nose.yPosition;
     studioMii[0x26] = lookupTables.mouths.values[mii.mouth.page][mii.mouth.type];
-    studioMii[0x24] = mii.mouth.col;
+    studioMii[0x24] = mii.mouth.color;
     if (studioMii[0x24] < 4) {
         studioMii[0x24] += 19;
     } else {
@@ -1993,15 +1995,15 @@ function convertMiiToStudio(jsonIn) {
     }
     studioMii[0x25] = mii.mouth.size;
     studioMii[0x23] = mii.mouth.squash;
-    studioMii[0x27] = mii.mouth.yPos;
-    studioMii[0x29] = mii.facialHair.mustacheType;
-    studioMii[1] = mii.facialHair.beardType;
-    studioMii[0] = lookupTables.hairCols.indexOf(mii.facialHair.col);
+    studioMii[0x27] = mii.mouth.yPosition;
+    studioMii[0x29] = mii.beard.mustache.type;
+    studioMii[1] = mii.beard.beardType;
+    studioMii[0] = mii.beard.color;
     if (!studioMii[0]) studioMii[0] = 8;
-    studioMii[0x28] = mii.facialHair.mustacheSize;
-    studioMii[0x2A] = mii.facialHair.mustacheYPos;
+    studioMii[0x28] = mii.beard.mustache.size;
+    studioMii[0x2A] = mii.beard.mustache.yPosition;
     studioMii[0x19] = mii.glasses.type;
-    studioMii[0x17] = lookupTables.glassesCols3DS.indexOf(mii.glasses.col);
+    studioMii[0x17] = mii.glasses.color;
     if (!studioMii[0x17]) {
         studioMii[0x17] = 8;
     } else if (studioMii[0x17] < 6) {
@@ -2115,16 +2117,20 @@ async function createFFLMiiIcon(data, width, height, fflRes) {
 
     let ffl, currentCharModel;
 
-    //const _realConsoleDebug = console.debug;
-    //console.debug = () => { };
+    const _realConsoleDebug = console.debug;
+    console.debug = () => { };
     try {
         // Initialize FFL
         ffl = await initializeFFL(fflRes, ModuleFFL);
 
         // Create Mii model and add to the scene.
         const studioRaw = parseHexOrB64ToUint8Array(data); // Parse studio data
-        currentCharModel = createCharModel(studioRaw, null,
-          FFLShaderMaterial, ffl.module);
+        
+        // Convert Uint8Array to Buffer for struct-fu compatibility
+        const studioBuffer = Buffer.from(studioRaw);
+        
+        currentCharModel = createCharModel(studioBuffer, null,
+        FFLShaderMaterial, ffl.module);
         initCharModelTextures(currentCharModel, renderer); // Initialize fully
         scene.add(currentCharModel.meshes); // Add to scene
 
@@ -2170,13 +2176,13 @@ async function createFFLMiiIcon(data, width, height, fflRes) {
     }
 }
 async function renderMii(jsonIn, fflRes=getFFLRes()){
-  if(!["3ds","wii u"].includes(jsonIn.console?.toLowerCase())){
-      jsonIn=convertMii(jsonIn);
-  }
-  const studioMii = convertMiiToStudio(jsonIn);
-  const width = height = 600;
+    if(!["3ds","wii u"].includes(jsonIn.console?.toLowerCase())){
+        jsonIn=convertMii(jsonIn);
+    }
+    const studioMii = convertMiiToStudio(jsonIn);
+    const width = height = 600;
 
-  return createFFLMiiIcon(studioMii, width, height, fflRes);
+    return createFFLMiiIcon(studioMii, width, height, fflRes);
 }
 async function writeWiiBin(jsonIn, outPath) {
     if (jsonIn.console?.toLowerCase() !== "wii") {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "miijs",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Work with Mii characters in every possible way needed for your project.",
   "main": "index.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "postinstall": "node ./patch-ffl.js"
   },
   "repository": {
     "type": "git",
@@ -26,7 +27,7 @@
   "homepage": "https://github.com/KestronProgramming/MiiJS#readme",
   "dependencies": {
     "canvas": "^3.1.0",
-    "ffl.js": "github:ariankordi/FFL.js#4f83ae2",
+    "ffl.js": "github:ariankordi/FFL.js#06ede8f",
     "gl": "^8.1.6",
     "https": "^1.0.0",
     "jimp": "0.22.12",
@@ -35,6 +36,7 @@
     "path": "^0.12.7",
     "qr-code-styling": "^1.9.2",
     "require-esm-in-cjs": "^0.1.0",
+    "struct-fu": "^1.2.1",
     "three": "^0.162.0"
   },
   "devDependencies": {

package/patch-ffl.js

@@ -0,0 +1,48 @@
+const fs = require('fs');
+const path = require('path');
+
+const fflPath = path.join(__dirname, './node_modules/ffl.js/ffl.js');
+
+console.log('Patching ffl.js to have CJS Exports...');
+
+if (!fs.existsSync(fflPath)) {
+    console.error('ffl.js not found at', fflPath);
+    process.exit(1);
+}
+
+let content = fs.readFileSync(fflPath, 'utf8');
+
+// Check if already patched
+if (content.includes('// MIIJS_PATCHED')) {
+    console.log('ffl.js already patched, skipping.');
+    process.exit(0);
+}
+
+content += `
+// MIIJS_PATCHED - CommonJS exports for Node.js
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = {
+        initializeFFL,
+        exitFFL,
+        createCharModel,
+        initCharModelTextures,
+        setIsWebGL1State,
+        parseHexOrB64ToUint8Array,
+        getCameraForViewType,
+        ViewType,
+        CharModel,
+        FFLExpression,
+        FFLModelFlag,
+        FFLResourceType,
+        makeExpressionFlag,
+        TextureShaderMaterial,
+        convertStudioCharInfoToFFLiCharInfo,
+        convertFFLiCharInfoToStudioCharInfo,
+        uint8ArrayToBase64
+    };
+}
+`;
+content=content.replaceAll("console.debug","//console.debug");
+fs.writeFileSync(fflPath, content, 'utf8');
+
+console.log('ffl.js successfully patched.');

package/out.txt

@@ -1,178 +0,0 @@
-{
-    "mouth": {
-        "0": 6,
-        "1": 1,
-        "2": 2,
-        "3": 4,
-        "4": 5,
-        "5": 5,
-        "6": 10,
-        "7": 0,
-        "8": 7,
-        "9": 1,
-        "10": 8,
-        "11": 7,
-        "12": 11,
-        "13": 11,
-        "14": 10,
-        "15": 6,
-        "16": 9,
-        "17": 3,
-        "18": 9,
-        "19": 2,
-        "20": 8,
-        "21": 3,
-        "22": 4,
-        "23": 0
-    },
-    "eyebrows": {
-        "0": 1,
-        "1": 3,
-        "2": 2,
-        "3": 3,
-        "4": 11,
-        "5": 10,
-        "6": 0,
-        "7": 6,
-        "8": 8,
-        "9": 4,
-        "10": 1,
-        "11": 0,
-        "12": 2,
-        "13": 7,
-        "14": 4,
-        "15": 6,
-        "16": 10,
-        "17": 9,
-        "18": 9,
-        "19": 5,
-        "20": 5,
-        "21": 7,
-        "22": 8,
-        "23": 11
-    },
-    "eyes": {
-        "0": 2,
-        "1": 6,
-        "2": 0,
-        "3": 6,
-        "4": 1,
-        "5": 0,
-        "6": 5,
-        "7": 0,
-        "8": 3,
-        "9": 4,
-        "10": 9,
-        "11": 1,
-        "12": 5,
-        "13": 2,
-        "14": 10,
-        "15": 9,
-        "16": 8,
-        "17": 5,
-        "18": 9,
-        "19": 2,
-        "20": 11,
-        "21": 8,
-        "22": 8,
-        "23": 6,
-        "24": 6,
-        "25": 9,
-        "26": 7,
-        "27": 10,
-        "28": 10,
-        "29": 5,
-        "30": 7,
-        "31": 8,
-        "32": 3,
-        "33": 0,
-        "34": 7,
-        "35": 11,
-        "36": 3,
-        "37": 4,
-        "38": 2,
-        "39": 4,
-        "40": 10,
-        "41": 1,
-        "42": 3,
-        "43": 7,
-        "44": 1,
-        "45": 4,
-        "46": 11,
-        "47": 11
-    },
-    "hairs": {
-        "0": 11,
-        "1": 6,
-        "2": 5,
-        "3": 1,
-        "4": 4,
-        "5": 8,
-        "6": 4,
-        "7": 11,
-        "8": 9,
-        "9": 3,
-        "10": 3,
-        "11": 6,
-        "12": 0,
-        "13": 1,
-        "14": 0,
-        "15": 10,
-        "16": 1,
-        "17": 8,
-        "18": 4,
-        "19": 7,
-        "20": 5,
-        "21": 10,
-        "22": 2,
-        "23": 3,
-        "24": 9,
-        "25": 5,
-        "26": 3,
-        "27": 10,
-        "28": 6,
-        "29": 11,
-        "30": 9,
-        "31": 11,
-        "32": 0,
-        "33": 0,
-        "34": 11,
-        "35": 9,
-        "36": 6,
-        "37": 2,
-        "38": 1,
-        "39": 4,
-        "40": 1,
-        "41": 7,
-        "42": 2,
-        "43": 0,
-        "44": 3,
-        "45": 6,
-        "46": 2,
-        "47": 1,
-        "48": 3,
-        "49": 7,
-        "50": 7,
-        "51": 2,
-        "52": 5,
-        "53": 7,
-        "54": 5,
-        "55": 8,
-        "56": 9,
-        "57": 10,
-        "58": 6,
-        "59": 8,
-        "60": 10,
-        "61": 0,
-        "62": 11,
-        "63": 7,
-        "64": 9,
-        "65": 8,
-        "66": 4,
-        "67": 4,
-        "68": 10,
-        "69": 2,
-        "70": 5,
-        "71": 8
-    }
-}

package/stuff.js

@@ -1,208 +0,0 @@
-var types={
-    mouth: {
-        '0': '113',
-        '1': '121',
-        '2': '131',
-        '3': '122',
-        '4': '132',
-        '5': '132',
-        '6': '124',
-        '7': '111',
-        '8': '123',
-        '9': '121',
-        '10': '133',
-        '11': '123',
-        '12': '134',
-        '13': '134',
-        '14': '124',
-        '15': '113',
-        '16': '114',
-        '17': '112',
-        '18': '114',
-        '19': '131',
-        '20': '133',
-        '21': '112',
-        '22': '122',
-        '23': '111'
-    },
-    eyebrows:{
-        '0': '121',
-        '1': '112',
-        '2': '231',
-        '3': '212',
-        '4': '134',
-        '5': '124',
-        '6': '111',
-        '7': '113',
-        '8': '133',
-        '9': '122',
-        '10': '221',
-        '11': '211',
-        '12': '131',
-        '13': '223',
-        '14': '222',
-        '15': '213',
-        '16': '224',
-        '17': '114',
-        '18': '214',
-        '19': '132',
-        '20': '232',
-        '21': '123',
-        '22': '233',
-        '23': '234'
-    },
-    eyes:{
-        '0': '131',
-        '1': '113',
-        '2': '111',
-        '3': '413',
-        '4': '121',
-        '5': '311',
-        '6': '332',
-        '7': '411',
-        '8': '112',
-        '9': '222',
-        '10': '414',
-        '11': '221',
-        '12': '232',
-        '13': '331',
-        '14': '424',
-        '15': '114',
-        '16': '133',
-        '17': '132',
-        '18': '314',
-        '19': '231',
-        '20': '134',
-        '21': '233',
-        '22': '433',
-        '23': '213',
-        '24': '313',
-        '25': '214',
-        '26': '123',
-        '27': '124',
-        '28': '324',
-        '29': '432',
-        '30': '323',
-        '31': '333',
-        '32': '212',
-        '33': '211',
-        '34': '223',
-        '35': '234',
-        '36': '312',
-        '37': '322',
-        '38': '431',
-        '39': '122',
-        '40': '224',
-        '41': '321',
-        '42': '412',
-        '43': '423',
-        '44': '421',
-        '45': '422',
-        '46': '334',
-        '47': '434'
-    },
-    hairs:{
-        '0': '534',
-        '1': '413',
-        '2': '632',
-        '3': '521',
-        '4': '422',
-        '5': '433',
-        '6': '522',
-        '7': '434',
-        '8': '414',
-        '9': '612',
-        '10': '512',
-        '11': '513',
-        '12': '411',
-        '13': '421',
-        '14': '511',
-        '15': '624',
-        '16': '621',
-        '17': '533',
-        '18': '622',
-        '19': '423',
-        '20': '532',
-        '21': '524',
-        '22': '531',
-        '23': '312',
-        '24': '614',
-        '25': '432',
-        '26': '412',
-        '27': '424',
-        '28': '613',
-        '29': '634',
-        '30': '314',
-        '31': '134',
-        '32': '211',
-        '33': '111',
-        '34': '334',
-        '35': '514',
-        '36': '313',
-        '37': '231',
-        '38': '321',
-        '39': '122',
-        '40': '121',
-        '41': '323',
-        '42': '331',
-        '43': '311',
-        '44': '112',
-        '45': '113',
-        '46': '631',
-        '47': '221',
-        '48': '212',
-        '49': '123',
-        '50': '223',
-        '51': '131',
-        '52': '232',
-        '53': '623',
-        '54': '332',
-        '55': '233',
-        '56': '114',
-        '57': '324',
-        '58': '213',
-        '59': '133',
-        '60': '224',
-        '61': '611',
-        '62': '234',
-        '63': '523',
-        '64': '214',
-        '65': '333',
-        '66': '222',
-        '67': '322',
-        '68': '124',
-        '69': '431',
-        '70': '132',
-        '71': '633'
-    }
-};
-var types2={};
-var mappings=[
-11,21,31,
-12,22,32,
-13,23,33,
-14,24,34];
-Object.keys(types).forEach(key=>{
-    types2[key]={};
-    Object.keys(types[key]).forEach(num=>{
-        types2[key][num]=mappings.indexOf(+(types[key][num].slice(1,3)));
-
-    });
-});
-require("fs").writeFileSync("./out.txt",JSON.stringify(types2,0,4));
-
-
-/*
-How it should be
-0, 1, 2
-3, 4, 5
-6, 7, 8
-9,10,11
-
-How it is
-11,21,31,
-12,22,32,
-13,23,33,
-14,24,34
-*/
-