@robertying/thu-learn-lib 5.1.0 → 6.0.0
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 +81 -248
- package/lib/auth.d.ts +14 -3
- package/lib/auth.d.ts.map +1 -1
- package/lib/auth.js +56 -58
- package/lib/auth.js.map +1 -1
- package/lib/calendar.d.ts +7 -2
- package/lib/calendar.d.ts.map +1 -1
- package/lib/calendar.js +99 -14
- package/lib/calendar.js.map +1 -1
- package/lib/contents.d.ts.map +1 -1
- package/lib/contents.js +4 -9
- package/lib/contents.js.map +1 -1
- package/lib/courses.d.ts.map +1 -1
- package/lib/courses.js +11 -25
- package/lib/courses.js.map +1 -1
- package/lib/discussions.d.ts.map +1 -1
- package/lib/discussions.js +6 -17
- package/lib/discussions.js.map +1 -1
- package/lib/favorites.d.ts +1 -0
- package/lib/favorites.d.ts.map +1 -1
- package/lib/favorites.js +13 -48
- package/lib/favorites.js.map +1 -1
- package/lib/files.d.ts +3 -3
- package/lib/files.d.ts.map +1 -1
- package/lib/files.js +109 -133
- package/lib/files.js.map +1 -1
- package/lib/homework.d.ts +34 -3
- package/lib/homework.d.ts.map +1 -1
- package/lib/homework.js +135 -79
- package/lib/homework.js.map +1 -1
- package/lib/index.d.ts +39 -19
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +44 -17
- package/lib/index.js.map +1 -1
- package/lib/notices.d.ts +3 -3
- package/lib/notices.d.ts.map +1 -1
- package/lib/notices.js +4 -20
- package/lib/notices.js.map +1 -1
- package/lib/questionnaires.d.ts.map +1 -1
- package/lib/questionnaires.js +8 -14
- package/lib/questionnaires.js.map +1 -1
- package/lib/request.d.ts +27 -13
- package/lib/request.d.ts.map +1 -1
- package/lib/request.js +84 -51
- package/lib/request.js.map +1 -1
- package/lib/timetable.d.ts +26 -0
- package/lib/timetable.d.ts.map +1 -0
- package/lib/timetable.js +110 -0
- package/lib/timetable.js.map +1 -0
- package/lib/types.d.ts +108 -75
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js +3 -0
- package/lib/types.js.map +1 -1
- package/lib/urls.d.ts +10 -20
- package/lib/urls.d.ts.map +1 -1
- package/lib/urls.js +11 -56
- package/lib/urls.js.map +1 -1
- package/lib/user.d.ts +7 -2
- package/lib/user.d.ts.map +1 -1
- package/lib/user.js +19 -5
- package/lib/user.js.map +1 -1
- package/lib/utils.d.ts +42 -4
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +76 -31
- package/lib/utils.js.map +1 -1
- package/package.json +8 -7
- package/src/auth.ts +62 -73
- package/src/calendar.ts +110 -16
- package/src/contents.ts +7 -9
- package/src/courses.ts +12 -26
- package/src/discussions.ts +8 -19
- package/src/favorites.ts +22 -48
- package/src/files.ts +121 -139
- package/src/homework.ts +184 -102
- package/src/index.ts +67 -48
- package/src/notices.ts +19 -26
- package/src/questionnaires.ts +18 -15
- package/src/request.ts +86 -62
- package/src/timetable.ts +121 -0
- package/src/types.ts +111 -86
- package/src/urls.ts +13 -64
- package/src/user.ts +21 -6
- package/src/utils.ts +94 -32
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/notices.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { Session } from './request.ts';
|
|
2
|
-
import type {
|
|
2
|
+
import type { CourseNotification, CourseNotificationBase, NotificationListOptions, RemoteFile } from './types.ts';
|
|
3
3
|
import { CourseType } from './types.ts';
|
|
4
4
|
/**
|
|
5
5
|
* Get all notifications （课程公告） of the specified course: current and expired lists.
|
|
6
6
|
* Attachments only for the notices `options.attachments` selects.
|
|
7
7
|
*/
|
|
8
|
-
export declare function getNotificationList(s: Session, courseID: string, courseType?: CourseType, options?: NotificationListOptions): Promise<
|
|
8
|
+
export declare function getNotificationList(s: Session, courseID: string, courseType?: CourseType, options?: NotificationListOptions): Promise<CourseNotification[]>;
|
|
9
9
|
/**
|
|
10
10
|
* Get the attachment of a notice from its detail page (1 request), or `undefined` without a request if
|
|
11
11
|
* `attachmentName` says it has none, or if the page has no attachment link.
|
|
12
12
|
*/
|
|
13
|
-
export declare function getNotificationAttachment(s: Session, notification: Pick<
|
|
13
|
+
export declare function getNotificationAttachment(s: Session, notification: Pick<CourseNotificationBase, 'url' | 'attachmentName'>, courseType?: CourseType): Promise<RemoteFile | undefined>;
|
|
14
14
|
//# sourceMappingURL=notices.d.ts.map
|
package/lib/notices.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notices.d.ts","sourceRoot":"","sources":["../src/notices.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"notices.d.ts","sourceRoot":"","sources":["../src/notices.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAClH,OAAO,EAAe,UAAU,EAAc,MAAM,YAAY,CAAC;AAajE;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,CAAC,EAAE,OAAO,EACV,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,UAA+B,EAC3C,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAW/B;AAmCD;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,CAAC,EAAE,OAAO,EACV,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,KAAK,GAAG,gBAAgB,CAAC,EACpE,UAAU,GAAE,UAA+B,GAC1C,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAmBjC"}
|
package/lib/notices.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
// Course notifications (课程公告).
|
|
2
2
|
import { Base64 } from 'js-base64';
|
|
3
|
-
import { $, YES } from './request.js';
|
|
4
3
|
import { ContentType, CourseType, FailReason } from './types.js';
|
|
5
4
|
import * as URLS from './urls.js';
|
|
6
|
-
import { decodeHTML, isSelected, trimAndDefine } from './utils.js';
|
|
5
|
+
import { $, YES, decodeHTML, expectSuccess, isSelected, toRequiredServerTime, toServerTime, trimAndDefine, } from './utils.js';
|
|
7
6
|
/**
|
|
8
7
|
* Get all notifications （课程公告） of the specified course: current and expired lists.
|
|
9
8
|
* Attachments only for the notices `options.attachments` selects.
|
|
@@ -24,12 +23,7 @@ async function getNotificationListKind(s, courseID, courseType, expired) {
|
|
|
24
23
|
method: 'POST',
|
|
25
24
|
body: URLS.LEARN_PAGE_LIST_FORM_DATA(courseID),
|
|
26
25
|
});
|
|
27
|
-
|
|
28
|
-
return Promise.reject({
|
|
29
|
-
reason: FailReason.INVALID_RESPONSE,
|
|
30
|
-
extra: json,
|
|
31
|
-
});
|
|
32
|
-
}
|
|
26
|
+
expectSuccess(json, FailReason.INVALID_RESPONSE);
|
|
33
27
|
const result = (json.object?.aaData ?? json.object?.resultsList ?? []);
|
|
34
28
|
return result.map((n) => {
|
|
35
29
|
const attachmentName = courseType === CourseType.STUDENT ? n.fjmc : n.fjbt;
|
|
@@ -41,8 +35,8 @@ async function getNotificationListKind(s, courseID, courseType, expired) {
|
|
|
41
35
|
publisher: n.fbrxm,
|
|
42
36
|
hasRead: n.sfyd === YES,
|
|
43
37
|
markedImportant: Number(n.sfqd) === 1, // n.sfqd could be string '1' (teacher mode) or number 1 (student mode)
|
|
44
|
-
publishTime: n.fbsj && typeof n.fbsj === 'string' ? n.fbsj : n.fbsjStr,
|
|
45
|
-
expireTime: n.jzsj
|
|
38
|
+
publishTime: toRequiredServerTime(n.fbsj && typeof n.fbsj === 'string' ? n.fbsj : n.fbsjStr),
|
|
39
|
+
expireTime: toServerTime(n.jzsj),
|
|
46
40
|
isFavorite: n.sfsc === YES,
|
|
47
41
|
comment: n.bznr ?? undefined,
|
|
48
42
|
attachmentName: typeof attachmentName === 'string' && attachmentName ? attachmentName : undefined,
|
|
@@ -56,16 +50,6 @@ async function getNotificationListKind(s, courseID, courseType, expired) {
|
|
|
56
50
|
export async function getNotificationAttachment(s, notification, courseType = CourseType.STUDENT) {
|
|
57
51
|
if (!notification.attachmentName)
|
|
58
52
|
return undefined;
|
|
59
|
-
/// from JSON (backup, currently not used)
|
|
60
|
-
// const postParams = new FormData();
|
|
61
|
-
// postParams.append('id', id);
|
|
62
|
-
// postParams.append('wlkcid', courseID);
|
|
63
|
-
// const metadata = await s.fetchJsonWithToken(URL.LEARN_NOTIFICATION_EDIT(courseType), {
|
|
64
|
-
// 'method': 'POST',
|
|
65
|
-
// 'body': postParams,
|
|
66
|
-
// });
|
|
67
|
-
// const attachmentId = metadata.ggfjid as string;
|
|
68
|
-
/// parsed from HTML
|
|
69
53
|
const result = $(await s.fetchTextWithToken(notification.url));
|
|
70
54
|
let path = (courseType === CourseType.STUDENT ? result('.ml-10') : result('#wjid')).attr('href');
|
|
71
55
|
// the page has no attachment link (removed since the list was fetched, or the page changed)
|
package/lib/notices.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notices.js","sourceRoot":"","sources":["../src/notices.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"notices.js","sourceRoot":"","sources":["../src/notices.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionnaires.d.ts","sourceRoot":"","sources":["../src/questionnaires.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"questionnaires.d.ts","sourceRoot":"","sources":["../src/questionnaires.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAc/F;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,CAAC,EAAE,OAAO,EACV,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,aAAa,EAAE,CAAC,CAa1B;AAyBD,0DAA0D;AAC1D,wBAAsB,sBAAsB,CAC1C,CAAC,EAAE,OAAO,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwBhC"}
|
package/lib/questionnaires.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
// Questionnaires (课程问卷).
|
|
2
|
-
import { YES } from './request.js';
|
|
3
2
|
import { FailReason, QuestionnaireType } from './types.js';
|
|
4
3
|
import * as URLS from './urls.js';
|
|
5
|
-
import { QNR_TYPE_MAP, decodeHTML, isSelected } from './utils.js';
|
|
4
|
+
import { QNR_TYPE_MAP, YES, apiError, decodeHTML, expectSuccess, isSelected, toRequiredServerTime, toServerTime, } from './utils.js';
|
|
6
5
|
/**
|
|
7
6
|
* Get all questionnaires （课程问卷/QNR） of the specified course: ongoing and ended lists.
|
|
8
7
|
* Questions (`detail`, 1 request each) only for the questionnaires `options.details` selects (default `'all'`).
|
|
@@ -19,12 +18,7 @@ export async function getQuestionnaireList(s, courseID, options = {}) {
|
|
|
19
18
|
}
|
|
20
19
|
async function getQuestionnaireListAtUrl(s, courseID, url) {
|
|
21
20
|
const json = await s.fetchJsonWithToken(url, { method: 'POST', body: URLS.LEARN_PAGE_LIST_FORM_DATA(courseID) });
|
|
22
|
-
|
|
23
|
-
return Promise.reject({
|
|
24
|
-
reason: FailReason.INVALID_RESPONSE,
|
|
25
|
-
extra: json,
|
|
26
|
-
});
|
|
27
|
-
}
|
|
21
|
+
expectSuccess(json, FailReason.INVALID_RESPONSE);
|
|
28
22
|
const result = (json.object?.aaData ?? []);
|
|
29
23
|
return result.map((e) => {
|
|
30
24
|
const type = QNR_TYPE_MAP.get(e.wjlx) ?? QuestionnaireType.SURVEY;
|
|
@@ -32,12 +26,12 @@ async function getQuestionnaireListAtUrl(s, courseID, url) {
|
|
|
32
26
|
id: e.wjid,
|
|
33
27
|
type,
|
|
34
28
|
title: decodeHTML(e.wjbt),
|
|
35
|
-
startTime: e.kssj,
|
|
36
|
-
endTime: e.jssj,
|
|
37
|
-
uploadTime: e.scsj,
|
|
29
|
+
startTime: toRequiredServerTime(e.kssj),
|
|
30
|
+
endTime: toRequiredServerTime(e.jssj),
|
|
31
|
+
uploadTime: toRequiredServerTime(e.scsj),
|
|
38
32
|
uploaderId: e.scr,
|
|
39
33
|
uploaderName: e.scrxm,
|
|
40
|
-
submitTime: e.tjsj
|
|
34
|
+
submitTime: toServerTime(e.tjsj),
|
|
41
35
|
isFavorite: e.sfsc === YES,
|
|
42
36
|
comment: e.bznr ?? undefined,
|
|
43
37
|
url: URLS.LEARN_QNR_SUBMIT_PAGE(e.wlkcid, e.wjid, type),
|
|
@@ -51,7 +45,7 @@ export async function getQuestionnaireDetail(s, courseID, qnrID) {
|
|
|
51
45
|
body: URLS.LEARN_QNR_DETAIL_FORM(courseID, qnrID),
|
|
52
46
|
});
|
|
53
47
|
if (!Array.isArray(json)) {
|
|
54
|
-
throw
|
|
48
|
+
throw apiError(FailReason.INVALID_RESPONSE, json);
|
|
55
49
|
}
|
|
56
50
|
return json.map((e) => ({
|
|
57
51
|
id: e.wtid,
|
|
@@ -59,7 +53,7 @@ export async function getQuestionnaireDetail(s, courseID, qnrID) {
|
|
|
59
53
|
type: e.type,
|
|
60
54
|
required: e.require === YES,
|
|
61
55
|
title: decodeHTML(e.wtbt),
|
|
62
|
-
score: e.wtfz ? Number(e.wtfz) : undefined, //
|
|
56
|
+
score: e.wtfz ? Number(e.wtfz) : undefined, // a number or a string of digits; none when missing or 0
|
|
63
57
|
options: e.list?.map((o) => ({
|
|
64
58
|
id: o.xxid,
|
|
65
59
|
index: Number(o.xxbh),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionnaires.js","sourceRoot":"","sources":["../src/questionnaires.ts"],"names":[],"mappings":"AAAA,yBAAyB;
|
|
1
|
+
{"version":3,"file":"questionnaires.js","sourceRoot":"","sources":["../src/questionnaires.ts"],"names":[],"mappings":"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"}
|
package/lib/request.d.ts
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
import * as cheerio from 'cheerio';
|
|
2
|
-
import type { Element } from 'cheerio';
|
|
3
1
|
import { CookieJar } from 'tough-cookie';
|
|
4
2
|
import type { CredentialProvider, Fetch, HelperConfig } from './types.ts';
|
|
5
3
|
import { Language } from './types.ts';
|
|
6
|
-
export declare const $: (html: string | Element | Element[]) => cheerio.CheerioAPI;
|
|
7
4
|
export declare const noLogin: (res: Response) => boolean;
|
|
8
|
-
export declare const YES = "\u662F";
|
|
9
5
|
/** default for `HelperConfig.maxConcurrentRequests` */
|
|
10
6
|
export declare const DEFAULT_MAX_CONCURRENT_REQUESTS = 6;
|
|
11
7
|
/** default for `HelperConfig.requestTimeout`, in milliseconds */
|
|
@@ -32,10 +28,15 @@ export type TimedFetch = (input: Parameters<Fetch>[0], init?: RequestOptions) =>
|
|
|
32
28
|
*/
|
|
33
29
|
export declare function withTimeout(inner: Fetch, ms: number): TimedFetch;
|
|
34
30
|
/**
|
|
35
|
-
*
|
|
36
|
-
*
|
|
31
|
+
* Reject a call of `inner` that fails without any response (the fetch implementation's own error: `TypeError: fetch
|
|
32
|
+
* failed` in Node, `Network request failed` in React Native) with `FailReason.NETWORK_ERROR`, keeping the error in
|
|
33
|
+
* `extra`. An `ApiError` (such as `REQUEST_TIMEOUT`) and the caller's own abort pass through unchanged.
|
|
37
34
|
*/
|
|
38
|
-
export declare
|
|
35
|
+
export declare function withNetworkError(inner: TimedFetch): TimedFetch;
|
|
36
|
+
/** whether an error means the server was not reached: `NETWORK_ERROR`, or `REQUEST_TIMEOUT` (no answer in time) */
|
|
37
|
+
export declare const isConnectionError: (err: unknown) => boolean;
|
|
38
|
+
/** free the connection of a response we won't read */
|
|
39
|
+
export declare const discard: (res: Response) => void;
|
|
39
40
|
/**
|
|
40
41
|
* State shared by every request a `Learn2018Helper` makes: cookies, CSRF token, language and the fetch wrappers.
|
|
41
42
|
* Internal; the helper keeps it in a private field.
|
|
@@ -49,6 +50,15 @@ export declare class Session {
|
|
|
49
50
|
readonly rawFetch: TimedFetch;
|
|
50
51
|
lang: Language;
|
|
51
52
|
previewFirstPage: boolean;
|
|
53
|
+
/**
|
|
54
|
+
* The device fingerprints of the last SSO login. id.tsinghua.edu.cn asks for them again when another site (WebVPN,
|
|
55
|
+
* for the registrar) signs in with the same id.tsinghua.edu.cn session.
|
|
56
|
+
*/
|
|
57
|
+
fingerprints?: {
|
|
58
|
+
fingerPrint: string;
|
|
59
|
+
fingerGenPrint: string;
|
|
60
|
+
fingerGenPrint3: string;
|
|
61
|
+
};
|
|
52
62
|
/** `loginWithProvider` signs in through SSO with the `CredentialProvider` */
|
|
53
63
|
constructor(config: HelperConfig | undefined, loginWithProvider: () => Promise<void>);
|
|
54
64
|
get csrfToken(): string;
|
|
@@ -61,16 +71,20 @@ export declare class Session {
|
|
|
61
71
|
runLogin(login: () => Promise<void>): Promise<void>;
|
|
62
72
|
/**
|
|
63
73
|
* Log in with the `CredentialProvider`, or wait for the login already in progress (also one with explicit
|
|
64
|
-
* credentials) instead of starting another.
|
|
74
|
+
* credentials) instead of starting another. Called by `login()`, so it tries again after a `BAD_CREDENTIAL`.
|
|
65
75
|
*/
|
|
66
76
|
relogin(): Promise<void>;
|
|
67
|
-
/**
|
|
68
|
-
|
|
69
|
-
|
|
77
|
+
/**
|
|
78
|
+
* `relogin` for a login nobody asked for (an expired session, no CSRF token yet, the registrar wanting a new
|
|
79
|
+
* id.tsinghua.edu.cn session), unless the last provider login was turned down with `BAD_CREDENTIAL`: then reject with
|
|
80
|
+
* that again
|
|
81
|
+
*/
|
|
82
|
+
autoRelogin(): Promise<void>;
|
|
83
|
+
/** fetch with a login check (see `#send`); logs in first if there is no CSRF token yet and adds it to the URL */
|
|
70
84
|
readonly fetchWithToken: TimedFetch;
|
|
71
85
|
/**
|
|
72
|
-
* Like `fetchWithToken`, but returns the parsed JSON body.
|
|
73
|
-
* session (log in again and retry once, as for a 403)
|
|
86
|
+
* Like `fetchWithToken`, but returns the parsed JSON body. The short login page with status 200 instead of JSON
|
|
87
|
+
* counts as an expired session (log in again and retry once, as for a 403); any other page is `INVALID_RESPONSE`.
|
|
74
88
|
*/
|
|
75
89
|
readonly fetchJsonWithToken: (input: Parameters<Fetch>[0], init?: RequestOptions) => Promise<any>;
|
|
76
90
|
/**
|
package/lib/request.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"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"}
|
package/lib/request.js
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
import * as cheerio from 'cheerio';
|
|
2
1
|
import fetchCookie from 'fetch-cookie';
|
|
3
2
|
import { fetch } from 'node-fetch-native';
|
|
4
3
|
import { CookieJar } from 'tough-cookie';
|
|
5
4
|
import { FailReason, Language } from './types.js';
|
|
6
|
-
|
|
7
|
-
export const $ = (html) => {
|
|
8
|
-
return cheerio.load(html, CHEERIO_CONFIG);
|
|
9
|
-
};
|
|
5
|
+
import { apiError, looksLikeLoginPage, urlOf } from './utils.js';
|
|
10
6
|
export const noLogin = (res) => res.url.includes('login_timeout') || res.status === 403;
|
|
11
|
-
export const YES = '是';
|
|
12
7
|
/** default for `HelperConfig.maxConcurrentRequests` */
|
|
13
8
|
export const DEFAULT_MAX_CONCURRENT_REQUESTS = 6;
|
|
14
9
|
/** default for `HelperConfig.requestTimeout`, in milliseconds */
|
|
@@ -22,7 +17,6 @@ export const addCSRFTokenToUrl = (url, token) => {
|
|
|
22
17
|
function makeFetch(jar) {
|
|
23
18
|
return fetchCookie(fetch, jar);
|
|
24
19
|
}
|
|
25
|
-
const urlOf = (input) => typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
|
|
26
20
|
/**
|
|
27
21
|
* Let at most `max` calls of `inner` run at once; the rest wait in FIFO order. A slot is freed when the response
|
|
28
22
|
* headers arrive (or the call fails), so reading a body does not hold one.
|
|
@@ -88,10 +82,7 @@ export function withTimeout(inner, ms) {
|
|
|
88
82
|
catch (err) {
|
|
89
83
|
outer?.removeEventListener('abort', forward);
|
|
90
84
|
if (timedOut) {
|
|
91
|
-
throw {
|
|
92
|
-
reason: FailReason.REQUEST_TIMEOUT,
|
|
93
|
-
extra: { url: urlOf(input), timeout },
|
|
94
|
-
};
|
|
85
|
+
throw apiError(FailReason.REQUEST_TIMEOUT, { url: urlOf(input), timeout });
|
|
95
86
|
}
|
|
96
87
|
throw err;
|
|
97
88
|
}
|
|
@@ -100,25 +91,34 @@ export function withTimeout(inner, ms) {
|
|
|
100
91
|
}
|
|
101
92
|
};
|
|
102
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* Reject a call of `inner` that fails without any response (the fetch implementation's own error: `TypeError: fetch
|
|
96
|
+
* failed` in Node, `Network request failed` in React Native) with `FailReason.NETWORK_ERROR`, keeping the error in
|
|
97
|
+
* `extra`. An `ApiError` (such as `REQUEST_TIMEOUT`) and the caller's own abort pass through unchanged.
|
|
98
|
+
*/
|
|
99
|
+
export function withNetworkError(inner) {
|
|
100
|
+
return async (input, init) => {
|
|
101
|
+
try {
|
|
102
|
+
return await inner(input, init);
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
if (err?.reason !== undefined || init?.signal?.aborted)
|
|
106
|
+
throw err;
|
|
107
|
+
throw apiError(FailReason.NETWORK_ERROR, err);
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
/** whether an error means the server was not reached: `NETWORK_ERROR`, or `REQUEST_TIMEOUT` (no answer in time) */
|
|
112
|
+
export const isConnectionError = (err) => {
|
|
113
|
+
const reason = err?.reason;
|
|
114
|
+
return reason === FailReason.NETWORK_ERROR || reason === FailReason.REQUEST_TIMEOUT;
|
|
115
|
+
};
|
|
103
116
|
/** free the connection of a response we won't read */
|
|
104
|
-
const discard = (res) => {
|
|
117
|
+
export const discard = (res) => {
|
|
105
118
|
res.body?.cancel().catch(() => { });
|
|
106
119
|
};
|
|
107
120
|
/** returned by a read step when the response turned out to be from an expired session */
|
|
108
121
|
const EXPIRED = Symbol('expired');
|
|
109
|
-
/**
|
|
110
|
-
* Whether a 200 body that should have been JSON is an HTML page instead. Web Learning answers some requests of an
|
|
111
|
-
* expired session with a login or redirect page and status 200, not with a 403 or a `login_timeout` redirect.
|
|
112
|
-
*/
|
|
113
|
-
const looksLikeHtml = (text) => text.trimStart().startsWith('<');
|
|
114
|
-
/** pages longer than this are taken as real pages, never as the short login / redirect page of an expired session */
|
|
115
|
-
const MAX_LOGIN_PAGE_LENGTH = 4096;
|
|
116
|
-
/**
|
|
117
|
-
* Whether a 200 page is the short login or redirect page of an expired session rather than the page asked for. A
|
|
118
|
-
* heuristic (not verified against the real server): short, and pointing at the login timeout page or the SSO login.
|
|
119
|
-
*/
|
|
120
|
-
export const looksLikeLoginPage = (text) => text.length < MAX_LOGIN_PAGE_LENGTH &&
|
|
121
|
-
/login_timeout|id\.tsinghua\.edu\.cn\/do\/off\/ui\/auth\/login|j_spring_security_thauth_roaming_entry/.test(text);
|
|
122
122
|
/**
|
|
123
123
|
* State shared by every request a `Learn2018Helper` makes: cookies, CSRF token, language and the fetch wrappers.
|
|
124
124
|
* Internal; the helper keeps it in a private field.
|
|
@@ -133,15 +133,26 @@ export class Session {
|
|
|
133
133
|
/** bumped whenever the session changes (login, `csrfToken` set), so late failures from an old session don't log in again */
|
|
134
134
|
#generation = 0;
|
|
135
135
|
#pendingLogin;
|
|
136
|
+
/**
|
|
137
|
+
* The `BAD_CREDENTIAL` of the last failed `CredentialProvider` login. Automatic logins (an expired session, no CSRF
|
|
138
|
+
* token yet) reject with it instead of trying the same credentials again, which could lock the account; an explicit
|
|
139
|
+
* `login`, or a new CSRF token, clears it.
|
|
140
|
+
*/
|
|
141
|
+
#badCredential;
|
|
136
142
|
lang = Language.ZH;
|
|
137
143
|
previewFirstPage;
|
|
144
|
+
/**
|
|
145
|
+
* The device fingerprints of the last SSO login. id.tsinghua.edu.cn asks for them again when another site (WebVPN,
|
|
146
|
+
* for the registrar) signs in with the same id.tsinghua.edu.cn session.
|
|
147
|
+
*/
|
|
148
|
+
fingerprints;
|
|
138
149
|
/** `loginWithProvider` signs in through SSO with the `CredentialProvider` */
|
|
139
150
|
constructor(config, loginWithProvider) {
|
|
140
151
|
this.loginWithProvider = loginWithProvider;
|
|
141
152
|
this.previewFirstPage = config?.generatePreviewUrlForFirstPage ?? true;
|
|
142
153
|
this.provider = config?.provider;
|
|
143
154
|
this.cookieJar = config?.cookieJar ?? new CookieJar();
|
|
144
|
-
this.rawFetch = limitConcurrency(withTimeout(config?.fetch ?? makeFetch(this.cookieJar), config?.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT), config?.maxConcurrentRequests ?? DEFAULT_MAX_CONCURRENT_REQUESTS);
|
|
155
|
+
this.rawFetch = limitConcurrency(withNetworkError(withTimeout(config?.fetch ?? makeFetch(this.cookieJar), config?.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT)), config?.maxConcurrentRequests ?? DEFAULT_MAX_CONCURRENT_REQUESTS);
|
|
145
156
|
}
|
|
146
157
|
get csrfToken() {
|
|
147
158
|
return this.#csrfToken;
|
|
@@ -149,6 +160,7 @@ export class Session {
|
|
|
149
160
|
set csrfToken(token) {
|
|
150
161
|
this.#csrfToken = token;
|
|
151
162
|
this.#generation += 1;
|
|
163
|
+
this.#badCredential = undefined;
|
|
152
164
|
}
|
|
153
165
|
/**
|
|
154
166
|
* Run one login (`login`) at a time. It starts after a login already in progress has settled, and requests that
|
|
@@ -166,17 +178,39 @@ export class Session {
|
|
|
166
178
|
}
|
|
167
179
|
/**
|
|
168
180
|
* Log in with the `CredentialProvider`, or wait for the login already in progress (also one with explicit
|
|
169
|
-
* credentials) instead of starting another.
|
|
181
|
+
* credentials) instead of starting another. Called by `login()`, so it tries again after a `BAD_CREDENTIAL`.
|
|
170
182
|
*/
|
|
171
183
|
relogin() {
|
|
172
|
-
|
|
184
|
+
this.#badCredential = undefined;
|
|
185
|
+
return this.autoRelogin();
|
|
173
186
|
}
|
|
187
|
+
/**
|
|
188
|
+
* `relogin` for a login nobody asked for (an expired session, no CSRF token yet, the registrar wanting a new
|
|
189
|
+
* id.tsinghua.edu.cn session), unless the last provider login was turned down with `BAD_CREDENTIAL`: then reject with
|
|
190
|
+
* that again
|
|
191
|
+
*/
|
|
192
|
+
autoRelogin() {
|
|
193
|
+
return this.#badCredential
|
|
194
|
+
? Promise.reject(this.#badCredential)
|
|
195
|
+
: (this.#pendingLogin ?? this.runLogin(this.#providerLogin));
|
|
196
|
+
}
|
|
197
|
+
#providerLogin = async () => {
|
|
198
|
+
try {
|
|
199
|
+
await this.loginWithProvider();
|
|
200
|
+
}
|
|
201
|
+
catch (err) {
|
|
202
|
+
if (err?.reason === FailReason.BAD_CREDENTIAL)
|
|
203
|
+
this.#badCredential = err;
|
|
204
|
+
throw err;
|
|
205
|
+
}
|
|
206
|
+
};
|
|
174
207
|
/**
|
|
175
208
|
* Send a request built by `makeUrl` (called again for the retry, so it can pick up a new CSRF token) and read it
|
|
176
209
|
* with `read`, which returns `EXPIRED` for a body that shows the session has expired.
|
|
177
210
|
* When the session has expired, it rejects with `NOT_LOGGED_IN` if there is no `CredentialProvider`; otherwise it
|
|
178
211
|
* logs in again (sharing a login already in progress, or skipping it if another request already renewed the
|
|
179
|
-
* session) and retries once.
|
|
212
|
+
* session) and retries once. After a provider login failed with `BAD_CREDENTIAL` it rejects with that instead, until
|
|
213
|
+
* the next explicit `login`.
|
|
180
214
|
*/
|
|
181
215
|
async #send(makeUrl, init, read) {
|
|
182
216
|
const attempt = async (retry) => {
|
|
@@ -192,14 +226,14 @@ export class Session {
|
|
|
192
226
|
if (first !== EXPIRED)
|
|
193
227
|
return first;
|
|
194
228
|
if (!this.provider) {
|
|
195
|
-
throw
|
|
229
|
+
throw apiError(FailReason.NOT_LOGGED_IN);
|
|
196
230
|
}
|
|
197
231
|
if (this.#generation === generation) {
|
|
198
|
-
await this.
|
|
232
|
+
await this.autoRelogin();
|
|
199
233
|
}
|
|
200
234
|
const second = await attempt(true);
|
|
201
235
|
if (second === EXPIRED) {
|
|
202
|
-
throw
|
|
236
|
+
throw apiError(FailReason.NOT_LOGGED_IN);
|
|
203
237
|
}
|
|
204
238
|
return second;
|
|
205
239
|
}
|
|
@@ -207,26 +241,27 @@ export class Session {
|
|
|
207
241
|
static #response = async (res, retry) => {
|
|
208
242
|
if (retry && res.status !== 200) {
|
|
209
243
|
discard(res);
|
|
210
|
-
throw {
|
|
211
|
-
reason: FailReason.UNEXPECTED_STATUS,
|
|
212
|
-
extra: { code: res.status, text: res.statusText },
|
|
213
|
-
};
|
|
244
|
+
throw apiError(FailReason.UNEXPECTED_STATUS, { code: res.status, text: res.statusText });
|
|
214
245
|
}
|
|
215
246
|
return res;
|
|
216
247
|
};
|
|
217
|
-
/**
|
|
218
|
-
|
|
248
|
+
/**
|
|
249
|
+
* The parsed JSON body (after a re-login only from a response with status 200); the login page with status 200
|
|
250
|
+
* instead means the session has expired.
|
|
251
|
+
*/
|
|
252
|
+
static #json = async (res, retry) => {
|
|
253
|
+
await Session.#response(res, retry);
|
|
219
254
|
const text = await res.text();
|
|
220
255
|
try {
|
|
221
256
|
return JSON.parse(text);
|
|
222
257
|
}
|
|
223
258
|
catch {
|
|
224
|
-
if (res.status === 200 &&
|
|
259
|
+
if (res.status === 200 && looksLikeLoginPage(text))
|
|
225
260
|
return EXPIRED;
|
|
226
|
-
throw {
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
};
|
|
261
|
+
throw apiError(res.status === 200 ? FailReason.INVALID_RESPONSE : FailReason.UNEXPECTED_STATUS, {
|
|
262
|
+
code: res.status,
|
|
263
|
+
text: text.slice(0, 200),
|
|
264
|
+
});
|
|
230
265
|
}
|
|
231
266
|
};
|
|
232
267
|
/** the text body; a short login / redirect page with status 200 means the session has expired */
|
|
@@ -237,18 +272,16 @@ export class Session {
|
|
|
237
272
|
};
|
|
238
273
|
#withToken = async (input) => {
|
|
239
274
|
if (this.#csrfToken === '') {
|
|
240
|
-
await this.
|
|
275
|
+
await this.autoRelogin();
|
|
241
276
|
}
|
|
242
277
|
const url = urlOf(input);
|
|
243
278
|
return () => addCSRFTokenToUrl(url, this.#csrfToken);
|
|
244
279
|
};
|
|
245
|
-
/** fetch with a login check (see `#send`) */
|
|
246
|
-
fetch = (input, init) => this.#send(() => urlOf(input), init, Session.#response);
|
|
247
|
-
/** like `fetch`, but logs in first if there is no CSRF token yet and adds the current token to the URL */
|
|
280
|
+
/** fetch with a login check (see `#send`); logs in first if there is no CSRF token yet and adds it to the URL */
|
|
248
281
|
fetchWithToken = async (input, init) => this.#send(await this.#withToken(input), init, Session.#response);
|
|
249
282
|
/**
|
|
250
|
-
* Like `fetchWithToken`, but returns the parsed JSON body.
|
|
251
|
-
* session (log in again and retry once, as for a 403)
|
|
283
|
+
* Like `fetchWithToken`, but returns the parsed JSON body. The short login page with status 200 instead of JSON
|
|
284
|
+
* counts as an expired session (log in again and retry once, as for a 403); any other page is `INVALID_RESPONSE`.
|
|
252
285
|
*/
|
|
253
286
|
fetchJsonWithToken = async (input, init) => this.#send(await this.#withToken(input), init, Session.#json);
|
|
254
287
|
/**
|
|
@@ -262,12 +295,12 @@ export class Session {
|
|
|
262
295
|
*/
|
|
263
296
|
async ensureSession(probeUrl) {
|
|
264
297
|
if (this.#csrfToken === '') {
|
|
265
|
-
await this.
|
|
298
|
+
await this.autoRelogin();
|
|
266
299
|
return;
|
|
267
300
|
}
|
|
268
301
|
const json = await this.fetchJsonWithToken(probeUrl);
|
|
269
302
|
if (json?.message !== 'success') {
|
|
270
|
-
throw
|
|
303
|
+
throw apiError(FailReason.INVALID_RESPONSE, json);
|
|
271
304
|
}
|
|
272
305
|
}
|
|
273
306
|
}
|
package/lib/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"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"}
|