@dxos/echo-db 2.33.9-dev.7d11f506 → 2.33.9-dev.9bbef4e2
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/api/index.d.ts +1 -0
- package/dist/src/api/index.d.ts.map +1 -1
- package/dist/src/api/index.js +1 -0
- package/dist/src/api/index.js.map +1 -1
- package/dist/src/api/result-set.js +4 -4
- package/dist/src/api/result-set.js.map +1 -1
- package/dist/src/api/subscription.d.ts +5 -0
- package/dist/src/api/subscription.d.ts.map +1 -0
- package/dist/src/api/subscription.js +25 -0
- package/dist/src/api/subscription.js.map +1 -0
- package/dist/src/echo-api.test.d.ts +2 -0
- package/dist/src/echo-api.test.d.ts.map +1 -0
- package/dist/src/echo-api.test.js +117 -0
- package/dist/src/echo-api.test.js.map +1 -0
- package/dist/src/echo.d.ts +3 -4
- package/dist/src/echo.d.ts.map +1 -1
- package/dist/src/echo.js +6 -8
- package/dist/src/echo.js.map +1 -1
- package/dist/src/echo.test.js +3 -3
- package/dist/src/echo.test.js.map +1 -1
- package/dist/src/halo/halo-factory.js +8 -8
- package/dist/src/halo/halo-factory.js.map +1 -1
- package/dist/src/halo/halo-party.d.ts +2 -2
- package/dist/src/halo/halo-party.d.ts.map +1 -1
- package/dist/src/halo/halo-party.js +3 -3
- package/dist/src/halo/halo-party.js.map +1 -1
- package/dist/src/halo/halo.js +9 -9
- package/dist/src/halo/halo.js.map +1 -1
- package/dist/src/halo/halo.test.js.map +1 -1
- package/dist/src/halo/identity-manager.d.ts.map +1 -1
- package/dist/src/halo/identity-manager.js +7 -10
- package/dist/src/halo/identity-manager.js.map +1 -1
- package/dist/src/halo/identity.d.ts +1 -1
- package/dist/src/halo/identity.d.ts.map +1 -1
- package/dist/src/halo/identity.js +4 -2
- package/dist/src/halo/identity.js.map +1 -1
- package/dist/src/halo/preferences.d.ts.map +1 -1
- package/dist/src/halo/preferences.js +6 -6
- package/dist/src/halo/preferences.js.map +1 -1
- package/dist/src/invitations/greeting-initiator.js +6 -6
- package/dist/src/invitations/greeting-initiator.js.map +1 -1
- package/dist/src/invitations/greeting-responder.js +5 -5
- package/dist/src/invitations/greeting-responder.js.map +1 -1
- package/dist/src/invitations/halo-recovery-initiator.js +6 -6
- package/dist/src/invitations/halo-recovery-initiator.js.map +1 -1
- package/dist/src/invitations/invitation-descriptor.js +9 -9
- package/dist/src/invitations/invitation-descriptor.js.map +1 -1
- package/dist/src/invitations/invitation-factory.js +3 -3
- package/dist/src/invitations/invitation-factory.js.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.js +7 -7
- package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
- package/dist/src/packlets/database/data-mirror.js +8 -8
- package/dist/src/packlets/database/data-mirror.js.map +1 -1
- package/dist/src/packlets/database/data-service-host.js +3 -3
- package/dist/src/packlets/database/data-service-host.js.map +1 -1
- package/dist/src/packlets/database/data-service-router.js +5 -5
- package/dist/src/packlets/database/data-service-router.js.map +1 -1
- package/dist/src/packlets/database/database-backend.js +3 -3
- package/dist/src/packlets/database/database-backend.js.map +1 -1
- package/dist/src/packlets/database/database.js +2 -2
- package/dist/src/packlets/database/database.js.map +1 -1
- package/dist/src/packlets/database/item-demuxer.js +14 -14
- package/dist/src/packlets/database/item-demuxer.js.map +1 -1
- package/dist/src/packlets/database/item-manager.d.ts.map +1 -1
- package/dist/src/packlets/database/item-manager.js +18 -18
- package/dist/src/packlets/database/item-manager.js.map +1 -1
- package/dist/src/packlets/database/link.js +3 -3
- package/dist/src/packlets/database/link.js.map +1 -1
- package/dist/src/packlets/database/selection/result.js +2 -2
- package/dist/src/packlets/database/selection/result.js.map +1 -1
- package/dist/src/parties/data-party.d.ts.map +1 -1
- package/dist/src/parties/data-party.js +11 -11
- package/dist/src/parties/data-party.js.map +1 -1
- package/dist/src/parties/data-party.test.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts +3 -2
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +4 -4
- package/dist/src/parties/party-factory.js.map +1 -1
- package/dist/src/parties/party-manager.d.ts +3 -3
- package/dist/src/parties/party-manager.d.ts.map +1 -1
- package/dist/src/parties/party-manager.js +6 -11
- package/dist/src/parties/party-manager.js.map +1 -1
- package/dist/src/parties/party-manager.test.js +6 -6
- package/dist/src/parties/party-manager.test.js.map +1 -1
- package/dist/src/parties/party-preferences.d.ts +1 -1
- package/dist/src/parties/party-preferences.d.ts.map +1 -1
- package/dist/src/parties/party-preferences.js +5 -5
- package/dist/src/parties/party-preferences.js.map +1 -1
- package/dist/src/pipeline/feed-muxer.js +3 -3
- package/dist/src/pipeline/feed-muxer.js.map +1 -1
- package/dist/src/pipeline/feed-muxer.test.js +4 -2
- package/dist/src/pipeline/feed-muxer.test.js.map +1 -1
- package/dist/src/pipeline/message-selector.js +2 -2
- package/dist/src/pipeline/message-selector.js.map +1 -1
- package/dist/src/pipeline/metadata-store.d.ts.map +1 -1
- package/dist/src/pipeline/metadata-store.js +35 -32
- package/dist/src/pipeline/metadata-store.js.map +1 -1
- package/dist/src/pipeline/party-feed-provider.js +3 -3
- package/dist/src/pipeline/party-feed-provider.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.d.ts +3 -1
- package/dist/src/pipeline/party-pipeline.d.ts.map +1 -1
- package/dist/src/pipeline/party-pipeline.js +20 -18
- package/dist/src/pipeline/party-pipeline.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.test.js +10 -9
- package/dist/src/pipeline/party-pipeline.test.js.map +1 -1
- package/dist/src/pipeline/party-processor.js +3 -3
- package/dist/src/pipeline/party-processor.js.map +1 -1
- package/dist/src/protocol/authenticator.test.js +53 -12
- package/dist/src/protocol/authenticator.test.js.map +1 -1
- package/dist/src/protocol/identity-credentials.d.ts +0 -1
- package/dist/src/protocol/identity-credentials.d.ts.map +1 -1
- package/dist/src/protocol/identity-credentials.js.map +1 -1
- package/dist/src/protocol/index.d.ts +1 -0
- package/dist/src/protocol/index.d.ts.map +1 -1
- package/dist/src/protocol/index.js +1 -0
- package/dist/src/protocol/index.js.map +1 -1
- package/dist/src/protocol/party-protocol-factory.d.ts +1 -1
- package/dist/src/protocol/party-protocol-factory.d.ts.map +1 -1
- package/dist/src/snapshots/snapshot-store.js +2 -2
- package/dist/src/snapshots/snapshot-store.js.map +1 -1
- package/dist/src/snapshots/snapshot-store.test.js +5 -1
- package/dist/src/snapshots/snapshot-store.test.js.map +1 -1
- package/dist/src/testing/testing-factories.js +2 -2
- package/dist/src/testing/testing-factories.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +21 -17
- package/src/api/index.ts +1 -0
- package/src/api/result-set.ts +1 -1
- package/src/api/subscription.ts +24 -0
- package/src/echo-api.test.ts +162 -0
- package/src/echo.test.ts +3 -3
- package/src/echo.ts +12 -11
- package/src/halo/halo-factory.ts +1 -1
- package/src/halo/halo-party.ts +4 -4
- package/src/halo/halo.test.ts +1 -3
- package/src/halo/halo.ts +1 -1
- package/src/halo/identity-manager.ts +2 -7
- package/src/halo/identity.ts +3 -3
- package/src/halo/preferences.ts +2 -1
- package/src/invitations/greeting-initiator.ts +1 -1
- package/src/invitations/greeting-responder.ts +1 -1
- package/src/invitations/halo-recovery-initiator.ts +1 -1
- package/src/invitations/invitation-descriptor.ts +1 -1
- package/src/invitations/invitation-factory.ts +1 -1
- package/src/invitations/offline-invitation-claimer.ts +1 -1
- package/src/packlets/database/data-mirror.ts +1 -1
- package/src/packlets/database/data-service-host.ts +1 -1
- package/src/packlets/database/data-service-router.ts +1 -1
- package/src/packlets/database/database-backend.ts +1 -1
- package/src/packlets/database/database.ts +1 -1
- package/src/packlets/database/item-demuxer.ts +1 -1
- package/src/packlets/database/item-manager.ts +6 -6
- package/src/packlets/database/link.ts +1 -1
- package/src/packlets/database/selection/result.ts +1 -1
- package/src/parties/data-party.test.ts +3 -1
- package/src/parties/data-party.ts +3 -3
- package/src/parties/party-factory.ts +4 -4
- package/src/parties/party-manager.test.ts +1 -1
- package/src/parties/party-manager.ts +7 -14
- package/src/parties/party-preferences.ts +4 -4
- package/src/pipeline/feed-muxer.test.ts +4 -2
- package/src/pipeline/feed-muxer.ts +1 -1
- package/src/pipeline/message-selector.ts +1 -1
- package/src/pipeline/metadata-store.ts +38 -29
- package/src/pipeline/party-feed-provider.ts +1 -1
- package/src/pipeline/party-pipeline.test.ts +3 -2
- package/src/pipeline/party-pipeline.ts +10 -7
- package/src/pipeline/party-processor.ts +1 -1
- package/src/protocol/authenticator.test.ts +102 -17
- package/src/protocol/identity-credentials.ts +0 -2
- package/src/protocol/index.ts +1 -0
- package/src/protocol/party-protocol-factory.ts +1 -1
- package/src/snapshots/snapshot-store.test.ts +5 -1
- package/src/snapshots/snapshot-store.ts +1 -1
- package/src/testing/testing-factories.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-initiator.js","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"greeting-initiator.js","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.GreetingResponder = exports.GreetingState = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
@@ -66,8 +66,8 @@ class GreetingResponder {
|
|
|
66
66
|
*/
|
|
67
67
|
// TODO(burdon): Rename listenForXXX?
|
|
68
68
|
async invite(secretValidator, secretProvider, onFinish, expiration) {
|
|
69
|
-
(0,
|
|
70
|
-
(0,
|
|
69
|
+
(0, node_assert_1.default)(secretValidator);
|
|
70
|
+
(0, node_assert_1.default)(this._state === GreetingState.LISTENING);
|
|
71
71
|
let timeout;
|
|
72
72
|
const cleanup = async (expired) => {
|
|
73
73
|
if (timeout) {
|
|
@@ -105,7 +105,7 @@ class GreetingResponder {
|
|
|
105
105
|
*/
|
|
106
106
|
async start() {
|
|
107
107
|
log('Starting...');
|
|
108
|
-
(0,
|
|
108
|
+
(0, node_assert_1.default)(this._state === GreetingState.INITIALIZED);
|
|
109
109
|
// As the Greeter, use the topic as our peerId.
|
|
110
110
|
// (For reasons why see detailed comment on greetClient).
|
|
111
111
|
await this._networkManager.joinProtocolSwarm({
|
|
@@ -147,7 +147,7 @@ class GreetingResponder {
|
|
|
147
147
|
* @private
|
|
148
148
|
*/
|
|
149
149
|
async _writeCredentialsToParty(messages) {
|
|
150
|
-
(0,
|
|
150
|
+
(0, node_assert_1.default)(this._state === GreetingState.CONNECTED);
|
|
151
151
|
/* These messages will be self-signed by keys not yet admitted to the Party,, so we cannot check
|
|
152
152
|
* for a trusted key, only that the signatures are valid.
|
|
153
153
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-responder.js","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"greeting-responder.js","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.HaloRecoveryInitiator = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
@@ -41,7 +41,7 @@ class HaloRecoveryInitiator {
|
|
|
41
41
|
* @param {number} timeout Connection timeout (ms).
|
|
42
42
|
*/
|
|
43
43
|
async connect(timeout = DEFAULT_TIMEOUT) {
|
|
44
|
-
(0,
|
|
44
|
+
(0, node_assert_1.default)(this._state === greeting_responder_1.GreetingState.INITIALIZED);
|
|
45
45
|
// This is a temporary connection, there is no need to any special or permanent ID.
|
|
46
46
|
this._peerId = (0, crypto_1.randomBytes)();
|
|
47
47
|
log('Local PeerId:', protocols_1.PublicKey.stringify(this._peerId));
|
|
@@ -67,9 +67,9 @@ class HaloRecoveryInitiator {
|
|
|
67
67
|
* @return {InvitationDescriptor}
|
|
68
68
|
*/
|
|
69
69
|
async claim() {
|
|
70
|
-
(0,
|
|
71
|
-
(0,
|
|
72
|
-
(0,
|
|
70
|
+
(0, node_assert_1.default)(this._state === greeting_responder_1.GreetingState.CONNECTED);
|
|
71
|
+
(0, node_assert_1.default)(this._greeterPlugin);
|
|
72
|
+
(0, node_assert_1.default)(this._peerId);
|
|
73
73
|
// Send to the first peer (any peer will do).
|
|
74
74
|
const peer = this._greeterPlugin.peers[0];
|
|
75
75
|
const responderPeerId = protocols_1.PublicKey.bufferize(peer.getSession().peerId);
|
|
@@ -78,7 +78,7 @@ class HaloRecoveryInitiator {
|
|
|
78
78
|
// We expect to receive a new swarm/rendezvousKey to use for the full Greeting process.
|
|
79
79
|
const claimResponse = await this._greeterPlugin.send(responderPeerId, (0, credentials_1.createGreetingClaimMessage)(signature));
|
|
80
80
|
const { id, rendezvousKey } = claimResponse;
|
|
81
|
-
(0,
|
|
81
|
+
(0, node_assert_1.default)(id && rendezvousKey);
|
|
82
82
|
await this.disconnect();
|
|
83
83
|
this._state = greeting_responder_1.GreetingState.SUCCEEDED;
|
|
84
84
|
return new invitation_descriptor_1.InvitationDescriptor(invitation_descriptor_1.InvitationDescriptorType.INTERACTIVE, Buffer.from(rendezvousKey), Buffer.from(id), this._credentialsSigner.getIdentityKey().publicKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo-recovery-initiator.js","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"halo-recovery-initiator.js","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
32
|
exports.InvitationDescriptor = exports.InvitationDescriptorType = void 0;
|
|
33
|
-
const assert_1 = __importDefault(require("assert"));
|
|
34
33
|
const base_x_1 = __importDefault(require("base-x"));
|
|
35
34
|
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
35
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
36
36
|
const crypto_1 = require("@dxos/crypto");
|
|
37
37
|
const proto = __importStar(require("@dxos/echo-protocol"));
|
|
38
38
|
const protocols_1 = require("@dxos/protocols");
|
|
@@ -60,14 +60,14 @@ class InvitationDescriptor {
|
|
|
60
60
|
this.invitation = invitation;
|
|
61
61
|
this.identityKey = identityKey;
|
|
62
62
|
this.secret = secret;
|
|
63
|
-
(0,
|
|
64
|
-
(0,
|
|
65
|
-
(0,
|
|
63
|
+
(0, node_assert_1.default)(type);
|
|
64
|
+
(0, node_assert_1.default)(swarmKey instanceof Uint8Array);
|
|
65
|
+
(0, node_assert_1.default)(invitation instanceof Uint8Array);
|
|
66
66
|
if (identityKey) {
|
|
67
67
|
protocols_1.PublicKey.assertValidPublicKey(identityKey);
|
|
68
68
|
}
|
|
69
69
|
if (secret) {
|
|
70
|
-
(0,
|
|
70
|
+
(0, node_assert_1.default)(secret instanceof Uint8Array);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
static fromQueryParameters(queryParameters) {
|
|
@@ -79,9 +79,9 @@ class InvitationDescriptor {
|
|
|
79
79
|
return descriptor;
|
|
80
80
|
}
|
|
81
81
|
static fromProto(protoInvitation) {
|
|
82
|
-
(0,
|
|
83
|
-
(0,
|
|
84
|
-
(0,
|
|
82
|
+
(0, node_assert_1.default)(protoInvitation.type, 'Invitation type not provided.');
|
|
83
|
+
(0, node_assert_1.default)(protoInvitation.swarmKey, 'Invitation swarm key not provided.');
|
|
84
|
+
(0, node_assert_1.default)(protoInvitation.invitation, 'Invitation not provided.');
|
|
85
85
|
return new InvitationDescriptor(protoInvitation.type, protoInvitation.swarmKey, Buffer.from(protoInvitation.invitation), protoInvitation.identityKey ? protocols_1.PublicKey.from(protoInvitation.identityKey) : undefined, protoInvitation.secret ? Buffer.from(protoInvitation.secret) : undefined);
|
|
86
86
|
}
|
|
87
87
|
static decode(code) {
|
|
@@ -125,7 +125,7 @@ class InvitationDescriptor {
|
|
|
125
125
|
exports.InvitationDescriptor = InvitationDescriptor;
|
|
126
126
|
const parseInvitationType = (str) => {
|
|
127
127
|
const type = parseInt(str);
|
|
128
|
-
(0,
|
|
128
|
+
(0, node_assert_1.default)(type === 1 || type === 2, 'Invalid invitation type');
|
|
129
129
|
return type;
|
|
130
130
|
};
|
|
131
131
|
const stringifyInvitationType = (type) => type.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-descriptor.js","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"invitation-descriptor.js","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.InvitationFactory = void 0;
|
|
10
|
-
const
|
|
10
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
11
11
|
const credentials_1 = require("@dxos/credentials");
|
|
12
12
|
const common_1 = require("./common");
|
|
13
13
|
const greeting_responder_1 = require("./greeting-responder");
|
|
@@ -28,7 +28,7 @@ class InvitationFactory {
|
|
|
28
28
|
return this._credentialsSigner.getIdentityKey().publicKey.equals(this._partyProcessor.partyKey);
|
|
29
29
|
}
|
|
30
30
|
async createOfflineInvitation(publicKey) {
|
|
31
|
-
(0,
|
|
31
|
+
(0, node_assert_1.default)(!this.isHalo, 'Offline invitations to HALO are not allowed.');
|
|
32
32
|
const invitationMessage = (0, credentials_1.createPartyInvitationMessage)(this._credentialsSigner.signer, this._partyProcessor.partyKey, publicKey, this._credentialsSigner.getIdentityKey(), this._credentialsSigner.getDeviceSigningKeys());
|
|
33
33
|
await this._credentialsWriter.write(invitationMessage);
|
|
34
34
|
return new invitation_descriptor_1.InvitationDescriptor(invitation_descriptor_1.InvitationDescriptorType.OFFLINE, this._partyProcessor.partyKey.asBuffer(), invitationMessage.payload.signed.payload.id);
|
|
@@ -37,7 +37,7 @@ class InvitationFactory {
|
|
|
37
37
|
* Creates an invitation for a remote peer.
|
|
38
38
|
*/
|
|
39
39
|
async createInvitation(authenticationDetails = common_1.defaultInvitationAuthenticator, options = {}) {
|
|
40
|
-
(0,
|
|
40
|
+
(0, node_assert_1.default)(this._networkManager);
|
|
41
41
|
const responder = new greeting_responder_1.GreetingResponder(this._networkManager, this._partyProcessor, this._genesisFeedKey, this._credentialsSigner, this._credentialsWriter);
|
|
42
42
|
const { secretValidator, secretProvider } = authenticationDetails;
|
|
43
43
|
const { onFinish, expiration } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-factory.js","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"invitation-factory.js","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AAEjC,mDAAyF;AAOzF,qCAAsG;AACtG,6DAAyD;AACzD,mEAAyF;AAEzF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,YACmB,eAAmC,EACnC,eAA0B,EAC1B,kBAAqC,EACrC,kBAA2C,EAC3C,eAA+B;QAJ/B,oBAAe,GAAf,eAAe,CAAoB;QACnC,oBAAe,GAAf,eAAe,CAAW;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAmB;QACrC,uBAAkB,GAAlB,kBAAkB,CAAyB;QAC3C,oBAAe,GAAf,eAAe,CAAgB;IAC/C,CAAC;IAEJ,IAAI,MAAM;QACR,gDAAgD;QAChD,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAE,SAAoB;QACjD,IAAA,qBAAM,EAAC,CAAC,IAAI,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAC;QAErE,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAC9B,IAAI,CAAC,eAAe,CAAC,QAAQ,EAC7B,SAAS,EACT,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,EACxC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,CAC/C,CAAC;QAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEvD,OAAO,IAAI,4CAAoB,CAC7B,gDAAwB,CAAC,OAAO,EAChC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,EACxC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAC5C,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CACpB,wBAAiD,uCAA8B,EAAE,UAA6B,EAAE;QAChH,IAAA,qBAAM,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,sCAAiB,CACrC,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,kBAAkB,CACxB,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,qBAAqB,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEzC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEjG,OAAO,IAAI,4CAAoB,CAC7B,gDAAwB,CAAC,WAAW,EACpC,QAAQ,EACR,UAAU,EACV,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACxD,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAE,YAAoB;QACxC,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;CACF;AAjED,8CAiEC"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.OfflineInvitationClaimer = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
@@ -29,7 +29,7 @@ class OfflineInvitationClaimer {
|
|
|
29
29
|
this._networkManager = _networkManager;
|
|
30
30
|
this._invitationDescriptor = _invitationDescriptor;
|
|
31
31
|
this._state = greeting_responder_1.GreetingState.INITIALIZED;
|
|
32
|
-
(0,
|
|
32
|
+
(0, node_assert_1.default)(invitation_descriptor_1.InvitationDescriptorType.OFFLINE === _invitationDescriptor.type);
|
|
33
33
|
}
|
|
34
34
|
get state() {
|
|
35
35
|
return this._state;
|
|
@@ -39,9 +39,9 @@ class OfflineInvitationClaimer {
|
|
|
39
39
|
* @param {number} timeout Connection timeout (ms).
|
|
40
40
|
*/
|
|
41
41
|
async connect(timeout = DEFAULT_TIMEOUT) {
|
|
42
|
-
(0,
|
|
42
|
+
(0, node_assert_1.default)(this._state === greeting_responder_1.GreetingState.INITIALIZED);
|
|
43
43
|
const { swarmKey } = this._invitationDescriptor;
|
|
44
|
-
(0,
|
|
44
|
+
(0, node_assert_1.default)(swarmKey, 'swarmKey is required');
|
|
45
45
|
// This is a temporary connection, there is no need to any special or permanent ID.
|
|
46
46
|
const localPeerId = (0, crypto_1.randomBytes)();
|
|
47
47
|
log('Local PeerId:', protocols_1.PublicKey.stringify(localPeerId));
|
|
@@ -66,15 +66,15 @@ class OfflineInvitationClaimer {
|
|
|
66
66
|
* @return {InvitationDescriptor}
|
|
67
67
|
*/
|
|
68
68
|
async claim() {
|
|
69
|
-
(0,
|
|
70
|
-
(0,
|
|
69
|
+
(0, node_assert_1.default)(this._state === greeting_responder_1.GreetingState.CONNECTED);
|
|
70
|
+
(0, node_assert_1.default)(this._greeterPlugin);
|
|
71
71
|
const { invitation: invitationID } = this._invitationDescriptor;
|
|
72
72
|
// Send to the first peer (any peer will do).
|
|
73
73
|
const responderPeerId = protocols_1.PublicKey.bufferize(this._greeterPlugin.peers[0].getSession().peerId);
|
|
74
74
|
// We expect to receive a new swarm/rendezvousKey to use for the full Greeting process.
|
|
75
75
|
const claimResponse = await this._greeterPlugin.send(responderPeerId, (0, credentials_1.createGreetingClaimMessage)(Buffer.from(invitationID)));
|
|
76
76
|
const { id, rendezvousKey } = claimResponse;
|
|
77
|
-
(0,
|
|
77
|
+
(0, node_assert_1.default)(id && rendezvousKey);
|
|
78
78
|
await this.disconnect();
|
|
79
79
|
this._state = greeting_responder_1.GreetingState.SUCCEEDED;
|
|
80
80
|
return new invitation_descriptor_1.InvitationDescriptor(invitation_descriptor_1.InvitationDescriptorType.INTERACTIVE, Buffer.from(rendezvousKey), Buffer.from(id));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.DataMirror = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const debug_2 = require("@dxos/debug");
|
|
13
13
|
const log = (0, debug_1.default)('dxos:echo-db:data-mirror');
|
|
14
14
|
// TODO(dmaretskyi): Subscription cleanup.
|
|
@@ -31,13 +31,13 @@ class DataMirror {
|
|
|
31
31
|
var _a, _b;
|
|
32
32
|
for (const addedEntity of (_a = diff.added) !== null && _a !== void 0 ? _a : []) {
|
|
33
33
|
log(`Construct: ${JSON.stringify(addedEntity)}`);
|
|
34
|
-
(0,
|
|
35
|
-
(0,
|
|
36
|
-
(0,
|
|
34
|
+
(0, node_assert_1.default)(addedEntity.itemId);
|
|
35
|
+
(0, node_assert_1.default)(addedEntity.genesis);
|
|
36
|
+
(0, node_assert_1.default)(addedEntity.genesis.modelType);
|
|
37
37
|
let entity;
|
|
38
38
|
if (addedEntity.genesis.link) {
|
|
39
|
-
(0,
|
|
40
|
-
(0,
|
|
39
|
+
(0, node_assert_1.default)(addedEntity.genesis.link.source);
|
|
40
|
+
(0, node_assert_1.default)(addedEntity.genesis.link.target);
|
|
41
41
|
entity = await this._itemManager.constructLink({
|
|
42
42
|
itemId: addedEntity.itemId,
|
|
43
43
|
itemType: addedEntity.genesis.itemType,
|
|
@@ -68,12 +68,12 @@ class DataMirror {
|
|
|
68
68
|
var _a, _b, _c, _d, _e, _f;
|
|
69
69
|
log(`Update[${entity.id}]: ${JSON.stringify(update)}`);
|
|
70
70
|
if (update.snapshot) {
|
|
71
|
-
(0,
|
|
71
|
+
(0, node_assert_1.default)(update.snapshot.model);
|
|
72
72
|
entity._stateManager.resetToSnapshot(update.snapshot.model);
|
|
73
73
|
}
|
|
74
74
|
else if (update.mutation) {
|
|
75
75
|
if ((_a = update.mutation.data) === null || _a === void 0 ? void 0 : _a.mutation) {
|
|
76
|
-
(0,
|
|
76
|
+
(0, node_assert_1.default)(update.mutation.meta);
|
|
77
77
|
await entity._stateManager.processMessage({
|
|
78
78
|
feedKey: (_b = update.mutation.meta.feedKey) !== null && _b !== void 0 ? _b : (0, debug_2.failUndefined)(),
|
|
79
79
|
memberKey: (_c = update.mutation.meta.memberKey) !== null && _c !== void 0 ? _c : (0, debug_2.failUndefined)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-mirror.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-mirror.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"data-mirror.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-mirror.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.DataServiceHost = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const codec_protobuf_1 = require("@dxos/codec-protobuf");
|
|
13
13
|
const debug_2 = require("@dxos/debug");
|
|
14
14
|
const protocols_1 = require("@dxos/protocols");
|
|
@@ -83,7 +83,7 @@ class DataServiceHost {
|
|
|
83
83
|
*/
|
|
84
84
|
subscribeEntityStream(request) {
|
|
85
85
|
return new codec_protobuf_1.Stream(({ next }) => {
|
|
86
|
-
(0,
|
|
86
|
+
(0, node_assert_1.default)(request.itemId);
|
|
87
87
|
const entityItem = this._itemManager.items.find(item => item.id === request.itemId);
|
|
88
88
|
let snapshot;
|
|
89
89
|
if (entityItem) {
|
|
@@ -120,7 +120,7 @@ class DataServiceHost {
|
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
122
|
async write(request) {
|
|
123
|
-
(0,
|
|
123
|
+
(0, node_assert_1.default)(this._writeStream, 'Cannot write mutations in readonly mode');
|
|
124
124
|
return this._writeStream.write(request);
|
|
125
125
|
}
|
|
126
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-service-host.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-service-host.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"data-service-host.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-service-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.DataServiceRouter = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const debug_2 = require("@dxos/debug");
|
|
13
13
|
const util_1 = require("@dxos/util");
|
|
14
14
|
const errors_1 = require("../errors");
|
|
@@ -26,20 +26,20 @@ class DataServiceRouter {
|
|
|
26
26
|
}
|
|
27
27
|
subscribeEntitySet(request) {
|
|
28
28
|
var _a;
|
|
29
|
-
(0,
|
|
29
|
+
(0, node_assert_1.default)(request.partyKey);
|
|
30
30
|
const host = (_a = this._trackedParties.get(request.partyKey)) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.PartyNotFoundError(request.partyKey));
|
|
31
31
|
return host.subscribeEntitySet();
|
|
32
32
|
}
|
|
33
33
|
subscribeEntityStream(request) {
|
|
34
34
|
var _a;
|
|
35
|
-
(0,
|
|
35
|
+
(0, node_assert_1.default)(request.partyKey);
|
|
36
36
|
const host = (_a = this._trackedParties.get(request.partyKey)) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.PartyNotFoundError(request.partyKey));
|
|
37
37
|
return host.subscribeEntityStream(request);
|
|
38
38
|
}
|
|
39
39
|
write(request) {
|
|
40
40
|
var _a;
|
|
41
|
-
(0,
|
|
42
|
-
(0,
|
|
41
|
+
(0, node_assert_1.default)(request.partyKey);
|
|
42
|
+
(0, node_assert_1.default)(request.mutation);
|
|
43
43
|
const host = (_a = this._trackedParties.get(request.partyKey)) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.PartyNotFoundError(request.partyKey));
|
|
44
44
|
return host.write(request.mutation);
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-service-router.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-service-router.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"data-service-router.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-service-router.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAC1B,8DAAiC;AAGjC,uCAAoC;AAWpC,qCAAwC;AAExC,sCAA+C;AAG/C,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,kCAAkC,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAa,iBAAiB;IAA9B;QACmB,oBAAe,GAAG,IAAI,iBAAU,CAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAyB9F,CAAC;IAvBC,UAAU,CAAE,GAAa,EAAE,IAAqB;QAC9C,GAAG,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,kBAAkB,CAAE,OAAkC;;QACpD,IAAA,qBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,mCAAI,IAAA,aAAK,EAAC,IAAI,2BAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3G,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACnC,CAAC;IAED,qBAAqB,CAAE,OAAqC;;QAC1D,IAAA,qBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,mCAAI,IAAA,aAAK,EAAC,IAAI,2BAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3G,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAE,OAAqB;;QAC1B,IAAA,qBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,IAAA,qBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,mCAAI,IAAA,aAAK,EAAC,IAAI,2BAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3G,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;CACF;AA1BD,8CA0BC"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.RemoteDatabaseBackend = exports.FeedDatabaseBackend = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const data_mirror_1 = require("./data-mirror");
|
|
13
13
|
const data_service_host_1 = require("./data-service-host");
|
|
14
14
|
const item_demuxer_1 = require("./item-demuxer");
|
|
@@ -79,8 +79,8 @@ class RemoteDatabaseBackend {
|
|
|
79
79
|
write: async (mutation) => {
|
|
80
80
|
log('write', mutation);
|
|
81
81
|
const { feedKey, seq } = await this._service.write({ mutation, partyKey: this._partyKey });
|
|
82
|
-
(0,
|
|
83
|
-
(0,
|
|
82
|
+
(0, node_assert_1.default)(feedKey);
|
|
83
|
+
(0, node_assert_1.default)(seq !== undefined);
|
|
84
84
|
return {
|
|
85
85
|
feedKey,
|
|
86
86
|
seq
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-backend.js","sourceRoot":"","sources":["../../../../src/packlets/database/database-backend.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"database-backend.js","sourceRoot":"","sources":["../../../../src/packlets/database/database-backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.Database = exports.State = void 0;
|
|
16
|
-
const
|
|
16
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
17
17
|
const async_1 = require("@dxos/async");
|
|
18
18
|
const model_factory_1 = require("@dxos/model-factory");
|
|
19
19
|
const object_model_1 = require("@dxos/object-model");
|
|
@@ -120,7 +120,7 @@ class Database {
|
|
|
120
120
|
const result = this.select(filter).exec();
|
|
121
121
|
await result.update.waitForCondition(() => result.entities.length > 0);
|
|
122
122
|
const item = result.expectOne();
|
|
123
|
-
(0,
|
|
123
|
+
(0, node_assert_1.default)(item, 'Possible race condition detected.');
|
|
124
124
|
return item;
|
|
125
125
|
}
|
|
126
126
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/packlets/database/database.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/packlets/database/database.ts"],"names":[],"mappings":"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"}
|