eitri-cli 1.9.0-beta.8 → 1.9.0

package/bitbucket-pipelines.yml

@@ -1,5 +1,4 @@
-image: node:18
-  
+image: node:18-buster
 pipelines:
   custom:
     test-validation:
@@ -8,10 +7,26 @@ pipelines:
           caches:
             - node
           script:
-            - yarn
+            - apt-get update
+            - apt-get install -y wget
+            - wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+            - apt-get install -y ./google-chrome-stable_current_amd64.deb
+            - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable'
+            - apt-get install -y libssl-dev
+            - apt-get install -y pkg-config
+            - apt-get install -y git
+            - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            - export PATH="/root/.cargo/bin:${PATH}"
+            - rustup --version
+            - rustup target add x86_64-unknown-linux-gnu
+            - cd eitri-cli-v2
+            - npm i
+            - npm run build:debug
+            - cd ..
+            - npm i
             - npm i -g .
             - export FOUNDRY_CONTEXT_PATH=runes-foundry
-            - yarn test cli.test.js --force-exit
+            - npm run test cli.test.js -- --force-exit
   default:
     - step: &runTests
         name: Run tests
@@ -19,18 +34,26 @@ pipelines:
           - node
         script:
           - apt-get update
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - apt-get install -y wget
+          - wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          - apt-get install -y ./google-chrome-stable_current_amd64.deb
+          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable'
           - apt-get install -y libssl-dev
           - apt-get install -y pkg-config
-          - apt-get install -y cargo
+          - apt-get install -y git
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - rustup target add x86_64-unknown-linux-gnu
           - cd eitri-cli-v2
-          - yarn install
+          - npm i
+          - npm run build:debug
           - cd ..
-          - apt-get install -y git
-          - apt-get install -y chromium
-          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/chromium-browser'
           - yarn
           - npm i -g .
-          - yarn test cli.test.js --force-exit
+          - export FOUNDRY_CONTEXT_PATH=runes-foundry
+          - npm run test cli.test.js -- --force-exit --runInBand --bail
     - step: &runRustTests
         name: Run Rust tests
         caches:
@@ -39,44 +62,134 @@ pipelines:
         - apt-get update
         - apt-get install -y libssl-dev
         - apt-get install -y pkg-config
-        - apt-get install -y cargo
+        - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        - export PATH="/root/.cargo/bin:${PATH}"
+        - rustup --version
+        - rustup target add x86_64-unknown-linux-gnu
         - cd eitri-cli-v2
         - cargo test
+    - step: &macOSCrossCompile
+        image: joseluisq/rust-linux-darwin-builder:1.76.0
+        name: "macOS cross compile"
+        caches:
+          - node
+        script:
+          - apt-get update
+          - apt-get install -y git
+          - apt-get install -y libssl-dev
+          - apt-get install -y libudev-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
+          - apt-get install -y gcc-mingw-w64
+          - apt-get install -y curl
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - export CC=o64-clang
+          - export CXX=o64-clang++
+          - cd eitri-cli-v2
+          - cargo add openssl --features vendored
+          - npm install
+          - npm run build -- --target aarch64-apple-darwin
+          - npm run build -- --target x86_64-apple-darwin
+          - rm -rf target
+          - cp -r ./eitri-cli-v2.darwin-arm64.node ../eitri-cli-v2.darwin-arm64.node
+          - cp -r ./eitri-cli-v2.darwin-x64.node ../eitri-cli-v2.darwin-x64.node
+          - cp -r ./index.d.ts ../index.d.ts
+          - cp -r ./index.js ../rust-index.js
+        artifacts:
+          - eitri-cli-v2.darwin-arm64.node
+          - eitri-cli-v2.darwin-x64.node
+          - index.d.ts
+          - rust-index.js
+    - step: &linuxCrossCompile
+        caches:
+          - node
+        name: 'Linux compile'
+        script:
+          - apt-get update
+          - apt-get install -y git
+          - apt-get install -y libssl-dev
+          - apt-get install -y libudev-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
+          - apt-get install -y gcc-mingw-w64
+          - apt-get install -y curl
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - rustup target add x86_64-unknown-linux-gnu
+          - cd eitri-cli-v2
+          - cargo add openssl --features vendored
+          - npm install
+          - npm run build -- --target x86_64-unknown-linux-gnu
+          - cp -r ./eitri-cli-v2.linux-x64-gnu.node ../eitri-cli-v2.linux-x64-gnu.node
+        artifacts:
+          - eitri-cli-v2.linux-x64-gnu.node
+    - step: &windowsCrossCompile
+        caches:
+          - node
+        name: 'Windows cross compile'
+        script:
+          - apt-get update
+          - apt-get install -y git
+          - apt-get install -y libssl-dev
+          - apt-get install -y libudev-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
+          - apt-get install -y gcc-mingw-w64
+          - apt-get install -y curl
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - rustup target add x86_64-pc-windows-msvc
+          - cargo install cargo-xwin
+          - cd eitri-cli-v2
+          - npm install
+          - npm run build -- --target x86_64-pc-windows-msvc
+          - cp -r ./eitri-cli-v2.win32-x64-msvc.node ../eitri-cli-v2.win32-x64-msvc.node
+        artifacts:
+          - eitri-cli-v2.win32-x64-msvc.node
   branches:
     "**":
-      - step: *runTests
-      - step: *runRustTests
+      - parallel:
+          fail-fast: false 
+          steps:
+            - step: *runTests
+            - step: *runRustTests
     '{beta,master}':
-      # - step: *runTests
-      # - step: *runRustTests
+      - parallel:
+          fail-fast: false 
+          steps:
+            - step: *runTests
+            - step: *runRustTests
+      - parallel:
+          fail-fast: true
+          steps:
+            - step: *windowsCrossCompile
+            - step: *linuxCrossCompile
+            - step: *macOSCrossCompile
       - step:
           name: "Generation of a new version: beta or stable."
           caches:
             - node
           script:
+            - mv ./eitri-cli-v2.darwin-arm64.node ./eitri-cli-v2/eitri-cli-v2.darwin-arm64.node
+            - mv ./eitri-cli-v2.darwin-x64.node ./eitri-cli-v2/eitri-cli-v2.darwin-x64.node
+            - mv ./eitri-cli-v2.linux-x64-gnu.node ./eitri-cli-v2/eitri-cli-v2.linux-x64-gnu.node
+            - mv ./eitri-cli-v2.win32-x64-msvc.node ./eitri-cli-v2/eitri-cli-v2.win32-x64-msvc.node
+            - mv ./index.d.ts ./eitri-cli-v2/index.d.ts
+            - mv ./rust-index.js ./eitri-cli-v2/index.js
             - apt-get update
             - apt-get install -y git
-            - apt-get install -y libssl-dev
-            - apt-get install -y libudev-dev
-            - apt-get install -y pkg-config
-            - apt-get install -y cargo
-            - apt-get install -y gcc-mingw-w64
-            - apt-get install -y curl
-            - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-            - export PATH="/root/.cargo/bin:${PATH}"
-            - rustup --version
-            - rustup target add x86_64-pc-windows-gnu
-            - rustup target add x86_64-unknown-linux-gnu
-            - cd eitri-cli-v2
-            - yarn install
-            - yarn install:win32
-            - rm -rf target
-            - cd ..
             - echo 'Start release'
             - echo 'If there is a new version, it will be automatically published on NPM according to the channel/branch (beta or master (stable)).'
-            - yarn
-            - yarn run release
+            - npm i
+            - npm run release
             - RELEASE_VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')
             - node -e "const fs = require('fs'); const packageJson = JSON.parse(fs.readFileSync('package.json')); packageJson.version = process.env.RELEASE_VERSION; fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 4));"
             - echo 'New release'
-            - echo $RELEASE_VERSION
+            - echo $RELEASE_VERSION

package/config/dev.js

@@ -2,6 +2,7 @@
 const HOST = "api.eitri.tech";
 const packageJson = require("../package.json");
 const path = require("path");
+const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
 
 const config = {
     userAgent: packageJson.name,
@@ -24,8 +25,8 @@ const config = {
     },
     workspace: {
         url: `https://${HOST}`,
-        basePath: "foundry",
-        targetPath: "/foundry/targets",
+        basePath: FOUNDRY_CONTEXT_PATH,
+        targetPath: `/${FOUNDRY_CONTEXT_PATH}/targets`,
         target: {
             knownTargets: [
                 {

package/eitri-cli-v2/Cargo.toml

@@ -1,23 +1,39 @@
 [package]
-name = "eitri-cli-v2"
-version = "0.1.0"
-license = "ISC"
 edition = "2021"
-exclude = ["index.node"]
+name = "eitri-cli-v2"
+version = "0.0.0"
 
 [lib]
 crate-type = ["cdylib"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
+# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
+napi = { version = "2.12.2", default-features = false, features = [
+    "napi4",
+    "async",
+] }
+napi-derive = "2.12.2"
 homedir = "0.2.1"
 httpmock = "0.7.0"
-neon = "1"
 once_cell = "1.19.0"
 reqwest = { version = "0.11.24", features = ["json", "multipart", "cookies"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_derive = "1.0.197"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
-openssl = { version = "0.10", features = ["vendored"] }
-cc = "1.0.90"
+
+[target.x86_64-unknown-linux-gnu]
+openssl = { version = "0.9", features = ["vendored"] }
+
+[target.aarch64-apple-darwin]
+openssl = { version = "0.9", features = ["vendored"] }
+
+[target.x86_64-apple-darwin]
+openssl = { version = "0.9", features = ["vendored"] }
+
+[build-dependencies]
+napi-build = "2.0.1"
+
+[profile.release]
+lto = true
+strip = "symbols"

package/eitri-cli-v2/build.rs

@@ -0,0 +1,5 @@
+extern crate napi_build;
+
+fn main() {
+  napi_build::setup();
+}

package/eitri-cli-v2/index.d.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+/* eslint-disable */
+
+/* auto-generated by NAPI-RS */
+
+export function publish(environment: string, message: string): Promise<void>

package/eitri-cli-v2/index.js

@@ -1,2 +1,300 @@
-const os = require('os')
-module.exports = os.platform() === 'win32' ? require('./index.win32.node'): require('./index.unix.node')
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require('path')
+
+const { platform, arch } = process
+
+let nativeBinding = null
+let localFileExisted = false
+let loadError = null
+
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
+    } catch (e) {
+      return true
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, 'eitri-cli-v2.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.android-arm64.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, 'eitri-cli-v2.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
+    }
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+    }
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'eitri-cli-v2.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./eitri-cli-v2.darwin-universal.node')
+      } else {
+        nativeBinding = require('eitri-cli-v2-darwin-universal')
+      }
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, 'eitri-cli-v2.darwin-x64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.darwin-x64.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.darwin-arm64.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+    }
+    localFileExisted = existsSync(join(__dirname, 'eitri-cli-v2.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./eitri-cli-v2.freebsd-x64.node')
+      } else {
+        nativeBinding = require('eitri-cli-v2-freebsd-x64')
+      }
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-x64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-x64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.linux-arm-gnueabihf.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.linux-arm-gnueabihf.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-linux-arm-gnueabihf')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'eitri-cli-v2.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./eitri-cli-v2.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('eitri-cli-v2-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
+        localFileExisted = existsSync(
+          join(__dirname, 'eitri-cli-v2.linux-s390x-gnu.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./eitri-cli-v2.linux-s390x-gnu.node')
+          } else {
+            nativeBinding = require('eitri-cli-v2-linux-s390x-gnu')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+    }
+    break
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
+  }
+  throw new Error(`Failed to load native binding`)
+}
+
+const { publish } = nativeBinding
+
+module.exports.publish = publish

package/eitri-cli-v2/package-lock.json

@@ -7,7 +7,6 @@
     "": {
       "name": "eitri-cli-v2",
       "version": "0.1.0",
-      "hasInstallScript": true,
       "license": "ISC",
       "devDependencies": {
         "cargo-cp-artifact": "^0.1"

package/eitri-cli-v2/package.json

@@ -1,21 +1,35 @@
 {
   "name": "eitri-cli-v2",
-  "version": "0.1.0",
-  "description": "",
+  "version": "0.0.0",
   "main": "index.js",
-  "scripts": {
-    "build": "cargo-cp-artifact -nc index.unix.node -- cargo build --message-format=json-render-diagnostics --target x86_64-unknown-linux-gnu",
-    "build:win32": "cargo-cp-artifact -nc index.win32.node -- cargo build --message-format=json-render-diagnostics --target x86_64-pc-windows-gnu",
-    "build-debug": "npm run build --",
-    "build-release": "npm run build -- --release",
-    "build-release:win32": "npm run build:win32 -- --release",
-    "install": "npm run build-release",
-    "install:win32": "npm run build-release:win32",
-    "test": "cargo test"
+  "types": "index.d.ts",
+  "napi": {
+    "name": "eitri-cli-v2",
+    "triples": {
+      "defaults": false,
+      "additional": [
+        "aarch64-apple-darwin"
+      ]
+    }
   },
-  "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "devDependencies": {
-    "cargo-cp-artifact": "^0.1"
+    "@napi-rs/cli": "^2.18.0",
+    "ava": "^6.0.1"
+  },
+  "ava": {
+    "timeout": "3m"
+  },
+  "engines": {
+    "node": ">= 10"
+  },
+  "scripts": {
+    "artifacts": "napi artifacts",
+    "build": "napi build --platform --release",
+    "build:debug": "napi build --platform",
+    "prepublishOnly": "napi prepublish -t npm",
+    "test": "ava",
+    "universal": "napi universal",
+    "version": "napi version"
   }
 }