@bsv/wallet-toolbox 2.1.0-beta.3 → 2.1.2
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/CHANGELOG.md +31 -1
- package/docs/client.md +581 -199
- package/docs/monitor.md +30 -11
- package/docs/services.md +78 -27
- package/docs/storage.md +18 -82
- package/docs/wallet.md +581 -199
- package/out/src/Setup.js +1 -4
- package/out/src/Setup.js.map +1 -1
- package/out/src/WalletPermissionsManager.d.ts +4 -2
- package/out/src/WalletPermissionsManager.d.ts.map +1 -1
- package/out/src/WalletPermissionsManager.js +127 -35
- package/out/src/WalletPermissionsManager.js.map +1 -1
- package/out/src/__tests/WalletPermissionsManager.flows.test.js +113 -1
- package/out/src/__tests/WalletPermissionsManager.flows.test.js.map +1 -1
- package/out/src/mockchain/MockChainMigrations.js +1 -1
- package/out/src/mockchain/MockChainMigrations.js.map +1 -1
- package/out/src/sdk/WalletStorage.interfaces.d.ts +2 -0
- package/out/src/sdk/WalletStorage.interfaces.d.ts.map +1 -1
- package/out/src/services/Services.d.ts +15 -0
- package/out/src/services/Services.d.ts.map +1 -1
- package/out/src/services/Services.js +59 -4
- package/out/src/services/Services.js.map +1 -1
- package/out/src/services/chaintracker/chaintracks/Chaintracks.d.ts.map +1 -1
- package/out/src/services/chaintracker/chaintracks/Chaintracks.js +20 -4
- package/out/src/services/chaintracker/chaintracks/Chaintracks.js.map +1 -1
- package/out/src/services/chaintracker/chaintracks/Storage/ChaintracksKnexMigrations.js +1 -1
- package/out/src/services/chaintracker/chaintracks/Storage/ChaintracksKnexMigrations.js.map +1 -1
- package/out/src/services/chaintracker/chaintracks/__tests/bulkIngestorFailures.test.d.ts +2 -0
- package/out/src/services/chaintracker/chaintracks/__tests/bulkIngestorFailures.test.d.ts.map +1 -0
- package/out/src/services/chaintracker/chaintracks/__tests/bulkIngestorFailures.test.js +109 -0
- package/out/src/services/chaintracker/chaintracks/__tests/bulkIngestorFailures.test.js.map +1 -0
- package/out/src/storage/StorageIdb.d.ts.map +1 -1
- package/out/src/storage/StorageIdb.js +4 -0
- package/out/src/storage/StorageIdb.js.map +1 -1
- package/out/src/storage/StorageKnex.d.ts +8 -0
- package/out/src/storage/StorageKnex.d.ts.map +1 -1
- package/out/src/storage/StorageKnex.js +125 -71
- package/out/src/storage/StorageKnex.js.map +1 -1
- package/out/src/storage/StorageProvider.d.ts +8 -0
- package/out/src/storage/StorageProvider.d.ts.map +1 -1
- package/out/src/storage/StorageProvider.js +42 -0
- package/out/src/storage/StorageProvider.js.map +1 -1
- package/out/src/storage/methods/ListOutputsSpecOp.d.ts.map +1 -1
- package/out/src/storage/methods/ListOutputsSpecOp.js +24 -7
- package/out/src/storage/methods/ListOutputsSpecOp.js.map +1 -1
- package/out/src/storage/methods/createAction.d.ts.map +1 -1
- package/out/src/storage/methods/createAction.js +69 -32
- package/out/src/storage/methods/createAction.js.map +1 -1
- package/out/src/storage/methods/listActionsIdb.d.ts.map +1 -1
- package/out/src/storage/methods/listActionsIdb.js +17 -3
- package/out/src/storage/methods/listActionsIdb.js.map +1 -1
- package/out/src/storage/methods/listActionsKnex.d.ts.map +1 -1
- package/out/src/storage/methods/listActionsKnex.js +28 -2
- package/out/src/storage/methods/listActionsKnex.js.map +1 -1
- package/out/src/storage/methods/listOutputsKnex.d.ts.map +1 -1
- package/out/src/storage/methods/listOutputsKnex.js +83 -50
- package/out/src/storage/methods/listOutputsKnex.js.map +1 -1
- package/out/src/storage/remoting/StorageServer.d.ts +1 -0
- package/out/src/storage/remoting/StorageServer.d.ts.map +1 -1
- package/out/src/storage/remoting/StorageServer.js +58 -8
- package/out/src/storage/remoting/StorageServer.js.map +1 -1
- package/out/src/storage/remoting/__test/StorageClient.man.test.js +361 -96
- package/out/src/storage/remoting/__test/StorageClient.man.test.js.map +1 -1
- package/out/src/storage/schema/KnexMigrations.d.ts.map +1 -1
- package/out/src/storage/schema/KnexMigrations.js +41 -1
- package/out/src/storage/schema/KnexMigrations.js.map +1 -1
- package/out/src/storage/sync/StorageMySQLDojoReader.d.ts.map +1 -1
- package/out/src/storage/sync/StorageMySQLDojoReader.js +4 -0
- package/out/src/storage/sync/StorageMySQLDojoReader.js.map +1 -1
- package/out/src/utility/brc114ActionTimeLabels.d.ts +9 -0
- package/out/src/utility/brc114ActionTimeLabels.d.ts.map +1 -0
- package/out/src/utility/brc114ActionTimeLabels.js +51 -0
- package/out/src/utility/brc114ActionTimeLabels.js.map +1 -0
- package/package.json +3 -3
- package/out/src/services/chaintracker/chaintracks/Ingest/__tests/WhatsOnChainServices.test.d.ts +0 -2
- package/out/src/services/chaintracker/chaintracks/Ingest/__tests/WhatsOnChainServices.test.d.ts.map +0 -1
- package/out/src/services/chaintracker/chaintracks/Ingest/__tests/WhatsOnChainServices.test.js +0 -102
- package/out/src/services/chaintracker/chaintracks/Ingest/__tests/WhatsOnChainServices.test.js.map +0 -1
|
@@ -6,6 +6,7 @@ const ListActionsSpecOp_1 = require("./ListActionsSpecOp");
|
|
|
6
6
|
const types_1 = require("../../sdk/types");
|
|
7
7
|
const utilityHelpers_1 = require("../../utility/utilityHelpers");
|
|
8
8
|
const utilityHelpers_noBuffer_1 = require("../../utility/utilityHelpers.noBuffer");
|
|
9
|
+
const brc114ActionTimeLabels_1 = require("../../utility/brc114ActionTimeLabels");
|
|
9
10
|
async function listActions(storage, auth, vargs) {
|
|
10
11
|
const limit = vargs.limit;
|
|
11
12
|
const offset = vargs.offset;
|
|
@@ -14,10 +15,13 @@ async function listActions(storage, auth, vargs) {
|
|
|
14
15
|
totalActions: 0,
|
|
15
16
|
actions: []
|
|
16
17
|
};
|
|
18
|
+
const { from: actionTimeFrom, to: actionTimeTo, timeFilterRequested, remainingLabels: ordinaryLabelsPreSpecOp } = (0, brc114ActionTimeLabels_1.parseBrc114ActionTimeLabels)(vargs.labels);
|
|
19
|
+
const createdAtFrom = actionTimeFrom !== undefined ? new Date(actionTimeFrom) : undefined;
|
|
20
|
+
const createdAtTo = actionTimeTo !== undefined ? new Date(actionTimeTo) : undefined;
|
|
17
21
|
let specOp = undefined;
|
|
18
22
|
let specOpLabels = [];
|
|
19
23
|
let labels = [];
|
|
20
|
-
for (const label of
|
|
24
|
+
for (const label of ordinaryLabelsPreSpecOp) {
|
|
21
25
|
if ((0, types_1.isListActionsSpecOp)(label)) {
|
|
22
26
|
specOp = (0, ListActionsSpecOp_1.getLabelToSpecOp)()[label];
|
|
23
27
|
}
|
|
@@ -62,6 +66,7 @@ async function listActions(storage, auth, vargs) {
|
|
|
62
66
|
// any and only non-existing labels, impossible to satisfy.
|
|
63
67
|
return r;
|
|
64
68
|
const columns = [
|
|
69
|
+
'created_at',
|
|
65
70
|
'transactionId',
|
|
66
71
|
'reference',
|
|
67
72
|
'txid',
|
|
@@ -76,6 +81,15 @@ async function listActions(storage, auth, vargs) {
|
|
|
76
81
|
? specOp.setStatusFilter()
|
|
77
82
|
: ['completed', 'unprocessed', 'sending', 'unproven', 'unsigned', 'nosend', 'nonfinal'];
|
|
78
83
|
const noLabels = labelIds.length === 0;
|
|
84
|
+
const applyTimestampFilters = (q) => {
|
|
85
|
+
if (!timeFilterRequested)
|
|
86
|
+
return;
|
|
87
|
+
q.whereNotNull('created_at');
|
|
88
|
+
if (createdAtFrom)
|
|
89
|
+
q.where('created_at', '>=', storage.validateDateForWhere(createdAtFrom));
|
|
90
|
+
if (createdAtTo)
|
|
91
|
+
q.where('created_at', '<', storage.validateDateForWhere(createdAtTo));
|
|
92
|
+
};
|
|
79
93
|
const makeWithLabelsQueries = () => {
|
|
80
94
|
const cteq = k.raw(`
|
|
81
95
|
SELECT ${columns.map(c => 't.' + c).join(',')},
|
|
@@ -90,6 +104,7 @@ async function listActions(storage, auth, vargs) {
|
|
|
90
104
|
`);
|
|
91
105
|
const q = k.with('tlc', cteq);
|
|
92
106
|
q.from('tlc');
|
|
107
|
+
applyTimestampFilters(q);
|
|
93
108
|
if (isQueryModeAll)
|
|
94
109
|
q.where('lc', labelIds.length);
|
|
95
110
|
else
|
|
@@ -101,6 +116,7 @@ async function listActions(storage, auth, vargs) {
|
|
|
101
116
|
};
|
|
102
117
|
const makeWithoutLabelsQueries = () => {
|
|
103
118
|
const q = k('transactions').where('userId', auth.userId).whereIn('status', stati);
|
|
119
|
+
applyTimestampFilters(q);
|
|
104
120
|
const qcount = q.clone().count('transactionId as total');
|
|
105
121
|
return { q, qcount };
|
|
106
122
|
};
|
|
@@ -110,8 +126,10 @@ async function listActions(storage, auth, vargs) {
|
|
|
110
126
|
if (specOp === null || specOp === void 0 ? void 0 : specOp.postProcess) {
|
|
111
127
|
await specOp.postProcess(storage, auth, vargs, specOpLabels, txs);
|
|
112
128
|
}
|
|
113
|
-
if (!limit
|
|
129
|
+
if (!limit)
|
|
114
130
|
r.totalActions = txs.length;
|
|
131
|
+
else if (txs.length < limit)
|
|
132
|
+
r.totalActions = (offset || 0) + txs.length;
|
|
115
133
|
else {
|
|
116
134
|
const total = (0, utilityHelpers_1.verifyOne)(await qcount)['total'];
|
|
117
135
|
r.totalActions = Number(total);
|
|
@@ -137,6 +155,14 @@ async function listActions(storage, auth, vargs) {
|
|
|
137
155
|
const action = r.actions[i];
|
|
138
156
|
if (vargs.includeLabels) {
|
|
139
157
|
action.labels = (await storage.getLabelsForTransactionId(tx.transactionId)).map(l => l.label);
|
|
158
|
+
if (timeFilterRequested) {
|
|
159
|
+
const ts = tx.created_at ? new Date(tx.created_at).getTime() : NaN;
|
|
160
|
+
if (!Number.isNaN(ts)) {
|
|
161
|
+
const timeLabel = (0, brc114ActionTimeLabels_1.makeBrc114ActionTimeLabel)(ts);
|
|
162
|
+
if (!action.labels.includes(timeLabel))
|
|
163
|
+
action.labels.push(timeLabel);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
140
166
|
}
|
|
141
167
|
if (vargs.includeOutputs) {
|
|
142
168
|
const outputs = await storage.findOutputs({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listActionsKnex.js","sourceRoot":"","sources":["../../../../src/storage/methods/listActionsKnex.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"listActionsKnex.js","sourceRoot":"","sources":["../../../../src/storage/methods/listActionsKnex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOutputsKnex.d.ts","sourceRoot":"","sources":["../../../../src/storage/methods/listOutputsKnex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAE,uCAAuC,EAAgB,UAAU,EAAE,MAAM,UAAU,CAAA;AACrH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"listOutputsKnex.d.ts","sourceRoot":"","sources":["../../../../src/storage/methods/listOutputsKnex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAE,uCAAuC,EAAgB,UAAU,EAAE,MAAM,UAAU,CAAA;AACrH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAG5C,OAAO,EAAE,MAAM,EAAY,MAAM,oCAAoC,CAAA;AAQrE,wBAAsB,WAAW,CAC/B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,UAAU,CAAC,oBAAoB,EACtC,UAAU,CAAC,EAAE,uCAAuC,GACnD,OAAO,CAAC,iBAAiB,CAAC,CAgT5B"}
|
|
@@ -106,58 +106,61 @@ async function listOutputs(dsk, auth, vargs, originator) {
|
|
|
106
106
|
columns = [...columns, 'lockingScript', 'scriptLength', 'scriptOffset'];
|
|
107
107
|
const noTags = tagIds.length === 0;
|
|
108
108
|
const includeSpent = specOp && specOp.includeSpent ? specOp.includeSpent : false;
|
|
109
|
-
const
|
|
110
|
-
const
|
|
111
|
-
const
|
|
112
|
-
|
|
109
|
+
const txStatusAllowed = ['completed', 'unproven', 'nosend', 'sending'];
|
|
110
|
+
const outputColumns = columns.map(c => `o.${c} as ${c}`);
|
|
111
|
+
const applyBaseFilters = (q) => {
|
|
112
|
+
q.join('transactions as t', 't.transactionId', 'o.transactionId');
|
|
113
|
+
q.where('o.userId', userId);
|
|
114
|
+
q.whereIn('t.status', txStatusAllowed);
|
|
113
115
|
if (basketId)
|
|
114
|
-
|
|
116
|
+
q.where('o.basketId', basketId);
|
|
115
117
|
if (!includeSpent)
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
118
|
+
q.where('o.spendable', true);
|
|
119
|
+
};
|
|
120
|
+
const makeWithTagsQuery = () => {
|
|
121
|
+
const q = k('outputs as o');
|
|
122
|
+
applyBaseFilters(q);
|
|
123
|
+
if (isQueryModeAll) {
|
|
124
|
+
for (const tagId of tagIds) {
|
|
125
|
+
q.whereExists(function () {
|
|
126
|
+
this.select(k.raw('1'))
|
|
127
|
+
.from('output_tags_map as m')
|
|
128
|
+
.whereRaw('m.outputId = o.outputId')
|
|
129
|
+
.where('m.outputTagId', tagId)
|
|
130
|
+
.whereNot('m.isDeleted', true);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
q.whereExists(function () {
|
|
136
|
+
this.select(k.raw('1'))
|
|
137
|
+
.from('output_tags_map as m')
|
|
138
|
+
.whereRaw('m.outputId = o.outputId')
|
|
139
|
+
.whereIn('m.outputTagId', tagIds)
|
|
140
|
+
.whereNot('m.isDeleted', true);
|
|
141
|
+
});
|
|
142
|
+
}
|
|
133
143
|
return q;
|
|
134
144
|
};
|
|
135
145
|
const makeWithTagsQueries = () => {
|
|
136
146
|
const q = makeWithTagsQuery();
|
|
137
147
|
const qcount = q.clone();
|
|
138
|
-
q.select(
|
|
139
|
-
qcount.count('outputId as total');
|
|
148
|
+
q.select(outputColumns);
|
|
149
|
+
qcount.clearSelect().clearOrder().count('o.outputId as total');
|
|
140
150
|
return { q, qcount };
|
|
141
151
|
};
|
|
142
|
-
const makeWhere = () => {
|
|
143
|
-
const where = { userId };
|
|
144
|
-
if (basketId)
|
|
145
|
-
where.basketId = basketId;
|
|
146
|
-
if (!includeSpent)
|
|
147
|
-
where.spendable = true;
|
|
148
|
-
return where;
|
|
149
|
-
};
|
|
150
152
|
const makeWithoutTagsQueries = () => {
|
|
151
|
-
const
|
|
152
|
-
|
|
153
|
-
const qcount = q.clone().count('outputId as total');
|
|
154
|
-
q.
|
|
153
|
+
const q = k('outputs as o');
|
|
154
|
+
applyBaseFilters(q);
|
|
155
|
+
const qcount = q.clone().clearSelect().clearOrder().count('o.outputId as total');
|
|
156
|
+
q.select(outputColumns);
|
|
155
157
|
return { q, qcount };
|
|
156
158
|
};
|
|
157
159
|
if (specOp === null || specOp === void 0 ? void 0 : specOp.totalOutputsIsSumOfSatoshis) {
|
|
158
160
|
if (noTags) {
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
+
const q = k('outputs as o');
|
|
162
|
+
applyBaseFilters(q);
|
|
163
|
+
q.sum('o.satoshis as totalSatoshis');
|
|
161
164
|
const rsum = await q.first();
|
|
162
165
|
r.totalOutputs = Number(rsum ? rsum['totalSatoshis'] || 0 : 0);
|
|
163
166
|
return r;
|
|
@@ -165,7 +168,7 @@ async function listOutputs(dsk, auth, vargs, originator) {
|
|
|
165
168
|
else {
|
|
166
169
|
columns = ['outputId', 'basketId', 'spendable', 'satoshis'];
|
|
167
170
|
const q = makeWithTagsQuery();
|
|
168
|
-
q.sum('satoshis as totalSatoshis');
|
|
171
|
+
q.sum('o.satoshis as totalSatoshis');
|
|
169
172
|
const rsum = await q.first();
|
|
170
173
|
r.totalOutputs = Number(rsum ? rsum['totalSatoshis'] || 0 : 0);
|
|
171
174
|
return r;
|
|
@@ -175,7 +178,7 @@ async function listOutputs(dsk, auth, vargs, originator) {
|
|
|
175
178
|
// Sort order when limit and offset are possible must be ascending for determinism.
|
|
176
179
|
if (!specOp || !specOp.ignoreLimit)
|
|
177
180
|
q.limit(limit).offset(offset);
|
|
178
|
-
q.orderBy('outputId', orderBy);
|
|
181
|
+
q.orderBy('o.outputId', orderBy);
|
|
179
182
|
let outputs = await q;
|
|
180
183
|
if (specOp) {
|
|
181
184
|
if (specOp.filterOutputs)
|
|
@@ -216,7 +219,42 @@ async function listOutputs(dsk, auth, vargs, originator) {
|
|
|
216
219
|
labels?: LabelStringUnder300Bytes[]
|
|
217
220
|
}
|
|
218
221
|
*/
|
|
219
|
-
const
|
|
222
|
+
const labelsByTransactionId = {};
|
|
223
|
+
const tagsByOutputId = {};
|
|
224
|
+
if (vargs.includeLabels) {
|
|
225
|
+
const txIds = [...new Set(outputs.map(o => o.transactionId).filter((id) => id !== undefined))];
|
|
226
|
+
if (txIds.length > 0) {
|
|
227
|
+
const labels = await k('tx_labels as l')
|
|
228
|
+
.join('tx_labels_map as lm', 'lm.txLabelId', 'l.txLabelId')
|
|
229
|
+
.whereIn('lm.transactionId', txIds)
|
|
230
|
+
.whereNot('lm.isDeleted', true)
|
|
231
|
+
.whereNot('l.isDeleted', true)
|
|
232
|
+
.select('lm.transactionId', 'l.label');
|
|
233
|
+
for (const row of labels) {
|
|
234
|
+
const txid = Number(row.transactionId);
|
|
235
|
+
if (!labelsByTransactionId[txid])
|
|
236
|
+
labelsByTransactionId[txid] = [];
|
|
237
|
+
labelsByTransactionId[txid].push(String(row.label));
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
if (vargs.includeTags) {
|
|
242
|
+
const outputIds = [...new Set(outputs.map(o => o.outputId).filter((id) => id !== undefined))];
|
|
243
|
+
if (outputIds.length > 0) {
|
|
244
|
+
const tags = await k('output_tags as ot')
|
|
245
|
+
.join('output_tags_map as om', 'om.outputTagId', 'ot.outputTagId')
|
|
246
|
+
.whereIn('om.outputId', outputIds)
|
|
247
|
+
.whereNot('om.isDeleted', true)
|
|
248
|
+
.whereNot('ot.isDeleted', true)
|
|
249
|
+
.select('om.outputId', 'ot.tag');
|
|
250
|
+
for (const row of tags) {
|
|
251
|
+
const outputId = Number(row.outputId);
|
|
252
|
+
if (!tagsByOutputId[outputId])
|
|
253
|
+
tagsByOutputId[outputId] = [];
|
|
254
|
+
tagsByOutputId[outputId].push(String(row.tag));
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
220
258
|
const beef = new sdk_1.Beef();
|
|
221
259
|
for (const o of outputs) {
|
|
222
260
|
const wo = {
|
|
@@ -233,15 +271,10 @@ async function listOutputs(dsk, auth, vargs, originator) {
|
|
|
233
271
|
//}
|
|
234
272
|
if (vargs.includeCustomInstructions && o.customInstructions)
|
|
235
273
|
wo.customInstructions = o.customInstructions;
|
|
236
|
-
if (vargs.includeLabels && o.
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
wo.labels = labelsByTxid[o.txid];
|
|
241
|
-
}
|
|
242
|
-
if (vargs.includeTags) {
|
|
243
|
-
wo.tags = (await dsk.getTagsForOutputId(o.outputId, trx)).map(t => t.tag);
|
|
244
|
-
}
|
|
274
|
+
if (vargs.includeLabels && o.transactionId !== undefined)
|
|
275
|
+
wo.labels = labelsByTransactionId[o.transactionId] || [];
|
|
276
|
+
if (vargs.includeTags && o.outputId !== undefined)
|
|
277
|
+
wo.tags = tagsByOutputId[o.outputId] || [];
|
|
245
278
|
if (vargs.includeLockingScripts) {
|
|
246
279
|
await dsk.validateOutputScript(o, trx);
|
|
247
280
|
if (o.lockingScript)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOutputsKnex.js","sourceRoot":"","sources":["../../../../src/storage/methods/listOutputsKnex.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"listOutputsKnex.js","sourceRoot":"","sources":["../../../../src/storage/methods/listOutputsKnex.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ export declare class StorageServer {
|
|
|
27
27
|
private adminIdentityKeys?;
|
|
28
28
|
private makeLogger?;
|
|
29
29
|
constructor(storage: StorageProvider, options: WalletStorageServerOptions);
|
|
30
|
+
private setupShortReqLogging;
|
|
30
31
|
private setupRoutes;
|
|
31
32
|
private validateParam0;
|
|
32
33
|
server: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageServer.d.ts","sourceRoot":"","sources":["../../../../src/storage/remoting/StorageServer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAA0C,MAAM,UAAU,CAAA;AACnF,OAAgB,EAAE,OAAO,EAAY,MAAM,SAAS,CAAA;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAGpD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAClE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,UAAU,CAAC,EAAE,gBAAgB,CAAA;CAC9B;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,qBAAqB,CAAC,CAA4C;IAC1E,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,UAAU,CAAC,CAAkB;gBAEzB,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"StorageServer.d.ts","sourceRoot":"","sources":["../../../../src/storage/remoting/StorageServer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAA0C,MAAM,UAAU,CAAA;AACnF,OAAgB,EAAE,OAAO,EAAY,MAAM,SAAS,CAAA;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAGpD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAClE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,UAAU,CAAC,EAAE,gBAAgB,CAAA;CAC9B;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,qBAAqB,CAAC,CAA4C;IAC1E,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,UAAU,CAAC,CAAkB;gBAEzB,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,0BAA0B;IAgBzE,OAAO,CAAC,oBAAoB;IA0C5B,OAAO,CAAC,WAAW;YAyLL,cAAc;IAY5B,MAAM,EAAE,GAAG,CAAA;IAEJ,KAAK,IAAI,IAAI;IAMP,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQnC,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI;IAOhD;;;OAGG;IACH,cAAc,CAAC,CAAC,SAAS,eAAe,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC;IAmB9E;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,eAAe,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;CAMvF"}
|
|
@@ -26,8 +26,46 @@ class StorageServer {
|
|
|
26
26
|
this.calculateRequestPrice = options.calculateRequestPrice;
|
|
27
27
|
this.adminIdentityKeys = options.adminIdentityKeys;
|
|
28
28
|
this.makeLogger = options.makeLogger;
|
|
29
|
+
if (options['logShortReqs']) {
|
|
30
|
+
this.setupShortReqLogging();
|
|
31
|
+
}
|
|
29
32
|
this.setupRoutes();
|
|
30
33
|
}
|
|
34
|
+
setupShortReqLogging() {
|
|
35
|
+
this.app.use((req, res, next) => {
|
|
36
|
+
var _a;
|
|
37
|
+
const contentLength = Number(req.headers['content-length'] || 0);
|
|
38
|
+
if (contentLength > 0 && contentLength < 1000 && req.method === 'POST') {
|
|
39
|
+
const logObj = {
|
|
40
|
+
source: 'StorageServer short-request-log',
|
|
41
|
+
contentLength,
|
|
42
|
+
contentType: req.headers['content-type'] || '-',
|
|
43
|
+
ts: new Date().toISOString(),
|
|
44
|
+
url: req.originalUrl,
|
|
45
|
+
ip: req.ip || req.socket.remoteAddress,
|
|
46
|
+
ua: req.headers['user-agent'] || '-',
|
|
47
|
+
headers: { ...req.headers } // shallow copy
|
|
48
|
+
};
|
|
49
|
+
const traceContext = (_a = (req.headers['X-Cloud-Trace-Context'] || req.headers['x-cloud-trace-context'])) === null || _a === void 0 ? void 0 : _a.split('/')[0];
|
|
50
|
+
if (traceContext)
|
|
51
|
+
logObj['logging.googleapis.com/trace'] = `projects/computing-with-integrity/traces/${traceContext}`;
|
|
52
|
+
const chunks = [];
|
|
53
|
+
req.on('data', chunk => chunks.push(Buffer.from(chunk)));
|
|
54
|
+
req.on('end', () => {
|
|
55
|
+
const bodyBuffer = Buffer.concat(chunks);
|
|
56
|
+
try {
|
|
57
|
+
logObj.body = bodyBuffer.toString('utf8');
|
|
58
|
+
}
|
|
59
|
+
catch (_a) {
|
|
60
|
+
logObj.body = bodyBuffer.toString('hex');
|
|
61
|
+
logObj.bodyEncoding = 'hex';
|
|
62
|
+
}
|
|
63
|
+
console.log(JSON.stringify(logObj));
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
next();
|
|
67
|
+
});
|
|
68
|
+
}
|
|
31
69
|
setupRoutes() {
|
|
32
70
|
this.app.use(express_1.default.json({ limit: '30mb' }));
|
|
33
71
|
// This allows the API to be used everywhere when CORS is enforced
|
|
@@ -65,13 +103,23 @@ class StorageServer {
|
|
|
65
103
|
}
|
|
66
104
|
// A single POST endpoint for JSON-RPC:
|
|
67
105
|
this.app.post('/', async (req, res) => {
|
|
68
|
-
var _a, _b, _c, _d;
|
|
106
|
+
var _a, _b, _c, _d, _e;
|
|
69
107
|
let { jsonrpc, method, params, id } = req.body;
|
|
70
108
|
// Basic JSON-RPC protocol checks:
|
|
71
109
|
if (jsonrpc !== '2.0' || !method || typeof method !== 'string') {
|
|
72
110
|
return res.status(400).json({ error: { code: -32600, message: 'Invalid Request' } });
|
|
73
111
|
}
|
|
74
|
-
|
|
112
|
+
const logObj = {
|
|
113
|
+
source: `StorageServer POST handler`,
|
|
114
|
+
method,
|
|
115
|
+
id,
|
|
116
|
+
user: req.auth.identityKey,
|
|
117
|
+
params: JSON.stringify(params || '').slice(0, 256)
|
|
118
|
+
};
|
|
119
|
+
const traceContext = (_a = (req.headers['X-Cloud-Trace-Context'] || req.headers['x-cloud-trace-context'])) === null || _a === void 0 ? void 0 : _a.split('/')[0];
|
|
120
|
+
if (traceContext)
|
|
121
|
+
logObj['logging.googleapis.com/trace'] = `projects/computing-with-integrity/traces/${traceContext}`;
|
|
122
|
+
console.log(JSON.stringify(logObj));
|
|
75
123
|
try {
|
|
76
124
|
// Dispatch the method call:
|
|
77
125
|
if (typeof this[method] === 'function') {
|
|
@@ -84,7 +132,9 @@ class StorageServer {
|
|
|
84
132
|
// Find user
|
|
85
133
|
switch (method) {
|
|
86
134
|
case 'destroy': {
|
|
87
|
-
|
|
135
|
+
logObj['result'] = undefined;
|
|
136
|
+
logObj['comment'] = 'IGNORED';
|
|
137
|
+
console.log(JSON.stringify(logObj));
|
|
88
138
|
return res.json({ jsonrpc: '2.0', result: undefined, id });
|
|
89
139
|
}
|
|
90
140
|
case 'getSettings':
|
|
@@ -152,8 +202,8 @@ class StorageServer {
|
|
|
152
202
|
logger = this.makeLogger(params[1]['logger']);
|
|
153
203
|
params[1]['logger'] = logger;
|
|
154
204
|
logger.group(`StorageSever ${method}`);
|
|
155
|
-
const userId = (
|
|
156
|
-
const identityKey = (
|
|
205
|
+
const userId = (_b = params[0]) === null || _b === void 0 ? void 0 : _b['userId'];
|
|
206
|
+
const identityKey = (_c = params[0]) === null || _c === void 0 ? void 0 : _c['identityKey'];
|
|
157
207
|
if (userId)
|
|
158
208
|
logger.log(`userId: ${userId}`);
|
|
159
209
|
if (identityKey)
|
|
@@ -163,7 +213,7 @@ class StorageServer {
|
|
|
163
213
|
const result = await this.storage[method](...(params || []));
|
|
164
214
|
if (logger) {
|
|
165
215
|
logger.groupEnd();
|
|
166
|
-
(
|
|
216
|
+
(_d = logger.flush) === null || _d === void 0 ? void 0 : _d.call(logger);
|
|
167
217
|
if (logger.isOrigin) {
|
|
168
218
|
// Potentially only flush if isOrigin...
|
|
169
219
|
}
|
|
@@ -176,7 +226,7 @@ class StorageServer {
|
|
|
176
226
|
}
|
|
177
227
|
catch (eu) {
|
|
178
228
|
(0, WalletLogger_1.logWalletError)(eu, logger, 'error executing requested method');
|
|
179
|
-
(
|
|
229
|
+
(_e = logger === null || logger === void 0 ? void 0 : logger.flush) === null || _e === void 0 ? void 0 : _e.call(logger);
|
|
180
230
|
throw eu;
|
|
181
231
|
}
|
|
182
232
|
}
|
|
@@ -228,7 +278,7 @@ class StorageServer {
|
|
|
228
278
|
async close() {
|
|
229
279
|
if (this.server) {
|
|
230
280
|
await this.server.close(() => {
|
|
231
|
-
console.log('WalletStorageServer closed')
|
|
281
|
+
// console.log('WalletStorageServer closed')
|
|
232
282
|
});
|
|
233
283
|
}
|
|
234
284
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageServer.js","sourceRoot":"","sources":["../../../../src/storage/remoting/StorageServer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"StorageServer.js","sourceRoot":"","sources":["../../../../src/storage/remoting/StorageServer.ts"],"names":[],"mappings":"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"}
|