@amalgm/browser 0.1.2-preview.37260290026 → 0.1.2-preview.37266617347
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/src/cookies/coordinator.js +16 -6
- package/dist/src/cookies/coordinator.js.map +1 -1
- package/dist/src/electron.cjs +13 -6
- package/docs/CHROME.md +3 -1
- package/docs/COOKIES.md +2 -0
- package/docs/TESTING.md +2 -1
- package/package.json +4 -4
|
@@ -30,8 +30,14 @@ export class BrowserCookieCoordinator {
|
|
|
30
30
|
connection.current.set(key, value);
|
|
31
31
|
else
|
|
32
32
|
connection.current.delete(key);
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
// A browser reports applies in order, and a report can arrive after a newer apply.
|
|
34
|
+
const applied = connection.expected.get(key) || [];
|
|
35
|
+
const echoed = applied.findIndex(expected => sameCookie(value, expected));
|
|
36
|
+
if (echoed >= 0) {
|
|
37
|
+
if (echoed === applied.length - 1)
|
|
38
|
+
connection.expected.delete(key);
|
|
39
|
+
else
|
|
40
|
+
applied.splice(0, echoed + 1);
|
|
35
41
|
return;
|
|
36
42
|
}
|
|
37
43
|
connection.pending.set(key, { cookie, removed: change.removed });
|
|
@@ -134,9 +140,10 @@ export class BrowserCookieCoordinator {
|
|
|
134
140
|
const changes = connection.version === undefined
|
|
135
141
|
? { upserts: local.filter(cookie => !known.has(cookieKey(cookie))), deletes: [] }
|
|
136
142
|
: diffCookies([...previous.values()], local);
|
|
137
|
-
|
|
143
|
+
const applied = (key) => connection.expected.get(key)?.at(-1);
|
|
144
|
+
changes.upserts = changes.upserts.filter(cookie => !sameCookie(cookie, applied(cookieKey(cookie))));
|
|
138
145
|
changes.deletes = changes.deletes.filter(cookie => !connection.expected.has(cookieKey(cookie))
|
|
139
|
-
||
|
|
146
|
+
|| applied(cookieKey(cookie)) !== undefined);
|
|
140
147
|
connection.expected.clear(); // The snapshot settled every earlier apply, echoed or not.
|
|
141
148
|
if (changes.upserts.length || changes.deletes.length)
|
|
142
149
|
await this.store.merge({ sourceId: connection.adapter.id, ...changes });
|
|
@@ -154,10 +161,13 @@ export class BrowserCookieCoordinator {
|
|
|
154
161
|
&& connection.current.has(cookieKey(cookie)));
|
|
155
162
|
if ((!upserts.length && !deletes.length) || connection.closed)
|
|
156
163
|
return;
|
|
164
|
+
const expect = (key, value) => {
|
|
165
|
+
connection.expected.set(key, [...connection.expected.get(key) || [], value]);
|
|
166
|
+
};
|
|
157
167
|
for (const cookie of upserts)
|
|
158
|
-
|
|
168
|
+
expect(cookieKey(cookie), cookie);
|
|
159
169
|
for (const cookie of deletes)
|
|
160
|
-
|
|
170
|
+
expect(cookieKey(cookie), undefined);
|
|
161
171
|
await connection.adapter.apply({ upserts, deletes, versionToken: delta.versionToken });
|
|
162
172
|
for (const cookie of upserts)
|
|
163
173
|
if (!connection.pending.has(cookieKey(cookie)))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator.js","sourceRoot":"","sources":["../../../src/cookies/coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"coordinator.js","sourceRoot":"","sources":["../../../src/cookies/coordinator.ts"],"names":[],"mappings":"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"}
|
package/dist/src/electron.cjs
CHANGED
|
@@ -12805,8 +12805,11 @@ var BrowserCookieCoordinator = class {
|
|
|
12805
12805
|
const value = change.removed ? void 0 : cookie;
|
|
12806
12806
|
if (value) connection.current.set(key, value);
|
|
12807
12807
|
else connection.current.delete(key);
|
|
12808
|
-
|
|
12809
|
-
|
|
12808
|
+
const applied = connection.expected.get(key) || [];
|
|
12809
|
+
const echoed = applied.findIndex((expected) => sameCookie(value, expected));
|
|
12810
|
+
if (echoed >= 0) {
|
|
12811
|
+
if (echoed === applied.length - 1) connection.expected.delete(key);
|
|
12812
|
+
else applied.splice(0, echoed + 1);
|
|
12810
12813
|
return;
|
|
12811
12814
|
}
|
|
12812
12815
|
connection.pending.set(key, { cookie, removed: change.removed });
|
|
@@ -12893,8 +12896,9 @@ var BrowserCookieCoordinator = class {
|
|
|
12893
12896
|
connection.current = new Map(local.map((cookie) => [cookieKey(cookie), cookie]));
|
|
12894
12897
|
const known = /* @__PURE__ */ new Set([...state.cookies.map(cookieKey), ...state.tombstones.map(({ key }) => key)]);
|
|
12895
12898
|
const changes = connection.version === void 0 ? { upserts: local.filter((cookie) => !known.has(cookieKey(cookie))), deletes: [] } : diffCookies([...previous.values()], local);
|
|
12896
|
-
|
|
12897
|
-
changes.
|
|
12899
|
+
const applied = (key) => connection.expected.get(key)?.at(-1);
|
|
12900
|
+
changes.upserts = changes.upserts.filter((cookie) => !sameCookie(cookie, applied(cookieKey(cookie))));
|
|
12901
|
+
changes.deletes = changes.deletes.filter((cookie) => !connection.expected.has(cookieKey(cookie)) || applied(cookieKey(cookie)) !== void 0);
|
|
12898
12902
|
connection.expected.clear();
|
|
12899
12903
|
if (changes.upserts.length || changes.deletes.length) await this.store.merge({ sourceId: connection.adapter.id, ...changes });
|
|
12900
12904
|
const changed = new Set([...changes.upserts, ...changes.deletes].map(cookieKey));
|
|
@@ -12907,8 +12911,11 @@ var BrowserCookieCoordinator = class {
|
|
|
12907
12911
|
const upserts = delta.upserts.flatMap((cookie) => this.portable(connection, cookie) || []).filter((cookie) => !sameCookie(cookie, connection.current.get(cookieKey(cookie))));
|
|
12908
12912
|
const deletes = delta.deletes.filter((cookie) => this.portable(connection, { ...cookie, value: "" }) && connection.current.has(cookieKey(cookie)));
|
|
12909
12913
|
if (!upserts.length && !deletes.length || connection.closed) return;
|
|
12910
|
-
|
|
12911
|
-
|
|
12914
|
+
const expect = (key, value) => {
|
|
12915
|
+
connection.expected.set(key, [...connection.expected.get(key) || [], value]);
|
|
12916
|
+
};
|
|
12917
|
+
for (const cookie of upserts) expect(cookieKey(cookie), cookie);
|
|
12918
|
+
for (const cookie of deletes) expect(cookieKey(cookie), void 0);
|
|
12912
12919
|
await connection.adapter.apply({ upserts, deletes, versionToken: delta.versionToken });
|
|
12913
12920
|
for (const cookie of upserts) if (!connection.pending.has(cookieKey(cookie))) connection.current.set(cookieKey(cookie), cookie);
|
|
12914
12921
|
for (const cookie of deletes) if (!connection.pending.has(cookieKey(cookie))) connection.current.delete(cookieKey(cookie));
|
package/docs/CHROME.md
CHANGED
|
@@ -143,5 +143,7 @@ page examination starts with 1000 cookies and requires 60 edits to cause zero
|
|
|
143
143
|
full-store scans, one encrypted row write per commit (edits that arrive during a
|
|
144
144
|
commit coalesce, so at most 60), and under 120 KB of encoded state. Observer
|
|
145
145
|
reload, worker restart, HttpOnly and partitioned events are exercised in real
|
|
146
|
-
Chrome.
|
|
146
|
+
Chrome. Another browser's edits that arrive while Chrome is still writing the
|
|
147
|
+
previous one must leave Chrome and the account at the last edit, with none of
|
|
148
|
+
Chrome's reports of those writes taken for its own edits. Timing/CPU observations describe this local workload, not a universal
|
|
147
149
|
website latency guarantee.
|
package/docs/COOKIES.md
CHANGED
|
@@ -27,6 +27,8 @@ Each adapter serializes its events. Pending changes to the same identity
|
|
|
27
27
|
coalesce while existing work is in flight; there is no debounce delay. Applying
|
|
28
28
|
a jar change records its expected echo before writing the physical store.
|
|
29
29
|
That echo never becomes a new local edit, including after an interrupted apply.
|
|
30
|
+
A store reports writes in order but can report one after a newer write to the
|
|
31
|
+
same cookie, so each identity keeps every echo it still expects, oldest first.
|
|
30
32
|
On first contact, physical cookies contribute only identities the jar has never
|
|
31
33
|
known. Stale disk cookies cannot resurrect a deletion; an observed new edit can.
|
|
32
34
|
An unavailable store retains pending changes and waits for another cookie or
|
package/docs/TESTING.md
CHANGED
|
@@ -21,7 +21,8 @@ npm run verify # check, build, test, package/install
|
|
|
21
21
|
- all 22 actions reachable through SDK, CLI, MCP, REST, and Toolbox, from one
|
|
22
22
|
action manifest; an MCP call without a session uses its chat's session
|
|
23
23
|
- two-way cookie sync: sign-ins and sign-outs reach the account, failed
|
|
24
|
-
applies retry without echo,
|
|
24
|
+
applies retry without echo, echoes reported after a newer write,
|
|
25
|
+
partitioned cookies, protected hosts
|
|
25
26
|
- record-level merges, tombstones, corrupt-jar health, wrong-key redaction
|
|
26
27
|
- auth filtering, login token TTL and hashing, deprecated-input compatibility,
|
|
27
28
|
serialized live login transitions
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amalgm/browser",
|
|
3
|
-
"version": "0.1.2-preview.
|
|
3
|
+
"version": "0.1.2-preview.37266617347",
|
|
4
4
|
"description": "The amalgm runtime's browser: one Chrome, a session per chat, and the account's cookies in every view.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -151,11 +151,11 @@
|
|
|
151
151
|
"@amalgm/core"
|
|
152
152
|
]
|
|
153
153
|
},
|
|
154
|
-
"gitHead": "
|
|
154
|
+
"gitHead": "49a914a43ff1d37e8c97e43a3e7740d487101cf9",
|
|
155
155
|
"amalgmSource": {
|
|
156
156
|
"repository": "amalgm-inc/amalgm-browser",
|
|
157
157
|
"branch": "preview",
|
|
158
|
-
"commit": "
|
|
159
|
-
"occurrence": "
|
|
158
|
+
"commit": "49a914a43ff1d37e8c97e43a3e7740d487101cf9",
|
|
159
|
+
"occurrence": "37266617347"
|
|
160
160
|
}
|
|
161
161
|
}
|