tool-db 1.2.0 → 1.2.1
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/toolDbClientOnMessage.js +210 -204
- package/dist/toolDbClientOnMessage.js.map +1 -1
- package/dist/wss.js +9 -6
- package/dist/wss.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,237 +22,243 @@ function toolDbClientOnMessage(data, socket) {
|
|
|
22
22
|
var _this = this;
|
|
23
23
|
var originalData = data;
|
|
24
24
|
if (typeof data === "string") {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
this._idListeners[msgId]
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
35
|
-
if (message_1.type === "ping") {
|
|
36
|
-
socket.toolDbId = message_1.clientId;
|
|
37
|
-
this.websockets._clientSockets[message_1.clientId] = socket;
|
|
38
|
-
socket.isServer = message_1.isServer;
|
|
39
|
-
this.websockets.sendToClientId(socket.toolDbId || "", {
|
|
40
|
-
type: "pong",
|
|
41
|
-
isServer: this.options.server,
|
|
42
|
-
clientId: this.options.id,
|
|
43
|
-
to: [],
|
|
44
|
-
id: (0, _1.textRandom)(10),
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
if (message_1.type === "pong") {
|
|
48
|
-
socket.toolDbId = message_1.clientId;
|
|
49
|
-
socket.isServer = message_1.isServer;
|
|
50
|
-
this.websockets._clientSockets[message_1.clientId] = socket;
|
|
51
|
-
this.onConnect();
|
|
52
|
-
}
|
|
53
|
-
if (message_1.type === "subscribe") {
|
|
54
|
-
if (socket.toolDbId) {
|
|
55
|
-
var subId = socket.toolDbId + "-" + message_1.key;
|
|
56
|
-
if (!this.subscriptions.includes(subId)) {
|
|
57
|
-
this.subscriptions.push(subId);
|
|
58
|
-
this.addKeyListener(message_1.key, function (msg) {
|
|
59
|
-
if ((msg.type === "put" || msg.type === "crdt") &&
|
|
60
|
-
socket.toolDbId) {
|
|
61
|
-
// We do not reply to the socket directly
|
|
62
|
-
// instead we use the client id, in case the socket reconnects
|
|
63
|
-
_this.websockets.sendToClientId(socket.toolDbId, msg);
|
|
64
|
-
}
|
|
65
|
-
});
|
|
25
|
+
try {
|
|
26
|
+
var message_1 = JSON.parse(data);
|
|
27
|
+
console.warn("Got message > ", message_1.type, message_1.k || "", message_1);
|
|
28
|
+
// Check if we are listening for this ID
|
|
29
|
+
if (message_1.id) {
|
|
30
|
+
var msgId = message_1.id;
|
|
31
|
+
if (this._idListeners[msgId]) {
|
|
32
|
+
this._idListeners[msgId](message_1);
|
|
33
|
+
this.removeIdListener(msgId);
|
|
66
34
|
}
|
|
67
35
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
36
|
+
if (message_1.type === "ping") {
|
|
37
|
+
socket.toolDbId = message_1.clientId;
|
|
38
|
+
this.websockets._clientSockets[message_1.clientId] = socket;
|
|
39
|
+
socket.isServer = message_1.isServer;
|
|
40
|
+
this.websockets.sendToClientId(socket.toolDbId || "", {
|
|
41
|
+
type: "pong",
|
|
42
|
+
isServer: this.options.server,
|
|
43
|
+
clientId: this.options.id,
|
|
44
|
+
to: [],
|
|
45
|
+
id: (0, _1.textRandom)(10),
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
if (message_1.type === "pong") {
|
|
49
|
+
socket.toolDbId = message_1.clientId;
|
|
50
|
+
socket.isServer = message_1.isServer;
|
|
51
|
+
this.websockets._clientSockets[message_1.clientId] = socket;
|
|
52
|
+
this.onConnect();
|
|
53
|
+
}
|
|
54
|
+
if (message_1.type === "subscribe") {
|
|
55
|
+
if (socket.toolDbId) {
|
|
56
|
+
var subId = socket.toolDbId + "-" + message_1.key;
|
|
57
|
+
if (!this.subscriptions.includes(subId)) {
|
|
58
|
+
this.subscriptions.push(subId);
|
|
59
|
+
this.addKeyListener(message_1.key, function (msg) {
|
|
60
|
+
if ((msg.type === "put" || msg.type === "crdt") &&
|
|
61
|
+
socket.toolDbId) {
|
|
62
|
+
// We do not reply to the socket directly
|
|
63
|
+
// instead we use the client id, in case the socket reconnects
|
|
64
|
+
_this.websockets.sendToClientId(socket.toolDbId, msg);
|
|
65
|
+
}
|
|
66
|
+
});
|
|
77
67
|
}
|
|
78
68
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
id: (0, _1.textRandom)(10),
|
|
90
|
-
doc: (0, _1.uint8ToBase64)(savedDoc),
|
|
91
|
-
};
|
|
92
|
-
_this.websockets.sendToClientId(socket.toolDbId || "", msg);
|
|
93
|
-
}
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
if (message_1.type === "get") {
|
|
97
|
-
this.store.get(message_1.key, function (err, data) {
|
|
98
|
-
if (data) {
|
|
99
|
-
try {
|
|
100
|
-
// Use the id of the get so the other client knows we are replying
|
|
101
|
-
var oldData = __assign(__assign({ type: "put" }, JSON.parse(data)), { id: message_1.id });
|
|
102
|
-
_this.websockets.sendToClientId(socket.toolDbId || "", oldData);
|
|
69
|
+
// basically the exact same as GET, below
|
|
70
|
+
this.store.get(message_1.key, function (err, data) {
|
|
71
|
+
if (data) {
|
|
72
|
+
try {
|
|
73
|
+
var oldData = __assign(__assign({}, JSON.parse(data)), { id: message_1.id });
|
|
74
|
+
_this.websockets.sendToClientId(socket.toolDbId || "", oldData);
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
// do nothing
|
|
78
|
+
}
|
|
103
79
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
80
|
+
});
|
|
81
|
+
this.loadCrdtDocument(message_1.key, false).then(function (doc) {
|
|
82
|
+
// console.log("Load crdt from subscribe", message.key, doc);
|
|
83
|
+
if (doc) {
|
|
84
|
+
var savedDoc = automerge_1.default.save(doc);
|
|
85
|
+
// console.log("saved", savedDoc);
|
|
86
|
+
var msg = {
|
|
87
|
+
type: "crdt",
|
|
88
|
+
key: message_1.key,
|
|
89
|
+
to: [],
|
|
90
|
+
id: (0, _1.textRandom)(10),
|
|
91
|
+
doc: (0, _1.uint8ToBase64)(savedDoc),
|
|
92
|
+
};
|
|
93
|
+
_this.websockets.sendToClientId(socket.toolDbId || "", msg);
|
|
107
94
|
}
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
if (message_1.type === "get") {
|
|
98
|
+
this.store.get(message_1.key, function (err, data) {
|
|
99
|
+
if (data) {
|
|
100
|
+
try {
|
|
101
|
+
// Use the id of the get so the other client knows we are replying
|
|
102
|
+
var oldData = __assign(__assign({ type: "put" }, JSON.parse(data)), { id: message_1.id });
|
|
103
|
+
_this.websockets.sendToClientId(socket.toolDbId || "", oldData);
|
|
104
|
+
}
|
|
105
|
+
catch (e) {
|
|
106
|
+
// socket.send(data);
|
|
107
|
+
// do nothing
|
|
108
|
+
}
|
|
112
109
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
110
|
+
else {
|
|
111
|
+
if (_this.options.debug) {
|
|
112
|
+
console.log("Local key not found, relay", originalData);
|
|
113
|
+
}
|
|
114
|
+
_this.websockets.send(message_1);
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
if (message_1.type === "put") {
|
|
119
|
+
toolDbVerificationWrapper_1.default.call(this, message_1).then(function (value) {
|
|
120
|
+
// console.log("Verification wrapper result: ", value, message.k);
|
|
121
|
+
if (value === _1.VerifyResult.Verified) {
|
|
122
|
+
// relay to other servers !!!
|
|
123
|
+
_this.websockets.send(message_1);
|
|
124
|
+
_this.store.get(message_1.k, function (err, oldData) {
|
|
125
|
+
if (oldData) {
|
|
126
|
+
var parsedOldData = __assign({ type: "put" }, JSON.parse(oldData));
|
|
127
|
+
if (parsedOldData.t < message_1.t) {
|
|
128
|
+
var key = message_1.k;
|
|
129
|
+
_this.triggerKeyListener(key, message_1);
|
|
130
|
+
_this.store.put(message_1.k, JSON.stringify(message_1), function (err, data) {
|
|
131
|
+
//
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
var key = message_1.k;
|
|
136
|
+
_this.triggerKeyListener(key, parsedOldData);
|
|
137
|
+
}
|
|
138
|
+
// } else if (this.options.debug) {
|
|
139
|
+
// console.log(
|
|
140
|
+
// `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
|
|
141
|
+
// );
|
|
142
|
+
// }
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
127
145
|
var key = message_1.k;
|
|
128
146
|
_this.triggerKeyListener(key, message_1);
|
|
129
147
|
_this.store.put(message_1.k, JSON.stringify(message_1), function (err, data) {
|
|
130
148
|
//
|
|
131
149
|
});
|
|
132
150
|
}
|
|
133
|
-
|
|
134
|
-
var key = message_1.k;
|
|
135
|
-
_this.triggerKeyListener(key, parsedOldData);
|
|
136
|
-
}
|
|
137
|
-
// } else if (this.options.debug) {
|
|
138
|
-
// console.log(
|
|
139
|
-
// `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
|
|
140
|
-
// );
|
|
141
|
-
// }
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
var key = message_1.k;
|
|
145
|
-
_this.triggerKeyListener(key, message_1);
|
|
146
|
-
_this.store.put(message_1.k, JSON.stringify(message_1), function (err, data) {
|
|
147
|
-
//
|
|
148
|
-
});
|
|
149
|
-
}
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
console.warn("unverified message: ", value, message_1);
|
|
154
|
-
}
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
if (message_1.type === "crdtPut") {
|
|
158
|
-
// key = aggregated, final value
|
|
159
|
-
// key.crdt = automerge doc with changes
|
|
160
|
-
// const writeStart = new Date().getTime();
|
|
161
|
-
toolDbVerificationWrapper_1.default.call(this, message_1).then(function (value) {
|
|
162
|
-
// console.log("CRDT Verification wrapper result: ", value);
|
|
163
|
-
if (value === _1.VerifyResult.Verified) {
|
|
164
|
-
var key_1 = message_1.k;
|
|
165
|
-
var data_1 = [];
|
|
166
|
-
try {
|
|
167
|
-
data_1 = JSON.parse(message_1.v);
|
|
151
|
+
});
|
|
168
152
|
}
|
|
169
|
-
|
|
170
|
-
|
|
153
|
+
else {
|
|
154
|
+
console.warn("unverified message: ", value, message_1);
|
|
171
155
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
var
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
if (message_1.type === "crdtPut") {
|
|
159
|
+
// key = aggregated, final value
|
|
160
|
+
// key.crdt = automerge doc with changes
|
|
161
|
+
// const writeStart = new Date().getTime();
|
|
162
|
+
toolDbVerificationWrapper_1.default.call(this, message_1).then(function (value) {
|
|
163
|
+
// console.log("CRDT Verification wrapper result: ", value);
|
|
164
|
+
if (value === _1.VerifyResult.Verified) {
|
|
165
|
+
var key_1 = message_1.k;
|
|
166
|
+
var data_1 = [];
|
|
183
167
|
try {
|
|
184
|
-
|
|
168
|
+
data_1 = JSON.parse(message_1.v);
|
|
185
169
|
}
|
|
186
170
|
catch (e) {
|
|
171
|
+
//
|
|
172
|
+
}
|
|
173
|
+
var changes_1 = data_1.map(base64ToBinaryChange_1.default);
|
|
174
|
+
_this.loadCrdtDocument(key_1).then(function (currentDoc) {
|
|
175
|
+
// if (currentDoc) {
|
|
176
|
+
// console.log(
|
|
177
|
+
// "loaded",
|
|
178
|
+
// key,
|
|
179
|
+
// currentDoc,
|
|
180
|
+
// Automerge.getHistory(currentDoc)
|
|
181
|
+
// );
|
|
182
|
+
// }
|
|
183
|
+
var newDoc = automerge_1.default.init();
|
|
187
184
|
try {
|
|
188
|
-
newDoc = automerge_1.default.applyChanges(automerge_1.default.init(), changes_1)[0];
|
|
185
|
+
newDoc = automerge_1.default.applyChanges(currentDoc || automerge_1.default.init(), changes_1)[0];
|
|
189
186
|
}
|
|
190
|
-
catch (
|
|
191
|
-
|
|
192
|
-
|
|
187
|
+
catch (e) {
|
|
188
|
+
try {
|
|
189
|
+
newDoc = automerge_1.default.applyChanges(automerge_1.default.init(), changes_1)[0];
|
|
190
|
+
}
|
|
191
|
+
catch (ee) {
|
|
192
|
+
if (_this.options.debug) {
|
|
193
|
+
console.log(ee);
|
|
194
|
+
}
|
|
193
195
|
}
|
|
194
196
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
197
|
+
// if (newDoc) {
|
|
198
|
+
// console.log(
|
|
199
|
+
// "new document changes:",
|
|
200
|
+
// Automerge.getHistory(newDoc)
|
|
201
|
+
// );
|
|
202
|
+
// }
|
|
203
|
+
// persist
|
|
204
|
+
_this.documents[key_1] = newDoc;
|
|
205
|
+
var savedDoc = automerge_1.default.save(newDoc);
|
|
206
|
+
_this.store.put(key_1 + ".crdt", savedDoc, function (err, data) {
|
|
207
|
+
// const writeEnd = new Date().getTime();
|
|
208
|
+
// console.log("CRDT write: ", (writeEnd - writeStart) / 1000);
|
|
209
|
+
});
|
|
210
|
+
var crdtMessage = {
|
|
211
|
+
type: "crdt",
|
|
212
|
+
key: key_1,
|
|
213
|
+
id: message_1.id,
|
|
214
|
+
to: [],
|
|
215
|
+
doc: (0, _1.uint8ToBase64)(savedDoc),
|
|
216
|
+
};
|
|
217
|
+
_this.triggerKeyListener(key_1, crdtMessage);
|
|
218
|
+
// relay to other servers
|
|
219
|
+
// !!!
|
|
220
|
+
_this.websockets.send(crdtMessage);
|
|
208
221
|
});
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
console.log("unverified message", value, message_1);
|
|
225
|
+
}
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
if (message_1.type === "crdtGet") {
|
|
229
|
+
this.loadCrdtDocument(message_1.key).then(function (currentDoc) {
|
|
230
|
+
var saved = automerge_1.default.save(currentDoc || automerge_1.default.init());
|
|
231
|
+
_this.websockets.sendToClientId(socket.toolDbId || "", {
|
|
232
|
+
type: "crdt",
|
|
233
|
+
id: message_1.id,
|
|
234
|
+
key: message_1.key,
|
|
235
|
+
to: [],
|
|
236
|
+
doc: (0, _1.uint8ToBase64)(saved),
|
|
220
237
|
});
|
|
221
|
-
}
|
|
222
|
-
else {
|
|
223
|
-
console.log("unverified message", value, message_1);
|
|
224
|
-
}
|
|
225
|
-
});
|
|
226
|
-
}
|
|
227
|
-
if (message_1.type === "crdtGet") {
|
|
228
|
-
this.loadCrdtDocument(message_1.key).then(function (currentDoc) {
|
|
229
|
-
var saved = automerge_1.default.save(currentDoc || automerge_1.default.init());
|
|
230
|
-
_this.websockets.sendToClientId(socket.toolDbId || "", {
|
|
231
|
-
type: "crdt",
|
|
232
|
-
id: message_1.id,
|
|
233
|
-
key: message_1.key,
|
|
234
|
-
to: [],
|
|
235
|
-
doc: (0, _1.uint8ToBase64)(saved),
|
|
236
238
|
});
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
239
|
+
}
|
|
240
|
+
if (message_1.type === "query") {
|
|
241
|
+
this.store.query(message_1.key).then(function (keys) {
|
|
242
|
+
_this.websockets.sendToClientId(socket.toolDbId || "", {
|
|
243
|
+
type: "queryAck",
|
|
244
|
+
id: message_1.id,
|
|
245
|
+
to: [],
|
|
246
|
+
keys: keys,
|
|
247
|
+
});
|
|
246
248
|
});
|
|
247
|
-
}
|
|
249
|
+
}
|
|
250
|
+
if (message_1.type === "crdt") {
|
|
251
|
+
var key = message_1.key;
|
|
252
|
+
this.triggerKeyListener(key, message_1);
|
|
253
|
+
var savedDoc = (0, _1.base64ToBinaryDocument)(message_1.doc);
|
|
254
|
+
this.store.put(key + ".crdt", savedDoc, function (err, data) {
|
|
255
|
+
//
|
|
256
|
+
});
|
|
257
|
+
}
|
|
248
258
|
}
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
var savedDoc = (0, _1.base64ToBinaryDocument)(message_1.doc);
|
|
253
|
-
this.store.put(key + ".crdt", savedDoc, function (err, data) {
|
|
254
|
-
//
|
|
255
|
-
});
|
|
259
|
+
catch (e) {
|
|
260
|
+
console.log("Got message ERR > ", data);
|
|
261
|
+
console.log(e);
|
|
256
262
|
}
|
|
257
263
|
}
|
|
258
264
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sBAUW;AAEX,0FAAoE;AAEpE,wDAAkC;AAClC,sFAAgE;AAGhE,SAAwB,qBAAqB,CAE3C,IAAY,EACZ,MAAuB;IAHzB,
|
|
1
|
+
{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":"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"}
|
package/dist/wss.js
CHANGED
|
@@ -202,20 +202,23 @@ var WSS = /** @class */ (function () {
|
|
|
202
202
|
var _this = this;
|
|
203
203
|
if (crossServer === void 0) { crossServer = false; }
|
|
204
204
|
var to = lodash_1.default.uniq(__spreadArray(__spreadArray([], msg.to, true), [this.options.id], false));
|
|
205
|
-
var filteredConns =
|
|
206
|
-
.filter(function (
|
|
205
|
+
var filteredConns = Object.keys(this.clientSockets)
|
|
206
|
+
.filter(function (id) { return !to.includes(id); })
|
|
207
207
|
.map(function (clientId) { return _this._clientSockets[clientId]; })
|
|
208
208
|
.filter(function (conn) { return conn && conn.readyState === conn.OPEN; });
|
|
209
|
+
// console.log(">> Send message: ", msg, "to: ", to);
|
|
209
210
|
// console.log(
|
|
210
|
-
// "
|
|
211
|
-
// filteredConns.map((c) => c.
|
|
212
|
-
// "but not to",
|
|
213
|
-
// filterUrls
|
|
211
|
+
// "filteredConns ",
|
|
212
|
+
// filteredConns.map((c) => c.toolDbId)
|
|
214
213
|
// );
|
|
215
214
|
filteredConns.forEach(function (conn) {
|
|
216
215
|
if ((crossServer && conn.isServer) || !crossServer) {
|
|
216
|
+
// console.log("Sent out to: ", conn.toolDbId, conn.origUrl);
|
|
217
217
|
conn.send(JSON.stringify(__assign(__assign({}, msg), { to: to })));
|
|
218
218
|
}
|
|
219
|
+
else {
|
|
220
|
+
// console.log("Fitlered out!", conn.toolDbId, conn.origUrl);
|
|
221
|
+
}
|
|
219
222
|
});
|
|
220
223
|
};
|
|
221
224
|
WSS.prototype.sendToClientId = function (clientId, msg) {
|
package/dist/wss.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wss.js","sourceRoot":"","sources":["../src/wss.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"wss.js","sourceRoot":"","sources":["../src/wss.ts"],"names":[],"mappings":"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"}
|