@robertying/thu-learn-lib 5.0.0 → 6.0.0

package/README.md

@@ -7,40 +7,23 @@ This is a JavaScript library aimed to provide a program-friendly interface of [w
 
 This is [robertying](https://github.com/robertying)'s fork of [Harry-Chen/thu-learn-lib](https://github.com/Harry-Chen/thu-learn-lib), maintained for [learnX](https://github.com/robertying/learnX) and published as `@robertying/thu-learn-lib`.
 
-This project is licensed under MIT License.
+This project is licensed under MIT License. See [CHANGELOG.md](CHANGELOG.md) for release notes and [CONTRIBUTING.md](CONTRIBUTING.md) for development, testing and releasing.
 
 ## Compatibility
 
 The library is ESM-only and uses [node-fetch-native](https://github.com/unjs/node-fetch-native) with [fetch-cookie](https://github.com/valeriangalliat/fetch-cookie) for cookie and redirect support. It runs in Node and in React Native; you can also pass your own `fetch` in `HelperConfig`.
 
+Browsers block these cross-origin requests (CORS), so run the library in Node.js or React Native.
+
 ## Installation
 
 ```bash
 pnpm add @robertying/thu-learn-lib
 ```
 
-## Development
-
-```bash
-pnpm install
-pnpm typecheck
-pnpm lint
-pnpm format
-pnpm test
-pnpm build # emits ESM + .d.ts to lib/
-```
-
-The code is split by area under `src/`: `request.ts` (session, CSRF token, re-login), `auth.ts`, `courses.ts`, `notices.ts`, `files.ts`, `homework.ts`, `discussions.ts`, `questionnaires.ts`, `favorites.ts`, `calendar.ts`, `contents.ts` and `user.ts`. `index.ts` holds the public `Learn2018Helper` class, which passes its private session to those functions.
-
-Linting uses type-aware [oxlint](https://oxc.rs/docs/guide/usage/linter) and formatting uses [oxfmt](https://oxc.rs/docs/guide/usage/formatter).
-
-## Releasing
-
-Bump `version` in `package.json`, merge, then push a matching tag (for example `git tag v4.1.0 && git push origin v4.1.0`). The Release workflow checks, builds, publishes to npm with provenance (npm trusted publishing, no token) and creates a GitHub release.
-
 ## Usage
 
-### Authentication related (important changes since v1.2.0)
+### Logging in
 
 ```typescript
 import { Learn2018Helper } from '@robertying/thu-learn-lib';
@@ -64,36 +47,43 @@ const helper = new Learn2018Helper({
 
 // Without a CredentialProvider you must log in yourself. With one, the first request logs in.
 try {
-  await helper.login(username, password, fingerPrint);
+  await helper.login({ username, password, fingerPrint });
 } catch (e) {
   // e is an ApiError: check e.reason (a FailReason) and e.extra
 }
 
+// When resuming with a saved CSRF token and cookie jar, ensureSession logs in again only if the
+// session has expired.
+helper.setCSRFToken(savedToken);
+await helper.ensureSession();
+
 // To reuse cookies elsewhere (e.g. for file download), pass your own cookie jar in the config.
 
 // Logout if you want, but the cookie jar will not be cleared.
 await helper.logout();
 ```
 
-### Content related
+`HelperConfig` also takes `maxConcurrentRequests` (default 6) and `requestTimeout` (milliseconds, default 60000).
 
-We currently support both student and teacher (or TA) version of web learning. To keep backwards compatibility, the **default behavior of all APIs is to use the student version**. The following APIs needs `CourseType.TEACHER` as the last (optional) parameter to access the teacher version. You **should use them when you are the teacher / TA** of one course, for you will get nothing from the student version in that case.
+### Courses and content
+
+We currently support both student and teacher (or TA) version of web learning. To keep backwards compatibility, the **default behavior of all APIs is to use the student version**. The following APIs take an optional `courseType`; pass `CourseType.TEACHER` to access the teacher version. You **should use them when you are the teacher / TA** of one course, for you will get nothing from the student version in that case.
 
 We do not maintain a global type in `Learn2018Helper` class, for there can be the situation that one can be a student and teacher of the same course simultaneously, on which by using different `CourseType` you can get different results.
 
-- `getCourseList`
-- `getNotificationList/getFileList/getHomeworkList/getDiscussionList/getAnsweredQuestionList`
-- `getAllContents`
+- `getCourseList(semesterID, courseType, lang, options)`
+- `getNotificationList(courseID, courseType, options)`, `getHomeworkList(courseID, courseType, options)`
+- `getFileList/getFileCategoryList/getDiscussionList/getAnsweredQuestionList(courseID, courseType)`, `getFileListByCategory(courseID, categoryID, courseType)`
+- `getNotificationAttachment(notification, courseType)`, `getUserInfo(courseType)`
+- `getAllContents(courseIDs, type, { courseType })`
 
 Note that currently fetching homework information from teacher version is **partially implemented**.
 
 ```typescript
-import { ContentType, ApiError } from '@robertying/thu-learn-lib';
-
 // get ids of all semesters that current account has access to
 const semesters = await helper.getSemesterIdList();
 
-// get get semester info
+// get semester info
 const semester = await helper.getCurrentSemester();
 
 // get courses of this semester
@@ -106,215 +96,92 @@ const notifications = await helper.getNotificationList(course.id);
 const files = await helper.getFileList(course.id);
 const homework = await helper.getHomeworkList(course.id);
 const questions = await helper.getAnsweredQuestionList(course.id);
+// questionnaires fetch their questions (one request each) unless you pass { details: 'none' }
+const questionnaires = await helper.getQuestionnaireList(course.id, { details: 'none' });
+```
+
+Every time field is a `ServerTime`: an ISO 8601 string in Beijing time with its offset (`2026-11-07T18:28:00+08:00`), which `new Date()` reads as the right moment in any time zone.
+
+The lists give `CourseNotification`, `CourseFile`, `Homework`, `Discussion`, `Question` and `Questionnaire` items. A type for an item without its on-demand detail ends in `Base` (`HomeworkBase`, `CourseNotificationBase`), and the detail alone in `Detail` (`HomeworkDetail`).
+
+### Details on demand
 
-// get content from bunches of courses
-// the return type will be { [id: string]: Content }
-// where Content = Notification | File | Homework | Discussion | Question
-const homeworks = await helper.getAllContents([1, 2, 3], ContentType.HOMEWORK);
+Details cost extra requests per item, so they are opt-in; fetch the rest on demand.
+
+```typescript
+import { ContentType } from '@robertying/thu-learn-lib';
+
+const withDetails = await helper.getHomeworkList(course.id, undefined, { details: (h) => !h.submitted });
+const detail = await helper.getHomeworkDetail(homework[0]);
+const attachment = await helper.getNotificationAttachment(notifications[0]);
+
+// get one type of content from many courses; a course that fails is in `errors` instead of failing the rest
+const { contents, errors } = await helper.getAllContents(
+  courses.map((c) => c.id),
+  ContentType.HOMEWORK,
+  { details: 'none' },
+);
+```
+
+### Calendar
+
+```typescript
+import { ApiError } from '@robertying/thu-learn-lib';
 
 // get course calendar in a period (yyyymmdd, inclusive)
-// ranges over 28 days are fetched in windows; windows that fail even after a retry are in failedRanges
+// ranges over 28 days are fetched in windows; windows that still fail are in failedRanges
 try {
   const { events, failedRanges } = await helper.getCalendar('20191001', '20191201', { graduate: false });
 } catch (e) {
-  // every window failed
+  // every window failed, or signing in to the registrar failed
   const error = e as ApiError;
   // check e.reason and e.extra for information
 }
 ```
 
-Browsers block these cross-origin requests (CORS), so run the library in Node.js or React Native.
+Off campus the registrar is reached through WebVPN, which reuses the id.tsinghua.edu.cn session of the last `login`. When that session has expired (e.g. in a session resumed from saved cookies), a helper with a `CredentialProvider` logs in again and tries once more.
+
+### Timetable
+
+The registrar's calendar knows about holidays and moved classes, but it fails now and then. A timetable can also be worked out from each course's time and location (`getCourseList(..., { timeAndLocation: true })`) and the term's first day:
+
+```typescript
+import { CLASS_PERIOD_TIMES, parseCourseMeeting, semesterWeek } from '@robertying/thu-learn-lib';
+
+// '星期六第1节(9,11周)，六教6A414' (or 'Section 1 of Sat (Week 9,11 ), 六教6A414' in English)
+const meeting = parseCourseMeeting(course.timeAndLocation[0]);
+// { weekday: 6, period: 1, weeks: [9, 11], location: '六教6A414' }; weeks is null for every week
+const [start, end] = CLASS_PERIOD_TIMES[meeting.period]; // Beijing time, ['08:00', '09:35']
+
+// the teaching week of a Beijing date; week 1 starts on the Monday after a weekend first day
+const week = semesterWeek(semester.startDate, '2026-11-04');
+```
+
+### Submitting homework
+
+```typescript
+import { homeworkContentHtml } from '@robertying/thu-learn-lib';
+
+// the answer is HTML and replaces the submitted one; pass the submitted HTML to only change the attachment
+await helper.submitHomework(homework.studentHomeworkId, homeworkContentHtml('my answer'), {
+  filename: 'answer.pdf',
+  content: blob, // in React Native: { uri, type }
+});
+```
+
+`fetch` can't report upload progress. To send the submission with another HTTP client, get the request with `getHomeworkSubmitRequest` (it checks the session first) and read the answer with `checkHomeworkSubmitResponse`:
+
+```typescript
+import { checkHomeworkSubmitResponse } from '@robertying/thu-learn-lib';
+
+const { url, body } = await helper.getHomeworkSubmitRequest(id, content, attachment);
+const res = await axios.post(url, body, { onUploadProgress });
+checkHomeworkSubmitResponse(res.data);
+```
+
+### Errors
 
-## Typing
-
-See `src/types.ts` for type definitions. Note that `ApiError` represents the type that will be used in rejected Promises.
-
-## Testing
-
-`pnpm test` runs the offline tests. They give the helper a fake `fetch` (`test/helpers/fake-server.ts`) that serves hand-written responses shaped like Web Learning's, simulates SSO login and session expiry, and records every request so tests can also check how many requests an API makes.
-
-`pnpm test:live` runs the tests against the real server. It needs your own credentials: copy `test/live/template.env` to `test/live/.env` and fill it in.
-
-## Changelog
-
-- v4.1.0
-  - Published as `@robertying/thu-learn-lib`
-  - Tooling: pnpm, TypeScript 7 (`tsc` ESM + `.d.ts` build), oxlint + oxfmt, Vitest 5, Node 26
-  - (_BREAKING CHANGE_) Drop the IIFE browser build and the browser-extension demo
-  - Code split into modules, with offline tests
-  - No API changes
-- v4.0.0
-  - Upgrade cheerio to 1.0
-  - Add support for questionnaire (add `getQuestionnaireList` API and some public types)
-  - Add support for managing favorite items
-  - Add support for sorting courses (i.e. manage the order on web learning)
-  - Add support for managing comments on content (e.g. files, notifications)
-  - (_BREAKING CHANGE_) Deprecate usage of `studentHomeworkId`
-- v3.2.1
-  - Upgrade to eslint v9
-  - Add `setCSRFToken` function to manually reuse previous (maybe valid) token and prevent unnecessary re-login (see [#49](https://github.com/Harry-Chen/thu-learn-lib/issues/49))  
-    _Note:_ To use this feature in Node.js, `cookieJar` should also be reused, otherwise it will not work. (not the case in browser env)
-  - Fix `CourseContent` type: default value for type param `T` (breaking change introduced in [#53](https://github.com/Harry-Chen/thu-learn-lib/issues/53))
-  - _(Breaking...?)_ Rename `File.id2` added in previous version to actual `id` and previously used `id` to `fileId` (see [#60](https://github.com/Harry-Chen/thu-learn-lib/issues/60))
-  - Upgrade dependencies
-- v3.2.0
-  - Support file categories (see [#57](https://github.com/Harry-Chen/thu-learn-lib/issues/57)):
-    - Add `FileCategory` type and optional `category` field in `File` type
-    - Now `getFileList` function automatically fetches all categories and saves them in each `File` object
-    - Add `getFileCategoryList` function to fetch file categories
-    - Add `getFileListByCategory` function to get file list by category
-  - Fix content of file download url and visit count in for `CourseType.TEACHER`
-- v3.1.4
-  - Allow and check for undefined credential in login (see [#52](https://github.com/Harry-Chen/thu-learn-lib/issues/52))
-  - Discriminate `getAllContents` return type based on input content type (see [#53](https://github.com/Harry-Chen/thu-learn-lib/issues/53))
-  - Use `searchParams` to set csrf token & add csrf token to `getCalendar` (see [#54](https://github.com/Harry-Chen/thu-learn-lib/issues/54))
-  - Update bunches of dependencies
-- v3.1.3
-  - Fix empty time and location of course (see [#145](https://github.com/Harry-Chen/Learn-Helper/issues/145))
-- v3.1.2
-  - Fix empty course name parsing
-  - (Maybe BEARKING) `Homework.gradeLevel` changed to `HomeworkGradeLevel` (a string enum) for better i18n
-  - Fix get language
-- v3.1.1
-  - Remove `fetch-cookie` dependency in browser build, reducing bundle size
-  - Add `getUserInfo` interface (#48, thanks to @robertying)
-- v3.1.0
-  - **Refactor**:
-    - Build tool: `webpack` -> `tsup`
-    - Development tool: `webpack` -> `vite`
-    - Test tool: `jest` -> `vitest`
-    - Fetch:
-      - `cross-fetch` -> `node-fetch-native` (Node.js now has native `fetch`)
-      - `real-isomorphic-fetch` -> `fetch-cookie` (`fetch-cookie` now can handle redirects)
-      - `tough-cookie-no-native` -> `tough-cookie` (`tough-cookie` is now native)
-    - **(BREAKING)** Updated library output structure, now everything exported in index, cannot use `/lib` or `/lib/types` anymore
-  - Added:
-    - Submit homework
-    - Language switching and related behaviour
-    - Get TA's homework info (partial support)
-  - Fixed:
-    - **Web Learning API update**
-    - Decode course name
-  - Other:
-    - Move `fake-parse5` to [a seperate library](https://github.com/AsakuraMizu/fake-parse5)
-- v3.0.4
-  - No feature changes, upgrade dependencies
-- v3.0.3
-  - No feature changes, upgrade dependencies
-- v3.0.2
-  - No feature changes, upgrade dependencies to mitigate security vulnerabilities
-- v3.0.1
-  - Add config `generatePreviewUrlForFirstPage` to switch preview URL type (default to `true`)
-- v3.0.0
-  - (BREAKING CHANGE) Redesign exported types, use `RemoteFile` to represent a file on Web Learning
-  - Add support for parsing attachment sizes & preview URLs in homework & notifications (Harry-Chen/Learn-Helper#109)
-- v2.5.4
-  - Fix (sometimes) incorrect publish time of notifications (#36)
-- v2.5.3
-  - Add `allowFailure` in `getAllContents` for convenience
-- v2.5.2
-  - Allow retrieving CSRF token via `getCSRFToken` method
-  - Export `addCSRFTokenToUrl` function as API for convenience
-- v2.5.1
-  - No feature change, add support for direct `import` in Node.js
-- v2.5.0
-  - Add transparent support for CSRF token (recently deployed) in all Web Learning APIs
-- v2.4.2
-  - No functionality change, bump some dependencies to mitigate security concerns
-- v2.4.1
-  - Replace `parse5` with `htmlparser2` in Cheerio and remove it from bundled file (replaced with `src/fake-parse5`)
-  - Replace TSLint with ESLint
-- v2.4.0
-  - Upgrade to TypeScript 4.1 & Webpack 5.15
-  - Add more null checking for disabled functionalities (see [xxr3376/Learn-Project#90](https://github.com/xxr3376/Learn-Project/issues/90))
-- v2.3.2
-  - Fix a problem in `v2.3.1` (not published) and `v2.3.0` that build output fails to be uploaded to npm
-- v2.3.0
-  - Refine error detecting & handling by using `ApiError` in usage of `Promise.reject` (might be a breaking change)
-- v2.2.3
-  - Add workaround for some strange behaviors in teacher mode (thanks to @MashPlant)
-- v2.2.2
-  - Return error when API return any non-success result
-- v2.2.1
-  - Fix a missing parameter in `previewUrl`
-- v2.2.0
-  - Use ECMAScript private fields in `Learn2018Helper` class to protect credentials
-  - Add `previewUrl` to `File`
-  - Upgrade to TypeScript 3.8.2
-- v2.1.2
-  - Fix problem in invoking JSONP callback (because some engines might do JIT)
-- v2.1.1
-  - Remove usage of `eval` in `getCalendar`
-- v2.1.0
-  - Catch errors returned by calendar API and throw user-defined error
-  - Add documentation for all public APIs
-- v2.0.0
-  - Use ES2018 in generated library
-  - Add `FailReason` to represent all strings that will be used as the reason of rejected Promises
-  - `login` and `logout` no longer return Promises
-- v1.2.2
-  - Fix a function signature to keep compatibility
-- v1.2.1
-  - Support TA version of many APIs (see above for usage)
-  - Fix some wrong URLs in fetched data
-- v1.2.0
-  - Support getting course calendars from academic.tsinghua.edu.cn (thanks to robertying)
-  - Automatic retry logging in when fetching failed and `CredentialProvider` is provided (thanks to mayeths)
-  - Add unit tests using `jest` (thanks to mayeths)
-  - Filter out `null` values in `getSemesterIdList` API
-  - Switch to `https://learn.tsinghua.edu.cn/` from `learn2018` permanently
-- v1.1.4
-  - Return empty array if any content module is disabled
-  - Add `getTACourseList` to get TA's course list (temporarily can not be used by other functions)
-- v1.1.3
-  - Emergency fix of wrongly decoded base64 string, add `js-base64` back
-- v1.1.2
-  - Switch to `Base64.js` instead of `js-base64`, which uses evil `eval`
-- v1.1.1
-  - Decode HTML entities in the title of disscussions (the last one, I promise!)
-- v1.1.0
-  - Fix an typo in grade level mapping
-  - Bump to a new minor version
-- v1.0.16 (no v1.0.15 due to some publishing issues)
-  - Switch to `yarn`
-  - Add parsing of grade levels of homework (A+/A/.../F)
-- v1.0.14
-  - Add prefix for `attachmentUrl` filed of Notification
-  - Deprecate all old versions
-- v1.0.13
-  - Decode HTML entities whenever possible
-- v1.0.12
-  - Add `url` for Course
-  - Fix `url` for Question (to display correct section name)
-- v1.0.11
-  - Fix `url` error in Question
-- v1.0.10
-  - Decode the HTML entities in the `description` field of homework
-- v1.0.9
-  - Use `entities` to decode HTML entities
-- v1.0.8
-  - Export type CourseContent
-- v1.0.7
-  - No change made to code, update README
-- v1.0.6
-  - Add API to fetching content for a list of courses
-- v1.0.5
-  - Fix HTML entity replacement.
-- v1.0.4
-  - No change made to code
-  - Remove unused build commands
-  - Fix multiple typos in README
-- v1.0.3
-  - Add real logout API (thank @zhaofeng-shu33)
-- v1.0.2
-  - Add API to get IDs of all semesters (thank @jiegec)
-- v1.0.1
-  - Expose CookieJar in helper class
-  - Fix some HTML entity decoding problems
-  - **Rename of some APIs** (break compatibility before we have actual users)
-- v1.0.0
-  - First release
-  - Support parsing of notification, homework, file, discussion and **answered** questions
+Rejected promises carry an `ApiError`: `reason` is a `FailReason` and `extra` holds what the server answered, when there is something useful. For example, a wrong password rejects with `BAD_CREDENTIAL`, an expired session without a `CredentialProvider` with `NOT_LOGGED_IN`, a request that gets no answer (offline, DNS or TLS failure) with `NETWORK_ERROR`, and a slow request with `REQUEST_TIMEOUT`; `isConnectionError(e)` is true for the last two, also for a login. See `src/types.ts` for every reason and the other type definitions.
 
 ## Projects using this library
 

package/lib/auth.d.ts

@@ -1,11 +1,22 @@
 import type { Session } from './request.ts';
+import type { Credential } from './types.ts';
+/** a `Credential` with everything an SSO login needs */
+export type CompleteCredential = Credential & {
+    username: string;
+    password: string;
+    fingerPrint: string;
+};
+/** whether `credential` has a username, a password and a fingerprint */
+export declare const isComplete: (credential: Credential | undefined) => credential is CompleteCredential;
 /**
  * If using alternative cookie management systems,
  * be sure to clear id.tsinghua.edu.cn cookies before calling this function
  */
-export declare function getRoamingTicket(s: Session, username: string, password: string, fingerPrint: string, fingerGenPrint?: string, fingerGenPrint3?: string): Promise<string>;
-/** login is necessary if you do not provide a `CredentialProvider` */
-export declare function login(s: Session, username?: string, password?: string, fingerPrint?: string, fingerGenPrint?: string, fingerGenPrint3?: string): Promise<void>;
-/**  logout (to make everyone happy) */
+export declare function getRoamingTicket(s: Session, credential: CompleteCredential): Promise<string>;
+/** log in with the `CredentialProvider`; `NO_CREDENTIAL` without one, or when it gives an incomplete credential */
+export declare function loginWithProvider(s: Session): Promise<void>;
+/** log in through id.tsinghua.edu.cn, then read the CSRF token and the website language from the homepage */
+export declare function login(s: Session, credential: CompleteCredential): Promise<void>;
+/**  logout (to make everyone happy); the CSRF token is cleared, so the next request logs in again */
 export declare function logout(s: Session): Promise<void>;
 //# sourceMappingURL=auth.d.ts.map

package/lib/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAM5C;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,CAAC,EAAE,OAAO,EACV,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,MAAW,EAC3B,eAAe,GAAE,MAAW,mBA4C7B;AAED,sEAAsE;AACtE,wBAAsB,KAAK,CACzB,CAAC,EAAE,OAAO,EACV,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,uCAAuC;AACvC,wBAAsB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtD"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAK7C,wDAAwD;AACxD,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1G,wEAAwE;AACxE,eAAO,MAAM,UAAU,eAAgB,UAAU,GAAG,SAAS,KAAG,UAAU,IAAI,kBACD,CAAC;AAE9E;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmDlG;AAaD,mHAAmH;AACnH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjE;AAED,6GAA6G;AAC7G,wBAAsB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBrF;AAED,qGAAqG;AACrG,wBAAsB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtD"}

package/lib/auth.js

@@ -1,29 +1,27 @@
 // Login to Web Learning through id.tsinghua.edu.cn (SSO) and logout.
 import { sm2 } from 'sm-crypto';
-import { $ } from './request.js';
-import { FailReason, Language } from './types.js';
+import { discard, isConnectionError } from './request.js';
+import { CourseType, FailReason, Language } from './types.js';
 import * as URLS from './urls.js';
+import { $, apiError } from './utils.js';
+/** whether `credential` has a username, a password and a fingerprint */
+export const isComplete = (credential) => !!credential?.username && !!credential.password && !!credential.fingerPrint;
 /**
  * If using alternative cookie management systems,
  * be sure to clear id.tsinghua.edu.cn cookies before calling this function
  */
-export async function getRoamingTicket(s, username, password, fingerPrint, fingerGenPrint = '', fingerGenPrint3 = '') {
-    // Make sure we always start with the form page
-    // More code is needed to handle the case where the user is already logged in (i.e. cookies are set)
-    // It won't be a problem if it is always the same user,
-    // but if the current cookies are from a different user than the one trying to log in,
-    // it will cause problems.
+export async function getRoamingTicket(s, credential) {
+    const { username, password, fingerPrint, fingerGenPrint = '', fingerGenPrint3 = '' } = credential;
+    // start from the login form without an id.tsinghua.edu.cn session: one left in the cookies may be another user's
     try {
         await s.cookieJar.setCookie('JSESSIONID=; path=/; HttpOnly', URLS.ID_PREFIX);
     }
     catch (err) {
-        throw {
-            reason: FailReason.ERROR_SETTING_COOKIES,
-            extra: err,
-        };
+        throw apiError(FailReason.ERROR_SETTING_COOKIES, err);
     }
+    let page;
     try {
-        const loginForm = await s.rawFetch(URLS.ID_LOGIN());
+        const loginForm = await s.rawFetch(URLS.ID_LOGIN);
         const body = $(await loginForm.text());
         const sm2publicKey = body('#sm2publicKey').text().trim();
         const formData = new FormData();
@@ -31,69 +29,81 @@ export async function getRoamingTicket(s, username, password, fingerPrint, finge
         formData.append('i_pass', '04' + sm2.doEncrypt(password, sm2publicKey));
         formData.append('singleLogin', 'on');
         formData.append('fingerPrint', fingerPrint);
-        formData.append('fingerGenPrint', fingerGenPrint ?? '');
-        formData.append('fingerGenPrint3', fingerGenPrint3 ?? '');
+        formData.append('fingerGenPrint', fingerGenPrint);
+        formData.append('fingerGenPrint3', fingerGenPrint3);
         formData.append('i_captcha', '');
-        const checkResponse = await s.rawFetch(URLS.ID_LOGIN_CHECK(), {
+        const checkResponse = await s.rawFetch(URLS.ID_LOGIN_CHECK, {
             method: 'POST',
             body: formData,
         });
-        const anchor = $(await checkResponse.text())('a');
-        const redirectUrl = anchor.attr('href');
-        const ticket = redirectUrl.split('=').slice(-1)[0];
-        return ticket;
+        if (!checkResponse.ok) {
+            throw { code: checkResponse.status, text: checkResponse.statusText };
+        }
+        page = await checkResponse.text();
     }
     catch (err) {
-        throw {
-            reason: FailReason.ERROR_FETCH_FROM_ID,
-            extra: err,
-        };
+        // no answer at all: the device is offline or id.tsinghua.edu.cn is unreachable, not a refused login
+        if (isConnectionError(err))
+            throw err;
+        throw apiError(FailReason.ERROR_FETCH_FROM_ID, err);
     }
+    // id.tsinghua.edu.cn answers with a page whose only link is the roaming URL (with the ticket), or with the login form
+    // again (with its links to the password reset, guides, phone and mail) for a wrong password
+    const body = $(page);
+    const ticket = ticketOf(body('a[href*="ticket="]').attr('href'));
+    if (ticket)
+        return ticket;
+    if (body('#theform, form[action*="/auth/login/check"]').length > 0 && body('#i_pass').length > 0) {
+        throw apiError(FailReason.BAD_CREDENTIAL, textOf(body('#msg_note, .alert-danger')) || undefined);
+    }
+    // something else, e.g. a second factor, a locked account or maintenance: not a wrong password
+    throw apiError(FailReason.ERROR_FETCH_FROM_ID, textOf(body('body').clone().find('script, style').remove().end()).slice(0, 200));
 }
-/** login is necessary if you do not provide a `CredentialProvider` */
-export async function login(s, username, password, fingerPrint, fingerGenPrint, fingerGenPrint3) {
-    if (!username || !password || !fingerPrint) {
-        if (!s.provider)
-            return Promise.reject({
-                reason: FailReason.NO_CREDENTIAL,
-            });
-        const credential = await s.provider();
-        username = credential.username;
-        password = credential.password;
-        fingerPrint = credential.fingerPrint;
-        fingerGenPrint = credential.fingerGenPrint;
-        fingerGenPrint3 = credential.fingerGenPrint3;
-        if (!username || !password || !fingerPrint) {
-            return Promise.reject({
-                reason: FailReason.NO_CREDENTIAL,
-            });
-        }
+const textOf = (el) => el.text().replace(/\s+/g, ' ').trim();
+const ticketOf = (href) => {
+    if (!href)
+        return undefined;
+    try {
+        return new URL(href, URLS.ID_PREFIX).searchParams.get('ticket') || undefined;
+    }
+    catch {
+        return undefined;
     }
-    // check response from id.tsinghua.edu.cn
-    const ticket = await getRoamingTicket(s, username, password, fingerPrint, fingerGenPrint, fingerGenPrint3);
+};
+/** log in with the `CredentialProvider`; `NO_CREDENTIAL` without one, or when it gives an incomplete credential */
+export async function loginWithProvider(s) {
+    const credential = await s.provider?.();
+    if (!isComplete(credential))
+        throw apiError(FailReason.NO_CREDENTIAL);
+    return login(s, credential);
+}
+/** log in through id.tsinghua.edu.cn, then read the CSRF token and the website language from the homepage */
+export async function login(s, credential) {
+    const ticket = await getRoamingTicket(s, credential);
+    const { fingerPrint, fingerGenPrint = '', fingerGenPrint3 = '' } = credential;
+    s.fingerprints = { fingerPrint, fingerGenPrint, fingerGenPrint3 };
     const loginResponse = await s.rawFetch(URLS.LEARN_AUTH_ROAM(ticket));
+    // only the status matters
+    discard(loginResponse);
     if (!loginResponse.ok) {
-        return Promise.reject({
-            reason: FailReason.ERROR_ROAMING,
-        });
+        throw apiError(FailReason.ERROR_ROAMING);
     }
-    const courseListPageSource = await (await s.rawFetch(URLS.LEARN_STUDENT_COURSE_LIST_PAGE())).text();
+    const courseListPageSource = await (await s.rawFetch(URLS.LEARN_HOMEPAGE(CourseType.STUDENT))).text();
     const tokenRegex = /^.*&_csrf=(\S*)".*$/gm;
     const tokenMatches = [...courseListPageSource.matchAll(tokenRegex)];
     if (tokenMatches.length === 0) {
-        return Promise.reject({
-            reason: FailReason.INVALID_RESPONSE,
-            extra: 'cannot fetch CSRF token from source',
-        });
+        throw apiError(FailReason.INVALID_RESPONSE, 'cannot fetch CSRF token from source');
     }
     s.csrfToken = tokenMatches[0][1];
-    const langRegex = /<script src="\/f\/wlxt\/common\/languagejs\?lang=(zh|en)"><\/script>/g;
+    // the homepage loads e.g. `/f/wlxt/common/languagejs?lang=zh_CN&v=845`
+    const langRegex = /\/f\/wlxt\/common\/languagejs\?lang=(zh|en)/g;
     const langMatches = [...courseListPageSource.matchAll(langRegex)];
     if (langMatches.length !== 0)
         s.lang = langMatches[0][1] === 'en' ? Language.EN : Language.ZH;
 }
-/**  logout (to make everyone happy) */
+/**  logout (to make everyone happy); the CSRF token is cleared, so the next request logs in again */
 export async function logout(s) {
-    await s.rawFetch(URLS.LEARN_LOGOUT(), { method: 'POST' });
+    discard(await s.rawFetch(URLS.LEARN_LOGOUT, { method: 'POST' }));
+    s.csrfToken = '';
 }
 //# sourceMappingURL=auth.js.map

package/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAErE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGhC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAKzC,wEAAwE;AACxE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,UAAkC,EAAoC,EAAE,CACjG,CAAC,CAAC,UAAU,EAAE,QAAQ,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;AAE9E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,CAAU,EAAE,UAA8B;IAC/E,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;IAClG,iHAAiH;IACjH,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,+BAA+B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;QAEzD,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACpC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QACxE,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrC,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAC5C,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE;YAC1D,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;YACtB,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC;QACvE,CAAC;QACD,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,oGAAoG;QACpG,IAAI,iBAAiB,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,CAAC;QACtC,MAAM,QAAQ,CAAC,UAAU,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,sHAAsH;IACtH,4FAA4F;IAC5F,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,IAAI,IAAI,CAAC,6CAA6C,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjG,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;IACnG,CAAC;IACD,8FAA8F;IAC9F,MAAM,QAAQ,CACZ,UAAU,CAAC,mBAAmB,EAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAChF,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAEjF,MAAM,QAAQ,GAAG,CAAC,IAAwB,EAAsB,EAAE;IAChE,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;IAC/E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,mHAAmH;AACnH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,CAAU;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,MAAM,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACtE,OAAO,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AAC9B,CAAC;AAED,6GAA6G;AAC7G,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,CAAU,EAAE,UAA8B;IACpE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,cAAc,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;IAC9E,CAAC,CAAC,YAAY,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;IAElE,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,0BAA0B;IAC1B,OAAO,CAAC,aAAa,CAAC,CAAC;IACvB,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;QACtB,MAAM,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,oBAAoB,GAAW,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9G,MAAM,UAAU,GAAG,uBAAuB,CAAC;IAC3C,MAAM,YAAY,GAAG,CAAC,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACpE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,qCAAqC,CAAC,CAAC;IACrF,CAAC;IACD,CAAC,CAAC,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,uEAAuE;IACvE,MAAM,SAAS,GAAG,8CAA8C,CAAC;IACjE,MAAM,WAAW,GAAG,CAAC,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAClE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;AAChG,CAAC;AAED,qGAAqG;AACrG,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,CAAU;IACrC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC;AACnB,CAAC"}