node-nim 10.10.1-beta.88 → 10.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-nim",
-    "version": "10.10.1-beta.88",
+    "version": "10.10.1",
     "description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
     "main": "dist/node-nim.js",
     "bin": {

package/script/download-sdk.js

@@ -6,9 +6,16 @@ const decompress = require('decompress')
 
 // Global variables
 const default_arch = 'universal'
+const supportedPackageArchByPlatform = {
+    darwin: ['universal', 'arm64', 'x64'],
+    win32: ['ia32', 'x64'],
+    linux: ['arm64', 'x64'],
+    ohos: ['arm64']
+}
 const platform = normalizePlatform(process.env.npm_config_platform || process.platform)
-const current_arch = normalizeArch(process.env.npm_config_arch || (platform === 'ohos' ? 'arm64' : process.arch))
-const arch = platform === 'darwin' ? default_arch : current_arch
+const configured_arch = process.env.npm_config_arch
+const current_arch = configured_arch || getRuntimeArch(platform)
+const arch = resolvePackageArch(platform, current_arch, platform === 'darwin' && !configured_arch)
 const channel = 'message'
 const product = 'nim'
 const savePath = path.join(__dirname, '..', 'temporary')
@@ -356,10 +363,17 @@ function platformAliases(nodePlatform) {
 }
 
 function archAliases(nodeArch) {
-    if (normalizeArch(nodeArch) === 'arm64') {
-        return ['arm64', 'arm64-v8a', 'arm64_v8a']
+    const arch = normalizeArch(nodeArch)
+    if (arch === 'arm64') {
+        return ['arm64', 'arm64-v8a', 'arm64_v8a', 'aarch64']
+    }
+    if (arch === 'x64') {
+        return ['x64', 'x86_64', 'amd64']
+    }
+    if (arch === 'ia32') {
+        return ['ia32', 'x86', 'i386', 'i686']
     }
-    return [nodeArch]
+    return [arch]
 }
 
 function normalizePlatform(nodePlatform) {
@@ -370,12 +384,40 @@ function normalizePlatform(nodePlatform) {
 }
 
 function normalizeArch(nodeArch) {
-    if (['arm64-v8a', 'arm64_v8a'].includes(nodeArch)) {
+    if (['arm64-v8a', 'arm64_v8a', 'aarch64'].includes(nodeArch)) {
         return 'arm64'
     }
+    if (['x86_64', 'amd64'].includes(nodeArch)) {
+        return 'x64'
+    }
+    if (['x86', 'i386', 'i686'].includes(nodeArch)) {
+        return 'ia32'
+    }
     return nodeArch
 }
 
+function getRuntimeArch(nodePlatform) {
+    return normalizePlatform(nodePlatform) === 'ohos' ? 'arm64' : process.arch
+}
+
+function getSupportedArchList(nodePlatform) {
+    nodePlatform = normalizePlatform(nodePlatform)
+    if (!Object.prototype.hasOwnProperty.call(supportedPackageArchByPlatform, nodePlatform)) {
+        throw new Error(`Unsupported platform ${nodePlatform}`)
+    }
+    return supportedPackageArchByPlatform[nodePlatform]
+}
+
+function resolvePackageArch(nodePlatform, nodeArch, preferUniversal) {
+    nodePlatform = normalizePlatform(nodePlatform)
+    const arch = preferUniversal ? default_arch : normalizeArch(nodeArch)
+    const supportedArchList = getSupportedArchList(nodePlatform)
+    if (!supportedArchList.includes(arch)) {
+        throw new Error(`Unsupported arch ${nodeArch} for ${nodePlatform}. Supported arch: ${supportedArchList.join(', ')}`)
+    }
+    return arch
+}
+
 // Parse directory listing from HTTP server
 async function parseDirectoryListing(url) {
     try {
@@ -444,9 +486,7 @@ async function findLatestBuildWithPackage(baseUrl, branch, nodePlatform, nodeArc
 // Map Node.js platform/arch to SDK directory format
 function getPlatformArchDir(nodePlatform, nodeArch) {
     nodePlatform = normalizePlatform(nodePlatform)
-    nodeArch = normalizeArch(nodeArch)
-    // Normalize arch - default to x64 if not arm64
-    const arch = nodeArch === 'arm64' ? 'arm64' : (nodeArch === 'ia32' ? 'ia32' : 'x64')
+    const arch = resolvePackageArch(nodePlatform, nodeArch, false)
     // For win32, include multi-threaded suffix
     if (nodePlatform === 'win32') {
         return `win32-${arch}-multi-threaded/`
@@ -491,6 +531,25 @@ async function findPackage(buildUrl, nodePlatform, nodeArch) {
     return `${fullUrl}${packageFile}`
 }
 
+// Find latest version from release directory (e.g., 10.10.1 from release/10.10.1/)
+async function findLatestReleaseVersion(baseUrl) {
+    const releaseUrl = `${baseUrl}release/`
+    log(` 🔍 Searching for latest version in ${releaseUrl}`)
+    const items = await parseDirectoryListing(releaseUrl)
+
+    const versions = items
+        .filter(item => item.endsWith('/'))
+        .map(item => item.replace('/', ''))
+        .filter(v => /^\d+\.\d+\.\d+/.test(v))
+        .sort((a, b) => compareVersions.compare(b, a))
+
+    if (versions.length === 0) {
+        throw new Error(`No version directories found in ${releaseUrl}`)
+    }
+    log(` ✅ Found latest version: ${versions[0]}`)
+    return versions[0]
+}
+
 // Build package URL from branch name
 async function buildPackageUrlFromBranch(branch, nodePlatform, nodeArch) {
     // Base64 encoded internal server URL (decode when needed)
@@ -498,9 +557,16 @@ async function buildPackageUrlFromBranch(branch, nodePlatform, nodeArch) {
     const baseUrl = Buffer.from(encodedBaseUrl, 'base64').toString('utf-8')
     log(` 🌿 Resolving package URL for branch: ${branch}`)
 
+    let effectiveBranch = branch
+    if (branch === 'beta') {
+        const latestVersion = await findLatestReleaseVersion(baseUrl)
+        effectiveBranch = `release/${latestVersion}`
+        log(` 📦 Beta channel: using latest release version ${latestVersion}`)
+    }
+
     // Find latest build that contains the requested platform package
     // This will automatically fallback to previous builds if the latest doesn't have the package
-    const { buildNumber, packageUrl } = await findLatestBuildWithPackage(baseUrl, branch, nodePlatform, nodeArch)
+    const { buildNumber, packageUrl } = await findLatestBuildWithPackage(baseUrl, effectiveBranch, nodePlatform, nodeArch)
 
     return packageUrl
 }
@@ -538,3 +604,7 @@ if (require.main === module) {
     })()
 }
 exports.downloadSDK = downloadSDK
+exports.normalizeArch = normalizeArch
+exports.resolvePackageArch = resolvePackageArch
+exports.getPlatformArchDir = getPlatformArchDir
+exports.getSupportedArchList = getSupportedArchList

package/script/package-ohpm-har.js

@@ -357,6 +357,28 @@ function isSemverCore(version) {
     return /^\d+\.\d+\.\d+$/.test(version)
 }
 
+function resolveSdkDisplayVersion(sdkVersion) {
+    const sdkDisplayVersions = {
+        17: '5.0.5(17)'
+    }
+    return sdkDisplayVersions[sdkVersion] || sdkVersion
+}
+
+function resolveSdkApiVersion(sdkVersion) {
+    const value = String(sdkVersion).trim()
+    const displayMatch = value.match(/\((\d+)\)$/)
+    if (displayMatch) {
+        return displayMatch[1]
+    }
+    if (/^\d+$/.test(value)) {
+        return value
+    }
+    if (!value) {
+        throw new Error(`Invalid OHOS SDK version: ${sdkVersion}`)
+    }
+    throw new Error(`OHOS SDK version must be an API level, got: ${sdkVersion}`)
+}
+
 function getPackageVersion() {
     const gitTag = runGit(['describe', '--abbrev=0', '--tags', '--exact-match'])
     const gitBranch = runGit(['rev-parse', '--abbrev-ref', 'HEAD'])
@@ -421,9 +443,11 @@ function main() {
         throw new Error('Missing required argument: --ohos-install-dir')
     }
     const version = getPackageVersion()
-    const sdkVersion = args.sdkVersion || process.env.OHPM_SDK_VERSION || '20'
+    const sdkVersion = args.sdkVersion || process.env.OHPM_SDK_VERSION || '17'
+    const sdkApiVersion = resolveSdkApiVersion(sdkVersion)
+    const sdkDisplayVersion = resolveSdkDisplayVersion(sdkVersion)
     const tools = resolvePackagingTools({
-        sdkVersion,
+        sdkVersion: sdkApiVersion,
         skipNpmInstall: args.skipNpmInstall
     })
 
@@ -443,7 +467,8 @@ function main() {
     const nativeTypePackage = 'libnode-nim.so'
 
     console.log(`[node-nim][ohpm] Package version: ${version}`)
-    console.log(`[node-nim][ohpm] OHOS SDK version: ${sdkVersion}`)
+    console.log(`[node-nim][ohpm] OHOS SDK version: ${sdkApiVersion}`)
+    console.log(`[node-nim][ohpm] OHOS SDK display version: ${sdkDisplayVersion}`)
     console.log(`[node-nim][ohpm] OHOS install directory: ${ohosInstallDir}`)
     if (process.env.OHOS_NATIVE_HOME) {
         console.log(`[node-nim][ohpm] OHOS_NATIVE_HOME: ${process.env.OHOS_NATIVE_HOME}`)
@@ -510,7 +535,8 @@ function main() {
     const restoreProjectFiles = replaceInFilesWithRestore(projectDir, placeholderExt, (content) => {
         return content
             .replace(/\{\{VERSION\}\}/g, version)
-            .replace(/\{\{OHOS_SDK_VERSION\}\}/g, sdkVersion)
+            .replace(/"\{\{OHOS_SDK_VERSION\}\}"/g, sdkApiVersion)
+            .replace(/\{\{OHOS_SDK_VERSION\}\}/g, sdkApiVersion)
     })
 
     try {