@matter/node 0.11.5-alpha.0-20241123-e56e38864 → 0.11.5-alpha.0-20241124-c836aa892
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/cjs/behavior/state/transaction/Transaction.d.ts +18 -18
- package/dist/cjs/node/storage/EndpointStoreService.d.ts.map +1 -1
- package/dist/cjs/node/storage/EndpointStoreService.js +4 -2
- package/dist/cjs/node/storage/EndpointStoreService.js.map +1 -1
- package/dist/esm/behavior/state/transaction/Transaction.d.ts +18 -18
- package/dist/esm/node/storage/EndpointStoreService.d.ts.map +1 -1
- package/dist/esm/node/storage/EndpointStoreService.js +4 -2
- package/dist/esm/node/storage/EndpointStoreService.js.map +1 -1
- package/package.json +7 -7
- package/src/node/storage/EndpointStoreService.ts +8 -2
|
@@ -145,14 +145,14 @@ export declare const Transaction: {
|
|
|
145
145
|
* A read-only transaction you may use without context.
|
|
146
146
|
*/
|
|
147
147
|
ReadOnly: {
|
|
148
|
-
"__#
|
|
149
|
-
"__#
|
|
150
|
-
"__#
|
|
151
|
-
"__#
|
|
152
|
-
"__#
|
|
153
|
-
"__#
|
|
154
|
-
"__#
|
|
155
|
-
"__#
|
|
148
|
+
"__#116859@#participants": Set<Participant>;
|
|
149
|
+
"__#116859@#roles": Map<{}, Participant>;
|
|
150
|
+
"__#116859@#resources": Set<Resource>;
|
|
151
|
+
"__#116859@#status": Status;
|
|
152
|
+
"__#116859@#waitingOn"?: Iterable<Transaction>;
|
|
153
|
+
"__#116859@#via": string;
|
|
154
|
+
"__#116859@#shared"?: import("#general").Observable<[]>;
|
|
155
|
+
"__#116859@#closed"?: import("#general").Observable<[]>;
|
|
156
156
|
close(): void;
|
|
157
157
|
readonly via: string;
|
|
158
158
|
readonly status: Status;
|
|
@@ -171,16 +171,16 @@ export declare const Transaction: {
|
|
|
171
171
|
rollback(): Promise<void> | undefined;
|
|
172
172
|
waitFor(others: Set<Transaction>): Promise<void>;
|
|
173
173
|
toString(): string;
|
|
174
|
-
"__#
|
|
175
|
-
"__#
|
|
176
|
-
"__#
|
|
177
|
-
"__#
|
|
178
|
-
"__#
|
|
179
|
-
"__#
|
|
180
|
-
"__#
|
|
181
|
-
"__#
|
|
182
|
-
"__#
|
|
183
|
-
"__#
|
|
174
|
+
"__#116859@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
|
|
175
|
+
"__#116859@#executePreCommit"(): MaybePromise<void>;
|
|
176
|
+
"__#116859@#executeCommit"(): MaybePromise;
|
|
177
|
+
"__#116859@#executeCommit1"(): MaybePromise;
|
|
178
|
+
"__#116859@#executeCommit2"(): Promise<void> | undefined;
|
|
179
|
+
"__#116859@#executePostCommit"(participants: Participant[]): MaybePromise;
|
|
180
|
+
"__#116859@#executeRollback"(): Promise<void> | undefined;
|
|
181
|
+
"__#116859@#log"(...message: unknown[]): void;
|
|
182
|
+
"__#116859@#locksChanged"(resources: Set<Resource>, how?: string): void;
|
|
183
|
+
"__#116859@#assertAvailable"(): void;
|
|
184
184
|
};
|
|
185
185
|
Status: typeof Status;
|
|
186
186
|
[Symbol.toStringTag]: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EndpointStoreService.d.ts","sourceRoot":"","sources":["../../../../src/node/storage/EndpointStoreService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAmE,MAAM,UAAU,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE;;;;;;;GAOG;AACH,8BAAsB,oBAAoB;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CAC/D;AAED,qBAAa,oBAAqB,SAAQ,oBAAoB;;
|
|
1
|
+
{"version":3,"file":"EndpointStoreService.d.ts","sourceRoot":"","sources":["../../../../src/node/storage/EndpointStoreService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAmE,MAAM,UAAU,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE;;;;;;;GAOG;AACH,8BAAsB,oBAAoB;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CAC/D;AAED,qBAAa,oBAAqB,SAAQ,oBAAoB;;IAY1D,IAAI,YAAY,uCAEf;gBAEW,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,oBAAoB,CAAC,OAAO;IAU3D,CAAC,YAAY,CAAC,SAAS,CAAC;IAsBxB,KAAK;IAkBL,KAAK;IAOX,YAAY,CAAC,QAAQ,EAAE,QAAQ;IAwD/B,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CA0DtD;AAED,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,OAAO;QACpB,OAAO,EAAE,cAAc,CAAC;QACxB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE,OAAO,CAAC;KAClB;CACJ"}
|
|
@@ -37,6 +37,7 @@ class EndpointStoreService {
|
|
|
37
37
|
class EndpointStoreFactory extends EndpointStoreService {
|
|
38
38
|
#storage;
|
|
39
39
|
#allocatedNumbers = /* @__PURE__ */ new Set();
|
|
40
|
+
#preAllocatedNumbers = /* @__PURE__ */ new Set();
|
|
40
41
|
#construction;
|
|
41
42
|
#persistedNextNumber;
|
|
42
43
|
#numbersPersisted;
|
|
@@ -64,7 +65,7 @@ class EndpointStoreFactory extends EndpointStoreService {
|
|
|
64
65
|
this.#root = await (0, import_general.asyncNew)(import_EndpointStore.EndpointStore, this.#storage);
|
|
65
66
|
this.#root.visit(({ number }) => {
|
|
66
67
|
if (number !== void 0) {
|
|
67
|
-
this.#
|
|
68
|
+
this.#preAllocatedNumbers.add(number);
|
|
68
69
|
}
|
|
69
70
|
});
|
|
70
71
|
}
|
|
@@ -107,12 +108,13 @@ class EndpointStoreFactory extends EndpointStoreService {
|
|
|
107
108
|
if (this.#allocatedNumbers.has(knownNumber)) {
|
|
108
109
|
logger.warn(`Stored number ${knownNumber} is already allocated to another endpoint, ignoring`);
|
|
109
110
|
} else {
|
|
111
|
+
this.#preAllocatedNumbers.delete(knownNumber);
|
|
110
112
|
endpoint.number = knownNumber;
|
|
111
113
|
return;
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
const startNumber = this.#nextNumber;
|
|
115
|
-
while (this.#nextNumber < 1 || this.#allocatedNumbers.has(this.#nextNumber)) {
|
|
117
|
+
while (this.#nextNumber < 1 || this.#allocatedNumbers.has(this.#nextNumber) || this.#preAllocatedNumbers.has(this.#nextNumber)) {
|
|
116
118
|
this.#nextNumber = (this.#nextNumber + 1) % 65535;
|
|
117
119
|
if (this.#nextNumber === startNumber) {
|
|
118
120
|
throw new import_general.ImplementationError(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/storage/EndpointStoreService.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,qBAA8F;AAC9F,2BAA8B;AAE9B,6BAAsC;AAXtC;AAAA;AAAA;AAAA;AAAA;AAaA,MAAM,kBAAkB;AAExB,MAAM,SAAS,sBAAO,IAAI,sBAAsB;AAUzC,MAAe,qBAAqB;AAkB3C;AAEO,MAAM,6BAA6B,qBAAqB;AAAA,EAC3D;AAAA,EACA,oBAAoB,oBAAI,IAAY;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,EAAE,SAAS,WAAW,GAAiC;AAC/D,UAAM;AAEN,SAAK,WAAW;AAChB,SAAK,qBAAqB,cAAc;AAExC,SAAK,oBAAgB,6BAAa,IAAI;AACtC,SAAK,cAAc,MAAM;AAAA,EAC7B;AAAA,EAEA,OAAO,4BAAa,SAAS,IAAI;AAE7B,SAAK,cAAe,MAAM,KAAK,SAAS,IAAI,iBAAiB,KAAK,kBAAkB,IAAK;AAEzF,QAAI,CAAC,KAAK,aAAa;AACnB,WAAK,cAAc;AAAA,IACvB,OAAO;AACH,WAAK,uBAAuB,KAAK;AAAA,IACrC;AAGA,SAAK,QAAQ,UAAM,yBAAS,oCAAe,KAAK,QAAQ;AAIxD,SAAK,MAAM,MAAM,CAAC,EAAE,OAAO,MAAM;AAC7B,UAAI,WAAW,QAAW;AACtB,aAAK,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["endpoint"]
|
|
6
6
|
}
|
|
@@ -145,14 +145,14 @@ export declare const Transaction: {
|
|
|
145
145
|
* A read-only transaction you may use without context.
|
|
146
146
|
*/
|
|
147
147
|
ReadOnly: {
|
|
148
|
-
"__#
|
|
149
|
-
"__#
|
|
150
|
-
"__#
|
|
151
|
-
"__#
|
|
152
|
-
"__#
|
|
153
|
-
"__#
|
|
154
|
-
"__#
|
|
155
|
-
"__#
|
|
148
|
+
"__#116859@#participants": Set<Participant>;
|
|
149
|
+
"__#116859@#roles": Map<{}, Participant>;
|
|
150
|
+
"__#116859@#resources": Set<Resource>;
|
|
151
|
+
"__#116859@#status": Status;
|
|
152
|
+
"__#116859@#waitingOn"?: Iterable<Transaction>;
|
|
153
|
+
"__#116859@#via": string;
|
|
154
|
+
"__#116859@#shared"?: import("#general").Observable<[]>;
|
|
155
|
+
"__#116859@#closed"?: import("#general").Observable<[]>;
|
|
156
156
|
close(): void;
|
|
157
157
|
readonly via: string;
|
|
158
158
|
readonly status: Status;
|
|
@@ -171,16 +171,16 @@ export declare const Transaction: {
|
|
|
171
171
|
rollback(): Promise<void> | undefined;
|
|
172
172
|
waitFor(others: Set<Transaction>): Promise<void>;
|
|
173
173
|
toString(): string;
|
|
174
|
-
"__#
|
|
175
|
-
"__#
|
|
176
|
-
"__#
|
|
177
|
-
"__#
|
|
178
|
-
"__#
|
|
179
|
-
"__#
|
|
180
|
-
"__#
|
|
181
|
-
"__#
|
|
182
|
-
"__#
|
|
183
|
-
"__#
|
|
174
|
+
"__#116859@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
|
|
175
|
+
"__#116859@#executePreCommit"(): MaybePromise<void>;
|
|
176
|
+
"__#116859@#executeCommit"(): MaybePromise;
|
|
177
|
+
"__#116859@#executeCommit1"(): MaybePromise;
|
|
178
|
+
"__#116859@#executeCommit2"(): Promise<void> | undefined;
|
|
179
|
+
"__#116859@#executePostCommit"(participants: Participant[]): MaybePromise;
|
|
180
|
+
"__#116859@#executeRollback"(): Promise<void> | undefined;
|
|
181
|
+
"__#116859@#log"(...message: unknown[]): void;
|
|
182
|
+
"__#116859@#locksChanged"(resources: Set<Resource>, how?: string): void;
|
|
183
|
+
"__#116859@#assertAvailable"(): void;
|
|
184
184
|
};
|
|
185
185
|
Status: typeof Status;
|
|
186
186
|
[Symbol.toStringTag]: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EndpointStoreService.d.ts","sourceRoot":"","sources":["../../../../src/node/storage/EndpointStoreService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAmE,MAAM,UAAU,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE;;;;;;;GAOG;AACH,8BAAsB,oBAAoB;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CAC/D;AAED,qBAAa,oBAAqB,SAAQ,oBAAoB;;
|
|
1
|
+
{"version":3,"file":"EndpointStoreService.d.ts","sourceRoot":"","sources":["../../../../src/node/storage/EndpointStoreService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAmE,MAAM,UAAU,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE;;;;;;;GAOG;AACH,8BAAsB,oBAAoB;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAE/C;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CAC/D;AAED,qBAAa,oBAAqB,SAAQ,oBAAoB;;IAY1D,IAAI,YAAY,uCAEf;gBAEW,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,oBAAoB,CAAC,OAAO;IAU3D,CAAC,YAAY,CAAC,SAAS,CAAC;IAsBxB,KAAK;IAkBL,KAAK;IAOX,YAAY,CAAC,QAAQ,EAAE,QAAQ;IAwD/B,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa;CA0DtD;AAED,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,OAAO;QACpB,OAAO,EAAE,cAAc,CAAC;QACxB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE,OAAO,CAAC;KAClB;CACJ"}
|
|
@@ -13,6 +13,7 @@ class EndpointStoreService {
|
|
|
13
13
|
class EndpointStoreFactory extends EndpointStoreService {
|
|
14
14
|
#storage;
|
|
15
15
|
#allocatedNumbers = /* @__PURE__ */ new Set();
|
|
16
|
+
#preAllocatedNumbers = /* @__PURE__ */ new Set();
|
|
16
17
|
#construction;
|
|
17
18
|
#persistedNextNumber;
|
|
18
19
|
#numbersPersisted;
|
|
@@ -40,7 +41,7 @@ class EndpointStoreFactory extends EndpointStoreService {
|
|
|
40
41
|
this.#root = await asyncNew(EndpointStore, this.#storage);
|
|
41
42
|
this.#root.visit(({ number }) => {
|
|
42
43
|
if (number !== void 0) {
|
|
43
|
-
this.#
|
|
44
|
+
this.#preAllocatedNumbers.add(number);
|
|
44
45
|
}
|
|
45
46
|
});
|
|
46
47
|
}
|
|
@@ -83,12 +84,13 @@ class EndpointStoreFactory extends EndpointStoreService {
|
|
|
83
84
|
if (this.#allocatedNumbers.has(knownNumber)) {
|
|
84
85
|
logger.warn(`Stored number ${knownNumber} is already allocated to another endpoint, ignoring`);
|
|
85
86
|
} else {
|
|
87
|
+
this.#preAllocatedNumbers.delete(knownNumber);
|
|
86
88
|
endpoint.number = knownNumber;
|
|
87
89
|
return;
|
|
88
90
|
}
|
|
89
91
|
}
|
|
90
92
|
const startNumber = this.#nextNumber;
|
|
91
|
-
while (this.#nextNumber < 1 || this.#allocatedNumbers.has(this.#nextNumber)) {
|
|
93
|
+
while (this.#nextNumber < 1 || this.#allocatedNumbers.has(this.#nextNumber) || this.#preAllocatedNumbers.has(this.#nextNumber)) {
|
|
92
94
|
this.#nextNumber = (this.#nextNumber + 1) % 65535;
|
|
93
95
|
if (this.#nextNumber === startNumber) {
|
|
94
96
|
throw new ImplementationError(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/storage/EndpointStoreService.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,cAAc,qBAAqB,eAAe,WAAW,QAAQ,gBAAgB;AAC9F,SAAS,qBAAqB;AAE9B,SAAS,6BAA6B;AAEtC,MAAM,kBAAkB;AAExB,MAAM,SAAS,OAAO,IAAI,sBAAsB;AAUzC,MAAe,qBAAqB;AAkB3C;AAEO,MAAM,6BAA6B,qBAAqB;AAAA,EAC3D;AAAA,EACA,oBAAoB,oBAAI,IAAY;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,EAAE,SAAS,WAAW,GAAiC;AAC/D,UAAM;AAEN,SAAK,WAAW;AAChB,SAAK,qBAAqB,cAAc;AAExC,SAAK,gBAAgB,aAAa,IAAI;AACtC,SAAK,cAAc,MAAM;AAAA,EAC7B;AAAA,EAEA,OAAO,aAAa,SAAS,IAAI;AAE7B,SAAK,cAAe,MAAM,KAAK,SAAS,IAAI,iBAAiB,KAAK,kBAAkB,IAAK;AAEzF,QAAI,CAAC,KAAK,aAAa;AACnB,WAAK,cAAc;AAAA,IACvB,OAAO;AACH,WAAK,uBAAuB,KAAK;AAAA,IACrC;AAGA,SAAK,QAAQ,MAAM,SAAS,eAAe,KAAK,QAAQ;AAIxD,SAAK,MAAM,MAAM,CAAC,EAAE,OAAO,MAAM;AAC7B,UAAI,WAAW,QAAW;AACtB,aAAK,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["endpoint"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/node",
|
|
3
|
-
"version": "0.11.5-alpha.0-
|
|
3
|
+
"version": "0.11.5-alpha.0-20241124-c836aa892",
|
|
4
4
|
"description": "API for building Matter nodes",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -43,14 +43,14 @@
|
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@noble/curves": "^1.5.0",
|
|
46
|
-
"@matter/general": "0.11.5-alpha.0-
|
|
47
|
-
"@matter/model": "0.11.5-alpha.0-
|
|
48
|
-
"@matter/types": "0.11.5-alpha.0-
|
|
49
|
-
"@matter/protocol": "0.11.5-alpha.0-
|
|
46
|
+
"@matter/general": "0.11.5-alpha.0-20241124-c836aa892",
|
|
47
|
+
"@matter/model": "0.11.5-alpha.0-20241124-c836aa892",
|
|
48
|
+
"@matter/types": "0.11.5-alpha.0-20241124-c836aa892",
|
|
49
|
+
"@matter/protocol": "0.11.5-alpha.0-20241124-c836aa892"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@matter/tools": "0.11.5-alpha.0-
|
|
53
|
-
"@matter/testing": "0.11.5-alpha.0-
|
|
52
|
+
"@matter/tools": "0.11.5-alpha.0-20241124-c836aa892",
|
|
53
|
+
"@matter/testing": "0.11.5-alpha.0-20241124-c836aa892"
|
|
54
54
|
},
|
|
55
55
|
"files": [
|
|
56
56
|
"dist/**/*",
|
|
@@ -46,6 +46,7 @@ export abstract class EndpointStoreService {
|
|
|
46
46
|
export class EndpointStoreFactory extends EndpointStoreService {
|
|
47
47
|
#storage: StorageContext;
|
|
48
48
|
#allocatedNumbers = new Set<number>();
|
|
49
|
+
#preAllocatedNumbers = new Set<number>();
|
|
49
50
|
#construction: Construction<EndpointStoreFactory>;
|
|
50
51
|
#persistedNextNumber?: number;
|
|
51
52
|
#numbersPersisted?: Promise<void>;
|
|
@@ -85,7 +86,7 @@ export class EndpointStoreFactory extends EndpointStoreService {
|
|
|
85
86
|
// endpoints and #nextNumber is somehow invalid
|
|
86
87
|
this.#root.visit(({ number }) => {
|
|
87
88
|
if (number !== undefined) {
|
|
88
|
-
this.#
|
|
89
|
+
this.#preAllocatedNumbers.add(number);
|
|
89
90
|
}
|
|
90
91
|
});
|
|
91
92
|
}
|
|
@@ -141,6 +142,7 @@ export class EndpointStoreFactory extends EndpointStoreService {
|
|
|
141
142
|
if (this.#allocatedNumbers.has(knownNumber)) {
|
|
142
143
|
logger.warn(`Stored number ${knownNumber} is already allocated to another endpoint, ignoring`);
|
|
143
144
|
} else {
|
|
145
|
+
this.#preAllocatedNumbers.delete(knownNumber);
|
|
144
146
|
endpoint.number = knownNumber;
|
|
145
147
|
return;
|
|
146
148
|
}
|
|
@@ -148,7 +150,11 @@ export class EndpointStoreFactory extends EndpointStoreService {
|
|
|
148
150
|
|
|
149
151
|
const startNumber = this.#nextNumber;
|
|
150
152
|
|
|
151
|
-
while (
|
|
153
|
+
while (
|
|
154
|
+
this.#nextNumber < 1 ||
|
|
155
|
+
this.#allocatedNumbers.has(this.#nextNumber) ||
|
|
156
|
+
this.#preAllocatedNumbers.has(this.#nextNumber)
|
|
157
|
+
) {
|
|
152
158
|
this.#nextNumber = (this.#nextNumber + 1) % 0xffff;
|
|
153
159
|
if (this.#nextNumber === startNumber) {
|
|
154
160
|
throw new ImplementationError(
|