@d0v3riz/baileys 6.7.25 → 7.0.0-rc.8

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.
Files changed (218) hide show
  1. package/README.md +53 -50
  2. package/WAProto/GenerateStatics.sh +2 -2
  3. package/WAProto/WAProto.proto +1339 -493
  4. package/WAProto/fix-imports.js +1 -1
  5. package/WAProto/index.d.ts +4585 -44041
  6. package/WAProto/index.js +80831 -148208
  7. package/lib/Defaults/index.d.ts +13 -3
  8. package/lib/Defaults/index.d.ts.map +1 -1
  9. package/lib/Defaults/index.js +27 -13
  10. package/lib/Defaults/index.js.map +1 -1
  11. package/lib/Signal/Group/group_cipher.d.ts +1 -2
  12. package/lib/Signal/Group/group_cipher.d.ts.map +1 -1
  13. package/lib/Signal/Group/group_cipher.js +29 -41
  14. package/lib/Signal/Group/group_cipher.js.map +1 -1
  15. package/lib/Signal/Group/keyhelper.d.ts.map +1 -1
  16. package/lib/Signal/Group/keyhelper.js +0 -1
  17. package/lib/Signal/Group/keyhelper.js.map +1 -1
  18. package/lib/Signal/Group/sender-chain-key.d.ts +1 -1
  19. package/lib/Signal/Group/sender-chain-key.d.ts.map +1 -1
  20. package/lib/Signal/Group/sender-chain-key.js +1 -7
  21. package/lib/Signal/Group/sender-chain-key.js.map +1 -1
  22. package/lib/Signal/Group/sender-key-distribution-message.js +2 -2
  23. package/lib/Signal/Group/sender-key-distribution-message.js.map +1 -1
  24. package/lib/Signal/Group/sender-key-message.d.ts.map +1 -1
  25. package/lib/Signal/Group/sender-key-message.js +0 -1
  26. package/lib/Signal/Group/sender-key-message.js.map +1 -1
  27. package/lib/Signal/Group/sender-key-record.d.ts +1 -1
  28. package/lib/Signal/Group/sender-key-record.d.ts.map +1 -1
  29. package/lib/Signal/Group/sender-key-record.js +2 -11
  30. package/lib/Signal/Group/sender-key-record.js.map +1 -1
  31. package/lib/Signal/Group/sender-key-state.d.ts +4 -4
  32. package/lib/Signal/Group/sender-key-state.d.ts.map +1 -1
  33. package/lib/Signal/Group/sender-key-state.js +21 -33
  34. package/lib/Signal/Group/sender-key-state.js.map +1 -1
  35. package/lib/Signal/Group/sender-message-key.d.ts.map +1 -1
  36. package/lib/Signal/Group/sender-message-key.js +0 -1
  37. package/lib/Signal/Group/sender-message-key.js.map +1 -1
  38. package/lib/Signal/libsignal.d.ts +4 -3
  39. package/lib/Signal/libsignal.d.ts.map +1 -1
  40. package/lib/Signal/libsignal.js +243 -42
  41. package/lib/Signal/libsignal.js.map +1 -1
  42. package/lib/Signal/lid-mapping.d.ts +23 -0
  43. package/lib/Signal/lid-mapping.d.ts.map +1 -0
  44. package/lib/Signal/lid-mapping.js +171 -0
  45. package/lib/Signal/lid-mapping.js.map +1 -0
  46. package/lib/Socket/Client/types.d.ts +2 -2
  47. package/lib/Socket/Client/types.d.ts.map +1 -1
  48. package/lib/Socket/Client/websocket.d.ts +2 -2
  49. package/lib/Socket/Client/websocket.d.ts.map +1 -1
  50. package/lib/Socket/Client/websocket.js +2 -2
  51. package/lib/Socket/Client/websocket.js.map +1 -1
  52. package/lib/Socket/business.d.ts +31 -17
  53. package/lib/Socket/business.d.ts.map +1 -1
  54. package/lib/Socket/business.js +122 -1
  55. package/lib/Socket/business.js.map +1 -1
  56. package/lib/Socket/chats.d.ts +17 -9
  57. package/lib/Socket/chats.d.ts.map +1 -1
  58. package/lib/Socket/chats.js +54 -23
  59. package/lib/Socket/chats.js.map +1 -1
  60. package/lib/Socket/communities.d.ts +41 -14
  61. package/lib/Socket/communities.d.ts.map +1 -1
  62. package/lib/Socket/communities.js +83 -3
  63. package/lib/Socket/communities.js.map +1 -1
  64. package/lib/Socket/groups.d.ts +16 -9
  65. package/lib/Socket/groups.d.ts.map +1 -1
  66. package/lib/Socket/groups.js +14 -11
  67. package/lib/Socket/groups.js.map +1 -1
  68. package/lib/Socket/index.d.ts +41 -14
  69. package/lib/Socket/index.d.ts.map +1 -1
  70. package/lib/Socket/index.js +1 -0
  71. package/lib/Socket/index.js.map +1 -1
  72. package/lib/Socket/messages-recv.d.ts +26 -16
  73. package/lib/Socket/messages-recv.d.ts.map +1 -1
  74. package/lib/Socket/messages-recv.js +512 -311
  75. package/lib/Socket/messages-recv.js.map +1 -1
  76. package/lib/Socket/messages-send.d.ts +27 -16
  77. package/lib/Socket/messages-send.d.ts.map +1 -1
  78. package/lib/Socket/messages-send.js +394 -133
  79. package/lib/Socket/messages-send.js.map +1 -1
  80. package/lib/Socket/newsletter.d.ts +18 -12
  81. package/lib/Socket/newsletter.d.ts.map +1 -1
  82. package/lib/Socket/newsletter.js +3 -1
  83. package/lib/Socket/newsletter.js.map +1 -1
  84. package/lib/Socket/socket.d.ts +13 -3
  85. package/lib/Socket/socket.d.ts.map +1 -1
  86. package/lib/Socket/socket.js +353 -78
  87. package/lib/Socket/socket.js.map +1 -1
  88. package/lib/Types/Auth.d.ts +12 -1
  89. package/lib/Types/Auth.d.ts.map +1 -1
  90. package/lib/Types/Bussines.d.ts +25 -0
  91. package/lib/Types/Bussines.d.ts.map +1 -0
  92. package/lib/Types/Bussines.js +2 -0
  93. package/lib/Types/Bussines.js.map +1 -0
  94. package/lib/Types/Chat.d.ts +5 -0
  95. package/lib/Types/Chat.d.ts.map +1 -1
  96. package/lib/Types/Chat.js.map +1 -1
  97. package/lib/Types/Contact.d.ts +4 -4
  98. package/lib/Types/Contact.d.ts.map +1 -1
  99. package/lib/Types/Events.d.ts +8 -5
  100. package/lib/Types/Events.d.ts.map +1 -1
  101. package/lib/Types/GroupMetadata.d.ts +7 -4
  102. package/lib/Types/GroupMetadata.d.ts.map +1 -1
  103. package/lib/Types/Message.d.ts +38 -12
  104. package/lib/Types/Message.d.ts.map +1 -1
  105. package/lib/Types/Message.js +5 -1
  106. package/lib/Types/Message.js.map +1 -1
  107. package/lib/Types/Signal.d.ts +18 -0
  108. package/lib/Types/Signal.d.ts.map +1 -1
  109. package/lib/Types/Socket.d.ts +24 -13
  110. package/lib/Types/Socket.d.ts.map +1 -1
  111. package/lib/Types/Socket.js.map +1 -1
  112. package/lib/Utils/auth-utils.d.ts +2 -2
  113. package/lib/Utils/auth-utils.d.ts.map +1 -1
  114. package/lib/Utils/auth-utils.js +178 -111
  115. package/lib/Utils/auth-utils.js.map +1 -1
  116. package/lib/Utils/browser-utils.d.ts +4 -0
  117. package/lib/Utils/browser-utils.d.ts.map +1 -0
  118. package/lib/Utils/browser-utils.js +28 -0
  119. package/lib/Utils/browser-utils.js.map +1 -0
  120. package/lib/Utils/chat-utils.d.ts +6 -7
  121. package/lib/Utils/chat-utils.d.ts.map +1 -1
  122. package/lib/Utils/chat-utils.js +19 -2
  123. package/lib/Utils/chat-utils.js.map +1 -1
  124. package/lib/Utils/crypto.d.ts +6 -6
  125. package/lib/Utils/crypto.d.ts.map +1 -1
  126. package/lib/Utils/crypto.js +16 -12
  127. package/lib/Utils/crypto.js.map +1 -1
  128. package/lib/Utils/decode-wa-message.d.ts +14 -2
  129. package/lib/Utils/decode-wa-message.d.ts.map +1 -1
  130. package/lib/Utils/decode-wa-message.js +104 -15
  131. package/lib/Utils/decode-wa-message.js.map +1 -1
  132. package/lib/Utils/event-buffer.d.ts +0 -1
  133. package/lib/Utils/event-buffer.d.ts.map +1 -1
  134. package/lib/Utils/event-buffer.js +65 -20
  135. package/lib/Utils/event-buffer.js.map +1 -1
  136. package/lib/Utils/generics.d.ts +5 -7
  137. package/lib/Utils/generics.d.ts.map +1 -1
  138. package/lib/Utils/generics.js +59 -51
  139. package/lib/Utils/generics.js.map +1 -1
  140. package/lib/Utils/history.d.ts +8 -9
  141. package/lib/Utils/history.d.ts.map +1 -1
  142. package/lib/Utils/history.js +8 -3
  143. package/lib/Utils/history.js.map +1 -1
  144. package/lib/Utils/index.d.ts +2 -1
  145. package/lib/Utils/index.d.ts.map +1 -1
  146. package/lib/Utils/index.js +2 -1
  147. package/lib/Utils/index.js.map +1 -1
  148. package/lib/Utils/link-preview.d.ts +1 -2
  149. package/lib/Utils/link-preview.d.ts.map +1 -1
  150. package/lib/Utils/link-preview.js +1 -1
  151. package/lib/Utils/link-preview.js.map +1 -1
  152. package/lib/Utils/message-retry-manager.d.ts +82 -0
  153. package/lib/Utils/message-retry-manager.d.ts.map +1 -0
  154. package/lib/Utils/message-retry-manager.js +172 -0
  155. package/lib/Utils/message-retry-manager.js.map +1 -0
  156. package/lib/Utils/messages-media.d.ts +14 -12
  157. package/lib/Utils/messages-media.d.ts.map +1 -1
  158. package/lib/Utils/messages-media.js +48 -24
  159. package/lib/Utils/messages-media.js.map +1 -1
  160. package/lib/Utils/messages.d.ts +17 -4
  161. package/lib/Utils/messages.d.ts.map +1 -1
  162. package/lib/Utils/messages.js +85 -21
  163. package/lib/Utils/messages.js.map +1 -1
  164. package/lib/Utils/noise-handler.js +2 -1
  165. package/lib/Utils/noise-handler.js.map +1 -1
  166. package/lib/Utils/pre-key-manager.d.ts +28 -0
  167. package/lib/Utils/pre-key-manager.d.ts.map +1 -0
  168. package/lib/Utils/pre-key-manager.js +106 -0
  169. package/lib/Utils/pre-key-manager.js.map +1 -0
  170. package/lib/Utils/process-message.d.ts +26 -8
  171. package/lib/Utils/process-message.d.ts.map +1 -1
  172. package/lib/Utils/process-message.js +141 -24
  173. package/lib/Utils/process-message.js.map +1 -1
  174. package/lib/Utils/signal.d.ts +4 -4
  175. package/lib/Utils/signal.d.ts.map +1 -1
  176. package/lib/Utils/signal.js +21 -12
  177. package/lib/Utils/signal.js.map +1 -1
  178. package/lib/Utils/validate-connection.d.ts.map +1 -1
  179. package/lib/Utils/validate-connection.js +50 -14
  180. package/lib/Utils/validate-connection.js.map +1 -1
  181. package/lib/WABinary/decode.d.ts.map +1 -1
  182. package/lib/WABinary/decode.js +12 -2
  183. package/lib/WABinary/decode.js.map +1 -1
  184. package/lib/WABinary/generic-utils.js +1 -1
  185. package/lib/WABinary/generic-utils.js.map +1 -1
  186. package/lib/WABinary/jid-utils.d.ts +18 -6
  187. package/lib/WABinary/jid-utils.d.ts.map +1 -1
  188. package/lib/WABinary/jid-utils.js +52 -8
  189. package/lib/WABinary/jid-utils.js.map +1 -1
  190. package/lib/WAM/constants.d.ts +1 -1
  191. package/lib/WAM/constants.d.ts.map +1 -1
  192. package/lib/WAM/constants.js +18516 -10904
  193. package/lib/WAM/constants.js.map +1 -1
  194. package/lib/WAM/encode.d.ts.map +1 -1
  195. package/lib/WAM/encode.js +0 -1
  196. package/lib/WAM/encode.js.map +1 -1
  197. package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts +2 -1
  198. package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts.map +1 -1
  199. package/lib/WAUSync/Protocols/UsyncLIDProtocol.js +10 -2
  200. package/lib/WAUSync/Protocols/UsyncLIDProtocol.js.map +1 -1
  201. package/lib/WAUSync/USyncQuery.d.ts +1 -1
  202. package/lib/WAUSync/USyncQuery.d.ts.map +1 -1
  203. package/lib/WAUSync/USyncQuery.js +23 -20
  204. package/lib/WAUSync/USyncQuery.js.map +1 -1
  205. package/package.json +16 -11
  206. package/lib/Defaults/baileys-version.json +0 -3
  207. package/lib/Signal/Group/queue-job.d.ts +0 -2
  208. package/lib/Signal/Group/queue-job.d.ts.map +0 -1
  209. package/lib/Signal/Group/queue-job.js +0 -54
  210. package/lib/Signal/Group/queue-job.js.map +0 -1
  211. package/lib/Socket/usync.d.ts +0 -37
  212. package/lib/Socket/usync.d.ts.map +0 -1
  213. package/lib/Socket/usync.js +0 -63
  214. package/lib/Socket/usync.js.map +0 -1
  215. package/lib/Utils/baileys-event-stream.d.ts +0 -17
  216. package/lib/Utils/baileys-event-stream.d.ts.map +0 -1
  217. package/lib/Utils/baileys-event-stream.js +0 -56
  218. package/lib/Utils/baileys-event-stream.js.map +0 -1
@@ -1,10 +1,16 @@
1
1
  import { proto } from '../../WAProto/index.js';
2
- import type { MediaType, SocketConfig } from '../Types/index.js';
2
+ import type { SocketConfig } from '../Types/index.js';
3
3
  export declare const UNAUTHORIZED_CODES: number[];
4
4
  export declare const DEFAULT_ORIGIN = "https://web.whatsapp.com";
5
+ export declare const CALL_VIDEO_PREFIX = "https://call.whatsapp.com/video/";
6
+ export declare const CALL_AUDIO_PREFIX = "https://call.whatsapp.com/voice/";
5
7
  export declare const DEF_CALLBACK_PREFIX = "CB:";
6
8
  export declare const DEF_TAG_PREFIX = "TAG:";
7
9
  export declare const PHONE_CONNECTION_CB = "CB:Pong";
10
+ export declare const WA_ADV_ACCOUNT_SIG_PREFIX: Buffer<ArrayBuffer>;
11
+ export declare const WA_ADV_DEVICE_SIG_PREFIX: Buffer<ArrayBuffer>;
12
+ export declare const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX: Buffer<ArrayBuffer>;
13
+ export declare const WA_ADV_HOSTED_DEVICE_SIG_PREFIX: Buffer<ArrayBuffer>;
8
14
  export declare const WA_DEFAULT_EPHEMERAL: number;
9
15
  export declare const NOISE_MODE = "Noise_XX_25519_AESGCM_SHA256\0\0\0\0";
10
16
  export declare const DICT_VERSION = 3;
@@ -15,7 +21,7 @@ export declare const URL_REGEX: RegExp;
15
21
  export declare const WA_CERT_DETAILS: {
16
22
  SERIAL: number;
17
23
  };
18
- export declare const PROCESSABLE_HISTORY_TYPES: proto.Message.HistorySyncNotification.HistorySyncType[];
24
+ export declare const PROCESSABLE_HISTORY_TYPES: proto.HistorySync.HistorySyncType[];
19
25
  export declare const DEFAULT_CONNECTION_CONFIG: SocketConfig;
20
26
  export declare const MEDIA_PATH_MAP: {
21
27
  [T in MediaType]?: string;
@@ -39,10 +45,14 @@ export declare const MEDIA_HKDF_KEY_MAPPING: {
39
45
  'product-catalog-image': string;
40
46
  'payment-bg-image': string;
41
47
  ptv: string;
48
+ 'biz-cover-photo': string;
42
49
  };
50
+ export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING;
43
51
  export declare const MEDIA_KEYS: MediaType[];
44
52
  export declare const MIN_PREKEY_COUNT = 5;
45
- export declare const INITIAL_PREKEY_COUNT = 30;
53
+ export declare const INITIAL_PREKEY_COUNT = 812;
54
+ export declare const UPLOAD_TIMEOUT = 30000;
55
+ export declare const MIN_UPLOAD_INTERVAL = 5000;
46
56
  export declare const DEFAULT_CACHE_TTLS: {
47
57
  SIGNAL_STORE: number;
48
58
  MSG_RETRY: number;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EAAuB,SAAS,EAAE,YAAY,EAAa,MAAM,UAAU,CAAA;AAOvF,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,cAAc,6BAA6B,CAAA;AACxD,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,cAAc,SAAS,CAAA;AACpC,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,eAAO,MAAM,oBAAoB,QAAmB,CAAA;AAEpD,eAAO,MAAM,UAAU,yCAAyC,CAAA;AAChE,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,eAAe,qBAAmB,CAAA;AAC/C,eAAO,MAAM,eAAe,qBAAyC,CAAA;AACrE,yGAAyG;AACzG,eAAO,MAAM,SAAS,QAAwF,CAAA;AAE9G,eAAO,MAAM,eAAe;;CAE3B,CAAA;AAED,eAAO,MAAM,yBAAyB,yDAMrC,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,YA+BvC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;KAAG,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM;CAUvD,CAAA;AAED,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;CAmBlC,CAAA;AAED,eAAO,MAAM,UAAU,EAAkC,SAAS,EAAE,CAAA;AAEpE,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC,eAAO,MAAM,oBAAoB,KAAK,CAAA;AAEtC,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EAAuB,YAAY,EAAa,MAAM,UAAU,CAAA;AAM5E,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,cAAc,6BAA6B,CAAA;AACxD,eAAO,MAAM,iBAAiB,qCAAqC,CAAA;AACnE,eAAO,MAAM,iBAAiB,qCAAqC,CAAA;AACnE,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,cAAc,SAAS,CAAA;AACpC,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,eAAO,MAAM,yBAAyB,qBAAsB,CAAA;AAC5D,eAAO,MAAM,wBAAwB,qBAAsB,CAAA;AAC3D,eAAO,MAAM,gCAAgC,qBAAsB,CAAA;AACnE,eAAO,MAAM,+BAA+B,qBAAsB,CAAA;AAElE,eAAO,MAAM,oBAAoB,QAAmB,CAAA;AAEpD,eAAO,MAAM,UAAU,yCAAyC,CAAA;AAChE,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,eAAe,qBAAmB,CAAA;AAC/C,eAAO,MAAM,eAAe,qBAAyC,CAAA;AACrE,yGAAyG;AACzG,eAAO,MAAM,SAAS,QAAwF,CAAA;AAG9G,eAAO,MAAM,eAAe;;CAE3B,CAAA;AAED,eAAO,MAAM,yBAAyB,qCAQrC,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,YAiCvC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;KAAG,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM;CAWvD,CAAA;AAED,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;CAoBlC,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,sBAAsB,CAAA;AAE3D,eAAO,MAAM,UAAU,EAAkC,SAAS,EAAE,CAAA;AAEpE,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC,eAAO,MAAM,oBAAoB,MAAM,CAAA;AAEvC,eAAO,MAAM,cAAc,QAAQ,CAAA;AACnC,eAAO,MAAM,mBAAmB,OAAO,CAAA;AAEvC,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAA"}
@@ -1,14 +1,19 @@
1
1
  import { proto } from '../../WAProto/index.js';
2
2
  import { makeLibSignalRepository } from '../Signal/libsignal.js';
3
- import { Browsers } from '../Utils/index.js';
3
+ import { Browsers } from '../Utils/browser-utils.js';
4
4
  import logger from '../Utils/logger.js';
5
- import defaultVersion from './baileys-version.json' with { type: 'json' };
6
- const { version } = defaultVersion;
5
+ const version = [2, 3000, 1027934701];
7
6
  export const UNAUTHORIZED_CODES = [401, 403, 419];
8
7
  export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
8
+ export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
9
+ export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
9
10
  export const DEF_CALLBACK_PREFIX = 'CB:';
10
11
  export const DEF_TAG_PREFIX = 'TAG:';
11
12
  export const PHONE_CONNECTION_CB = 'CB:Pong';
13
+ export const WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0]);
14
+ export const WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
15
+ export const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
16
+ export const WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
12
17
  export const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
13
18
  export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
14
19
  export const DICT_VERSION = 3;
@@ -16,19 +21,22 @@ export const KEY_BUNDLE_TYPE = Buffer.from([5]);
16
21
  export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]); // last is "DICT_VERSION"
17
22
  /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
18
23
  export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
24
+ // TODO: Add WA root CA
19
25
  export const WA_CERT_DETAILS = {
20
26
  SERIAL: 0
21
27
  };
22
28
  export const PROCESSABLE_HISTORY_TYPES = [
23
- proto.Message.HistorySyncNotification.HistorySyncType.INITIAL_BOOTSTRAP,
24
- proto.Message.HistorySyncNotification.HistorySyncType.PUSH_NAME,
25
- proto.Message.HistorySyncNotification.HistorySyncType.RECENT,
26
- proto.Message.HistorySyncNotification.HistorySyncType.FULL,
27
- proto.Message.HistorySyncNotification.HistorySyncType.ON_DEMAND
29
+ proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
30
+ proto.HistorySync.HistorySyncType.PUSH_NAME,
31
+ proto.HistorySync.HistorySyncType.RECENT,
32
+ proto.HistorySync.HistorySyncType.FULL,
33
+ proto.HistorySync.HistorySyncType.ON_DEMAND,
34
+ proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
35
+ proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
28
36
  ];
29
37
  export const DEFAULT_CONNECTION_CONFIG = {
30
38
  version: version,
31
- browser: Browsers.ubuntu('Chrome'),
39
+ browser: Browsers.macOS('Chrome'),
32
40
  waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
33
41
  connectTimeoutMs: 20000,
34
42
  keepAliveIntervalMs: 30000,
@@ -41,13 +49,15 @@ export const DEFAULT_CONNECTION_CONFIG = {
41
49
  fireInitQueries: true,
42
50
  auth: undefined,
43
51
  markOnlineOnConnect: true,
44
- syncFullHistory: false,
52
+ syncFullHistory: true,
45
53
  patchMessageBeforeSending: msg => msg,
46
54
  shouldSyncHistoryMessage: () => true,
47
55
  shouldIgnoreJid: () => false,
48
56
  linkPreviewImageThumbnailWidth: 192,
49
57
  transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
50
58
  generateHighQualityLinkPreview: false,
59
+ enableAutoSessionRecreation: true,
60
+ enableRecentMessageCache: true,
51
61
  options: {},
52
62
  appStateMacVerification: {
53
63
  patch: false,
@@ -67,7 +77,8 @@ export const MEDIA_PATH_MAP = {
67
77
  'thumbnail-link': '/mms/image',
68
78
  'product-catalog-image': '/product/image',
69
79
  'md-app-state': '',
70
- 'md-msg-hist': '/mms/md-app-state'
80
+ 'md-msg-hist': '/mms/md-app-state',
81
+ 'biz-cover-photo': '/pps/biz-cover-photo'
71
82
  };
72
83
  export const MEDIA_HKDF_KEY_MAPPING = {
73
84
  audio: 'Audio',
@@ -87,11 +98,14 @@ export const MEDIA_HKDF_KEY_MAPPING = {
87
98
  'md-app-state': 'App State',
88
99
  'product-catalog-image': '',
89
100
  'payment-bg-image': 'Payment Background',
90
- ptv: 'Video'
101
+ ptv: 'Video',
102
+ 'biz-cover-photo': 'Image'
91
103
  };
92
104
  export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP);
93
105
  export const MIN_PREKEY_COUNT = 5;
94
- export const INITIAL_PREKEY_COUNT = 30;
106
+ export const INITIAL_PREKEY_COUNT = 812;
107
+ export const UPLOAD_TIMEOUT = 30000; // 30 seconds
108
+ export const MIN_UPLOAD_INTERVAL = 5000; // 5 seconds minimum between uploads
95
109
  export const DEFAULT_CACHE_TTLS = {
96
110
  SIGNAL_STORE: 5 * 60, // 5 minutes
97
111
  MSG_RETRY: 60 * 60, // 1 hour
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"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"}
@@ -8,8 +8,7 @@ export declare class GroupCipher {
8
8
  private readonly senderKeyStore;
9
9
  private readonly senderKeyName;
10
10
  constructor(senderKeyStore: SenderKeyStore, senderKeyName: SenderKeyName);
11
- private queueJob;
12
- encrypt(paddedPlaintext: Uint8Array | string): Promise<Uint8Array>;
11
+ encrypt(paddedPlaintext: Uint8Array): Promise<Uint8Array>;
13
12
  decrypt(senderKeyMessageBytes: Uint8Array): Promise<Uint8Array>;
14
13
  private getSenderKey;
15
14
  private getPlainText;
@@ -1 +1 @@
1
- {"version":3,"file":"group_cipher.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,WAAW,cAAc;IAC9B,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACrE,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpF;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IAKxE,OAAO,CAAC,QAAQ;IAIH,OAAO,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA6BlE,OAAO,CAAC,qBAAqB,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2B5E,OAAO,CAAC,YAAY;YA4BN,YAAY;YAQZ,aAAa;CAc3B"}
1
+ {"version":3,"file":"group_cipher.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,WAAW,cAAc;IAC9B,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAErE,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpF;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IAK3D,OAAO,CAAC,eAAe,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BzD,OAAO,CAAC,qBAAqB,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAyB5E,OAAO,CAAC,YAAY;YA4BN,YAAY;YAQZ,aAAa;CAO3B"}
@@ -1,6 +1,4 @@
1
- /* @ts-ignore */
2
1
  import { decrypt, encrypt } from 'libsignal/src/crypto.js';
3
- import queueJob from './queue-job.js';
4
2
  import { SenderKeyMessage } from './sender-key-message.js';
5
3
  import { SenderKeyName } from './sender-key-name.js';
6
4
  import { SenderKeyRecord } from './sender-key-record.js';
@@ -10,44 +8,37 @@ export class GroupCipher {
10
8
  this.senderKeyStore = senderKeyStore;
11
9
  this.senderKeyName = senderKeyName;
12
10
  }
13
- queueJob(awaitable) {
14
- return queueJob(this.senderKeyName.toString(), awaitable);
15
- }
16
11
  async encrypt(paddedPlaintext) {
17
- return await this.queueJob(async () => {
18
- const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
19
- if (!record) {
20
- throw new Error('No SenderKeyRecord found for encryption');
21
- }
22
- const senderKeyState = record.getSenderKeyState();
23
- if (!senderKeyState) {
24
- throw new Error('No session to encrypt message');
25
- }
26
- const iteration = senderKeyState.getSenderChainKey().getIteration();
27
- const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
28
- const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
29
- const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
30
- await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
31
- return senderKeyMessage.serialize();
32
- });
12
+ const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
13
+ if (!record) {
14
+ throw new Error('No SenderKeyRecord found for encryption');
15
+ }
16
+ const senderKeyState = record.getSenderKeyState();
17
+ if (!senderKeyState) {
18
+ throw new Error('No session to encrypt message');
19
+ }
20
+ const iteration = senderKeyState.getSenderChainKey().getIteration();
21
+ const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
22
+ const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
23
+ const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
24
+ await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
25
+ return senderKeyMessage.serialize();
33
26
  }
34
27
  async decrypt(senderKeyMessageBytes) {
35
- return await this.queueJob(async () => {
36
- const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
37
- if (!record) {
38
- throw new Error('No SenderKeyRecord found for decryption');
39
- }
40
- const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
41
- const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
42
- if (!senderKeyState) {
43
- throw new Error('No session found to decrypt message');
44
- }
45
- senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
46
- const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
47
- const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
48
- await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
49
- return plaintext;
50
- });
28
+ const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
29
+ if (!record) {
30
+ throw new Error('No SenderKeyRecord found for decryption');
31
+ }
32
+ const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
33
+ const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
34
+ if (!senderKeyState) {
35
+ throw new Error('No session found to decrypt message');
36
+ }
37
+ senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
38
+ const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
39
+ const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
40
+ await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
41
+ return plaintext;
51
42
  }
52
43
  getSenderKey(senderKeyState, iteration) {
53
44
  let senderChainKey = senderKeyState.getSenderChainKey();
@@ -81,10 +72,7 @@ export class GroupCipher {
81
72
  }
82
73
  async getCipherText(iv, key, plaintext) {
83
74
  try {
84
- const ivBuffer = typeof iv === 'string' ? Buffer.from(iv, 'base64') : iv;
85
- const keyBuffer = typeof key === 'string' ? Buffer.from(key, 'base64') : key;
86
- const plaintextBuffer = typeof plaintext === 'string' ? Buffer.from(plaintext) : plaintext;
87
- return encrypt(keyBuffer, plaintextBuffer, ivBuffer);
75
+ return encrypt(key, plaintext, iv);
88
76
  }
89
77
  catch (e) {
90
78
  throw new Error('InvalidMessageException');
@@ -1 +1 @@
1
- {"version":3,"file":"group_cipher.js","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"group_cipher.js","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"keyhelper.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAErD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,wBAAwB,CAAC,GAAG,CAAC,EAAE,WAAW,GAAG,cAAc,CAS1E"}
1
+ {"version":3,"file":"keyhelper.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAErD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,wBAAwB,CAAC,GAAG,CAAC,EAAE,WAAW,GAAG,cAAc,CAS1E"}
@@ -1,5 +1,4 @@
1
1
  import * as nodeCrypto from 'crypto';
2
- /* @ts-ignore */
3
2
  import { generateKeyPair } from 'libsignal/src/curve.js';
4
3
  export function generateSenderKey() {
5
4
  return nodeCrypto.randomBytes(32);
@@ -1 +1 @@
1
- {"version":3,"file":"keyhelper.js","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,QAAQ,CAAA;AACpC,gBAAgB;AAChB,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAIrD,MAAM,UAAU,iBAAiB;IAChC,OAAO,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,mBAAmB;IAClC,OAAO,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACxC,CAAC;AAOD,MAAM,UAAU,wBAAwB,CAAC,GAAiB;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;KACjC,CAAA;AACF,CAAC"}
1
+ {"version":3,"file":"keyhelper.js","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAIrD,MAAM,UAAU,iBAAiB;IAChC,OAAO,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,mBAAmB;IAClC,OAAO,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACxC,CAAC;AAOD,MAAM,UAAU,wBAAwB,CAAC,GAAiB;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;KACjC,CAAA;AACF,CAAC"}
@@ -4,7 +4,7 @@ export declare class SenderChainKey {
4
4
  private readonly CHAIN_KEY_SEED;
5
5
  private readonly iteration;
6
6
  private readonly chainKey;
7
- constructor(iteration: number, chainKey: any);
7
+ constructor(iteration: number, chainKey: Uint8Array | Buffer);
8
8
  getIteration(): number;
9
9
  getSenderMessageKey(): SenderMessageKey;
10
10
  getNext(): SenderChainKey;
@@ -1 +1 @@
1
- {"version":3,"file":"sender-chain-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IASrC,YAAY,IAAI,MAAM;IAItB,mBAAmB,IAAI,gBAAgB;IAIvC,OAAO,IAAI,cAAc;IAIzB,OAAO,IAAI,UAAU;IAI5B,OAAO,CAAC,aAAa;CAGrB"}
1
+ {"version":3,"file":"sender-chain-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM;IAKrD,YAAY,IAAI,MAAM;IAItB,mBAAmB,IAAI,gBAAgB;IAIvC,OAAO,IAAI,cAAc;IAIzB,OAAO,IAAI,UAAU;IAI5B,OAAO,CAAC,aAAa;CAGrB"}
@@ -1,4 +1,3 @@
1
- /* @ts-ignore */
2
1
  import { calculateMAC } from 'libsignal/src/crypto.js';
3
2
  import { SenderMessageKey } from './sender-message-key.js';
4
3
  export class SenderChainKey {
@@ -6,12 +5,7 @@ export class SenderChainKey {
6
5
  this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
7
6
  this.CHAIN_KEY_SEED = Buffer.from([0x02]);
8
7
  this.iteration = iteration;
9
- if (chainKey instanceof Buffer) {
10
- this.chainKey = chainKey;
11
- }
12
- else {
13
- this.chainKey = Buffer.from(chainKey || []);
14
- }
8
+ this.chainKey = Buffer.from(chainKey);
15
9
  }
16
10
  getIteration() {
17
11
  return this.iteration;
@@ -1 +1 @@
1
- {"version":3,"file":"sender-chain-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,OAAO,cAAc;IAM1B,YAAY,SAAiB,EAAE,QAAa;QAL3B,qBAAgB,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,mBAAc,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAKhE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,QAAQ,YAAY,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;QAC5C,CAAC;IACF,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,mBAAmB;QACzB,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC;IAEO,aAAa,CAAC,IAAgB,EAAE,GAAW;QAClD,OAAO,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC;CACD"}
1
+ {"version":3,"file":"sender-chain-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,OAAO,cAAc;IAM1B,YAAY,SAAiB,EAAE,QAA6B;QAL3C,qBAAgB,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,mBAAc,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAKhE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,mBAAmB;QACzB,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC;IAEO,aAAa,CAAC,IAAgB,EAAE,GAAW;QAClD,OAAO,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC;CACD"}
@@ -51,10 +51,10 @@ export class SenderKeyDistributionMessage extends CiphertextMessage {
51
51
  return this.iteration;
52
52
  }
53
53
  getChainKey() {
54
- return typeof this.chainKey === 'string' ? Buffer.from(this.chainKey, 'base64') : this.chainKey;
54
+ return this.chainKey;
55
55
  }
56
56
  getSignatureKey() {
57
- return typeof this.signatureKey === 'string' ? Buffer.from(this.signatureKey, 'base64') : this.signatureKey;
57
+ return this.signatureKey;
58
58
  }
59
59
  getId() {
60
60
  return this.id;
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-distribution-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-distribution-message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sender-key-distribution-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-distribution-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AASxD,MAAM,OAAO,4BAA6B,SAAQ,iBAAiB;IAOlE,YACC,EAAkB,EAClB,SAAyB,EACzB,QAA4B,EAC5B,YAAgC,EAChC,UAA8B;QAE9B,KAAK,EAAE,CAAA;QAEP,IAAI,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACnC,MAAM,mBAAmB,GAAG,KAAK,CAAC,4BAA4B,CAAC,MAAM,CACpE,OAAO,CACP,CAAC,MAAM,EAA2C,CAAA;gBAEnD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;gBAC5B,IAAI,CAAC,EAAE,GAAG,mBAAmB,CAAC,EAAE,CAAA;gBAChC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAA;gBAC9C,IAAI,CAAC,QAAQ;oBACZ,OAAO,mBAAmB,CAAC,QAAQ,KAAK,QAAQ;wBAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC;wBACrD,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAA;gBAChC,IAAI,CAAC,YAAY;oBAChB,OAAO,mBAAmB,CAAC,UAAU,KAAK,QAAQ;wBACjD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC;wBACvD,CAAC,CAAC,mBAAmB,CAAC,UAAU,CAAA;YACnC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3B,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;YACrF,IAAI,CAAC,EAAE,GAAG,EAAG,CAAA;YACb,IAAI,CAAC,SAAS,GAAG,SAAU,CAAA;YAC3B,IAAI,CAAC,QAAQ,GAAG,QAAS,CAAA;YACzB,IAAI,CAAC,YAAY,GAAG,YAAa,CAAA;YAEjC,MAAM,OAAO,GAAG,KAAK,CAAC,4BAA4B,CAAC,MAAM,CACxD,KAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC;gBACzC,EAAE;gBACF,SAAS;gBACT,QAAQ;gBACR,UAAU,EAAE,IAAI,CAAC,YAAY;aAC7B,CAAC,CACF,CAAC,MAAM,EAAE,CAAA;YAEV,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;QACnE,CAAC;IACF,CAAC;IAEO,oBAAoB,CAAC,SAAiB,EAAE,QAAgB;QAC/D,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAA;IACpD,CAAC;IAEM,SAAS;QACf,OAAO,IAAI,CAAC,UAAU,CAAA;IACvB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,2BAA2B,CAAA;IACxC,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,WAAW;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC;IAEM,eAAe;QACrB,OAAO,IAAI,CAAC,YAAY,CAAA;IACzB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAA;IACf,CAAC;CACD"}
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-message.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAQxD,qBAAa,gBAAiB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAK;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;gBAGtC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,EAC9B,YAAY,CAAC,EAAE,UAAU,GAAG,IAAI,EAChC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IAyCxB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,UAAU;IAI3B,eAAe,CAAC,YAAY,EAAE,UAAU,GAAG,IAAI;IAOtD,OAAO,CAAC,YAAY;IAIb,SAAS,IAAI,UAAU;IAIvB,OAAO,IAAI,MAAM;CAGxB"}
1
+ {"version":3,"file":"sender-key-message.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAQxD,qBAAa,gBAAiB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAK;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;gBAGtC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,EAC9B,YAAY,CAAC,EAAE,UAAU,GAAG,IAAI,EAChC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IAyCxB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,UAAU;IAI3B,eAAe,CAAC,YAAY,EAAE,UAAU,GAAG,IAAI;IAOtD,OAAO,CAAC,YAAY;IAIb,SAAS,IAAI,UAAU;IAIvB,OAAO,IAAI,MAAM;CAGxB"}
@@ -1,4 +1,3 @@
1
- /* @ts-ignore */
2
1
  import { calculateSignature, verifySignature } from 'libsignal/src/curve.js';
3
2
  import { proto } from '../../../WAProto/index.js';
4
3
  import { CiphertextMessage } from './ciphertext-message.js';
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sender-key-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,6 @@ export declare class SenderKeyRecord {
26
26
  private: Uint8Array;
27
27
  }): void;
28
28
  serialize(): SenderKeyStateStructure[];
29
- static deserialize(data: Uint8Array | string | SenderKeyStateStructure[]): SenderKeyRecord;
29
+ static deserialize(data: Uint8Array): SenderKeyRecord;
30
30
  }
31
31
  //# sourceMappingURL=sender-key-record.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-record.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-record.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,MAAM,WAAW,uBAAuB;IACvC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE;QACf,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,UAAU,CAAA;KAChB,CAAA;IACD,gBAAgB,EAAE;QACjB,MAAM,EAAE,UAAU,CAAA;QAClB,OAAO,CAAC,EAAE,UAAU,CAAA;KACpB,CAAA;IACD,iBAAiB,EAAE,KAAK,CAAC;QACxB,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,UAAU,CAAA;KAChB,CAAC,CAAA;CACF;AAED,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAI;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAE3C,UAAU,CAAC,EAAE,uBAAuB,EAAE;IAQ3C,OAAO,IAAI,OAAO;IAIlB,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAQ7D,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,GAAG,IAAI;IAOtG,iBAAiB,CACvB,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,GAClD,IAAI;IAKA,SAAS,IAAI,uBAAuB,EAAE;IAG7C,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,uBAAuB,EAAE,GAAG,eAAe;CAa1F"}
1
+ {"version":3,"file":"sender-key-record.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-record.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,MAAM,WAAW,uBAAuB;IACvC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE;QACf,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,UAAU,CAAA;KAChB,CAAA;IACD,gBAAgB,EAAE;QACjB,MAAM,EAAE,UAAU,CAAA;QAClB,OAAO,CAAC,EAAE,UAAU,CAAA;KACpB,CAAA;IACD,iBAAiB,EAAE,KAAK,CAAC;QACxB,SAAS,EAAE,MAAM,CAAA;QACjB,IAAI,EAAE,UAAU,CAAA;KAChB,CAAC,CAAA;CACF;AAED,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAI;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAE3C,UAAU,CAAC,EAAE,uBAAuB,EAAE;IAQ3C,OAAO,IAAI,OAAO;IAIlB,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAQ7D,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,GAAG,IAAI;IAOtG,iBAAiB,CACvB,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,GAClD,IAAI;IAKA,SAAS,IAAI,uBAAuB,EAAE;IAG7C,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe;CAKrD"}
@@ -33,17 +33,8 @@ export class SenderKeyRecord {
33
33
  return this.senderKeyStates.map(state => state.getStructure());
34
34
  }
35
35
  static deserialize(data) {
36
- let parsed;
37
- if (typeof data === 'string') {
38
- parsed = JSON.parse(data, BufferJSON.reviver);
39
- }
40
- else if (data instanceof Uint8Array) {
41
- const str = Buffer.from(data).toString('utf-8');
42
- parsed = JSON.parse(str, BufferJSON.reviver);
43
- }
44
- else {
45
- parsed = data;
46
- }
36
+ const str = Buffer.from(data).toString('utf-8');
37
+ const parsed = JSON.parse(str, BufferJSON.reviver);
47
38
  return new SenderKeyRecord(parsed);
48
39
  }
49
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-record.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAkBnD,MAAM,OAAO,eAAe;IAI3B,YAAY,UAAsC;QAHjC,eAAU,GAAG,CAAC,CAAA;QACd,oBAAe,GAAqB,EAAE,CAAA;QAGtD,IAAI,UAAU,EAAE,CAAC;YAChB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;YAC7F,CAAC;QACF,CAAC;IACF,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,CAAA;IACzC,CAAC;IAEM,iBAAiB,CAAC,KAAc;QACtC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,CAAA;IACtE,CAAC;IAEM,iBAAiB,CAAC,EAAU,EAAE,SAAiB,EAAE,QAAoB,EAAE,YAAwB;QACrG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAC1F,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC7B,CAAC;IACF,CAAC;IAEM,iBAAiB,CACvB,EAAU,EACV,SAAiB,EACjB,QAAoB,EACpB,OAAoD;QAEpD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;IAChF,CAAC;IAEM,SAAS;QACf,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAA;IAC/D,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,IAAqD;QACvE,IAAI,MAAiC,CAAA;QACrC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;QAC9C,CAAC;aAAM,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC/C,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACP,MAAM,GAAG,IAAI,CAAA;QACd,CAAC;QAED,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;CACD"}
1
+ {"version":3,"file":"sender-key-record.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAkBnD,MAAM,OAAO,eAAe;IAI3B,YAAY,UAAsC;QAHjC,eAAU,GAAG,CAAC,CAAA;QACd,oBAAe,GAAqB,EAAE,CAAA;QAGtD,IAAI,UAAU,EAAE,CAAC;YAChB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;YAC7F,CAAC;QACF,CAAC;IACF,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,CAAA;IACzC,CAAC;IAEM,iBAAiB,CAAC,KAAc;QACtC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,CAAA;IACtE,CAAC;IAEM,iBAAiB,CAAC,EAAU,EAAE,SAAiB,EAAE,QAAoB,EAAE,YAAwB;QACrG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAC1F,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC7B,CAAC;IACF,CAAC;IAEM,iBAAiB,CACvB,EAAU,EACV,SAAiB,EACjB,QAAoB,EACpB,OAAoD;QAEpD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;IAChF,CAAC;IAEM,SAAS;QACf,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAA;IAC/D,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,IAAgB;QAClC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;QAClD,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;CACD"}
@@ -21,10 +21,10 @@ interface SenderKeyStateStructure {
21
21
  export declare class SenderKeyState {
22
22
  private readonly MAX_MESSAGE_KEYS;
23
23
  private readonly senderKeyStateStructure;
24
- constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null, signatureKeyPair?: {
25
- public: Uint8Array;
26
- private: Uint8Array;
27
- } | null, signatureKeyPublic?: Uint8Array | null, signatureKeyPrivate?: Uint8Array | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
24
+ constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null | string, signatureKeyPair?: {
25
+ public: Uint8Array | string;
26
+ private: Uint8Array | string;
27
+ } | null, signatureKeyPublic?: Uint8Array | string | null, signatureKeyPrivate?: Uint8Array | string | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
28
28
  getKeyId(): number;
29
29
  getSenderChainKey(): SenderChainKey;
30
30
  setSenderChainKey(chainKey: SenderChainKey): void;
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-state.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,UAAU,uBAAuB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,yBAAyB;IAClC,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,UAAU,yBAAyB;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,uBAAuB;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,uBAAuB,CAAA;IACvC,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,iBAAiB,EAAE,yBAAyB,EAAE,CAAA;CAC9C;AAED,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAO;IACxC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAyB;gBAGhE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,EAC5B,gBAAgB,CAAC,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,EACrE,kBAAkB,CAAC,EAAE,UAAU,GAAG,IAAI,EACtC,mBAAmB,CAAC,EAAE,UAAU,GAAG,IAAI,EACvC,uBAAuB,CAAC,EAAE,uBAAuB,GAAG,IAAI;IAsClD,QAAQ,IAAI,MAAM;IAIlB,iBAAiB,IAAI,cAAc;IAOnC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAOjD,mBAAmB,IAAI,MAAM;IAW7B,oBAAoB,IAAI,MAAM,GAAG,SAAS;IAe1C,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/C,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAW7D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAYlE,YAAY,IAAI,uBAAuB;CAG9C"}
1
+ {"version":3,"file":"sender-key-state.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,UAAU,uBAAuB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,yBAAyB;IAClC,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,UAAU,yBAAyB;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,uBAAuB;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,uBAAuB,CAAA;IACvC,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,iBAAiB,EAAE,yBAAyB,EAAE,CAAA;CAC9C;AAED,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAO;IACxC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAyB;gBAGhE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,GAAG,MAAM,EACrC,gBAAgB,CAAC,EAAE;QAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,EACvF,kBAAkB,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,EAC/C,mBAAmB,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,EAChD,uBAAuB,CAAC,EAAE,uBAAuB,GAAG,IAAI;IA8BlD,QAAQ,IAAI,MAAM;IAIlB,iBAAiB,IAAI,cAAc;IAOnC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAOjD,mBAAmB,IAAI,MAAM;IAa7B,oBAAoB,IAAI,MAAM,GAAG,SAAS;IAM1C,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/C,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAW7D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAYlE,YAAY,IAAI,uBAAuB;CAG9C"}
@@ -4,31 +4,28 @@ export class SenderKeyState {
4
4
  constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
5
5
  this.MAX_MESSAGE_KEYS = 2000;
6
6
  if (senderKeyStateStructure) {
7
- this.senderKeyStateStructure = senderKeyStateStructure;
7
+ this.senderKeyStateStructure = {
8
+ ...senderKeyStateStructure,
9
+ senderMessageKeys: Array.isArray(senderKeyStateStructure.senderMessageKeys)
10
+ ? senderKeyStateStructure.senderMessageKeys
11
+ : []
12
+ };
8
13
  }
9
14
  else {
10
15
  if (signatureKeyPair) {
11
16
  signatureKeyPublic = signatureKeyPair.public;
12
17
  signatureKeyPrivate = signatureKeyPair.private;
13
18
  }
14
- chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
15
- const senderChainKeyStructure = {
16
- iteration: iteration || 0,
17
- seed: chainKey || Buffer.alloc(0)
18
- };
19
- const signingKeyStructure = {
20
- public: typeof signatureKeyPublic === 'string'
21
- ? Buffer.from(signatureKeyPublic, 'base64')
22
- : signatureKeyPublic || Buffer.alloc(0)
23
- };
24
- if (signatureKeyPrivate) {
25
- signingKeyStructure.private =
26
- typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
27
- }
28
19
  this.senderKeyStateStructure = {
29
20
  senderKeyId: id || 0,
30
- senderChainKey: senderChainKeyStructure,
31
- senderSigningKey: signingKeyStructure,
21
+ senderChainKey: {
22
+ iteration: iteration || 0,
23
+ seed: Buffer.from(chainKey || [])
24
+ },
25
+ senderSigningKey: {
26
+ public: Buffer.from(signatureKeyPublic || []),
27
+ private: Buffer.from(signatureKeyPrivate || [])
28
+ },
32
29
  senderMessageKeys: []
33
30
  };
34
31
  }
@@ -46,26 +43,17 @@ export class SenderKeyState {
46
43
  };
47
44
  }
48
45
  getSigningKeyPublic() {
49
- const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
50
- if (publicKey instanceof Buffer) {
51
- return publicKey;
46
+ const publicKey = Buffer.from(this.senderKeyStateStructure.senderSigningKey.public);
47
+ if (publicKey.length === 32) {
48
+ const fixed = Buffer.alloc(33);
49
+ fixed[0] = 0x05;
50
+ publicKey.copy(fixed, 1);
51
+ return fixed;
52
52
  }
53
- else if (typeof publicKey === 'string') {
54
- return Buffer.from(publicKey, 'base64');
55
- }
56
- return Buffer.from(publicKey || []);
53
+ return publicKey;
57
54
  }
58
55
  getSigningKeyPrivate() {
59
56
  const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
60
- if (!privateKey) {
61
- return undefined;
62
- }
63
- if (privateKey instanceof Buffer) {
64
- return privateKey;
65
- }
66
- else if (typeof privateKey === 'string') {
67
- return Buffer.from(privateKey, 'base64');
68
- }
69
57
  return Buffer.from(privateKey || []);
70
58
  }
71
59
  hasSenderMessageKey(iteration) {
@@ -1 +1 @@
1
- {"version":3,"file":"sender-key-state.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sender-key-state.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"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"}