@pod-network/trade-sdk 0.18.0 → 0.19.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/client.d.ts +5 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +6 -5
- package/dist/client.js.map +1 -1
- package/dist/codec/activity.d.ts +4 -9
- package/dist/codec/activity.d.ts.map +1 -1
- package/dist/codec/activity.js +6 -23
- package/dist/codec/activity.js.map +1 -1
- package/dist/codec/resolution.js +2 -2
- package/dist/datafeed.js +1 -1
- package/dist/stores/resource.d.ts +9 -3
- package/dist/stores/resource.d.ts.map +1 -1
- package/dist/stores/resource.js +6 -1
- package/dist/stores/resource.js.map +1 -1
- package/dist/sync/activity.d.ts +11 -2
- package/dist/sync/activity.d.ts.map +1 -1
- package/dist/sync/activity.js +74 -18
- package/dist/sync/activity.js.map +1 -1
- package/dist/sync/candles.d.ts.map +1 -1
- package/dist/sync/candles.js +6 -0
- package/dist/sync/candles.js.map +1 -1
- package/dist/sync/order-ledger.d.ts +42 -0
- package/dist/sync/order-ledger.d.ts.map +1 -0
- package/dist/sync/order-ledger.js +163 -0
- package/dist/sync/order-ledger.js.map +1 -0
- package/dist/sync/order-preview.d.ts.map +1 -1
- package/dist/sync/order-preview.js +5 -1
- package/dist/sync/order-preview.js.map +1 -1
- package/dist/sync/orders.d.ts +5 -1
- package/dist/sync/orders.d.ts.map +1 -1
- package/dist/sync/orders.js +41 -16
- package/dist/sync/orders.js.map +1 -1
- package/dist/sync/positions-live.d.ts.map +1 -1
- package/dist/sync/positions-live.js +33 -7
- package/dist/sync/positions-live.js.map +1 -1
- package/dist/sync/sources.d.ts +3 -1
- package/dist/sync/sources.d.ts.map +1 -1
- package/dist/sync/sources.js +21 -9
- package/dist/sync/sources.js.map +1 -1
- package/dist/sync/withdrawals.d.ts +1 -1
- package/dist/sync/withdrawals.d.ts.map +1 -1
- package/dist/sync/withdrawals.js +15 -6
- package/dist/sync/withdrawals.js.map +1 -1
- package/dist/transport/rest.d.ts +5 -0
- package/dist/transport/rest.d.ts.map +1 -1
- package/dist/transport/rest.js +3 -0
- package/dist/transport/rest.js.map +1 -1
- package/dist/types/public.d.ts +6 -2
- package/dist/types/public.d.ts.map +1 -1
- package/dist/write/index.d.ts +2 -2
- package/dist/write/index.js +1 -1
- package/package.json +1 -1
- package/src/client.ts +11 -5
- package/src/codec/activity.ts +5 -22
- package/src/codec/resolution.ts +2 -2
- package/src/datafeed.ts +1 -1
- package/src/stores/resource.ts +13 -4
- package/src/sync/activity.ts +78 -20
- package/src/sync/candles.ts +5 -0
- package/src/sync/order-ledger.ts +157 -0
- package/src/sync/order-preview.ts +5 -1
- package/src/sync/orders.ts +39 -14
- package/src/sync/positions-live.ts +32 -7
- package/src/sync/sources.ts +22 -8
- package/src/sync/withdrawals.ts +15 -6
- package/src/transport/rest.ts +8 -0
- package/src/types/public.ts +6 -2
- package/src/write/index.ts +2 -2
package/dist/client.d.ts
CHANGED
|
@@ -26,6 +26,11 @@ export interface PodTradeClientOptions {
|
|
|
26
26
|
positionResyncMs?: number;
|
|
27
27
|
/** Periodic REST re-poll of market 24h stats (ms). Default 30_000; 0 disables. */
|
|
28
28
|
marketResyncMs?: number;
|
|
29
|
+
/**
|
|
30
|
+
* Periodic REST reconcile (ms) of orders, activity, withdrawals, candles and
|
|
31
|
+
* triggers, which repairs what the stream missed. Default 60_000; 0 disables.
|
|
32
|
+
*/
|
|
33
|
+
historyResyncMs?: number;
|
|
29
34
|
/**
|
|
30
35
|
* Optional persistence for the static markets list (localStorage-backed in a
|
|
31
36
|
* browser), so market-keyed UI mounts instantly on repeat visits. Key it per
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAC7E,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAC9F,WAAW,EAAE,UAAU,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAC4C,KAAK,QAAQ,EAAqB,KAAK,aAAa,EACtG,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEyB,KAAK,YAAY,EAChD,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAkC,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAsC,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAAsD,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExJ,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;uDACmD;IACnD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,SAAS,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5D,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kFAAkF;IAClF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B;AAID,qBAAa,cAAc;IACzB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2C;IACjE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAgB;gBAE/B,IAAI,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client.js
CHANGED
|
@@ -36,6 +36,7 @@ export class PodTradeClient {
|
|
|
36
36
|
ws: this.ws,
|
|
37
37
|
positionResyncMs: opts.positionResyncMs ?? 60_000,
|
|
38
38
|
marketResyncMs: opts.marketResyncMs ?? 30_000,
|
|
39
|
+
historyResyncMs: opts.historyResyncMs ?? 60_000,
|
|
39
40
|
marketsCache: opts.marketsCache,
|
|
40
41
|
};
|
|
41
42
|
}
|
|
@@ -85,8 +86,8 @@ export class PodTradeClient {
|
|
|
85
86
|
this.cache.clear();
|
|
86
87
|
this.ws.close();
|
|
87
88
|
}
|
|
88
|
-
slot(key) {
|
|
89
|
-
return this.snapshots && { store: this.snapshots, key: key.toLowerCase() };
|
|
89
|
+
slot(key, stampOf) {
|
|
90
|
+
return this.snapshots && { store: this.snapshots, key: key.toLowerCase(), stampOf };
|
|
90
91
|
}
|
|
91
92
|
memo(key, make) {
|
|
92
93
|
const hit = this.cache.get(key);
|
|
@@ -110,7 +111,7 @@ export class PodTradeClient {
|
|
|
110
111
|
return this.memo(`orderbook:${id}:${depth ?? ""}`, () => new BaseResource(orderbookSource(this.ctx, id, depth)));
|
|
111
112
|
}
|
|
112
113
|
positions(account) {
|
|
113
|
-
return this.memo(`positions:${account}`, () => new BaseResource(positionsSource(this.ctx, account)));
|
|
114
|
+
return this.memo(`positions:${account}`, () => new BaseResource(positionsSource(this.ctx, account), this.slot(`positions:${account}`, (s) => s.timestampUs)));
|
|
114
115
|
}
|
|
115
116
|
/**
|
|
116
117
|
* Positions with mark-driven fields (uPnL, notional, equity, account value,
|
|
@@ -126,7 +127,7 @@ export class PodTradeClient {
|
|
|
126
127
|
if (!snap)
|
|
127
128
|
return undefined;
|
|
128
129
|
return enrichPositions(snap, markets.get() ?? []);
|
|
129
|
-
}, this.slot(`livePositions:${account}
|
|
130
|
+
}, this.slot(`livePositions:${account}`, (s) => s.timestampUs));
|
|
130
131
|
});
|
|
131
132
|
}
|
|
132
133
|
triggers(account, _query) {
|
|
@@ -134,7 +135,7 @@ export class PodTradeClient {
|
|
|
134
135
|
}
|
|
135
136
|
/** Live spot holdings + native cash. */
|
|
136
137
|
balances(account) {
|
|
137
|
-
return this.memo(`balances:${account}`, () => new BaseResource(balancesSource(this.ctx, account), this.slot(`balances:${account}
|
|
138
|
+
return this.memo(`balances:${account}`, () => new BaseResource(balancesSource(this.ctx, account), this.slot(`balances:${account}`, (b) => b.timestampUs)));
|
|
138
139
|
}
|
|
139
140
|
/**
|
|
140
141
|
* Static bridge config: the claim chain, and each bridged token's L1 address,
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAsB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EACL,YAAY,EAAE,gBAAgB,EAAE,eAAe,GAChD,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EACnF,YAAY,EAAE,cAAc,GAC7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAuB,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAqB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAA+D,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/codec/activity.d.ts
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
import type { ActivityEntry, ActivityEvent, Order } from "../types/public.js";
|
|
2
|
-
import type { WireActivityEntry } from "../types/wire.js";
|
|
2
|
+
import type { WireActivityEntry, WireOrderEvent } from "../types/wire.js";
|
|
3
3
|
/** One activity row, or `undefined` for an unknown kind. */
|
|
4
4
|
export declare function decodeActivityEntry(e: WireActivityEntry, timeMs: number): ActivityEntry | undefined;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
* carry their current state, so a REST batch applies nothing to an order in `pageOrders`.
|
|
9
|
-
*/
|
|
10
|
-
export declare function foldActivityBatch(batchUs: number, entries: WireActivityEntry[], orders: Map<string, Order>, source: "stream" | {
|
|
11
|
-
pageOrders: ReadonlySet<string>;
|
|
12
|
-
}): {
|
|
5
|
+
export declare function asOrderEvent(e: WireActivityEntry): WireOrderEvent | undefined;
|
|
6
|
+
/** Decode one batch, setting its `order` rows in `orders` and applying transitions to the orders it holds. */
|
|
7
|
+
export declare function foldActivityBatch(batchUs: number, entries: WireActivityEntry[], orders: Map<string, Order>): {
|
|
13
8
|
rows: ActivityEntry[];
|
|
14
9
|
events: ActivityEvent[];
|
|
15
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/codec/activity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAkB,MAAM,oBAAoB,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/codec/activity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAkB,MAAM,oBAAoB,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAK1E,4DAA4D;AAC5D,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CA6FnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,iBAAiB,GAAG,cAAc,GAAG,SAAS,CAW7E;AAED,8GAA8G;AAC9G,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,EAAE,EAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GACzB;IAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAAC,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,CAuCpD"}
|
package/dist/codec/activity.js
CHANGED
|
@@ -96,7 +96,7 @@ export function decodeActivityEntry(e, timeMs) {
|
|
|
96
96
|
return undefined;
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
function asOrderEvent(e) {
|
|
99
|
+
export function asOrderEvent(e) {
|
|
100
100
|
switch (e.k) {
|
|
101
101
|
case "fill":
|
|
102
102
|
return { k: "fill", id: e.id, b: e.b, q: e.q, tb: e.tb, tq: e.tq, tf: e.tf, f: e.f, st: e.st, pa: e.pa, pnl: e.pnl };
|
|
@@ -108,13 +108,8 @@ function asOrderEvent(e) {
|
|
|
108
108
|
return undefined;
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
/**
|
|
112
|
-
|
|
113
|
-
* orders it holds. Only a `stream` batch emits events. A REST page's `order` rows already
|
|
114
|
-
* carry their current state, so a REST batch applies nothing to an order in `pageOrders`.
|
|
115
|
-
*/
|
|
116
|
-
export function foldActivityBatch(batchUs, entries, orders, source) {
|
|
117
|
-
const rest = source !== "stream";
|
|
111
|
+
/** Decode one batch, setting its `order` rows in `orders` and applying transitions to the orders it holds. */
|
|
112
|
+
export function foldActivityBatch(batchUs, entries, orders) {
|
|
118
113
|
const batchMs = usToMs(batchUs);
|
|
119
114
|
const rows = [];
|
|
120
115
|
const events = [];
|
|
@@ -125,28 +120,16 @@ export function foldActivityBatch(batchUs, entries, orders, source) {
|
|
|
125
120
|
rows.push(row);
|
|
126
121
|
if (row.activityType === "order") {
|
|
127
122
|
orders.set(row.order.id, row.order);
|
|
128
|
-
|
|
129
|
-
events.push({ kind: row.order.status === "invalid" ? "reject" : "new", order: row.order, batchMs });
|
|
130
|
-
}
|
|
123
|
+
events.push({ kind: row.order.status === "invalid" ? "reject" : "new", order: row.order, batchMs });
|
|
131
124
|
continue;
|
|
132
125
|
}
|
|
133
126
|
if (row.activityType === "backstop" || row.activityType === "bridge_transfer" || row.activityType === "transfer") {
|
|
134
|
-
|
|
135
|
-
events.push(row);
|
|
127
|
+
events.push(row);
|
|
136
128
|
continue;
|
|
137
129
|
}
|
|
138
130
|
const order = orders.get(row.orderId);
|
|
139
|
-
if (!order
|
|
131
|
+
if (!order)
|
|
140
132
|
continue;
|
|
141
|
-
if (rest) {
|
|
142
|
-
const event = asOrderEvent(e);
|
|
143
|
-
// `pnl` is a delta that the held order's own REST row may already include; that row, not the fill, sets it.
|
|
144
|
-
if (event) {
|
|
145
|
-
event.pnl = undefined;
|
|
146
|
-
applyEvent(event, order, { batchMs });
|
|
147
|
-
}
|
|
148
|
-
continue;
|
|
149
|
-
}
|
|
150
133
|
if (row.activityType === "modify_reject") {
|
|
151
134
|
const { requestedPrice, requestedSize, message } = row;
|
|
152
135
|
events.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/codec/activity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/codec/activity.ts"],"names":[],"mappings":"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"}
|
package/dist/codec/resolution.js
CHANGED
|
@@ -10,7 +10,7 @@ export const RESOLUTION_SECONDS = {
|
|
|
10
10
|
"1h": 3_600,
|
|
11
11
|
"4h": 14_400,
|
|
12
12
|
"1d": 86_400,
|
|
13
|
-
"
|
|
13
|
+
"1w": 604_800,
|
|
14
14
|
"1M": 2_592_000, // a nominal 30d month: what the indexer buckets by, not calendar months
|
|
15
15
|
};
|
|
16
16
|
/**
|
|
@@ -28,7 +28,7 @@ export const RESOLUTION_PAGE_BUCKETS = {
|
|
|
28
28
|
"1h": 168, // 1 week
|
|
29
29
|
"4h": 180, // ~30 days
|
|
30
30
|
"1d": 365, // ~1 year
|
|
31
|
-
"
|
|
31
|
+
"1w": 260, // ~5 years
|
|
32
32
|
"1M": 120, // ~decade (nominal 30-day buckets, epoch-anchored — see above)
|
|
33
33
|
};
|
|
34
34
|
export const RESOLUTIONS = Object.keys(RESOLUTION_SECONDS);
|
package/dist/datafeed.js
CHANGED
|
@@ -5,7 +5,7 @@ import { toNumber } from "./codec/units.js";
|
|
|
5
5
|
import { RESOLUTION_SECONDS } from "./codec/resolution.js";
|
|
6
6
|
const TV_TO_RESOLUTION = {
|
|
7
7
|
"1": "1m", "5": "5m", "15": "15m", "30": "30m",
|
|
8
|
-
"60": "1h", "240": "4h", "1D": "1d", "1W": "
|
|
8
|
+
"60": "1h", "240": "4h", "1D": "1d", "1W": "1w", "1M": "1M",
|
|
9
9
|
};
|
|
10
10
|
function toTvBar(b, quoteDecimals = 18) {
|
|
11
11
|
return {
|
|
@@ -39,9 +39,14 @@ export interface SnapshotStore {
|
|
|
39
39
|
set(key: string, value: string): void;
|
|
40
40
|
}
|
|
41
41
|
/** Where one resource persists its snapshot. */
|
|
42
|
-
export interface SnapshotSlot {
|
|
42
|
+
export interface SnapshotSlot<T = unknown> {
|
|
43
43
|
store: SnapshotStore;
|
|
44
44
|
key: string;
|
|
45
|
+
/**
|
|
46
|
+
* The value's tick stamp. A value stamped past the one written is written at once, so a
|
|
47
|
+
* reload never asks the node for less than the user already saw.
|
|
48
|
+
*/
|
|
49
|
+
stampOf?: (value: T) => number | undefined;
|
|
45
50
|
}
|
|
46
51
|
export interface ResourceHandle<T> {
|
|
47
52
|
set(value: T): void;
|
|
@@ -65,6 +70,7 @@ export declare class BaseResource<T> implements Resource<T> {
|
|
|
65
70
|
private provisional;
|
|
66
71
|
private confirmed;
|
|
67
72
|
private dirty;
|
|
73
|
+
private writtenStamp;
|
|
68
74
|
private persisted;
|
|
69
75
|
private writeTimer;
|
|
70
76
|
private _error;
|
|
@@ -74,7 +80,7 @@ export declare class BaseResource<T> implements Resource<T> {
|
|
|
74
80
|
private readyPromise;
|
|
75
81
|
private readyResolve;
|
|
76
82
|
private readyReject;
|
|
77
|
-
constructor(source: ResourceSource<T>, slot?: SnapshotSlot | undefined);
|
|
83
|
+
constructor(source: ResourceSource<T>, slot?: SnapshotSlot<T> | undefined);
|
|
78
84
|
get(): T | undefined;
|
|
79
85
|
isProvisional(): boolean;
|
|
80
86
|
lastKnown(): Snapshot<T> | undefined;
|
|
@@ -104,7 +110,7 @@ export declare class BaseResource<T> implements Resource<T> {
|
|
|
104
110
|
private emit;
|
|
105
111
|
}
|
|
106
112
|
/** A read-only view derived from several resources; recomputes on any change. */
|
|
107
|
-
export declare function combineResources<T>(parents: Resource<unknown>[], compute: () => T | undefined, slot?: SnapshotSlot): Resource<T>;
|
|
113
|
+
export declare function combineResources<T>(parents: Resource<unknown>[], compute: () => T | undefined, slot?: SnapshotSlot<T>): Resource<T>;
|
|
108
114
|
/** A read-only view derived from another resource. */
|
|
109
115
|
export declare function derivedResource<S, T>(parent: Resource<S>, select: (s: S | undefined) => T | undefined): Resource<T>;
|
|
110
116
|
//# sourceMappingURL=resource.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/stores/resource.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IACrB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAC5C;;;;;;OAMG;IACH,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,yEAAyE;IACzE,OAAO,CAAC,IAAI,IAAI,CAAC;IACjB;;;;OAIG;IACH,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IACrC;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;CACxB;AAED,yDAAyD;AACzD,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,KAAK,EAAE,CAAC,CAAC;IACT,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAChC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,gDAAgD;AAChD,MAAM,WAAW,YAAY;
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/stores/resource.ts"],"names":[],"mappings":"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"}
|
package/dist/stores/resource.js
CHANGED
|
@@ -15,6 +15,7 @@ export class BaseResource {
|
|
|
15
15
|
// can neither hide it from lastKnown() nor stop it being written.
|
|
16
16
|
confirmed;
|
|
17
17
|
dirty = false;
|
|
18
|
+
writtenStamp = -Infinity;
|
|
18
19
|
persisted;
|
|
19
20
|
writeTimer;
|
|
20
21
|
_error;
|
|
@@ -136,7 +137,10 @@ export class BaseResource {
|
|
|
136
137
|
if (!provisional) {
|
|
137
138
|
this.confirmed = { value: v, at: Date.now() };
|
|
138
139
|
this.dirty = true;
|
|
139
|
-
|
|
140
|
+
const stamp = this.slot?.stampOf?.(v);
|
|
141
|
+
if (stamp !== undefined && stamp > this.writtenStamp)
|
|
142
|
+
this.writeSlot();
|
|
143
|
+
else if (this.slot)
|
|
140
144
|
this.writeTimer ??= setTimeout(() => this.writeSlot(), SNAPSHOT_WRITE_MS);
|
|
141
145
|
}
|
|
142
146
|
this._error = undefined;
|
|
@@ -167,6 +171,7 @@ export class BaseResource {
|
|
|
167
171
|
this.dirty = false;
|
|
168
172
|
try {
|
|
169
173
|
this.slot.store.set(this.slot.key, stringifyBig({ v: SNAPSHOT_VERSION, ...this.confirmed }));
|
|
174
|
+
this.writtenStamp = this.slot.stampOf?.(this.confirmed.value) ?? this.writtenStamp;
|
|
170
175
|
}
|
|
171
176
|
catch { /* storage denied or full */ }
|
|
172
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/stores/resource.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,0EAA0E;AAE1E,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/stores/resource.ts"],"names":[],"mappings":"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"}
|
package/dist/sync/activity.d.ts
CHANGED
|
@@ -12,7 +12,8 @@ export declare class ActivityHistory implements ActivityView {
|
|
|
12
12
|
private handle;
|
|
13
13
|
/** Every batch's rows, from either source; what dedupes one against the other. */
|
|
14
14
|
private readonly batches;
|
|
15
|
-
private readonly
|
|
15
|
+
private readonly ledger;
|
|
16
|
+
private reconciling;
|
|
16
17
|
private rows;
|
|
17
18
|
private nextUs;
|
|
18
19
|
private seedGen;
|
|
@@ -39,8 +40,16 @@ export declare class ActivityHistory implements ActivityView {
|
|
|
39
40
|
setWindow(): void;
|
|
40
41
|
loadOlder(): Promise<void>;
|
|
41
42
|
private seed;
|
|
42
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
* A page's `order` rows are each order's state at the page's read; its batches are
|
|
45
|
+
* folded like frames, so the ledger skips the orders those rows already cover.
|
|
46
|
+
*/
|
|
43
47
|
private store;
|
|
48
|
+
/** Point `order` rows at the ledger's order, which later transitions and reconciles update in place. */
|
|
49
|
+
private shown;
|
|
50
|
+
private minimum;
|
|
51
|
+
/** Activity since the last reconcile: adds the batches the stream lost and corrects the orders. */
|
|
52
|
+
private reconcile;
|
|
44
53
|
private onFrame;
|
|
45
54
|
/** Rows newest batch first, wire order within a batch. */
|
|
46
55
|
private restack;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/sync/activity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EAAE,aAAa,EAAE,aAAa,EAAgB,OAAO,EACnE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/sync/activity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EAAE,aAAa,EAAE,aAAa,EAAgB,OAAO,EACnE,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAG7D,MAAM,WAAW,YAAa,SAAQ,cAAc,CAAC,aAAa,CAAC;IACjE,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CAClE;AAED,kGAAkG;AAClG,qBAAa,eAAgB,YAAW,YAAY;IAmBhD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAnB1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IACrD,OAAO,CAAC,MAAM,CAA8C;IAC5D,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAErB;IACF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgD;IAC/E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;gBAG1C,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,OAAO;IAqBnC,GAAG,IAAI,aAAa,EAAE,GAAG,SAAS;IAClC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAC3C,KAAK,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IACjC,IAAI,KAAK,IAAI,KAAK,GAAG,SAAS,CAA4B;IAC1D,OAAO,IAAI,OAAO;IAClB,OAAO,IAAI,OAAO;IAClB,OAAO,IAAI,IAAI;IAEf,0EAA0E;IAC1E,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IASxC;;;OAGG;IACH,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI;IAOhE,SAAS,IAAI,IAAI;IAEX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;YAoBlB,IAAI;IAyClB;;;OAGG;IACH,OAAO,CAAC,KAAK;IAYb,wGAAwG;IACxG,OAAO,CAAC,KAAK;IAOb,OAAO,CAAC,OAAO;IAIf,mGAAmG;YACrF,SAAS;IAmBvB,OAAO,CAAC,OAAO;IAiCf,0DAA0D;IAC1D,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,OAAO;CAGhB"}
|
package/dist/sync/activity.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
// `pod_activity` sends one batch per tick, so the batch alone is the resume cursor (ADR 0057).
|
|
2
|
-
import { foldActivityBatch } from "../codec/activity.js";
|
|
3
|
-
import {
|
|
2
|
+
import { decodeActivityEntry, foldActivityBatch } from "../codec/activity.js";
|
|
3
|
+
import { decodeOrder } from "../codec/decode.js";
|
|
4
|
+
import { msToUs, usToMs } from "../codec/units.js";
|
|
4
5
|
import { BaseResource } from "../stores/resource.js";
|
|
6
|
+
import { OrderLedger, readActivityAfter } from "./order-ledger.js";
|
|
5
7
|
import { readAtLeast } from "./sources.js";
|
|
6
8
|
import { ResumableStream } from "./stream.js";
|
|
7
9
|
/** One account's whole feed: the one subscription, batch map and paging state its views share. */
|
|
@@ -12,7 +14,8 @@ export class ActivityHistory {
|
|
|
12
14
|
handle;
|
|
13
15
|
/** Every batch's rows, from either source; what dedupes one against the other. */
|
|
14
16
|
batches = new Map();
|
|
15
|
-
|
|
17
|
+
ledger = new OrderLedger(([batchUs, entries], orders) => foldActivityBatch(batchUs, entries, orders));
|
|
18
|
+
reconciling = false;
|
|
16
19
|
rows = [];
|
|
17
20
|
nextUs = null;
|
|
18
21
|
seedGen = 0;
|
|
@@ -34,7 +37,9 @@ export class ActivityHistory {
|
|
|
34
37
|
this.base = new BaseResource((h) => {
|
|
35
38
|
this.handle = h;
|
|
36
39
|
this.stream.start();
|
|
40
|
+
const timer = ctx.historyResyncMs > 0 ? setInterval(() => void this.reconcile(), ctx.historyResyncMs) : undefined;
|
|
37
41
|
return () => {
|
|
42
|
+
clearInterval(timer);
|
|
38
43
|
this.stream.stop();
|
|
39
44
|
this.handle = undefined;
|
|
40
45
|
};
|
|
@@ -75,8 +80,9 @@ export class ActivityHistory {
|
|
|
75
80
|
this.rebuild();
|
|
76
81
|
try {
|
|
77
82
|
const toUs = this.nextUs;
|
|
78
|
-
const page = await readAtLeast((min) => this.ctx.rest.activity(this.account, { toUs }, min), this.
|
|
79
|
-
this.store([page])
|
|
83
|
+
const page = await readAtLeast((min) => this.ctx.rest.activity(this.account, { toUs }, min), this.minimum());
|
|
84
|
+
if (!this.store([page]))
|
|
85
|
+
return;
|
|
80
86
|
this.nextUs = page.nextUs;
|
|
81
87
|
this._hasMore = page.nextUs !== null;
|
|
82
88
|
this.restack();
|
|
@@ -95,7 +101,9 @@ export class ActivityHistory {
|
|
|
95
101
|
const page = await this.ctx.rest.activity(this.account);
|
|
96
102
|
if (stale())
|
|
97
103
|
return false;
|
|
98
|
-
this.store([page])
|
|
104
|
+
if (!this.store([page]))
|
|
105
|
+
throw new Error("activity read below the held frames");
|
|
106
|
+
this.ledger.stampUs ||= page.solutionNowUs;
|
|
99
107
|
this.nextUs = page.nextUs;
|
|
100
108
|
this._hasMore = page.nextUs !== null;
|
|
101
109
|
this.restack();
|
|
@@ -107,13 +115,14 @@ export class ActivityHistory {
|
|
|
107
115
|
let toUs;
|
|
108
116
|
const pages = [];
|
|
109
117
|
do {
|
|
110
|
-
const page = await readAtLeast((min) => this.ctx.rest.activity(this.account, { fromUs, toUs }, min), since);
|
|
118
|
+
const page = await readAtLeast((min) => this.ctx.rest.activity(this.account, { fromUs, toUs }, min), Math.max(since, this.ledger.minimum()));
|
|
111
119
|
if (stale())
|
|
112
120
|
return false;
|
|
113
121
|
pages.push(page);
|
|
114
122
|
toUs = page.nextUs ?? undefined;
|
|
115
123
|
} while (toUs !== undefined);
|
|
116
|
-
this.store(pages)
|
|
124
|
+
if (!this.store(pages))
|
|
125
|
+
throw new Error("activity read below the held frames");
|
|
117
126
|
this.restack();
|
|
118
127
|
for (const page of pages)
|
|
119
128
|
this.stream.raise({ since: msToUs(page.solutionNow) });
|
|
@@ -127,12 +136,50 @@ export class ActivityHistory {
|
|
|
127
136
|
throw e;
|
|
128
137
|
}
|
|
129
138
|
}
|
|
130
|
-
/**
|
|
139
|
+
/**
|
|
140
|
+
* A page's `order` rows are each order's state at the page's read; its batches are
|
|
141
|
+
* folded like frames, so the ledger skips the orders those rows already cover.
|
|
142
|
+
*/
|
|
131
143
|
store(pages) {
|
|
132
|
-
const
|
|
133
|
-
const
|
|
144
|
+
const kept = pages.filter((p) => this.ledger.rows(p.batches.flatMap(([, entries]) => entries.flatMap((e) => (e.k === "order" ? [decodeOrder(e)] : []))), p.solutionNowUs));
|
|
145
|
+
const fresh = kept.flatMap((p) => p.batches).filter(([batchUs]) => !this.batches.has(batchUs));
|
|
134
146
|
for (const [batchUs, entries] of fresh.sort((a, b) => a[0] - b[0])) {
|
|
135
|
-
this.batches.set(batchUs,
|
|
147
|
+
this.batches.set(batchUs, this.shown(this.ledger.live(batchUs, [batchUs, entries]).rows));
|
|
148
|
+
}
|
|
149
|
+
return kept.length === pages.length;
|
|
150
|
+
}
|
|
151
|
+
/** Point `order` rows at the ledger's order, which later transitions and reconciles update in place. */
|
|
152
|
+
shown(rows) {
|
|
153
|
+
for (const row of rows) {
|
|
154
|
+
if (row.activityType === "order")
|
|
155
|
+
row.order = this.ledger.view.get(row.order.id) ?? row.order;
|
|
156
|
+
}
|
|
157
|
+
return rows;
|
|
158
|
+
}
|
|
159
|
+
minimum() {
|
|
160
|
+
return Math.max(this.stream.cursor.since ?? 0, this.ledger.minimum()) || undefined;
|
|
161
|
+
}
|
|
162
|
+
/** Activity since the last reconcile: adds the batches the stream lost and corrects the orders. */
|
|
163
|
+
async reconcile() {
|
|
164
|
+
if (this.reconciling || !this.ledger.stampUs || !this.stream.running)
|
|
165
|
+
return;
|
|
166
|
+
this.reconciling = true;
|
|
167
|
+
try {
|
|
168
|
+
const pages = await readActivityAfter(this.ctx.rest, this.account, this.ledger.stampUs, this.ledger.minimum());
|
|
169
|
+
if (!this.stream.running || !this.ledger.reconcile(pages))
|
|
170
|
+
return;
|
|
171
|
+
const fresh = pages.flatMap((p) => p.batches).filter(([batchUs]) => !this.batches.has(batchUs));
|
|
172
|
+
for (const [batchUs, entries] of fresh) {
|
|
173
|
+
const rows = entries.flatMap((e) => decodeActivityEntry(e, usToMs(batchUs)) ?? []);
|
|
174
|
+
this.batches.set(batchUs, this.shown(rows));
|
|
175
|
+
}
|
|
176
|
+
this.restack();
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
// The next interval asks again.
|
|
180
|
+
}
|
|
181
|
+
finally {
|
|
182
|
+
this.reconciling = false;
|
|
136
183
|
}
|
|
137
184
|
}
|
|
138
185
|
onFrame(result) {
|
|
@@ -151,13 +198,22 @@ export class ActivityHistory {
|
|
|
151
198
|
if (this.stream.delivered(at))
|
|
152
199
|
return;
|
|
153
200
|
this.stream.advance(at);
|
|
154
|
-
if (!entries.length
|
|
201
|
+
if (!entries.length)
|
|
155
202
|
return;
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
this.
|
|
159
|
-
|
|
160
|
-
|
|
203
|
+
const frame = [batchUs, entries];
|
|
204
|
+
let events;
|
|
205
|
+
if (this.batches.has(batchUs)) {
|
|
206
|
+
// A REST read already applied this batch; the app still hears about it.
|
|
207
|
+
events = this.ledger.report(frame).events;
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
const folded = this.ledger.live(batchUs, frame);
|
|
211
|
+
events = folded.events;
|
|
212
|
+
this.batches.set(batchUs, this.shown(folded.rows));
|
|
213
|
+
this.rows = [...folded.rows, ...this.rows];
|
|
214
|
+
// Listeners run after rebuild() so one that reads the resource sees what the event produced.
|
|
215
|
+
this.rebuild();
|
|
216
|
+
}
|
|
161
217
|
if (events.length) {
|
|
162
218
|
for (const listener of this.eventListeners) {
|
|
163
219
|
try {
|