@towns-labs/sdk 2.0.12 → 2.0.13

package/dist/tests/multi_ne/sync-agent/members.test.js

@@ -1,35 +1,40 @@
 /**
  * @group with-entitlements
  */
+import { MembershipOp } from '@towns-labs/proto';
 import { Bot } from '../../../sync-agent/utils/bot';
 import { waitFor } from '../../testUtils';
-import { MembershipOp } from '@towns-labs/proto';
 describe('members.test.ts', () => {
-    const testUser = new Bot();
     let syncAgent;
-    let space;
+    let aliceSync;
+    let gdm;
     beforeAll(async () => {
-        await testUser.fundWallet();
-        syncAgent = await testUser.makeSyncAgent();
-        await syncAgent.start();
-        const { spaceId } = await syncAgent.spaces.createSpace();
-        space = syncAgent.spaces.getSpace(spaceId);
+        const bobUser = new Bot();
+        const aliceUser = new Bot();
+        await Promise.all([bobUser.fundWallet(), aliceUser.fundWallet()]);
+        syncAgent = await bobUser.makeSyncAgent();
+        aliceSync = await aliceUser.makeSyncAgent();
+        await Promise.all([syncAgent.start(), aliceSync.start()]);
+        const { streamId } = await syncAgent.gdms.createGDM([{ userId: aliceSync.userId }]);
+        gdm = syncAgent.gdms.getGdm(streamId);
     });
     afterAll(async () => {
-        await syncAgent.stop();
+        await syncAgent?.stop();
+        await aliceSync?.stop();
     });
-    test('member should be defined in a new space', async () => {
-        await waitFor(() => expect(syncAgent.spaces.value.initialized).toBe(true));
-        await waitFor(() => expect(space.value.initialized).toBe(true));
-        await waitFor(() => expect(space.value.channelIds.length).toBe(1));
-        const members = space.members.value.userIds;
-        expect(members.length).toBe(1);
-        expect(members[0]).toBe(testUser.userId);
+    test('member should be defined in a new gdm', async () => {
+        await waitFor(() => expect(syncAgent?.gdms.value.initialized).toBe(true));
+        await waitFor(() => expect(gdm?.value.initialized).toBe(true));
+        await waitFor(() => expect(gdm?.members.value.initialized).toBe(true));
+        const members = gdm.members.value.userIds;
+        expect(members).toEqual(expect.arrayContaining([syncAgent.userId, aliceSync.userId]));
     });
-    test('Members.getMember always return a member, even if not in the space/channel yet', async () => {
+    test('Members.getMember always return a member, even if not in the gdm yet', async () => {
         const newMember = new Bot();
-        const member = space.members.get(newMember.userId);
-        expect(member.value.membership).toBe(MembershipOp.SO_UNSPECIFIED);
+        const member = gdm.members.get(newMember.userId);
+        await waitFor(() => expect(member.value.initialized).toBe(true));
+        expect(member.value.userId).toBe(newMember.userId);
+        expect([MembershipOp.SO_UNSPECIFIED, undefined]).toContain(member.value.membership);
     });
 });
 //# sourceMappingURL=members.test.js.map

package/dist/tests/multi_ne/sync-agent/members.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"members.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/members.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;IAC1B,IAAI,SAAoB,CAAA;IACxB,IAAI,KAAY,CAAA;IAChB,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAA;QAC3B,SAAS,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,SAAS,CAAC,KAAK,EAAE,CAAA;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAA;QAExD,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAE,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC1E,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC/D,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAElE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QAC3C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;QAC9F,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAA;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
+{"version":3,"file":"members.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/members.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/multi_ne/sync-agent/streams.test.d.ts

@@ -1,2 +1,5 @@
+/**
+ * @group with-entitlements
+ */
 export {};
 //# sourceMappingURL=streams.test.d.ts.map

package/dist/tests/multi_ne/sync-agent/streams.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streams.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/streams.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"streams.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/streams.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/tests/multi_ne/sync-agent/streams.test.js

@@ -3,25 +3,25 @@
  */
 import { dlogger } from '@towns-labs/utils';
 import { Bot } from '../../../sync-agent/utils/bot';
-import { makeUniqueChannelStreamId, streamIdAsBytes } from '../../../id';
+import { makeUniqueGDMChannelStreamId, streamIdAsBytes } from '../../../id';
 const logger = dlogger('csb:test:streams');
 describe('streams.test.ts', () => {
     logger.log('start');
-    const testUser = new Bot();
-    beforeAll(async () => {
-        await testUser.fundWallet();
-    });
     test('stream exists', async () => {
-        const syncAgent = await testUser.makeSyncAgent();
-        await syncAgent.start();
-        const { spaceId, defaultChannelId } = await syncAgent.spaces.createSpace();
-        const spaceExists = await syncAgent.riverConnection.streamExists(streamIdAsBytes(spaceId));
-        expect(spaceExists).toBe(true);
-        const channelExists = await syncAgent.riverConnection.streamExists(streamIdAsBytes(defaultChannelId));
-        expect(channelExists).toBe(true);
-        const notAStream = makeUniqueChannelStreamId(spaceId);
-        const notAStreamExists = await syncAgent.riverConnection.streamExists(streamIdAsBytes(notAStream));
+        const bobUser = new Bot();
+        const aliceUser = new Bot();
+        await Promise.all([bobUser.fundWallet(), aliceUser.fundWallet()]);
+        const bob = await bobUser.makeSyncAgent();
+        const alice = await aliceUser.makeSyncAgent();
+        await Promise.all([bob.start(), alice.start()]);
+        const { streamId } = await bob.gdms.createGDM([{ userId: alice.userId }]);
+        const streamExists = await bob.riverConnection.streamExists(streamIdAsBytes(streamId));
+        expect(streamExists).toBe(true);
+        const notAStream = makeUniqueGDMChannelStreamId();
+        const notAStreamExists = await bob.riverConnection.streamExists(streamIdAsBytes(notAStream));
         expect(notAStreamExists).toBe(false);
+        await bob.stop();
+        await alice.stop();
     });
 });
 //# sourceMappingURL=streams.test.js.map

package/dist/tests/multi_ne/sync-agent/streams.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"streams.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/streams.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAExE,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAE1C,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;IAE1B,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAA;QAChD,MAAM,SAAS,CAAC,KAAK,EAAE,CAAA;QACvB,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAA;QAC1E,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;QAC1F,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE9B,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,YAAY,CAC9D,eAAe,CAAC,gBAAgB,CAAC,CACpC,CAAA;QACD,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhC,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,YAAY,CACjE,eAAe,CAAC,UAAU,CAAC,CAC9B,CAAA;QACD,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
+{"version":3,"file":"streams.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/streams.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,4BAA4B,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE3E,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAE1C,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAEnB,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAA;QACzB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAA;QAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;QAEjE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAA;QACzC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAE/C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEzE,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;QACtF,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE/B,MAAM,UAAU,GAAG,4BAA4B,EAAE,CAAA;QACjD,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAA;QAC5F,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAEpC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;QAChB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/dist/tests/multi_ne/sync-agent/syncAgent.test.d.ts

@@ -1,2 +1,5 @@
+/**
+ * @group with-entitlements
+ */
 export {};
 //# sourceMappingURL=syncAgent.test.d.ts.map

package/dist/tests/multi_ne/sync-agent/syncAgent.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncAgent.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgent.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"syncAgent.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgent.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/tests/multi_ne/sync-agent/syncAgent.test.js

@@ -17,31 +17,36 @@ describe('syncAgent.test.ts', () => {
         await testUser.fundWallet();
     });
     test('syncAgent', async () => {
+        const aliceUser = new Bot();
+        await aliceUser.fundWallet();
         const syncAgent = await testUser.makeSyncAgent();
+        const alice = await aliceUser.makeSyncAgent();
         expect(syncAgent.riverConnection.authStatus.value).toBe(AuthStatus.Initializing);
-        await syncAgent.start();
+        await Promise.all([syncAgent.start(), alice.start()]);
         await waitFor(() => expect(syncAgent.riverConnection.authStatus.value).toBe(AuthStatus.ConnectedToRiver));
-        expect(Object.keys(syncAgent.user.memberships.value.streamMemberships).length).toBe(0);
-        expect(syncAgent.spaces.value.spaceIds.length).toBe(0);
-        const { spaceId, defaultChannelId } = await syncAgent.spaces.createSpace();
-        logger.log('spaceId', spaceId);
-        await waitFor(() => expect(Object.keys(syncAgent.user.memberships.value.streamMemberships).length).toBe(2));
-        expect(syncAgent.user.memberships.value.streamMemberships[spaceId]?.op).toBe(MembershipOp.SO_JOIN);
-        expect(syncAgent.user.memberships.value.streamMemberships[defaultChannelId]?.op).toBe(MembershipOp.SO_JOIN);
-        expect(syncAgent.riverConnection.authStatus.value).toBe(AuthStatus.ConnectedToRiver);
-        expect(syncAgent.user.memberships.value.initialized).toBe(true);
-        expect(syncAgent.spaces.value.spaceIds.length).toBe(1);
+        await waitFor(() => expect(syncAgent.user.memberships.value.initialized).toBe(true));
+        await waitFor(() => expect(syncAgent.user.inbox.value.initialized).toBe(true));
+        await waitFor(() => expect(syncAgent.user.deviceKeys.value.initialized).toBe(true));
+        await waitFor(() => expect(syncAgent.user.settings.value.initialized).toBe(true));
+        await waitFor(() => expect(syncAgent.gdms.value.initialized).toBe(true));
+        const { streamId } = await syncAgent.gdms.createGDM([{ userId: alice.userId }]);
+        logger.log('streamId', streamId);
+        await waitFor(() => expect(syncAgent.user.memberships.value.streamMemberships[streamId]?.op).toBe(MembershipOp.SO_JOIN));
+        expect(syncAgent.gdms.value.streamIds).toContain(streamId);
         await syncAgent.stop();
+        await alice.stop();
     });
     test('syncAgent loads again', async () => {
         const syncAgent = await testUser.makeSyncAgent();
         await syncAgent.start();
         expect(syncAgent.riverConnection.authStatus.value).toBe(AuthStatus.ConnectedToRiver);
-        expect(syncAgent.user.memberships.value.initialized).toBe(true);
-        await waitFor(() => expect(syncAgent.spaces.value.spaceIds.length).toBe(1));
+        await waitFor(() => expect(syncAgent.user.memberships.value.initialized).toBe(true));
+        await waitFor(() => expect(syncAgent.gdms.value.initialized).toBe(true));
         await syncAgent.stop();
     });
     test('logIn with delegate', async () => {
+        const aliceUser = new Bot();
+        await aliceUser.fundWallet();
         const bearerToken = await makeBearerToken(testUser.signer, { days: 1 });
         logger.log('bearerTokenStr', bearerToken);
         const signerContext = await makeSignerContextFromBearerToken(bearerToken);
@@ -49,10 +54,13 @@ describe('syncAgent.test.ts', () => {
             townsConfig: townsEnv().makeTownsConfig(),
             context: signerContext,
         });
-        await syncAgent.start();
+        const alice = await aliceUser.makeSyncAgent();
+        await Promise.all([syncAgent.start(), alice.start()]);
         expect(syncAgent.riverConnection.authStatus.value).toBe(AuthStatus.ConnectedToRiver);
-        await waitFor(() => expect(syncAgent.spaces.value.spaceIds.length).toBe(1));
+        const { streamId } = await syncAgent.gdms.createGDM([{ userId: alice.userId }]);
+        await waitFor(() => expect(syncAgent.user.memberships.value.streamMemberships[streamId]?.op).toBe(MembershipOp.SO_JOIN));
         await syncAgent.stop();
+        await alice.stop();
     });
 });
 //# sourceMappingURL=syncAgent.test.js.map

package/dist/tests/multi_ne/sync-agent/syncAgent.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncAgent.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgent.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncAgent.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgent.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/multi_ne/sync-agent/syncAgents.test.d.ts

@@ -1,2 +1,5 @@
+/**
+ * @group with-entitlements
+ */
 export {};
 //# sourceMappingURL=syncAgents.test.d.ts.map

package/dist/tests/multi_ne/sync-agent/syncAgents.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncAgents.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgents.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"syncAgents.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgents.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/tests/multi_ne/sync-agent/syncAgents.test.js

@@ -26,39 +26,29 @@ describe('syncAgents.test.ts', () => {
     });
     test('syncAgents', async () => {
         await Promise.all([bob.start(), alice.start(), charlie.start()]);
-        const { spaceId } = await bob.spaces.createSpace();
-        expect(bob.user.memberships.isJoined(spaceId)).toBe(true);
-        await Promise.all([
-            alice.spaces.getSpace(spaceId).join(aliceUser.signer),
-            charlie.spaces.getSpace(spaceId).join(charlieUser.signer),
+        const { streamId } = await bob.gdms.createGDM([
+            { userId: alice.userId },
+            { userId: charlie.userId },
         ]);
-        expect(alice.user.memberships.isJoined(spaceId)).toBe(true);
-        expect(charlie.user.memberships.isJoined(spaceId)).toBe(true);
+        await waitFor(() => expect(bob.gdms.value.streamIds).toContain(streamId));
+        await waitFor(() => expect(alice.gdms.value.streamIds).toContain(streamId));
+        await waitFor(() => expect(charlie.gdms.value.streamIds).toContain(streamId));
     });
     test('syncAgents load async', async () => {
         await bob.start();
-        const { spaceId } = await bob.spaces.createSpace();
-        expect(bob.user.memberships.isJoined(spaceId)).toBe(true);
-        // queue up a join, then start the client (wow!)
-        const alicePromise = alice.spaces.getSpace(spaceId).join(aliceUser.signer);
+        const { streamId } = await bob.gdms.createGDM([{ userId: alice.userId }]);
         await alice.start();
-        await alicePromise;
-        expect(alice.user.memberships.isJoined(spaceId)).toBe(true);
+        await waitFor(() => expect(alice.gdms.value.streamIds).toContain(streamId));
     });
     test('syncAgents send a message', async () => {
         await Promise.all([bob.start(), alice.start()]);
-        await waitFor(() => bob.spaces.value.initialized);
-        expect(bob.spaces.value.spaceIds.length).toBeGreaterThan(0);
-        const spaceId = bob.spaces.value.spaceIds[0];
-        expect(alice.user.memberships.isJoined(spaceId)).toBe(true); // alice joined above
-        const space = bob.spaces.getSpace(spaceId);
-        const channel = space.getDefaultChannel();
-        await channel.sendMessage('Hello, World!');
-        expect(findMessageByText(channel.timeline.events.value, 'Hello, World!')).toBeDefined();
-        // sleep for a bit, then check if alice got the message
-        const aliceChannel = alice.spaces.getSpace(spaceId).getChannel(channel.value.id);
-        logger.log(aliceChannel.timeline.events.value);
-        await waitFor(() => expect(findMessageByText(aliceChannel.timeline.events.value, 'Hello, World!')).toBeDefined());
+        const { streamId } = await bob.gdms.createGDM([{ userId: alice.userId }]);
+        const bobGdm = bob.gdms.getGdm(streamId);
+        const aliceGdm = alice.gdms.getGdm(streamId);
+        await waitFor(() => expect(bobGdm.value.initialized).toBe(true));
+        await waitFor(() => expect(aliceGdm.value.initialized).toBe(true));
+        await bobGdm.sendMessage('Hello, World!');
+        await waitFor(() => expect(findMessageByText(aliceGdm.timeline.events.value, 'Hello, World!')).toBeDefined());
     });
     test('syncAgents send a message with disableSignatureValidation=true', async () => {
         const prevBobOpts = bob.riverConnection.clientParams.opts?.unpackEnvelopeOpts;
@@ -76,18 +66,11 @@ describe('syncAgents.test.ts', () => {
             },
         };
         await Promise.all([bob.start(), alice.start()]);
-        await waitFor(() => bob.spaces.value.initialized);
-        const spaceId = bob.spaces.value.spaceIds[0];
-        const space = bob.spaces.getSpace(spaceId);
-        const channelId = await space.createChannel('random', bobUser.signer);
-        const channel = space.getChannel(channelId);
-        await channel.sendMessage('Hello, World again!');
-        // join the channel, find the message
-        const aliceChannel = alice.spaces.getSpace(spaceId).getChannel(channel.value.id);
-        await aliceChannel.join();
-        logger.log(aliceChannel.timeline.events.value);
-        await waitFor(() => expect(findMessageByText(aliceChannel.timeline.events.value, 'Hello, World again!')).toBeDefined());
-        // reset the unpackEnvelopeOpts
+        const { streamId } = await bob.gdms.createGDM([{ userId: alice.userId }]);
+        const bobGdm = bob.gdms.getGdm(streamId);
+        const aliceGdm = alice.gdms.getGdm(streamId);
+        await bobGdm.sendMessage('Hello, World again!');
+        await waitFor(() => expect(findMessageByText(aliceGdm.timeline.events.value, 'Hello, World again!')).toBeDefined());
         bob.riverConnection.clientParams.opts = {
             ...bob.riverConnection.clientParams.opts,
             unpackEnvelopeOpts: prevBobOpts,
@@ -99,42 +82,23 @@ describe('syncAgents.test.ts', () => {
     });
     test('syncAgents pin a message', async () => {
         await Promise.all([bob.start(), alice.start()]);
-        await waitFor(() => bob.spaces.value.initialized);
-        expect(bob.spaces.value.spaceIds.length).toBeGreaterThan(0);
-        const spaceId = bob.spaces.value.spaceIds[0];
-        expect(alice.user.memberships.isJoined(spaceId)).toBe(true); // alice joined above
-        const space = bob.spaces.getSpace(spaceId);
-        const channel = space.getDefaultChannel();
-        const channelId = channel.value.id;
+        const { streamId } = await bob.gdms.createGDM([{ userId: alice.userId }]);
+        const bobGdm = bob.gdms.getGdm(streamId);
+        const aliceGdm = alice.gdms.getGdm(streamId);
+        await bobGdm.sendMessage('pin me');
         const event = await waitForValue(() => {
-            const event = findMessageByText(channel.timeline.events.value, 'Hello, World!');
-            expect(event).toBeDefined();
-            return event;
+            const found = findMessageByText(bobGdm.timeline.events.value, 'pin me');
+            expect(found).toBeDefined();
+            return found;
         });
-        // bob can pin
-        const result = await channel.pin(event.eventId);
-        expect(result).toBeDefined();
-        await waitFor(() => expect(bob.riverConnection.client?.streams.get(channelId)?.view.membershipContent.pins
+        await bobGdm.pin(event.eventId);
+        await waitFor(() => expect(bob.riverConnection.client?.streams.get(streamId)?.view.membershipContent.pins
             .length).toBe(1));
-        // bob can unpin
-        const result2 = await channel.unpin(event.eventId);
-        expect(result2).toBeDefined();
-        // alice can't pin yet, she doesn't have permissions
-        const aliceChannel = alice.spaces.getSpace(spaceId).getChannel(channelId);
-        await waitFor(() => aliceChannel.value.initialized);
-        // alice can pin
-        const result3 = await aliceChannel.pin(event.eventId);
-        expect(result3).toBeDefined();
-    });
-    test('dm', async () => {
-        await Promise.all([bob.start(), alice.start()]);
-        const { streamId } = await bob.dms.createDM(alice.userId);
-        const bobAndAliceDm = bob.dms.getDm(streamId);
-        await waitFor(() => expect(bobAndAliceDm.members.value.initialized).toBe(true));
-        expect(bobAndAliceDm.members.value.userIds).toEqual(expect.arrayContaining([bob.userId, alice.userId]));
-        await bobAndAliceDm.sendMessage('hi');
-        const aliceAndBobDm = alice.dms.getDmWithUserId(bob.userId);
-        await waitFor(() => expect(findMessageByText(aliceAndBobDm.timeline.events.value, 'hi')).toBeDefined());
+        await bobGdm.unpin(event.eventId);
+        await waitFor(() => expect(bob.riverConnection.client?.streams.get(streamId)?.view.membershipContent.pins
+            .length).toBe(0));
+        await waitFor(() => expect(aliceGdm.value.initialized).toBe(true));
+        await aliceGdm.pin(event.eventId);
     });
     test('gdm', async () => {
         await Promise.all([bob.start(), alice.start(), charlie.start()]);

package/dist/tests/multi_ne/sync-agent/syncAgents.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncAgents.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgents.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncAgents.test.js","sourceRoot":"","sources":["../../../../src/tests/multi_ne/sync-agent/syncAgents.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE1E,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAA;IACzB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAA;IAC3B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,CAAA;IAC7B,IAAI,GAAc,CAAA;IAClB,IAAI,KAAgB,CAAA;IACpB,IAAI,OAAkB,CAAA;IAEtB,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;QAC3F,GAAG,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAA;QACnC,KAAK,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,CAAA;QACvC,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,EAAE,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;QAChB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAClB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAEhE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1C,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;YACxB,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;SAC7B,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QACzE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC3E,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjF,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,GAAG,CAAC,KAAK,EAAE,CAAA;QACjB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEzE,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/E,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEzE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAChE,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAElE,MAAM,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QACzC,MAAM,OAAO,CAAC,GAAG,EAAE,CACf,MAAM,CACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CACrE,CAAC,WAAW,EAAE,CAClB,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,WAAW,GAAG,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,EAAE,kBAAkB,CAAA;QAC7E,MAAM,aAAa,GAAG,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,EAAE,kBAAkB,CAAA;QACjF,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,GAAG;YACpC,GAAG,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI;YACxC,kBAAkB,EAAE;gBAChB,0BAA0B,EAAE,IAAI;aACnC;SACJ,CAAA;QACD,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,GAAG;YACtC,GAAG,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI;YAC1C,kBAAkB,EAAE;gBAChB,0BAA0B,EAAE,IAAI;aACnC;SACJ,CAAA;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEzE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAA;QAC/C,MAAM,OAAO,CAAC,GAAG,EAAE,CACf,MAAM,CACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAC3E,CAAC,WAAW,EAAE,CAClB,CAAA;QAED,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,GAAG;YACpC,GAAG,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI;YACxC,kBAAkB,EAAE,WAAW;SAClC,CAAA;QACD,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,GAAG;YACtC,GAAG,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI;YAC1C,kBAAkB,EAAE,aAAa;SACpC,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QACzE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAE5C,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAClC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YACvE,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;YAC3B,OAAO,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC/B,MAAM,OAAO,CAAC,GAAG,EAAE,CACf,MAAM,CACF,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI;aACzE,MAAM,CACd,CAAC,IAAI,CAAC,CAAC,CAAC,CACZ,CAAA;QACD,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,OAAO,CAAC,GAAG,EAAE,CACf,MAAM,CACF,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI;aACzE,MAAM,CACd,CAAC,IAAI,CAAC,CAAC,CAAC,CACZ,CAAA;QAED,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAClE,MAAM,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;QACnB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1C,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;YACxB,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;SAC7B,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACxE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CACxC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CACrE,CAAA;QACD,MAAM,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,OAAO,CAAC,GAAG,EAAE,CACf,MAAM,CACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CACrE,CAAC,WAAW,EAAE,CAClB,CAAA;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}