Merge pull request #1 from bytedance/dev

ci: update branch could trigger actions

Author: oyyd

.github/workflows/CI.yml

@@ -1,12 +1,12 @@
 name: CI
 env:
   DEBUG: napi:*
-  APP_NAME: unode-unix-socket
+  APP_NAME: node-unix-socket
   MACOSX_DEPLOYMENT_TARGET: '10.13'
 'on':
   push:
     branches:
-      - main
+      - master
     tags-ignore:
       - '**'
     paths-ignore:
@@ -29,18 +29,13 @@ jobs:
             build: |
               yarn build
               strip -x *.node
-          - host: windows-latest
-            build: yarn build
-            target: x86_64-pc-windows-msvc
-            architecture: x64
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine-zig
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
             build: |-
               set -e &&
-              rustup target add x86_64-unknown-linux-gnu &&
-              yarn build --target x86_64-unknown-linux-gnu --zig --zig-abi-suffix 2.12 &&
-              llvm-strip -x *.node
+              yarn build --target x86_64-unknown-linux-gnu &&
+              strip *.node
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
@@ -96,7 +91,7 @@ jobs:
         if: ${{ matrix.settings.setup }}
         shell: bash
       - name: Install dependencies
-        run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+        run: yarn install
       - name: Build in docker
         uses: addnab/docker-run-action@v3
         if: ${{ matrix.settings.docker }}
@@ -114,21 +109,18 @@ jobs:
           name: bindings-${{ matrix.settings.target }}
           path: ${{ env.APP_NAME }}.*.node
           if-no-files-found: error
-  test-macOS-windows-binding:
-    name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
+  test-linux-x64-gnu-binding:
+    name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
     needs:
       - build
     strategy:
       fail-fast: false
       matrix:
-        settings:
-          - host: windows-latest
-            target: x86_64-pc-windows-msvc
         node:
           - '12'
           - '14'
           - '16'
-    runs-on: ${{ matrix.settings.host }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
@@ -141,31 +133,34 @@ jobs:
         uses: actions/cache@v2
         with:
           path: node_modules
-          key: npm-cache-test-${{ matrix.settings.target }}-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
+          key: npm-cache-test-linux-x64-gnu-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
       - name: Install dependencies
-        run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+        run: yarn install
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: bindings-${{ matrix.settings.target }}
+          name: bindings-x86_64-unknown-linux-gnu
           path: .
       - name: List packages
         run: ls -R .
         shell: bash
       - name: Test bindings
-        run: yarn test
-  test-linux-x64-gnu-binding:
-    name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
+        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim
+  test-macOS-binding:
+    name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
     needs:
       - build
     strategy:
       fail-fast: false
       matrix:
+        settings:
+          - host: macos-latest
+            target: x86_64-apple-darwin
         node:
-          - '12'
           - '14'
           - '16'
-    runs-on: ubuntu-latest
+          - '18'
+    runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
@@ -175,28 +170,28 @@ jobs:
           check-latest: true
           cache: yarn
       - name: Cache NPM dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
-          path: node_modules
-          key: npm-cache-test-linux-x64-gnu-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
+          path: .yarn/cache
+          key: npm-cache-test-${{ matrix.settings.target }}-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
       - name: Install dependencies
-        run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+        run: yarn install
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: bindings-x86_64-unknown-linux-gnu
+          name: bindings-${{ matrix.settings.target }}
           path: .
       - name: List packages
         run: ls -R .
         shell: bash
       - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test
+        run: yarn build:ts && yarn test
   publish:
     name: Publish
     runs-on: ubuntu-latest
     needs:
-      - test-macOS-windows-binding
       - test-linux-x64-gnu-binding
+      - test-macOS-binding
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
@@ -213,7 +208,7 @@ jobs:
           restore-keys: |
             npm-cache-
       - name: Install dependencies
-        run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+        run: yarn install
       - name: Download all artifacts
         uses: actions/download-artifact@v3
         with:

README.md

@@ -1,10 +1,10 @@
 # node-unix-socket
 
-`node-unix-socket` allows you to use some nonblocking sockets that are not supported by Node.js native modules, including:
+`node-unix-socket` allows you to use some nonblocking unix sockets that are currently not supported by Node.js native modules, including:
 
-- Using `SO_REUSEPORT` enabled TCP [net.Server](https://nodejs.org/dist/latest-v16.x/docs/api/net.html#class-netserver)
 - unix seqpacket(`SOCK_SEQPACKET`) sockets
 - unix datagram(`SOCK_DGRAM`) sockets
+- Using `SO_REUSEPORT` enabled TCP [net.Server](https://nodejs.org/dist/latest-v16.x/docs/api/net.html#class-netserver)
 
 `node-unix-socket` is a [napi-rs](https://napi.rs/) based [Node.js addons](https://nodejs.org/docs/latest-v16.x/api/addons.html). This lib uses [libuv](https://libuv.org/) inside Node.js so that it won't introduce any other asynchronous runtimes.
 

__test__/util.ts

@@ -41,6 +41,6 @@ export function hasIPv6() {
   const re = isWindows ? /Loopback Pseudo-Interface/ : /lo/;
   return Object.keys(iFaces).some((name) => {
     return re.test(name) &&
-           iFaces[name].some(({ family }) => family === 'IPv6');
+           iFaces[name]?.some(({ family }) => family === 'IPv6');
   });
 }

js/addon.js

@@ -1,4 +1,4 @@
-const { existsSync, readFileSync } = require('fs')
+const { existsSync, readFileSync, statSync } = require('fs')
 const { join } = require('path')
 
 const { platform, arch } = process
@@ -164,7 +164,7 @@ switch (platform) {
             loadError = e
           }
         } else {
-          localFileExisted = existsSync(
+          localFileExisted = statSync(
             join(__dirname, '../node-unix-socket.linux-x64-gnu.node')
           )
           try {

package.json

@@ -10,13 +10,13 @@
   "description": "node-unix-socket allows you to use SO_REUSEPORT, SOCK_SEQPACKET, SOCK_DGRAM in Node.js.",
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "napi build --platform --js false --dts js/addon.d.ts && npm run build:ts",
-    "build:release": "napi build --platform --release --js false --dts js/addon.d.ts && npm run build:ts",
+    "build": "npm run build:ts && napi build --platform --js false --dts js/addon.d.ts",
+    "build:release": "npm run build:ts && napi build --platform --release --js false --dts js/addon.d.ts",
     "build:ts": "tsc -p tsconfig.json",
     "check_mem": "node --max-old-space-size=128 scripts/dgram_memory.js",
     "doc": "typedoc --excludePrivate --excludeInternal --excludeExternals --plugin typedoc-plugin-markdown js/index.ts",
     "prepublishOnly": "napi pre`publish -t npm",
-    "test": "jest --testRegex '__test__/(.+).spec.ts' --runInBand",
+    "test": "jest --testRegex '__test__/(.+).spec.ts' --runInBand --silent=false",
     "test:dumb": "TERM=dumb npm run test",
     "version": "napi version"
   },