yz-yuki-plugin 2.0.4-1 → 2.0.4-3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -5,7 +5,7 @@ import { EventType } from 'yunzai';
|
|
|
5
5
|
* *******************************************************************
|
|
6
6
|
*/
|
|
7
7
|
/**申请登陆二维码(web端) */
|
|
8
|
-
export declare function applyLoginQRCode(e: EventType): Promise<
|
|
8
|
+
export declare function applyLoginQRCode(e: EventType): Promise<string>;
|
|
9
9
|
/**处理扫码结果 */
|
|
10
10
|
export declare function pollLoginQRCode(e: EventType, qrcodeKey: string): Promise<string>;
|
|
11
11
|
/**查看app扫码登陆获取的ck的有效状态*/
|
|
@@ -24,6 +24,9 @@ async function applyLoginQRCode(e) {
|
|
|
24
24
|
headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'user-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { 'Host': 'passport.bilibili.com', }),
|
|
25
25
|
redirect: "follow",
|
|
26
26
|
});
|
|
27
|
+
if (!response.ok) {
|
|
28
|
+
throw new Error(`获取B站登录二维码URL网络请求失败，状态码: ${response.status}`);
|
|
29
|
+
}
|
|
27
30
|
const res = await response.json();
|
|
28
31
|
if (res?.code === 0) {
|
|
29
32
|
const qrcodeKey = res.data.qrcode_key;
|
|
@@ -37,13 +40,18 @@ async function applyLoginQRCode(e) {
|
|
|
37
40
|
modelName: "bili-login"
|
|
38
41
|
};
|
|
39
42
|
const qrCodeImage = await renderPage("bili-login", "LoginQrcodePage", LoginPropsData, ScreenshotOptionsData);
|
|
40
|
-
let
|
|
43
|
+
let qrCodeBufferArray = [];
|
|
41
44
|
if (qrCodeImage !== false) {
|
|
42
45
|
const { img } = qrCodeImage;
|
|
43
|
-
|
|
46
|
+
qrCodeBufferArray = img;
|
|
44
47
|
}
|
|
45
48
|
let msg = [];
|
|
46
|
-
|
|
49
|
+
if (qrCodeBufferArray.length === 0) {
|
|
50
|
+
msg.push('渲染二维码图片失败，请查看终端输出的实时日志，\n复制哔哩登陆二维码URL，使用在线或本地二维码生成工具生成二维码并扫码。');
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
msg.push(Segment.image(qrCodeBufferArray[0]));
|
|
54
|
+
}
|
|
47
55
|
e.reply('请在3分钟内扫码以完成B站登陆绑定');
|
|
48
56
|
e.reply(msg);
|
|
49
57
|
logger.info(`优纪插件: 如果发送二维码图片消息失败可复制如下URL, 使用在线或本地二维码生成工具生成二维码并扫码`);
|
|
@@ -63,6 +71,9 @@ async function pollLoginQRCode(e, qrcodeKey) {
|
|
|
63
71
|
headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { 'Host': 'passport.bilibili.com', }),
|
|
64
72
|
redirect: "follow",
|
|
65
73
|
});
|
|
74
|
+
if (!response.ok) {
|
|
75
|
+
throw new Error(`处理B站登录token网络请求失败，状态码: ${response.status}`);
|
|
76
|
+
}
|
|
66
77
|
const data = await response.json();
|
|
67
78
|
if (data.code === 0) {
|
|
68
79
|
if (data.data.code === 0) {
|
package/lib/utils/image.js
CHANGED
|
@@ -9,14 +9,15 @@ class Image extends Picture {
|
|
|
9
9
|
yukiPuppeteerRender;
|
|
10
10
|
/**
|
|
11
11
|
* 构造函数，整合截图方法
|
|
12
|
+
* @param launchOptions Puppeteer 启动选项，可选。父类有默认的设置。
|
|
12
13
|
*/
|
|
13
14
|
constructor() {
|
|
14
15
|
// 继承父类实例
|
|
15
16
|
super();
|
|
16
|
-
//
|
|
17
|
-
this.Com;
|
|
18
|
-
//
|
|
19
|
-
this.Pup.start();
|
|
17
|
+
// 父类已经实例化组件渲染对象
|
|
18
|
+
//this.Com;
|
|
19
|
+
// 父类已经实例化启动 Puppeteer
|
|
20
|
+
//this.Pup.start();
|
|
20
21
|
// 初始化 YukiPuppeteerRender 实例
|
|
21
22
|
this.yukiPuppeteerRender = new YukiPuppeteerRender(this.Pup);
|
|
22
23
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yz-yuki-plugin",
|
|
3
|
-
"version": "2.0.4-
|
|
3
|
+
"version": "2.0.4-3",
|
|
4
4
|
"description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
|
|
5
5
|
"author": "snowtafir",
|
|
6
6
|
"type": "module",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"check-format": "git diff --exit-code"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"axios": "^1.7.
|
|
24
|
+
"axios": "^1.7.7",
|
|
25
25
|
"chalk": "^5.3.0",
|
|
26
26
|
"chokidar": "^3.6.0",
|
|
27
27
|
"debug": "^4.3.6",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"md5": "^2.3.0",
|
|
31
31
|
"moment": "^2.30.1",
|
|
32
32
|
"node-fetch": "^3.3.2",
|
|
33
|
-
"puppeteer": "^23.3.
|
|
33
|
+
"puppeteer": "^23.3.1",
|
|
34
34
|
"qrcode": "^1.5.4",
|
|
35
35
|
"react": "^18.3.1",
|
|
36
36
|
"react-dom": "^18.3.1",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"@types/react": "^18.3.3",
|
|
64
64
|
"@types/react-dom": "^18.3.0",
|
|
65
65
|
"@types/yaml": "1.9.7",
|
|
66
|
-
"axios": "^1.7.
|
|
66
|
+
"axios": "^1.7.7",
|
|
67
67
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
68
68
|
"chokidar": "^3.6.0",
|
|
69
69
|
"jsdom": "^24.1.1",
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"node-fetch": "^3.3.2",
|
|
73
73
|
"nodemon": "^3.1.4",
|
|
74
74
|
"prettier": "^3.3.3",
|
|
75
|
-
"puppeteer": "^23.3.
|
|
75
|
+
"puppeteer": "^23.3.1",
|
|
76
76
|
"qrcode": "^1.5.4",
|
|
77
77
|
"react": "^18.3.1",
|
|
78
78
|
"react-dom": "^18.3.1",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"ts-node": "^10.9.2",
|
|
88
88
|
"tsx": "^4.19.0",
|
|
89
89
|
"typescript": "^5.5.4",
|
|
90
|
-
"yunzai": "^1.1.
|
|
90
|
+
"yunzai": "^1.1.6",
|
|
91
91
|
"yunzai-mys": "^1.0.6"
|
|
92
92
|
},
|
|
93
93
|
"files": [
|
package/public/output.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.12 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.m-auto{margin:auto}.mb-3{margin-bottom:.75rem}.ml-7{margin-left:1.75rem}.mt-3{margin-top:.75rem}.h-10{height:2.5rem}.h-12{height:3rem}.h-72{height:18rem}.max-h-96{max-height:24rem}.w-32{width:8rem}.w-72{width:18rem}.w-96{width:24rem}.p-1{padding:.25rem}.p-5{padding:1.25rem}.text-center{text-align:center}.text-lg{font-size:1.125rem;line-height:1.75rem}.italic{font-style:italic}.text-blue-500{--tw-text-opacity:1;color:rgb(59 130 246/var(--tw-text-opacity))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity))}
|