node-nim 10.8.10-beta.153 → 10.8.10-beta.161

package/dist/loader.js

@@ -1,51 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-let sdk_path = '';
-let debug_path = '';
-// Add the compiled product path to the environment variable,
-// so that the third party does not need to copy the
-// dynamic library separately to the program directory when importing.
-if (process.platform === 'win32') {
-    sdk_path = path_1.default.join(__dirname, '../sdk/bin');
-    debug_path = path_1.default.join(__dirname, '../../build/bin');
-}
-else {
-    sdk_path = path_1.default.join(__dirname, '../sdk/lib');
-    debug_path = path_1.default.join(__dirname, '../../build/lib');
-}
-let relative_path = process.platform === 'win32'
-    ? path_1.default.join(process.cwd(), 'node_modules/node-nim/sdk/bin')
-    : path_1.default.join(process.cwd(), 'node_modules/node-nim/sdk/lib');
-let paths = [debug_path, sdk_path, process.cwd(), path_1.default.dirname(process.execPath), relative_path];
-let node_nim_dir = '';
-for (let current_path of paths) {
-    if (fs_1.default.existsSync(path_1.default.join(current_path, 'node-nim.node'))) {
-        node_nim_dir = current_path;
-        break;
-    }
-}
-if (node_nim_dir.length === 0) {
-    throw new Error('node-nim.node not found, tried: ' + paths.join(', '));
-}
-if (process.platform === 'win32') {
-    process.env.PATH = `${node_nim_dir};${process.env.PATH}`;
-}
-let object;
-try {
-    object = require(path_1.default.join(node_nim_dir, 'node-nim.node'));
-}
-catch (exception) {
-    if (process.platform === 'win32') {
-        object = require('../sdk/bin/node-nim.node');
-    }
-    else {
-        object = require('../sdk/lib/node-nim.node');
-    }
-}
-exports.default = object;
+exports.default = require('../build/Release/node-nim.node');
 //# sourceMappingURL=loader.js.map

package/dist/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../ts/loader.ts"],"names":[],"mappings":";;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,IAAI,QAAQ,GAAG,EAAE,CAAA;AACjB,IAAI,UAAU,GAAG,EAAE,CAAA;AAEnB,6DAA6D;AAC7D,oDAAoD;AACpD,sEAAsE;AACtE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;IAChC,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IAC7C,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;CACrD;KAAM;IACL,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IAC7C,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;CACrD;AACD,IAAI,aAAa,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;IAC9C,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC;IAC3D,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAA;AAC7D,IAAI,KAAK,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAA;AAChG,IAAI,YAAY,GAAG,EAAE,CAAA;AACrB,KAAK,IAAI,YAAY,IAAI,KAAK,EAAE;IAC9B,IAAI,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,EAAE;QAC3D,YAAY,GAAG,YAAY,CAAA;QAC3B,MAAK;KACN;CACF;AACD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;IAC7B,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;CACvE;AACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;IAChC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;CACzD;AAED,IAAI,MAAW,CAAA;AACf,IAAI;IACF,MAAM,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAA;CAC3D;AAAC,OAAO,SAAS,EAAE;IAClB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;KAC7C;SAAM;QACL,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;KAC7C;CACF;AAED,kBAAe,MAAM,CAAA"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../ts/loader.ts"],"names":[],"mappings":";;AAAA,kBAAe,OAAO,CAAC,gCAAgC,CAAC,CAAA"}

package/package.json

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

package/script/download-sdk.js

@@ -1,78 +1,99 @@
 const fetch = require('node-fetch')
 const fs = require('fs')
+const path = require('path')
 const compareVersions = require('compare-versions')
 const download = require('download')
+
+// Global variables
 const arch = process.env.npm_config_arch || process.arch
 const platform = process.env.npm_config_platform || process.platform
-const sdk_group = 'message'
-const sdk_name = 'nim'
-const sdk_path = `${__dirname}/../sdk`
+const channel = 'message'
+const product = 'nim'
+const savePath = path.join(__dirname, '..', 'temporary')
+
 if (process.env.npm_config_ignoredownloadsdk) {
-    console.log('ignore download sdk')
+    console.log('ignore download product')
     process.exit(0)
 }
-let sdk_version
-let sdk_url = process.env.npm_config_nimsdkurl
+let version
+let downloadUrl = process.env.npm_config_nimsdkurl
 if (process.env.npm_package_version) {
-    sdk_version = process.env.npm_package_version.split('-')[0]
+    version = process.env.npm_package_version.split('-')[0]
 }
 if (process.env.npm_config_nimsdkversion) {
-    sdk_version = process.env.npm_config_nimsdkversion
+    version = process.env.npm_config_nimsdkversion
 }
 async function downloadSDK(custom_sdk_url) {
     if (custom_sdk_url) {
-        sdk_url = custom_sdk_url
+        downloadUrl = custom_sdk_url
     }
     // fetch publish list
     const res = await fetch('https://admin.netease.im/public-service/free/publish/list')
     const publish_json = await res.json()
     // get sdk list
-    if (!sdk_url) {
-        let latest_version = '0.0.0'
-        let latest_sdk_url = ''
-        Object.keys(publish_json.data[sdk_group]).forEach((temp) => {
-            if (compareVersions.compare(latest_version, temp, '<')) {
-                publish_json.data[sdk_group][temp].forEach((member) => {
-                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
-                        latest_version = temp
-                        latest_sdk_url = member.cdnlink
+    if (!downloadUrl) {
+        let latestVersion = '0.0.0'
+        let latestDownloadUrl = ''
+        Object.keys(publish_json.data[channel]).forEach((temp) => {
+            if (compareVersions.compare(latestVersion, temp, '<')) {
+                publish_json.data[channel][temp].forEach((member) => {
+                    if (member.filename.includes(product) && member.filename.includes(platform) && member.filename.includes(arch)) {
+                        latestVersion = temp
+                        latestDownloadUrl = member.cdnlink
                     }
                 })
             }
-            if (sdk_version === temp) {
-                publish_json.data[sdk_group][temp].forEach((member) => {
-                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
-                        sdk_url = member.cdnlink
+            if (version === temp) {
+                publish_json.data[channel][temp].forEach((member) => {
+                    if (member.filename.includes(product) && member.filename.includes(platform) && member.filename.includes(arch)) {
+                        downloadUrl = member.cdnlink
                     }
                 })
             }
         })
-        if (!sdk_url || sdk_url.length === 0) {
-            console.log(`${sdk_name} sdk version ${sdk_version} not found, use latest version ${latest_version}`)
-            sdk_url = latest_sdk_url
+        if (!downloadUrl || downloadUrl.length === 0) {
+            console.log(`[node-nim] Product [${product}] version ${version} not found, use latest version ${latestVersion}`)
+            downloadUrl = latestDownloadUrl
         }
-        console.log(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch}`)
+        console.log(`[node-nim] Downloading product: ${product}, platform: ${platform}, arch: ${arch}`)
     }
-    if (!sdk_url) {
-        console.error(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch} not found`)
+    if (!downloadUrl) {
+        console.error(`[node-nim] Downloading product: ${product}, platform: ${platform}, arch: ${arch} not found`)
         return
     }
-    console.info(`[node-nim] Downloading prebuilt sdk from ${sdk_url} to ${sdk_path}`)
-    // remove sdk_path
-    if (fs.existsSync(sdk_path)) {
-        fs.rmdirSync(sdk_path, { recursive: true })
+    console.info(`[node-nim] Downloading prebuilt SDK from ${downloadUrl} to ${savePath}`)
+    // remove temporary download folder and target folder
+    const target = path.join(__dirname, '..', 'build', 'Release')
+    if (fs.existsSync(savePath)) {
+        fs.rmSync(savePath, { recursive: true })
+    }
+    if (fs.existsSync(target)) {
+        fs.rmSync(target, { recursive: true })
     }
     // download sdk
     try {
-        await download(sdk_url, sdk_path, {
+        await download(downloadUrl, savePath, {
             extract: true,
             filter: (file) => {
                 return !file.path.includes('._')
             }
         })
+        // create build/Release folder
+        if (!fs.existsSync(target)) {
+            fs.mkdirSync(target, { recursive: true })
+        }
+        // move sdk/* files to build/Release
+        const from = path.join(savePath, platform === 'win32' ? 'bin' : 'lib')
+        const files = fs.readdirSync(from)
+        files.forEach((file) => {
+            console.info(`[node-nim] move ${file} to ${target}`)
+            fs.renameSync(path.join(from, file), path.join(target, file))
+        })
+        // remove temporary download folder
+        fs.rmSync(savePath, { recursive: true })
         console.info(`[node-nim] Downloading prebuilt sdk complete`)
     } catch (err) {
-        console.error(`[node-nim] downloadSDK error:${err}`)
+        console.error(`[node-nim] Failed to download, error: ${err}`)
     }
 }
 exports.downloadSDK = downloadSDK

package/types/loader.d.ts

@@ -1,2 +1,2 @@
-declare let object: any;
-export default object;
+declare const _default: any;
+export default _default;