docs: 更新CHANGELOG

see stackoverflow why-docker-run-creates-new-container-every-time

.dockerignore

@@ -1,4 +1,4 @@
 **/**
 !lib/
-!package*
+!package.json
 !main.js

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -60,9 +60,11 @@ body:
     attributes:
       label: "运行日志"
       description: |
-        控制台日志。
+        控制台日志,请用md代码格式上传,日志内容过多时请上传文件
       placeholder: |
+        ```
         请在此黏贴运行日志。
+        ```
 
   - id: system
     type: input

.github/workflows/docker.yml

@@ -16,25 +16,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  path-context:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
+      - name: Build and push
+        env:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: shanmite/lottery_auto_docker:latest
+          repo: ${{ secrets.DOCKERHUB_REPO }}
+        run: |
+          curl -fsSL https://get.docker.com | bash -s docker
+          docker build -t $repo .
+          docker login -p $password -u $username
+          docker push $repo

.github/workflows/pkg.yml

@@ -16,8 +16,8 @@ on:
     branches:
       - main
 jobs:
-  pkg_x64:
-    runs-on: windows-latest
+  build_all:
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout codes"
         uses: actions/checkout@v2
@@ -27,56 +27,19 @@ jobs:
           node-version: "16"
       - name: "Pkg this"
         run: |
+          sudo apt install zip unzip
           npm install
-          npm run pkg_x64
-      - name: "Upload to artifact(win)"
+          npm run build_all
+      - name: "Upload to artifact"
         uses: actions/upload-artifact@v2
         with:
-          name: nlts-win-x64
-          path: dist/nlts-win-x64/
-      - name: "Upload to artifact(linux)"
-        uses: actions/upload-artifact@v2
+          name: all_platform
+          path: dist/
+      - name: "Upload to release draft"
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
-          name: nlts-linux-x64
-          path: dist/nlts-linux-x64/
-      - name: "Upload to artifact(macos)"
-        uses: actions/upload-artifact@v2
-        with:
-          name: nlts-macos-x64
-          path: dist/nlts-macos-x64/
-  # pkg_arm64:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: "Checkout codes"
-  #       uses: actions/checkout@v2
-  #     - name: "Use Node.js"
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: "16"
-  #     - name: "Pkg this"
-  #       run: |
-  #         npm install
-  #         npm run pkg_arm64
-  #     - name: "Upload to artifact"
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: nlts-linux-arm64
-  #         path: dist/
-  # pkg_armv7:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: "Checkout codes"
-  #       uses: actions/checkout@v2
-  #     - name: "Use Node.js"
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: "16"
-  #     - name: "Pkg this"
-  #       run: |
-  #         npm install
-  #         npm run pkg_armv7
-  #     - name: "Upload to artifact"
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: nlts-linux-armv7
-  #         path: dist/
+          file: "dist/*.zip"
+          delete_file: "dist/*.zip"
+          overwrite: true

CHANGELOG.md

@@ -1,5 +1,20 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.3.7)
+* 50e18e2 feat: 下载更新时有多个版本
+* b9c73bd chore: change docker auto build
+* 608b1fb pref: 增加筛选时日志输出(#79)
+* 07ef8df chore: 移植并完善自动化构建脚本
+* 6b09e26 chore: update docker init.sh
+* 7babd57 docs: about docker
+* 8b57a85 chore: pkg build
+## 较上一版本变化
+* 变更可执行文件
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.6...v2.3.7
+
 ## 主要变化(2.3.6)
 * eae72db feat: minfollower填0可关闭本地粉丝数筛选
 * 111602f perf: 日志显示是否转发过

Dockerfile

@@ -1,13 +1,10 @@
-# Latest Nodejs + Alpine Linux
 FROM node:lts-alpine
 
-MAINTAINER [email protected]
-
-LABEL version="1.0" description="自动参与B站动态抽奖"
+LABEL author="shanmite" version="1.1" description="自动参与B站动态抽奖"
 
 WORKDIR /lottery
 
-COPY ["package.json", "package*.json", "./"]
+COPY ["package.json", "./"]
 
 RUN npm install
 

README.md

@@ -201,7 +201,7 @@ npm i && npm run clear
 1.初始化
 
 ```bash
-curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sh
+curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sudo sh
 ```
 
 进入`lottery`文件夹
@@ -215,30 +215,27 @@ cd lottery
 - env.js 设置必要环境变量
 - my_config.js 你的设置
 
-执行相应的脚本
-> start,check,clear
-
-例如:
-
-```bash
-./start.sh
+2.执行相应的脚本
+```
+$ tree
+.
+├── check.sh
+├── clear.sh
+├── debug.sh 进入临时容器查看内容
+├── env.js
+├── my_config.js
+├── new_env.js
+├── new_my_config.js
+├── remove_all.sh 移除对应docker镜像和所有相关容器
+└── start.sh 
 ```
 
-2.更新
+3.更新
 
 进入lottery上一级目录
 
 使用与初始化相同的命令
 
-3.卸载
-
-进入lottery上一级目录
-
-```bash
-docker image rm -f shanmite/lottery_auto_docker
-rm -rf lottery/
-```
-
 ----------------------------------------
 
 ## 防重复转发

lib/core/monitor.js

@@ -210,6 +210,8 @@ class Monitor extends Searcher {
             return true
         });
 
+        log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
+
         if (lottery_param[0] !== "APIs" && set_lottery_info_url && protoLotteryInfo.length) {
             log.info("上传抽奖信息", "开始")
             await new Promise((resolve) => {
@@ -240,10 +242,16 @@ class Monitor extends Searcher {
             hasOfficialLottery
         }) {
             /* 遇到转发过就退出 */
-            if (is_liked) return false;
+            if (is_liked) {
+                log.info("筛选动态", `已转发(${dyid})`)
+                return false
+            }
 
             /* 超过指定时间退出 */
-            if (now_ts - create_time > max_create_time * 86400) return false;
+            if (now_ts - create_time > max_create_time * 86400) {
+                log.info("筛选动态", `过时动态(${dyid})`)
+                return false
+            }
 
             const
                 /**判断是转发源动态还是现动态 */
@@ -266,17 +274,26 @@ class Monitor extends Searcher {
                     || (!hasOfficialLottery && chatmodel[1] === '1');
 
             /**屏蔽词 */
-            if (isBlock) return false;
+            if (isBlock) {
+                log.info("筛选动态", `包含屏蔽词(${dyid})`)
+                return false
+            }
 
             /**若勾选只转已关注 */
-            if (only_followed && !isFollowed) return false;
+            if (only_followed && !isFollowed) {
+                log.info("筛选动态", `只转已关注(${dyid})`)
+                return false
+            }
 
             /* 获取黑名单并去重合并 */
             const { blacklist: remote_blacklist } = global_var.get("remoteconfig")
                 , new_blacklist = remote_blacklist
                     ? [...new Set([...blacklist.split(','), ...remote_blacklist.split(',')])].join()
                     : blacklist;
-            if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) return false;
+            if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) {
+                log.info("筛选动态", `黑名单用户(${dyid})`)
+                return false
+            }
 
 
             if (isLottery) {
@@ -354,6 +371,8 @@ class Monitor extends Searcher {
                 if (isSendChat) onelotteryinfo.rid = rid;
 
                 alllotteryinfo.push(onelotteryinfo);
+            } else {
+                log.info("筛选动态", `非抽奖动态(${dyid})`)
             }
         })
 

lib/core/searcher.js

@@ -247,21 +247,21 @@ class Searcher {
                     log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
                     if (is_liked) {
                         log.info('获取动态', `动态(${origin_dynamic_id})已转发过`)
+                    } else {
+                        return [...results, {
+                            lottery_info_type: 'uid',
+                            create_time: cur.origin_create_time,
+                            is_liked,
+                            uids: [cur.uid, cur.origin_uid],
+                            uname: cur.origin_uname,
+                            ctrl: [],
+                            dyid: cur.origin_dynamic_id,
+                            rid: cur.origin_rid_str,
+                            des: cur.origin_description,
+                            type: cur.orig_type,
+                            hasOfficialLottery: cur.origin_hasOfficialLottery
+                        }]
                     }
-
-                    return [...results, {
-                        lottery_info_type: 'uid',
-                        create_time: cur.origin_create_time,
-                        is_liked,
-                        uids: [cur.uid, cur.origin_uid],
-                        uname: cur.origin_uname,
-                        ctrl: [],
-                        dyid: cur.origin_dynamic_id,
-                        rid: cur.origin_rid_str,
-                        des: cur.origin_description,
-                        type: cur.orig_type,
-                        hasOfficialLottery: cur.origin_hasOfficialLottery
-                    }]
                 }
 
                 return results
@@ -452,11 +452,10 @@ class Searcher {
                                                 log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
                                                 if (is_liked) {
                                                     log.info('获取动态', `动态(${dyid})已转发过`)
+                                                } else {
+                                                    cur.is_liked = is_liked
+                                                    return [...results, cur]
                                                 }
-
-                                                cur.is_liked = is_liked
-
-                                                return [...results, cur]
                                             }
 
                                             return results

lib/update.js

@@ -1,12 +1,12 @@
 const { send } = require('./net/http')
-const { strToJson, download } = require('./utils')
+const { strToJson, download, try_for_each } = require('./utils')
 const { version, checkVersion, log } = require('./utils')
 
 /**
  * 获取下载链接
  * @param {string} owner
  * @param {string} repo
- * @returns {Promise<{ download_url: string, text: string }>}
+ * @returns {Promise<{ download_url: string[], text: string }>}
  */
 function getLatestReleaseDownloadUrl(owner, repo) {
     return new Promise((resolve, reject) => {
@@ -36,8 +36,8 @@ function getLatestReleaseDownloadUrl(owner, repo) {
                             try {
                                 const download_url = assets
                                     .filter(({ name }) => name.includes(platform) && name.includes(arch))
-                                    .map(({ browser_download_url }) => browser_download_url)[0]
-                                if (!download_url) {
+                                    .map(({ browser_download_url }) => browser_download_url)
+                                if (!download_url.length) {
                                     reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
                                 }
                                 resolve({ download_url, text })
@@ -67,11 +67,12 @@ function getLatestReleaseDownloadUrl(owner, repo) {
 async function update() {
     try {
         const { download_url, text } = await getLatestReleaseDownloadUrl('shanmiteko', 'LotteryAutoScript')
-
-        let proxy_url = new URL(download_url)
-        proxy_url.host = 'download.fastgit.org'
-
-        await download(proxy_url.href, 'latest_version.zip')
+        await try_for_each(download_url.entries(), async ([i, url]) => {
+            let proxy_url = new URL(url)
+            proxy_url.host = 'download.fastgit.org'
+            await download(proxy_url.href, `latest_version${i}.zip`)
+            return false
+        })
 
         log.info('自动下载', '成功下载到当前目录')
         log.info('更新说明', '\n' + text + '\n')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
@@ -8,9 +8,7 @@
     "clear": "node main.js clear",
     "check": "node main.js check",
     "update": "node main.js update",
-    "pkg_x64": "PowerShell .\\script\\pkg\\pkg.ps1",
-    "pkg_arm64": "npx pkg -t node16-linux-arm64 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js",
-    "pkg_armv7": "npx pkg -t node16-linuxstatic-armv7 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js"
+    "build_all": "bash script/build/pkg.sh"
   },
   "files": [
     "lib",
@@ -24,9 +22,12 @@
   "bin": "main.js",
   "pkg": {
     "targets": [
-      "linux-x64",
-      "win-x64",
-      "macos-x64"
+      "node12-win-x64",
+      "node16-win-x64",
+      "node16-linux-x64",
+      "node16-macos-x64",
+      "node16-linuxstatic-arm64",
+      "node16-linuxstatic-armv7"
     ],
     "outputPath": "dist"
   },

script/build/pkg.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+ROOT=$PWD
+README="README.md"
+TEMPLATE_CONFIG_FILE="my_config.example.js"
+TEMPLATE_ENV_FILE="env.example.js"
+CONFIG_FILE="my_config.js"
+ENV_FILE="env.js"
+TARGET_DIR="./dist"
+BIN_NAME="lottery"
+
+create_win_bat() {
+	echo "@echo off && lottery $1 && pause"
+}
+
+if [ -d "$TARGET_DIR" ]; then
+	rm -rf "$TARGET_DIR"
+fi
+
+npx pkg .
+
+# Searching in the current directory
+for file in "$TARGET_DIR/"*; do
+	TMPDIR="${file%.exe}"
+	TMPDIR_NAME="${TMPDIR##*/}"
+	REMANE_FILE="$TARGET_DIR/$BIN_NAME"
+	mv $file $REMANE_FILE
+	mkdir -p "$TMPDIR/"
+	mv $REMANE_FILE "$TMPDIR/"
+	cp $README "$TMPDIR/"
+	cp $TEMPLATE_CONFIG_FILE "$TMPDIR/$CONFIG_FILE"
+	cp $TEMPLATE_ENV_FILE "$TMPDIR/$ENV_FILE"
+	if [ "$(echo $file | grep '.exe')" ]; then
+		BATS=("start" "check" "clear" "update")
+		for item in "${BATS[@]}"; do
+			create_win_bat "${item}" >"$TMPDIR/$item.bat"
+		done
+	else
+		cat >"$TMPDIR/update.sh" <<-EOF
+			#!/bin/bash
+			./lottery update
+			if [[ -r "latest_version.zip" ]]; then
+			unzip latest_version.zip
+			rm latest_version0.zip
+			chmod u+x lottery
+			fi
+		EOF
+	fi
+	cd $TMPDIR
+	zip -r "$TMPDIR_NAME.zip" .
+	mv "$TMPDIR_NAME.zip" ../
+	cd $ROOT
+done

script/docker/init.sh

@@ -29,7 +29,9 @@ if [ ! -f "$ENV_FILE" ]; then
     echo "create $ENV_FILE"
     curl -fsSL $ENV_EXAMPLE -o $ENV_FILE
 else
-    echo "$ENV_FILE exists"
+    echo "$ENV_FILE already existed"
+    echo "create new_$ENV_FILE"
+    curl -fsSL $ENV_EXAMPLE -o "new_$ENV_FILE"
 fi
 
 # 新建配置文件
@@ -37,38 +39,99 @@ if [ ! -f "$CONFIG_FILE" ]; then
     echo "create $CONFIG_FILE"
     curl -fsSL $CONFIG_EXAMPLE -o $CONFIG_FILE
 else
-    echo "$CONFIG_FILE exists"
+    echo "$CONFIG_FILE already existed"
+    echo "create new_$CONFIG_FILE"
+    curl -fsSL $CONFIG_EXAMPLE -o "new_$CONFIG_FILE"
 fi
 
 echo "docker pull $DOCKER_REPO"
 docker -v && docker pull $DOCKER_REPO
 
 echo "create start.sh"
-echo -e "#!/bin/bash\n\
-docker run \
--v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
--v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-start" \
-> start.sh
+cat >start.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-start
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        start
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x start.sh
 
 echo "create check.sh"
-echo -e "#!/bin/bash\n\
-docker run \
--v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
--v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-check" \
-> check.sh
+cat >check.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-check
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        check
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x check.sh
 
 echo "create clear.sh"
-echo -e "#!/bin/bash\n\
-docker run \
--v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
--v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-$DOCKER_REPO \
-clear" \
-> clear.sh
+cat >clear.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-clear
+if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
+    docker run \\
+        -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
+        -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --name \$NAME \\
+        $DOCKER_REPO \\
+        clear
+else
+    echo "container \$NAME already existed"
+    echo "history logs -> docker logs \$NAME"
+    echo "close this -> docker stop \$NAME"
+    echo "start \$NAME"
+    docker start \$NAME
+fi
+EOF
 chmod +x clear.sh
+
+echo "create debug.sh"
+cat >debug.sh <<EOF
+#!/bin/sh
+NAME=shanmite-lottery-debug
+echo "create temporary debug container"
+docker run \\
+    -it \\
+    --name \$NAME \\
+    --entrypoint /bin/sh \\
+    $DOCKER_REPO -c sh
+echo "remove temporary debug container"
+docker rm -v \$NAME
+EOF
+chmod +x debug.sh
+
+echo "create remove_all.sh"
+cat >remove_all.sh <<EOF
+#!/bin/sh
+echo "remove all containers about $DOCKER_REPO"
+docker rm -v \$(docker ps -a | awk '/shanmite\/lottery_auto_docker/ {print \$1}')
+echo "remove image $DOCKER_REPO"
+docker image rm -f shanmite/lottery_auto_docker
+echo "see you next time!"
+EOF
+chmod +x remove_all.sh

script/pkg/pkg.ps1

@@ -1,57 +0,0 @@
-$README = "README.md"
-$TEMPLATE_CONFIG_FILE = "my_config.example.js"
-$TEMPLATE_ENV_FILE = "env.example.js"
-
-$CONFIG_FILE = "my_config.js"
-$ENV_FILE = "env.js"
-
-$TARGET_DIR = ".\dist"
-
-$NAME = 'lottery-auto-script'
-
-$TRIARR = @(
-    @("$NAME-win.exe", "lottery.exe", "nlts-win-x64"),
-    @("$NAME-linux", "lottery", "nlts-linux-x64"),
-    @("$NAME-macos", "lottery", "nlts-macos-x64")
-)
-
-if((Test-Path $TARGET_DIR) -eq "True") {
-    Remove-Item -Path $TARGET_DIR -Recurse
-}
-
-npx pkg .
-
-Copy-Item -Path $TEMPLATE_ENV_FILE -Destination $TARGET_DIR -Force
-Copy-Item -Path $TEMPLATE_CONFIG_FILE -Destination $TARGET_DIR -Force
-Copy-Item -Path $README -Destination $TARGET_DIR -Force
-
-Set-Location -Path $TARGET_DIR
-
-Move-Item -Path $TEMPLATE_ENV_FILE -Destination $ENV_FILE -Force
-Move-Item -Path $TEMPLATE_CONFIG_FILE -Destination $CONFIG_FILE -Force
-
-foreach ($TRI in $TRIARR) {
-    $PROTO_BIN,$BIN,$DIR = $TRI
-
-    New-Item -ItemType Directory -Force -Path $DIR
-    
-    Move-Item -Path $PROTO_BIN -Destination $BIN -Force
-
-    Move-Item -Path $BIN -Destination $DIR -Force
-    Copy-Item -Path $ENV_FILE -Destination $DIR -Force
-    Copy-Item -Path $CONFIG_FILE -Destination $DIR -Force
-    Copy-Item -Path $README -Destination $DIR -Force
-
-    if ($DIR -eq "nlts-win-x64") {
-        New-Item -Path $DIR -Name "start.bat" -ItemType File -Value "@echo off && lottery start && pause" -Force
-        New-Item -Path $DIR -Name "check.bat" -ItemType File -Value "@echo off && lottery check && pause" -Force
-        New-Item -Path $DIR -Name "clear.bat" -ItemType File -Value "@echo off && lottery clear && pause" -Force
-        New-Item -Path $DIR -Name "update.bat" -ItemType File -Value "@echo off && lottery update && pause" -Force
-    }
-
-    Compress-Archive -Path $DIR -DestinationPath $DIR -Force
-}
-
-Remove-Item -Path $ENV_FILE
-Remove-Item -Path $CONFIG_FILE
-Remove-Item -Path $README

script/unix-like/update.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-./lottery update
-
-if [[ -r "latest_version.zip" ]]; then
-    unzip latest_version.zip
-    rm latest_version.zip
-    chmod u+x lottery
-fi