@blocklet/discuss-kit 1.5.182 → 1.5.183

package/lib/cjs/comments.js

@@ -16,7 +16,6 @@ const discussKitUx = require("@blocklet/discuss-kit-ux");
 const ahooks = require("ahooks");
 const ErrorFallback = require("./components/error-fallback");
 const locales = require("./locales");
-const getWsClient = require("./ws");
 const api = require("./api");
 const useAsyncRetry = (fn, deps = []) => {
   const state = ahooks.useRequest(fn, { refreshDeps: deps });
@@ -131,7 +130,7 @@ function DiscussKitComments({
       }));
     }
   };
-  getWsClient.useSubscription(
+  discussKitUx.useSubscription(
     object.id,
     ({ event, data }) => {
       var _a;
@@ -259,7 +258,7 @@ function Wrapper({
   if (!_prefix) {
     throw new Error("prefix is required.");
   }
-  const wsClient = getWsClient(_prefix);
+  const wsClient = discussKitUx.getWsClient(_prefix);
   react.useEffect(() => {
     wsClient.connect();
     return () => {

package/lib/es/comments.js

@@ -11,11 +11,10 @@ import CircularProgress from "@mui/material/CircularProgress";
 import ButtonGroup from "@mui/material/ButtonGroup";
 import { useLocaleContext, LocaleProvider } from "@arcblock/ux/lib/Locale/context";
 import { ErrorBoundary } from "react-error-boundary";
-import { UploaderProvider, InternalThemeProvider, ConfirmProvider, DefaultEditorConfigProvider, CommentsProvider, useDefaultApiErrorHandler, useCommentsContext, GithubReaction, CommentInput, CommentList } from "@blocklet/discuss-kit-ux";
+import { getWsClient, UploaderProvider, InternalThemeProvider, ConfirmProvider, DefaultEditorConfigProvider, CommentsProvider, useDefaultApiErrorHandler, useCommentsContext, useSubscription, GithubReaction, CommentInput, CommentList } from "@blocklet/discuss-kit-ux";
 import { useRequest } from "ahooks";
 import ErrorFallback from "./components/error-fallback";
 import { translations } from "./locales";
-import getWsClient, { useSubscription } from "./ws";
 import api, { fetchRatings } from "./api";
 const useAsyncRetry = (fn, deps = []) => {
   const state = useRequest(fn, { refreshDeps: deps });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "1.5.182",
+  "version": "1.5.183",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -37,8 +37,8 @@
     "@arcblock/did-connect": "^2.8.14",
     "@arcblock/ux": "^2.8.14",
     "@arcblock/ws": "^1.18.95",
-    "@blocklet/discuss-kit-ux": "1.5.182",
-    "@blocklet/editor": "1.5.182",
+    "@blocklet/discuss-kit-ux": "1.5.183",
+    "@blocklet/editor": "1.5.183",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mui/icons-material": "^5.14.9",
@@ -77,5 +77,5 @@
     "vite-plugin-build": "^0.10.0",
     "vite-plugin-svgr": "^4.1.0"
   },
-  "gitHead": "a23964ec273fe5a9c15733b31bfdbf7b0df72fe5"
+  "gitHead": "6d597a12b098da62ff187179e43222c45bf0f629"
 }

package/lib/cjs/ws.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const react = require("react");
-const Cookie = require("js-cookie");
-const ws = require("@arcblock/ws");
-let client;
-function create(prefix) {
-  const pathPrefix = prefix;
-  const url = `//${window.location.host}${pathPrefix.replace(/\/$/, "")}`;
-  return new ws.WsClient(url, {
-    heartbeatIntervalMs: 10 * 1e3,
-    params: () => ({
-      token: Cookie.get("login_token")
-    }),
-    reconnectAfterMs: (tries) => {
-      if (Cookie.get("login_token")) {
-        return Math.floor(Math.random() * 2 ** tries * 1e3);
-      }
-      return 2 ** tries * 1e3;
-    }
-  });
-}
-function getWsClient(prefix) {
-  if (!client) {
-    client = create(prefix);
-  }
-  return client;
-}
-const useSubscription = (event, cb = () => {
-}, deps = [], prefix = "") => {
-  if (!client) {
-    client = getWsClient(prefix);
-  }
-  react.useEffect(() => {
-    client.on(event, cb);
-    return () => {
-      client.off(event, cb);
-    };
-  }, deps);
-};
-exports.create = create;
-exports.default = getWsClient;
-exports.useSubscription = useSubscription;

package/lib/es/ws.js

@@ -1,43 +0,0 @@
-import { useEffect } from "react";
-import Cookie from "js-cookie";
-import { WsClient } from "@arcblock/ws";
-let client;
-function create(prefix) {
-  const pathPrefix = prefix;
-  const url = `//${window.location.host}${pathPrefix.replace(/\/$/, "")}`;
-  return new WsClient(url, {
-    heartbeatIntervalMs: 10 * 1e3,
-    params: () => ({
-      token: Cookie.get("login_token")
-    }),
-    reconnectAfterMs: (tries) => {
-      if (Cookie.get("login_token")) {
-        return Math.floor(Math.random() * 2 ** tries * 1e3);
-      }
-      return 2 ** tries * 1e3;
-    }
-  });
-}
-function getWsClient(prefix) {
-  if (!client) {
-    client = create(prefix);
-  }
-  return client;
-}
-const useSubscription = (event, cb = () => {
-}, deps = [], prefix = "") => {
-  if (!client) {
-    client = getWsClient(prefix);
-  }
-  useEffect(() => {
-    client.on(event, cb);
-    return () => {
-      client.off(event, cb);
-    };
-  }, deps);
-};
-export {
-  create,
-  getWsClient as default,
-  useSubscription
-};