@skills-store/rednote 0.1.2 → 0.1.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/dist/rednote/login.js +13 -18
- package/package.json +1 -1
package/dist/rednote/login.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { parseArgs } from 'node:util';
|
|
3
3
|
import { printJson, runCli } from '../utils/browser-cli.js';
|
|
4
4
|
import { resolveStatusTarget } from './status.js';
|
|
5
|
-
import { createRednoteSession, disconnectRednoteSession } from './checkLogin.js';
|
|
5
|
+
import { checkRednoteLogin, createRednoteSession, disconnectRednoteSession } from './checkLogin.js';
|
|
6
6
|
function printLoginHelp() {
|
|
7
7
|
process.stdout.write(`rednote login
|
|
8
8
|
|
|
@@ -28,21 +28,24 @@ async function getOrCreateXiaohongshuPage(session) {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
export async function openRednoteLogin(target, session) {
|
|
31
|
+
const rednoteStatus = await checkRednoteLogin(target, session);
|
|
32
|
+
if (!rednoteStatus.needLogin) {
|
|
33
|
+
return {
|
|
34
|
+
ok: true,
|
|
35
|
+
rednote: {
|
|
36
|
+
loginClicked: false,
|
|
37
|
+
pageUrl: session.page.url(),
|
|
38
|
+
waitingForPhoneLogin: false,
|
|
39
|
+
message: '当前实例已登录，无需重复执行登录操作。'
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
}
|
|
31
43
|
const { page } = await getOrCreateXiaohongshuPage(session);
|
|
32
|
-
await page.waitForTimeout(2_000);
|
|
33
44
|
const loginButton = page.locator('#login-btn');
|
|
34
45
|
const hasLoginButton = await loginButton.count() > 0;
|
|
35
46
|
if (!hasLoginButton) {
|
|
36
47
|
return {
|
|
37
48
|
ok: true,
|
|
38
|
-
instance: {
|
|
39
|
-
scope: target.scope,
|
|
40
|
-
name: target.instanceName,
|
|
41
|
-
browser: target.browser,
|
|
42
|
-
userDataDir: target.userDataDir,
|
|
43
|
-
source: target.source,
|
|
44
|
-
lastConnect: target.lastConnect
|
|
45
|
-
},
|
|
46
49
|
rednote: {
|
|
47
50
|
loginClicked: false,
|
|
48
51
|
pageUrl: page.url(),
|
|
@@ -55,14 +58,6 @@ export async function openRednoteLogin(target, session) {
|
|
|
55
58
|
await page.waitForTimeout(500);
|
|
56
59
|
return {
|
|
57
60
|
ok: true,
|
|
58
|
-
instance: {
|
|
59
|
-
scope: target.scope,
|
|
60
|
-
name: target.instanceName,
|
|
61
|
-
browser: target.browser,
|
|
62
|
-
userDataDir: target.userDataDir,
|
|
63
|
-
source: target.source,
|
|
64
|
-
lastConnect: target.lastConnect
|
|
65
|
-
},
|
|
66
61
|
rednote: {
|
|
67
62
|
loginClicked: true,
|
|
68
63
|
pageUrl: page.url(),
|