feat: 升级依赖 (#27)

* feat: 修改devcontainer，升级截图库

* feat: 升级依赖

* feat: 修改CI

* feat: release 0.1.5

0.1.5

.cargo/config.toml

@@ -1,3 +1,14 @@
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-L", "native=/usr/lib/x86_64-linux-gnu/"]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = ["-L", "native=/usr/aarch64-unknown-linux-gnu/"]
+
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
-rustflags = ["-C", "target-feature=-crt-static"]
+rustflags = [
+  "-C",
+  "target-feature=-crt-static",
+  "-L",
+  "native=/usr/lib/",
+]

.devcontainer/devcontainer.json

@@ -1,41 +1,13 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/typescript-node
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
 {
-  "name": "nodejs-rust",
-  "build": {
-    "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick a Node version: 18, 16, 14.
-    // Append -bullseye or -buster to pin to an OS version.
-    // Use -bullseye variants on local on arm64/Apple Silicon.
-    "args": {
-      "VARIANT": "16-bullseye"
-    }
-  },
-  "overrideCommand": false,
-  // Configure tool-specific properties.
-  "customizations": {
-    // Configure properties specific to VS Code.
-    "vscode": {
-      // Set *default* container specific settings.json values on container create.
-      "settings": {
-        "lldb.executable": "/usr/bin/lldb",
-        // VS Code don't watch files under ./target
-        "files.watcherExclude": {
-          "**/target/**": true
-        },
-        "rust-analyzer.checkOnSave.command": "clippy"
-      },
-
-      // Add the IDs of extensions you want installed when the container is created.
-      "extensions": [
-        "dbaeumer.vscode-eslint",
-        "vadimcn.vscode-lldb",
-        "mutantdino.resourcemonitor",
-        "rust-lang.rust-analyzer",
-        "tamasfe.even-better-toml",
-        "serayuzgur.crates"
-      ]
-    }
+  "name": "Node.js & TypeScript",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:1-18-bullseye",
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/desktop-lite:1": {},
+    "ghcr.io/devcontainers/features/rust:1": {}
   },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
@@ -44,9 +16,20 @@
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "yarn install",
 
-  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "node",
-  "features": {
-    "rust": "latest"
+  // Configure tool-specific properties.
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "wengerk.highlight-bad-chars",
+        "streetsidesoftware.code-spell-checker",
+        "EditorConfig.EditorConfig",
+        "esbenp.prettier-vscode",
+        "rust-lang.rust-analyzer",
+        "foxundermoon.shell-format"
+      ]
+    }
   }
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
 }

.github/workflows/napi.yml

@@ -56,7 +56,7 @@ jobs:
             build: |-
               set -e &&
               apt-get update &&
-              apt-get install libxcb1-dev libxrandr-dev libdbus-1-dev -y &&
+              apt-get install libxcb1-dev -y &&
               yarn build --target x86_64-unknown-linux-gnu &&
               strip *.node
           - host: ubuntu-latest
@@ -65,17 +65,24 @@ jobs:
             build: |-
               set -e &&
               apk update &&
-              apk add libxcb-dev libxrandr-dev dbus-dev &&
+              apk add libxcb-dev &&
               yarn build &&
               strip *.node
           # - host: ubuntu-latest
           #   target: aarch64-unknown-linux-gnu
           #   docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
           #   build: |-
           #     set -e &&
-          #     dpkg --add-architecture arm64 &&
           #     apt-get update &&
-          #     apt-get install libxcb1-dev:arm64 libxrandr-dev:arm64 libdbus-1-dev:arm64 -y &&
+          #     apt-get install libxcb1-dev -y &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.so /usr/aarch64-unknown-linux-gnu/lib/libxcb.so &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.a /usr/aarch64-unknown-linux-gnu/lib/libxcb.a &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.so /usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/libxcb.so &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.a /usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/libxcb.a &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.so /usr/aarch64-unknown-linux-gnu/lib/gcc/libxcb.so &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.a /usr/aarch64-unknown-linux-gnu/lib/gcc/libxcb.a &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.so /usr/aarch64-unknown-linux-gnu/libxcb.so &&
+          #     ln -s /usr/lib/x86_64-linux-gnu/libxcb.a /usr/aarch64-unknown-linux-gnu/libxcb.a &&
           #     rustup target add aarch64-unknown-linux-gnu &&
           #     rustup toolchain install stable-aarch64-unknown-linux-gnu &&
           #     yarn build --target aarch64-unknown-linux-gnu &&
@@ -86,7 +93,7 @@ jobs:
           #   build: |-
           #     set -e &&
           #     apk update &&
-          #     apk add libxcb-dev libxrandr-dev dbus-dev && \
+          #     apk add libxcb-dev libxrandr-dev && \
           #     rustup target add aarch64-unknown-linux-musl && \
           #     yarn build --target aarch64-unknown-linux-musl &&
           #     /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
@@ -199,8 +206,6 @@ jobs:
   #     fail-fast: false
   #     matrix:
   #       node:
-  #         - "14"
-  #         - "16"
   #         - "18"
   #   runs-on: ubuntu-latest
   #   steps:

.gitignore

@@ -121,7 +121,7 @@ dist
 .AppleDouble
 .LSOverride
 
-# Icon must end with two 
+# Icon must end with two
 Icon
 
 

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  "recommendations": [
+    "wengerk.highlight-bad-chars",
+    "streetsidesoftware.code-spell-checker",
+    "editorconfig.editorconfig",
+    "esbenp.prettier-vscode",
+    "rust-lang.rust-analyzer",
+    "foxundermoon.shell-format"
+  ]
+}

Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.12.0", default-features = false, features = ["napi4"] }
 napi-derive = "2.12.2"
-screenshots = "0.5.3"
+screenshots = "0.7.0"
 
 [build-dependencies]
 napi-build = "2.0.1"

docker/alpine-init.sh

@@ -20,7 +20,6 @@ startInBackgroundIfNotRunning() {
 }
 
 startInBackgroundIfNotRunning Xvfb ${DISPLAY} -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x24 -dpi 96 -listen tcp -ac
-startInBackgroundIfNotRunning fluxbox -display ${DISPLAY}
 
 echo $@
 

docker/alpine.Dockerfile

@@ -4,17 +4,13 @@ FROM node:${VERSION}-alpine
 
 # Setup environment variables
 ENV DISPLAY=":0" \
-  VNC_PORT="5900" \
-  NOVNC_PORT="6080" \
   DISPLAY_WIDTH="1280" \
   DISPLAY_HEIGHT="720"
 
 COPY alpine-init.sh /usr/local/share/alpine-init.sh
 
-RUN echo "http://dl-3.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
 RUN apk update && \
-  apk add xvfb fluxbox libxcb libxrandr dbus
+  apk add xvfb libxcb libxrandr
 
 ENTRYPOINT [ "/usr/local/share/alpine-init.sh" ]
 

docker/debian-init.sh

@@ -20,7 +20,6 @@ startInBackgroundIfNotRunning() {
 }
 
 startInBackgroundIfNotRunning Xvfb ${DISPLAY} -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x24 -dpi 96 -listen tcp -ac
-startInBackgroundIfNotRunning fluxbox -display ${DISPLAY}
 
 echo $@
 

docker/debian.Dockerfile

@@ -1,24 +1,20 @@
 ARG VERSION="18"
 
-FROM node:${VERSION}
+FROM node:${VERSION}-slim
 
 # Setup environment variables
 ENV DEBIAN_FRONTEND=noninteractive \
   DISPLAY=":0" \
-  VNC_PORT="5900" \
-  NOVNC_PORT="6080" \
   DISPLAY_WIDTH="1280" \
   DISPLAY_HEIGHT="720"
 
 COPY debian-init.sh /usr/local/share/debian-init.sh
 
 RUN apt-get update && \
-  apt-get -y install --no-install-recommends \
-  xvfb \
-  fluxbox \
-  libxcb1 \
-  libxrandr2 \
-  libdbus-1-3
+  apt-get -y install --no-install-recommends xvfb libxcb1 libxrandr2 && \
+  apt-get autoclean -y && \
+  apt-get autoremove -y  && \
+  rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/usr/local/share/debian-init.sh" ]
 

npm/darwin-arm64/package.json

@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

npm/darwin-universal/package.json

@@ -12,4 +12,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

npm/darwin-x64/package.json

@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

npm/linux-arm64-gnu/package.json

@@ -18,4 +18,4 @@
   "libc": [
     "glibc"
   ]
-}
+}

npm/linux-arm64-musl/package.json

@@ -18,4 +18,4 @@
   "libc": [
     "musl"
   ]
-}
+}

npm/linux-x64-gnu/package.json

@@ -18,4 +18,4 @@
   "libc": [
     "glibc"
   ]
-}
+}

npm/linux-x64-musl/package.json

@@ -18,4 +18,4 @@
   "libc": [
     "musl"
   ]
-}
+}

npm/win32-arm64-msvc/package.json

@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

npm/win32-ia32-msvc/package.json

@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

npm/win32-x64-msvc/package.json

@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-screenshots",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [