@ohos-ports/sharp 0.34.5-beta.3 → 0.34.5-beta.5

package/lib/sharp.js

@@ -10,38 +10,29 @@ const { familySync, versionSync } = require('detect-libc');
 const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
 const runtimePlatform = runtimePlatformArch();
 
-// 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
+// OpenHarmony: create soname symlink for transitive .so dependency
+// sharp.node NEEDED is patched to use full filename (libvips-cpp.so.42.20.3),
+// but libvips-cpp.so.42.20.3 still NEEDED libvips.so.42 (soname).
+// The libvips package only ships libvips.so.42.20.3, no soname symlink.
 try {
+  const path = require('node:path');
+  const fs = require('node:fs');
   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)
-    try {
-      for (const file of fs.readdirSync(libvipsLibPath)) {
-        const m = file.match(/^(.+\.so\.\d+)\.\d+\.\d+$/);
-        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 (_) {}
-            }
-          }
+    for (const file of fs.readdirSync(libvipsLibPath)) {
+      const m = file.match(/^(.+\.so\.\d+)\.\d+\.\d+$/);
+      if (m) {
+        const soname = path.join(libvipsLibPath, m[1]);
+        if (!fs.existsSync(soname)) {
+          try { fs.symlinkSync(file, soname); } catch (_) {}
         }
       }
-    } catch (_) {}
-    const currentLdPath = process.env.LD_LIBRARY_PATH || '';
-    if (!currentLdPath.includes(libvipsLibPath)) {
-      process.env.LD_LIBRARY_PATH = `${libvipsLibPath}:${currentLdPath}`;
     }
   }
-} catch (_e) { /* libvips not available as separate package, skip */ }
+} catch (_e) { /* skip */ }
 
 const paths = [
+  `./sharp-${runtimePlatform}.node`,
   `../src/build/Release/sharp-${runtimePlatform}.node`,
   '../src/build/Release/sharp-wasm32.node',
   `@ohos-ports/img-sharp-${runtimePlatform}/sharp.node`,

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.3",
+  "version": "0.34.5-beta.5",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [