@ohos-ports/sharp 0.34.5-beta.10 → 0.34.5-beta.12

package/lib/sharp.js

@@ -10,7 +10,61 @@ const { familySync, versionSync } = require('detect-libc');
 const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
 const runtimePlatform = runtimePlatformArch();
 
-// OpenHarmony patch disabled — RPATH + symlinks handle libvips resolution
+// OpenHarmony: set LD_LIBRARY_PATH for libvips before loading native binary
+// The .node binary's RPATH references @img/ namespace but the actual .so
+// files are installed under @ohos-ports/img-sharp-libvips-{platform}/lib
+try {
+  const libvipsLibPath = require(`@ohos-ports/img-sharp-libvips-${runtimePlatform}/lib`);
+  if (libvipsLibPath) {
+    const path = require('node:path');
+    const fs = require('node:fs');
+    // Create soname symlinks: libXXX.so.Y.Z.W → libXXX.so.Y
+    // The .node binary NEEDED entries request sonames (e.g. libvips-cpp.so.42)
+    // but the libvips package only ships full-version files (e.g. libvips-cpp.so.42.20.3)
+    // HarmonyOS fix: some libs carry 2-component sonames (e.g. libbz2.so.1.0,
+    // per embedded SONAME) — create a symlink for every soname prefix variant
+    // so both 1- and 2-component NEEDED requests resolve.
+    try {
+      for (const file of fs.readdirSync(libvipsLibPath)) {
+        const m = file.match(/^(.+\.so)\.(\d[\w.]*)$/);
+        if (m) {
+          const base = m[1];
+          const parts = m[2].split('.');
+          for (let i = 1; i < parts.length; i++) {
+            const soname = `${base}.${parts.slice(0, i).join('.')}`;
+            const sonamePath = path.join(libvipsLibPath, soname);
+            if (!fs.existsSync(sonamePath)) {
+              try { fs.symlinkSync(file, sonamePath); } catch (_) {
+                try { fs.copyFileSync(path.join(libvipsLibPath, file), sonamePath); } catch (_) {}
+              }
+            }
+          }
+        }
+      }
+    } catch (_) {}
+    const currentLdPath = process.env.LD_LIBRARY_PATH || '';
+    if (!currentLdPath.includes(libvipsLibPath)) {
+      process.env.LD_LIBRARY_PATH = `${libvipsLibPath}:${currentLdPath}`;
+    }
+    // HarmonyOS RPATH fix: the prebuilt .node carries RPATH
+    // $ORIGIN/../../sharp-libvips-openharmony-arm64/lib (the @img/ namespace
+    // layout), but the libvips package is installed as
+    // @ohos-ports/img-sharp-libvips-<platform>. JS-side LD_LIBRARY_PATH is
+    // invisible to the dynamic loader, so create a compatibility symlink at
+    // node_modules/@ohos-ports/sharp-libvips-<platform> -> img-sharp-libvips-<platform>
+    // so dlopen resolves libvips-cpp.so.42 via the original RPATH.
+    try {
+      const scopedDir = path.resolve(libvipsLibPath, '..', '..');
+      const linkPath = path.join(scopedDir, `sharp-libvips-${runtimePlatform}`);
+      const linkTarget = `img-sharp-libvips-${runtimePlatform}`;
+      if (!fs.existsSync(linkPath)) {
+        try { fs.symlinkSync(linkTarget, linkPath, 'dir'); } catch (_) {
+          try { fs.mkdirSync(linkPath, { recursive: true }); } catch (_) {}
+        }
+      }
+    } catch (_) {}
+  }
+} catch (_e) { /* libvips not available as separate package, skip */ }
 
 const paths = [
   `../src/build/Release/sharp-${runtimePlatform}.node`,

package/lib/utility.js

@@ -21,10 +21,6 @@ const libvipsVersion = sharp.libvipsVersion();
  * @returns {Object}
  */
 const format = sharp.format();
-/* @ohos-ports patch: native module returns 'jp2' instead of 'jp2k' */
-if (!format.jp2k && format.jp2) {
-  format.jp2k = format.jp2;
-}
 format.heif.output.alias = ['avif', 'heic'];
 format.jpeg.output.alias = ['jpe', 'jpg'];
 format.tiff.output.alias = ['tif'];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ohos-ports/sharp",
-  "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.34.5-beta.10",
+  "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images [ohos-ports: openharmony-arm64 native (libvips 8.18.3) + soname-variant/RPATH symlink self-healing]",
+  "version": "0.34.5-beta.12",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -118,7 +118,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/lovell/sharp.git"
+    "url": "https://github.com/ohos-ports/ohos-ports.git",
+    "directory": "ports/sharp/0.34.5"
   },
   "keywords": [
     "jpeg",
@@ -168,7 +169,7 @@
     "@img/sharp-win32-arm64": "0.34.5",
     "@img/sharp-win32-ia32": "0.34.5",
     "@img/sharp-win32-x64": "0.34.5",
-    "@ohos-ports/img-sharp-openharmony-arm64": "0.34.5-beta.3"
+    "@ohos-ports/img-sharp-openharmony-arm64": "0.34.5-beta.4"
   },
   "devDependencies": {
     "@ohos-ports/biomejs-biome": "^2.3.4-beta.0",
@@ -199,5 +200,8 @@
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
+  },
+  "bugs": {
+    "url": "https://github.com/ohos-ports/ohos-ports/issues"
   }
 }