@ifc-lite/collab-server 0.5.3 → 0.6.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/bin.js +13 -2
- package/dist/bin.js.map +1 -1
- package/dist/blob-gc-worker.d.ts +57 -0
- package/dist/blob-gc-worker.d.ts.map +1 -0
- package/dist/blob-gc-worker.js +207 -0
- package/dist/blob-gc-worker.js.map +1 -0
- package/dist/blob-gc.d.ts +69 -0
- package/dist/blob-gc.d.ts.map +1 -0
- package/dist/blob-gc.js +208 -0
- package/dist/blob-gc.js.map +1 -0
- package/dist/blob-route.d.ts +16 -0
- package/dist/blob-route.d.ts.map +1 -1
- package/dist/blob-route.js +58 -12
- package/dist/blob-route.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/path-locks.d.ts +10 -2
- package/dist/path-locks.d.ts.map +1 -1
- package/dist/path-locks.js +10 -2
- package/dist/path-locks.js.map +1 -1
- package/dist/room-manager.d.ts +53 -3
- package/dist/room-manager.d.ts.map +1 -1
- package/dist/room-manager.js +111 -3
- package/dist/room-manager.js.map +1 -1
- package/dist/server.d.ts +6 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +62 -1
- package/dist/server.js.map +1 -1
- package/package.json +9 -8
package/dist/blob-route.d.ts
CHANGED
|
@@ -55,9 +55,25 @@ export declare class InMemoryBlobStorage implements ServerBlobStorage {
|
|
|
55
55
|
export declare class FsBlobStorage implements ServerBlobStorage {
|
|
56
56
|
private readonly dir;
|
|
57
57
|
private readonly ready;
|
|
58
|
+
private readonly locks;
|
|
58
59
|
constructor(dataDir: string);
|
|
59
60
|
private file;
|
|
61
|
+
/**
|
|
62
|
+
* Serialize operations on one hash. Without this, a GC sweep can stat a blob
|
|
63
|
+
* as old, and unlink it after a concurrent `put` has already renamed fresh
|
|
64
|
+
* bytes into place - deleting a blob a client believes it just uploaded.
|
|
65
|
+
* Keyed per hash, so unrelated blobs never contend.
|
|
66
|
+
*/
|
|
67
|
+
private withLock;
|
|
60
68
|
put(hash: string, bytes: Uint8Array, contentType?: string): Promise<ServerBlobMeta>;
|
|
69
|
+
/**
|
|
70
|
+
* Delete a blob only if it is still older than `cutoffEpochMs`.
|
|
71
|
+
*
|
|
72
|
+
* The mtime is re-checked HERE, under the same lock `put` takes, so a blob
|
|
73
|
+
* re-uploaded between a GC plan and its application survives: `put` refreshes
|
|
74
|
+
* mtime via a fresh temp file and rename. Returns whether it deleted.
|
|
75
|
+
*/
|
|
76
|
+
deleteIfOlderThan(hash: string, cutoffEpochMs: number): Promise<boolean>;
|
|
61
77
|
get(hash: string): Promise<{
|
|
62
78
|
bytes: Uint8Array;
|
|
63
79
|
meta: ServerBlobMeta;
|
package/dist/blob-route.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blob-route.d.ts","sourceRoot":"","sources":["../src/blob-route.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAKlC,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACpF,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3B;AAED,kDAAkD;AAClD,qBAAa,mBAAoB,YAAW,iBAAiB;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IAElF,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAUnF,GAAG,CAAC,IAAI,EAAE,MAAM;;;;IAIhB,GAAG,CAAC,IAAI,EAAE,MAAM;IAGhB,MAAM,CAAC,IAAI,EAAE,MAAM;IAGnB,IAAI;CAGX;AAKD;;;;;;;;;GASG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;
|
|
1
|
+
{"version":3,"file":"blob-route.d.ts","sourceRoot":"","sources":["../src/blob-route.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAKlC,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACpF,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC/E,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC3B;AAED,kDAAkD;AAClD,qBAAa,mBAAoB,YAAW,iBAAiB;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IAElF,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAUnF,GAAG,CAAC,IAAI,EAAE,MAAM;;;;IAIhB,GAAG,CAAC,IAAI,EAAE,MAAM;IAGhB,MAAM,CAAC,IAAI,EAAE,MAAM;IAGnB,IAAI;CAGX;AAKD;;;;;;;;;GASG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;gBAE9C,OAAO,EAAE,MAAM;IAK3B,OAAO,CAAC,IAAI;IAIZ;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAeV,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBzF;;;;;;OAMG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBxE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC;IAe9E,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWtC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAMhC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GAAG,SAAS,KACrB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAEhC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAM5B"}
|
package/dist/blob-route.js
CHANGED
|
@@ -46,6 +46,7 @@ const HASH_REGEX = /^[a-f0-9]{32}$/;
|
|
|
46
46
|
export class FsBlobStorage {
|
|
47
47
|
dir;
|
|
48
48
|
ready;
|
|
49
|
+
locks = new Map();
|
|
49
50
|
constructor(dataDir) {
|
|
50
51
|
this.dir = path.join(dataDir, 'blobs');
|
|
51
52
|
this.ready = fs.promises.mkdir(this.dir, { recursive: true }).then(() => undefined);
|
|
@@ -53,20 +54,65 @@ export class FsBlobStorage {
|
|
|
53
54
|
file(hash) {
|
|
54
55
|
return path.join(this.dir, hash);
|
|
55
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* Serialize operations on one hash. Without this, a GC sweep can stat a blob
|
|
59
|
+
* as old, and unlink it after a concurrent `put` has already renamed fresh
|
|
60
|
+
* bytes into place - deleting a blob a client believes it just uploaded.
|
|
61
|
+
* Keyed per hash, so unrelated blobs never contend.
|
|
62
|
+
*/
|
|
63
|
+
withLock(hash, fn) {
|
|
64
|
+
const prev = this.locks.get(hash) ?? Promise.resolve();
|
|
65
|
+
const run = prev.then(fn, fn);
|
|
66
|
+
// Keep the chain alive but never let a rejection poison the next waiter.
|
|
67
|
+
const settled = run.then(() => undefined, () => undefined);
|
|
68
|
+
this.locks.set(hash, settled);
|
|
69
|
+
void settled.then(() => {
|
|
70
|
+
if (this.locks.get(hash) === settled)
|
|
71
|
+
this.locks.delete(hash);
|
|
72
|
+
});
|
|
73
|
+
return run;
|
|
74
|
+
}
|
|
56
75
|
async put(hash, bytes, contentType) {
|
|
57
76
|
await this.ready;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
77
|
+
return this.withLock(hash, async () => {
|
|
78
|
+
const file = this.file(hash);
|
|
79
|
+
// Atomic write (temp + rename) so a concurrent/interrupted PUT of the same
|
|
80
|
+
// content-addressed blob can't leave a torn file.
|
|
81
|
+
const tmp = `${file}.tmp-${crypto.randomUUID()}`;
|
|
82
|
+
await fs.promises.writeFile(tmp, bytes);
|
|
83
|
+
await fs.promises.rename(tmp, file);
|
|
84
|
+
return {
|
|
85
|
+
hash,
|
|
86
|
+
byteLength: bytes.byteLength,
|
|
87
|
+
contentType,
|
|
88
|
+
uploadedAt: new Date().toISOString(),
|
|
89
|
+
};
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Delete a blob only if it is still older than `cutoffEpochMs`.
|
|
94
|
+
*
|
|
95
|
+
* The mtime is re-checked HERE, under the same lock `put` takes, so a blob
|
|
96
|
+
* re-uploaded between a GC plan and its application survives: `put` refreshes
|
|
97
|
+
* mtime via a fresh temp file and rename. Returns whether it deleted.
|
|
98
|
+
*/
|
|
99
|
+
async deleteIfOlderThan(hash, cutoffEpochMs) {
|
|
100
|
+
await this.ready;
|
|
101
|
+
return this.withLock(hash, async () => {
|
|
102
|
+
const file = this.file(hash);
|
|
103
|
+
try {
|
|
104
|
+
const stat = await fs.promises.stat(file);
|
|
105
|
+
if (stat.mtimeMs >= cutoffEpochMs)
|
|
106
|
+
return false;
|
|
107
|
+
await fs.promises.unlink(file);
|
|
108
|
+
return true;
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
if (err.code === 'ENOENT')
|
|
112
|
+
return false;
|
|
113
|
+
throw err;
|
|
114
|
+
}
|
|
115
|
+
});
|
|
70
116
|
}
|
|
71
117
|
async get(hash) {
|
|
72
118
|
await this.ready;
|
package/dist/blob-route.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blob-route.js","sourceRoot":"","sources":["../src/blob-route.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAmB/D,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAiBlC,kDAAkD;AAClD,MAAM,OAAO,mBAAmB;IACb,KAAK,GAAG,IAAI,GAAG,EAAuD,CAAC;IAExF,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,KAAiB,EAAE,WAAoB;QAC7D,MAAM,IAAI,GAAmB;YAC3B,IAAI;YACJ,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,WAAW;YACX,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACrC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAY;QACpB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACrE,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IACD,KAAK,CAAC,IAAI;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAED,2EAA2E;AAC3E,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAEpC;;;;;;;;;GASG;AACH,MAAM,OAAO,aAAa;IACP,GAAG,CAAS;IACZ,KAAK,CAAgB;
|
|
1
|
+
{"version":3,"file":"blob-route.js","sourceRoot":"","sources":["../src/blob-route.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -21,4 +21,6 @@ export { assertPushableLayer, assertReportDigest, CONTENT_DIGEST_REGEX, LayerPus
|
|
|
21
21
|
export { FsLayerRegistry } from './layer-registry-fs.js';
|
|
22
22
|
export { emitRegistryEvent, signRegistryEvent, type RegistryWebhook, type RegistryEvent, type RegistryEventType, } from './registry-webhooks.js';
|
|
23
23
|
export { handleLayerRegistryRequest, type LayerRegistryRouteOptions, type RegistryAuthorizeFn, } from './layer-registry-route.js';
|
|
24
|
+
export * from './blob-gc.js';
|
|
25
|
+
export * from './blob-gc-worker.js';
|
|
24
26
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -22,4 +22,6 @@ export { assertPushableLayer, assertReportDigest, CONTENT_DIGEST_REGEX, LayerPus
|
|
|
22
22
|
export { FsLayerRegistry } from './layer-registry-fs.js';
|
|
23
23
|
export { emitRegistryEvent, signRegistryEvent, } from './registry-webhooks.js';
|
|
24
24
|
export { handleLayerRegistryRequest, } from './layer-registry-route.js';
|
|
25
|
+
export * from './blob-gc.js';
|
|
26
|
+
export * from './blob-gc-worker.js';
|
|
25
27
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,iBAAiB,GAIlB,MAAM,aAAa,CAAC;AAKrB,OAAO,EACL,aAAa,GAId,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,GAGjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAIL,oBAAoB,EACpB,OAAO,EACP,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,IAAI,EACJ,WAAW,GAIZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,SAAS,GAKV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,aAAa,GAGd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,cAAc,GAGf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,EACf,cAAc,GAEf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,yBAAyB,GAK1B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,GAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,GAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,GAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,GAGlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GAKlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,aAAa,EACb,eAAe,EACf,4BAA4B,EAC5B,iCAAiC,EACjC,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAUlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,GAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,GAOpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAIlB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,0BAA0B,GAG3B,MAAM,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,iBAAiB,GAIlB,MAAM,aAAa,CAAC;AAKrB,OAAO,EACL,aAAa,GAId,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,GAGjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAIL,oBAAoB,EACpB,OAAO,EACP,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,IAAI,EACJ,WAAW,GAIZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,SAAS,GAKV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,aAAa,GAGd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,cAAc,GAGf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,EACf,cAAc,GAEf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,yBAAyB,GAK1B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,GAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,GAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,GAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,GAGlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GAKlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,aAAa,EACb,eAAe,EACf,4BAA4B,EAC5B,iCAAiC,EACjC,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAUlB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,GAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,GAOpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAIlB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,0BAA0B,GAG3B,MAAM,2BAA2B,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC"}
|
package/dist/path-locks.d.ts
CHANGED
|
@@ -26,8 +26,16 @@ export declare function createPathLockRegistry(): PathLockRegistry;
|
|
|
26
26
|
/**
|
|
27
27
|
* Apply `update` to a throwaway Y.Doc and harvest the touched paths
|
|
28
28
|
* as a list of `<top>/<key>` strings (`entities/wall`, `geometry/g1`,
|
|
29
|
-
* etc.).
|
|
30
|
-
*
|
|
29
|
+
* etc.).
|
|
30
|
+
*
|
|
31
|
+
* EVERY top-level shared type is harvested, not just the four pre-created
|
|
32
|
+
* below: `Y.applyUpdate` registers any top-level type the update names, and
|
|
33
|
+
* `topLevelKeyOf` scans `doc.share`, so `annotations` — the fifth member of
|
|
34
|
+
* `TOP` in @ifc-lite/collab, deliberately absent here — is found all the same.
|
|
35
|
+
* The `getMap` calls only force the common types into existence early; they
|
|
36
|
+
* are NOT the list of what can be locked, and reading them as one would
|
|
37
|
+
* suggest a lock prefix that cannot be enforced. `path-locks.test.ts` pins
|
|
38
|
+
* both halves of that.
|
|
31
39
|
*/
|
|
32
40
|
export declare function harvestUpdatePaths(update: Uint8Array): string[];
|
|
33
41
|
/**
|
package/dist/path-locks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-locks.d.ts","sourceRoot":"","sources":["../src/path-locks.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAkB,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AAIzF,MAAM,WAAW,QAAQ;IACvB,qGAAqG;IACrG,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,4EAA4E;IAC5E,WAAW,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,0CAA0C;IAC1C,IAAI,IAAI,SAAS,QAAQ,EAAE,CAAC;IAC5B,0EAA0E;IAC1E,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC9B,sCAAsC;IACtC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,uBAAuB;IACvB,KAAK,IAAI,IAAI,CAAC;IACd,mFAAmF;IACnF,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC;CAC9D;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CA4BzD;AAED
|
|
1
|
+
{"version":3,"file":"path-locks.d.ts","sourceRoot":"","sources":["../src/path-locks.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAkB,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AAIzF,MAAM,WAAW,QAAQ;IACvB,qGAAqG;IACrG,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,4EAA4E;IAC5E,WAAW,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,0CAA0C;IAC1C,IAAI,IAAI,SAAS,QAAQ,EAAE,CAAC;IAC5B,0EAA0E;IAC1E,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC9B,sCAAsC;IACtC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,uBAAuB;IACvB,KAAK,IAAI,IAAI,CAAC;IACd,mFAAmF;IACnF,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC;CAC9D;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CA4BzD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,EAAE,CAwC/D;AASD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,eAAe,CAgDlF"}
|
package/dist/path-locks.js
CHANGED
|
@@ -61,8 +61,16 @@ export function createPathLockRegistry() {
|
|
|
61
61
|
/**
|
|
62
62
|
* Apply `update` to a throwaway Y.Doc and harvest the touched paths
|
|
63
63
|
* as a list of `<top>/<key>` strings (`entities/wall`, `geometry/g1`,
|
|
64
|
-
* etc.).
|
|
65
|
-
*
|
|
64
|
+
* etc.).
|
|
65
|
+
*
|
|
66
|
+
* EVERY top-level shared type is harvested, not just the four pre-created
|
|
67
|
+
* below: `Y.applyUpdate` registers any top-level type the update names, and
|
|
68
|
+
* `topLevelKeyOf` scans `doc.share`, so `annotations` — the fifth member of
|
|
69
|
+
* `TOP` in @ifc-lite/collab, deliberately absent here — is found all the same.
|
|
70
|
+
* The `getMap` calls only force the common types into existence early; they
|
|
71
|
+
* are NOT the list of what can be locked, and reading them as one would
|
|
72
|
+
* suggest a lock prefix that cannot be enforced. `path-locks.test.ts` pins
|
|
73
|
+
* both halves of that.
|
|
66
74
|
*/
|
|
67
75
|
export function harvestUpdatePaths(update) {
|
|
68
76
|
const tmp = new Y.Doc();
|
package/dist/path-locks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-locks.js","sourceRoot":"","sources":["../src/path-locks.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AA0BjD,MAAM,UAAU,sBAAsB;IACpC,MAAM,KAAK,GAAe,EAAE,CAAC;IAE7B,OAAO;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QACtB,GAAG,CAAC,IAAI;YACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,IAAI;YACT,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,GAAG,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC1B,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK;YACH,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,SAAS;YACrB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;oBAAE,SAAS;gBAC5C,IAAI,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;oBAAE,SAAS;gBACxD,IAAI,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;oBAAE,SAAS;gBACpD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"path-locks.js","sourceRoot":"","sources":["../src/path-locks.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AA0BjD,MAAM,UAAU,sBAAsB;IACpC,MAAM,KAAK,GAAe,EAAE,CAAC;IAE7B,OAAO;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QACtB,GAAG,CAAC,IAAI;YACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,IAAI;YACT,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,GAAG,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC1B,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK;YACH,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,SAAS;YACrB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;oBAAE,SAAS;gBAC5C,IAAI,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;oBAAE,SAAS;gBACxD,IAAI,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;oBAAE,SAAS;gBACpD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAkB;IACnD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IACxB,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5B,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEnB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,OAAO,GAAG,CAAC,EAAiB,EAAE,EAAE;QACpC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAChD,IAAI,IAAI,GAAmC,IAA+B,CAAC;YAC3E,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,IAAI,GAAI,IAA+E,CAAC,KAAK,CAAC;gBACpG,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,4BAA4B;oBAC5B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtC,IAAI,IAAI;wBAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACjC,MAAM;gBACR,CAAC;gBACD,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ;oBAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACzE,IAAI,GAAG,IAAI,CAAC,MAAwC,CAAC;YACvD,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YACpC,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAChC,2DAA2D;YAC3D,2DAA2D;YAC3D,4BAA4B;YAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,KAAK,IAAI;oBAAE,SAAS;gBAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3B,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACrC,GAAG,CAAC,OAAO,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,aAAa,CAAC,IAA6B,EAAE,GAAU;IAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAA0B;IAC/D,OAAO,CAAC,GAAe,EAAE,IAAoB,EAAkB,EAAE;QAC/D,IAAI,GAAG,CAAC,UAAU,KAAK,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAC9C,oEAAoE;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,SAAiB,CAAC;QACtB,IAAI,CAAC;YACH,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;YACnE,iEAAiE;YACjE,2BAA2B;YAC3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,oDAAoD;QACpD,IAAI,SAAS,KAAK,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACzC,IAAI,KAAa,CAAC;QAClB,IAAI,CAAC;YACH,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,mEAAmE;QACnE,mEAAmE;QACnE,kEAAkE;QAClE,kCAAkC;QAClC,MAAM,YAAY,GAChB,KAAK,KAAK,YAAY,CAAC,gBAAgB;YACvC,KAAK,KAAK,YAAY,CAAC,mBAAmB,CAAC;QAC7C,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAEvC,IAAI,OAAmB,CAAC;QACxB,IAAI,CAAC;YACH,OAAO,GAAG,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChD,CAAC;QAAC,MAAM,CAAC;YACP,gEAAgE;YAChE,4DAA4D;YAC5D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;QAC3D,CAAC;QACD,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/room-manager.d.ts
CHANGED
|
@@ -20,6 +20,15 @@ export interface VerifyDecision {
|
|
|
20
20
|
ok: boolean;
|
|
21
21
|
/** Audit-friendly reason string when ok=false. */
|
|
22
22
|
reason?: string;
|
|
23
|
+
/**
|
|
24
|
+
* Optional replacement payload to dispatch instead of the raw wire
|
|
25
|
+
* message — e.g. the anti-replay protector unwraps its signed envelope
|
|
26
|
+
* (tag + clientId + clock + hmac + inner frame) down to the inner
|
|
27
|
+
* y-protocol frame here. Without this, the envelope bytes themselves
|
|
28
|
+
* would be handed to `dispatchMessage`, which doesn't recognise them as
|
|
29
|
+
* a sync/awareness frame and silently drops them in its `default` case.
|
|
30
|
+
*/
|
|
31
|
+
payload?: Uint8Array;
|
|
23
32
|
}
|
|
24
33
|
export type VerifyMessageFn = (msg: Uint8Array, conn: PeerConnection) => VerifyDecision;
|
|
25
34
|
export interface RoomOptions {
|
|
@@ -41,9 +50,13 @@ export interface RoomOptions {
|
|
|
41
50
|
* so a non-writer / rate-limited / oversized frame is rejected before the
|
|
42
51
|
* verifier parses it (avoids Y.Doc-parse amplification). Signed-envelope
|
|
43
52
|
* frames (e.g. the anti-replay protector's `0xff`-tagged frames) aren't
|
|
44
|
-
* recognised as sync write-frames, so the verifier
|
|
45
|
-
* them and sees every signed frame
|
|
46
|
-
* `
|
|
53
|
+
* recognised as sync write-frames by that first peek, so the verifier
|
|
54
|
+
* runs first for them and sees every signed frame — but if the verifier
|
|
55
|
+
* unwraps the envelope and returns `payload`, `handleMessage` re-runs
|
|
56
|
+
* `preCheckWriteFrame` on THAT payload before dispatch. The unwrapped
|
|
57
|
+
* frame is a real write frame the outer peek never saw, so it must still
|
|
58
|
+
* clear role / rate-limit / size before it reaches the doc. Returning
|
|
59
|
+
* `{ ok: false }` audits as `reject` with `reason`.
|
|
47
60
|
*/
|
|
48
61
|
verifyMessage?: VerifyMessageFn;
|
|
49
62
|
/** Internal: metric counters injected by the manager. */
|
|
@@ -99,6 +112,31 @@ export declare class Room {
|
|
|
99
112
|
/** Number of currently connected peers. */
|
|
100
113
|
get peerCount(): number;
|
|
101
114
|
addConnection(conn: PeerConnection): void;
|
|
115
|
+
/**
|
|
116
|
+
* Send an application-level keepalive to one peer.
|
|
117
|
+
*
|
|
118
|
+
* y-websocket's client closes a connection after
|
|
119
|
+
* `messageReconnectTimeout` (30s, a module-level const, not configurable)
|
|
120
|
+
* with no inbound MESSAGE, and only `websocket.onmessage` refreshes that
|
|
121
|
+
* clock (y-websocket/src/y-websocket.js:186,387-396). WebSocket protocol
|
|
122
|
+
* pings do not count: they are auto-ponged below the message layer, so the
|
|
123
|
+
* `ws.ping()` loop in `server.ts` cannot feed it.
|
|
124
|
+
*
|
|
125
|
+
* This server does not echo a peer's own updates back to it
|
|
126
|
+
* (`if (conn === origin) continue;` below, and the same for doc updates), so
|
|
127
|
+
* a room with ONE occupant produces no server-to-client traffic at all after
|
|
128
|
+
* the initial handshake. y-websocket's own comment says the timeout assumes
|
|
129
|
+
* "not even your own awareness updates (which are updated every 15 seconds)"
|
|
130
|
+
* come back, i.e. the reference server echoes them and ours does not.
|
|
131
|
+
*
|
|
132
|
+
* Until #2791 that gap was masked by an accident: the server's own Awareness
|
|
133
|
+
* ghost state renewed every ~15s and was broadcast to everyone, feeding the
|
|
134
|
+
* watchdog. Clearing the ghost removes the accident, so the keepalive has to
|
|
135
|
+
* be explicit. Measured: with the ghost gone and no keepalive, a lone client
|
|
136
|
+
* closed and reconnected at t=30s and t=63s over a 75s window; with either
|
|
137
|
+
* one present, zero closes.
|
|
138
|
+
*/
|
|
139
|
+
sendKeepalive(conn: PeerConnection): void;
|
|
102
140
|
removeConnection(conn: PeerConnection): void;
|
|
103
141
|
/** Receive a binary message from a peer and dispatch it. */
|
|
104
142
|
handleMessage(conn: PeerConnection, msg: Uint8Array): void;
|
|
@@ -124,6 +162,18 @@ export declare class Room {
|
|
|
124
162
|
* IDs the connection contributed so we can clean up on disconnect.
|
|
125
163
|
*/
|
|
126
164
|
private onAwarenessUpdate;
|
|
165
|
+
/** Close connections and detach the doc/awareness listeners. Shared by
|
|
166
|
+
* `destroy()` and `disposeUnloaded()`; does not touch persistence. */
|
|
167
|
+
private closeConnsAndListeners;
|
|
168
|
+
/**
|
|
169
|
+
* Tear down a room that never finished loading. Same disposal as
|
|
170
|
+
* `destroy()` MINUS the final compaction: this room's `doc` is empty or
|
|
171
|
+
* partial because `loadFromDisk()` threw, so compacting it would replace
|
|
172
|
+
* the persisted log with that emptiness -- turning a transient disk error
|
|
173
|
+
* (EMFILE, ENOSPC, an NFS blip) or a corrupt log into permanent data loss.
|
|
174
|
+
* Compaction is only ever valid for a doc that loaded successfully.
|
|
175
|
+
*/
|
|
176
|
+
disposeUnloaded(): Promise<void>;
|
|
127
177
|
destroy(): Promise<void>;
|
|
128
178
|
}
|
|
129
179
|
export interface RoomManagerOptions extends RoomOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room-manager.d.ts","sourceRoot":"","sources":["../src/room-manager.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAsE,MAAM,uBAAuB,CAAC;AAItH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAqB,KAAK,gBAAgB,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"room-manager.d.ts","sourceRoot":"","sources":["../src/room-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/room-manager.js
CHANGED
|
@@ -22,6 +22,12 @@ import { noopAuditSink, shortHash, } from './audit-log.js';
|
|
|
22
22
|
import { createRateLimiter } from './rate-limit.js';
|
|
23
23
|
const MESSAGE_SYNC = 0;
|
|
24
24
|
const MESSAGE_AWARENESS = 1;
|
|
25
|
+
/**
|
|
26
|
+
* An awareness update naming ZERO clients: a single varUint `0` length prefix.
|
|
27
|
+
* `applyAwarenessUpdate` decodes it as a no-op, but it is a real WebSocket
|
|
28
|
+
* message, which is the point. See `Room.sendKeepalive`.
|
|
29
|
+
*/
|
|
30
|
+
const EMPTY_AWARENESS_UPDATE = new Uint8Array([0]);
|
|
25
31
|
// Inner sync-message subtypes (mirror y-protocols/sync constants) used for
|
|
26
32
|
// the cheap pre-verify frame peek. Kept local so the peek never has to call
|
|
27
33
|
// the full readSyncMessage (which applies payloads to the doc as a side
|
|
@@ -59,6 +65,17 @@ export class Room {
|
|
|
59
65
|
this.id = id;
|
|
60
66
|
this.doc = new Y.Doc();
|
|
61
67
|
this.awareness = new Awareness(this.doc);
|
|
68
|
+
// y-protocols' Awareness constructor self-registers a local state of `{}`
|
|
69
|
+
// for its own clientID and renews it every ~15s. The server is a relay,
|
|
70
|
+
// not a participant: left in place, that entry is broadcast to every
|
|
71
|
+
// client as a peer, so every room badge read one too high (#2791). It
|
|
72
|
+
// showed "(2)" directly above a roster saying "You're the only one here",
|
|
73
|
+
// because the roster filters on a `user` field and the badge did not.
|
|
74
|
+
// Clearing the state also stops the renewal, which y-protocols guards on
|
|
75
|
+
// `getLocalState() !== null`.
|
|
76
|
+
// This must stay BEFORE the `update` listener is wired up below, so that
|
|
77
|
+
// clearing it cannot broadcast a removal for a peer no client ever saw.
|
|
78
|
+
this.awareness.setLocalState(null);
|
|
62
79
|
this.persistence = opts.persistence;
|
|
63
80
|
this.compactEvery = opts.compactEvery ?? 1000;
|
|
64
81
|
this.auditSink = opts.auditSink ?? noopAuditSink;
|
|
@@ -143,6 +160,36 @@ export class Room {
|
|
|
143
160
|
safeSend(conn.ws, encoding.toUint8Array(aenc));
|
|
144
161
|
}
|
|
145
162
|
}
|
|
163
|
+
/**
|
|
164
|
+
* Send an application-level keepalive to one peer.
|
|
165
|
+
*
|
|
166
|
+
* y-websocket's client closes a connection after
|
|
167
|
+
* `messageReconnectTimeout` (30s, a module-level const, not configurable)
|
|
168
|
+
* with no inbound MESSAGE, and only `websocket.onmessage` refreshes that
|
|
169
|
+
* clock (y-websocket/src/y-websocket.js:186,387-396). WebSocket protocol
|
|
170
|
+
* pings do not count: they are auto-ponged below the message layer, so the
|
|
171
|
+
* `ws.ping()` loop in `server.ts` cannot feed it.
|
|
172
|
+
*
|
|
173
|
+
* This server does not echo a peer's own updates back to it
|
|
174
|
+
* (`if (conn === origin) continue;` below, and the same for doc updates), so
|
|
175
|
+
* a room with ONE occupant produces no server-to-client traffic at all after
|
|
176
|
+
* the initial handshake. y-websocket's own comment says the timeout assumes
|
|
177
|
+
* "not even your own awareness updates (which are updated every 15 seconds)"
|
|
178
|
+
* come back, i.e. the reference server echoes them and ours does not.
|
|
179
|
+
*
|
|
180
|
+
* Until #2791 that gap was masked by an accident: the server's own Awareness
|
|
181
|
+
* ghost state renewed every ~15s and was broadcast to everyone, feeding the
|
|
182
|
+
* watchdog. Clearing the ghost removes the accident, so the keepalive has to
|
|
183
|
+
* be explicit. Measured: with the ghost gone and no keepalive, a lone client
|
|
184
|
+
* closed and reconnected at t=30s and t=63s over a 75s window; with either
|
|
185
|
+
* one present, zero closes.
|
|
186
|
+
*/
|
|
187
|
+
sendKeepalive(conn) {
|
|
188
|
+
const enc = encoding.createEncoder();
|
|
189
|
+
encoding.writeVarUint(enc, MESSAGE_AWARENESS);
|
|
190
|
+
encoding.writeVarUint8Array(enc, EMPTY_AWARENESS_UPDATE);
|
|
191
|
+
safeSend(conn.ws, encoding.toUint8Array(enc));
|
|
192
|
+
}
|
|
146
193
|
removeConnection(conn) {
|
|
147
194
|
this.conns.delete(conn);
|
|
148
195
|
if (conn.awarenessClients.size > 0) {
|
|
@@ -162,6 +209,7 @@ export class Room {
|
|
|
162
209
|
// write-tagged frames (asymmetric CPU/GC DoS). Cheap peeks only here.
|
|
163
210
|
if (!this.preCheckWriteFrame(conn, msg))
|
|
164
211
|
return;
|
|
212
|
+
let dispatchable = msg;
|
|
165
213
|
if (this.verifyMessage) {
|
|
166
214
|
const decision = this.verifyMessage(msg, conn);
|
|
167
215
|
if (!decision.ok) {
|
|
@@ -170,9 +218,27 @@ export class Room {
|
|
|
170
218
|
this.counters.reject?.(reason);
|
|
171
219
|
return;
|
|
172
220
|
}
|
|
221
|
+
// A verifier that unwraps an outer envelope (e.g. the anti-replay
|
|
222
|
+
// protector's signed frame) hands back the inner y-protocol frame
|
|
223
|
+
// here; dispatch THAT, not the raw envelope bytes — the envelope
|
|
224
|
+
// isn't itself a valid sync/awareness frame.
|
|
225
|
+
if (decision.payload) {
|
|
226
|
+
dispatchable = decision.payload;
|
|
227
|
+
// The preCheckWriteFrame call above read the ENVELOPE (msg), whose
|
|
228
|
+
// outer varint is the verifier's own tag (e.g. SIGNED_TAG) and never
|
|
229
|
+
// MESSAGE_SYNC, so it returned true without consulting the role, the
|
|
230
|
+
// limiter, or the size cap (see preCheckWriteFrame's early return).
|
|
231
|
+
// decision.payload is a real, unwrapped write frame that peek never
|
|
232
|
+
// saw — re-run the same gate on the bytes we are actually about to
|
|
233
|
+
// dispatch, or a viewer holding a valid signing key can write to the
|
|
234
|
+
// doc, and an oversized/unrate-limited envelope bypasses the caps
|
|
235
|
+
// meant to bound Y.Doc-parse amplification.
|
|
236
|
+
if (!this.preCheckWriteFrame(conn, dispatchable))
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
173
239
|
}
|
|
174
240
|
try {
|
|
175
|
-
this.dispatchMessage(conn,
|
|
241
|
+
this.dispatchMessage(conn, dispatchable);
|
|
176
242
|
}
|
|
177
243
|
catch {
|
|
178
244
|
// Malformed/truncated frame from a peer. lib0 decoding throws
|
|
@@ -340,7 +406,9 @@ export class Room {
|
|
|
340
406
|
safeSend(conn.ws, message);
|
|
341
407
|
}
|
|
342
408
|
};
|
|
343
|
-
|
|
409
|
+
/** Close connections and detach the doc/awareness listeners. Shared by
|
|
410
|
+
* `destroy()` and `disposeUnloaded()`; does not touch persistence. */
|
|
411
|
+
closeConnsAndListeners() {
|
|
344
412
|
this.destroyed = true;
|
|
345
413
|
for (const conn of this.conns) {
|
|
346
414
|
try {
|
|
@@ -351,6 +419,22 @@ export class Room {
|
|
|
351
419
|
this.conns.clear();
|
|
352
420
|
this.doc.off('update', this.onDocUpdate);
|
|
353
421
|
this.awareness.off('update', this.onAwarenessUpdate);
|
|
422
|
+
}
|
|
423
|
+
/**
|
|
424
|
+
* Tear down a room that never finished loading. Same disposal as
|
|
425
|
+
* `destroy()` MINUS the final compaction: this room's `doc` is empty or
|
|
426
|
+
* partial because `loadFromDisk()` threw, so compacting it would replace
|
|
427
|
+
* the persisted log with that emptiness -- turning a transient disk error
|
|
428
|
+
* (EMFILE, ENOSPC, an NFS blip) or a corrupt log into permanent data loss.
|
|
429
|
+
* Compaction is only ever valid for a doc that loaded successfully.
|
|
430
|
+
*/
|
|
431
|
+
async disposeUnloaded() {
|
|
432
|
+
this.closeConnsAndListeners();
|
|
433
|
+
this.awareness.destroy();
|
|
434
|
+
this.doc.destroy();
|
|
435
|
+
}
|
|
436
|
+
async destroy() {
|
|
437
|
+
this.closeConnsAndListeners();
|
|
354
438
|
// Final compaction so the next load picks up the freshest state.
|
|
355
439
|
try {
|
|
356
440
|
await this.persistence.compact(this.id, Y.encodeStateAsUpdate(this.doc));
|
|
@@ -396,7 +480,31 @@ export class RoomManager {
|
|
|
396
480
|
const verifyMessage = this.options.verifyMessage;
|
|
397
481
|
pending = (async () => {
|
|
398
482
|
const room = new Room(roomId, { ...this.options, counters, verifyMessage });
|
|
399
|
-
|
|
483
|
+
// `new Room(...)` already started disposables (notably y-protocols'
|
|
484
|
+
// `Awareness`, which self-starts a `setInterval` renewal/eviction
|
|
485
|
+
// timer in its constructor) and wired `doc`/`awareness` listeners.
|
|
486
|
+
// If loadFromDisk() throws, `room` is never returned to any caller,
|
|
487
|
+
// so nothing outside this closure can reach it to dispose those
|
|
488
|
+
// handles — they would otherwise leak for the life of the process.
|
|
489
|
+
// Tear the half-built room down here, where we still hold the only
|
|
490
|
+
// reference, then rethrow so the promise still rejects as before.
|
|
491
|
+
//
|
|
492
|
+
// Use disposeUnloaded(), NOT destroy(): destroy() ends with a final
|
|
493
|
+
// compact() of `room.doc` onto the persisted log, and on this path
|
|
494
|
+
// `room.doc` is empty or partial (that is what loadFromDisk() failing
|
|
495
|
+
// means). A transient EMFILE/ENOSPC blip -- or a corrupt log -- would
|
|
496
|
+
// otherwise be turned into permanent data loss by the "cleanup" that
|
|
497
|
+
// runs right here.
|
|
498
|
+
try {
|
|
499
|
+
await room.loadFromDisk();
|
|
500
|
+
}
|
|
501
|
+
catch (err) {
|
|
502
|
+
await room.disposeUnloaded().catch((disposeErr) => {
|
|
503
|
+
// eslint-disable-next-line no-console
|
|
504
|
+
console.error(`[collab-server] disposeUnloaded error for ${roomId} (original error wins):`, disposeErr);
|
|
505
|
+
});
|
|
506
|
+
throw err;
|
|
507
|
+
}
|
|
400
508
|
return room;
|
|
401
509
|
})();
|
|
402
510
|
// Evict the cached promise if initialization fails so a transient load
|