fishpi 0.0.20 → 0.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/{src/article.d.ts → article.d.ts} +16 -5
- package/lib/{src/article.js → article.js} +56 -39
- package/lib/{src/breezemoon.js → breezemoon.js} +3 -3
- package/lib/{src/chat.js → chat.js} +12 -8
- package/lib/{src/chatroom.d.ts → chatroom.d.ts} +3 -3
- package/lib/{src/chatroom.js → chatroom.js} +25 -27
- package/lib/{src/comment.js → comment.js} +6 -21
- package/lib/{src/emoji.js → emoji.js} +178 -184
- package/lib/{src/index.d.ts → index.d.ts} +2 -0
- package/lib/{src/index.js → index.js} +40 -20
- package/lib/{src/notice.d.ts → notice.d.ts} +3 -3
- package/lib/{src/notice.js → notice.js} +6 -6
- package/lib/{src/typing.d.ts → typing.d.ts} +204 -57
- package/lib/{src/typing.js → typing.js} +36 -1
- package/lib/{src/user.js → user.js} +8 -26
- package/lib/{src/utils.d.ts → utils.d.ts} +3 -2
- package/lib/{src/utils.js → utils.js} +52 -33
- package/package.json +53 -48
- /package/lib/{src/breezemoon.d.ts → breezemoon.d.ts} +0 -0
- /package/lib/{src/chat.d.ts → chat.d.ts} +0 -0
- /package/lib/{src/comment.d.ts → comment.d.ts} +0 -0
- /package/lib/{src/emoji.d.ts → emoji.d.ts} +0 -0
- /package/lib/{src/user.d.ts → user.d.ts} +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiResponse, ArticlePost, ArticleListType, ArticleDetail, VoteStatus } from './typing';
|
|
1
|
+
import { ApiResponse, ArticlePost, ArticleListType, ArticleDetail, VoteStatus, ArticleList } from './typing';
|
|
2
2
|
declare class Article {
|
|
3
3
|
private _apiKey;
|
|
4
4
|
constructor(token?: string);
|
|
@@ -34,15 +34,26 @@ declare class Article {
|
|
|
34
34
|
* @param tag 指定查询标签,可选
|
|
35
35
|
* @returns 文章列表
|
|
36
36
|
*/
|
|
37
|
-
list(type
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
list({ type, page, tag }: {
|
|
38
|
+
type: ArticleListType;
|
|
39
|
+
page?: number;
|
|
40
|
+
tag?: string;
|
|
41
|
+
}): Promise<ApiResponse<ArticleList>>;
|
|
42
|
+
/**
|
|
43
|
+
* 查询用户文章列表
|
|
44
|
+
* @param userName 用户名
|
|
45
|
+
* @returns 文章列表
|
|
46
|
+
*/
|
|
47
|
+
userArticles({ userName, page }: {
|
|
48
|
+
userName: string;
|
|
49
|
+
page: number;
|
|
50
|
+
}): Promise<ApiResponse<ArticleList>>;
|
|
40
51
|
/**
|
|
41
52
|
* 获取文章详情
|
|
42
53
|
* @param id 文章id
|
|
43
54
|
* @returns 文章详情
|
|
44
55
|
*/
|
|
45
|
-
detail(id: string): Promise<ApiResponse<{
|
|
56
|
+
detail(id: string, p?: number): Promise<ApiResponse<{
|
|
46
57
|
article: ArticleDetail;
|
|
47
58
|
}>>;
|
|
48
59
|
/**
|
|
@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
25
25
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
26
|
function step(op) {
|
|
27
27
|
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
-
while (_) try {
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
29
|
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;
|
|
30
30
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
31
|
switch (op[0]) {
|
|
@@ -83,10 +83,7 @@ var Article = /** @class */ (function () {
|
|
|
83
83
|
})];
|
|
84
84
|
case 1:
|
|
85
85
|
rsp = _a.sent();
|
|
86
|
-
|
|
87
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
88
|
-
}
|
|
89
|
-
return [2 /*return*/, rsp.data];
|
|
86
|
+
return [2 /*return*/, rsp];
|
|
90
87
|
case 2:
|
|
91
88
|
e_1 = _a.sent();
|
|
92
89
|
throw e_1;
|
|
@@ -115,10 +112,7 @@ var Article = /** @class */ (function () {
|
|
|
115
112
|
})];
|
|
116
113
|
case 1:
|
|
117
114
|
rsp = _a.sent();
|
|
118
|
-
|
|
119
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
120
|
-
}
|
|
121
|
-
return [2 /*return*/, rsp.data];
|
|
115
|
+
return [2 /*return*/, rsp];
|
|
122
116
|
case 2:
|
|
123
117
|
e_2 = _a.sent();
|
|
124
118
|
throw e_2;
|
|
@@ -133,55 +127,84 @@ var Article = /** @class */ (function () {
|
|
|
133
127
|
* @param tag 指定查询标签,可选
|
|
134
128
|
* @returns 文章列表
|
|
135
129
|
*/
|
|
136
|
-
Article.prototype.list = function (
|
|
130
|
+
Article.prototype.list = function (_a) {
|
|
131
|
+
var type = _a.type, _b = _a.page, page = _b === void 0 ? 1 : _b, tag = _a.tag;
|
|
137
132
|
return __awaiter(this, void 0, void 0, function () {
|
|
138
133
|
var rsp, e_3;
|
|
139
|
-
return __generator(this, function (
|
|
140
|
-
switch (
|
|
134
|
+
return __generator(this, function (_c) {
|
|
135
|
+
switch (_c.label) {
|
|
141
136
|
case 0:
|
|
142
|
-
|
|
137
|
+
_c.trys.push([0, 2, , 3]);
|
|
143
138
|
return [4 /*yield*/, (0, utils_1.request)({
|
|
144
|
-
url: "articles/".concat(tag !== undefined ? "tag/".concat(tag) : 'recent').concat(type, "?
|
|
139
|
+
url: "api/articles/".concat(tag !== undefined ? "tag/".concat(tag) : 'recent').concat(type, "?p=").concat(page, "&").concat(this._apiKey ? "apiKey=".concat(this._apiKey) : ''),
|
|
145
140
|
})];
|
|
146
141
|
case 1:
|
|
147
|
-
rsp =
|
|
148
|
-
return [2 /*return*/, rsp
|
|
142
|
+
rsp = _c.sent();
|
|
143
|
+
return [2 /*return*/, rsp];
|
|
149
144
|
case 2:
|
|
150
|
-
e_3 =
|
|
145
|
+
e_3 = _c.sent();
|
|
151
146
|
throw e_3;
|
|
152
147
|
case 3: return [2 /*return*/];
|
|
153
148
|
}
|
|
154
149
|
});
|
|
155
150
|
});
|
|
156
151
|
};
|
|
152
|
+
/**
|
|
153
|
+
* 查询用户文章列表
|
|
154
|
+
* @param userName 用户名
|
|
155
|
+
* @returns 文章列表
|
|
156
|
+
*/
|
|
157
|
+
Article.prototype.userArticles = function (_a) {
|
|
158
|
+
var userName = _a.userName, _b = _a.page, page = _b === void 0 ? 1 : _b;
|
|
159
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
160
|
+
var rsp, e_4;
|
|
161
|
+
return __generator(this, function (_c) {
|
|
162
|
+
switch (_c.label) {
|
|
163
|
+
case 0:
|
|
164
|
+
_c.trys.push([0, 2, , 3]);
|
|
165
|
+
return [4 /*yield*/, (0, utils_1.request)({
|
|
166
|
+
url: "api/articles/".concat(userName, "/articles?p=").concat(page, "&").concat(this._apiKey ? "apiKey=".concat(this._apiKey) : ''),
|
|
167
|
+
})];
|
|
168
|
+
case 1:
|
|
169
|
+
rsp = _c.sent();
|
|
170
|
+
return [2 /*return*/, rsp];
|
|
171
|
+
case 2:
|
|
172
|
+
e_4 = _c.sent();
|
|
173
|
+
throw e_4;
|
|
174
|
+
case 3: return [2 /*return*/];
|
|
175
|
+
}
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
};
|
|
157
179
|
/**
|
|
158
180
|
* 获取文章详情
|
|
159
181
|
* @param id 文章id
|
|
160
182
|
* @returns 文章详情
|
|
161
183
|
*/
|
|
162
|
-
Article.prototype.detail = function (id) {
|
|
184
|
+
Article.prototype.detail = function (id, p) {
|
|
185
|
+
if (p === void 0) { p = 1; }
|
|
163
186
|
return __awaiter(this, void 0, void 0, function () {
|
|
164
|
-
var rsp, i, i,
|
|
187
|
+
var rsp, i, i, e_5;
|
|
165
188
|
return __generator(this, function (_a) {
|
|
166
189
|
switch (_a.label) {
|
|
167
190
|
case 0:
|
|
168
191
|
_a.trys.push([0, 2, , 3]);
|
|
169
192
|
return [4 /*yield*/, (0, utils_1.request)({
|
|
170
|
-
url: "article/".concat(id, "?apiKey=").concat(this._apiKey),
|
|
193
|
+
url: "api/article/".concat(id, "?apiKey=").concat(this._apiKey, "&p=").concat(p),
|
|
171
194
|
})];
|
|
172
195
|
case 1:
|
|
173
196
|
rsp = _a.sent();
|
|
174
|
-
rsp.
|
|
197
|
+
rsp.articleAuthor.sysMetal = (0, utils_1.analyzeMetalAttr)(rsp.data.articleAuthor.sysMetal);
|
|
175
198
|
for (i = 0; i < rsp.data.articleComments.length; i++) {
|
|
176
|
-
rsp.
|
|
199
|
+
rsp.articleComments[i].sysMetal = (0, utils_1.analyzeMetalAttr)(rsp.data.articleComments[i].sysMetal);
|
|
177
200
|
}
|
|
178
201
|
for (i = 0; i < rsp.data.articleNiceComments.length; i++) {
|
|
179
|
-
rsp.
|
|
202
|
+
rsp.articleNiceComments[i].sysMetal = (0, utils_1.analyzeMetalAttr)(rsp.data.articleNiceComments[i].sysMetal);
|
|
180
203
|
}
|
|
181
|
-
return [2 /*return*/, rsp
|
|
204
|
+
return [2 /*return*/, rsp];
|
|
182
205
|
case 2:
|
|
183
|
-
|
|
184
|
-
throw
|
|
206
|
+
e_5 = _a.sent();
|
|
207
|
+
throw e_5;
|
|
185
208
|
case 3: return [2 /*return*/];
|
|
186
209
|
}
|
|
187
210
|
});
|
|
@@ -194,7 +217,7 @@ var Article = /** @class */ (function () {
|
|
|
194
217
|
*/
|
|
195
218
|
Article.prototype.vote = function (id) {
|
|
196
219
|
return __awaiter(this, void 0, void 0, function () {
|
|
197
|
-
var rsp,
|
|
220
|
+
var rsp, e_6;
|
|
198
221
|
return __generator(this, function (_a) {
|
|
199
222
|
switch (_a.label) {
|
|
200
223
|
case 0:
|
|
@@ -209,13 +232,10 @@ var Article = /** @class */ (function () {
|
|
|
209
232
|
})];
|
|
210
233
|
case 1:
|
|
211
234
|
rsp = _a.sent();
|
|
212
|
-
|
|
213
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
214
|
-
}
|
|
215
|
-
return [2 /*return*/, rsp.data];
|
|
235
|
+
return [2 /*return*/, rsp];
|
|
216
236
|
case 2:
|
|
217
|
-
|
|
218
|
-
throw
|
|
237
|
+
e_6 = _a.sent();
|
|
238
|
+
throw e_6;
|
|
219
239
|
case 3: return [2 /*return*/];
|
|
220
240
|
}
|
|
221
241
|
});
|
|
@@ -223,7 +243,7 @@ var Article = /** @class */ (function () {
|
|
|
223
243
|
};
|
|
224
244
|
Article.prototype.thank = function (id) {
|
|
225
245
|
return __awaiter(this, void 0, void 0, function () {
|
|
226
|
-
var rsp,
|
|
246
|
+
var rsp, e_7;
|
|
227
247
|
return __generator(this, function (_a) {
|
|
228
248
|
switch (_a.label) {
|
|
229
249
|
case 0:
|
|
@@ -237,13 +257,10 @@ var Article = /** @class */ (function () {
|
|
|
237
257
|
})];
|
|
238
258
|
case 1:
|
|
239
259
|
rsp = _a.sent();
|
|
240
|
-
if (rsp.status === 401) {
|
|
241
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
242
|
-
}
|
|
243
260
|
return [2 /*return*/, rsp.data];
|
|
244
261
|
case 2:
|
|
245
|
-
|
|
246
|
-
throw
|
|
262
|
+
e_7 = _a.sent();
|
|
263
|
+
throw e_7;
|
|
247
264
|
case 3: return [2 /*return*/];
|
|
248
265
|
}
|
|
249
266
|
});
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
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;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -72,7 +72,7 @@ var Breezemoon = /** @class */ (function () {
|
|
|
72
72
|
})];
|
|
73
73
|
case 1:
|
|
74
74
|
rsp = _a.sent();
|
|
75
|
-
return [2 /*return*/, rsp
|
|
75
|
+
return [2 /*return*/, rsp];
|
|
76
76
|
case 2:
|
|
77
77
|
e_1 = _a.sent();
|
|
78
78
|
throw e_1;
|
|
@@ -102,7 +102,7 @@ var Breezemoon = /** @class */ (function () {
|
|
|
102
102
|
})];
|
|
103
103
|
case 1:
|
|
104
104
|
rsp = _a.sent();
|
|
105
|
-
return [2 /*return*/, rsp
|
|
105
|
+
return [2 /*return*/, rsp];
|
|
106
106
|
case 2:
|
|
107
107
|
e_2 = _a.sent();
|
|
108
108
|
throw e_2;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -33,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
33
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
34
38
|
function step(op) {
|
|
35
39
|
if (f) throw new TypeError("Generator is already executing.");
|
|
36
|
-
while (_) try {
|
|
40
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
37
41
|
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;
|
|
38
42
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
39
43
|
switch (op[0]) {
|
|
@@ -97,7 +101,7 @@ var Chat = /** @class */ (function () {
|
|
|
97
101
|
if (rsp.status === 401) {
|
|
98
102
|
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
99
103
|
}
|
|
100
|
-
rsp = rsp
|
|
104
|
+
rsp = rsp;
|
|
101
105
|
return [2 /*return*/, rsp];
|
|
102
106
|
case 2:
|
|
103
107
|
e_1 = _a.sent();
|
|
@@ -128,7 +132,7 @@ var Chat = /** @class */ (function () {
|
|
|
128
132
|
if (rsp.status === 401) {
|
|
129
133
|
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
130
134
|
}
|
|
131
|
-
rsp = rsp
|
|
135
|
+
rsp = rsp;
|
|
132
136
|
if (param.autoRead)
|
|
133
137
|
this.markRead(param.user);
|
|
134
138
|
return [2 /*return*/, rsp];
|
|
@@ -160,7 +164,7 @@ var Chat = /** @class */ (function () {
|
|
|
160
164
|
if (rsp.status === 401) {
|
|
161
165
|
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
162
166
|
}
|
|
163
|
-
rsp = rsp
|
|
167
|
+
rsp = rsp;
|
|
164
168
|
return [2 /*return*/, rsp];
|
|
165
169
|
case 2:
|
|
166
170
|
e_3 = _a.sent();
|
|
@@ -189,7 +193,7 @@ var Chat = /** @class */ (function () {
|
|
|
189
193
|
if (rsp.status === 401) {
|
|
190
194
|
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
191
195
|
}
|
|
192
|
-
rsp = rsp
|
|
196
|
+
rsp = rsp;
|
|
193
197
|
return [2 /*return*/, rsp];
|
|
194
198
|
case 2:
|
|
195
199
|
e_4 = _a.sent();
|
|
@@ -253,8 +257,8 @@ var Chat = /** @class */ (function () {
|
|
|
253
257
|
_b = user;
|
|
254
258
|
_c = reconnecting_websocket_1.default.bind;
|
|
255
259
|
_d = [void 0, user ?
|
|
256
|
-
"wss://".concat(utils_1.domain, "chat-channel?apiKey=").concat(this._apiKey, "&toUser=").concat(user)
|
|
257
|
-
: "wss://".concat(utils_1.domain, "user-channel?apiKey=").concat(this._apiKey), []];
|
|
260
|
+
"wss://".concat(utils_1.domain, "/chat-channel?apiKey=").concat(this._apiKey, "&toUser=").concat(user)
|
|
261
|
+
: "wss://".concat(utils_1.domain, "/user-channel?apiKey=").concat(this._apiKey), []];
|
|
258
262
|
_f = {};
|
|
259
263
|
if (!utils_1.isBrowse) return [3 /*break*/, 1];
|
|
260
264
|
_e = window.WebSocket;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiResponse, ChatContentType, ChatMessageType, ChatRoomMessage, GestureType, RedPacket, RedPacketInfo } from './typing';
|
|
1
|
+
import { ApiResponse, ChatContentType, ChatMessageType, ChatRoomMessage, GestureType, Message, RedPacket, RedPacketInfo } from './typing';
|
|
2
2
|
declare class ChatRoom {
|
|
3
3
|
private _apiKey;
|
|
4
4
|
private _discusse;
|
|
@@ -59,7 +59,7 @@ declare class ChatRoom {
|
|
|
59
59
|
* @param oId 红包消息 Id
|
|
60
60
|
* @param gesture 猜拳类型
|
|
61
61
|
*/
|
|
62
|
-
open(oId: string, gesture?: GestureType
|
|
62
|
+
open(oId: string, gesture?: GestureType): Promise<ApiResponse<RedPacketInfo>>;
|
|
63
63
|
/**
|
|
64
64
|
* 发送一个红包
|
|
65
65
|
* @param redpacket 红包对象
|
|
@@ -75,6 +75,6 @@ declare class ChatRoom {
|
|
|
75
75
|
* 添加聊天室消息监听函数
|
|
76
76
|
* @param wsCallback 消息监听函数
|
|
77
77
|
*/
|
|
78
|
-
addListener(wsCallback:
|
|
78
|
+
addListener(wsCallback: (msg: Message) => void, error?: (ev: any) => void, close?: (ev: any) => void): Promise<void>;
|
|
79
79
|
}
|
|
80
80
|
export default ChatRoom;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -33,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
33
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
34
38
|
function step(op) {
|
|
35
39
|
if (f) throw new TypeError("Generator is already executing.");
|
|
36
|
-
while (_) try {
|
|
40
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
37
41
|
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;
|
|
38
42
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
39
43
|
switch (op[0]) {
|
|
@@ -129,7 +133,6 @@ var ChatRoom = /** @class */ (function () {
|
|
|
129
133
|
if (rsp_1.status === 401) {
|
|
130
134
|
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
131
135
|
}
|
|
132
|
-
rsp_1 = rsp_1.data;
|
|
133
136
|
if (rsp_1.code != 0) {
|
|
134
137
|
throw new Error(rsp_1.msg);
|
|
135
138
|
}
|
|
@@ -168,10 +171,6 @@ var ChatRoom = /** @class */ (function () {
|
|
|
168
171
|
})];
|
|
169
172
|
case 1:
|
|
170
173
|
rsp_2 = _a.sent();
|
|
171
|
-
if (rsp_2.status === 401) {
|
|
172
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
173
|
-
}
|
|
174
|
-
rsp_2 = rsp_2.data;
|
|
175
174
|
if (rsp_2.code != 0) {
|
|
176
175
|
throw new Error(rsp_2.msg);
|
|
177
176
|
}
|
|
@@ -218,10 +217,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
218
217
|
})];
|
|
219
218
|
case 1:
|
|
220
219
|
rsp = _a.sent();
|
|
221
|
-
|
|
222
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
223
|
-
}
|
|
224
|
-
return [2 /*return*/, rsp.data];
|
|
220
|
+
return [2 /*return*/, rsp];
|
|
225
221
|
case 2:
|
|
226
222
|
e_3 = _a.sent();
|
|
227
223
|
throw e_3;
|
|
@@ -251,10 +247,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
251
247
|
})];
|
|
252
248
|
case 1:
|
|
253
249
|
rsp = _a.sent();
|
|
254
|
-
|
|
255
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
256
|
-
}
|
|
257
|
-
return [2 /*return*/, rsp.data];
|
|
250
|
+
return [2 /*return*/, rsp];
|
|
258
251
|
case 2:
|
|
259
252
|
e_4 = _a.sent();
|
|
260
253
|
throw e_4;
|
|
@@ -279,7 +272,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
279
272
|
})];
|
|
280
273
|
case 1:
|
|
281
274
|
rsp = _a.sent();
|
|
282
|
-
return [2 /*return*/, rsp.
|
|
275
|
+
return [2 /*return*/, rsp.replace(/<!--.*?-->/g, '')];
|
|
283
276
|
case 2:
|
|
284
277
|
e_5 = _a.sent();
|
|
285
278
|
throw e_5;
|
|
@@ -319,10 +312,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
319
312
|
})];
|
|
320
313
|
case 1:
|
|
321
314
|
rsp = _a.sent();
|
|
322
|
-
|
|
323
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
324
|
-
}
|
|
325
|
-
return [2 /*return*/, rsp.data];
|
|
315
|
+
return [2 /*return*/, rsp];
|
|
326
316
|
case 2:
|
|
327
317
|
e_6 = _a.sent();
|
|
328
318
|
throw e_6;
|
|
@@ -363,7 +353,9 @@ var ChatRoom = /** @class */ (function () {
|
|
|
363
353
|
* 添加聊天室消息监听函数
|
|
364
354
|
* @param wsCallback 消息监听函数
|
|
365
355
|
*/
|
|
366
|
-
ChatRoom.prototype.addListener = function (wsCallback) {
|
|
356
|
+
ChatRoom.prototype.addListener = function (wsCallback, error, close) {
|
|
357
|
+
if (error === void 0) { error = function (ev) { }; }
|
|
358
|
+
if (close === void 0) { close = function (ev) { }; }
|
|
367
359
|
return __awaiter(this, void 0, void 0, function () {
|
|
368
360
|
var _a, _b, _c, _d;
|
|
369
361
|
var _e;
|
|
@@ -379,7 +371,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
379
371
|
this._wsCallbacks.push(wsCallback);
|
|
380
372
|
_a = this;
|
|
381
373
|
_b = reconnecting_websocket_1.default.bind;
|
|
382
|
-
_c = [void 0, "wss://".concat(utils_1.domain, "chat-room-channel?apiKey=").concat(this._apiKey), []];
|
|
374
|
+
_c = [void 0, "wss://".concat(utils_1.domain, "/chat-room-channel?apiKey=").concat(this._apiKey), []];
|
|
383
375
|
_e = {};
|
|
384
376
|
if (!utils_1.isBrowse) return [3 /*break*/, 1];
|
|
385
377
|
_d = window.WebSocket;
|
|
@@ -404,7 +396,7 @@ var ChatRoom = /** @class */ (function () {
|
|
|
404
396
|
}, 1000 * 60 * 3);
|
|
405
397
|
};
|
|
406
398
|
this._rws.onmessage = function (e) { return __awaiter(_this, void 0, void 0, function () {
|
|
407
|
-
var msg, data, oId, time, userName, userNickname, userAvatarURL, content, md, data_1, oId, count, got, whoGive, whoGot;
|
|
399
|
+
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;
|
|
408
400
|
return __generator(this, function (_a) {
|
|
409
401
|
msg = JSON.parse(e.data);
|
|
410
402
|
data = null;
|
|
@@ -423,6 +415,11 @@ var ChatRoom = /** @class */ (function () {
|
|
|
423
415
|
data = msg.oId;
|
|
424
416
|
break;
|
|
425
417
|
}
|
|
418
|
+
case 'barrager': {
|
|
419
|
+
barragerContent = msg.barragerContent, userAvatarURL = msg.userAvatarURL, userAvatarURL20 = msg.userAvatarURL20, userNickname = msg.userNickname, barragerColor = msg.barragerColor, userName = msg.userName, userAvatarURL210 = msg.userAvatarURL210, userAvatarURL48 = msg.userAvatarURL48;
|
|
420
|
+
data = { barragerContent: barragerContent, userAvatarURL: userAvatarURL, userAvatarURL20: userAvatarURL20, userNickname: userNickname, barragerColor: barragerColor, userName: userName, userAvatarURL210: userAvatarURL210, userAvatarURL48: userAvatarURL48 };
|
|
421
|
+
break;
|
|
422
|
+
}
|
|
426
423
|
case 'msg': {
|
|
427
424
|
oId = msg.oId, time = msg.time, userName = msg.userName, userNickname = msg.userNickname, userAvatarURL = msg.userAvatarURL, content = msg.content, md = msg.md;
|
|
428
425
|
try {
|
|
@@ -446,11 +443,12 @@ var ChatRoom = /** @class */ (function () {
|
|
|
446
443
|
return [2 /*return*/];
|
|
447
444
|
});
|
|
448
445
|
}); };
|
|
449
|
-
this._rws.onerror = function (e) {
|
|
446
|
+
this._rws.onerror = error || (function (e) {
|
|
450
447
|
console.error(e);
|
|
451
|
-
};
|
|
452
|
-
this._rws.onclose = function (e) {
|
|
453
|
-
|
|
448
|
+
});
|
|
449
|
+
this._rws.onclose = close || (function (e) {
|
|
450
|
+
console.log(e);
|
|
451
|
+
});
|
|
454
452
|
return [2 /*return*/];
|
|
455
453
|
}
|
|
456
454
|
});
|
|
@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
25
25
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
26
|
function step(op) {
|
|
27
27
|
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
-
while (_) try {
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
29
|
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;
|
|
30
30
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
31
|
switch (op[0]) {
|
|
@@ -78,10 +78,7 @@ var Comment = /** @class */ (function () {
|
|
|
78
78
|
})];
|
|
79
79
|
case 1:
|
|
80
80
|
rsp = _a.sent();
|
|
81
|
-
|
|
82
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
83
|
-
}
|
|
84
|
-
return [2 /*return*/, rsp.data];
|
|
81
|
+
return [2 /*return*/, rsp];
|
|
85
82
|
case 2:
|
|
86
83
|
e_1 = _a.sent();
|
|
87
84
|
throw e_1;
|
|
@@ -104,10 +101,7 @@ var Comment = /** @class */ (function () {
|
|
|
104
101
|
})];
|
|
105
102
|
case 1:
|
|
106
103
|
rsp = _a.sent();
|
|
107
|
-
|
|
108
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
109
|
-
}
|
|
110
|
-
return [2 /*return*/, rsp.data];
|
|
104
|
+
return [2 /*return*/, rsp];
|
|
111
105
|
case 2:
|
|
112
106
|
e_2 = _a.sent();
|
|
113
107
|
throw e_2;
|
|
@@ -133,10 +127,7 @@ var Comment = /** @class */ (function () {
|
|
|
133
127
|
})];
|
|
134
128
|
case 1:
|
|
135
129
|
rsp = _a.sent();
|
|
136
|
-
|
|
137
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
138
|
-
}
|
|
139
|
-
return [2 /*return*/, rsp.data];
|
|
130
|
+
return [2 /*return*/, rsp];
|
|
140
131
|
case 2:
|
|
141
132
|
e_3 = _a.sent();
|
|
142
133
|
throw e_3;
|
|
@@ -162,10 +153,7 @@ var Comment = /** @class */ (function () {
|
|
|
162
153
|
})];
|
|
163
154
|
case 1:
|
|
164
155
|
rsp = _a.sent();
|
|
165
|
-
|
|
166
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
167
|
-
}
|
|
168
|
-
return [2 /*return*/, rsp.data];
|
|
156
|
+
return [2 /*return*/, rsp];
|
|
169
157
|
case 2:
|
|
170
158
|
e_4 = _a.sent();
|
|
171
159
|
throw e_4;
|
|
@@ -190,10 +178,7 @@ var Comment = /** @class */ (function () {
|
|
|
190
178
|
})];
|
|
191
179
|
case 1:
|
|
192
180
|
rsp = _a.sent();
|
|
193
|
-
|
|
194
|
-
return [2 /*return*/, { code: -1, msg: '登录已失效,请重新登录!' }];
|
|
195
|
-
}
|
|
196
|
-
return [2 /*return*/, rsp.data];
|
|
181
|
+
return [2 /*return*/, rsp];
|
|
197
182
|
case 2:
|
|
198
183
|
e_5 = _a.sent();
|
|
199
184
|
throw e_5;
|