fishpi 0.0.3 → 0.0.7

package/lib/src/index.js

@@ -27,22 +27,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const crypto = __importStar(require("crypto"));
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const utils_1 = require("./utils");
-const chatroom_1 = __importDefault(require("./chatroom"));
-const notice_1 = __importDefault(require("./notice"));
-class FishPi {
+var crypto = __importStar(require("crypto"));
+var fs = __importStar(require("fs"));
+var path = __importStar(require("path"));
+var utils_1 = require("./utils");
+var chatroom_1 = __importDefault(require("./chatroom"));
+var notice_1 = __importDefault(require("./notice"));
+var emoji_1 = __importDefault(require("./emoji"));
+var user_1 = __importDefault(require("./user"));
+var article_1 = __importDefault(require("./article"));
+var chat_1 = __importDefault(require("./chat"));
+var FishPi = /** @class */ (function () {
     /**
      * 构造一个 API 请求对象
      * @param token 接口 API Key，没有可以传空
      */
-    constructor(token = '') {
+    function FishPi(token) {
+        if (token === void 0) { token = ''; }
         /**
          *  请求 API 的 API Key
          */
@@ -55,242 +87,171 @@ class FishPi {
          *  通知接口对象
          */
         this.notice = new notice_1.default();
+        /**
+         *  表情包接口对象
+         */
+        this.emoji = new emoji_1.default();
+        /**
+         *  用户接口对象
+         */
+        this.account = new user_1.default();
+        /**
+         *  文章接口对象
+         */
+        this.article = new article_1.default();
+        /**
+         * 私聊接口对象
+         */
+        this.chat = new chat_1.default();
         if (!token) {
             return;
         }
-        this.apiKey = token;
-        this.chatroom.setToken(this.apiKey);
-        this.notice.setToken(this.apiKey);
+        this.setToken(token);
     }
-    /**
-     * 登录账号返回 API Key
-     * @param data 用户账密
-     */
-    login(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let md5 = crypto.createHash('md5');
-                let rsp = yield (0, utils_1.request)({
-                    url: 'api/getKey',
-                    method: 'post',
-                    data: {
-                        nameOrEmail: data.username,
-                        userPassword: md5.update(data.passwd).digest('hex')
-                    },
-                });
-                this.apiKey = rsp.data.Key;
+    FishPi.prototype.setToken = function (apiKey) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.apiKey = apiKey;
                 this.chatroom.setToken(this.apiKey);
                 this.notice.setToken(this.apiKey);
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+                this.emoji.setToken(this.apiKey);
+                this.account.setToken(this.apiKey);
+                this.article.setToken(this.apiKey);
+                this.chat.setToken(this.apiKey);
+                return [2 /*return*/];
+            });
         });
-    }
+    };
     /**
-     * 返回登录账户信息，需要先登录或设置有效的 api key
+     * 登录账号返回 API Key
+     * @param data 用户账密
      */
-    info() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `api/user?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return { code: -1, msg: '登录已失效，请重新登录！' };
+    FishPi.prototype.login = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var md5, 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'),
+                                    mfaCode: data.mfaCode
+                                },
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        this.setToken(rsp.data.Key);
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_1 = _a.sent();
+                        throw e_1;
+                    case 3: return [2 /*return*/];
                 }
-                if (rsp.data.data)
-                    rsp.data.data.sysMetal = (0, utils_1.toMetal)(rsp.data.data.sysMetal);
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+            });
         });
-    }
+    };
     /**
      * 查询指定用户信息
      * @param username 用户名
      */
-    user(username) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `user/${username}?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return { code: -1, msg: '登录已失效，请重新登录！' };
+    FishPi.prototype.user = function (username) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "user/".concat(username, "?apiKey=").concat(this.apiKey)
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        if (rsp.status === 401) {
+                            return [2 /*return*/, { code: -1, msg: '登录已失效，请重新登录！' }];
+                        }
+                        rsp.data.data.sysMetal = (0, utils_1.toMetal)(rsp.data.data.sysMetal);
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_2 = _a.sent();
+                        throw e_2;
+                    case 3: return [2 /*return*/];
                 }
-                rsp.data.data.sysMetal = (0, utils_1.toMetal)(rsp.data.data.sysMetal);
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+            });
         });
-    }
+    };
     /**
      * 用户名联想，通常用于 @ 列表
      * @param username 用户名
      */
-    names(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `users/names`,
-                    method: 'post',
-                    data: {
-                        name
-                    },
-                });
-                return rsp.data.data;
-            }
-            catch (e) {
-                throw e;
-            }
-        });
-    }
-    /**
-     * 查询登录用户常用表情
-     */
-    emotions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `users/emotions?apiKey=${this.apiKey}`,
-                });
-                if (rsp.status === 401) {
-                    return { code: -1, msg: '登录已失效，请重新登录！' };
+    FishPi.prototype.names = function (name) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "users/names",
+                                method: 'post',
+                                data: {
+                                    name: name
+                                },
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp.data.data];
+                    case 2:
+                        e_3 = _a.sent();
+                        throw e_3;
+                    case 3: return [2 /*return*/];
                 }
-                rsp.data.data = Object.keys(rsp.data.data);
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+            });
         });
-    }
-    /**
-     * 查询登录用户当前活跃度，请求频率请控制在 30 ~ 60 秒一次
-     */
-    liveness() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.apiKey) {
-                return 0;
-            }
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `user/liveness?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return -1;
-                }
-                return rsp.data.liveness || 0;
-            }
-            catch (e) {
-                throw e;
-            }
-        });
-    }
-    /**
-     * 检查登录用户是否已经签到
-     */
-    isCheckIn() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.apiKey) {
-                return false;
-            }
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `user/checkedIn?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return false;
-                }
-                return rsp.data.checkedIn || false;
-            }
-            catch (e) {
-                throw e;
-            }
-        });
-    }
-    /**
-     * 检查登录用户是否已经领取昨日活跃奖励
-     */
-    isCollectedLiveness() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.apiKey) {
-                return false;
-            }
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `api/activity/is-collected-liveness?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return false;
-                }
-                return rsp.data.isCollectedYesterdayLivenessReward || false;
-            }
-            catch (e) {
-                throw e;
-            }
-        });
-    }
-    /**
-     * 领取昨日活跃度奖励
-     */
-    rewardLiveness() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.apiKey) {
-                return 0;
-            }
-            try {
-                let rsp = yield (0, utils_1.request)({
-                    url: `api/activity/yesterday-liveness-reward-api?apiKey=${this.apiKey}`
-                });
-                if (rsp.status === 401) {
-                    return 0;
-                }
-                return rsp.data.sum || 0;
-            }
-            catch (e) {
-                throw e;
-            }
-        });
-    }
+    };
     /**
      * 上传文件
      * @param files 要上传的文件，如果是在 Node 使用，则传入文件路径数组，若是在浏览器使用，则传入文件对象数组。
      */
-    upload(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let data;
-            if (utils_1.isBrowse) {
-                data = new FormData();
-                files.forEach(f => data.append('file[]', f));
-            }
-            else {
-                let FormData = (yield Promise.resolve().then(() => __importStar(require('form-data')))).default;
-                data = new FormData();
-                files.forEach(f => data.append('file[]', fs.readFileSync(f.toString()), path.basename(f.toString())));
-            }
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `upload`,
-                    method: 'post',
-                    data,
-                    headers: utils_1.isBrowse ? undefined : data.getHeaders()
-                });
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+    FishPi.prototype.upload = function (files) {
+        return __awaiter(this, void 0, void 0, function () {
+            var data, FormData_1, rsp, e_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!utils_1.isBrowse) return [3 /*break*/, 1];
+                        data = new FormData();
+                        files.forEach(function (f) { return data.append('file[]', f); });
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('form-data')); })];
+                    case 2:
+                        FormData_1 = (_a.sent()).default;
+                        data = new FormData_1();
+                        files.forEach(function (f) { return data.append('file[]', fs.readFileSync(f.toString()), path.basename(f.toString())); });
+                        _a.label = 3;
+                    case 3:
+                        _a.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "upload",
+                                method: 'post',
+                                data: data,
+                                headers: utils_1.isBrowse ? undefined : data.getHeaders()
+                            })];
+                    case 4:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp.data];
+                    case 5:
+                        e_4 = _a.sent();
+                        throw e_4;
+                    case 6: return [2 /*return*/];
+                }
+            });
         });
-    }
-}
+    };
+    return FishPi;
+}());
 exports.default = FishPi;

package/lib/src/notice.d.ts

@@ -20,9 +20,7 @@ declare class Notice {
      * 已读指定类型消息
      * @param type 消息类型
      */
-    makeRead(type: string): Promise<{
-        code: number;
-    }>;
+    makeRead(type: string): Promise<ApiResponse<undefined>>;
     /**
      * 已读所有消息
      */

package/lib/src/notice.js

@@ -8,10 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
-class Notice {
-    constructor(token = '') {
+var utils_1 = require("./utils");
+var Notice = /** @class */ (function () {
+    function Notice(token) {
+        if (token === void 0) { token = ''; }
         this._apiKey = '';
         if (!token) {
             return;
@@ -22,79 +50,108 @@ class Notice {
      * 重新设置请求 Token
      * @param apiKey 接口 API Key
      */
-    setToken(token) {
+    Notice.prototype.setToken = function (token) {
         this._apiKey = token;
-    }
+    };
     /**
      * 获取未读消息数
      */
-    count() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `notifications/unread/count?apiKey=${this._apiKey}`,
-                });
-                rsp.data.userNotifyStatus = rsp.data.userNotifyStatus != 0;
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+    Notice.prototype.count = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "notifications/unread/count?apiKey=".concat(this._apiKey),
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        rsp.data.userNotifyStatus = rsp.data.userNotifyStatus != 0;
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_1 = _a.sent();
+                        throw e_1;
+                    case 3: return [2 /*return*/];
+                }
+            });
         });
-    }
+    };
     /**
      * 获取消息列表
      * @param type 消息类型
      */
-    list(type) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `api/getNotifications?apiKey=${this._apiKey}&type=${type}`,
-                });
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+    Notice.prototype.list = function (type) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "api/getNotifications?apiKey=".concat(this._apiKey, "&type=").concat(type),
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_2 = _a.sent();
+                        throw e_2;
+                    case 3: return [2 /*return*/];
+                }
+            });
         });
-    }
+    };
     /**
      * 已读指定类型消息
      * @param type 消息类型
      */
-    makeRead(type) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `notifications/make-read/${type}?apiKey=${this._apiKey}`,
-                });
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+    Notice.prototype.makeRead = function (type) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "notifications/make-read/".concat(type, "?apiKey=").concat(this._apiKey),
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_3 = _a.sent();
+                        throw e_3;
+                    case 3: return [2 /*return*/];
+                }
+            });
         });
-    }
+    };
     /**
      * 已读所有消息
      */
-    readAll() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let rsp;
-            try {
-                rsp = yield (0, utils_1.request)({
-                    url: `notifications/all-read?apiKey=${this._apiKey}`,
-                });
-                return rsp.data;
-            }
-            catch (e) {
-                throw e;
-            }
+    Notice.prototype.readAll = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "notifications/all-read?apiKey=".concat(this._apiKey),
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp.data];
+                    case 2:
+                        e_4 = _a.sent();
+                        throw e_4;
+                    case 3: return [2 /*return*/];
+                }
+            });
         });
-    }
-}
+    };
+    return Notice;
+}());
 exports.default = Notice;