@tsingroc/tsingroc-components 5.0.0-alpha.21 → 5.0.0-alpha.22

package/dist/components/auth/SessionStore.js

@@ -0,0 +1,193 @@
+export class SessionStore {
+  #service;
+  #persistent;
+  #persistentKey;
+  #revalidateInterval;
+  #session = null;
+  #operation = null;
+  get service() {
+    return this.#service;
+  }
+  get session() {
+    return this.#session;
+  }
+  constructor(service, options = {}) {
+    this.#service = service;
+    const {
+      persistent = true,
+      persistentKey = "access_token",
+      revalidateInterval = 0
+    } = options;
+    this.#persistent = persistent;
+    this.#persistentKey = persistentKey;
+    this.#revalidateInterval = revalidateInterval;
+    if (persistent) {
+      const token = localStorage.getItem(persistentKey);
+      if (token !== null) {
+        void this.load(token).catch(() => localStorage.removeItem(persistentKey));
+      }
+    }
+    const revalidate = this.revalidate.bind(this);
+    if (options.revalidateOnFocus) {
+      window.addEventListener("focus", revalidate);
+    }
+    if (options.revalidateOnReconnect) {
+      window.addEventListener("online", revalidate);
+    }
+  }
+
+  /**
+   * 获取会话。
+   *
+   * 如果当前已经有会话，那么直接返回会话。
+   * 如果当前没有会话，那么获取一个新的会话（通常是登录），失败时抛出异常。
+   * 返回的 Promise 可能永远不会 resolve，也可能立即 resolve。
+   */
+  get() {
+    if (this.#session) return Promise.resolve(this.#session);
+    if (this.#operation) return this.#operation.promise;
+    let cancelled = false;
+    const promise = this.#service.getSession().catch(err => {
+      this.#updateAndNotify(null, {
+        type: "failed",
+        reason: err
+      });
+      throw err;
+    }).then(state => {
+      if (cancelled) throw new Error("操作被新操作取消");
+      return this.load(state);
+    });
+    const cancel = () => cancelled = true;
+    this.#operation = {
+      promise,
+      cancel
+    };
+    return promise;
+  }
+
+  /** 加载并验证一个外部的会话状态。有效时更新并返回 Session，无效时抛出异常。 */
+  load(state) {
+    if (this.#operation) this.#operation.cancel();
+    let cancelled = false;
+    const promise = this.#validate(state).catch(err => {
+      this.#updateAndNotify(null, {
+        type: "failed",
+        reason: err
+      });
+      throw err;
+    }).then(session => {
+      if (cancelled) throw new Error("操作被新操作取消");
+      this.#updateAndNotify(session, {
+        type: "validated",
+        session
+      });
+      return session;
+    });
+    const cancel = () => cancelled = true;
+    this.#operation = {
+      promise,
+      cancel
+    };
+    return promise;
+  }
+
+  /** 在线验证当前保存的会话是否有效。有效时返回 Session，无效或无会话时清除状态并抛出异常。 */
+  validate() {
+    if (this.#operation) return this.#operation.promise;
+    if (!this.#session) return Promise.reject(new Error("当前无会话！"));
+    clearTimeout(this.#revalidateTask);
+    const session = this.#session;
+    let cancelled = false;
+    const promise = this.#validate(session.state).catch(err => {
+      this.#updateAndNotify(null, {
+        type: "invalidated",
+        reason: err
+      });
+      throw err;
+    }).then(session => {
+      if (cancelled) throw new Error("操作被新操作取消");
+      this.#updateAndNotify(session, {
+        type: "revalidated",
+        session
+      });
+      this.#updateRevalidateTask();
+      return session;
+    });
+    const cancel = () => cancelled = true;
+    this.#operation = {
+      promise,
+      cancel
+    };
+    return promise;
+  }
+
+  /** 在线验证当前保存的会话是否有效。无效时清除状态，有效或无会话时不做任何操作。返回会话是否有效。 */
+  async revalidate() {
+    try {
+      void (await this.validate());
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /** 立即结束会话并清除状态。如果当前无会话则不做任何操作。 */
+  async clear() {
+    if (this.#operation) this.#operation.cancel();
+    if (this.#session) {
+      await this.#service.endSession?.(this.#session.state);
+      this.#updateAndNotify(null, {
+        type: "invalidated",
+        reason: "用户已登出"
+      });
+    }
+  }
+  addEventListener(listener) {
+    this.#listeners = [...this.#listeners, listener];
+  }
+  removeEventListener(listener) {
+    this.#listeners = this.#listeners.filter(l => l !== listener);
+  }
+  async #validate(state) {
+    const rawUserInfo = await this.#service.validate(state);
+    const userInfo = this.#service.parseUserInfo(rawUserInfo);
+    return {
+      state,
+      rawUserInfo,
+      userInfo
+    };
+  }
+  #listeners = [];
+  #updateAndNotify(session, event) {
+    this.#session = session;
+    this.#operation = null;
+    if (this.#persistent) {
+      if (session) {
+        localStorage.setItem(this.#persistentKey, session.state);
+      } else {
+        localStorage.removeItem(this.#persistentKey);
+      }
+    }
+    for (const listener of this.#listeners) {
+      listener(event);
+    }
+  }
+  #revalidateTask = undefined;
+  #updateRevalidateTask() {
+    if (this.#revalidateInterval && this.#session) {
+      this.#revalidateTask = setTimeout(async () => {
+        await this.revalidate();
+        this.#updateRevalidateTask();
+      }, this.#revalidateInterval);
+    }
+  }
+}
+
+/**
+ * SessionStore 发出的事件类型。
+ *
+ * - validated：会话首次验证成功。
+ * - revalidated：会话重新验证成功。
+ * - failed: 会话创建或首次验证失败。
+ * - invalidated：会话失效。
+ */

package/dist/deckgl/TiandituLayer.d.ts

@@ -1,6 +1,6 @@
-import { CompositeLayer } from "deck.gl";
 import type { DefaultProps } from "@deck.gl/core";
 import { TileLayer } from "@deck.gl/geo-layers";
+import { CompositeLayer } from "deck.gl";
 export interface TiandituLayerProps {
     tiandituTk: string;
     type: "vec" | "img" | "ter";

package/dist/deckgl/TiandituLayer.js

@@ -1,5 +1,5 @@
-import { BitmapLayer, CompositeLayer } from "deck.gl";
 import { TileLayer } from "@deck.gl/geo-layers";
+import { BitmapLayer, CompositeLayer } from "deck.gl";
 export default class TiandituLayer extends CompositeLayer {
   static layerName = "TiandituLayer";
   static defaultProps = {

package/dist/deckgl/WeatherData.d.ts

@@ -1,5 +1,5 @@
-import type * as wl from "weatherlayers-gl";
 import type { BitmapBoundingBox } from "@deck.gl/layers";
+import type * as wl from "weatherlayers-gl";
 export interface WeatherData {
     dims: {
         longitude: number;

package/dist/echarts/series/maxBarSeries.d.ts

@@ -1,4 +1,4 @@
-import type { Color, BarSeriesOption as OrigBarSeriesOption } from "echarts";
+import type { BarSeriesOption as OrigBarSeriesOption, Color } from "echarts";
 import type { EChartsSeries } from "..";
 export interface MaxBarSeriesOption {
     /** 系列名称，不可与其他系列重名。*/

package/dist/index.d.ts

@@ -1,4 +1,11 @@
-export { AuthProvider, type AuthProviderProps, AuthCheck, type AuthCheckProps, AuthCallback, type AuthCallbackProps, useAuth, type Auth, type CasdoorAuth, type LocalAuth, } from "./components/Auth";
+export { AuthProvider, useSessionStore, useSession, type AuthProviderProps, type TokenBasedAuthProviderProps, type GenericAuthProviderProps, type UseSessionOptions, type UseSessionNonNullableOptions, } from "./components/auth/AuthProvider";
+export type { AuthService, UserInfo } from "./components/auth/AuthService";
+export { CasdoorAuthService, CasdoorCallback, CasdoorRoleCheck, type CasdoorAuthServiceOptions, type CasdoorTokenPayload, type CasdoorUserInfo, type CasdoorCallbackProps, type CasdoorRoleCheckProps, } from "./components/auth/CasdoorAuth";
+export { EmbeddedAuthService, type EmbeddedAuthServiceOptions, } from "./components/auth/EmbeddedAuth";
+export { fetcherWithBearerToken, fetcherWithLoginOn401, useFetcher, FetcherMiddleware, FetcherWithAuth, type Fetcher, type FetcherExtraOptions, type FetcherMiddlewareProps, type FetcherWithAuthProps, } from "./components/auth/Fetcher";
+export { LocalAuthService, useLocalLogin, type LocalAuthServiceOptions, type LocalTokenPayload, type LocalUserInfo, } from "./components/auth/LocalAuth";
+export { LoginCheck, type LoginCheckProps } from "./components/auth/LoginCheck";
+export { SessionStore, type SessionStoreOptions, type SessionStoreEvent, type SessionStoreEventListener, type Session, } from "./components/auth/SessionStore";
 export { default as AutoResizedECharts, withAutoResize, } from "./components/AutoResizedECharts";
 export { default as Calendar, type CalendarProps } from "./components/Calendar";
 export { default as CircularProgress, type CircularProgressProps, } from "./components/CircularProgress";

package/dist/index.js

@@ -1,4 +1,10 @@
-export { AuthProvider, AuthCheck, AuthCallback, useAuth } from "./components/Auth";
+export { AuthProvider, useSessionStore, useSession } from "./components/auth/AuthProvider";
+export { CasdoorAuthService, CasdoorCallback, CasdoorRoleCheck } from "./components/auth/CasdoorAuth";
+export { EmbeddedAuthService } from "./components/auth/EmbeddedAuth";
+export { fetcherWithBearerToken, fetcherWithLoginOn401, useFetcher, FetcherMiddleware, FetcherWithAuth } from "./components/auth/Fetcher";
+export { LocalAuthService, useLocalLogin } from "./components/auth/LocalAuth";
+export { LoginCheck } from "./components/auth/LoginCheck";
+export { SessionStore } from "./components/auth/SessionStore";
 export { default as AutoResizedECharts, withAutoResize } from "./components/AutoResizedECharts";
 export { default as Calendar } from "./components/Calendar";
 export { default as CircularProgress } from "./components/CircularProgress";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsingroc/tsingroc-components",
-  "version": "5.0.0-alpha.21",
+  "version": "5.0.0-alpha.22",
   "author": "",
   "license": "ISC",
   "description": "",
@@ -29,85 +29,69 @@
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "rspress",
-    "lint": "eslint .",
-    "format": "prettier . -w && eslint . --fix",
+    "dev": "vite",
+    "lint": "oxlint --type-aware",
+    "format": "dprint fmt && oxlint --type-aware --fix",
     "build": "rm -rf dist && (npx babel src --out-dir dist --extensions .ts,.tsx & tsc -p tsconfig.lib.json & copyfiles src/**/*.css dist --up 1 & wait)",
     "prepublishOnly": "npm run build",
-    "docs:build": "rspress build",
-    "docs:preview": "rspress preview"
+    "docs:build": "vite build",
+    "docs:preview": "vite preview"
   },
   "dependencies": {
     "casdoor-js-sdk": "^0.16.0",
-    "dayjs": "^1.11.18",
-    "deck.gl": "^9.2.2",
+    "dayjs": "^1.11.19",
+    "deck.gl": "^9.2.5",
     "geotiff": "^2.1.3",
     "jwt-decode": "^4.0.0",
     "react-icons": "^5.5.0",
     "rollup-plugin-worker-factory": "^0.5.7",
-    "weatherlayers-gl": "^2025.8.0"
+    "weatherlayers-gl": "^2025.12.0"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^6.0.0",
-    "@ant-design/v5-patch-for-react-19": "^1.0.3",
-    "antd": "^5.27.5",
+    "@ant-design/icons": "^6.1.0",
+    "antd": "^6.1.4",
     "antd-style": "^3.7.1",
-    "echarts": "^5.6.0 || ^6.0.0",
+    "echarts": "^6.0.0",
     "echarts-gl": "^2.0.9",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0"
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3"
   },
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@babel/cli": "^7.28.3",
-    "@babel/core": "^7.28.4",
-    "@babel/preset-react": "^7.27.1",
-    "@babel/preset-typescript": "^7.27.1",
-    "@eslint/js": "^9.38.0",
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@rspress/core": "^2.0.0-beta.34",
-    "@rspress/plugin-preview": "^2.0.0-beta.34",
-    "@types/node": "^22.18.12",
-    "@types/react": "^19.2.2",
-    "@types/react-dom": "^19.2.2",
-    "antd": "^5.27.6",
+    "@babel/core": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
+    "@content-collections/core": "^0.12.0",
+    "@content-collections/mdx": "^0.2.2",
+    "@content-collections/vite": "^0.2.8",
+    "@types/node": "^22.19.3",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^5.1.2",
+    "antd": "^6.1.4",
     "antd-style": "^3.7.1",
     "babel-plugin-react-compiler": "^1.0.0",
     "copyfiles": "^2.4.1",
+    "dprint": "^0.50.2",
     "echarts": "^6.0.0",
     "echarts-gl": "^2.0.9",
-    "eslint": "^9.38.0",
-    "eslint-plugin-react-hooks": "^7.0.0",
-    "globals": "^16.4.0",
-    "prettier": "^3.6.2",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "oxlint": "^1.38.0",
+    "oxlint-tsgolint": "^0.10.1",
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
-    "typedoc": "^0.28.14",
+    "typedoc": "^0.28.15",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.2"
+    "vite": "npm:rolldown-vite@^7.3.0",
+    "zod": "^4.3.5"
   },
   "overrides": {
     "echarts-gl": {
       "echarts": "^6.0.0"
     }
-  },
-  "prettier": {
-    "trailingComma": "all",
-    "importOrder": [
-      "<BUILTIN_MODULES>",
-      "",
-      "<THIRD_PARTY_MODULES>",
-      "^@(?!docs/)",
-      "",
-      "^@docs/",
-      "^[./]"
-    ],
-    "importOrderCaseSensitive": true,
-    "plugins": [
-      "@ianvs/prettier-plugin-sort-imports"
-    ]
   }
 }