oicq-icalingua-plus-plus 1.23.87 → 1.24.0
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/device.js +51 -0
- package/lib/message/face.js +9 -0
- package/lib/message/parser.js +3 -14
- package/lib/onlinepush.js +9 -6
- package/package.json +3 -3
package/lib/device.js
CHANGED
|
@@ -393,6 +393,45 @@ const apk = {
|
|
|
393
393
|
ssover: 21,
|
|
394
394
|
qua: 'V1_AND_SQ_8.9.85_4766_YYB_D',
|
|
395
395
|
},
|
|
396
|
+
|
|
397
|
+
//android phone 8.9.88
|
|
398
|
+
35: {
|
|
399
|
+
...DEFAULT_ANDROID_APK_INFO,
|
|
400
|
+
name: "A8.9.88.46a07457",
|
|
401
|
+
version: "8.9.88.13035",
|
|
402
|
+
ver: "8.9.88",
|
|
403
|
+
buildtime: 1697015435,
|
|
404
|
+
subid: 537182769,
|
|
405
|
+
sdkver: "6.0.0.2556",
|
|
406
|
+
ssover: 21,
|
|
407
|
+
qua: 'V1_AND_SQ_8.9.88_4852_YYB_D',
|
|
408
|
+
},
|
|
409
|
+
|
|
410
|
+
//android phone 8.9.93
|
|
411
|
+
37: {
|
|
412
|
+
...DEFAULT_ANDROID_APK_INFO,
|
|
413
|
+
name: "A8.9.93.bf80f08f",
|
|
414
|
+
version: "8.9.93.13475",
|
|
415
|
+
ver: "8.9.93",
|
|
416
|
+
buildtime: 1697015435,
|
|
417
|
+
subid: 537187398,
|
|
418
|
+
sdkver: "6.0.0.2556",
|
|
419
|
+
ssover: 21,
|
|
420
|
+
qua: 'V1_AND_SQ_8.9.93_5028_YYB_D',
|
|
421
|
+
},
|
|
422
|
+
|
|
423
|
+
//android phone 9.0.0
|
|
424
|
+
39: {
|
|
425
|
+
...DEFAULT_ANDROID_APK_INFO,
|
|
426
|
+
name: "A9.0.0.0ebb1ecb",
|
|
427
|
+
version: "9.0.0.14110",
|
|
428
|
+
ver: "9.0.0",
|
|
429
|
+
buildtime: 1701164403,
|
|
430
|
+
subid: 537194351,
|
|
431
|
+
sdkver: "6.0.0.2557",
|
|
432
|
+
ssover: 21,
|
|
433
|
+
qua: 'V1_AND_SQ_9.0.0_5282_YYB_D',
|
|
434
|
+
},
|
|
396
435
|
};
|
|
397
436
|
|
|
398
437
|
//apad
|
|
@@ -451,6 +490,18 @@ apk[32].subid = 537178685;
|
|
|
451
490
|
apk[34] = { ...apk[33] };
|
|
452
491
|
apk[34].subid = 537180607;
|
|
453
492
|
|
|
493
|
+
//apad 8.9.88
|
|
494
|
+
apk[36] = { ...apk[35] };
|
|
495
|
+
apk[36].subid = 537182808;
|
|
496
|
+
|
|
497
|
+
//apad 8.9.93
|
|
498
|
+
apk[38] = { ...apk[37] };
|
|
499
|
+
apk[38].subid = 537187437;
|
|
500
|
+
|
|
501
|
+
//apad 9.0.0
|
|
502
|
+
apk[40] = { ...apk[39] };
|
|
503
|
+
apk[40].subid = 537194390;
|
|
504
|
+
|
|
454
505
|
//ipad
|
|
455
506
|
apk[5] = { ...apk[1] };
|
|
456
507
|
apk[5].subid = 537155074;
|
package/lib/message/face.js
CHANGED
|
@@ -276,6 +276,15 @@ const map = {
|
|
|
276
276
|
346: "/你真棒棒",
|
|
277
277
|
347: "/大展宏兔",
|
|
278
278
|
348: "/福萝卜",
|
|
279
|
+
349: "/坚强",
|
|
280
|
+
350: "/贴贴",
|
|
281
|
+
351: "/敲敲",
|
|
282
|
+
352: "/咦",
|
|
283
|
+
353: "/拜托",
|
|
284
|
+
354: "/尊嘟假嘟",
|
|
285
|
+
355: "/耶",
|
|
286
|
+
356: "/666",
|
|
287
|
+
357: "/裂开",
|
|
279
288
|
358: "/骰子",
|
|
280
289
|
359: "/包剪锤",
|
|
281
290
|
};
|
package/lib/message/parser.js
CHANGED
|
@@ -493,25 +493,14 @@ class Parser {
|
|
|
493
493
|
data.url = await offNTPicDown.call(this.c, this.uid, elem[2]);
|
|
494
494
|
} else if (elem[7].toHex) { //私图
|
|
495
495
|
data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
|
|
496
|
-
if (elem[
|
|
497
|
-
data.url = "https://c2cpicdw.qpic.cn" + elem[15];
|
|
498
|
-
else if (elem[10]) {
|
|
496
|
+
if (elem[10]) {
|
|
499
497
|
if (elem[23])
|
|
500
498
|
data.url = await groupNTPicDown.call(this.c, this.gid, elem[23], elem[7]);
|
|
501
499
|
else
|
|
502
500
|
data.url = await offNTPicDown.call(this.c, this.uid, elem[10]);
|
|
503
501
|
}
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
const keys = Object.keys(elem).reverse();
|
|
507
|
-
for (let key of keys) {
|
|
508
|
-
if (elem[key].toString || elem[key].toString().length !== 16) {
|
|
509
|
-
data.url = await offNTPicDown.call(this.c, this.uid, String(elem[key]));
|
|
510
|
-
break;
|
|
511
|
-
}
|
|
512
|
-
}
|
|
513
|
-
}
|
|
514
|
-
*/
|
|
502
|
+
else if (elem[15])
|
|
503
|
+
data.url = "https://c2cpicdw.qpic.cn" + elem[15];
|
|
515
504
|
} else { //群图
|
|
516
505
|
data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
|
|
517
506
|
if (elem[16])
|
package/lib/onlinepush.js
CHANGED
|
@@ -680,14 +680,13 @@ function rebuildFragments(msg) {
|
|
|
680
680
|
*/
|
|
681
681
|
async function NTMsgListener(blob, seq) {
|
|
682
682
|
// WIP: NT消息
|
|
683
|
-
let msg;
|
|
684
683
|
const o = pb.decode(blob);
|
|
685
684
|
const type = o[1][2][1];
|
|
686
685
|
this.logger.debug("NT message type", type);
|
|
687
686
|
switch (type) {
|
|
688
687
|
case 82: //群聊消息
|
|
689
|
-
msg = groupNTMsgConverter.call(this, o);
|
|
690
688
|
try {
|
|
689
|
+
const msg = groupNTMsgConverter.call(this, o);
|
|
691
690
|
//生成消息id
|
|
692
691
|
const head = msg[1], content = msg[2], body = msg[3];
|
|
693
692
|
if (head[9][2] === 127) return;
|
|
@@ -720,8 +719,8 @@ async function NTMsgListener(blob, seq) {
|
|
|
720
719
|
case 167: //单向好友
|
|
721
720
|
case 208: //好友语音
|
|
722
721
|
case 529: //离线文件
|
|
723
|
-
msg = c2cNTMsgConverter.call(this, o);
|
|
724
722
|
try {
|
|
723
|
+
const msg = c2cNTMsgConverter.call(this, o);
|
|
725
724
|
const data = await parseC2CMsg.call(this, msg, true);
|
|
726
725
|
if (data.user_id === this.uin) {
|
|
727
726
|
data.user_id = msg[1][2];
|
|
@@ -741,24 +740,28 @@ async function NTMsgListener(blob, seq) {
|
|
|
741
740
|
case 84: //群请求
|
|
742
741
|
case 87: //群邀请
|
|
743
742
|
case 525: //群请求(来自群员的邀请)
|
|
744
|
-
return sysmsg.getNewGroup.call(this);
|
|
743
|
+
return sysmsg.getNewGroup.call(this);
|
|
745
744
|
case 187: //好友请求
|
|
746
745
|
case 191: //单向好友增加
|
|
747
746
|
return sysmsg.getNewFriend.call(this);
|
|
748
747
|
case 528: //push528
|
|
749
|
-
{
|
|
748
|
+
try {
|
|
750
749
|
const type = o[1][2][3], buf = o[1][3][2]._raw, time = o[1][2][6];
|
|
751
750
|
if (typeof push528[type] === "function")
|
|
752
751
|
push528[type].call(this, buf, time, o[1][1][1]);
|
|
752
|
+
} catch (e) {
|
|
753
|
+
this.logger.debug(e);
|
|
753
754
|
}
|
|
754
755
|
break;
|
|
755
756
|
case 732: //push732
|
|
756
|
-
{
|
|
757
|
+
try {
|
|
757
758
|
const group_id = o[1][1][1];
|
|
758
759
|
const type = o[1][2][3], buf = o[1][3][2]._raw, time = o[1][2][6];
|
|
759
760
|
if (type === 0x0C) break;
|
|
760
761
|
if (typeof push732[type] === "function")
|
|
761
762
|
push732[type].call(this, group_id, buf, time);
|
|
763
|
+
} catch (e) {
|
|
764
|
+
this.logger.debug(e);
|
|
762
765
|
}
|
|
763
766
|
break;
|
|
764
767
|
// WIP: NT的系统消息
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oicq-icalingua-plus-plus",
|
|
3
3
|
"app_name": "oicq-icalingua-plus-plus",
|
|
4
|
-
"version": "1.
|
|
5
|
-
"app_version": "1.
|
|
6
|
-
"upday": "
|
|
4
|
+
"version": "1.24.0",
|
|
5
|
+
"app_version": "1.24.0",
|
|
6
|
+
"upday": "2024/01/05",
|
|
7
7
|
"protocol_version": "v11",
|
|
8
8
|
"description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
|
|
9
9
|
"main": "index.js",
|