@calimero-network/mero-js 7.0.4 → 7.1.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/dist/admin-api/admin-client.d.ts +8 -4
- package/dist/admin-api/admin-client.d.ts.map +1 -1
- package/dist/admin-api/admin-client.js +84 -27
- package/dist/admin-api/admin-client.js.map +1 -1
- package/dist/admin-api/admin-types.d.ts +7 -1
- package/dist/admin-api/admin-types.d.ts.map +1 -1
- package/dist/events/group.d.ts +10 -0
- package/dist/events/group.d.ts.map +1 -0
- package/dist/events/group.js +2 -0
- package/dist/events/group.js.map +1 -0
- package/dist/events/index.d.ts +1 -0
- package/dist/events/index.d.ts.map +1 -1
- package/dist/events/sse.d.ts +12 -4
- package/dist/events/sse.d.ts.map +1 -1
- package/dist/events/sse.js +58 -27
- package/dist/events/sse.js.map +1 -1
- package/dist/events/ws.d.ts +14 -4
- package/dist/events/ws.d.ts.map +1 -1
- package/dist/events/ws.js +60 -29
- package/dist/events/ws.js.map +1 -1
- package/dist/index.browser.mjs +2 -2
- package/dist/index.browser.mjs.map +3 -3
- package/dist/index.cjs +156 -74
- package/dist/index.cjs.map +2 -2
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +156 -74
- package/dist/index.mjs.map +2 -2
- package/package.json +1 -1
package/dist/events/sse.js
CHANGED
|
@@ -4,6 +4,7 @@ export class SseClient {
|
|
|
4
4
|
this.abortController = null;
|
|
5
5
|
this.reconnectTimer = null;
|
|
6
6
|
this.subscribedContextIds = new Set();
|
|
7
|
+
this.subscribedGroupIds = new Set();
|
|
7
8
|
this.closed = false;
|
|
8
9
|
this.listeners = { connect: [], event: [], error: [] };
|
|
9
10
|
this.baseUrl = opts.baseUrl.replace(/\/+$/, '');
|
|
@@ -148,25 +149,30 @@ export class SseClient {
|
|
|
148
149
|
this.sessionId = msg.session_id;
|
|
149
150
|
this.emit('connect', msg.session_id);
|
|
150
151
|
// Re-subscribe after reconnect
|
|
151
|
-
if (this.subscribedContextIds.size > 0) {
|
|
152
|
-
this.sendSubscription('subscribe',
|
|
152
|
+
if (this.subscribedContextIds.size > 0 || this.subscribedGroupIds.size > 0) {
|
|
153
|
+
this.sendSubscription('subscribe', {
|
|
154
|
+
contextIds: [...this.subscribedContextIds],
|
|
155
|
+
groupIds: [...this.subscribedGroupIds],
|
|
156
|
+
});
|
|
153
157
|
}
|
|
154
158
|
return;
|
|
155
159
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
}
|
|
166
|
-
catch {
|
|
167
|
-
// Keep raw data
|
|
168
|
-
}
|
|
160
|
+
if (!msg.result)
|
|
161
|
+
return;
|
|
162
|
+
let eventData = msg.result.data;
|
|
163
|
+
// Decode byte-array data if needed
|
|
164
|
+
if (Array.isArray(eventData)) {
|
|
165
|
+
try {
|
|
166
|
+
const bytes = new Uint8Array(eventData);
|
|
167
|
+
const text = new TextDecoder().decode(bytes);
|
|
168
|
+
eventData = JSON.parse(text);
|
|
169
169
|
}
|
|
170
|
+
catch {
|
|
171
|
+
// Keep raw data
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
// Context event message
|
|
175
|
+
if (msg.result.contextId) {
|
|
170
176
|
this.emit('event', {
|
|
171
177
|
contextId: msg.result.contextId,
|
|
172
178
|
// Forward the event tag (sibling of `data` in core's flattened
|
|
@@ -174,33 +180,57 @@ export class SseClient {
|
|
|
174
180
|
type: msg.result.type,
|
|
175
181
|
data: eventData,
|
|
176
182
|
});
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
// Group-membership event message (untagged NodeEvent's group variant)
|
|
186
|
+
if (msg.result.groupId) {
|
|
187
|
+
this.emit('event', {
|
|
188
|
+
groupId: msg.result.groupId,
|
|
189
|
+
type: msg.result.type,
|
|
190
|
+
data: eventData,
|
|
191
|
+
});
|
|
177
192
|
}
|
|
178
193
|
}
|
|
179
194
|
catch {
|
|
180
195
|
// Invalid JSON, ignore
|
|
181
196
|
}
|
|
182
197
|
}
|
|
183
|
-
async subscribe(
|
|
184
|
-
const
|
|
185
|
-
|
|
198
|
+
async subscribe(idsOrOpts) {
|
|
199
|
+
const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
|
|
200
|
+
const newContextIds = (opts.contextIds ?? []).filter(id => !this.subscribedContextIds.has(id));
|
|
201
|
+
const newGroupIds = (opts.groupIds ?? []).filter(id => !this.subscribedGroupIds.has(id));
|
|
202
|
+
for (const id of opts.contextIds ?? []) {
|
|
186
203
|
this.subscribedContextIds.add(id);
|
|
187
204
|
}
|
|
188
|
-
|
|
189
|
-
|
|
205
|
+
for (const id of opts.groupIds ?? []) {
|
|
206
|
+
this.subscribedGroupIds.add(id);
|
|
207
|
+
}
|
|
208
|
+
if ((newContextIds.length > 0 || newGroupIds.length > 0) && this.sessionId) {
|
|
209
|
+
await this.sendSubscription('subscribe', { contextIds: newContextIds, groupIds: newGroupIds });
|
|
190
210
|
}
|
|
191
211
|
}
|
|
192
|
-
async unsubscribe(
|
|
193
|
-
const
|
|
194
|
-
|
|
212
|
+
async unsubscribe(idsOrOpts) {
|
|
213
|
+
const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
|
|
214
|
+
const hadContextIds = (opts.contextIds ?? []).filter(id => this.subscribedContextIds.has(id));
|
|
215
|
+
const hadGroupIds = (opts.groupIds ?? []).filter(id => this.subscribedGroupIds.has(id));
|
|
216
|
+
for (const id of opts.contextIds ?? []) {
|
|
195
217
|
this.subscribedContextIds.delete(id);
|
|
196
218
|
}
|
|
197
|
-
|
|
198
|
-
|
|
219
|
+
for (const id of opts.groupIds ?? []) {
|
|
220
|
+
this.subscribedGroupIds.delete(id);
|
|
221
|
+
}
|
|
222
|
+
if ((hadContextIds.length > 0 || hadGroupIds.length > 0) && this.sessionId) {
|
|
223
|
+
await this.sendSubscription('unsubscribe', { contextIds: hadContextIds, groupIds: hadGroupIds });
|
|
199
224
|
}
|
|
200
225
|
}
|
|
201
|
-
async sendSubscription(method,
|
|
226
|
+
async sendSubscription(method, ids) {
|
|
202
227
|
try {
|
|
203
228
|
const token = await this.getAuthToken();
|
|
229
|
+
const params = {};
|
|
230
|
+
if (ids.contextIds && ids.contextIds.length > 0)
|
|
231
|
+
params.contextIds = ids.contextIds;
|
|
232
|
+
if (ids.groupIds && ids.groupIds.length > 0)
|
|
233
|
+
params.groupIds = ids.groupIds;
|
|
204
234
|
const response = await fetch(`${this.baseUrl}/sse/subscription`, {
|
|
205
235
|
method: 'POST',
|
|
206
236
|
headers: {
|
|
@@ -210,7 +240,7 @@ export class SseClient {
|
|
|
210
240
|
body: JSON.stringify({
|
|
211
241
|
id: this.sessionId,
|
|
212
242
|
method,
|
|
213
|
-
params
|
|
243
|
+
params,
|
|
214
244
|
}),
|
|
215
245
|
});
|
|
216
246
|
if (!response.ok) {
|
|
@@ -252,6 +282,7 @@ export class SseClient {
|
|
|
252
282
|
}
|
|
253
283
|
this.sessionId = null;
|
|
254
284
|
this.subscribedContextIds.clear();
|
|
285
|
+
this.subscribedGroupIds.clear();
|
|
255
286
|
}
|
|
256
287
|
}
|
|
257
288
|
//# sourceMappingURL=sse.js.map
|
package/dist/events/sse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/events/sse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/events/sse.ts"],"names":[],"mappings":"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"}
|
package/dist/events/ws.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { GroupMembershipEventData } from './group';
|
|
2
|
+
export type { GroupMembershipEventData };
|
|
1
3
|
export interface WsEventData {
|
|
2
4
|
contextId: string;
|
|
3
5
|
/** The context-event discriminator (core serializes it as a sibling of
|
|
@@ -5,7 +7,7 @@ export interface WsEventData {
|
|
|
5
7
|
type?: string;
|
|
6
8
|
data: unknown;
|
|
7
9
|
}
|
|
8
|
-
type WsEventHandler = (event: WsEventData) => void;
|
|
10
|
+
type WsEventHandler = (event: WsEventData | GroupMembershipEventData) => void;
|
|
9
11
|
type WsConnectHandler = () => void;
|
|
10
12
|
type WsErrorHandler = (error: Error) => void;
|
|
11
13
|
/**
|
|
@@ -20,6 +22,7 @@ export declare class WsClient {
|
|
|
20
22
|
private reconnectAttempt;
|
|
21
23
|
private reconnectTimer;
|
|
22
24
|
private subscribedContextIds;
|
|
25
|
+
private subscribedGroupIds;
|
|
23
26
|
private listeners;
|
|
24
27
|
private static readonly MAX_BACKOFF_MS;
|
|
25
28
|
constructor(opts: {
|
|
@@ -35,11 +38,18 @@ export declare class WsClient {
|
|
|
35
38
|
private emit;
|
|
36
39
|
connect(): Promise<void>;
|
|
37
40
|
private handleMessage;
|
|
38
|
-
subscribe(
|
|
39
|
-
|
|
41
|
+
subscribe(idsOrOpts: string[] | {
|
|
42
|
+
contextIds?: string[];
|
|
43
|
+
groupIds?: string[];
|
|
44
|
+
}): void;
|
|
45
|
+
unsubscribe(idsOrOpts: string[] | {
|
|
46
|
+
contextIds?: string[];
|
|
47
|
+
groupIds?: string[];
|
|
48
|
+
}): void;
|
|
49
|
+
private resubscribeAfterReconnect;
|
|
50
|
+
private buildSubscriptionParams;
|
|
40
51
|
private sendMessage;
|
|
41
52
|
private scheduleReconnect;
|
|
42
53
|
close(): void;
|
|
43
54
|
}
|
|
44
|
-
export {};
|
|
45
55
|
//# sourceMappingURL=ws.d.ts.map
|
package/dist/events/ws.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/events/ws.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;CACf;AAED,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/events/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAEzC,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;CACf;AAED,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,wBAAwB,KAAK,IAAI,CAAC;AAC9E,KAAK,gBAAgB,GAAG,MAAM,IAAI,CAAC;AACnC,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAQ7C;;;GAGG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,oBAAoB,CAA0B;IACtD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,SAAS,CAAsD;IAEvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAS;gBAEnC,IAAI,EAAE;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;KACrC;IAKD,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI;IACrD,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IACjD,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IAUjD,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI;IACtD,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IAClD,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IAWlD,OAAO,CAAC,IAAI;IAiBN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0C9B,OAAO,CAAC,aAAa;IA2CrB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG;QAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAkBrF,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG;QAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAkBvF,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,iBAAiB;IAgBzB,KAAK,IAAI,IAAI;CAcd"}
|
package/dist/events/ws.js
CHANGED
|
@@ -9,6 +9,7 @@ export class WsClient {
|
|
|
9
9
|
this.reconnectAttempt = 0;
|
|
10
10
|
this.reconnectTimer = null;
|
|
11
11
|
this.subscribedContextIds = new Set();
|
|
12
|
+
this.subscribedGroupIds = new Set();
|
|
12
13
|
this.listeners = { connect: [], event: [], error: [] };
|
|
13
14
|
this.baseUrl = opts.baseUrl.replace(/\/+$/, '');
|
|
14
15
|
this.getAuthToken = opts.getAuthToken;
|
|
@@ -47,7 +48,7 @@ export class WsClient {
|
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
async connect() {
|
|
50
|
-
if (this.ws && (this.ws.readyState ===
|
|
51
|
+
if (this.ws && (this.ws.readyState === 0 /* CONNECTING */ || this.ws.readyState === 1 /* OPEN */)) {
|
|
51
52
|
return;
|
|
52
53
|
}
|
|
53
54
|
this.closed = false;
|
|
@@ -62,14 +63,7 @@ export class WsClient {
|
|
|
62
63
|
this.ws.onopen = () => {
|
|
63
64
|
this.reconnectAttempt = 0;
|
|
64
65
|
this.emit('connect');
|
|
65
|
-
|
|
66
|
-
if (this.subscribedContextIds.size > 0) {
|
|
67
|
-
this.sendMessage({
|
|
68
|
-
id: null,
|
|
69
|
-
method: 'subscribe',
|
|
70
|
-
params: { contextIds: [...this.subscribedContextIds] },
|
|
71
|
-
});
|
|
72
|
-
}
|
|
66
|
+
this.resubscribeAfterReconnect();
|
|
73
67
|
};
|
|
74
68
|
this.ws.onmessage = (event) => {
|
|
75
69
|
this.handleMessage(event.data);
|
|
@@ -96,18 +90,20 @@ export class WsClient {
|
|
|
96
90
|
return;
|
|
97
91
|
try {
|
|
98
92
|
const msg = JSON.parse(raw);
|
|
99
|
-
if (msg.result
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
93
|
+
if (!msg.result)
|
|
94
|
+
return;
|
|
95
|
+
let eventData = msg.result.data;
|
|
96
|
+
if (Array.isArray(eventData)) {
|
|
97
|
+
try {
|
|
98
|
+
const bytes = new Uint8Array(eventData);
|
|
99
|
+
const text = new TextDecoder().decode(bytes);
|
|
100
|
+
eventData = JSON.parse(text);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
// Keep raw data
|
|
110
104
|
}
|
|
105
|
+
}
|
|
106
|
+
if (msg.result.contextId) {
|
|
111
107
|
this.emit('event', {
|
|
112
108
|
contextId: msg.result.contextId,
|
|
113
109
|
// Forward the event tag (sibling of `data` in core's flattened
|
|
@@ -115,38 +111,72 @@ export class WsClient {
|
|
|
115
111
|
type: msg.result.type,
|
|
116
112
|
data: eventData,
|
|
117
113
|
});
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
// Group-membership event message (untagged NodeEvent's group variant)
|
|
117
|
+
if (msg.result.groupId) {
|
|
118
|
+
this.emit('event', {
|
|
119
|
+
groupId: msg.result.groupId,
|
|
120
|
+
type: msg.result.type,
|
|
121
|
+
data: eventData,
|
|
122
|
+
});
|
|
118
123
|
}
|
|
119
124
|
}
|
|
120
125
|
catch {
|
|
121
126
|
// Invalid JSON, ignore
|
|
122
127
|
}
|
|
123
128
|
}
|
|
124
|
-
subscribe(
|
|
125
|
-
|
|
129
|
+
subscribe(idsOrOpts) {
|
|
130
|
+
const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
|
|
131
|
+
for (const id of opts.contextIds ?? []) {
|
|
126
132
|
this.subscribedContextIds.add(id);
|
|
127
133
|
}
|
|
128
|
-
|
|
134
|
+
for (const id of opts.groupIds ?? []) {
|
|
135
|
+
this.subscribedGroupIds.add(id);
|
|
136
|
+
}
|
|
137
|
+
if (this.ws && this.ws.readyState === 1 /* OPEN */) {
|
|
129
138
|
this.sendMessage({
|
|
130
139
|
id: null,
|
|
131
140
|
method: 'subscribe',
|
|
132
|
-
params:
|
|
141
|
+
params: this.buildSubscriptionParams(opts.contextIds ?? [], opts.groupIds ?? []),
|
|
133
142
|
});
|
|
134
143
|
}
|
|
135
144
|
}
|
|
136
|
-
unsubscribe(
|
|
137
|
-
|
|
145
|
+
unsubscribe(idsOrOpts) {
|
|
146
|
+
const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
|
|
147
|
+
for (const id of opts.contextIds ?? []) {
|
|
138
148
|
this.subscribedContextIds.delete(id);
|
|
139
149
|
}
|
|
140
|
-
|
|
150
|
+
for (const id of opts.groupIds ?? []) {
|
|
151
|
+
this.subscribedGroupIds.delete(id);
|
|
152
|
+
}
|
|
153
|
+
if (this.ws && this.ws.readyState === 1 /* OPEN */) {
|
|
141
154
|
this.sendMessage({
|
|
142
155
|
id: null,
|
|
143
156
|
method: 'unsubscribe',
|
|
144
|
-
params:
|
|
157
|
+
params: this.buildSubscriptionParams(opts.contextIds ?? [], opts.groupIds ?? []),
|
|
145
158
|
});
|
|
146
159
|
}
|
|
147
160
|
}
|
|
161
|
+
resubscribeAfterReconnect() {
|
|
162
|
+
if (this.subscribedContextIds.size === 0 && this.subscribedGroupIds.size === 0)
|
|
163
|
+
return;
|
|
164
|
+
this.sendMessage({
|
|
165
|
+
id: null,
|
|
166
|
+
method: 'subscribe',
|
|
167
|
+
params: this.buildSubscriptionParams([...this.subscribedContextIds], [...this.subscribedGroupIds]),
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
buildSubscriptionParams(contextIds, groupIds) {
|
|
171
|
+
const params = {};
|
|
172
|
+
if (contextIds.length > 0)
|
|
173
|
+
params.contextIds = contextIds;
|
|
174
|
+
if (groupIds.length > 0)
|
|
175
|
+
params.groupIds = groupIds;
|
|
176
|
+
return params;
|
|
177
|
+
}
|
|
148
178
|
sendMessage(msg) {
|
|
149
|
-
if (this.ws && this.ws.readyState ===
|
|
179
|
+
if (this.ws && this.ws.readyState === 1 /* OPEN */) {
|
|
150
180
|
this.ws.send(JSON.stringify(msg));
|
|
151
181
|
}
|
|
152
182
|
}
|
|
@@ -175,6 +205,7 @@ export class WsClient {
|
|
|
175
205
|
this.ws = null;
|
|
176
206
|
}
|
|
177
207
|
this.subscribedContextIds.clear();
|
|
208
|
+
this.subscribedGroupIds.clear();
|
|
178
209
|
}
|
|
179
210
|
}
|
|
180
211
|
WsClient.MAX_BACKOFF_MS = 30000;
|
package/dist/events/ws.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/events/ws.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/events/ws.ts"],"names":[],"mappings":"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"}
|