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

package/index.js

@@ -1,99 +1,12 @@
-const Canvas = require('./lib/canvas')
-const Image = require('./lib/image')
-const CanvasRenderingContext2D = require('./lib/context2d')
-const CanvasPattern = require('./lib/pattern')
-const packageJson = require('./package.json')
-const bindings = require('./lib/bindings')
-const fs = require('fs')
-const PNGStream = require('./lib/pngstream')
-const PDFStream = require('./lib/pdfstream')
-const JPEGStream = require('./lib/jpegstream')
-const { DOMPoint, DOMMatrix } = require('./lib/DOMMatrix')
+"use strict";
 
-bindings.setDOMMatrix(DOMMatrix)
+const path = require("path");
+const fs = require("fs");
 
-function createCanvas (width, height, type) {
-  return new Canvas(width, height, type)
-}
+// 模块入口：只导出 build 目录路径
+const buildDir = path.join(__dirname, "build", "Release");
 
-function createImageData (array, width, height) {
-  return new bindings.ImageData(array, width, height)
-}
-
-function loadImage (src) {
-  return new Promise((resolve, reject) => {
-    const image = new Image()
-
-    function cleanup () {
-      image.onload = null
-      image.onerror = null
-    }
-
-    image.onload = () => { cleanup(); resolve(image) }
-    image.onerror = (err) => { cleanup(); reject(err) }
-
-    image.src = src
-  })
-}
-
-/**
- * Resolve paths for registerFont. Must be called *before* creating a Canvas
- * instance.
- * @param src {string} Path to font file.
- * @param fontFace {{family: string, weight?: string, style?: string}} Object
- * specifying font information. `weight` and `style` default to `"normal"`.
- */
-function registerFont (src, fontFace) {
-  // TODO this doesn't need to be on Canvas; it should just be a static method
-  // of `bindings`.
-  return Canvas._registerFont(fs.realpathSync(src), fontFace)
-}
-
-/**
- * Unload all fonts from pango to free up memory
- */
-function deregisterAllFonts () {
-  return Canvas._deregisterAllFonts()
-}
-
-exports.Canvas = Canvas
-exports.Context2d = CanvasRenderingContext2D // Legacy/compat export
-exports.CanvasRenderingContext2D = CanvasRenderingContext2D
-exports.CanvasGradient = bindings.CanvasGradient
-exports.CanvasPattern = CanvasPattern
-exports.Image = Image
-exports.ImageData = bindings.ImageData
-exports.PNGStream = PNGStream
-exports.PDFStream = PDFStream
-exports.JPEGStream = JPEGStream
-exports.DOMMatrix = DOMMatrix
-exports.DOMPoint = DOMPoint
-
-exports.registerFont = registerFont
-exports.deregisterAllFonts = deregisterAllFonts
-
-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
-}
-
-/** Library version. */
-exports.version = packageJson.version
-/** Cairo version. */
-exports.cairoVersion = bindings.cairoVersion
-/** jpeglib version. */
-exports.jpegVersion = bindings.jpegVersion
-/** gif_lib version. */
-exports.gifVersion = bindings.gifVersion ? bindings.gifVersion.replace(/[^.\d]/g, '') : undefined
-/** freetype version. */
-exports.freetypeVersion = bindings.freetypeVersion
-/** rsvg version. */
-exports.rsvgVersion = bindings.rsvgVersion
-/** pango version. */
-exports.pangoVersion = bindings.pangoVersion
+module.exports = {
+  buildDir,
+  canvas: path.join(buildDir, "canvas.node"),
+};

package/install.js

@@ -0,0 +1,64 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
+
+const releaseDir = path.join(__dirname, "build", "Release");
+
+// 从 ELF 文件中提取所有 NEEDED soname
+function getNeededSonames(elfPath) {
+  try {
+    const output = execSync(`readelf -d "${elfPath}" 2>/dev/null`, {
+      encoding: "utf8",
+    });
+    const needed = [];
+    for (const line of output.split("\n")) {
+      const match = line.match(/\(NEEDED\).*\[(.+?)\]/);
+      if (match) needed.push(match[1]);
+    }
+    return needed;
+  } catch {
+    return [];
+  }
+}
+
+function run() {
+  // 1. 列出目录下所有实际 .so 文件
+  const allFiles = fs.readdirSync(releaseDir);
+  const soFiles = allFiles.filter(
+    (f) => f.endsWith(".so") || /\.so\.\d/.test(f)
+  );
+
+  // 2. 收集所有 ELF 文件的 NEEDED（不只是 canvas.node，还包括所有 .so 的级联依赖）
+  const elfFiles = allFiles.filter(
+    (f) => f.endsWith(".node") || f.endsWith(".so") || /\.so\.\d/.test(f)
+  );
+  const allNeeded = new Set();
+  for (const f of elfFiles) {
+    for (const soname of getNeededSonames(path.join(releaseDir, f))) {
+      allNeeded.add(soname);
+    }
+  }
+
+  // 3. 为每个缺失的 soname 找到匹配的实际文件并创建符号链接
+  let created = 0;
+  for (const soname of allNeeded) {
+    if (fs.existsSync(path.join(releaseDir, soname))) continue;
+    const match = soFiles.find((f) => f.startsWith(soname) && f !== soname);
+    if (!match) continue;
+    fs.symlinkSync(match, path.join(releaseDir, soname));
+    console.log(`  ${soname} -> ${match}`);
+    created++;
+  }
+
+  if (created > 0) {
+    console.log(`Created ${created} soname symlink(s)`);
+  }
+}
+
+try {
+  run();
+} catch (e) {
+  console.warn("Warning: failed to create soname symlinks:", e.message);
+}

package/package.json

@@ -1,75 +1,20 @@
 {
   "name": "@ohos-ports/canvas",
-  "description": "Canvas graphics API backed by Cairo",
-  "version": "3.2.3-beta.1",
-  "author": "TJ Holowaychuk <tj@learnboost.com>",
+  "version": "3.2.3-beta.2",
+  "description": "Prebuilt native binaries for canvas on OpenHarmony arm64",
   "main": "index.js",
-  "browser": "browser.js",
-  "types": "index.d.ts",
-  "contributors": [
-    "Nathan Rajlich <nathan@tootallnate.net>",
-    "Rod Vagg <r@va.gg>",
-    "Juriy Zaytsev <kangax@gmail.com>"
+  "os": [
+    "openharmony"
   ],
-  "keywords": [
-    "canvas",
-    "graphic",
-    "graphics",
-    "pixman",
-    "cairo",
-    "image",
-    "images",
-    "pdf"
+  "cpu": [
+    "arm64"
   ],
-  "homepage": "https://github.com/Automattic/node-canvas",
-  "repository": "git://github.com/Automattic/node-canvas.git",
-  "scripts": {
-    "prebenchmark": "node-gyp build",
-    "benchmark": "node benchmarks/run.js",
-    "lint": "standard examples/*.js test/server.js test/public/*.js benchmarks/run.js lib/context2d.js util/has_lib.js browser.js index.js",
-    "test": "mocha test/*.test.js",
-    "pretest-server": "node-gyp build",
-    "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"
-  },
   "files": [
-    "binding.gyp",
-    "browser.js",
-    "index.d.ts",
+    "build/",
     "index.js",
-    "install-prebuilt.js",
-    "lib/",
-    "src/",
-    "util/"
+    "install.js"
   ],
-  "dependencies": {
-    "node-addon-api": "^7.0.0",
-    "prebuild-install": "^7.1.3"
-  },
-  "optionalDependencies": {
-    "@ohos-ports/canvas-prebuilt-openharmony-arm64": "3.2.3-beta.0"
-  },
-  "devDependencies": {
-    "@types/node": "^10.12.18",
-    "assert-rejects": "^1.0.0",
-    "express": "^4.16.3",
-    "js-yaml": "^4.1.0",
-    "mocha": "^5.2.0",
-    "pixelmatch": "^4.0.2",
-    "standard": "^12.0.1",
-    "tsd": "^0.29.0",
-    "typescript": "^4.2.2"
-  },
-  "engines": {
-    "node": "^18.12.0 || >= 20.9.0"
-  },
-  "binary": {
-    "napi_versions": [
-      7
-    ]
-  },
-  "license": "MIT"
+  "scripts": {
+    "install": "node install.js"
+  }
 }