fishpi 0.0.28 → 0.0.30

package/README.md

@@ -59,11 +59,11 @@ await fish.chatroom.redpacket.send({
 // 私聊历史获取
 let chatHistory = await fish.chat.get({ user: 'username', autoRead: false })
 // 监听私聊新消息
-fishpi.chat.addListener(({ msg: any }) => {
+fishpi.chat.addListener(async ({ msg }: { msg: NoticeMsg }) => {
     switch (msg.command) {
         // 私聊未读数更新
         case 'chatUnreadCountRefresh':
-            if(msg.count > 0) {
+            if(msg.count! > 0) {
                 let unreadMsgs = await fishpi.chat.unread();
             }
             else this.users.forEach((u, i) => {
@@ -73,7 +73,7 @@ fishpi.chat.addListener(({ msg: any }) => {
         // 新私聊消息
         case 'newIdleChatMessage':
             // msg 就是新的私聊消息
-            console.log(msg.senderUserName, '说：', notice.preview);
+            console.log(msg.senderUserName, '说：', msg.preview);
             break;
         // 有新的消息通知
         case 'refreshNotification':
@@ -82,7 +82,7 @@ fishpi.chat.addListener(({ msg: any }) => {
     }
 });
 // 监听指定用户的私聊消息
-fishpi.chat.addListener(({ msg: ChatData }) => {
+fishpi.chat.addListener(({ msg }: { msg: ChatData }) => {
     console.log(msg.senderUserName, '[', msg.time, ']：', msg.content);
 }, 'username');
 // 给指定用户发私聊消息

package/lib/chatroom.d.ts

@@ -1,4 +1,4 @@
-import { ApiResponse, ChatContentType, ChatMessageType, ChatRoomMessage, GestureType, Message, MuteItem, RedPacket, RedPacketInfo } from './typing';
+import { ApiResponse, ChatContentType, ChatMessageType, ClientType, ChatRoomMessage, GestureType, Message, MuteItem, RedPacket, RedPacketInfo } from './typing';
 declare class ChatRoom {
     private _apiKey;
     private _discusse;
@@ -44,7 +44,7 @@ declare class ChatRoom {
      * 发送一条消息
      * @param msg 消息内容，支持 Markdown
      */
-    send(msg: string): Promise<ApiResponse<undefined>>;
+    send(msg: string, clientType?: ClientType | string, version?: string): Promise<ApiResponse<undefined>>;
     /**
      * 发送一条弹幕
      * @param msg 消息内容，支持 Markdown

package/lib/chatroom.js

@@ -133,6 +133,7 @@ var ChatRoom = /** @class */ (function () {
                             return [2 /*return*/, rsp_1];
                         rsp_1.data.forEach(function (d, i, data) {
                             try {
+                                data[i].via = (0, utils_1.clientToVia)(data[i].client);
                                 data[i].sysMetal = (0, utils_1.toMetal)(data[i].sysMetal);
                                 redpacket_1 = JSON.parse(d.content);
                                 if (redpacket_1.msgType !== 'redPacket')
@@ -171,6 +172,7 @@ var ChatRoom = /** @class */ (function () {
                             return [2 /*return*/, rsp_2];
                         rsp_2.data.forEach(function (d, i, data) {
                             try {
+                                data[i].via = (0, utils_1.clientToVia)(data[i].client);
                                 data[i].sysMetal = (0, utils_1.toMetal)(data[i].sysMetal);
                                 redpacket_2 = JSON.parse(d.content);
                                 if (redpacket_2.msgType !== 'redPacket')
@@ -223,7 +225,9 @@ var ChatRoom = /** @class */ (function () {
      * 发送一条消息
      * @param msg 消息内容，支持 Markdown
      */
-    ChatRoom.prototype.send = function (msg) {
+    ChatRoom.prototype.send = function (msg, clientType, version) {
+        if (clientType === void 0) { clientType = typing_1.ClientType.Other; }
+        if (version === void 0) { version = 'Latest'; }
         return __awaiter(this, void 0, void 0, function () {
             var rsp, e_4;
             return __generator(this, function (_a) {
@@ -235,6 +239,7 @@ var ChatRoom = /** @class */ (function () {
                                 method: 'post',
                                 data: {
                                     content: msg,
+                                    client: "".concat(clientType, "/").concat(version),
                                     apiKey: this._apiKey
                                 },
                             })];
@@ -482,7 +487,7 @@ var ChatRoom = /** @class */ (function () {
                             }, 1000 * 60 * 3);
                         };
                         this._rws.onmessage = function (e) { return __awaiter(_this, void 0, void 0, function () {
-                            var msg, data, barragerContent, userAvatarURL, userAvatarURL20, userNickname, barragerColor, userName, userAvatarURL210, userAvatarURL48, oId, time, userName, userNickname, userAvatarURL, content, md, data_1, oId, count, got, whoGive, whoGot;
+                            var msg, data, barragerContent, userAvatarURL, userAvatarURL20, userNickname, barragerColor, userName, userAvatarURL210, userAvatarURL48, oId, time, userName, userNickname, userAvatarURL, content, md, client, data_1, oId, count, got, whoGive, whoGot;
                             return __generator(this, function (_a) {
                                 msg = JSON.parse(e.data);
                                 data = null;
@@ -507,7 +512,7 @@ var ChatRoom = /** @class */ (function () {
                                         break;
                                     }
                                     case 'msg': {
-                                        oId = msg.oId, time = msg.time, userName = msg.userName, userNickname = msg.userNickname, userAvatarURL = msg.userAvatarURL, content = msg.content, md = msg.md;
+                                        oId = msg.oId, time = msg.time, userName = msg.userName, userNickname = msg.userNickname, userAvatarURL = msg.userAvatarURL, content = msg.content, md = msg.md, client = msg.client;
                                         try {
                                             data_1 = JSON.parse(content);
                                             if (data_1.msgType === 'redPacket') {
@@ -516,7 +521,7 @@ var ChatRoom = /** @class */ (function () {
                                             }
                                         }
                                         catch (e) { }
-                                        data = { oId: oId, time: time, userName: userName, userNickname: userNickname, userAvatarURL: userAvatarURL, content: content, md: md };
+                                        data = { oId: oId, time: time, userName: userName, userNickname: userNickname, userAvatarURL: userAvatarURL, content: content, md: md, client: client, via: (0, utils_1.clientToVia)(client) };
                                         break;
                                     }
                                     case 'redPacketStatus': {

package/lib/index.js

@@ -62,7 +62,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FingerTo = void 0;
-var crypto = __importStar(require("crypto"));
 var utils_1 = require("./utils");
 var chatroom_1 = __importDefault(require("./chatroom"));
 var notice_1 = __importDefault(require("./notice"));
@@ -72,6 +71,7 @@ var article_1 = __importDefault(require("./article"));
 var chat_1 = __importDefault(require("./chat"));
 var breezemoon_1 = __importDefault(require("./breezemoon"));
 var finger_1 = require("./finger");
+var js_md5_1 = __importDefault(require("js-md5"));
 var FishPi = /** @class */ (function () {
     /**
      * 构造一个 API 请求对象
@@ -145,18 +145,17 @@ var FishPi = /** @class */ (function () {
      */
     FishPi.prototype.login = function (data) {
         return __awaiter(this, void 0, void 0, function () {
-            var md5, rsp, e_1;
+            var rsp, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        md5 = crypto.createHash('md5');
                         return [4 /*yield*/, (0, utils_1.request)({
                                 url: 'api/getKey',
                                 method: 'post',
                                 data: {
                                     nameOrEmail: data.username,
-                                    userPassword: md5.update(data.passwd).digest('hex'),
+                                    userPassword: (0, js_md5_1.default)(data.passwd),
                                     mfaCode: data.mfaCode
                                 },
                             })];

package/lib/typing.d.ts

@@ -539,6 +539,64 @@ export interface Metal extends MetalBase {
  * 徽章列表
  */
 export declare type MetalList = Array<Metal>;
+export declare enum ClientType {
+    /**
+     * 网页端
+     */
+    Web = "Web",
+    /**
+     * PC 端
+     */
+    PC = "PC",
+    /**
+     * 移动端聊天室
+     */
+    Mobile = "Mobile",
+    /**
+     * Windows 客户端
+     */
+    Windows = "Windows",
+    /**
+     * macOS 客户端
+     */
+    macOS = "macOS",
+    /**
+     * iOS 客户端
+     */
+    iOS = "iOS",
+    /**
+     * Android 客户端
+     */
+    Android = "Android",
+    /**
+     * IDEA 插件
+     */
+    IDEA = "IDEA",
+    /**
+     * Chrome 插件
+     */
+    Chrome = "Chrome",
+    /**
+     * Edge 插件
+     */
+    Edge = "Edge",
+    /**
+     * VSCode 插件
+     */
+    VSCode = "VSCode",
+    /**
+     * Python 插件
+     */
+    Python = "Python",
+    /**
+     * Golang 插件
+     */
+    Golang = "Golang",
+    /**
+     * 其他插件
+     */
+    Other = "Other"
+}
 /**
  * 聊天室消息
  */
@@ -563,6 +621,23 @@ export interface ChatRoomMessage {
      * 用户徽章
      */
     sysMetal: MetalList;
+    /**
+     * 消息来源
+     */
+    client: string;
+    /**
+     * 消息来源解析
+     */
+    via: {
+        /**
+         * 消息来源
+         */
+        client: ClientType | string;
+        /**
+         * 消息来源版本
+         */
+        version: string;
+    };
     /**
      * 消息内容
      */
@@ -715,6 +790,23 @@ export interface ChatMsg {
      * 消息内容 Markdown
      */
     md: string;
+    /**
+     * 消息来源
+     */
+    client: string;
+    /**
+     * 消息来源解析
+     */
+    via: {
+        /**
+         * 消息来源
+         */
+        client: ClientType | string;
+        /**
+         * 消息来源版本
+         */
+        version: string;
+    };
 }
 /**
  * @ 用户列表

package/lib/typing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VoteStatus = exports.ArticleListType = exports.ArticleStatus = exports.YesNoStatus = exports.PublicStatus = exports.ArticleType = exports.ReportType = exports.ReportDataType = exports.NoticeType = exports.ChatRoomMessageType = exports.ChatMessageType = exports.ChatContentType = exports.MetalAttr = exports.RedPacketType = exports.GestureType = exports.UserAppRole = exports.DataType = void 0;
+exports.VoteStatus = exports.ArticleListType = exports.ArticleStatus = exports.YesNoStatus = exports.PublicStatus = exports.ArticleType = exports.ReportType = exports.ReportDataType = exports.NoticeType = exports.ChatRoomMessageType = exports.ChatMessageType = exports.ChatContentType = exports.ClientType = exports.MetalAttr = exports.RedPacketType = exports.GestureType = exports.UserAppRole = exports.DataType = void 0;
 /**
  * 数据类型
  */
@@ -215,6 +215,65 @@ var MetalAttr = /** @class */ (function () {
     return MetalAttr;
 }());
 exports.MetalAttr = MetalAttr;
+var ClientType;
+(function (ClientType) {
+    /**
+     * 网页端
+     */
+    ClientType["Web"] = "Web";
+    /**
+     * PC 端
+     */
+    ClientType["PC"] = "PC";
+    /**
+     * 移动端聊天室
+     */
+    ClientType["Mobile"] = "Mobile";
+    /**
+     * Windows 客户端
+     */
+    ClientType["Windows"] = "Windows";
+    /**
+     * macOS 客户端
+     */
+    ClientType["macOS"] = "macOS";
+    /**
+     * iOS 客户端
+     */
+    ClientType["iOS"] = "iOS";
+    /**
+     * Android 客户端
+     */
+    ClientType["Android"] = "Android";
+    /**
+     * IDEA 插件
+     */
+    ClientType["IDEA"] = "IDEA";
+    /**
+     * Chrome 插件
+     */
+    ClientType["Chrome"] = "Chrome";
+    /**
+     * Edge 插件
+     */
+    ClientType["Edge"] = "Edge";
+    /**
+     * VSCode 插件
+     */
+    ClientType["VSCode"] = "VSCode";
+    /**
+     * Python 插件
+     */
+    ClientType["Python"] = "Python";
+    /**
+     * Golang 插件
+     */
+    ClientType["Golang"] = "Golang";
+    /**
+     * 其他插件
+     */
+    ClientType["Other"] = "Other";
+})(ClientType = exports.ClientType || (exports.ClientType = {}));
 /**
  * 历史消息类型
  */

package/lib/utils.d.ts

@@ -4,5 +4,9 @@ declare function setDomain(d: string): void;
 declare function request(opt: any): Promise<any>;
 declare function analyzeMetalAttr(m: any): Metal;
 declare function toMetal(sysMetal: string): MetalList;
+declare function clientToVia(client: string): {
+    client: string;
+    version: string;
+} | undefined;
 declare const isBrowse: boolean;
-export { request, domain, toMetal, analyzeMetalAttr, isBrowse, setDomain };
+export { request, domain, toMetal, analyzeMetalAttr, isBrowse, setDomain, clientToVia };

package/lib/utils.js

@@ -55,7 +55,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setDomain = exports.isBrowse = exports.analyzeMetalAttr = exports.toMetal = exports.domain = exports.request = void 0;
+exports.clientToVia = exports.setDomain = exports.isBrowse = exports.analyzeMetalAttr = exports.toMetal = exports.domain = exports.request = void 0;
 var domain = 'fishpi.cn';
 exports.domain = domain;
 function setDomain(d) {
@@ -144,5 +144,12 @@ function toMetal(sysMetal) {
     }
 }
 exports.toMetal = toMetal;
+function clientToVia(client) {
+    if (!client)
+        return;
+    var via = client.split('/');
+    return { client: via[0], version: via[1] };
+}
+exports.clientToVia = clientToVia;
 var isBrowse = typeof window !== 'undefined';
 exports.isBrowse = isBrowse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fishpi",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "A Package to use API of fishpi.",
   "main": "./lib/index.js",
   "files": [
@@ -32,7 +32,9 @@
   },
   "homepage": "https://github.com/imlinhanchao/fishpi-api-package#readme",
   "dependencies": {
+    "@types/js-md5": "^0.7.0",
     "form-data": "^4.0.0",
+    "js-md5": "^0.7.3",
     "reconnecting-websocket": "^4.4.0",
     "ws": "^8.4.2"
   },