@ohos-ports/canvas 3.2.3-beta.1 → 3.2.3-beta.3

package/index.js

@@ -76,12 +76,7 @@ exports.createCanvas = createCanvas
 exports.createImageData = createImageData
 exports.loadImage = loadImage
 
-// Backends is declared in src/Backends.h but not yet implemented (no
-// Backends.cc, not registered in init.cc).  Only export it when the
-// native module actually provides it.
-if (bindings.Backends) {
-  exports.backends = bindings.Backends
-}
+exports.backends = bindings.Backends
 
 /** Library version. */
 exports.version = packageJson.version

package/lib/bindings.js

@@ -1,18 +1,5 @@
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
-
-// On OpenHarmony the system fontconfig config file may be missing.
-// Set FONTCONFIG_PATH so the .so bundled with this package picks up
-// the fonts.conf that install-prebuilt.js drops next to canvas.node.
-if (!process.env.FONTCONFIG_PATH) {
-  const buildDir = path.join(__dirname, '..', 'build', 'Release')
-  if (fs.existsSync(path.join(buildDir, 'fonts.conf'))) {
-    process.env.FONTCONFIG_PATH = buildDir
-  }
-}
-
 const bindings = require('../build/Release/canvas.node')
 
 module.exports = bindings

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ohos-ports/canvas",
   "description": "Canvas graphics API backed by Cairo",
-  "version": "3.2.3-beta.1",
+  "version": "3.2.3-beta.3",
   "author": "TJ Holowaychuk <tj@learnboost.com>",
   "main": "index.js",
   "browser": "browser.js",
@@ -22,7 +22,11 @@
     "pdf"
   ],
   "homepage": "https://github.com/Automattic/node-canvas",
-  "repository": "git://github.com/Automattic/node-canvas.git",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ohos-ports/ohos-ports.git",
+    "directory": "ports/canvas/3.2.3"
+  },
   "scripts": {
     "prebenchmark": "node-gyp build",
     "benchmark": "node benchmarks/run.js",
@@ -32,25 +36,20 @@
     "test-server": "node test/server.js",
     "generate-wpt": "node ./test/wpt/generate.js",
     "test-wpt": "mocha test/wpt/generated/*.js",
-    "install": "node install-prebuilt.js || node-gyp rebuild",
-    "tsd": "tsd"
+    "tsd": "tsd",
+    "install": "node -e \"process.exit(0)\""
   },
   "files": [
-    "binding.gyp",
     "browser.js",
     "index.d.ts",
     "index.js",
-    "install-prebuilt.js",
     "lib/",
     "src/",
-    "util/"
+    "util/",
+    "build/Release/*.node"
   ],
   "dependencies": {
-    "node-addon-api": "^7.0.0",
-    "prebuild-install": "^7.1.3"
-  },
-  "optionalDependencies": {
-    "@ohos-ports/canvas-prebuilt-openharmony-arm64": "3.2.3-beta.0"
+    "node-addon-api": "^7.0.0"
   },
   "devDependencies": {
     "@types/node": "^10.12.18",
@@ -71,5 +70,16 @@
       7
     ]
   },
-  "license": "MIT"
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ohos-ports/ohos-ports/issues"
+  },
+  "ohos_ports": {
+    "platform": "openharmony",
+    "arch": "arm64",
+    "native_artifact": "build/Release/canvas.node",
+    "source": "compiled from source on HarmonyOS (node-gyp + clang, harmonybrew cairo/pango/harfbuzz stack)",
+    "runtime_note": "requires LD_LIBRARY_PATH=$HOME/.harmonybrew/lib for brew shared libs (cairo, pango, harfbuzz, freetype, fontconfig, libjpeg, libpng, pixman, libintl)"
+  },
+  "gypfile": false
 }

package/src/Backends.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "backend/Backend.h"
+#include <napi.h>
+
+class Backends : public Napi::ObjectWrap<Backends> {
+  public:
+    static void Initialize(Napi::Env env, Napi::Object exports);
+};

package/binding.gyp

@@ -1,229 +0,0 @@
-{
-  'conditions': [
-    ['OS=="win"', {
-      'variables': {
-        'GTK_Root%': 'C:/GTK',  # Set the location of GTK all-in-one bundle
-        'with_jpeg%': 'false',
-        'with_gif%': 'false',
-        'with_rsvg%': 'false',
-        'variables': { # Nest jpeg_root to evaluate it before with_jpeg
-          'jpeg_root%': '<!(node ./util/win_jpeg_lookup)'
-        },
-        'jpeg_root%': '<(jpeg_root)', # Take value of nested variable
-        'conditions': [
-          ['jpeg_root==""', {
-            'with_jpeg%': 'false'
-          }, {
-            'with_jpeg%': 'true'
-          }]
-        ]
-      }
-    }, {  # 'OS!="win"'
-      'variables': {
-        'with_jpeg%': '<!(node ./util/has_lib.js jpeg)',
-        'with_gif%': '<!(node ./util/has_lib.js gif)',
-        'with_rsvg%': '<!(node ./util/has_lib.js rsvg)'
-      }
-    }]
-  ],
-  'targets': [
-    {
-      'target_name': 'canvas-postbuild',
-      'dependencies': ['canvas'],
-      'conditions': [
-        ['OS=="win"', {
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'files': [
-              '<(GTK_Root)/bin/zlib1.dll',
-              '<(GTK_Root)/bin/libintl-8.dll',
-              '<(GTK_Root)/bin/libpng14-14.dll',
-              '<(GTK_Root)/bin/libpangocairo-1.0-0.dll',
-              '<(GTK_Root)/bin/libpango-1.0-0.dll',
-              '<(GTK_Root)/bin/libpangoft2-1.0-0.dll',
-              '<(GTK_Root)/bin/libpangowin32-1.0-0.dll',
-              '<(GTK_Root)/bin/libcairo-2.dll',
-              '<(GTK_Root)/bin/libfontconfig-1.dll',
-              '<(GTK_Root)/bin/libfreetype-6.dll',
-              '<(GTK_Root)/bin/libglib-2.0-0.dll',
-              '<(GTK_Root)/bin/libgobject-2.0-0.dll',
-              '<(GTK_Root)/bin/libgmodule-2.0-0.dll',
-              '<(GTK_Root)/bin/libgthread-2.0-0.dll',
-              '<(GTK_Root)/bin/libexpat-1.dll'
-            ]
-          }]
-        }]
-      ]
-    },
-    {
-      'target_name': 'canvas',
-      'include_dirs': ["<!(node -p \"require('node-addon-api').include_dir\")"],
-      'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS', 'NODE_ADDON_API_ENABLE_MAYBE' ],
-      'sources': [
-        'src/bmp/BMPParser.cc',
-        'src/Canvas.cc',
-        'src/CanvasGradient.cc',
-        'src/CanvasPattern.cc',
-        'src/CanvasRenderingContext2d.cc',
-        'src/closure.cc',
-        'src/color.cc',
-        'src/Image.cc',
-        'src/ImageData.cc',
-        'src/init.cc',
-        'src/register_font.cc',
-        'src/FontParser.cc'
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'libraries': [
-            '-l<(GTK_Root)/lib/cairo.lib',
-            '-l<(GTK_Root)/lib/libpng.lib',
-            '-l<(GTK_Root)/lib/pangocairo-1.0.lib',
-            '-l<(GTK_Root)/lib/pango-1.0.lib',
-            '-l<(GTK_Root)/lib/freetype.lib',
-            '-l<(GTK_Root)/lib/glib-2.0.lib',
-            '-l<(GTK_Root)/lib/gobject-2.0.lib'
-          ],
-          'include_dirs': [
-            '<(GTK_Root)/include',
-            '<(GTK_Root)/include/cairo',
-            '<(GTK_Root)/include/pango-1.0',
-            '<(GTK_Root)/include/glib-2.0',
-            '<(GTK_Root)/include/freetype2',
-            '<(GTK_Root)/lib/glib-2.0/include'
-          ],
-          'defines': [
-            '_USE_MATH_DEFINES',  # for M_PI
-            'NOMINMAX' # allow std::min/max to work
-          ],
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'WarningLevel': 4,
-                  'ExceptionHandling': 1,
-                  'DisableSpecificWarnings': [
-                    4100, 4611
-                  ]
-                }
-              }
-            },
-            'Release': {
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'WarningLevel': 4,
-                  'ExceptionHandling': 1,
-                  'DisableSpecificWarnings': [
-                    4100, 4611
-                  ]
-                }
-              }
-            }
-          }
-        }, {  # 'OS!="win"'
-          'libraries': [
-            '<!@(pkg-config pixman-1 --libs)',
-            '<!@(pkg-config cairo --libs)',
-            '<!@(pkg-config libpng --libs)',
-            '<!@(pkg-config pangocairo --libs)',
-            '<!@(pkg-config freetype2 --libs)'
-          ],
-          'include_dirs': [
-            '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
-            '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
-            '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
-            '<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)'
-          ],
-          'cflags': ['-Wno-cast-function-type'],
-          'cflags!': ['-fno-exceptions'],
-          'cflags_cc!': ['-fno-exceptions']
-        }],
-        ['OS=="mac"', {
-          'cflags+': ['-fvisibility=hidden'],
-          'xcode_settings': {
-            'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
-            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
-          }
-        }],
-        ['with_jpeg=="true"', {
-          'defines': [
-            'HAVE_JPEG'
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'copies': [{
-                'destination': '<(PRODUCT_DIR)',
-                'files': [
-                  '<(jpeg_root)/bin/jpeg62.dll',
-                ]
-              }],
-              'include_dirs': [
-                '<(jpeg_root)/include'
-              ],
-              'libraries': [
-                '-l<(jpeg_root)/lib/jpeg.lib',
-              ]
-            }, {
-              'include_dirs': [
-                '<!@(pkg-config libjpeg --cflags-only-I | sed s/-I//g)'
-              ],
-              'libraries': [
-                '<!@(pkg-config libjpeg --libs)'
-              ]
-            }]
-          ]
-        }],
-        ['with_gif=="true"', {
-          'defines': [
-            'HAVE_GIF'
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'libraries': [
-                '-l<(GTK_Root)/lib/gif.lib'
-              ]
-            }, {
-              'include_dirs': [
-                '/opt/homebrew/include'
-              ],
-              'libraries': [
-                '-L/opt/homebrew/lib',
-                '-lgif'
-              ]
-            }]
-          ]
-        }],
-        ['with_rsvg=="true"', {
-          'defines': [
-            'HAVE_RSVG'
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'copies': [{
-                'destination': '<(PRODUCT_DIR)',
-                'files': [
-                  '<(GTK_Root)/bin/librsvg-2-2.dll',
-                  '<(GTK_Root)/bin/libgdk_pixbuf-2.0-0.dll',
-                  '<(GTK_Root)/bin/libgio-2.0-0.dll',
-                  '<(GTK_Root)/bin/libcroco-0.6-3.dll',
-                  '<(GTK_Root)/bin/libgsf-1-114.dll',
-                  '<(GTK_Root)/bin/libxml2-2.dll'
-                ]
-              }],
-              'libraries': [
-                '-l<(GTK_Root)/lib/librsvg-2-2.lib'
-              ]
-            }, {
-              'include_dirs': [
-                '<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
-              ],
-              'libraries': [
-                '<!@(pkg-config librsvg-2.0 --libs)'
-              ]
-            }]
-          ]
-        }]
-      ]
-    }
-  ]
-}

package/install-prebuilt.js

@@ -1,142 +0,0 @@
-"use strict";
-
-/**
- * Install script: tries to copy prebuilt binaries from the npm package
- * canvas-prebuilt-openharmony-arm64. Falls back to node-gyp rebuild
- * if the prebuilt package is not available (non-OpenHarmony platform).
- *
- * After copying, creates SONAME symlinks so the dynamic linker can find
- * shared libraries at runtime (e.g. libpixman-1.so.0 -> libpixman-1.so.0.46.4).
- */
-const path = require("path");
-const fs = require("fs");
-const { execSync } = require("child_process");
-
-function copyDirRecursive(src, dest) {
-  if (!fs.existsSync(src)) return;
-  fs.mkdirSync(dest, { recursive: true });
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-    if (entry.isSymbolicLink()) {
-      const target = fs.readlinkSync(srcPath);
-      if (fs.existsSync(destPath)) fs.rmSync(destPath);
-      fs.symlinkSync(target, destPath);
-    } else if (entry.isDirectory()) {
-      copyDirRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-}
-
-/**
- * Read the SONAME embedded in an ELF shared library via readelf.
- * Returns null if readelf is unavailable or the file has no SONAME.
- */
-function readSoname(filePath) {
-  try {
-    const output = execSync(`readelf -d "${filePath}" 2>/dev/null`, {
-      encoding: "utf8",
-      timeout: 5000,
-    });
-    const match = output.match(/SONAME.*?\[(.+?)\]/);
-    return match ? match[1] : null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Create SONAME symlinks for all .so files in the given directory.
- *
- * The dynamic linker resolves libraries by SONAME (e.g. libpixman-1.so.0),
- * but prebuilt packages ship the real file with its full version suffix
- * (e.g. libpixman-1.so.0.46.4). This function bridges the gap.
- *
- * Also handles the special case where libffi's SONAME is "libffi.so" but
- * libpango requires "libffi.so.8" at runtime.
- */
-function createSonameSymlinks(dir) {
-  if (!fs.existsSync(dir)) return;
-
-  const files = fs.readdirSync(dir);
-  let created = 0;
-
-  for (const file of files) {
-    // Skip symlinks and non-.so files
-    const filePath = path.join(dir, file);
-    const stat = fs.lstatSync(filePath);
-    if (stat.isSymbolicLink() || !file.includes(".so")) continue;
-
-    const soname = readSoname(filePath);
-    if (soname && soname !== file) {
-      const linkPath = path.join(dir, soname);
-      if (!fs.existsSync(linkPath)) {
-        fs.symlinkSync(file, linkPath);
-        console.log(`[canvas]   ${soname} -> ${file}`);
-        created++;
-      }
-    }
-  }
-
-  // Special case: libffi.so.8
-  // libffi's ELF SONAME is "libffi.so", but libpango links against
-  // "libffi.so.8". Create the intermediate symlink if the real file exists.
-  const libffiReal = files.find(
-    (f) => f.startsWith("libffi.so.") && !fs.lstatSync(path.join(dir, f)).isSymbolicLink()
-  );
-  if (libffiReal) {
-    const ffiLink = path.join(dir, "libffi.so.8");
-    if (!fs.existsSync(ffiLink)) {
-      fs.symlinkSync(libffiReal, ffiLink);
-      console.log(`[canvas]   libffi.so.8 -> ${libffiReal}`);
-      created++;
-    }
-  }
-
-  return created;
-}
-
-/**
- * Create a minimal fontconfig configuration file if the system does not
- * provide one (e.g. OpenHarmony).  The config points fontconfig at the
- * system font directory so that text rendering works without warnings.
- */
-function ensureFontconfigConfig(dir) {
-  const fontsConfPath = path.join(dir, "fonts.conf");
-  if (fs.existsSync(fontsConfPath)) return;
-
-  // HarmonyOS keeps system fonts in /system/fonts
-  const fontsConf = `<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <dir>/system/fonts</dir>
-  <cachedir>/tmp/.fontconfig-cache</cachedir>
-</fontconfig>
-`;
-
-  fs.writeFileSync(fontsConfPath, fontsConf, "utf8");
-  console.log("[canvas] Created fonts.conf for fontconfig");
-}
-
-try {
-  const prebuiltPath = require.resolve(
-    "@ohos-ports/canvas-prebuilt-openharmony-arm64/build/Release/canvas.node"
-  );
-  const prebuiltDir = path.dirname(prebuiltPath);
-  const destDir = path.join(__dirname, "build", "Release");
-
-  copyDirRecursive(prebuiltDir, destDir);
-  console.log("[canvas] Installed prebuilt binaries from @ohos-ports/canvas-prebuilt-openharmony-arm64");
-
-  console.log("[canvas] Creating SONAME symlinks...");
-  const count = createSonameSymlinks(destDir);
-  console.log(`[canvas] Created ${count} symlink(s)`);
-
-  // Ensure fontconfig has a config file to read on OpenHarmony
-  ensureFontconfigConfig(destDir);
-} catch {
-  console.log("[canvas] No prebuilt package available, falling back to node-gyp");
-  process.exit(1);
-}