@blocklet/discuss-kit 2.6.21 → 2.6.23

package/lib/cjs/api.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("@blocklet/js-sdk"),n=require("@blocklet/discuss-kit-ux"),o=require("./lib/utils.js"),s=i.createAxios({baseURL:o.discussKitApiPrefix,timeout:2e4,headers:{"x-discuss-kit-client-id":n.utils.getDiscussKitClientId()}});s.interceptors.request.use(e=>e,e=>Promise.reject(e));const a=async e=>{const{data:t}=await s.get(`/ratings/${e}`);return t},u=async e=>{try{const{data:t}=await s.get("/comments",{params:e});return t}catch(t){throw console.error(t),t}},l=async({parentId:e,content:t})=>{const{data:c}=await s.post("/comments/replies",{content:t,parentId:e});return c},d=async({commentId:e,cursor:t,limit:c=10})=>{try{const{data:r}=await s.get(`/comments/${e}/replies`,{params:{cursor:t,limit:c,embed:"rating"}});return r}catch(r){throw console.error(r),r}};exports.default=s;exports.fetchComments=u;exports.fetchMoreReplies=d;exports.fetchRatings=a;exports.reply=l;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("./node_modules/.pnpm/@blocklet_js-sdk@1.17.10_encoding@0.1.13/node_modules/@blocklet/js-sdk/dist/index.js"),n=require("@blocklet/discuss-kit-ux"),o=require("./lib/utils.js"),s=i.createAxios({baseURL:o.discussKitApiPrefix,timeout:2e4,headers:{"x-discuss-kit-client-id":n.utils.getDiscussKitClientId()}});s.interceptors.request.use(e=>e,e=>Promise.reject(e));const a=async e=>{const{data:t}=await s.get(`/ratings/${e}`);return t},u=async e=>{try{const{data:t}=await s.get("/comments",{params:e});return t}catch(t){throw console.error(t),t}},l=async({parentId:e,content:t})=>{const{data:c}=await s.post("/comments/replies",{content:t,parentId:e});return c},d=async({commentId:e,cursor:t,limit:c=10})=>{try{const{data:r}=await s.get(`/comments/${e}/replies`,{params:{cursor:t,limit:c,embed:"rating"}});return r}catch(r){throw console.error(r),r}};exports.default=s;exports.fetchComments=u;exports.fetchMoreReplies=d;exports.fetchRatings=a;exports.reply=l;

package/lib/cjs/node_modules/.pnpm/@blocklet_js-sdk@1.17.10_encoding@0.1.13/node_modules/@blocklet/js-sdk/dist/index.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@abtnode/constant"),R=require("ufo"),u=require("js-cookie");require("quick-lru");require("lodash/isEmpty");const p=require("axios"),K=require("keyv"),O=require("keyv-browser"),I=require("lodash/isNumber"),b=require("lodash/omit"),C=require("lodash/isObject"),N=require("json-stable-stringify");require("is-url");var L=class{getSessionToken(e){return u.get(c.SESSION_TOKEN_STORAGE_KEY)?u.get(c.SESSION_TOKEN_STORAGE_KEY):e.sessionTokenKey?window.localStorage.getItem(e.sessionTokenKey):""}setSessionToken(e){u.set(c.SESSION_TOKEN_STORAGE_KEY,e)}removeSessionToken(){u.remove(c.SESSION_TOKEN_STORAGE_KEY)}getRefreshToken(){return localStorage.getItem(c.REFRESH_TOKEN_STORAGE_KEY)}setRefreshToken(e){localStorage.setItem(c.REFRESH_TOKEN_STORAGE_KEY,e)}removeRefreshToken(){localStorage.removeItem(c.REFRESH_TOKEN_STORAGE_KEY)}},P=class{constructor({blocklet:e=window?.blocklet}={}){this.blocklet=e}getComponent(e){return(this.blocklet?.componentMountPoints||[]).find(n=>[n.title,n.name,n.did].includes(e))}getComponentMountPoint(e){return this.getComponent(e)?.mountPoint||""}getUrl(e,...n){const o=this.getComponentMountPoint(e);return R.joinURL(this.blocklet?.appUrl||"",o,...n)}},q="1.17.9";const x=(e=0)=>new Promise(n=>{setTimeout(()=>{n()},e)}),_=e=>`Bearer ${encodeURIComponent(e)}`,A="vid",F="__visitor_id",j=()=>u.get(A)||localStorage.getItem(F),D=async(e,n,o)=>{if(C(e.data)&&e.status>=200&&e.status<300&&typeof window<"u"&&window.blocklet?.appId&&window.blocklet?.appPk){if(!o)return e;if(!e.data.$signature)throw n(),new Error("Invalid response");const{appId:k,appPk:i}=window.blocklet;if(await o(N(b(e.data,["$signature"])),e.data.$signature,i,k)===!1)throw n(),new Error("Invalid response")}return e};function g(){return u.get("x-csrf-token")}function w(){return u.get("login_token")}async function y(){const e=g();try{const n=R.joinURL(window.location.origin,c.WELLKNOWN_SERVICE_PATH_PREFIX,"/api/did/csrfToken"),{data:o}=await p.get(n,{headers:{"x-csrf-token":e}});return o}catch(n){return console.error(n),{loginToken:w(),csrfToken:null}}}let h;function G(){if(!h){const e=window?.blocklet?.settings?.session?.cacheTtl;h=new K({store:new O.KeyvLocalStorage,ttl:I(e)?e*1e3:1e3*60*60})}return h}async function E(e,n=300){e.metaData.endTime=+new Date;const{startTime:o,endTime:k}=e.metaData,i=k-o;i<n&&await x(n-i),delete e.metaData}const v=(e,n)=>{const o={...e?.headers,"x-blocklet-js-sdk-version":q},k=new P,i=p.create({...e,headers:o});return n?.lazy&&(i.interceptors.request.use(t=>(t.metaData={startTime:+new Date},t),t=>Promise.reject(t)),i.interceptors.response.use(async t=>(t.config&&await E(t.config,n?.lazyTime),t),async t=>(t.response&&await E(t.response.config,n?.lazyTime),Promise.reject(t)))),i.interceptors.request.use(async t=>{const S=n?.componentDid??window.blocklet?.componentId?.split("/").pop();t.baseURL=t.baseURL||k.getComponentMountPoint(S),t.timeout=t.timeout||20*1e3;const f=w(),m=g();if(f&&m){const l=f.slice(-32),T=G(),r=await T.get(l);if(r)t.headers["x-csrf-token"]=r;else{const{loginToken:s,csrfToken:a}=await y();a?(await T.set(s.slice(-32),a),t.headers["x-csrf-token"]=a):t.headers["x-csrf-token"]=m}t.headers["x-csrf-token"]&&t.headers["x-csrf-token"]!==g()&&u.set("x-csrf-token",t.headers["x-csrf-token"],{sameSite:"strict",secure:!0})}const d=j();return[void 0,null].includes(d)||(t.headers["x-blocklet-visitor-id"]=d),t},t=>Promise.reject(t)),i};async function U(e){if(!e)throw new Error("Refresh token not found");const{data:n}=await v({baseURL:c.WELLKNOWN_SERVICE_PATH_PREFIX,timeout:10*1e3,secure:!0,headers:{authorization:_(e)}}).post("/api/did/refreshSession");return n}function Y({getSessionToken:e,setSessionToken:n,removeSessionToken:o,getRefreshToken:k,setRefreshToken:i,removeRefreshToken:t,onRefreshTokenError:S,onRefreshTokenSuccess:f},m,d){let l=null;const T=v({timeout:30*1e3,...m},d);return T.interceptors.request.use(async r=>{if(!u.get(c.SESSION_TOKEN_STORAGE_KEY)){const s=e(r);s&&(r.headers.authorization=_(s))}return l&&await l,r},r=>Promise.reject(r)),T.interceptors.response.use(async r=>r.config?.secure?await D(r,()=>{o(),t()},d?.verifyFn):r,async r=>{const s=r.config;if(s&&(s.headers=s?.headers?{...s.headers}:{},r?.response?.status===401&&!s._retry)){s._retry=!0;try{l||(l=U(k()));const a=await l;return n(a.nextToken),i(a.nextRefreshToken),typeof f=="function"&&f(a),T(s)}catch(a){return o(),t(),typeof S=="function"&&S(a),Promise.reject(r)}finally{l=null}}return Promise.reject(r)}),T}function $(e={},n={}){const o=new L;return Y({getSessionToken:o.getSessionToken,setSessionToken:o.setSessionToken,removeSessionToken:o.removeSessionToken,getRefreshToken:o.getRefreshToken,setRefreshToken:o.setRefreshToken,removeRefreshToken:o.removeRefreshToken,onRefreshTokenError:()=>{console.error("Failed to refresh token")},onRefreshTokenSuccess:()=>{}},e,n)}exports.createAxios=$;exports.getCSRFToken=g;exports.getCSRFTokenByLoginToken=y;exports.getLoginToken=w;

package/lib/es/api.js

@@ -1,4 +1,4 @@
-import { createAxios as a } from "@blocklet/js-sdk";
+import { createAxios as a } from "./node_modules/.pnpm/@blocklet_js-sdk@1.17.10_encoding@0.1.13/node_modules/@blocklet/js-sdk/dist/index.js";
 import { utils as c } from "@blocklet/discuss-kit-ux";
 import { discussKitApiPrefix as n } from "./lib/utils.js";
 const s = a({

package/lib/es/node_modules/.pnpm/@blocklet_js-sdk@1.17.10_encoding@0.1.13/node_modules/@blocklet/js-sdk/dist/index.js

@@ -0,0 +1,191 @@
+import { SESSION_TOKEN_STORAGE_KEY as d, REFRESH_TOKEN_STORAGE_KEY as h, WELLKNOWN_SERVICE_PATH_PREFIX as S } from "@abtnode/constant";
+import { joinURL as R } from "ufo";
+import c from "js-cookie";
+import "quick-lru";
+import "lodash/isEmpty";
+import v from "axios";
+import C from "keyv";
+import { KeyvLocalStorage as x } from "keyv-browser";
+import _ from "lodash/isNumber";
+import P from "lodash/omit";
+import K from "lodash/isObject";
+import L from "json-stable-stringify";
+import "is-url";
+var D = class {
+  getSessionToken(e) {
+    return c.get(d) ? c.get(d) : e.sessionTokenKey ? window.localStorage.getItem(e.sessionTokenKey) : "";
+  }
+  setSessionToken(e) {
+    c.set(d, e);
+  }
+  removeSessionToken() {
+    c.remove(d);
+  }
+  getRefreshToken() {
+    return localStorage.getItem(h);
+  }
+  setRefreshToken(e) {
+    localStorage.setItem(h, e);
+  }
+  removeRefreshToken() {
+    localStorage.removeItem(h);
+  }
+}, j = class {
+  constructor({ blocklet: e = window?.blocklet } = {}) {
+    this.blocklet = e;
+  }
+  getComponent(e) {
+    return (this.blocklet?.componentMountPoints || []).find((o) => [
+      o.title,
+      o.name,
+      o.did
+    ].includes(e));
+  }
+  getComponentMountPoint(e) {
+    return this.getComponent(e)?.mountPoint || "";
+  }
+  getUrl(e, ...o) {
+    const n = this.getComponentMountPoint(e);
+    return R(this.blocklet?.appUrl || "", n, ...o);
+  }
+}, F = "1.17.9";
+const O = (e = 0) => new Promise((o) => {
+  setTimeout(() => {
+    o();
+  }, e);
+}), b = (e) => `Bearer ${encodeURIComponent(e)}`, U = "vid", $ = "__visitor_id", N = () => c.get(U) || localStorage.getItem($), A = async (e, o, n) => {
+  if (K(e.data) && e.status >= 200 && e.status < 300 && typeof window < "u" && window.blocklet?.appId && window.blocklet?.appPk) {
+    if (!n) return e;
+    if (!e.data.$signature)
+      throw o(), new Error("Invalid response");
+    const { appId: l, appPk: i } = window.blocklet;
+    if (await n(L(P(e.data, ["$signature"])), e.data.$signature, i, l) === !1)
+      throw o(), new Error("Invalid response");
+  }
+  return e;
+};
+function g() {
+  return c.get("x-csrf-token");
+}
+function E() {
+  return c.get("login_token");
+}
+async function z() {
+  const e = g();
+  try {
+    const o = R(window.location.origin, S, "/api/did/csrfToken"), { data: n } = await v.get(o, { headers: { "x-csrf-token": e } });
+    return n;
+  } catch (o) {
+    return console.error(o), {
+      loginToken: E(),
+      csrfToken: null
+    };
+  }
+}
+let w;
+function M() {
+  if (!w) {
+    const e = window?.blocklet?.settings?.session?.cacheTtl;
+    w = new C({
+      store: new x(),
+      ttl: _(e) ? e * 1e3 : 1e3 * 60 * 60
+    });
+  }
+  return w;
+}
+async function y(e, o = 300) {
+  e.metaData.endTime = +/* @__PURE__ */ new Date();
+  const { startTime: n, endTime: l } = e.metaData, i = l - n;
+  i < o && await O(o - i), delete e.metaData;
+}
+const I = (e, o) => {
+  const n = {
+    ...e?.headers,
+    "x-blocklet-js-sdk-version": F
+  }, l = new j(), i = v.create({
+    ...e,
+    headers: n
+  });
+  return o?.lazy && (i.interceptors.request.use((t) => (t.metaData = { startTime: +/* @__PURE__ */ new Date() }, t), (t) => Promise.reject(t)), i.interceptors.response.use(async (t) => (t.config && await y(t.config, o?.lazyTime), t), async (t) => (t.response && await y(t.response.config, o?.lazyTime), Promise.reject(t)))), i.interceptors.request.use(async (t) => {
+    const T = o?.componentDid ?? window.blocklet?.componentId?.split("/").pop();
+    t.baseURL = t.baseURL || l.getComponentMountPoint(T), t.timeout = t.timeout || 20 * 1e3;
+    const k = E(), p = g();
+    if (k && p) {
+      const u = k.slice(-32), f = M(), r = await f.get(u);
+      if (r) t.headers["x-csrf-token"] = r;
+      else {
+        const { loginToken: s, csrfToken: a } = await z();
+        a ? (await f.set(s.slice(-32), a), t.headers["x-csrf-token"] = a) : t.headers["x-csrf-token"] = p;
+      }
+      t.headers["x-csrf-token"] && t.headers["x-csrf-token"] !== g() && c.set("x-csrf-token", t.headers["x-csrf-token"], {
+        sameSite: "strict",
+        secure: !0
+      });
+    }
+    const m = N();
+    return [void 0, null].includes(m) || (t.headers["x-blocklet-visitor-id"] = m), t;
+  }, (t) => Promise.reject(t)), i;
+};
+async function B(e) {
+  if (!e) throw new Error("Refresh token not found");
+  const { data: o } = await I({
+    baseURL: S,
+    timeout: 10 * 1e3,
+    secure: !0,
+    headers: { authorization: b(e) }
+  }).post("/api/did/refreshSession");
+  return o;
+}
+function q({ getSessionToken: e, setSessionToken: o, removeSessionToken: n, getRefreshToken: l, setRefreshToken: i, removeRefreshToken: t, onRefreshTokenError: T, onRefreshTokenSuccess: k }, p, m) {
+  let u = null;
+  const f = I({
+    timeout: 30 * 1e3,
+    ...p
+  }, m);
+  return f.interceptors.request.use(async (r) => {
+    if (!c.get(d)) {
+      const s = e(r);
+      s && (r.headers.authorization = b(s));
+    }
+    return u && await u, r;
+  }, (r) => Promise.reject(r)), f.interceptors.response.use(async (r) => r.config?.secure ? await A(r, () => {
+    n(), t();
+  }, m?.verifyFn) : r, async (r) => {
+    const s = r.config;
+    if (s && (s.headers = s?.headers ? { ...s.headers } : {}, r?.response?.status === 401 && !s._retry)) {
+      s._retry = !0;
+      try {
+        u || (u = B(l()));
+        const a = await u;
+        return o(a.nextToken), i(a.nextRefreshToken), typeof k == "function" && k(a), f(s);
+      } catch (a) {
+        return n(), t(), typeof T == "function" && T(a), Promise.reject(r);
+      } finally {
+        u = null;
+      }
+    }
+    return Promise.reject(r);
+  }), f;
+}
+function re(e = {}, o = {}) {
+  const n = new D();
+  return q({
+    getSessionToken: n.getSessionToken,
+    setSessionToken: n.setSessionToken,
+    removeSessionToken: n.removeSessionToken,
+    getRefreshToken: n.getRefreshToken,
+    setRefreshToken: n.setRefreshToken,
+    removeRefreshToken: n.removeRefreshToken,
+    onRefreshTokenError: () => {
+      console.error("Failed to refresh token");
+    },
+    onRefreshTokenSuccess: () => {
+    }
+  }, e, o);
+}
+export {
+  re as createAxios,
+  g as getCSRFToken,
+  z as getCSRFTokenByLoginToken,
+  E as getLoginToken
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "2.6.21",
+  "version": "2.6.23",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -27,8 +27,8 @@
   "author": "Nate <nate@arcblock.io> (http://github.com/NateRobinson)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/ws": "^1.28.3",
-    "@blocklet/js-sdk": "^1.17.8-beta-20260106-113136-b3c09e14",
+    "@arcblock/ws": "^1.29.9",
+    "@blocklet/js-sdk": "^1.17.10",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -49,8 +49,8 @@
     "rehype-sanitize": "^5.0.1",
     "timeago.js": "^4.0.2",
     "url-join": "^4.0.1",
-    "@blocklet/discuss-kit-ux": "2.6.21",
-    "@blocklet/editor": "2.6.21"
+    "@blocklet/discuss-kit-ux": "2.6.23",
+    "@blocklet/editor": "2.6.23"
   },
   "peerDependencies": {
     "@arcblock/did-connect-react": "^3.1.5",