generated from tailored/router-db-template
feat: update Bailian model and improve TypeScript configuration
- Changed Bailian model from 'qwen3-235b-a22b' to 'qwen-plus' in ai.ts - Updated model references in bailianModel to use simplified names - Modified tsconfig.json to set module to NodeNext, target to esnext, and adjusted paths for better module resolution - Added new query-keys.ts file in xhs package to implement getNoteByKeyword functionality with command line interface
This commit is contained in:
17
packages/app-assistant/.gitignore
vendored
17
packages/app-assistant/.gitignore
vendored
@@ -1,17 +0,0 @@
|
||||
node_modules
|
||||
|
||||
dist
|
||||
|
||||
app.config.json5
|
||||
|
||||
apps.config.json
|
||||
|
||||
deploy.tar.gz
|
||||
cache-file
|
||||
|
||||
/apps
|
||||
|
||||
logs
|
||||
|
||||
.env*
|
||||
!.env.example
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"name": "@kevisual/app-assistant",
|
||||
"version": "0.0.1",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"dev": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
|
||||
"license": "MIT",
|
||||
"packageManager": "pnpm@10.10.0",
|
||||
"type": "module",
|
||||
"devDependencies": {
|
||||
"@types/node": "^22.15.3",
|
||||
"bullmq": "^5.51.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"nanoid": "^5.1.5"
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
export * from './provider/comments/xhs.ts';
|
||||
@@ -1,7 +0,0 @@
|
||||
import { SocialBase } from '@/social/social-base.ts';
|
||||
|
||||
export class XHS extends SocialBase {
|
||||
constructor() {
|
||||
super();
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import { nanoid } from 'nanoid';
|
||||
|
||||
export class SocialBase<T = any> {
|
||||
id: string = '';
|
||||
/**
|
||||
* 是否运行中
|
||||
*/
|
||||
isRuning: boolean = false;
|
||||
/**
|
||||
* 应用的配置项
|
||||
*/
|
||||
config: T;
|
||||
constructor(opts?: any) {
|
||||
this.config = opts?.config || {};
|
||||
this.id = opts?.id || nanoid();
|
||||
}
|
||||
/**
|
||||
* 获取用户信息
|
||||
*/
|
||||
async getUserInfo() {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
/**
|
||||
* 获取被 call 的信息
|
||||
*/
|
||||
async getMention() {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送评论信息
|
||||
*/
|
||||
async sendComment() {
|
||||
// throw new Error('Method not implemented.');
|
||||
}
|
||||
async getUnread() {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
const unreadUrl = 'https://edith.xiaohongshu.com/api/sns/web/unread_count';
|
||||
const cookie =
|
||||
'a1=xxxx;abRequestId=0a794332-4561-5f49-93f7-780b8b028e1f;access-token-creator.xiaohongshu.com=customer.creator.AT-68c517498636784561614544frjvxzj7yu8iewie;agora_session=6a0031373435393132333637323735343733393437313634000000000000;customerClientId=536706778174172;galaxy_creator_session_id=OhpHDDSoADhNEhnH5LLnQpletFLApu1fd91f;galaxy.creator.beaker.session.id=1745912429847011598150;gid=yjKqYfK0qDyYyj2DDSqd4ujxyW9kvxIuT62ddkMWhElyuxq8yDd6hl888q2WYy88j8i80yYD;loadts=1746020512562;sec_poison_id=441c932e-a6ac-4d8d-97ae-beb14adb1929;unread={%22ub%22:%2267eaf1fe000000001202c3ea%22%2C%22ue%22:%226803aa37000000001c0319d8%22%2C%22uc%22:35};web_session=040069b2e9c511ca302086ca253a4bde8b1cd1;webBuild=4.62.3;webId=97e5f097499594cad49aa0bd1a8ed83f;websectiga=3633fe24d49c7dd0eb923edc8205740f10fdb18b25d424d2a2322c6196d2a4ad;x-user-id-creator.xiaohongshu.com=639d86590000000026006076;xsecappid=xhs-pc-web;acw_tc=0a00df6217460205042195762e721fba339a0dbe8e4738b961a5ff15e74619;';
|
||||
|
||||
const cookieObj = cookie.split('; ').reduce((acc, item) => {
|
||||
const [key, value] = item.split('=');
|
||||
acc[key] = value;
|
||||
return acc;
|
||||
}, {} as Record<string, string>);
|
||||
const web_session = cookieObj['web_session'] || '';
|
||||
const a1 = cookieObj['a1'] || '';
|
||||
|
||||
const headers = {
|
||||
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
|
||||
Cookie: cookie,
|
||||
};
|
||||
|
||||
const meUri = '/api/sns/web/v2/user/me';
|
||||
const getSign = async (uri: string, data: any, a1: string, web_session?: string) => {
|
||||
const signs = await fetch('http://localhost:5006/sign', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
uri,
|
||||
data,
|
||||
a1,
|
||||
web_session: web_session,
|
||||
}),
|
||||
}).then((res) => res.json());
|
||||
return signs;
|
||||
};
|
||||
|
||||
const getUserMe = async () => {
|
||||
const sign = await getSign(meUri, null, a1, web_session);
|
||||
// const sign = {
|
||||
// 'x-s':
|
||||
// 'XYW_eyJzaWduU3ZuIjoiNTYiLCJzaWduVHlwZSI6IngyIiwiYXBwSWQiOiJsb2dpbiIsInNpZ25WZXJzaW9uIjoiMSIsInBheWxvYWQiOiJjYWE4NzYyMjk5NzQ0NDkzNGVhMWIxNDBjNzA0NTI2YmI0ZGZiYjcyMWJjMWQyZTEzNDhhNzZmNmM4MTI5NzljM2VkMWRmMjU0MGNkZDRkZmEyZGE0YjIzOTg0MDMyYmNmNGE4NDU1MzU4ZmZhZDQ0NjkxNzg4YWRjN2U2MmU3YjJmMzdmZGMzZTgwOWQ5NDNmOTRkM2JhMzVjNmQ3MzE4MjA1OWI3MTYyZGU0YjgxYzcyMDI2NmQyM2EzMmY1MGQ2NTQ5MmQ0ZTlhOTA3NmExY2JmMTYyZGJhMWJiMzAxNTg3MmY3MWU5MmIyNDllZGM3MmRkMjhiNGQ4Y2I4MjI2ZWY3YTdkYjI3NGQ2Y2YyMjVkZjk2ZjFmNWJlN2M2ZDkwNjY1MTE4MWJkYWNmYmQzYzVhMDk4Nzg3YjNmNThjMjc1ZWNjNDQzODFkOGNjNmU2ODAyNDFiZTRiODIwZjlkMDUyNTAyODk1ODZhYjM1NTRlMDJjYjhmZDlmNzIyNjM0NDMzZDBiZmNjMzg5NGU2ZDJmNGFiNGVlNGY0MzljMSJ9',
|
||||
// 'x-t': '1746022429225',
|
||||
// };
|
||||
console.log('sign', sign);
|
||||
const baseURL = 'https://edith.xiaohongshu.com';
|
||||
const xhsMeUri = baseURL + '/api/sns/web/v2/user/me';
|
||||
const res = await fetch(xhsMeUri, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
...headers,
|
||||
...sign,
|
||||
},
|
||||
});
|
||||
const data = await res.json();
|
||||
return data;
|
||||
};
|
||||
getUserMe().then((res) => {
|
||||
console.log('res', res);
|
||||
});
|
||||
|
||||
export async function getUnread() {
|
||||
const unreadUri = '/api/sns/web/unread_count';
|
||||
const sign = await getSign(unreadUri, null, a1, web_session);
|
||||
console.log('sign', sign);
|
||||
const res = await fetch(unreadUrl, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
...headers,
|
||||
...sign,
|
||||
},
|
||||
});
|
||||
const data = await res.json();
|
||||
return data;
|
||||
}
|
||||
// getUnread().then((res) => {
|
||||
// console.log('res', res);
|
||||
// });
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"extends": "@kevisual/types/json/backend.json",
|
||||
"compilerOptions": {
|
||||
"baseUrl": "./",
|
||||
"paths": {
|
||||
"@/*": [
|
||||
"src/*"
|
||||
]
|
||||
}
|
||||
},
|
||||
"include": [
|
||||
"src/**/*.ts",
|
||||
],
|
||||
"exclude": [],
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
import axios from 'axios';
|
||||
import qs from 'querystring';
|
||||
import { get_xs } from './jsvmp/xhs';
|
||||
import fs from 'fs';
|
||||
|
||||
import { getXCommon, getSearchId, SearchSortType, SearchNoteType } from './helper.js';
|
||||
import { getSearchId, SearchSortType, SearchNoteType } from './helper.js';
|
||||
import { ErrorEnum, DataFetchError, IPBlockError, SignError, NeedVerifyError } from './exception';
|
||||
|
||||
const camelToUnderscore = (key) => {
|
||||
@@ -93,24 +91,6 @@ class XhsClient {
|
||||
config.headers = newHeaders;
|
||||
return config;
|
||||
}
|
||||
_preHeaders(url, data = null) {
|
||||
let a1 = this.cookieDict.a1;
|
||||
let b1 = '';
|
||||
let x_s_result = get_xs(url, data, this.cookie);
|
||||
const X_S = x_s_result['X-s'];
|
||||
const X_t = x_s_result['X-t'].toString();
|
||||
const X_S_COMMON = getXCommon(a1, b1, X_S, X_t);
|
||||
return {
|
||||
headers: {
|
||||
'x-s': X_S,
|
||||
'x-t': X_t,
|
||||
// 'x-s-common': X_S_COMMON,
|
||||
},
|
||||
};
|
||||
}
|
||||
getXCommon(a1, b1, x_s, x_t) {
|
||||
return getXCommon(a1, b1 || '', x_s, String(x_t));
|
||||
}
|
||||
getCookieMap() {
|
||||
const cookie = this.cookie;
|
||||
let cookieDict = {};
|
||||
@@ -145,16 +125,6 @@ class XhsClient {
|
||||
this.axiosInstance.defaults.headers.Cookie = cookieStr;
|
||||
this.cookie = cookieStr;
|
||||
}
|
||||
/**
|
||||
* Get X-S and X-T
|
||||
* @param {*} url
|
||||
* @param {*} data
|
||||
* @param {*} cookie
|
||||
* @returns
|
||||
*/
|
||||
get_xs(url, data, cookie) {
|
||||
return get_xs(url, data, cookie);
|
||||
}
|
||||
|
||||
async request(method, url, config = {}) {
|
||||
try {
|
||||
@@ -277,17 +247,17 @@ class XhsClient {
|
||||
const endpoint = this.getEndpoint(config).endpoint;
|
||||
config = await this.requestSign(uri, data, config);
|
||||
this.printResult('post', { uri, data, config });
|
||||
if (data) {
|
||||
return this.request('POST', `${endpoint}${uri}`, {
|
||||
...config,
|
||||
data: jsonStr,
|
||||
headers: {
|
||||
...config.headers,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
});
|
||||
}
|
||||
return this.request('POST', `${endpoint}${uri}`, { ...config, data });
|
||||
// if (data) {
|
||||
// return this.request('POST', `${endpoint}${uri}`, {
|
||||
// ...config,
|
||||
// data: jsonStr,
|
||||
// headers: {
|
||||
// ...config.headers,
|
||||
// 'Content-Type': 'application/json',
|
||||
// },
|
||||
// });
|
||||
// }
|
||||
// return this.request('POST', `${endpoint}${uri}`, { ...config, data });
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -28,6 +28,12 @@ export const api: ApiInfo[] = [
|
||||
needSign: true,
|
||||
description: '获取@我的消息',
|
||||
},
|
||||
{
|
||||
uri: '/api/sns/web/v1/search/notes',
|
||||
method: 'POST',
|
||||
needSign: true,
|
||||
description: '通过关键词搜索笔记',
|
||||
}
|
||||
];
|
||||
|
||||
type ReturnApiInfo = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { getApiInfo } from './xhs-api/api.ts';
|
||||
import { XhsClient as XhsClientBase } from '@kevisual/xhs-core';
|
||||
import { Mention, CommonentInfo, ResponseMession } from './xhs-type/mention.ts';
|
||||
import { pick } from 'lodash-es';
|
||||
import { method, pick } from 'lodash-es';
|
||||
import { getNote } from './modules/get-note.ts';
|
||||
export type Result<T> = {
|
||||
code: number; // 0: success
|
||||
@@ -14,6 +14,7 @@ type SignInfo = {
|
||||
data: any;
|
||||
a1: string;
|
||||
web_session?: string;
|
||||
method?: 'GET' | 'POST';
|
||||
};
|
||||
type SignResponse = {
|
||||
a1: string;
|
||||
@@ -27,10 +28,10 @@ type SignResponse = {
|
||||
};
|
||||
type SignOptions = {
|
||||
signUrl?: string;
|
||||
method?: 'GET' | 'POST';
|
||||
};
|
||||
export const getSign = async (signInfo: SignInfo, options?: SignOptions): Promise<SignResponse> => {
|
||||
const { uri, data, a1, web_session } = signInfo;
|
||||
// console.log('getSign', uri, data, a1, web_session);
|
||||
const { uri, data, a1, method } = signInfo;
|
||||
// let signUri = new URL(uri, 'http://light.xiongxiao.me:5006').pathname;
|
||||
// signUri = '/api/sns/web/v2/user/me';
|
||||
try {
|
||||
@@ -48,7 +49,7 @@ export const getSign = async (signInfo: SignInfo, options?: SignOptions): Promis
|
||||
uri: uri,
|
||||
data,
|
||||
a1,
|
||||
web_session: web_session,
|
||||
method: signInfo.method || 'POST',
|
||||
}),
|
||||
}).then((res) => res.json());
|
||||
return signs as SignResponse;
|
||||
@@ -92,6 +93,11 @@ export class XhsClient extends XhsClientBase {
|
||||
case 'sign':
|
||||
// console.log('sign', data);
|
||||
break;
|
||||
case 'post':
|
||||
console.log('post', data);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
/**
|
||||
@@ -158,7 +164,7 @@ export class XhsClient extends XhsClientBase {
|
||||
const response = await this.get(url, { num, cursor }, { sign: this.sign.bind(this) });
|
||||
return response as Result<ReturnData>;
|
||||
}
|
||||
async getComment(noteId: string, xsecToken?: string) {}
|
||||
async getComment(noteId: string, xsecToken?: string) { }
|
||||
/**
|
||||
*
|
||||
* @uri /api/sns/web/v1/you/mentions
|
||||
@@ -183,23 +189,26 @@ export class XhsClient extends XhsClientBase {
|
||||
if (apiInfo && !apiInfo?.needSign) {
|
||||
return config || {};
|
||||
}
|
||||
const web_session = cookieDist['web_session'];
|
||||
const a1 = cookieDist['a1'];
|
||||
const res = await getSign({ uri, data, a1, web_session }, this.signConfig);
|
||||
const _sign = res.sign;
|
||||
const res = await getSign({ uri, data, a1, method: 'POST' }, this.signConfig);
|
||||
console.log('sign response', res);
|
||||
const _sign = res.sign
|
||||
this.printResult('sign', { uri, apiInfo, res });
|
||||
const xs = _sign?.['x-s'];
|
||||
const xt = _sign?.['x-t'];
|
||||
const b1 = _sign?.['b1'];
|
||||
const newA1 = _sign?.['a1'];
|
||||
const xsCommon = _sign?.['x-s-common'];
|
||||
const xB3Traceid = _sign?.['x-b3-traceid'];
|
||||
if (a1 !== newA1) {
|
||||
this.setCookieMap({ a1: newA1 });
|
||||
this.printResult('cookie change', a1);
|
||||
}
|
||||
// throw new Error('disable sign');
|
||||
if (res && xs) {
|
||||
headers['x-s'] = xs;
|
||||
headers['x-t'] = xt;
|
||||
// headers['x-s-common'] = this.getXCommon(a1, b1, xs, xt);
|
||||
headers['x-s-common'] = xsCommon;
|
||||
headers['x-b3-traceid'] = xB3Traceid;
|
||||
config.headers = headers;
|
||||
} else {
|
||||
console.log('get sign error', res);
|
||||
@@ -257,6 +266,21 @@ export class XhsClient extends XhsClientBase {
|
||||
}
|
||||
}
|
||||
getNote = getNote;
|
||||
async getNoteByKeyword(keyword: string, page?: number, pageSize?: number, sort?: string, noteType?: number): Promise<any> {
|
||||
const uri = '/api/sns/web/v1/search/notes';
|
||||
const data = {
|
||||
keyword,
|
||||
page: page || 1,
|
||||
page_size: pageSize || 20,
|
||||
sort: sort || SearchSortType.GENERAL,
|
||||
note_type: noteType || SearchNoteType.ALL,
|
||||
search_id: getSearchId(),
|
||||
image_formats: ['jpg', 'webp', 'avif'],
|
||||
ext_flags: []
|
||||
};
|
||||
const response = await this.post(uri, data, { sign: this.sign.bind(this) });
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
||||
type UnreadCount = {
|
||||
@@ -265,3 +289,29 @@ type UnreadCount = {
|
||||
connections: number;
|
||||
mentions: number;
|
||||
};
|
||||
function getSearchId() {
|
||||
const e = BigInt(Date.now()) << 64n;
|
||||
const t = Math.floor(Math.random() * 2147483647);
|
||||
return base36encode(e + BigInt(t));
|
||||
}
|
||||
function base36encode(num: bigint): string {
|
||||
return num.toString(36).toUpperCase();
|
||||
}
|
||||
|
||||
const SearchSortType = Object.freeze({
|
||||
// default
|
||||
GENERAL: { value: "general" },
|
||||
// most popular
|
||||
MOST_POPULAR: { value: "popularity_descending" },
|
||||
// Latest
|
||||
LATEST: { value: "time_descending" }
|
||||
});
|
||||
|
||||
const SearchNoteType = Object.freeze({
|
||||
// default
|
||||
ALL: { value: 0 },
|
||||
// only video
|
||||
VIDEO: { value: 1 },
|
||||
// only image
|
||||
IMAGE: { value: 2 }
|
||||
});
|
||||
@@ -49,16 +49,16 @@ app
|
||||
path: 'mention',
|
||||
key: 'getNote',
|
||||
description: '获取笔记',
|
||||
validator: {
|
||||
node_id: {
|
||||
type: 'string',
|
||||
required: true,
|
||||
},
|
||||
xsec_token: {
|
||||
type: 'string',
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
// validator: {
|
||||
// node_id: {
|
||||
// type: 'string',
|
||||
// required: true,
|
||||
// },
|
||||
// xsec_token: {
|
||||
// type: 'string',
|
||||
// required: true,
|
||||
// },
|
||||
// },
|
||||
isDebug: true,
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
@@ -108,13 +108,13 @@ app
|
||||
.route({
|
||||
path: 'mention',
|
||||
key: 'getMention',
|
||||
description: '获取提及列表',
|
||||
validator: {
|
||||
num: {
|
||||
type: 'number',
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
// description: '获取提及列表',
|
||||
// validator: {
|
||||
// num: {
|
||||
// type: 'number',
|
||||
// required: true,
|
||||
// },
|
||||
// },
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
const num = ctx.query.num;
|
||||
|
||||
@@ -8,6 +8,9 @@ import './query/mention.ts'
|
||||
import './query/unread.ts';
|
||||
import './query/get-userinfo.ts';
|
||||
import './query/get-connections.ts'
|
||||
import './query/query-keys.ts';
|
||||
|
||||
|
||||
program
|
||||
.command('test')
|
||||
.description('test command')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { xhsServices, app, xhsRootClient } from '../index.ts';
|
||||
import { useConfig } from '@kevisual/use-config/env';
|
||||
const config = useConfig();
|
||||
export const config = useConfig();
|
||||
import { program } from 'commander';
|
||||
|
||||
xhsRootClient.setCookie(config.XHS_ROOT_COOKIE || '');
|
||||
|
||||
29
packages/xhs/src/test/query/query-keys.ts
Normal file
29
packages/xhs/src/test/query/query-keys.ts
Normal file
@@ -0,0 +1,29 @@
|
||||
// getNoteByKeyword
|
||||
|
||||
import { xhsServices, program, config } from '../common.ts';
|
||||
import util from 'node:util';
|
||||
|
||||
const getNoteByKeyword = async (keyword: string) => {
|
||||
const client = xhsServices.getClient();
|
||||
xhsServices.setSignConfig({
|
||||
signUrl: config.XHS_API_SIGN_URL,
|
||||
});
|
||||
const res = await client.getNoteByKeyword(keyword).then((res) => {
|
||||
console.log(util.inspect(res, { depth: null }));
|
||||
return res;
|
||||
});
|
||||
console.log('type res', typeof res);
|
||||
if (res.code === 0) {
|
||||
console.log('total', res.data.total);
|
||||
if (res.data.notes.length > 0) {
|
||||
console.log('first note desc', res.data.notes[0].desc);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
program
|
||||
.command('get-note-by-keyword <keyword>')
|
||||
.description('get note by keyword')
|
||||
.action(async (keyword: string) => {
|
||||
getNoteByKeyword(keyword);
|
||||
});
|
||||
Reference in New Issue
Block a user