fix: 错误码变更(#20)

fix: 修改dingtalk签名base64问题

.github/workflows/pkg.yml

@@ -0,0 +1,72 @@
+name: 'Package Node.js project into an executable'
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'lib/**'
+      - 'main.js'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'lib/**'
+      - 'main.js'
+  workflow_dispatch:
+    branches:
+      - main
+jobs:
+  pkg_x64:
+    runs-on: windows-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_x64
+      - name: 'Upload to artifact'
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist_x64
+          path: dist/
+  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/

.github/workflows/sync.yml

@@ -1,27 +0,0 @@
-name: 'Automatic sync'
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-  watch:
-    types: started
-  repository_dispatch:
-    types: repo-sync
-jobs:
-  repo-sync:
-    env:
-      PAT: ${{ github.event.client_payload.PAT || secrets.PAT }}
-    runs-on: ubuntu-latest
-    if: github.event.repository.owner.id == github.event.sender.id
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: 开始自动同步
-        uses: repo-sync/github-sync@v2
-        if: env.PAT
-        with:
-          source_repo: "https://github.com/shanmite/LotteryAutoScript.git"
-          source_branch: "main"
-          destination_branch: "main"
-          github_token: ${{ github.event.client_payload.PAT || secrets.PAT }}

lib/core/monitor.js

@@ -55,10 +55,9 @@ class Monitor extends Searcher {
                 event_bus.emit('Turn_on_the_Monitor')
                 break
             case 22:
-                config.only_followed = true;
-                log.warn('账号异常', `UID(${global_var.get('myUID')})临时进入只转已关注模式(异常号只会对部分UP出现关注异常)`)
+                log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
                 if (!config.is_exception) {
-                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n临时进入只转已关注模式(异常号只会对部分UP出现关注异常)\n\n可在设置中令is_exception为true关闭此推送`)
+                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n异常号只会对部分UP出现关注异常\n\n可在设置中令is_exception为true关闭此推送`)
                 }
                 config.is_exception = true;
                 event_bus.emit('Turn_on_the_Monitor')
@@ -88,6 +87,7 @@ class Monitor extends Searcher {
         log.info('筛选动态', `筛选完毕(${len})`);
 
         if (len) {
+            let is_exception = false;
             for (const Lottery of utils.shuffle(allLottery)) {
                 let status = 0;
                 if (Lottery.isOfficialLottery) {
@@ -118,14 +118,24 @@ class Monitor extends Searcher {
                     }
                 }
                 status = await this.go(Lottery)
-                if (status) {
-                    return status
+                switch (status) {
+                    case 0:
+                        break;
+                    case 22:
+                        is_exception = true
+                        break;
+                    default:
+                        return status
                 }
                 d_storage.updateDyid(Lottery.dyid)
                 await utils.delay(config.wait * (Math.random() + 0.5));
             }
             log.info('抽奖', '开始转发下一组动态');
-            return 0
+            if (is_exception) {
+                return 22
+            } else {
+                return 0
+            }
         } else {
             log.info('抽奖', '无未转发抽奖');
             return 0

lib/helper/notify.js

@@ -430,7 +430,7 @@ function ddBotNotify(text, desp) {
             const dateNow = Date.now();
             const hmac = crypto.createHmac('sha256', DD_BOT_SECRET);
             hmac.update(`${dateNow}\n${DD_BOT_SECRET}`);
-            const result = encodeURIComponent(hmac.digest('Util64'));
+            const result = encodeURIComponent(hmac.digest().toString('base64'));
             send({
                 method: 'POST',
                 url: `https://oapi.dingtalk.com/robot/send`,

lib/net/bili.js

@@ -763,7 +763,7 @@ const bili_client = {
             } else if (res.code === 12015) {
                 show && log.error('自动评论', '需要输入验证码');
                 return 1
-            } else if (res.code === 12053) {
+            } else if (res.code === 12035) {
                 show && log.error('自动评论', '黑名单用户无法互动');
                 return -1
             } else {

lib/update.js

@@ -27,17 +27,25 @@ function getLatestReleaseDownloadUrl(owner, repo) {
                             ['linux', 'linux'],
                             ['darwin', 'macos']
                         ]).get(process.platform)
-                        if (platform) {
+                        const arch = new Map([
+                            ['x64', 'x64']
+                            ['arm', 'armv7'],
+                            ['arm64', 'arm64']
+                        ]).get(process.arch)
+                        if (platform && arch) {
                             try {
                                 const download_url = assets
-                                    .filter(({ name }) => name.includes(platform))
+                                    .filter(({ name }) => name.includes(platform) && name.includes(arch))
                                     .map(({ browser_download_url }) => browser_download_url)[0]
+                                if (!download_url) {
+                                    reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
+                                }
                                 resolve({ download_url, text })
                             } catch (err) {
                                 reject(err)
                             }
                         } else {
-                            reject(`未找到能在此平台(${process.platform})上运行的版本`)
+                            reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
                         }
                     } else {
                         reject('当前已是最新版本')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
@@ -9,8 +9,8 @@
     "check": "node main.js check",
     "update": "node main.js update",
     "pkg_x64": "PowerShell .\\script\\pkg\\pkg.ps1",
-    "pkg_arm64": "npx pkg -t linux-arm64 -o dist/lottery main.js && cp my_config.example.js my_config.js && cp env.example.js dist/env.js",
-    "pkg_armv7": "npx pkg -t linux-armv7 -o dist/lottery main.js && cp my_config.example.js my_config.js && cp env.example.js dist/env.js"
+    "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"
   },
   "files": [
     "lib",

script/pkg/pkg.ps1

@@ -49,7 +49,7 @@ foreach ($TRI in $TRIARR) {
         New-Item -Path $DIR -Name "update.bat" -ItemType File -Value "@echo off && lottery update && pause" -Force
     }
 
-    Compress-Archive -Path $DIR -DestinationPath "$($DIR)-$(Get-Date -Format "yyyyMMd")" -Force
+    Compress-Archive -Path $DIR -DestinationPath $DIR -Force
 }
 
 Remove-Item -Path $ENV_FILE