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

package/lib/sharp.js

@@ -21,14 +21,22 @@ try {
     // 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+)\.\d+\.\d+$/);
+        const m = file.match(/^(.+\.so)\.(\d[\w.]*)$/);
         if (m) {
-          const soname = path.join(libvipsLibPath, m[1]);
-          if (!fs.existsSync(soname)) {
-            try { fs.symlinkSync(file, soname); } catch (_) {
-              try { fs.copyFileSync(path.join(libvipsLibPath, file), soname); } catch (_) {}
+          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 (_) {}
+              }
             }
           }
         }
@@ -38,6 +46,23 @@ try {
     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 */ }
 

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.11",
+  "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",
@@ -199,5 +200,8 @@
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
+  },
+  "bugs": {
+    "url": "https://github.com/ohos-ports/ohos-ports/issues"
   }
 }