fastqr 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26fd3c0bc6d11317f8660a7b89a69986d5619d4b78800f1a735370488f6fc73
-  data.tar.gz: a179b19e3f7f02ecec67c150ab33515795d4e9badb3dd50b704d3b76dd4cfd5d
+  metadata.gz: ebdc094c4b99f58f52cb8e96663c42b155a036f419b2fa80239a92bbfb512eb9
+  data.tar.gz: 6dbb33c8d3dd4c35e34db189d47f9ce18490f474fa8faebfa41d843b66ae833f
 SHA512:
-  metadata.gz: 268ac8155f79b118f4ea4799542d13fcbd80c887681419a1c7052f5e9d13758a127a53cd7d6d047bed9133fab35704808298d98dd03050e971799e3ace12732d
-  data.tar.gz: a143f9911fda2c20a62d8208d4a48e6a3f143a28360a9a9c659a8a7615b8a64826a44be9a2c4ef4a6f9982e3656c0a83dd7dcb32b9c803c4a6100cb40942ee44
+  metadata.gz: 69e544be8d0454fccb215e7af53cbf8b0f3b50f0491f8cb3802b5070adcdae6265f82e795176488b4105bd174d9e000f37d53446c7f577684488ba28bfa2285f
+  data.tar.gz: 7c2a36f574a7f61cb68d4d317e2e413a5241a86a37e7b2421f0bef36ac653fc1f52158752d41260471f9746eac276a75933e3d7473a8669e736f97929cd0f376

data/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(fastqr VERSION 1.0.8 LANGUAGES CXX C)
+project(fastqr VERSION 1.0.9 LANGUAGES CXX C)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/bindings/nodejs/index.js

@@ -4,45 +4,63 @@
  */
 
 const platform = require('./lib/platform');
-const ffi = require('ffi-napi');
-const ref = require('ref-napi');
+const { execFileSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
 
 let fastqr;
 
-// Try to load pre-built binary first, fall back to compiled addon
+// Use pre-built CLI binary (no FFI needed!)
 if (platform.isPrebuiltAvailable()) {
-  // Load via FFI
-  const libPath = platform.getPrebuiltPath();
-
-  // Define C struct for options
-  const QROptionsStruct = ref.types.void; // Use void* for simplicity, C function handles NULL
-
-  const lib = ffi.Library(libPath, {
-    'fastqr_generate': ['int', ['string', 'string', 'pointer']],
-    'fastqr_version': ['string', []]
-  });
-
-  // Wrap FFI functions to match Node addon interface
+  const cliPath = path.join(__dirname, 'prebuilt', platform.getPlatformString(), 'bin', 'fastqr');
+  
+  if (!fs.existsSync(cliPath)) {
+    throw new Error(
+      'FastQR CLI binary not found. Expected at: ' + cliPath + '\n' +
+      'Please reinstall the package: npm install fastqr-pro'
+    );
+  }
+
+  // Wrap CLI to match API interface
   fastqr = {
     generate: function(data, outputPath, options = {}) {
-      // For now, pass NULL - C function uses defaults
-      // TODO: Build C struct for full options support
-      const result = lib.fastqr_generate(data, outputPath, ref.NULL);
-      return result === 1; // C returns 1 for success, 0 for failure
+      const args = [data, outputPath];
+      
+      // Support both new 'size' and legacy 'width'/'height'
+      const size = options.size || options.width || options.height || 300;
+      args.push('-s', size.toString());
+      
+      if (options.optimizeSize) args.push('-o');
+      if (options.foreground) args.push('-f', options.foreground.join(','));
+      if (options.background) args.push('-b', options.background.join(','));
+      if (options.errorLevel) args.push('-e', options.errorLevel);
+      if (options.logo) args.push('-l', options.logo);
+      if (options.logoSize) args.push('-p', options.logoSize.toString());
+      if (options.quality) args.push('-q', options.quality.toString());
+      
+      try {
+        execFileSync(cliPath, args, { stdio: 'pipe' });
+        return true;
+      } catch (error) {
+        return false;
+      }
     },
     version: function() {
-      return lib.fastqr_version();
+      try {
+        const output = execFileSync(cliPath, ['-v'], { encoding: 'utf8' });
+        return output.trim().replace('FastQR v', '');
+      } catch (error) {
+        return 'unknown';
+      }
     },
-    VERSION: lib.fastqr_version()
+    VERSION: null  // Will be set below
   };
-} else if (platform.isAddonAvailable()) {
-  // Load compiled addon
-  fastqr = require(platform.getAddonPath());
+  
+  fastqr.VERSION = fastqr.version();
 } else {
   throw new Error(
     'FastQR native binding not found. ' +
-    'Please run: npm install --build-from-source'
+    'No pre-built binary available for your platform: ' + process.platform + '-' + process.arch
   );
 }
 
@@ -157,8 +175,7 @@ function generateBatch(dataArray, outputDir, options = {}) {
         fs.writeFileSync(tempFile, dataArray.join('\n'), 'utf8');
 
         // Get CLI path
-        const cliPath = platform.getPrebuiltPath().replace('.dylib', '').replace('.so', '');
-        const actualCliPath = cliPath.endsWith('fastqr') ? cliPath : path.join(path.dirname(cliPath), 'fastqr');
+        const cliPath = path.join(__dirname, 'prebuilt', platform.getPlatformString(), 'bin', 'fastqr');
 
         // Build command arguments
         const args = ['-F', tempFile, outputDir];
@@ -171,7 +188,7 @@ function generateBatch(dataArray, outputDir, options = {}) {
         if (options.logoSize) args.push('-p', options.logoSize.toString());
         if (options.quality) args.push('-q', options.quality.toString());
 
-        execFileSync(actualCliPath, args, { stdio: 'pipe' });
+        execFileSync(cliPath, args, { stdio: 'pipe' });
 
         return { success: dataArray.length, failed: 0 };
     } catch (error) {

data/bindings/nodejs/lib/platform.js

@@ -65,8 +65,33 @@ function findFastQRBinary() {
   throw new Error(`Pre-built binary not found for ${platform}`);
 }
 
+/**
+ * Checks if pre-built binary is available
+ * @returns {boolean}
+ */
+function isPrebuiltAvailable() {
+  try {
+    const platform = detectPlatform();
+    const prebuiltDir = path.join(__dirname, '..', 'prebuilt', platform, 'bin');
+    const binaryPath = path.join(prebuiltDir, 'fastqr');
+    return fs.existsSync(binaryPath);
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * Gets platform string
+ * @returns {string}
+ */
+function getPlatformString() {
+  return detectPlatform();
+}
+
 module.exports = {
   detectPlatform,
   extractBinary,
-  findFastQRBinary
+  findFastQRBinary,
+  isPrebuiltAvailable,
+  getPlatformString
 };

data/bindings/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastqr-pro",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Fast QR code generator with UTF-8 support, custom colors, logo embedding, and precise size control",
   "main": "index.js",
   "types": "index.d.ts",
@@ -37,10 +37,7 @@
     "prebuilt/",
     "README.md"
   ],
-  "dependencies": {
-    "ffi-napi": "^4.0.3",
-    "ref-napi": "^3.0.3"
-  },
+  "dependencies": {},
   "devDependencies": {},
   "engines": {
     "node": ">=14.0.0"

data/bindings/ruby/lib/fastqr/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module FastQR
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end
 

data/bindings/ruby/lib/fastqr.rb

@@ -17,7 +17,7 @@ begin
         ffi_lib lib_path
 
         # Define C functions
-        attach_function :fastqr_generate_c, :fastqr_generate, [:string, :string, :pointer], :bool
+        attach_function :fastqr_generate_c, :fastqr_generate, [:string, :string, :pointer], :int
         attach_function :fastqr_version, [], :string
       end
     end
@@ -80,7 +80,7 @@ module FastQR
     # TODO: Build C struct from options hash
     # For now, pass nil to use defaults
     result = Native.fastqr_generate_c(data, output_path, nil)
-    raise Error, "Failed to generate QR code" unless result
+    raise Error, "Failed to generate QR code" unless result == 1
 
     true
   end

data/scripts/test-npm-real.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+set -e
+
+echo "🧪 Testing Node.js Package with REAL CODE..."
+echo ""
+
+# Get version
+VERSION=$(cat VERSION)
+echo "📦 Version: $VERSION"
+echo ""
+
+# Step 1: Build project (need shared library + CLI)
+echo "🔨 Step 1: Building C++ library..."
+rm -rf build
+mkdir -p build
+cd build
+cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release ..
+cmake --build .
+cd ..
+echo "✅ Build complete!"
+echo ""
+
+# Step 2: Copy binaries to Node.js prebuilt directory
+echo "📋 Step 2: Copying binaries to Node.js prebuilt..."
+PLATFORM="macos-arm64"  # Adjust for your platform
+PREBUILT_DIR="bindings/nodejs/prebuilt/$PLATFORM"
+
+mkdir -p "$PREBUILT_DIR/lib"
+mkdir -p "$PREBUILT_DIR/bin"
+
+# Copy library and CLI
+cp build/libfastqr.dylib "$PREBUILT_DIR/lib/"
+cp build/fastqr "$PREBUILT_DIR/bin/"
+
+echo "✅ Copied to $PREBUILT_DIR/"
+echo ""
+
+# Step 3: Test with real Node.js code
+echo "🧪 Step 3: Testing with real Node.js code..."
+node -e "
+const fastqr = require('./bindings/nodejs/index.js');
+
+console.log('FastQR version:', fastqr.version());
+console.log('');
+
+// Test 1: Basic generation
+console.log('Test 1: Basic QR code...');
+const result1 = fastqr.generate('Hello World', 'test_node_basic.png');
+console.log('✅ Result:', result1);
+
+// Test 2: With size option
+console.log('');
+console.log('Test 2: QR with size 500...');
+const result2 = fastqr.generate('Test Size', 'test_node_500.png', { size: 500 });
+console.log('✅ Result:', result2);
+
+// Test 3: With options
+console.log('');
+console.log('Test 3: QR with optimize...');
+const result3 = fastqr.generate('Test Optimize', 'test_node_opt.png', { 
+  size: 500, 
+  optimizeSize: true 
+});
+console.log('✅ Result:', result3);
+
+// Test 4: Batch mode
+console.log('');
+console.log('Test 4: Batch generation...');
+const data = ['QR 1', 'QR 2', 'QR 3'];
+const result4 = fastqr.generateBatch(data, 'test_node_batch/', { size: 300 });
+console.log('✅ Result:', JSON.stringify(result4));
+
+console.log('');
+console.log('✅ All tests passed!');
+"
+
+echo ""
+echo "✅ REAL NODE.JS TEST PASSED!"
+echo ""
+

data/src/fastqr.cpp

@@ -25,7 +25,7 @@
 // Enable benchmarking
 // #define FASTQR_BENCHMARK
 
-#define FASTQR_VERSION "1.0.8"
+#define FASTQR_VERSION "1.0.9"
 
 namespace fastqr {
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastqr
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - FastQR Project
@@ -134,6 +134,7 @@ files:
 - scripts/test-gem-local.sh
 - scripts/test-gem-manual.rb
 - scripts/test-npm-local.sh
+- scripts/test-npm-real.sh
 - scripts/update-version.sh
 - src/cli.cpp
 - src/fastqr.cpp