node-nim 7.8.3-rc.2 → 7.8.13-rc.2

package/README.md

@@ -1,36 +1,36 @@
-# NetEase IM Node.js addon wrapper
-
-## Build environment
-
- - CMake 3.10 or higher
- - Visual Studio 2017 or MSBuild 2017
-
-## Command line
-
-|Options|Descroption|
-|---|---|
-|fetch-wrapper|Download NIM C++ SDK source files and C binary files|
-|build-wrapper|Build NIM C++ SDK|
-|package|Package the compiled artifacts|
-|build|Build with specified parameters (build-wrapper+package)|
-
-Examples:
-
-Fetch C++ wrapper source files and build C++ addon for node.js.
-
-```bash
-npx just fetch-wrapper --target_platform=win32 --target_arch=ia32
-npx just build --runtime=electron --target=13.1.2 --target_platform=win32 --target_arch=ia32
-```
-
-Just build NIM C++ wrapper, needs `npx just fetch-wrapper` before.
-
-```bash
-npx just build-wrapper --target_platform=win32 --target_arch=ia32
-```
-
-Packing a compiled artifact as `.tar.gz` in `packages` folder.
-
-```bash
-npx just package --runtime=electron --target=13.1.2 --target_platform=win32 --target_arch=ia32
-```
+# NetEase IM Node.js addon wrapper
+
+## Build environment
+
+ - CMake 3.10 or higher
+ - Visual Studio 2017 or MSBuild 2017
+
+## Command line
+
+|Options|Descroption|
+|---|---|
+|fetch-wrapper|Download NIM C++ SDK source files and C binary files|
+|build-wrapper|Build NIM C++ SDK|
+|package|Package the compiled artifacts|
+|build|Build with specified parameters (build-wrapper+package)|
+
+Examples:
+
+Fetch C++ wrapper source files and build C++ addon for node.js.
+
+```bash
+npx just fetch-wrapper --target_platform=win32 --target_arch=ia32
+npx just build --runtime=electron --target=13.1.2 --target_platform=win32 --target_arch=ia32
+```
+
+Just build NIM C++ wrapper, needs `npx just fetch-wrapper` before.
+
+```bash
+npx just build-wrapper --target_platform=win32 --target_arch=ia32
+```
+
+Packing a compiled artifact as `.tar.gz` in `packages` folder.
+
+```bash
+npx just package --runtime=electron --target=13.1.2 --target_platform=win32 --target_arch=ia32
+```

package/just-task.js

@@ -1,154 +1,168 @@
-const { task, option, logger, argv } = require('just-task')
-const fs = require('fs')
-const download = require('download')
-const path = require('path')
-const fetchWrapper = require(path.join(__dirname, './scripts/fetch_wrapper'))
-const buildWrapper = require(path.join(__dirname, './scripts/build_wrapper'))
-const buildAddon = require(path.join(__dirname, './scripts/build_addon'))
-const packAddon = require(path.join(__dirname, './scripts/pack_addon'))
-const packageMeta = require(path.join(__dirname, 'package.json'))
-
-option('target')
-option('target_platform', { default: process.platform, choices: ['darwin', 'win32', 'linux'] })
-option('target_arch', { default: process.arch, choices: ['ia32', 'x64'] })
-option('runtime', { default: 'electron', choices: ['electron', 'node'] })
-option('debug', { default: false, boolean: true })
-option('silent', { default: false, boolean: true })
-
-const nativeUrl = 'https://yx-web-nosdn.netease.im/package/1632832061/NIM_CrossPlatform_SDK_v7.8.3.zip?download=NIM_CrossPlatform_SDK_v7.8.3.zip'
-
-task('fetch-wrapper', () => {
-  const platform = argv().target_platform
-  const arch = argv().target_arch
-  const cachePath = path.join(__dirname, 'nim_sdk')
-  const temporaryPath = path.join(__dirname, 'temporary')
-  return fetchWrapper({
-    fetchUrl: nativeUrl,
-    temporaryPath,
-    extractPath: cachePath,
-    platform,
-    arch
-  })
-})
-
-task('build-wrapper', () => {
-  const platform = argv().target_platform
-  const arch = argv().target_arch
-  const sourcePath = path.join(__dirname, 'nim_sdk')
-  return buildWrapper({
-    platform,
-    arch,
-    sourcePath
-  })
-})
-
-task('build', () => {
-  const target = argv().target
-  const platform = argv().target_platform || process.platform
-  const arch = argv().target_arch || process.arch
-  const runtime = argv().runtime
-  const version = packageMeta.version
-  const packageName = packageMeta.name
-  const sourcePath = path.join(__dirname, 'nim_sdk')
-
-  logger.info(JSON.stringify(argv()))
-
-  return new Promise((resolve, reject) => {
-    buildWrapper({
-      platform,
-      arch,
-      sourcePath
-    }).then(() => {
-      return buildAddon({
-        target,
-        runtime,
-        platform,
-        arch
-      })
-    }).then(() => {
-      return packAddon({
-        packageName,
-        version,
-        target,
-        platform,
-        arch,
-        runtime
-      })
-    }).then(() => resolve())
-  })
-})
-
-task('package', () => {
-  logger.info(JSON.stringify(argv()))
-  const target = argv().target
-  const platform = argv().target_platform
-  const arch = argv().target_arch
-  const runtime = argv().runtime
-  const version = packageMeta.version
-  const packageName = packageMeta.name
-  return packAddon({
-    packageName,
-    version,
-    target,
-    platform,
-    arch,
-    runtime
-  })
-})
-
-task('install', () => {
-  if ((process.env.npm_config_skip_install || false)) {
-    logger.info('[install] Skip downlaod prebuilt libraries.')
-    return
-  }
-  let target = '5.0.8'
-  let runtime = 'electron'
-  const targetPlatform = process.env.npm_config_target_platform || process.platform
-  const targetArch = process.env.npm_config_target_arch || process.arch
-  const downloadUrl = process.env.npm_config_download_url
-  const curPkgMeta = require(path.join(__dirname, 'package.json'))
-  const rootPkgMeta = require(path.join(process.env.INIT_CWD, 'package.json'))
-  logger.info('------------------ just install --------------------')
-  if (rootPkgMeta.devDependencies && rootPkgMeta.devDependencies.electron) {
-    // v13.1.2 => 13.1.2, remove prefix 'v'
-    target = rootPkgMeta.devDependencies.electron.replace(/^.*?(\d+.+\d).*/, '$1')
-  } else {
-    target = process.version.match(/^v(\d+\.\d+)/)[1]
-    runtime = 'node'
-  }
-  // 13.1.2 => 13.1, match major.minor only
-  const nodeAbi = `${runtime}-v${target.replace(/^(\d+.+?\d+).*/, '$1')}`
-  return new Promise((resolve, reject) => {
-    const host = 'https://yx-web-nosdn.netease.im'
-    const remotePath = 'package'
-    const packageName = `${curPkgMeta.name}-v${curPkgMeta.version}-${nodeAbi}-${targetPlatform}-${targetArch}.tar.gz`
-    const localPath = 'build/Release'
-    fs.rmdirSync(path.join(__dirname, localPath), { recursive: true })
-    download(`${host}/${remotePath}/${packageName}`, path.join(__dirname, localPath), {
-      strip: 1,
-      extract: true
-    }).then(() => {
-      logger.info(`[install] Download prebuilt binaries from ${host}/${remotePath}/${packageName}`)
-      resolve()
-    }).catch(err => {
-      logger.warn(`[install] Failed to download package from: ${host}/${remotePath}/${packageName}, error code: ${err.statusCode}`)
-      logger.info('[install] Start build from local source file.')
-      const cachePath = path.join(__dirname, 'nim_sdk')
-      const temporaryPath = path.join(__dirname, 'temporary')
-      fetchWrapper({
-        fetchUrl: nativeUrl,
-        temporaryPath,
-        extractPath: cachePath
-      }).then(() => {
-        return buildWrapper({
-          sourcePath: cachePath
-        })
-      }).then(() => {
-        return buildAddon({
-          target,
-          runtime
-        })
-      }).then(() => resolve())
-    })
-  })
-})
+const { task, option, logger, argv } = require('just-task')
+const fs = require('fs')
+const download = require('download')
+const path = require('path')
+const fetchWrapper = require(path.join(__dirname, './scripts/fetch_wrapper'))
+const buildWrapper = require(path.join(__dirname, './scripts/build_wrapper'))
+const buildAddon = require(path.join(__dirname, './scripts/build_addon'))
+const packAddon = require(path.join(__dirname, './scripts/pack_addon'))
+const packageMeta = require(path.join(__dirname, 'package.json'))
+
+option('target')
+option('target_platform', {
+    default: process.platform,
+    choices: ['darwin', 'win32', 'linux']
+})
+option('target_arch', { default: process.arch, choices: ['ia32', 'x64'] })
+option('runtime', { default: 'electron', choices: ['electron', 'node'] })
+option('debug', { default: false, boolean: true })
+option('silent', { default: false, boolean: true })
+
+const nativeUrl = 'https://yx-web-nosdn.netease.im/package/1682303944593/NIM_CrossPlatform_SDK_v7.8.13.zip?download=NIM_CrossPlatform_SDK_v7.8.13.zip'
+
+task('fetch-wrapper', () => {
+    const platform = argv().target_platform
+    const arch = argv().target_arch
+    const cachePath = path.join(__dirname, 'nim_sdk')
+    const temporaryPath = path.join(__dirname, 'temporary')
+    return fetchWrapper({
+        fetchUrl: nativeUrl,
+        temporaryPath,
+        extractPath: cachePath,
+        platform,
+        arch
+    })
+})
+
+task('build-wrapper', () => {
+    const platform = argv().target_platform
+    const arch = argv().target_arch
+    const sourcePath = path.join(__dirname, 'nim_sdk')
+    return buildWrapper({
+        platform,
+        arch,
+        sourcePath
+    })
+})
+
+task('build', () => {
+    const target = argv().target
+    const platform = argv().target_platform || process.platform
+    const arch = argv().target_arch || process.arch
+    const runtime = argv().runtime
+    const version = packageMeta.version
+    const packageName = packageMeta.name
+    const sourcePath = path.join(__dirname, 'nim_sdk')
+
+    logger.info(JSON.stringify(argv()))
+
+    return new Promise((resolve, reject) => {
+        buildWrapper({
+            platform,
+            arch,
+            sourcePath
+        })
+            .then(() => {
+                return buildAddon({
+                    target,
+                    runtime,
+                    platform,
+                    arch
+                })
+            })
+            .then(() => {
+                return packAddon({
+                    packageName,
+                    version,
+                    target,
+                    platform,
+                    arch,
+                    runtime
+                })
+            })
+            .then(() => resolve())
+    })
+})
+
+task('package', () => {
+    logger.info(JSON.stringify(argv()))
+    const target = argv().target
+    const platform = argv().target_platform
+    const arch = argv().target_arch
+    const runtime = argv().runtime
+    const version = packageMeta.version
+    const packageName = packageMeta.name
+    return packAddon({
+        packageName,
+        version,
+        target,
+        platform,
+        arch,
+        runtime
+    })
+})
+
+task('install', () => {
+    if (process.env.npm_config_skip_install || false) {
+        logger.info('[install] Skip downlaod prebuilt libraries.')
+        return
+    }
+    let target = '5.0.8'
+    let runtime = 'electron'
+    const targetPlatform = process.env.npm_config_target_platform || process.platform
+    const targetArch = process.env.npm_config_target_arch || process.arch
+    const downloadUrl = process.env.npm_config_download_url
+    const curPkgMeta = require(path.join(__dirname, 'package.json'))
+    const rootPkgMeta = require(path.join(process.env.INIT_CWD, 'package.json'))
+    logger.info('------------------ just install --------------------')
+    if (rootPkgMeta.devDependencies && rootPkgMeta.devDependencies.electron) {
+        // v13.1.2 => 13.1.2, remove prefix 'v'
+        target = rootPkgMeta.devDependencies.electron.replace(/^.*?(\d+.+\d).*/, '$1')
+    } else {
+        target = process.version.match(/^v(\d+\.\d+)/)[1]
+        runtime = 'node'
+    }
+    // 13.1.2 => 13.1, match major.minor only
+    const nodeAbi = `${runtime}-v${target.replace(/^(\d+.+?\d+).*/, '$1')}`
+    return new Promise((resolve, reject) => {
+        const host = 'https://yx-web-nosdn.netease.im'
+        const remotePath = 'package'
+        const packageName = `${curPkgMeta.name}-v${curPkgMeta.version}-${nodeAbi}-${targetPlatform}-${targetArch}.tar.gz`
+        const localPath = 'build/Release'
+        if (fs.existsSync(path.join(__dirname, localPath, packageName))) {
+            fs.rmSync(path.join(__dirname, localPath), { recursive: true })
+        }
+        fs.mkdirSync(path.join(__dirname, localPath), { recursive: true })
+        download(`${host}/${remotePath}/${packageName}`, path.join(__dirname, localPath), {
+            strip: 1,
+            extract: true
+        })
+            .then(() => {
+                logger.info(`[install] Download prebuilt binaries from ${host}/${remotePath}/${packageName}`)
+                resolve()
+            })
+            .catch((err) => {
+                logger.warn(`[install] Failed to download package from: ${host}/${remotePath}/${packageName}, error code: ${err.statusCode}`)
+                logger.info('[install] Start build from local source file.')
+                const cachePath = path.join(__dirname, 'nim_sdk')
+                const temporaryPath = path.join(__dirname, 'temporary')
+                fetchWrapper({
+                    fetchUrl: nativeUrl,
+                    temporaryPath,
+                    extractPath: cachePath
+                })
+                    .then(() => {
+                        return buildWrapper({
+                            sourcePath: cachePath
+                        })
+                    })
+                    .then(() => {
+                        return buildAddon({
+                            target,
+                            runtime
+                        })
+                    })
+                    .then(() => resolve())
+            })
+    })
+})

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "node-nim",
-  "version": "7.8.3-rc.2",
-  "description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
-  "main": "js/nim.js",
-  "types": "types/nim.d.ts",
-  "author": "Dylan",
-  "license": "ISC",
-  "scripts": {
-    "test": "mocha test -slow 200 -timeout 5000",
-    "install": "just install",
-    "build:ts": "rimraf ./js && rimraf ./types && tsc",
-    "prepare": "npm run build:ts"
-  },
-  "dependencies": {
-    "bindings": "^1.5.0",
-    "download": "^8.0.0",
-    "extract-zip": "^2.0.1",
-    "just-task": "^1.4.1",
-    "node-gyp": "^8.1.0",
-    "shelljs": "^0.8.4",
-    "tar": "^6.1.0"
-  },
-  "devDependencies": {
-    "eslint": "^7.31.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "mocha": "^8.4.0",
-    "typescript": "^4.3.5",
-    "typescript-eslint": "0.0.1-alpha.0"
-  },
-  "keywords": [
-    "netease",
-    "nim",
-    "chatroom",
-    "im sdk",
-    "nim sdk",
-    "nim node",
-    "nim electron"
-  ],
-  "files": [
-    "js",
-    "scripts",
-    "just-task.js"
-  ]
-}
+{
+    "name": "node-nim",
+    "version": "7.8.13-rc.2",
+    "description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
+    "main": "js/nim.js",
+    "types": "types/nim.d.ts",
+    "author": "Dylan",
+    "license": "ISC",
+    "scripts": {
+        "test": "mocha test -slow 200 -timeout 5000",
+        "install": "just install",
+        "build:ts": "rimraf ./js && rimraf ./types && tsc",
+        "prepare": "npm run build:ts"
+    },
+    "dependencies": {
+        "bindings": "^1.5.0",
+        "download": "^8.0.0",
+        "extract-zip": "^2.0.1",
+        "just-task": "^1.4.1",
+        "node-gyp": "^8.1.0",
+        "shelljs": "^0.8.4",
+        "tar": "^6.1.0"
+    },
+    "devDependencies": {
+        "eslint": "^7.31.0",
+        "eslint-config-standard": "^16.0.3",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-promise": "^5.1.0",
+        "eslint-plugin-standard": "^5.0.0",
+        "mocha": "^8.4.0",
+        "typescript": "^4.3.5",
+        "typescript-eslint": "0.0.1-alpha.0"
+    },
+    "keywords": [
+        "netease",
+        "nim",
+        "chatroom",
+        "im sdk",
+        "nim sdk",
+        "nim node",
+        "nim electron"
+    ],
+    "files": [
+        "js",
+        "scripts",
+        "just-task.js"
+    ]
+}

package/scripts/build_addon.js

@@ -1,56 +1,56 @@
-const { logger } = require('just-task')
-const shell = require('shelljs')
-const path = require('path')
-const fs = require('fs')
-
-module.exports = ({
-  target = '8.0.0',
-  runtime = 'electron',
-  platform = process.platform,
-  arch = process.arch,
-  debug = false,
-  silent = false,
-  msvcVersion = '2017',
-  distUrl = 'https://electronjs.org/headers',
-  forceClean = false
-}) => {
-  return new Promise((resolve, reject) => {
-    logger.info(`[build] start building [${runtime}-${target}]`)
-    const command = [`npx node-gyp configure`]
-    command.push(`--arch=${arch} --msvs_version=${msvcVersion}`)
-    if (runtime === 'electron') {
-      command.push(`--target=${target} --dist-url=${distUrl}`)
-    }
-    if (debug) {
-      command.push('--debug')
-      if (platform === 'darwin') {
-        command.push('-- -f xcode')
-      }
-    }
-    logger.info(command.join(' '))
-    logger.info('[build] platform:', platform)
-    logger.info('[build] arch:', arch)
-    logger.info('[build] target:', target)
-    logger.info('[build] runtime:', runtime)
-    if (forceClean) {
-      if (shell.exec(`npx node-gyp clean`, { silent }) !== 0) {
-        reject(new Error('failed to clean up build folder.'))
-      }
-    }
-    shell.exec(command.join(' '), { silent }, (code, stdout, stderr) => {
-      logger.info(`[build] configure done ${stdout}`)
-      if (code !== 0) {
-        reject(stderr)
-      }
-      shell.exec(`npx node-gyp build`, { silent }, (code, stdout, stderr) => {
-        if (code !== 0) {
-          logger.error('[build] failed to build C++ addon manually.')
-          logger.error(stderr)
-          reject(stderr)
-        }
-        logger.info(`[build] build complete ${stdout}`)
-        resolve()
-      })
-    })
-  })
-}
+const { logger } = require('just-task')
+const shell = require('shelljs')
+const path = require('path')
+const fs = require('fs')
+
+module.exports = ({
+  target = '8.0.0',
+  runtime = 'electron',
+  platform = process.platform,
+  arch = process.arch,
+  debug = false,
+  silent = false,
+  msvcVersion = '2017',
+  distUrl = 'https://electronjs.org/headers',
+  forceClean = false
+}) => {
+  return new Promise((resolve, reject) => {
+    logger.info(`[build] start building [${runtime}-${target}]`)
+    const command = [`npx node-gyp configure`]
+    command.push(`--arch=${arch} --msvs_version=${msvcVersion}`)
+    if (runtime === 'electron') {
+      command.push(`--target=${target} --dist-url=${distUrl}`)
+    }
+    if (debug) {
+      command.push('--debug')
+      if (platform === 'darwin') {
+        command.push('-- -f xcode')
+      }
+    }
+    logger.info(command.join(' '))
+    logger.info('[build] platform:', platform)
+    logger.info('[build] arch:', arch)
+    logger.info('[build] target:', target)
+    logger.info('[build] runtime:', runtime)
+    if (forceClean) {
+      if (shell.exec(`npx node-gyp clean`, { silent }) !== 0) {
+        reject(new Error('failed to clean up build folder.'))
+      }
+    }
+    shell.exec(command.join(' '), { silent }, (code, stdout, stderr) => {
+      logger.info(`[build] configure done ${stdout}`)
+      if (code !== 0) {
+        reject(stderr)
+      }
+      shell.exec(`npx node-gyp build`, { silent }, (code, stdout, stderr) => {
+        if (code !== 0) {
+          logger.error('[build] failed to build C++ addon manually.')
+          logger.error(stderr)
+          reject(stderr)
+        }
+        logger.info(`[build] build complete ${stdout}`)
+        resolve()
+      })
+    })
+  })
+}

package/scripts/build_wrapper.js

@@ -1,45 +1,45 @@
-const path = require('path')
-const shell = require('shelljs')
-const { logger } = require('just-task')
-
-module.exports = ({
-  platform = process.platform,
-  arch = process.arch,
-  sourcePath
-}) => {
-  return new Promise((resolve, reject) => {
-    const wrapperSource = path.join(sourcePath, 'wrapper')
-
-    // Generate Visual Studio solution
-    const temporaryPath = path.join(sourcePath, `build_${platform}_${arch}`)
-    const cmakeGenerate = [`cmake ${wrapperSource}`]
-    cmakeGenerate.push(`-B${temporaryPath}`)
-    cmakeGenerate.push('-T"v141_xp"')
-    cmakeGenerate.push(`-DCMAKE_INSTALL_PREFIX=${sourcePath}`)
-    if (platform === 'win32') {
-      cmakeGenerate.push('-DBUILD_SHARED_LIBS=ON')
-      cmakeGenerate.push(arch === 'ia32' ? '-G"Visual Studio 15 2017"' : '-G"Visual Studio 15 2017 Win64"')
-    } else if (platform === 'darwin') {
-      cmakeGenerate.push('-G"Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
-    } else {
-      reject(new Error('Unsupported platform.'))
-    }
-    logger.info(`[wrapper] ${cmakeGenerate.join(' ')}`)
-    if (shell.exec(cmakeGenerate.join(' ')).code !== 0) {
-      logger.error('[wrapper] Failed to generate NIM C++ wrapper solution.')
-      process.exit(1)
-    }
-
-    // Build C++ wrapper
-    const cmakeBuild = [`cmake --build ${temporaryPath}`]
-    cmakeBuild.push('--config Release')
-    cmakeBuild.push('--target install')
-    logger.info(`[wrapper] ${cmakeBuild.join(' ')}`)
-    if (shell.exec(cmakeBuild.join(' ')).code !== 0) {
-      logger.error('[wrapper] Failed to build NIM C++ wrapper.')
-      process.exit(1)
-    }
-
-    resolve()
-  })
-}
+const path = require('path')
+const shell = require('shelljs')
+const { logger } = require('just-task')
+
+module.exports = ({
+  platform = process.platform,
+  arch = process.arch,
+  sourcePath
+}) => {
+  return new Promise((resolve, reject) => {
+    const wrapperSource = path.join(sourcePath, 'wrapper')
+
+    // Generate Visual Studio solution
+    const temporaryPath = path.join(sourcePath, `build_${platform}_${arch}`)
+    const cmakeGenerate = [`cmake ${wrapperSource}`]
+    cmakeGenerate.push(`-B${temporaryPath}`)
+    cmakeGenerate.push('-T"v141_xp"')
+    cmakeGenerate.push(`-DCMAKE_INSTALL_PREFIX=${sourcePath}`)
+    if (platform === 'win32') {
+      cmakeGenerate.push('-DBUILD_SHARED_LIBS=ON')
+      cmakeGenerate.push(arch === 'ia32' ? '-G"Visual Studio 15 2017"' : '-G"Visual Studio 15 2017 Win64"')
+    } else if (platform === 'darwin') {
+      cmakeGenerate.push('-G"Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
+    } else {
+      reject(new Error('Unsupported platform.'))
+    }
+    logger.info(`[wrapper] ${cmakeGenerate.join(' ')}`)
+    if (shell.exec(cmakeGenerate.join(' ')).code !== 0) {
+      logger.error('[wrapper] Failed to generate NIM C++ wrapper solution.')
+      process.exit(1)
+    }
+
+    // Build C++ wrapper
+    const cmakeBuild = [`cmake --build ${temporaryPath}`]
+    cmakeBuild.push('--config Release')
+    cmakeBuild.push('--target install')
+    logger.info(`[wrapper] ${cmakeBuild.join(' ')}`)
+    if (shell.exec(cmakeBuild.join(' ')).code !== 0) {
+      logger.error('[wrapper] Failed to build NIM C++ wrapper.')
+      process.exit(1)
+    }
+
+    resolve()
+  })
+}

package/scripts/fetch_wrapper.js

@@ -1,45 +1,51 @@
-const path = require('path')
-const download = require('download')
-const tar = require('tar')
-const fs = require('fs')
-const { logger } = require('just-task')
-
-module.exports = ({
-  platform = process.platform,
-  arch = process.arch,
-  fetchUrl,
-  temporaryPath,
-  extractPath
-}) => {
-  return new Promise((resolve, reject) => {
-    logger.info(fetchUrl)
-    download(fetchUrl, temporaryPath, {
-      strip: 1,
-      extract: true
-    }).then(() => {
-      logger.info(`[fetch] Download file from ${fetchUrl}`)
-      const files = fs.readdirSync(temporaryPath)
-      const matchPlatform = platform === 'win32' ? 'windows' : 'macosx'
-      const matchArch = arch === 'ia32' ? 'x86' : (platform === 'win32' ? 'x64' : 'x86_64')
-      for (let i = 0; i < files.length; i++) {
-        logger.info(`[fetch] found resource: ${files[i]}`)
-        if (files[i].indexOf(matchPlatform) !== -1 && files[i].indexOf(matchArch) !== -1) {
-          const sourceFile = path.join(temporaryPath, files[i])
-          if (!fs.existsSync(extractPath)) {
-            fs.mkdirSync(extractPath)
-          }
-          logger.info(`[wrapper] Extract file from ${sourceFile} to ${extractPath}`)
-          tar.extract({
-            file: sourceFile,
-            cwd: extractPath,
-            sync: true
-          })
-          resolve()
-          break
-        }
-      }
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
+const path = require('path')
+const download = require('download')
+const tar = require('tar')
+const fs = require('fs')
+const { logger } = require('just-task')
+
+module.exports = ({
+  platform = process.platform,
+  arch = process.arch,
+  fetchUrl,
+  temporaryPath,
+  extractPath
+}) => {
+  return new Promise((resolve, reject) => {
+    logger.info(fetchUrl)
+    download(fetchUrl, temporaryPath, {
+      strip: 1,
+      extract: true
+    }).then(() => {
+      logger.info(`[fetch] Download file from ${fetchUrl}`)
+      const files = fs.readdirSync(temporaryPath)
+      const matchPlatform = platform === 'win32' ? 'windows' : 'macosx'
+      const matchArch = arch === 'ia32' ? 'x86' : (platform === 'win32' ? 'x64' : 'x86_64')
+      for (let i = 0; i < files.length; i++) {
+        logger.info(`[fetch] found resource: ${files[i]}`)
+        if (files[i].indexOf(matchPlatform) !== -1 && files[i].indexOf(matchArch) !== -1) {
+          const sourceFile = path.join(temporaryPath, files[i])
+          if (!fs.existsSync(extractPath)) {
+            fs.mkdirSync(extractPath)
+          }
+          logger.info(`[wrapper] Extract file from ${sourceFile} to ${extractPath}`)
+          tar.extract({
+            file: sourceFile,
+            cwd: extractPath,
+            sync: true,
+            filter: (path, entry) => {
+              if (path.includes('._')) {
+                return false
+              }
+              return true
+            }
+          })
+          resolve()
+          break
+        }
+      }
+    }).catch(err => {
+      reject(err)
+    })
+  })
+}

package/scripts/pack_addon.js

@@ -1,41 +1,41 @@
-const path = require('path')
-const tar = require('tar')
-const fs = require('fs')
-const { logger } = require('just-task')
-
-module.exports = ({
-  packageName,
-  version,
-  target,
-  platform,
-  arch,
-  runtime,
-  artifactsDirectory = path.join(__dirname, '../build/Release'),
-  distDirectory = path.join(__dirname, '../packages')
-}) => {
-  return new Promise((resolve, reject) => {
-    const strippedVersion = target.replace(/^.*?(\d+.+?\d).*/, '$1')
-    const artifacts = fs.readdirSync(artifactsDirectory)
-    const targetName = `${packageName}-v${version}-${runtime}-v${strippedVersion}-${platform}-${arch}.tar.gz`
-    const targetFile = path.join(distDirectory, targetName)
-    if (!fs.existsSync(distDirectory)) {
-      fs.mkdirSync(distDirectory)
-    }
-    logger.info(`[package] Tar artifacts as: ${targetName}`)
-    tar.create({
-      gzip: true,
-      file: targetFile,
-      cwd: artifactsDirectory,
-      filter: (path, stat) => {
-        if (path.match(/\.pdb|\.dll|\.node|\.framework|\.dylib/g) !== null) {
-          logger.info(`[package] ${path}`)
-          return true
-        }
-      }
-    }, artifacts).then(() => {
-      resolve()
-    }).catch(err => {
-      reject(err)
-    })
-  })
-}
+const path = require('path')
+const tar = require('tar')
+const fs = require('fs')
+const { logger } = require('just-task')
+
+module.exports = ({
+  packageName,
+  version,
+  target,
+  platform,
+  arch,
+  runtime,
+  artifactsDirectory = path.join(__dirname, '../build/Release'),
+  distDirectory = path.join(__dirname, '../packages')
+}) => {
+  return new Promise((resolve, reject) => {
+    const strippedVersion = target.replace(/^.*?(\d+.+?\d).*/, '$1')
+    const artifacts = fs.readdirSync(artifactsDirectory)
+    const targetName = `${packageName}-v${version}-${runtime}-v${strippedVersion}-${platform}-${arch}.tar.gz`
+    const targetFile = path.join(distDirectory, targetName)
+    if (!fs.existsSync(distDirectory)) {
+      fs.mkdirSync(distDirectory)
+    }
+    logger.info(`[package] Tar artifacts as: ${targetName}`)
+    tar.create({
+      gzip: true,
+      file: targetFile,
+      cwd: artifactsDirectory,
+      filter: (path, stat) => {
+        if (path.match(/\.pdb|\.dll|\.node|\.framework|\.dylib/g) !== null) {
+          logger.info(`[package] ${path}`)
+          return true
+        }
+      }
+    }, artifacts).then(() => {
+      resolve()
+    }).catch(err => {
+      reject(err)
+    })
+  })
+}