cojson 0.3.6 → 0.4.0

package/src/tests/queries.test.ts

@@ -1,4 +1,12 @@
-import { BinaryCoStream, CoList, CoMap, CoStream, Group, LocalNode, cojsonReady } from "..";
+import {
+    BinaryCoStream,
+    CoList,
+    CoMap,
+    CoStream,
+    Group,
+    LocalNode,
+    cojsonReady,
+} from "..";
 
 beforeEach(async () => {
     await cojsonReady;
@@ -6,7 +14,7 @@ beforeEach(async () => {
 
 test("Queries with maps work", async () => {
     const { node, accountID } =
-        LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+        LocalNode.withNewlyCreatedAccount({name: "Hermes Puggington"});
 
     const group = node.createGroup();
 
@@ -16,7 +24,7 @@ test("Queries with maps work", async () => {
             subMap: CoMap<{
                 hello: "world" | "moon" | "sun";
                 id: string;
-            }>;
+            }>["id"];
         }>
     >();
 
@@ -33,18 +41,20 @@ test("Queries with maps work", async () => {
                 expect(queriedMap.hello).toBe("world");
                 expect(Object.keys(queriedMap)).toEqual(["hello", "subMap"]);
                 if (queriedMap.edits.hello?.by?.profile?.name) {
-                    expect(queriedMap.edits.hello).toMatchObject({
-                        by: {
-                            id: accountID,
-                            profile: {
-                                id: node.expectProfileLoaded(accountID).id,
-                                name: "Hermes Puggington",
-                            },
-                            isMe: true,
-                        },
-                        tx: map.lastEditAt("hello")!.tx,
-                        at: new Date(map.lastEditAt("hello")!.at),
-                    });
+                    expect(queriedMap.edits.hello.by.id).toEqual(accountID);
+                    expect(queriedMap.edits.hello.by.profile.id).toEqual(
+                        node.expectProfileLoaded(accountID).id
+                    );
+                    expect(queriedMap.edits.hello.by.profile.name).toEqual(
+                        "Hermes Puggington"
+                    );
+                    expect(queriedMap.edits.hello.by.isMe).toBe(true);
+                    expect(queriedMap.edits.hello.tx).toEqual(
+                        map.lastEditAt("hello")!.tx
+                    );
+                    expect(queriedMap.edits.hello.at).toEqual(
+                        new Date(map.lastEditAt("hello")!.at)
+                    );
                     if (queriedMap.subMap) {
                         expect(queriedMap.subMap.type).toBe("comap");
                         expect(queriedMap.subMap.id).toEqual("foreignID");
@@ -79,7 +89,7 @@ test("Queries with maps work", async () => {
         }>
     >();
 
-    map = map.set("subMap", subMap);
+    map = map.set("subMap", subMap.id);
 
     subMap = subMap.mutate((subMap) => {
         subMap.set("hello", "world");
@@ -93,7 +103,7 @@ test("Queries with maps work", async () => {
 
 test("Queries with lists work", () => {
     const { node, accountID } =
-        LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+        LocalNode.withNewlyCreatedAccount({name: "Hermes Puggington"});
 
     const group = node.createGroup();
 
@@ -113,20 +123,17 @@ test("Queries with lists work", () => {
                 expect(queriedList[1]).toBe("world");
                 expect(queriedList[2]).toBe("moon");
                 if (queriedList.edits[2]?.by?.profile?.name) {
-                    expect(queriedList.edits[2]).toMatchObject({
-                        by: {
-                            id: accountID,
-                            profile: {
-                                id: node.expectProfileLoaded(accountID).id,
-                                name: "Hermes Puggington",
-                            },
-                            isMe: true,
-                        },
-                        at: expect.any(Date),
-                    });
+                    expect(queriedList.edits[2].by.id).toEqual(accountID);
+                    expect(queriedList.edits[2].by.profile.id).toEqual(
+                        node.expectProfileLoaded(accountID).id
+                    );
+                    expect(queriedList.edits[2].by.profile.name).toEqual(
+                        "Hermes Puggington"
+                    );
+                    expect(queriedList.edits[2].by.isMe).toBe(true);
+                    expect(queriedList.edits[2].at).toBeInstanceOf(Date);
                     if (queriedList.length === 3) {
                         queriedList.append("sun");
-
                     } else if (
                         queriedList.length === 4 &&
                         queriedList.edits[3]?.by?.profile?.name ===
@@ -152,11 +159,11 @@ test("Queries with lists work", () => {
 });
 
 test("List of nested maps works", () => {
-    const { node } = LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+    const { node } = LocalNode.withNewlyCreatedAccount({name: "Hermes Puggington"});
 
     const group = node.createGroup();
 
-    let list = group.createList<CoList<CoMap<{ hello: "world" }>>>();
+    let list = group.createList<CoList<CoMap<{ hello: "world" }>["id"]>>();
 
     const done = new Promise<void>((resolve) => {
         const unsubQuery = node.query(list.id, (queriedList) => {
@@ -176,23 +183,21 @@ test("List of nested maps works", () => {
     list = list.append(
         group.createMap<CoMap<{ hello: "world" }>>({
             hello: "world",
-        })
+        }).id
     );
 
     return done;
 });
 
 test("Can call .map on a quieried coList", async () => {
-    const { node } = LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+    const { node } = LocalNode.withNewlyCreatedAccount({name: "Hermes Puggington"});
 
     const group = node.createGroup();
 
     let list = group.createList<CoList<string>>();
 
     const done = new Promise<void>((resolve) => {
-
         const unsubQuery = node.query(list.id, (queriedList) => {
-
             if (queriedList && queriedList[0]) {
                 // console.log("update", queriedList);
                 expect(queriedList.map((item) => item + "!!!")).toEqual([
@@ -216,7 +221,7 @@ test("Can call .map on a quieried coList", async () => {
 
 test("Queries with streams work", () => {
     const { node, accountID } =
-        LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+        LocalNode.withNewlyCreatedAccount({name: "Hermes Puggington"});
 
     const group = node.createGroup();
 
@@ -233,45 +238,58 @@ test("Queries with streams work", () => {
                     expect(queriedStream.group).toBeInstanceOf(Group);
                     expect(queriedStream.group.id).toBe(group.id);
                     expect(queriedStream.meta).toBe(null);
-                    const expectedEntry = {
-                        last: "world",
-                        by: {
-                            id: accountID,
-                            isMe: true,
-                            profile: {
-                                id: node.expectProfileLoaded(accountID).id,
-                                name: "Hermes Puggington",
-                            },
-                        },
-                        at: new Date(
-                            stream.items[node.currentSessionID][1].madeAt
-                        ),
-                        all: [
-                            {
-                                value: "hello",
-                                at: new Date(
-                                    stream.items[
-                                        node.currentSessionID
-                                    ][0].madeAt
-                                ),
-                            },
-                            {
-                                value: "world",
-                                at: new Date(
-                                    stream.items[
-                                        node.currentSessionID
-                                    ][1].madeAt
-                                ),
-                            },
-                        ],
-                    };
-                    expect(queriedStream.perSession).toMatchObject({
-                        [node.currentSessionID]: expectedEntry,
-                    });
-                    expect(queriedStream.perAccount).toMatchObject({
-                        [accountID]: expectedEntry,
-                    });
-                    expect(queriedStream.me).toMatchObject(expectedEntry);
+
+                    expect(queriedStream.perSession[node.currentSessionID].last).toEqual(
+                        "world"
+                    );
+                    expect(queriedStream.perSession[node.currentSessionID].all[0].value).toEqual("hello");
+                    expect(queriedStream.perSession[node.currentSessionID].all[0].at).toEqual(new Date(
+                        stream.items[
+                            node.currentSessionID
+                        ][0].madeAt
+                    ));
+                    expect(queriedStream.perSession[node.currentSessionID].all[1].value).toEqual("world");
+                    expect(queriedStream.perSession[node.currentSessionID].all[1].at).toEqual(new Date(
+                        stream.items[
+                            node.currentSessionID
+                        ][1].madeAt
+                    ));
+                    expect(queriedStream.perSession[node.currentSessionID].by?.id).toEqual(accountID);
+                    expect(queriedStream.perSession[node.currentSessionID].by?.profile?.id).toEqual(
+                        node.expectProfileLoaded(accountID).id
+                    );
+                    expect(queriedStream.perSession[node.currentSessionID].by?.profile?.name).toEqual(
+                        "Hermes Puggington"
+                    );
+                    expect(queriedStream.perSession[node.currentSessionID].by?.isMe).toBe(true);
+                    expect(queriedStream.perSession[node.currentSessionID].at).toBeInstanceOf(Date);
+
+                    expect(queriedStream.perAccount[accountID].last).toEqual(
+                        "world"
+                    );
+                    expect(queriedStream.perAccount[accountID].all[0].value).toEqual("hello");
+                    expect(queriedStream.perAccount[accountID].all[0].at).toEqual(new Date(
+                        stream.items[
+                            node.currentSessionID
+                        ][0].madeAt
+                    ));
+                    expect(queriedStream.perAccount[accountID].all[1].value).toEqual("world");
+                    expect(queriedStream.perAccount[accountID].all[1].at).toEqual(new Date(
+                        stream.items[
+                            node.currentSessionID
+                        ][1].madeAt
+                    ));
+                    expect(queriedStream.perAccount[accountID].by?.id).toEqual(accountID);
+                    expect(queriedStream.perAccount[accountID].by?.profile?.id).toEqual(
+                        node.expectProfileLoaded(accountID).id
+                    );
+                    expect(queriedStream.perAccount[accountID].by?.profile?.name).toEqual(
+                        "Hermes Puggington"
+                    );
+                    expect(queriedStream.perAccount[accountID].by?.isMe).toBe(true);
+                    expect(queriedStream.perAccount[accountID].at).toBeInstanceOf(Date);
+
+                    expect(queriedStream.me).toEqual(queriedStream.perAccount[accountID]);
                     // console.log("final update", queriedStream);
                     resolve();
                     unsubQuery();
@@ -287,11 +305,12 @@ test("Queries with streams work", () => {
 });
 
 test("Streams of nested maps work", () => {
-    const { node } = LocalNode.withNewlyCreatedAccount("Hermes Puggington");
+    const { node } = LocalNode.withNewlyCreatedAccount({name:"Hermes Puggington"});
 
     const group = node.createGroup();
 
-    let stream = group.createStream<CoStream<CoMap<{ hello: "world" }>>>();
+    let stream =
+        group.createStream<CoStream<CoMap<{ hello: "world" }>["id"]>>();
 
     const done = new Promise<void>((resolve) => {
         const unsubQuery = node.query(stream.id, (queriedStream) => {
@@ -312,7 +331,7 @@ test("Streams of nested maps work", () => {
         hello: "world",
     });
 
-    stream = stream.push(map);
+    stream = stream.push(map.id);
 
     return done;
-});
+});

package/src/tests/sync.test.ts

@@ -3,13 +3,13 @@ import { LocalNode } from "../localNode.js";
 import { SyncMessage } from "../sync.js";
 import { expectMap } from "../coValue.js";
 import { MapOpPayload } from "../coValues/coMap.js";
-import { Group } from "../group.js";
+import { Group } from "../coValues/group.js";
 import {
     randomAnonymousAccountAndSessionID,
     shouldNotResolve,
 } from "./testUtils.js";
 import { connectedPeers, newStreamPair } from "../streamUtils.js";
-import { AccountID } from "../account.js";
+import { AccountID } from "../coValues/account.js";
 import { cojsonReady } from "../index.js";
 import { stableStringify } from "../jsonStringify.js";
 
@@ -534,7 +534,7 @@ test("If we add a server peer, all updates to all coValues are sent to it, even
     // });
     expect((await reader.read()).value).toMatchObject({
         action: "load",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     });
 
     const mapSubscribeMsg = await reader.read();
@@ -606,7 +606,7 @@ test("If we add a server peer, newly created coValues are auto-subscribed to", a
     // });
     expect((await reader.read()).value).toMatchObject({
         action: "load",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     });
 
     const map = group.createMap();
@@ -660,7 +660,7 @@ test("When we connect a new server peer, we try to sync all existing coValues to
 
     expect(groupSubscribeMessage.value).toEqual({
         action: "load",
-        ...group.underlyingMap.core.knownState(),
+        ...group.core.knownState(),
     } satisfies SyncMessage);
 
     const secondMessage = await reader.read();
@@ -756,7 +756,7 @@ test.skip("When replaying creation and transactions of a coValue as new content,
     const groupSubscribeMsg = await from1.read();
     expect(groupSubscribeMsg.value).toMatchObject({
         action: "load",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     });
 
     await to2.write(adminSubscribeMessage.value!);
@@ -770,7 +770,7 @@ test.skip("When replaying creation and transactions of a coValue as new content,
 
     expect(
         node2.syncManager.peers["test1"]!.optimisticKnownStates[
-            group.underlyingMap.core.id
+            group.core.id
         ]
     ).toBeDefined();
 
@@ -970,7 +970,7 @@ test("When a peer's incoming/readable stream closes, we remove the peer", async
     // });
     expect((await reader.read()).value).toMatchObject({
         action: "load",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     });
 
     const map = group.createMap();
@@ -1024,7 +1024,7 @@ test("When a peer's outgoing/writable stream closes, we remove the peer", async
     // });
     expect((await reader.read()).value).toMatchObject({
         action: "load",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     });
 
     const map = group.createMap();
@@ -1098,7 +1098,7 @@ test("If we start loading a coValue before connecting to a peer that has it, it
 function groupContentEx(group: Group) {
     return {
         action: "content",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     };
 }
 
@@ -1112,7 +1112,7 @@ function admContEx(adminID: AccountID) {
 function groupStateEx(group: Group) {
     return {
         action: "known",
-        id: group.underlyingMap.core.id,
+        id: group.core.id,
     };
 }
 

package/src/tests/testUtils.ts

@@ -1,8 +1,8 @@
 import { AgentSecret, createdNowUnique, getAgentID, newRandomAgentSecret  } from "../crypto.js";
 import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
-import { expectGroupContent } from "../group.js";
-import { AnonymousControlledAccount } from "../account.js";
+import { expectGroup } from "../coValues/group.js";
+import { AnonymousControlledAccount } from "../coValues/account.js";
 import { SessionID } from "../ids.js";
 // @ts-ignore
 import { expect } from "bun:test";
@@ -20,43 +20,41 @@ export function newGroup() {
 
     const node = new LocalNode(admin, sessionID);
 
-    const group = node.createCoValue({
+    const groupCore = node.createCoValue({
         type: "comap",
         ruleset: { type: "group", initialAdmin: admin.id },
         meta: null,
         ...createdNowUnique(),
     });
 
-    const groupContent = expectGroupContent(group.getCurrentContent());
+    const group = expectGroup(groupCore.getCurrentContent());
 
-    groupContent.mutate((editable) => {
+    group.mutate((editable) => {
         editable.set(admin.id, "admin", "trusting");
         expect(editable.get(admin.id)).toEqual("admin");
     });
 
-    return { node, group, admin };
+    return { node, groupCore, admin };
 }
 
 export function groupWithTwoAdmins() {
-    const { group, admin, node } = newGroup();
+    const { groupCore, admin, node } = newGroup();
 
     const otherAdmin = node.createAccount("otherAdmin");
 
-    let content = expectGroupContent(group.getCurrentContent());
+    let group = expectGroup(groupCore.getCurrentContent());
 
-    content.mutate((editable) => {
-        editable.set(otherAdmin.id, "admin", "trusting");
-        expect(editable.get(otherAdmin.id)).toEqual("admin");
+    group = group.mutate((mutable) => {
+        mutable.set(otherAdmin.id, "admin", "trusting");
+        expect(mutable.get(otherAdmin.id)).toEqual("admin");
     });
 
-    content = expectGroupContent(group.getCurrentContent());
-
-    if (content.type !== "comap") {
+    if (group.type !== "comap") {
         throw new Error("Expected map");
     }
 
-    expect(content.get(otherAdmin.id)).toEqual("admin");
-    return { group, admin, otherAdmin, node };
+    expect(group.get(otherAdmin.id)).toEqual("admin");
+    return { groupCore, admin, otherAdmin, node };
 }
 
 export function newGroupHighLevel() {
@@ -71,11 +69,11 @@ export function newGroupHighLevel() {
 }
 
 export function groupWithTwoAdminsHighLevel() {
-    const { admin, node, group } = newGroupHighLevel();
+    let { admin, node, group } = newGroupHighLevel();
 
     const otherAdmin = node.createAccount("otherAdmin");
 
-    group.addMember(otherAdmin.id, "admin");
+    group = group.addMember(otherAdmin.id, "admin");
 
     return { admin, node, group, otherAdmin };
 }

package/dist/account.d.ts

@@ -1,58 +0,0 @@
-import { CoValueHeader } from "./coValueCore.js";
-import { CoID } from "./coValue.js";
-import { AgentSecret, SealerID, SealerSecret, SignerID, SignerSecret } from "./crypto.js";
-import { AgentID } from "./ids.js";
-import { CoMap } from "./coValues/coMap.js";
-import { LocalNode } from "./localNode.js";
-import { Group, GroupContent } from "./group.js";
-export declare function accountHeaderForInitialAgentSecret(agentSecret: AgentSecret): CoValueHeader;
-export declare class AccountGroup extends Group {
-    get id(): AccountID;
-    getCurrentAgentID(): AgentID;
-}
-export interface GeneralizedControlledAccount {
-    id: AccountID | AgentID;
-    agentSecret: AgentSecret;
-    currentAgentID: () => AgentID;
-    currentSignerID: () => SignerID;
-    currentSignerSecret: () => SignerSecret;
-    currentSealerID: () => SealerID;
-    currentSealerSecret: () => SealerSecret;
-}
-/** @hidden */
-export declare class ControlledAccount extends AccountGroup implements GeneralizedControlledAccount {
-    agentSecret: AgentSecret;
-    constructor(agentSecret: AgentSecret, groupMap: CoMap<AccountContent, AccountMeta>, node: LocalNode);
-    currentAgentID(): AgentID;
-    currentSignerID(): SignerID;
-    currentSignerSecret(): SignerSecret;
-    currentSealerID(): SealerID;
-    currentSealerSecret(): SealerSecret;
-}
-/** @hidden */
-export declare class AnonymousControlledAccount implements GeneralizedControlledAccount {
-    agentSecret: AgentSecret;
-    constructor(agentSecret: AgentSecret);
-    get id(): AgentID;
-    currentAgentID(): AgentID;
-    currentSignerID(): SignerID;
-    currentSignerSecret(): SignerSecret;
-    currentSealerID(): SealerID;
-    currentSealerSecret(): SealerSecret;
-}
-export type AccountContent = {
-    profile: Profile;
-} & GroupContent;
-export type AccountMeta = {
-    type: "account";
-};
-export type Account = CoMap<AccountContent, AccountMeta>;
-export type AccountID = CoID<Account>;
-export declare function isAccountID(id: AccountID | AgentID): id is AccountID;
-export type ProfileContent = {
-    name: string;
-};
-export type ProfileMeta = {
-    type: "profile";
-};
-export type Profile = CoMap<ProfileContent, ProfileMeta>;

package/dist/account.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAMH,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,gBAAgB,EAChB,oBAAoB,GACvB,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,KAAK,EAAgB,MAAM,YAAY,CAAC;AAEjD,MAAM,UAAU,kCAAkC,CAC9C,WAAwB;IAExB,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACtC,OAAO;QACH,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;QAC/C,IAAI,EAAE;YACF,IAAI,EAAE,SAAS;SAClB;QACD,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;KACnB,CAAC;AACN,CAAC;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IACnC,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,aAAa,CAAC,EAAe,CAAC;IAC9C,CAAC;IAED,iBAAiB;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa;aAC5B,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,CAAC,EAAgB,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAE1D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CACX,6CAA6C,GAAG,MAAM,CAAC,MAAM,CAChE,CAAC;SACL;QAED,OAAO,MAAM,CAAC,CAAC,CAAE,CAAC;IACtB,CAAC;CACJ;AAaD,cAAc;AACd,MAAM,OAAO,iBACT,SAAQ,YAAY;IAKpB,YACI,WAAwB,EACxB,QAA4C,EAC5C,IAAe;QAEf,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,cAAc;QACV,OAAO,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,eAAe;QACX,OAAO,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,mBAAmB;QACf,OAAO,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,eAAe;QACX,OAAO,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,mBAAmB;QACf,OAAO,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACJ;AAED,cAAc;AACd,MAAM,OAAO,0BAA0B;IAKnC,YAAY,WAAwB;QAChC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,EAAE;QACF,OAAO,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,cAAc;QACV,OAAO,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,eAAe;QACX,OAAO,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,mBAAmB;QACf,OAAO,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,eAAe;QACX,OAAO,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,mBAAmB;QACf,OAAO,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACJ;AAOD,MAAM,UAAU,WAAW,CAAC,EAAuB;IAC/C,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/dist/group.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../src/group.ts"],"names":[],"mappings":"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"}