@zhin.js/plugin-music 1.1.0 → 1.1.2
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/README.md +27 -27
- package/commands/cookie/delete/{[source].js → [source]/index.js} +4 -4
- package/commands/cookie/delete/{[source].ts → [source]/index.ts} +5 -5
- package/commands/cookie/get/{[source].js → [source]/index.js} +4 -4
- package/commands/cookie/get/{[source].ts → [source]/index.ts} +5 -5
- package/commands/cookie/set/{[source].js → [source]/index.js} +4 -4
- package/commands/cookie/set/{[source].ts → [source]/index.ts} +5 -5
- package/commands/cookie/{status.js → status/index.js} +4 -4
- package/commands/cookie/{status.ts → status/index.ts} +5 -5
- package/commands/login/{[platform].js → [platform]/index.js} +10 -8
- package/commands/login/{[platform].ts → [platform]/index.ts} +10 -12
- package/commands//347/202/271/346/255/214/{[keyword].js → [keyword]/index.js} +7 -6
- package/commands//347/202/271/346/255/214/{[keyword].ts → [keyword]/index.ts} +8 -7
- package/components/{share-music.js → share-music/index.js} +4 -4
- package/components/{share-music.ts → share-music/index.ts} +5 -5
- package/lib/credential-store.d.ts +10 -7
- package/lib/credential-store.d.ts.map +1 -1
- package/lib/credential-store.js +44 -70
- package/lib/credential-store.js.map +1 -1
- package/lib/index.d.ts +5 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +5 -4
- package/lib/index.js.map +1 -1
- package/lib/login/index.d.ts +18 -11
- package/lib/login/index.d.ts.map +1 -1
- package/lib/login/index.js +103 -79
- package/lib/login/index.js.map +1 -1
- package/lib/music-lib.d.ts +3 -2
- package/lib/music-lib.d.ts.map +1 -1
- package/lib/music-lib.js +4 -5
- package/lib/music-lib.js.map +1 -1
- package/lib/runtime.d.ts +12 -0
- package/lib/runtime.d.ts.map +1 -0
- package/lib/runtime.js +3 -0
- package/lib/runtime.js.map +1 -0
- package/lib/session.d.ts +10 -4
- package/lib/session.d.ts.map +1 -1
- package/lib/session.js +33 -21
- package/lib/session.js.map +1 -1
- package/lib/sources/index.d.ts +2 -1
- package/lib/sources/index.d.ts.map +1 -1
- package/lib/sources/index.js +8 -6
- package/lib/sources/index.js.map +1 -1
- package/lib/sources/kugou.d.ts.map +1 -1
- package/lib/sources/kugou.js +16 -1
- package/lib/sources/kugou.js.map +1 -1
- package/lib/sources/netease.d.ts +3 -0
- package/lib/sources/netease.d.ts.map +1 -1
- package/lib/sources/netease.js +5 -2
- package/lib/sources/netease.js.map +1 -1
- package/lib/sources/qq.d.ts +3 -0
- package/lib/sources/qq.d.ts.map +1 -1
- package/lib/sources/qq.js +6 -3
- package/lib/sources/qq.js.map +1 -1
- package/middlewares/{music-selection.js → music-selection/index.js} +9 -7
- package/middlewares/{music-selection.ts → music-selection/index.ts} +13 -7
- package/package.json +16 -11
- package/plugin.js +23 -9
- package/{agent/skills/music.md → skills/music/SKILL.md} +2 -2
- package/{tools/music-search.js → skills/music/tools/music-search/index.js} +4 -3
- package/{tools/music-search.ts → skills/music/tools/music-search/index.ts} +11 -5
- package/{tools/music-share.js → skills/music/tools/music-share/index.js} +4 -3
- package/{tools/music-share.ts → skills/music/tools/music-share/index.ts} +6 -4
- package/src/credential-store.ts +43 -87
- package/src/index.ts +8 -16
- package/src/login/index.ts +111 -92
- package/src/music-lib.ts +5 -4
- package/src/runtime.ts +17 -0
- package/src/session.ts +38 -21
- package/src/sources/index.ts +9 -6
- package/src/sources/kugou.ts +15 -1
- package/src/sources/netease.ts +8 -2
- package/src/sources/qq.ts +9 -3
package/lib/credential-store.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { createGenerationStore, } from 'zhin.js';
|
|
2
1
|
export const MUSIC_CREDENTIALS_TABLE = 'music_credentials';
|
|
3
2
|
function createMemoryModel() {
|
|
4
3
|
const rows = [];
|
|
@@ -34,78 +33,53 @@ function createMemoryModel() {
|
|
|
34
33
|
}),
|
|
35
34
|
};
|
|
36
35
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
export function createInMemoryCredentialDb() {
|
|
37
|
+
const model = createMemoryModel();
|
|
38
|
+
return {
|
|
39
|
+
models: {
|
|
40
|
+
get: (name) => name === MUSIC_CREDENTIALS_TABLE ? model : undefined,
|
|
41
|
+
},
|
|
42
|
+
};
|
|
41
43
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (!_memoryDb) {
|
|
47
|
-
_memoryDb = {
|
|
48
|
-
models: {
|
|
49
|
-
get: (name) => name === MUSIC_CREDENTIALS_TABLE ? memoryModel : undefined,
|
|
50
|
-
},
|
|
51
|
-
};
|
|
44
|
+
export class CredentialStore {
|
|
45
|
+
#db;
|
|
46
|
+
constructor(db) {
|
|
47
|
+
this.#db = db;
|
|
52
48
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const memoryModel = createMemoryModel();
|
|
56
|
-
function getModel() {
|
|
57
|
-
return getDb().models.get(MUSIC_CREDENTIALS_TABLE) ?? null;
|
|
58
|
-
}
|
|
59
|
-
export async function getCredential(source, key) {
|
|
60
|
-
const model = getModel();
|
|
61
|
-
if (!model)
|
|
62
|
-
return null;
|
|
63
|
-
const rows = await model.select().where({ source, key });
|
|
64
|
-
if (rows.length === 0)
|
|
65
|
-
return null;
|
|
66
|
-
return String(rows[0].value ?? '');
|
|
67
|
-
}
|
|
68
|
-
export async function setCredential(source, key, value) {
|
|
69
|
-
const model = getModel();
|
|
70
|
-
if (!model)
|
|
71
|
-
return;
|
|
72
|
-
const existing = await model.select().where({ source, key });
|
|
73
|
-
if (existing.length > 0) {
|
|
74
|
-
await model
|
|
75
|
-
.update({ value, updated_at: new Date().toISOString() })
|
|
76
|
-
.where({ source, key });
|
|
49
|
+
get model() {
|
|
50
|
+
return this.#db.models.get(MUSIC_CREDENTIALS_TABLE) ?? null;
|
|
77
51
|
}
|
|
78
|
-
|
|
79
|
-
await model.
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
52
|
+
async get(source, key) {
|
|
53
|
+
const rows = await this.model?.select().where({ source, key });
|
|
54
|
+
if (!rows?.length)
|
|
55
|
+
return null;
|
|
56
|
+
return String(rows[0].value ?? '');
|
|
57
|
+
}
|
|
58
|
+
async set(source, key, value) {
|
|
59
|
+
const model = this.model;
|
|
60
|
+
if (!model)
|
|
61
|
+
return;
|
|
62
|
+
const existing = await model.select().where({ source, key });
|
|
63
|
+
if (existing.length > 0) {
|
|
64
|
+
await model.update({ value, updated_at: new Date().toISOString() }).where({ source, key });
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
await model.insert({ source, key, value, updated_at: new Date().toISOString() });
|
|
68
|
+
}
|
|
69
|
+
async delete(source, key) {
|
|
70
|
+
await this.model?.delete().where({ source, key });
|
|
71
|
+
}
|
|
72
|
+
async list(source) {
|
|
73
|
+
const model = this.model;
|
|
74
|
+
if (!model)
|
|
75
|
+
return [];
|
|
76
|
+
const rows = source ? await model.select().where({ source }) : await model.select();
|
|
77
|
+
return rows.map((row) => ({
|
|
78
|
+
source: String(row.source),
|
|
79
|
+
key: String(row.key),
|
|
80
|
+
value: String(row.value),
|
|
81
|
+
updated_at: String(row.updated_at ?? ''),
|
|
82
|
+
}));
|
|
85
83
|
}
|
|
86
|
-
}
|
|
87
|
-
export async function deleteCredential(source, key) {
|
|
88
|
-
const model = getModel();
|
|
89
|
-
if (!model)
|
|
90
|
-
return;
|
|
91
|
-
await model.delete().where({ source, key });
|
|
92
|
-
}
|
|
93
|
-
export async function listCredentials(source) {
|
|
94
|
-
const model = getModel();
|
|
95
|
-
if (!model)
|
|
96
|
-
return [];
|
|
97
|
-
const rows = source
|
|
98
|
-
? await model.select().where({ source })
|
|
99
|
-
: await model.select();
|
|
100
|
-
return rows.map((r) => ({
|
|
101
|
-
source: String(r.source),
|
|
102
|
-
key: String(r.key),
|
|
103
|
-
value: String(r.value),
|
|
104
|
-
updated_at: String(r.updated_at ?? ''),
|
|
105
|
-
}));
|
|
106
|
-
}
|
|
107
|
-
export function resetCredentialDb() {
|
|
108
|
-
credentialDbStore.clear();
|
|
109
|
-
_memoryDb = null;
|
|
110
84
|
}
|
|
111
85
|
//# sourceMappingURL=credential-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-store.js","sourceRoot":"","sources":["../src/credential-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credential-store.js","sourceRoot":"","sources":["../src/credential-store.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export { formatDuration, formatMusicInfo, sourceConfigMap, SOURCE_ALIASES, SOURCE_DISPLAY_NAME, resolveSourceAlias, } from './config.js';
|
|
2
2
|
export { searchMusic, shareMusicDetail, formatSearchResults, buildMusicShareSegment, } from './music-lib.js';
|
|
3
|
-
export {
|
|
4
|
-
export { sessionKey, resolveMessageIds,
|
|
5
|
-
export {
|
|
6
|
-
export {
|
|
3
|
+
export { createMusicServices } from './sources/index.js';
|
|
4
|
+
export { sessionKey, resolveMessageIds, MusicSearchSessions, type PendingSearch, } from './session.js';
|
|
5
|
+
export { CredentialStore, createInMemoryCredentialDb, MUSIC_CREDENTIALS_TABLE, type CredentialDb, type CredentialRow, } from './credential-store.js';
|
|
6
|
+
export { musicRuntimeToken, type MusicRuntime } from './runtime.js';
|
|
7
|
+
export { QrLoginRuntime, loginSessionKey, type QrLoginSource, type QrLoginSession, type QrPollResult, } from './login/index.js';
|
|
7
8
|
export type { MusicDetail, MusicInfo, MusicSource, MusicSourceConfig } from './types.js';
|
|
8
9
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,aAAa,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,eAAe,EACf,0BAA0B,EAC1B,uBAAuB,EACvB,KAAK,YAAY,EACjB,KAAK,aAAa,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,cAAc,EACd,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,YAAY,GAClB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export { formatDuration, formatMusicInfo, sourceConfigMap, SOURCE_ALIASES, SOURCE_DISPLAY_NAME, resolveSourceAlias, } from './config.js';
|
|
2
2
|
export { searchMusic, shareMusicDetail, formatSearchResults, buildMusicShareSegment, } from './music-lib.js';
|
|
3
|
-
export {
|
|
4
|
-
export { sessionKey, resolveMessageIds,
|
|
5
|
-
export {
|
|
6
|
-
export {
|
|
3
|
+
export { createMusicServices } from './sources/index.js';
|
|
4
|
+
export { sessionKey, resolveMessageIds, MusicSearchSessions, } from './session.js';
|
|
5
|
+
export { CredentialStore, createInMemoryCredentialDb, MUSIC_CREDENTIALS_TABLE, } from './credential-store.js';
|
|
6
|
+
export { musicRuntimeToken } from './runtime.js';
|
|
7
|
+
export { QrLoginRuntime, loginSessionKey, } from './login/index.js';
|
|
7
8
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,mBAAmB,GAEpB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,eAAe,EACf,0BAA0B,EAC1B,uBAAuB,GAGxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAqB,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,cAAc,EACd,eAAe,GAIhB,MAAM,kBAAkB,CAAC"}
|
package/lib/login/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { QrLoginSource, QrPollResult } from './types.js';
|
|
1
|
+
import type { QrLoginProvider, QrLoginSource, QrPollResult } from './types.js';
|
|
2
|
+
import type { CredentialStore } from '../credential-store.js';
|
|
2
3
|
export type { QrLoginSource, QrPollResult, QrLoginProvider } from './types.js';
|
|
3
4
|
export interface QrLoginSession {
|
|
4
5
|
source: QrLoginSource;
|
|
@@ -7,14 +8,20 @@ export interface QrLoginSession {
|
|
|
7
8
|
aborted: boolean;
|
|
8
9
|
}
|
|
9
10
|
export declare function loginSessionKey(endpointId: string, conversationId: string, senderId: string): string;
|
|
10
|
-
|
|
11
|
-
export declare
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
11
|
+
/** Generation-owned QR login coordinator. */
|
|
12
|
+
export declare class QrLoginRuntime {
|
|
13
|
+
#private;
|
|
14
|
+
constructor(credentials: CredentialStore, providers?: Readonly<Record<QrLoginSource, QrLoginProvider>>, now?: () => number, sleep?: (ms: number) => Promise<void>);
|
|
15
|
+
get(key: string): QrLoginSession | undefined;
|
|
16
|
+
cancel(key: string): boolean;
|
|
17
|
+
start(source: QrLoginSource, key: string): Promise<{
|
|
18
|
+
imageSegment: {
|
|
19
|
+
type: 'image';
|
|
20
|
+
data: Record<string, unknown>;
|
|
21
|
+
};
|
|
22
|
+
}>;
|
|
23
|
+
poll(key: string, onStatus: (result: QrPollResult) => Promise<void>): Promise<QrPollResult>;
|
|
24
|
+
pruneExpired(): void;
|
|
25
|
+
dispose(): void;
|
|
26
|
+
}
|
|
20
27
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/login/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/login/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/login/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE/E,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CAClB;AAMD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,MAAM,CAER;AAED,6CAA6C;AAC7C,qBAAa,cAAc;;gBAQvB,WAAW,EAAE,eAAe,EAC5B,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,EAC5D,GAAG,GAAE,MAAM,MAAiB,EAC5B,KAAK,GAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAA6D;IAWlG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAW5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQtB,KAAK,CACT,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;QAAE,YAAY,EAAE;YAAE,IAAI,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;IAwBxE,IAAI,CACR,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAChD,OAAO,CAAC,YAAY,CAAC;IAyCxB,YAAY,IAAI,IAAI;IAUpB,OAAO,IAAI,IAAI;CAIhB"}
|
package/lib/login/index.js
CHANGED
|
@@ -1,100 +1,124 @@
|
|
|
1
1
|
import { QQLoginProvider } from './qq.js';
|
|
2
2
|
import { NeteaseLoginProvider } from './netease.js';
|
|
3
|
-
import { setCredential } from '../credential-store.js';
|
|
4
|
-
const providers = {
|
|
5
|
-
qq: new QQLoginProvider(),
|
|
6
|
-
netease: new NeteaseLoginProvider(),
|
|
7
|
-
};
|
|
8
3
|
const LOGIN_TIMEOUT_MS = 2 * 60 * 1000;
|
|
9
4
|
const POLL_INTERVAL_MS = 3_000;
|
|
10
5
|
const MAX_POLLS = Math.ceil(LOGIN_TIMEOUT_MS / POLL_INTERVAL_MS);
|
|
11
|
-
const activeLogins = new Map();
|
|
12
6
|
export function loginSessionKey(endpointId, conversationId, senderId) {
|
|
13
7
|
return `login:${endpointId}:${conversationId}:${senderId}`;
|
|
14
8
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
9
|
+
/** Generation-owned QR login coordinator. */
|
|
10
|
+
export class QrLoginRuntime {
|
|
11
|
+
#active = new Map();
|
|
12
|
+
#providers;
|
|
13
|
+
#credentials;
|
|
14
|
+
#now;
|
|
15
|
+
#sleep;
|
|
16
|
+
constructor(credentials, providers, now = Date.now, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
|
|
17
|
+
this.#credentials = credentials;
|
|
18
|
+
this.#now = now;
|
|
19
|
+
this.#sleep = sleep;
|
|
20
|
+
this.#providers = providers ?? {
|
|
21
|
+
qq: new QQLoginProvider(),
|
|
22
|
+
netease: new NeteaseLoginProvider(),
|
|
23
|
+
};
|
|
22
24
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
export async function startLogin(source, key) {
|
|
34
|
-
const existing = activeLogins.get(key);
|
|
35
|
-
if (existing && !existing.aborted) {
|
|
36
|
-
existing.aborted = true;
|
|
25
|
+
get(key) {
|
|
26
|
+
const session = this.#active.get(key);
|
|
27
|
+
if (!session)
|
|
28
|
+
return undefined;
|
|
29
|
+
if (this.#now() - session.timestamp > LOGIN_TIMEOUT_MS) {
|
|
30
|
+
session.aborted = true;
|
|
31
|
+
this.#active.delete(key);
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
return session;
|
|
37
35
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
});
|
|
46
|
-
return { imageSegment: result.imageSegment };
|
|
47
|
-
}
|
|
48
|
-
export async function pollLogin(key, onStatus) {
|
|
49
|
-
const session = activeLogins.get(key);
|
|
50
|
-
if (!session) {
|
|
51
|
-
return { status: 'error', message: '没有进行中的登录会话' };
|
|
36
|
+
cancel(key) {
|
|
37
|
+
const session = this.#active.get(key);
|
|
38
|
+
if (!session)
|
|
39
|
+
return false;
|
|
40
|
+
session.aborted = true;
|
|
41
|
+
this.#active.delete(key);
|
|
42
|
+
return true;
|
|
52
43
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
44
|
+
async start(source, key) {
|
|
45
|
+
const existing = this.#active.get(key);
|
|
46
|
+
if (existing && !existing.aborted)
|
|
47
|
+
existing.aborted = true;
|
|
48
|
+
const session = {
|
|
49
|
+
source,
|
|
50
|
+
pollData: {},
|
|
51
|
+
timestamp: this.#now(),
|
|
52
|
+
aborted: false,
|
|
53
|
+
};
|
|
54
|
+
this.#active.set(key, session);
|
|
55
|
+
try {
|
|
56
|
+
const result = await this.#providers[source].createQr();
|
|
57
|
+
if (session.aborted || this.#active.get(key) !== session) {
|
|
58
|
+
throw new Error('登录已取消');
|
|
65
59
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
60
|
+
session.pollData = result.pollData;
|
|
61
|
+
return { imageSegment: result.imageSegment };
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
if (this.#active.get(key) === session)
|
|
65
|
+
this.#active.delete(key);
|
|
66
|
+
throw error;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
async poll(key, onStatus) {
|
|
70
|
+
const session = this.#active.get(key);
|
|
71
|
+
if (!session)
|
|
72
|
+
return { status: 'error', message: '没有进行中的登录会话' };
|
|
73
|
+
const provider = this.#providers[session.source];
|
|
74
|
+
let lastStatus = '';
|
|
75
|
+
try {
|
|
76
|
+
for (let i = 0; i < MAX_POLLS; i++) {
|
|
77
|
+
if (session.aborted) {
|
|
78
|
+
this.#active.delete(key);
|
|
79
|
+
return { status: 'error', message: '登录已取消' };
|
|
70
80
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
81
|
+
const result = await provider.pollQr(session.pollData);
|
|
82
|
+
if (result.status !== lastStatus) {
|
|
83
|
+
lastStatus = result.status;
|
|
84
|
+
await onStatus(result);
|
|
85
|
+
}
|
|
86
|
+
if (result.status === 'confirmed') {
|
|
87
|
+
this.#active.delete(key);
|
|
88
|
+
if (result.cookie)
|
|
89
|
+
await this.#credentials.set(session.source, 'cookie', result.cookie);
|
|
90
|
+
return result;
|
|
91
|
+
}
|
|
92
|
+
if (result.status === 'expired' || result.status === 'error') {
|
|
93
|
+
this.#active.delete(key);
|
|
94
|
+
return result;
|
|
95
|
+
}
|
|
96
|
+
await this.#sleep(POLL_INTERVAL_MS);
|
|
76
97
|
}
|
|
77
|
-
await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
|
|
78
98
|
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
this.#active.delete(key);
|
|
101
|
+
return {
|
|
102
|
+
status: 'error',
|
|
103
|
+
message: `轮询异常:${error instanceof Error ? error.message : String(error)}`,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
this.#active.delete(key);
|
|
107
|
+
return { status: 'expired', message: '登录超时,请重试' };
|
|
79
108
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
109
|
+
pruneExpired() {
|
|
110
|
+
const now = this.#now();
|
|
111
|
+
for (const [key, session] of this.#active) {
|
|
112
|
+
if (now - session.timestamp > LOGIN_TIMEOUT_MS) {
|
|
113
|
+
session.aborted = true;
|
|
114
|
+
this.#active.delete(key);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
87
117
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
91
|
-
export function cleanExpiredLogins() {
|
|
92
|
-
const now = Date.now();
|
|
93
|
-
for (const [key, session] of activeLogins) {
|
|
94
|
-
if (now - session.timestamp > LOGIN_TIMEOUT_MS) {
|
|
118
|
+
dispose() {
|
|
119
|
+
for (const session of this.#active.values())
|
|
95
120
|
session.aborted = true;
|
|
96
|
-
|
|
97
|
-
}
|
|
121
|
+
this.#active.clear();
|
|
98
122
|
}
|
|
99
123
|
}
|
|
100
124
|
//# sourceMappingURL=index.js.map
|
package/lib/login/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/login/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/login/index.ts"],"names":[],"mappings":"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"}
|
package/lib/music-lib.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { MusicInfo, MusicDetail, MusicSource } from './types.js';
|
|
2
|
-
|
|
2
|
+
import type { MusicRuntime } from './runtime.js';
|
|
3
|
+
export declare function searchMusic(runtime: MusicRuntime, keyword: string, source?: MusicSource, limit?: number): Promise<{
|
|
3
4
|
success: true;
|
|
4
5
|
keyword: string;
|
|
5
6
|
source: MusicSource;
|
|
6
7
|
results: MusicInfo[];
|
|
7
8
|
total: number;
|
|
8
9
|
}>;
|
|
9
|
-
export declare function shareMusicDetail(id: string, source: MusicSource): Promise<{
|
|
10
|
+
export declare function shareMusicDetail(runtime: MusicRuntime, id: string, source: MusicSource): Promise<{
|
|
10
11
|
success: false;
|
|
11
12
|
error: string;
|
|
12
13
|
music?: undefined;
|
package/lib/music-lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"music-lib.d.ts","sourceRoot":"","sources":["../src/music-lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"music-lib.d.ts","sourceRoot":"","sources":["../src/music-lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,WAAW,EACpB,KAAK,SAAI,GACR,OAAO,CAAC;IACT,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAWD;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;;;;;;;;GAc5F;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,EAAE,MAAM,EAAE,WAAW,GAAG,MAAM,CAU9F;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW;;;;;;;;;;;EAczD"}
|
package/lib/music-lib.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { musicServices } from './sources/index.js';
|
|
2
1
|
import { sourceConfigMap, SOURCE_DISPLAY_NAME, formatDuration } from './config.js';
|
|
3
|
-
export async function searchMusic(keyword, source, limit = 5) {
|
|
2
|
+
export async function searchMusic(runtime, keyword, source, limit = 5) {
|
|
4
3
|
const s = source ?? 'qq';
|
|
5
|
-
const service =
|
|
4
|
+
const service = runtime.services[s];
|
|
6
5
|
const results = await service.search(keyword, limit);
|
|
7
6
|
return {
|
|
8
7
|
success: true,
|
|
@@ -12,8 +11,8 @@ export async function searchMusic(keyword, source, limit = 5) {
|
|
|
12
11
|
total: results.length,
|
|
13
12
|
};
|
|
14
13
|
}
|
|
15
|
-
export async function shareMusicDetail(id, source) {
|
|
16
|
-
const service =
|
|
14
|
+
export async function shareMusicDetail(runtime, id, source) {
|
|
15
|
+
const service = runtime.services[source];
|
|
17
16
|
if (!service) {
|
|
18
17
|
return { success: false, error: `不支持的音乐源: ${source}` };
|
|
19
18
|
}
|
package/lib/music-lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"music-lib.js","sourceRoot":"","sources":["../src/music-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"music-lib.js","sourceRoot":"","sources":["../src/music-lib.ts"],"names":[],"mappings":"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"}
|
package/lib/runtime.d.ts
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { CredentialStore } from './credential-store.js';
|
|
2
|
+
import type { MusicSearchService, MusicSource } from './types.js';
|
|
3
|
+
import type { MusicSearchSessions } from './session.js';
|
|
4
|
+
import type { QrLoginRuntime } from './login/index.js';
|
|
5
|
+
export interface MusicRuntime {
|
|
6
|
+
readonly credentials: CredentialStore;
|
|
7
|
+
readonly services: Readonly<Record<MusicSource, MusicSearchService>>;
|
|
8
|
+
readonly sessions: MusicSearchSessions;
|
|
9
|
+
readonly logins: QrLoginRuntime;
|
|
10
|
+
}
|
|
11
|
+
export declare const musicRuntimeToken: import("zhin.js").Token<MusicRuntime>;
|
|
12
|
+
//# sourceMappingURL=runtime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACjC;AAED,eAAO,MAAM,iBAAiB,uCAG7B,CAAC"}
|
package/lib/runtime.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAatC,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAC1C,oBAAoB,EACpB,4BAA4B,CAC7B,CAAC"}
|
package/lib/session.d.ts
CHANGED
|
@@ -22,8 +22,14 @@ export declare function resolveMessageIds(input: {
|
|
|
22
22
|
conversationId: string;
|
|
23
23
|
senderId: string;
|
|
24
24
|
} | null;
|
|
25
|
-
|
|
26
|
-
export declare
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
/** Generation-owned pending music selections. */
|
|
26
|
+
export declare class MusicSearchSessions {
|
|
27
|
+
#private;
|
|
28
|
+
constructor(timeoutMs?: number, now?: () => number);
|
|
29
|
+
set(key: string, search: PendingSearch): void;
|
|
30
|
+
get(key: string): PendingSearch | undefined;
|
|
31
|
+
delete(key: string): void;
|
|
32
|
+
pruneExpired(): void;
|
|
33
|
+
dispose(): void;
|
|
34
|
+
}
|
|
29
35
|
//# sourceMappingURL=session.d.ts.map
|
package/lib/session.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAID,wBAAgB,UAAU,CACxB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,MAAM,CAER;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,YAAY,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE;YAAE,EAAE,CAAC,EAAE,OAAO,CAAA;SAAE,CAAA;KAAE,CAAC;IAC7D,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3B,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAO1E;AAED,iDAAiD;AACjD,qBAAa,mBAAmB;;gBAM5B,SAAS,SAAoB,EAC7B,GAAG,GAAE,MAAM,MAAiB;IAM9B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAI7C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAU3C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzB,YAAY,IAAI,IAAI;IASpB,OAAO,IAAI,IAAI;CAGhB"}
|