fastqr 1.0.20 → 1.0.22

data/bindings/php/src/FastQR.php

@@ -2,7 +2,7 @@
 
 /**
  * FastQR - Fast QR Code Generator
- * PHP Binding using FFI
+ * PHP Binding using CLI binary (no FFI needed!)
  *
  * Copyright (C) 2025 FastQR Project
  * Licensed under LGPL-2.1
@@ -10,21 +10,19 @@
 
 namespace FastQR;
 
-use FFI;
 use RuntimeException;
 
 class FastQR
 {
-    private static ?FFI $ffi = null;
-    private static bool $initialized = false;
+    private static ?string $cliPath = null;
 
     /**
-     * Initialize FFI
+     * Find CLI binary
      */
-    private static function init(): void
+    private static function findBinary(): string
     {
-        if (self::$initialized) {
-            return;
+        if (self::$cliPath !== null) {
+            return self::$cliPath;
         }
 
         // Detect platform
@@ -33,58 +31,30 @@ class FastQR
         if ($arch === 'x86_64' || $arch === 'amd64') {
             $arch = 'x86_64';
         } elseif ($arch === 'aarch64' || $arch === 'arm64') {
-            $arch = 'arm64';
+            $arch = $os === 'macos' ? 'arm64' : 'aarch64';
         }
         $platform = "$os-$arch";
-        $ext = $os === 'macos' ? 'dylib' : 'so';
-
-        // Try to find the library (pre-built first, then system)
-        $libPaths = [
-            __DIR__ . "/../../prebuilt/$platform/lib/libfastqr.$ext",  // Pre-built binary
-            '/usr/local/lib/libfastqr.' . $ext,                         // System install
-            '/usr/lib/libfastqr.' . $ext,
-            __DIR__ . '/../../../build/libfastqr.' . $ext,               // Local build
+
+        // Try to find the binary (pre-built first, then system)
+        $binaryPaths = [
+            __DIR__ . "/../../prebuilt/$platform/bin/fastqr",  // Pre-built binary
+            '/usr/local/bin/fastqr',                            // System install
+            '/usr/bin/fastqr',
+            __DIR__ . '/../../../build/fastqr',                 // Local build
         ];
 
-        $libPath = null;
-        foreach ($libPaths as $path) {
-            if (file_exists($path)) {
-                $libPath = $path;
-                break;
+        foreach ($binaryPaths as $path) {
+            if (file_exists($path) && is_executable($path)) {
+                self::$cliPath = $path;
+                return $path;
             }
         }
 
-        if ($libPath === null) {
-            throw new RuntimeException(
-                "FastQR library not found for platform: $platform\n" .
-                "Please install fastqr or build from source."
-            );
-        }
-
-        // Define C interface
-        $header = '
-            typedef struct {
-                int size;
-                int optimize_size;
-                unsigned char foreground_r;
-                unsigned char foreground_g;
-                unsigned char foreground_b;
-                unsigned char background_r;
-                unsigned char background_g;
-                unsigned char background_b;
-                int ec_level;
-                const char* logo_path;
-                int logo_size_percent;
-                const char* format;
-                int quality;
-            } QROptions;
-
-            bool fastqr_generate(const char* data, const char* output_path, QROptions* options);
-            const char* fastqr_version(void);
-        ';
-
-        self::$ffi = FFI::cdef($header, $libPath);
-        self::$initialized = true;
+        throw new RuntimeException(
+            "FastQR CLI binary not found for platform: $platform\n" .
+            "Searched in:\n" . implode("\n", $binaryPaths) . "\n" .
+            "Please install fastqr or build from source."
+        );
     }
 
     /**
@@ -127,8 +97,6 @@ class FastQR
      */
     public static function generate(string $data, string $outputPath, array $options = []): bool
     {
-        self::init();
-
         if (empty($data)) {
             throw new RuntimeException('Data cannot be empty');
         }
@@ -136,56 +104,64 @@ class FastQR
             throw new RuntimeException('Output path cannot be empty');
         }
 
-        // Create options struct
-        $opts = self::$ffi->new('QROptions');
+        $cliPath = self::findBinary();
+
+        // Build command arguments
+        $args = [
+            escapeshellarg($cliPath),
+            escapeshellarg($data),
+            escapeshellarg($outputPath)
+        ];
 
         // Size (preferred) or width/height (backward compatibility)
         if (isset($options['size'])) {
-            $opts->size = $options['size'];
+            $args[] = '-s ' . (int)$options['size'];
         } elseif (isset($options['width']) || isset($options['height'])) {
-            $opts->size = $options['width'] ?? $options['height'] ?? 300;
-        } else {
-            $opts->size = 300;
+            $size = $options['width'] ?? $options['height'] ?? 300;
+            $args[] = '-s ' . (int)$size;
         }
 
         // Optimize size
-        $opts->optimize_size = $options['optimizeSize'] ?? false ? 1 : 0;
+        if (!empty($options['optimizeSize'])) {
+            $args[] = '-o';
+        }
 
         // Foreground color
-        $fg = $options['foreground'] ?? [0, 0, 0];
-        $opts->foreground_r = $fg[0] ?? 0;
-        $opts->foreground_g = $fg[1] ?? 0;
-        $opts->foreground_b = $fg[2] ?? 0;
+        if (isset($options['foreground'])) {
+            $fg = $options['foreground'];
+            $args[] = '-f ' . implode(',', $fg);
+        }
 
         // Background color
-        $bg = $options['background'] ?? [255, 255, 255];
-        $opts->background_r = $bg[0] ?? 255;
-        $opts->background_g = $bg[1] ?? 255;
-        $opts->background_b = $bg[2] ?? 255;
+        if (isset($options['background'])) {
+            $bg = $options['background'];
+            $args[] = '-b ' . implode(',', $bg);
+        }
 
         // Error correction level
-        $ecLevel = $options['errorLevel'] ?? 'M';
-        $opts->ec_level = match($ecLevel) {
-            'L' => 0,
-            'M' => 1,
-            'Q' => 2,
-            'H' => 3,
-            default => 1
-        };
+        if (isset($options['errorLevel'])) {
+            $args[] = '-e ' . escapeshellarg($options['errorLevel']);
+        }
 
         // Logo
-        $opts->logo_path = $options['logo'] ?? null;
-        $opts->logo_size_percent = $options['logoSize'] ?? 20;
+        if (isset($options['logo'])) {
+            $args[] = '-l ' . escapeshellarg($options['logo']);
+        }
+        if (isset($options['logoSize'])) {
+            $args[] = '-p ' . (int)$options['logoSize'];
+        }
 
-        // Format and quality
-        $opts->format = $options['format'] ?? 'png';
-        $opts->quality = $options['quality'] ?? 95;
+        // Quality
+        if (isset($options['quality'])) {
+            $args[] = '-q ' . (int)$options['quality'];
+        }
 
-        // Call C function
-        $result = self::$ffi->fastqr_generate($data, $outputPath, FFI::addr($opts));
+        // Execute command
+        $cmd = implode(' ', $args) . ' 2>&1';
+        exec($cmd, $output, $returnCode);
 
-        if (!$result) {
-            throw new RuntimeException('Failed to generate QR code');
+        if ($returnCode !== 0) {
+            throw new RuntimeException('Failed to generate QR code: ' . implode("\n", $output));
         }
 
         return true;
@@ -198,8 +174,15 @@ class FastQR
      */
     public static function version(): string
     {
-        self::init();
-        return self::$ffi->fastqr_version();
+        $cliPath = self::findBinary();
+        $cmd = escapeshellarg($cliPath) . ' -v 2>&1';
+        $output = shell_exec($cmd);
+        
+        if ($output === null) {
+            return 'unknown';
+        }
+
+        return trim(str_replace('FastQR v', '', $output));
     }
 
     /**
@@ -241,65 +224,45 @@ class FastQR
         try {
             file_put_contents($tempFile, implode("\n", $dataArray));
 
-            // Find CLI binary
-            $os = PHP_OS_FAMILY === 'Darwin' ? 'macos' : (PHP_OS_FAMILY === 'Linux' ? 'linux' : 'unknown');
-            $arch = php_uname('m');
-            if ($arch === 'x86_64' || $arch === 'amd64') {
-                $arch = 'x86_64';
-            } elseif ($arch === 'aarch64' || $arch === 'arm64') {
-                $arch = 'arm64';
-            }
-            $platform = "$os-$arch";
-
-            $cliPaths = [
-                __DIR__ . "/../../prebuilt/$platform/bin/fastqr",
-                '/usr/local/bin/fastqr',
-                __DIR__ . '/../../../build/fastqr',
-            ];
-
-            $cliPath = null;
-            foreach ($cliPaths as $path) {
-                if (file_exists($path)) {
-                    $cliPath = $path;
-                    break;
-                }
-            }
-
-            if ($cliPath === null) {
-                throw new RuntimeException("FastQR CLI not found for platform: $platform");
-            }
+            $cliPath = self::findBinary();
 
             // Build command
-            $cmd = escapeshellarg($cliPath) . ' -F ' . escapeshellarg($tempFile) . ' ' . escapeshellarg($outputDir);
+            $args = [
+                escapeshellarg($cliPath),
+                '-F',
+                escapeshellarg($tempFile),
+                escapeshellarg($outputDir)
+            ];
 
             if (isset($options['size'])) {
-                $cmd .= ' -s ' . (int)$options['size'];
+                $args[] = '-s ' . (int)$options['size'];
             }
             if (!empty($options['optimizeSize'])) {
-                $cmd .= ' -o';
+                $args[] = '-o';
             }
             if (isset($options['foreground'])) {
                 $fg = $options['foreground'];
-                $cmd .= ' -f ' . implode(',', $fg);
+                $args[] = '-f ' . implode(',', $fg);
             }
             if (isset($options['background'])) {
                 $bg = $options['background'];
-                $cmd .= ' -b ' . implode(',', $bg);
+                $args[] = '-b ' . implode(',', $bg);
             }
             if (isset($options['errorLevel'])) {
-                $cmd .= ' -e ' . escapeshellarg($options['errorLevel']);
+                $args[] = '-e ' . escapeshellarg($options['errorLevel']);
             }
             if (isset($options['logo'])) {
-                $cmd .= ' -l ' . escapeshellarg($options['logo']);
+                $args[] = '-l ' . escapeshellarg($options['logo']);
             }
             if (isset($options['logoSize'])) {
-                $cmd .= ' -p ' . (int)$options['logoSize'];
+                $args[] = '-p ' . (int)$options['logoSize'];
             }
             if (isset($options['quality'])) {
-                $cmd .= ' -q ' . (int)$options['quality'];
+                $args[] = '-q ' . (int)$options['quality'];
             }
 
-            exec($cmd . ' 2>&1', $output, $returnCode);
+            $cmd = implode(' ', $args) . ' 2>&1';
+            exec($cmd, $output, $returnCode);
 
             if ($returnCode !== 0) {
                 throw new RuntimeException('Batch generation failed: ' . implode("\n", $output));
@@ -313,4 +276,3 @@ class FastQR
         }
     }
 }
-

data/bindings/ruby/extconf.rb

@@ -64,8 +64,8 @@ unless have_library('qrencode')
   abort "ERROR: libqrencode is required. Install it first."
 end
 
-unless have_library('vips')
-  abort "ERROR: libvips is required. Install it first."
+unless have_library('png')
+  abort "ERROR: libpng is required. Install it first."
 end
 
 # Check for headers
@@ -73,8 +73,8 @@ unless have_header('qrencode.h')
   abort "ERROR: qrencode.h not found"
 end
 
-unless have_header('vips/vips.h')
-  abort "ERROR: vips/vips.h not found"
+unless have_header('png.h')
+  abort "ERROR: png.h not found"
 end
 
 # Add C++14 support

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

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

data/build.sh

@@ -49,16 +49,16 @@ if ! pkg-config --exists libqrencode; then
 fi
 echo "✅ libqrencode found: $(pkg-config --modversion libqrencode)"
 
-if ! pkg-config --exists vips; then
-    echo "❌ libvips not found. Install with:"
+if ! pkg-config --exists libpng; then
+    echo "❌ libpng not found. Install with:"
     if [[ "$OS" == "macos" ]]; then
-        echo "   brew install vips"
+        echo "   brew install libpng"
     else
-        echo "   sudo apt-get install libvips-dev"
+        echo "   sudo apt-get install libpng-dev"
     fi
     exit 1
 fi
-echo "✅ libvips found: $(pkg-config --modversion vips)"
+echo "✅ libpng found: $(pkg-config --modversion libpng)"
 
 # Build
 echo ""

data/composer.json

@@ -12,8 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
-        "ext-ffi": "*"
+        "php": ">=7.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0"

data/docs/NODEJS_USAGE.md

@@ -5,13 +5,13 @@ Complete guide for using FastQR in Node.js and JavaScript applications.
 ## Installation
 
 ```bash
-npm install fastqr
+npm install fastqr-pro
 ```
 
 Or with Yarn:
 
 ```bash
-yarn add fastqr
+yarn add fastqr-pro
 ```
 
 **Note:** No system dependencies required! Pre-built binaries are included. 🎉

data/docs/README.md

@@ -40,10 +40,10 @@ FastQR is a fast, powerful QR code generator with full UTF-8 support, custom col
 ### 📦 No Dependencies!
 Starting from v1.0.0, all language packages include pre-built binaries:
 - Ruby: `gem install fastqr` ✅
-- Node.js: `npm install fastqr` ✅
+- Node.js: `npm install fastqr-pro` ✅
 - PHP: `composer require fastqr/fastqr` ✅
 
-No need to install libqrencode or libvips separately!
+No need to install libqrencode separately!
 
 ## Quick Start
 
@@ -69,7 +69,7 @@ FastQR.generate("Hello World", "qr.png", width: 500, height: 500)
 
 ### Node.js
 ```javascript
-npm install fastqr
+npm install fastqr-pro
 
 const fastqr = require('fastqr');
 fastqr.generate('Hello World', 'qr.png', { width: 500, height: 500 });
@@ -160,7 +160,8 @@ fastqr -s 2000x2000 -q 100 -e H "SKU-12345" product_qr.png
 
 FastQR is built on:
 - **[libqrencode](https://fukuchi.org/works/qrencode/)** (LGPL v2.1) - QR code generation
-- **[libvips](https://libvips.github.io/libvips/)** (LGPL v2.1+) - Image processing
+- **[libpng](http://www.libpng.org/pub/png/libpng.html)** - PNG image encoding
+- **[stb_image](https://github.com/nothings/stb)** (Public Domain) - Image loading
 
 Pre-built binaries are automatically generated for:
 - macOS (Intel & Apple Silicon)

data/prebuilt/README.md

@@ -48,7 +48,7 @@ Pre-built binaries are automatically included in the gem and loaded via FFI.
 
 ```bash
 gem install fastqr
-# No need to install qrencode or vips!
+# No need to install qrencode!
 ```
 
 ### For Node.js
@@ -56,8 +56,8 @@ gem install fastqr
 Pre-built binaries are automatically included in the npm package.
 
 ```bash
-npm install fastqr
-# No need to install qrencode or vips!
+npm install fastqr-pro
+# No need to install qrencode!
 ```
 
 ### For PHP
@@ -66,7 +66,7 @@ Pre-built binaries are included in the Composer package.
 
 ```bash
 composer require fastqr/fastqr
-# No need to install qrencode or vips!
+# No need to install qrencode!
 ```
 
 ### Manual Installation
@@ -105,7 +105,7 @@ The bindings automatically detect your platform and load the appropriate binary:
 
 ## Notes
 
-- Binaries are built with static linking of libqrencode and libvips
+- Binaries are built with static linking of libqrencode
 - No external dependencies required at runtime
 - Binaries are built on GitHub Actions for consistency
 - All binaries are tested before release
@@ -125,7 +125,6 @@ This will trigger the `build-binaries.yml` workflow which builds for all platfor
 
 The pre-built binaries include statically linked libraries:
 - libqrencode (LGPL 2.1)
-- libvips (LGPL 2.1+)
 
 As required by LGPL, users can rebuild with different versions. See BUILD.md for instructions.
 

data/src/fastqr.cpp

@@ -20,12 +20,8 @@
 #include <vector>
 #include <algorithm>
 #include <cstdio>
-#include <chrono>
 
-// Enable benchmarking
-// #define FASTQR_BENCHMARK
-
-#define FASTQR_VERSION "1.0.20"
+#define FASTQR_VERSION "1.0.22"
 
 namespace fastqr {
 
@@ -343,21 +339,12 @@ static void add_logo_to_image(std::vector<unsigned char>& qr_img, int qr_size, i
 }
 
 bool generate(const std::string& data, const std::string& output_path, const QROptions& options) {
-#ifdef FASTQR_BENCHMARK
-    auto t_start = std::chrono::high_resolution_clock::now();
-#endif
-
     // Generate QR code
     auto qr = generate_qr_code(data, options.ec_level);
     if (!qr) {
         return false;
     }
 
-#ifdef FASTQR_BENCHMARK
-    auto t_qr_gen = std::chrono::high_resolution_clock::now();
-    auto dur_qr = std::chrono::duration_cast<std::chrono::microseconds>(t_qr_gen - t_start).count();
-#endif
-
     int qr_size = qr->width;
     unsigned char* qr_data = qr->data;
 
@@ -381,15 +368,6 @@ bool generate(const std::string& data, const std::string& output_path, const QRO
         // Pack 8 pixels into 1 byte
         int scale = final_size / qr_size;
 
-#ifdef FASTQR_BENCHMARK
-        FILE* debug_log = fopen("/tmp/fastqr_debug.log", "a");
-        if (debug_log) {
-            fprintf(debug_log, "DEBUG: is_bw=%d, qr_size=%d, final_size=%d, scale=%d, scale*qr=%d\n",
-                   is_bw, qr_size, final_size, scale, scale*qr_size);
-            fclose(debug_log);
-        }
-#endif
-
         if (scale * qr_size == final_size) {
             // Integer scaling - optimized bit packing
             int bytes_per_row = (final_size + 7) / 8;
@@ -424,27 +402,7 @@ bool generate(const std::string& data, const std::string& output_path, const QRO
                 }
             }
 
-#ifdef FASTQR_BENCHMARK
-            auto t_scale = std::chrono::high_resolution_clock::now();
-            auto dur_scale = std::chrono::duration_cast<std::chrono::microseconds>(t_scale - t_qr_gen).count();
-#endif
-
-            bool result = write_indexed_png(output_path.c_str(), packed_data, final_size, final_size);
-
-#ifdef FASTQR_BENCHMARK
-            auto t_write = std::chrono::high_resolution_clock::now();
-            auto dur_write = std::chrono::duration_cast<std::chrono::microseconds>(t_write - t_scale).count();
-            auto dur_total = std::chrono::duration_cast<std::chrono::microseconds>(t_write - t_start).count();
-
-            FILE* timing_log = fopen("/tmp/fastqr_timing.log", "a");
-            if (timing_log) {
-                fprintf(timing_log, "TIMING: QR=%ldus, Scale=%ldus, Write=%ldus, Total=%ldus\n",
-                       dur_qr, dur_scale, dur_write, dur_total);
-                fclose(timing_log);
-            }
-#endif
-
-            return result;
+            return write_indexed_png(output_path.c_str(), packed_data, final_size, final_size);
         } else {
             // Non-integer scaling - use grayscale
             std::vector<unsigned char> final_image(final_size * final_size);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastqr
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - FastQR Project
@@ -52,8 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: FastQR is a fast QR code generator with full UTF-8 support, custom colors,
-  logo embedding, and precise size control. Built on libqrencode and libvips.
+description: Generate 1,000 QR codes in **0.37 seconds**. Full UTF-8 support. Custom
+  colors. Logo embedding. Precise size control.
 email:
 - fastqr@example.com
 executables: []
@@ -71,6 +71,7 @@ files:
 - PREBUILT.md
 - README.md
 - VERSION
+- bindings/nodejs/README.md
 - bindings/nodejs/index.d.ts
 - bindings/nodejs/index.js
 - bindings/nodejs/lib/platform.js
@@ -158,5 +159,5 @@ requirements: []
 rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Fast QR code generator with UTF-8 support
+summary: The fastest QR code generator on the planet.
 test_files: []