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

package/install/check.js

@@ -12,3 +12,62 @@ try {
   const summary = err.message.split(/\n/).slice(0, 1);
   console.log(`sharp: skipping install check: ${summary}`);
 }
+
+// Create libvips shared library symlinks on OpenHarmony
+// The native binary's RPATH references "sharp-libvips-openharmony-arm64" but
+// the actual package name is "img-sharp-libvips-openharmony-arm64" — we need
+// both package-level symlinks and .so version symlinks for RPATH to resolve.
+try {
+  const { runtimePlatformArch } = require('../lib/libvips');
+  const platform = runtimePlatformArch();
+  if (platform.startsWith('openharmony')) {
+    const fs = require('fs');
+    const path = require('path');
+    let libDir;
+    try {
+      libDir = require('@ohos-ports/img-sharp-libvips-openharmony-arm64/lib');
+    } catch {
+      try {
+        libDir = require('@img/sharp-libvips-openharmony-arm64/lib');
+      } catch {}
+    }
+    if (libDir && fs.existsSync(libDir)) {
+      // 1. Create .so version symlinks (libvips-cpp.so.42 → libvips-cpp.so.42.20.3)
+      const soSymlinks = [
+        ['libvips-cpp.so.42', 'libvips-cpp.so.42.20.3'],
+        ['libvips.so.42', 'libvips.so.42.20.3'],
+        ['libpcre2-8.so', 'libpcre2-8.so.0']
+      ];
+      for (const [link, target] of soSymlinks) {
+        const linkPath = path.join(libDir, link);
+        const targetPath = path.join(libDir, target);
+        if (fs.existsSync(linkPath)) continue;
+        if (!fs.existsSync(targetPath)) continue;
+        try {
+          fs.symlinkSync(target, linkPath);
+          console.log(`sharp: created symlink ${link} -> ${target}`);
+        } catch (e) {
+          // symlink creation may fail due to permissions; non-fatal
+        }
+      }
+
+      // 2. Create package-level symlinks so RPATH can resolve
+      // RPATH: $ORIGIN/../../sharp-libvips-openharmony-arm64/lib
+      // Actual package: img-sharp-libvips-openharmony-arm64
+      // Need: @ohos-ports/sharp-libvips-openharmony-arm64 → img-sharp-libvips-openharmony-arm64
+      const pkgDir = path.dirname(libDir);
+      const scopeDir = path.dirname(pkgDir);
+      const pkgBaseName = path.basename(pkgDir);
+      const rpathLinkName = pkgBaseName.replace(/^img-/, '');
+      const rpathLinkPath = path.join(scopeDir, rpathLinkName);
+      if (!fs.existsSync(rpathLinkPath)) {
+        try {
+          fs.symlinkSync(pkgBaseName, rpathLinkPath);
+          console.log(`sharp: created package symlink ${rpathLinkName} -> ${pkgBaseName}`);
+        } catch (e) {
+          // non-fatal
+        }
+      }
+    }
+  }
+} catch {}

package/lib/colour.js

@@ -3,7 +3,7 @@
   SPDX-License-Identifier: Apache-2.0
 */
 
-const color = require('@img/colour');
+const color = require('@ohos-ports/img-colour');
 const is = require('./is');
 
 /**

package/lib/sharp.js

@@ -10,10 +10,43 @@ 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
+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)
+    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 (_) {}
+            }
+          }
+        }
+      }
+    } 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 */ }
+
 const paths = [
   `../src/build/Release/sharp-${runtimePlatform}.node`,
   '../src/build/Release/sharp-wasm32.node',
+  `@ohos-ports/img-sharp-${runtimePlatform}/sharp.node`,
   `@img/sharp-${runtimePlatform}/sharp.node`,
+  '@ohos-ports/img-sharp-wasm32/sharp.node',
   '@img/sharp-wasm32/sharp.node'
 ];
 

package/lib/utility.js

@@ -61,16 +61,28 @@ let versions = {
 if (!libvipsVersion.isGlobal) {
   if (!libvipsVersion.isWasm) {
     try {
-      versions = require(`@img/sharp-${runtimePlatform}/versions`);
+      versions = require(`@ohos-ports/img-sharp-${runtimePlatform}/versions`);
     } catch (_) {
       try {
-        versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
-      } catch (_) {}
+        versions = require(`@img/sharp-${runtimePlatform}/versions`);
+      } catch (_) {
+        try {
+          versions = require(`@ohos-ports/img-sharp-libvips-${runtimePlatform}/versions`);
+        } catch (_) {
+          try {
+            versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
+          } catch (_) {}
+        }
+      }
     }
   } else {
     try {
-      versions = require('@img/sharp-wasm32/versions');
-    } catch (_) {}
+      versions = require('@ohos-ports/img-sharp-wasm32/versions');
+    } catch (_) {
+      try {
+        versions = require('@img/sharp-wasm32/versions');
+      } catch (_) {}
+    }
   }
 }
 versions.sharp = require('../package.json').version;

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.1",
+  "version": "0.34.5-beta.3",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -15,7 +15,7 @@
     "Brandon Aaron <hello.brandon@aaron.sh>",
     "Andreas Lind <andreas@one.com>",
     "Maurus Cuelenaere <mcuelenaere@gmail.com>",
-    "Linus Unnebäck <linus@folkdatorn.se>",
+    "Linus Unneb\u00e4ck <linus@folkdatorn.se>",
     "Victor Mateevitsi <mvictoras@gmail.com>",
     "Alaric Holloway <alaric.holloway@gmail.com>",
     "Bernhard K. Weisshuhn <bkw@codingforce.com>",
@@ -23,7 +23,7 @@
     "David Carley <dacarley@gmail.com>",
     "John Tobin <john@limelightmobileinc.com>",
     "Kenton Gray <kentongray@gmail.com>",
-    "Felix Bünemann <Felix.Buenemann@gmail.com>",
+    "Felix B\u00fcnemann <Felix.Buenemann@gmail.com>",
     "Samy Al Zahrani <samyalzahrany@gmail.com>",
     "Chintan Thakkar <lemnisk8@gmail.com>",
     "F. Orlando Galashan <frulo@gmx.de>",
@@ -31,7 +31,7 @@
     "Matt Hirsch <mhirsch@media.mit.edu>",
     "Matthias Thoemmes <thoemmes@gmail.com>",
     "Patrick Paskaris <patrick@paskaris.gr>",
-    "Jérémy Lal <kapouer@melix.org>",
+    "J\u00e9r\u00e9my Lal <kapouer@melix.org>",
     "Rahul Nanwani <r.nanwani@gmail.com>",
     "Alice Monday <alice0meta@gmail.com>",
     "Kristo Jorgenson <kristo.jorgenson@gmail.com>",
@@ -41,7 +41,7 @@
     "Matt Parrish <matt.r.parrish@gmail.com>",
     "Marcel Bretschneider <marcel.bretschneider@gmail.com>",
     "Matthew McEachen <matthew+github@mceachen.org>",
-    "Jarda Kotěšovec <jarda.kotesovec@gmail.com>",
+    "Jarda Kot\u011b\u0161ovec <jarda.kotesovec@gmail.com>",
     "Kenric D'Souza <kenric.dsouza@gmail.com>",
     "Oleh Aleinyk <oleg.aleynik@gmail.com>",
     "Marcel Bretschneider <marcel.bretschneider@gmail.com>",
@@ -70,7 +70,7 @@
     "Roman Malieiev <aromaleev@gmail.com>",
     "Tomas Szabo <tomas.szabo@deftomat.com>",
     "Robert O'Rourke <robert@o-rourke.org>",
-    "Guillermo Alfonso Varela Chouciño <guillevch@gmail.com>",
+    "Guillermo Alfonso Varela Chouci\u00f1o <guillevch@gmail.com>",
     "Christian Flintrup <chr@gigahost.dk>",
     "Manan Jadhav <manan@motionden.com>",
     "Leon Radley <leon@radley.se>",
@@ -79,7 +79,7 @@
     "Michael Nutt <michael@nutt.im>",
     "Brad Parham <baparham@gmail.com>",
     "Taneli Vatanen <taneli.vatanen@gmail.com>",
-    "Joris Dugué <zaruike10@gmail.com>",
+    "Joris Dugu\u00e9 <zaruike10@gmail.com>",
     "Chris Banks <christopher.bradley.banks@gmail.com>",
     "Ompal Singh <ompal.hitm09@gmail.com>",
     "Brodan <christopher.hranj@gmail.com>",
@@ -139,7 +139,7 @@
     "vips"
   ],
   "dependencies": {
-    "@img/colour": "^1.0.0",
+    "@ohos-ports/img-colour": "^1.1.0-beta.0",
     "detect-libc": "^2.1.2",
     "semver": "^7.7.3"
   },
@@ -200,4 +200,4 @@
   "funding": {
     "url": "https://opencollective.com/libvips"
   }
-}
+}