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

package/index.js

@@ -76,7 +76,12 @@ exports.createCanvas = createCanvas
 exports.createImageData = createImageData
 exports.loadImage = loadImage
 
-exports.backends = bindings.Backends
+// 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
+}
 
 /** Library version. */
 exports.version = packageJson.version

package/install-prebuilt.js

@@ -98,19 +98,44 @@ function createSonameSymlinks(dir) {
   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(
-    "canvas-prebuilt-openharmony-arm64/build/Release/canvas.node"
+    "@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 canvas-prebuilt-openharmony-arm64");
+  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);

package/lib/bindings.js

@@ -1,5 +1,18 @@
 '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.0",
+  "version": "3.2.3-beta.1",
   "author": "TJ Holowaychuk <tj@learnboost.com>",
   "main": "index.js",
   "browser": "browser.js",

package/src/Backends.h

@@ -1,9 +0,0 @@
-#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);
-};