@towns-labs/sdk 2.0.4 → 2.0.6
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/createApp.d.ts.map +1 -1
- package/dist/createApp.js +7 -1
- package/dist/createApp.js.map +1 -1
- package/dist/id.d.ts +1 -0
- package/dist/id.d.ts.map +1 -1
- package/dist/id.js +3 -0
- package/dist/id.js.map +1 -1
- package/dist/sync-agent/dms/models/dm.d.ts +2 -4
- package/dist/sync-agent/dms/models/dm.d.ts.map +1 -1
- package/dist/sync-agent/dms/models/dm.js +2 -30
- package/dist/sync-agent/dms/models/dm.js.map +1 -1
- package/dist/sync-agent/gdms/models/gdm.d.ts +2 -4
- package/dist/sync-agent/gdms/models/gdm.d.ts.map +1 -1
- package/dist/sync-agent/gdms/models/gdm.js +2 -30
- package/dist/sync-agent/gdms/models/gdm.js.map +1 -1
- package/dist/sync-agent/river-connection/riverConnection.d.ts +1 -3
- package/dist/sync-agent/river-connection/riverConnection.d.ts.map +1 -1
- package/dist/sync-agent/river-connection/riverConnection.js +5 -3
- package/dist/sync-agent/river-connection/riverConnection.js.map +1 -1
- package/dist/sync-agent/spaces/models/channel.d.ts +3 -6
- package/dist/sync-agent/spaces/models/channel.d.ts.map +1 -1
- package/dist/sync-agent/spaces/models/channel.js +4 -76
- package/dist/sync-agent/spaces/models/channel.js.map +1 -1
- package/dist/sync-agent/spaces/models/space.d.ts +6 -6
- package/dist/sync-agent/spaces/models/space.d.ts.map +1 -1
- package/dist/sync-agent/spaces/models/space.js +8 -30
- package/dist/sync-agent/spaces/models/space.js.map +1 -1
- package/dist/sync-agent/spaces/spaces.d.ts +3 -4
- package/dist/sync-agent/spaces/spaces.d.ts.map +1 -1
- package/dist/sync-agent/spaces/spaces.js +6 -25
- package/dist/sync-agent/spaces/spaces.js.map +1 -1
- package/dist/sync-agent/syncAgent.d.ts.map +1 -1
- package/dist/sync-agent/syncAgent.js +2 -7
- package/dist/sync-agent/syncAgent.js.map +1 -1
- package/dist/townsEnv.d.ts +6 -1
- package/dist/townsEnv.d.ts.map +1 -1
- package/dist/townsEnv.js +29 -5
- package/dist/townsEnv.js.map +1 -1
- package/package.json +10 -10
- package/dist/createBot.d.ts +0 -159
- package/dist/createBot.d.ts.map +0 -1
- package/dist/createBot.js +0 -206
- package/dist/createBot.js.map +0 -1
- package/dist/makeRiverRpcClient.d.ts +0 -6
- package/dist/makeRiverRpcClient.d.ts.map +0 -1
- package/dist/makeRiverRpcClient.js +0 -9
- package/dist/makeRiverRpcClient.js.map +0 -1
- package/dist/streamStateView_ChannelMetadata.d.ts +0 -22
- package/dist/streamStateView_ChannelMetadata.d.ts.map +0 -1
- package/dist/streamStateView_ChannelMetadata.js +0 -77
- package/dist/streamStateView_ChannelMetadata.js.map +0 -1
- package/dist/sync-agent/entitlements/entitlements.d.ts +0 -10
- package/dist/sync-agent/entitlements/entitlements.d.ts.map +0 -1
- package/dist/sync-agent/entitlements/entitlements.js +0 -20
- package/dist/sync-agent/entitlements/entitlements.js.map +0 -1
- package/dist/sync-agent/river-connection/models/riverChain.d.ts +0 -24
- package/dist/sync-agent/river-connection/models/riverChain.d.ts.map +0 -1
- package/dist/sync-agent/river-connection/models/riverChain.js +0 -66
- package/dist/sync-agent/river-connection/models/riverChain.js.map +0 -1
- package/dist/tests/multi/appRegistryService.test.d.ts +0 -2
- package/dist/tests/multi/appRegistryService.test.d.ts.map +0 -1
- package/dist/tests/multi/appRegistryService.test.js +0 -41
- package/dist/tests/multi/appRegistryService.test.js.map +0 -1
- package/dist/tests/multi/botEntitlements.test.d.ts +0 -5
- package/dist/tests/multi/botEntitlements.test.d.ts.map +0 -1
- package/dist/tests/multi/botEntitlements.test.js +0 -178
- package/dist/tests/multi/botEntitlements.test.js.map +0 -1
- package/dist/tests/multi/botMembership.test.d.ts +0 -5
- package/dist/tests/multi/botMembership.test.d.ts.map +0 -1
- package/dist/tests/multi/botMembership.test.js +0 -295
- package/dist/tests/multi/botMembership.test.js.map +0 -1
- package/dist/tests/multi/botStreamCreation.test.d.ts +0 -5
- package/dist/tests/multi/botStreamCreation.test.d.ts.map +0 -1
- package/dist/tests/multi/botStreamCreation.test.js +0 -60
- package/dist/tests/multi/botStreamCreation.test.js.map +0 -1
- package/dist/tests/multi/channelScrubbing.test.d.ts +0 -5
- package/dist/tests/multi/channelScrubbing.test.d.ts.map +0 -1
- package/dist/tests/multi/channelScrubbing.test.js +0 -102
- package/dist/tests/multi/channelScrubbing.test.js.map +0 -1
- package/dist/tests/multi_ne/nodeSelection.test.d.ts +0 -5
- package/dist/tests/multi_ne/nodeSelection.test.d.ts.map +0 -1
- package/dist/tests/multi_ne/nodeSelection.test.js +0 -41
- package/dist/tests/multi_ne/nodeSelection.test.js.map +0 -1
- package/dist/tests/multi_ne/trading.solana.test.d.ts +0 -2
- package/dist/tests/multi_ne/trading.solana.test.d.ts.map +0 -1
- package/dist/tests/multi_ne/trading.solana.test.js +0 -229
- package/dist/tests/multi_ne/trading.solana.test.js.map +0 -1
- package/dist/tests/multi_ne/trading.test.d.ts +0 -2
- package/dist/tests/multi_ne/trading.test.d.ts.map +0 -1
- package/dist/tests/multi_ne/trading.test.js +0 -243
- package/dist/tests/multi_ne/trading.test.js.map +0 -1
|
@@ -7,20 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
|
|
8
8
|
import { LoadPriority } from '../../../store/store';
|
|
9
9
|
import { MessageTimeline } from '../../timeline/timeline';
|
|
10
|
-
import { check
|
|
10
|
+
import { check } from '@towns-labs/utils';
|
|
11
11
|
import { isDefined } from '../../../check';
|
|
12
|
-
import { checkNever } from '@towns-labs/web3';
|
|
13
12
|
import { Members } from '../../members/members';
|
|
14
|
-
const logger = dlogger('csb:channel');
|
|
15
13
|
let Channel = class Channel extends PersistedObservable {
|
|
16
14
|
riverConnection;
|
|
17
|
-
spaceDapp;
|
|
18
15
|
timeline;
|
|
19
16
|
members;
|
|
20
|
-
constructor(id, spaceId, riverConnection,
|
|
17
|
+
constructor(id, spaceId, riverConnection, store) {
|
|
21
18
|
super({ id, spaceId, isJoined: false }, store, LoadPriority.high);
|
|
22
19
|
this.riverConnection = riverConnection;
|
|
23
|
-
this.spaceDapp = spaceDapp;
|
|
24
20
|
this.timeline = new MessageTimeline(id, riverConnection.userId, riverConnection);
|
|
25
21
|
this.members = new Members(id, riverConnection, store);
|
|
26
22
|
}
|
|
@@ -39,19 +35,6 @@ let Channel = class Channel extends PersistedObservable {
|
|
|
39
35
|
client.off('streamUserLeft', this.onStreamUserLeft);
|
|
40
36
|
};
|
|
41
37
|
});
|
|
42
|
-
if (!this.data.metadata) {
|
|
43
|
-
// todo aellis this needs batching and retries, and should be updated on spaceChannelUpdated events
|
|
44
|
-
this.spaceDapp
|
|
45
|
-
.getChannelDetails(this.data.spaceId, this.data.id)
|
|
46
|
-
.then((metadata) => {
|
|
47
|
-
if (metadata) {
|
|
48
|
-
this.setData({ metadata });
|
|
49
|
-
}
|
|
50
|
-
})
|
|
51
|
-
.catch((error) => {
|
|
52
|
-
logger.error('failed to get channel details', { id: this.data.id, error });
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
38
|
}
|
|
56
39
|
/** Joins the channel. */
|
|
57
40
|
async join() {
|
|
@@ -169,63 +152,8 @@ let Channel = class Channel extends PersistedObservable {
|
|
|
169
152
|
.call((client) => client.redactMessage(channelId, eventId));
|
|
170
153
|
return result;
|
|
171
154
|
}
|
|
172
|
-
async sendTip(
|
|
173
|
-
|
|
174
|
-
let toUserId;
|
|
175
|
-
switch (tip.type) {
|
|
176
|
-
case 'member': {
|
|
177
|
-
const membershipTokenId = await this.spaceDapp.getTokenIdOfOwner(this.data.spaceId, tip.receiver);
|
|
178
|
-
if (!membershipTokenId) {
|
|
179
|
-
throw new Error('tokenId not found');
|
|
180
|
-
}
|
|
181
|
-
toUserId = tip.receiver;
|
|
182
|
-
tx = await this.spaceDapp.sendTip({
|
|
183
|
-
tipParams: {
|
|
184
|
-
spaceId: this.data.spaceId,
|
|
185
|
-
type: 'member',
|
|
186
|
-
tokenId: membershipTokenId,
|
|
187
|
-
currency: tip.currency,
|
|
188
|
-
amount: tip.amount,
|
|
189
|
-
messageId,
|
|
190
|
-
channelId: this.data.id,
|
|
191
|
-
receiver: tip.receiver,
|
|
192
|
-
},
|
|
193
|
-
signer,
|
|
194
|
-
});
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
case 'bot': {
|
|
198
|
-
toUserId = tip.botId;
|
|
199
|
-
tx = await this.spaceDapp.sendTip({
|
|
200
|
-
tipParams: {
|
|
201
|
-
spaceId: this.data.spaceId,
|
|
202
|
-
type: 'bot',
|
|
203
|
-
receiver: tip.appAddress,
|
|
204
|
-
appId: tip.appId,
|
|
205
|
-
currency: tip.currency,
|
|
206
|
-
amount: tip.amount,
|
|
207
|
-
messageId,
|
|
208
|
-
channelId: this.data.id,
|
|
209
|
-
},
|
|
210
|
-
signer,
|
|
211
|
-
});
|
|
212
|
-
break;
|
|
213
|
-
}
|
|
214
|
-
default: {
|
|
215
|
-
checkNever(tip);
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
const receipt = await tx.wait(3);
|
|
219
|
-
const senderAddress = await signer.getAddress();
|
|
220
|
-
const tipEvent = this.spaceDapp.getTipEvent(this.data.spaceId, receipt, senderAddress);
|
|
221
|
-
if (!tipEvent) {
|
|
222
|
-
throw new Error('tipEvent not found');
|
|
223
|
-
}
|
|
224
|
-
const channelId = this.data.id;
|
|
225
|
-
const result = await this.riverConnection
|
|
226
|
-
.withStream(channelId)
|
|
227
|
-
.call((client) => client.addTransaction_Tip(tip.chainId, receipt, tipEvent, toUserId));
|
|
228
|
-
return result;
|
|
155
|
+
async sendTip(_messageId, _tip, _signer) {
|
|
156
|
+
throw new Error('not implemented');
|
|
229
157
|
}
|
|
230
158
|
onStreamInitialized = (streamId) => {
|
|
231
159
|
if (streamId === this.data.id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/channel.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAgB,YAAY,EAAS,MAAM,sBAAsB,CAAA;AAOxE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { Identifiable, Store } from '../../../store/store';
|
|
|
3
3
|
import { RiverConnection } from '../../river-connection/riverConnection';
|
|
4
4
|
import { Channel } from './channel';
|
|
5
5
|
import { ethers } from 'ethers';
|
|
6
|
-
import { SpaceDapp, SpaceInfo } from '@towns-labs/web3';
|
|
7
6
|
import { Members } from '../../members/members';
|
|
8
7
|
export interface SpaceModel extends Identifiable {
|
|
9
8
|
/** The River `spaceId` of the space. */
|
|
@@ -13,20 +12,21 @@ export interface SpaceModel extends Identifiable {
|
|
|
13
12
|
/** The ids of the channels in the space. */
|
|
14
13
|
channelIds: string[];
|
|
15
14
|
/** The space metadata {@link SpaceInfo}. */
|
|
16
|
-
metadata?:
|
|
15
|
+
metadata?: {
|
|
16
|
+
name: string;
|
|
17
|
+
};
|
|
17
18
|
}
|
|
18
19
|
export declare class Space extends PersistedObservable<SpaceModel> {
|
|
19
20
|
private riverConnection;
|
|
20
|
-
private spaceDapp;
|
|
21
21
|
private channels;
|
|
22
22
|
members: Members;
|
|
23
|
-
constructor(id: string, riverConnection: RiverConnection, store: Store
|
|
23
|
+
constructor(id: string, riverConnection: RiverConnection, store: Store);
|
|
24
24
|
protected onLoaded(): void;
|
|
25
25
|
/** Joins the space.
|
|
26
26
|
* @param signer - The signer to use to join the space.
|
|
27
27
|
* @param opts - Additional options for the join.
|
|
28
28
|
*/
|
|
29
|
-
join(
|
|
29
|
+
join(_signer: ethers.Signer, _opts?: {
|
|
30
30
|
skipMintMembership?: boolean;
|
|
31
31
|
}): Promise<void>;
|
|
32
32
|
/** Creates a channel in the space.
|
|
@@ -35,7 +35,7 @@ export declare class Space extends PersistedObservable<SpaceModel> {
|
|
|
35
35
|
* @param opts - Additional options for the channel creation.
|
|
36
36
|
* @returns The `channelId` of the created channel.
|
|
37
37
|
*/
|
|
38
|
-
createChannel(channelName: string,
|
|
38
|
+
createChannel(channelName: string, _signer: ethers.Signer, opts?: {
|
|
39
39
|
/** The topic of the channel. */
|
|
40
40
|
topic?: string;
|
|
41
41
|
}): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/space.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/space.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC5C,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,wDAAwD;IACxD,WAAW,EAAE,OAAO,CAAA;IACpB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,4CAA4C;IAC5C,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAC9B;AAED,qBACa,KAAM,SAAQ,mBAAmB,CAAC,UAAU,CAAC;IAKlD,OAAO,CAAC,eAAe;IAJ3B,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,EAAE,OAAO,CAAA;gBAEZ,EAAE,EAAE,MAAM,EACF,eAAe,EAAE,eAAe,EACxC,KAAK,EAAE,KAAK;cAcG,QAAQ;IAqB3B;;;OAGG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE;IAS3E;;;;;OAKG;IACG,aAAa,CACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EACtB,IAAI,CAAC,EAAE;QACH,gCAAgC;QAChC,KAAK,CAAC,EAAE,MAAM,CAAA;KACjB;IAUL;;;OAGG;IACH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAatC;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAI5B,OAAO,CAAC,mBAAmB,CAiB1B;IAED,OAAO,CAAC,qBAAqB,CAc5B;IAED,OAAO,CAAC,qBAAqB,CAK5B;IAED,OAAO,CAAC,qBAAqB,CAQ5B;CACJ"}
|
|
@@ -4,25 +4,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
import { check
|
|
7
|
+
import { check } from '@towns-labs/utils';
|
|
8
8
|
import { isDefined } from '../../../check';
|
|
9
9
|
import { isChannelStreamId, makeDefaultChannelStreamId, makeUniqueChannelStreamId, } from '../../../id';
|
|
10
10
|
import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
|
|
11
11
|
import { LoadPriority } from '../../../store/store';
|
|
12
12
|
import { Channel } from './channel';
|
|
13
13
|
import { Members } from '../../members/members';
|
|
14
|
-
const logger = dlogger('csb:space');
|
|
15
14
|
let Space = class Space extends PersistedObservable {
|
|
16
15
|
riverConnection;
|
|
17
|
-
spaceDapp;
|
|
18
16
|
channels;
|
|
19
17
|
members;
|
|
20
|
-
constructor(id, riverConnection, store
|
|
18
|
+
constructor(id, riverConnection, store) {
|
|
21
19
|
super({ id, channelIds: [], initialized: false }, store, LoadPriority.high);
|
|
22
20
|
this.riverConnection = riverConnection;
|
|
23
|
-
this.spaceDapp = spaceDapp;
|
|
24
21
|
this.channels = {
|
|
25
|
-
[makeDefaultChannelStreamId(id)]: new Channel(makeDefaultChannelStreamId(id), id, riverConnection,
|
|
22
|
+
[makeDefaultChannelStreamId(id)]: new Channel(makeDefaultChannelStreamId(id), id, riverConnection, store),
|
|
26
23
|
};
|
|
27
24
|
this.members = new Members(id, riverConnection, store);
|
|
28
25
|
}
|
|
@@ -43,28 +40,13 @@ let Space = class Space extends PersistedObservable {
|
|
|
43
40
|
client.off('spaceChannelUpdated', this.onSpaceChannelUpdated);
|
|
44
41
|
};
|
|
45
42
|
});
|
|
46
|
-
if (!this.data.metadata) {
|
|
47
|
-
// todo aellis this needs retries and batching
|
|
48
|
-
this.spaceDapp
|
|
49
|
-
.getSpaceInfo(this.data.id)
|
|
50
|
-
.then((spaceInfo) => {
|
|
51
|
-
this.setData({ metadata: spaceInfo });
|
|
52
|
-
})
|
|
53
|
-
.catch((error) => {
|
|
54
|
-
logger.error('getSpaceInfo error', error);
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
43
|
}
|
|
58
44
|
/** Joins the space.
|
|
59
45
|
* @param signer - The signer to use to join the space.
|
|
60
46
|
* @param opts - Additional options for the join.
|
|
61
47
|
*/
|
|
62
|
-
async join(
|
|
48
|
+
async join(_signer, _opts) {
|
|
63
49
|
const spaceId = this.data.id;
|
|
64
|
-
if (opts?.skipMintMembership !== true) {
|
|
65
|
-
const { issued } = await this.spaceDapp.joinSpace(spaceId, this.riverConnection.userId, signer);
|
|
66
|
-
logger.log('joinSpace transaction', issued);
|
|
67
|
-
}
|
|
68
50
|
await this.riverConnection.login({ spaceId });
|
|
69
51
|
await this.riverConnection.call(async (client) => {
|
|
70
52
|
await client.joinStream(spaceId);
|
|
@@ -77,13 +59,9 @@ let Space = class Space extends PersistedObservable {
|
|
|
77
59
|
* @param opts - Additional options for the channel creation.
|
|
78
60
|
* @returns The `channelId` of the created channel.
|
|
79
61
|
*/
|
|
80
|
-
async createChannel(channelName,
|
|
62
|
+
async createChannel(channelName, _signer, opts) {
|
|
81
63
|
const spaceId = this.data.id;
|
|
82
64
|
const channelId = makeUniqueChannelStreamId(spaceId);
|
|
83
|
-
const roles = await this.spaceDapp.getRoles(spaceId);
|
|
84
|
-
const tx = await this.spaceDapp.createChannel(spaceId, channelName, '', channelId, roles.filter((role) => role.name !== 'Owner').map((role) => role.roleId), signer);
|
|
85
|
-
const receipt = await tx.wait();
|
|
86
|
-
logger.log('createChannel receipt', receipt);
|
|
87
65
|
await this.riverConnection.call((client) => client.createChannel(spaceId, channelName, opts?.topic ?? '', channelId));
|
|
88
66
|
return channelId;
|
|
89
67
|
}
|
|
@@ -94,7 +72,7 @@ let Space = class Space extends PersistedObservable {
|
|
|
94
72
|
getChannel(channelId) {
|
|
95
73
|
check(isChannelStreamId(channelId), 'channelId is not a channel stream id');
|
|
96
74
|
if (!this.channels[channelId]) {
|
|
97
|
-
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.
|
|
75
|
+
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.store);
|
|
98
76
|
}
|
|
99
77
|
return this.channels[channelId];
|
|
100
78
|
}
|
|
@@ -112,7 +90,7 @@ let Space = class Space extends PersistedObservable {
|
|
|
112
90
|
const channelIds = Object.keys(stream.view.spaceContent.spaceChannelsMetadata ?? {});
|
|
113
91
|
for (const channelId of channelIds) {
|
|
114
92
|
if (!this.channels[channelId]) {
|
|
115
|
-
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.
|
|
93
|
+
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.store);
|
|
116
94
|
}
|
|
117
95
|
}
|
|
118
96
|
this.setData({ initialized: true, channelIds: channelIds });
|
|
@@ -121,7 +99,7 @@ let Space = class Space extends PersistedObservable {
|
|
|
121
99
|
onSpaceChannelCreated = (streamId, channelId) => {
|
|
122
100
|
if (streamId === this.data.id) {
|
|
123
101
|
if (!this.channels[channelId]) {
|
|
124
|
-
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.
|
|
102
|
+
this.channels[channelId] = new Channel(channelId, this.data.id, this.riverConnection, this.store);
|
|
125
103
|
}
|
|
126
104
|
if (!this.data.channelIds.includes(channelId)) {
|
|
127
105
|
this.setData({ channelIds: [...this.data.channelIds, channelId] });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space.js","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/space.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"space.js","sourceRoot":"","sources":["../../../../src/sync-agent/spaces/models/space.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EACH,iBAAiB,EACjB,0BAA0B,EAC1B,yBAAyB,GAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAgB,YAAY,EAAS,MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAcxC,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,mBAA+B;IAK1C;IAJJ,QAAQ,CAAyB;IACzC,OAAO,CAAS;IAChB,YACI,EAAU,EACF,eAAgC,EACxC,KAAY;QAEZ,KAAK,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;QAHnE,oBAAe,GAAf,eAAe,CAAiB;QAIxC,IAAI,CAAC,QAAQ,GAAG;YACZ,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,OAAO,CACzC,0BAA0B,CAAC,EAAE,CAAC,EAC9B,EAAE,EACF,eAAe,EACf,KAAK,CACR;SACJ,CAAA;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAC1D,CAAC;IAEkB,QAAQ;QACvB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,IACI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,aAAa,EACtD,CAAC;gBACC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC1C,CAAC;YACD,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;YACxD,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;YAC5D,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;YAC5D,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;YAC5D,OAAO,GAAG,EAAE;gBACR,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;gBACzD,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;gBAC7D,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;gBAC7D,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;YACjE,CAAC,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI,CAAC,OAAsB,EAAE,KAAwC;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC7C,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAChC,MAAM,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CACf,WAAmB,EACnB,OAAsB,EACtB,IAGC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QAC5B,MAAM,SAAS,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAA;QACpD,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACvC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,EAAE,SAAS,CAAC,CAC3E,CAAA;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,SAAiB;QACxB,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,sCAAsC,CAAC,CAAA;QAC3E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,OAAO,CAClC,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,EAAE,EACZ,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,KAAK,CACb,CAAA;QACL,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACnC,CAAC;IAED;;;OAGG;IACH,iBAAiB;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAClE,CAAC;IAEO,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC5D,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAA;YACjD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAA;YACpF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,OAAO,CAClC,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,EAAE,EACZ,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,KAAK,CACb,CAAA;gBACL,CAAC;YACL,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;QAC/D,CAAC;IACL,CAAC,CAAA;IAEO,qBAAqB,GAAG,CAAC,QAAgB,EAAE,SAAiB,EAAE,EAAE;QACpE,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,OAAO,CAClC,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,EAAE,EACZ,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,KAAK,CACb,CAAA;YACL,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,CAAA;YACtE,CAAC;QACL,CAAC;IACL,CAAC,CAAA;IAEO,qBAAqB,GAAG,CAAC,QAAgB,EAAE,SAAiB,EAAE,EAAE;QACpE,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC,CAAA;QACvF,CAAC;IACL,CAAC,CAAA;IAEO,qBAAqB,GAAG,CAC5B,QAAgB,EAChB,UAAkB,EAClB,kBAA0B,EAC5B,EAAE;QACA,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5B,yCAAyC;QAC7C,CAAC;IACL,CAAC,CAAA;CACJ,CAAA;AAxJY,KAAK;IADjB,mBAAmB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;GAC/B,KAAK,CAwJjB"}
|
|
@@ -3,7 +3,7 @@ import { PersistedObservable } from '../../observable/persistedObservable';
|
|
|
3
3
|
import { Space } from './models/space';
|
|
4
4
|
import { UserMemberships } from '../user/models/userMemberships';
|
|
5
5
|
import { RiverConnection } from '../river-connection/riverConnection';
|
|
6
|
-
import { CreateSpaceParams
|
|
6
|
+
import { CreateSpaceParams } from '@towns-labs/web3';
|
|
7
7
|
import { ethers } from 'ethers';
|
|
8
8
|
export interface SpacesModel extends Identifiable {
|
|
9
9
|
id: '0';
|
|
@@ -12,15 +12,14 @@ export interface SpacesModel extends Identifiable {
|
|
|
12
12
|
export declare class Spaces extends PersistedObservable<SpacesModel> {
|
|
13
13
|
private riverConnection;
|
|
14
14
|
private userMemberships;
|
|
15
|
-
private spaceDapp;
|
|
16
15
|
private spaces;
|
|
17
|
-
constructor(store: Store, riverConnection: RiverConnection, userMemberships: UserMemberships
|
|
16
|
+
constructor(store: Store, riverConnection: RiverConnection, userMemberships: UserMemberships);
|
|
18
17
|
protected onLoaded(): void;
|
|
19
18
|
getSpace(spaceId: string): Space;
|
|
20
19
|
private onUserMembershipsChanged;
|
|
21
20
|
createSpace(params: Partial<Omit<CreateSpaceParams, 'spaceName'>> & {
|
|
22
21
|
spaceName: string;
|
|
23
|
-
},
|
|
22
|
+
}, _signer: ethers.Signer): Promise<{
|
|
24
23
|
spaceId: string;
|
|
25
24
|
defaultChannelId: string;
|
|
26
25
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaces.d.ts","sourceRoot":"","sources":["../../../src/sync-agent/spaces/spaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAEH,mBAAmB,EAEtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,eAAe,EAAwB,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"spaces.d.ts","sourceRoot":"","sources":["../../../src/sync-agent/spaces/spaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAEH,mBAAmB,EAEtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,eAAe,EAAwB,MAAM,gCAAgC,CAAA;AAQtF,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAK/B,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC7C,EAAE,EAAE,GAAG,CAAA;IACP,QAAQ,EAAE,MAAM,EAAE,CAAA;CACrB;AAED,qBACa,MAAO,SAAQ,mBAAmB,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,eAAe;IAL3B,OAAO,CAAC,MAAM,CAA4B;gBAGtC,KAAK,EAAE,KAAK,EACJ,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe;cAKzB,QAAQ;IAS3B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;IAQhC,OAAO,CAAC,wBAAwB;IAkB1B,WAAW,CACb,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,EAC7E,OAAO,EAAE,MAAM,CAAC,MAAM;;;;IAepB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAItE"}
|
|
@@ -8,20 +8,17 @@ import { LoadPriority } from '../../store/store';
|
|
|
8
8
|
import { PersistedObservable, persistedObservable, } from '../../observable/persistedObservable';
|
|
9
9
|
import { Space } from './models/space';
|
|
10
10
|
import { MembershipOp } from '@towns-labs/proto';
|
|
11
|
-
import { isSpaceStreamId, makeDefaultChannelStreamId, makeSpaceStreamId } from '../../id';
|
|
12
|
-
import { makeDefaultMembershipInfo } from '../utils/spaceUtils';
|
|
11
|
+
import { isSpaceStreamId, makeDefaultChannelStreamId, makeSpaceStreamId, makeUniqueSpaceAddress, } from '../../id';
|
|
13
12
|
import { check, dlogger } from '@towns-labs/utils';
|
|
14
13
|
const logger = dlogger('csb:spaces');
|
|
15
14
|
let Spaces = class Spaces extends PersistedObservable {
|
|
16
15
|
riverConnection;
|
|
17
16
|
userMemberships;
|
|
18
|
-
spaceDapp;
|
|
19
17
|
spaces = {};
|
|
20
|
-
constructor(store, riverConnection, userMemberships
|
|
18
|
+
constructor(store, riverConnection, userMemberships) {
|
|
21
19
|
super({ id: '0', spaceIds: [] }, store, LoadPriority.high);
|
|
22
20
|
this.riverConnection = riverConnection;
|
|
23
21
|
this.userMemberships = userMemberships;
|
|
24
|
-
this.spaceDapp = spaceDapp;
|
|
25
22
|
}
|
|
26
23
|
onLoaded() {
|
|
27
24
|
this.userMemberships.subscribe((value) => {
|
|
@@ -31,7 +28,7 @@ let Spaces = class Spaces extends PersistedObservable {
|
|
|
31
28
|
getSpace(spaceId) {
|
|
32
29
|
check(isSpaceStreamId(spaceId), 'Invalid spaceId');
|
|
33
30
|
if (!this.spaces[spaceId]) {
|
|
34
|
-
this.spaces[spaceId] = new Space(spaceId, this.riverConnection, this.store
|
|
31
|
+
this.spaces[spaceId] = new Space(spaceId, this.riverConnection, this.store);
|
|
35
32
|
}
|
|
36
33
|
return this.spaces[spaceId];
|
|
37
34
|
}
|
|
@@ -45,29 +42,13 @@ let Spaces = class Spaces extends PersistedObservable {
|
|
|
45
42
|
this.setData({ spaceIds });
|
|
46
43
|
for (const spaceId of spaceIds) {
|
|
47
44
|
if (!this.spaces[spaceId]) {
|
|
48
|
-
this.spaces[spaceId] = new Space(spaceId, this.riverConnection, this.store
|
|
45
|
+
this.spaces[spaceId] = new Space(spaceId, this.riverConnection, this.store);
|
|
49
46
|
}
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
|
-
async createSpace(params,
|
|
53
|
-
const membershipInfo = params.membership ??
|
|
54
|
-
(await makeDefaultMembershipInfo(this.spaceDapp, this.riverConnection.userId));
|
|
49
|
+
async createSpace(params, _signer) {
|
|
55
50
|
const channelName = params.channelName ?? 'general';
|
|
56
|
-
const
|
|
57
|
-
spaceName: params.spaceName,
|
|
58
|
-
uri: params.uri ?? '',
|
|
59
|
-
channelName: channelName,
|
|
60
|
-
membership: membershipInfo,
|
|
61
|
-
shortDescription: params.shortDescription,
|
|
62
|
-
longDescription: params.longDescription,
|
|
63
|
-
}, signer);
|
|
64
|
-
const receipt = await transaction.wait();
|
|
65
|
-
logger.log('transaction receipt', receipt);
|
|
66
|
-
const spaceAddress = this.spaceDapp.getSpaceAddress(receipt, await signer.getAddress());
|
|
67
|
-
if (!spaceAddress) {
|
|
68
|
-
throw new Error('Space address not found');
|
|
69
|
-
}
|
|
70
|
-
logger.log('spaceAddress', spaceAddress);
|
|
51
|
+
const spaceAddress = makeUniqueSpaceAddress();
|
|
71
52
|
const spaceId = makeSpaceStreamId(spaceAddress);
|
|
72
53
|
const defaultChannelId = makeDefaultChannelStreamId(spaceAddress);
|
|
73
54
|
logger.log('spaceId, defaultChannelId', { spaceId, defaultChannelId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaces.js","sourceRoot":"","sources":["../../../src/sync-agent/spaces/spaces.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAgB,YAAY,EAAS,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAEH,mBAAmB,EACnB,mBAAmB,GACtB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"spaces.js","sourceRoot":"","sources":["../../../src/sync-agent/spaces/spaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAgent.d.ts","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"syncAgent.d.ts","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { RiverConnection } from './river-connection/riverConnection';
|
|
2
|
-
import { SpaceDapp } from '@towns-labs/web3';
|
|
3
2
|
import { Store } from '../store/store';
|
|
4
3
|
import { userIdFromAddress } from '../id';
|
|
5
4
|
import { User } from './user/user';
|
|
6
|
-
import { makeBaseProvider } from './utils/providers';
|
|
7
5
|
import { RiverDbManager } from '../riverDbManager';
|
|
8
6
|
import { DB_MODELS, DB_VERSION } from './db';
|
|
9
7
|
import { Spaces } from './spaces/spaces';
|
|
@@ -28,12 +26,9 @@ export class SyncAgent {
|
|
|
28
26
|
const logId = config.logId ?? shortenHexString(this.userId);
|
|
29
27
|
this.log = dlog('csb:syncAgent', { defaultEnabled: true }).extend(logId);
|
|
30
28
|
this.config = config;
|
|
31
|
-
const base = config.townsConfig.base;
|
|
32
|
-
const baseProvider = config.baseProvider ?? makeBaseProvider(config.townsConfig);
|
|
33
29
|
this.store = new Store(this.syncAgentDbName(), DB_VERSION, DB_MODELS);
|
|
34
30
|
this.store.newTransactionGroup('SyncAgent::initialization');
|
|
35
|
-
|
|
36
|
-
this.riverConnection = new RiverConnection(this.store, spaceDapp, config.townsConfig, {
|
|
31
|
+
this.riverConnection = new RiverConnection(this.store, config.townsConfig, {
|
|
37
32
|
signerContext: config.context,
|
|
38
33
|
cryptoStore: RiverDbManager.getCryptoDb(this.userId, this.cryptoDbName()),
|
|
39
34
|
opts: {
|
|
@@ -48,7 +43,7 @@ export class SyncAgent {
|
|
|
48
43
|
onTokenExpired: config.onTokenExpired,
|
|
49
44
|
});
|
|
50
45
|
this.user = new User(this.userId, this.store, this.riverConnection);
|
|
51
|
-
this.spaces = new Spaces(this.store, this.riverConnection, this.user.memberships
|
|
46
|
+
this.spaces = new Spaces(this.store, this.riverConnection, this.user.memberships);
|
|
52
47
|
this.gdms = new Gdms(this.store, this.riverConnection, this.user.memberships);
|
|
53
48
|
this.dms = new Dms(this.store, this.riverConnection, this.user.memberships);
|
|
54
49
|
// flatten out the observables
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAgent.js","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAwB,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"syncAgent.js","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAwB,MAAM,oCAAoC,CAAA;AAG1F,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,IAAI,EAAa,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIlD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAG5C,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAA;AAIrD,OAAO,EAAE,IAAI,EAAkB,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,GAAG,EAAY,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,IAAI,EAAW,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAiBnE,MAAM,OAAO,SAAS;IAClB,GAAG,CAAS;IACZ,MAAM,CAAQ;IACd,MAAM,CAAiB;IACvB,eAAe,CAAiB;IAChC,KAAK,CAAO;IACZ,IAAI,CAAM;IACV,MAAM,CAAQ;IACd,IAAI,CAAM;IACV,GAAG,CAAK;IACA,OAAO,GAAG,KAAK,CAAA;IAEvB,gFAAgF;IAChF,WAAW,CAWV;IAED,YAAY,MAAuB;QAC/B,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACxE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;QACrE,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAA;QAC3D,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE;YACvE,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YACzE,IAAI,EAAE;gBACF,oBAAoB,EAChB,MAAM,CAAC,uBAAuB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS;gBAClF,kBAAkB,EAAE,SAAS;gBAC7B,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;gBACxD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,KAAK,EAAE,MAAM,CAAC,KAAK;aACtB;YACD,cAAc,EAAE,MAAM,CAAC,WAAW;YAClC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,cAAc,EAAE,MAAM,CAAC,cAAc;SACxC,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QACnE,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACjF,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3E,8BAA8B;QAC9B,IAAI,CAAC,WAAW,GAAG;YACf,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU;YAChD,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YACtC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YAC1B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAClC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,GAAG;SAChB,CAAA;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;QAChF,CAAC;QACD,+EAA+E;QAC/E,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAA;QACpC,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;QACvD,oFAAoF;QACpF,kFAAkF;QAClF,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAClC,IAAI,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;IACrC,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACnC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IACrC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,EAAU;QACb,MAAM,SAAS,GACX,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,KAAK,MAAM;YAC5C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,CAAA;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACpF,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,EAAE,CAAA;QAC3D,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ"}
|
package/dist/townsEnv.d.ts
CHANGED
|
@@ -4,7 +4,8 @@ export declare enum TownsService {
|
|
|
4
4
|
Notifications = 0,
|
|
5
5
|
AppRegistry = 1,
|
|
6
6
|
StreamMetadata = 2,
|
|
7
|
-
Node = 3
|
|
7
|
+
Node = 3,
|
|
8
|
+
Relayer = 4
|
|
8
9
|
}
|
|
9
10
|
export type TownsConfig = {
|
|
10
11
|
environmentId: string;
|
|
@@ -29,6 +30,9 @@ export type TownsConfig = {
|
|
|
29
30
|
node: {
|
|
30
31
|
url: string;
|
|
31
32
|
};
|
|
33
|
+
relayer: {
|
|
34
|
+
url: string;
|
|
35
|
+
};
|
|
32
36
|
};
|
|
33
37
|
};
|
|
34
38
|
export interface ITownsEnv {
|
|
@@ -42,6 +46,7 @@ export interface ITownsEnv {
|
|
|
42
46
|
getAppRegistryUrl: (environmentId?: string) => string;
|
|
43
47
|
getStreamMetadataUrl: (environmentId?: string) => string;
|
|
44
48
|
getNodeUrl: (environmentId?: string) => string;
|
|
49
|
+
getRelayerUrl: (environmentId?: string) => string;
|
|
45
50
|
}
|
|
46
51
|
export declare function townsEnv(opts?: SafeEnvOpts): ITownsEnv;
|
|
47
52
|
//# sourceMappingURL=townsEnv.d.ts.map
|
package/dist/townsEnv.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"townsEnv.d.ts","sourceRoot":"","sources":["../src/townsEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAsB,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEnE,oBAAY,YAAY;IACpB,aAAa,IAAA;IACb,WAAW,IAAA;IACX,cAAc,IAAA;IACd,IAAI,IAAA;
|
|
1
|
+
{"version":3,"file":"townsEnv.d.ts","sourceRoot":"","sources":["../src/townsEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAsB,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEnE,oBAAY,YAAY;IACpB,aAAa,IAAA;IACb,WAAW,IAAA;IACX,cAAc,IAAA;IACd,IAAI,IAAA;IACJ,OAAO,IAAA;CACV;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,eAAe,CAAA;KAAE,CAAA;IACtD,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,gBAAgB,CAAA;KAAE,CAAA;IACxD,QAAQ,EAAE;QACN,aAAa,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;QAC9B,WAAW,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;QAC5B,cAAc,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;QAC/B,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;QACrB,OAAO,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;KAC3B,CAAA;CACJ,CAAA;AAED,MAAM,WAAW,SAAS;IACtB,gBAAgB,EAAE,MAAM,MAAM,CAAA;IAC9B,iBAAiB,EAAE,MAAM,MAAM,EAAE,CAAA;IACjC,eAAe,EAAE,MAAM,WAAW,EAAE,CAAA;IACpC,eAAe,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,WAAW,CAAA;IACxD,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAA;IACpE,oBAAoB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,CAAA;IACtE,yBAAyB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IAC7D,iBAAiB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACrD,oBAAoB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,aAAa,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;CACpD;AA8DD,wBAAgB,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CA2NtD"}
|