@xyo-network/node 2.45.0 → 2.46.0

package/src/spec/MemoryNode.spec.ts

@@ -15,6 +15,7 @@ import { Account, PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchem
 
 import { NodeConfigSchema } from '../Config'
 import { MemoryNode } from '../MemoryNode'
+import { NodeWrapper } from '../NodeWrapper'
 
 describe('MemoryNode', () => {
   const testAccount1 = new Account({ phrase: 'testPhrase1' })
@@ -35,12 +36,10 @@ describe('MemoryNode', () => {
       const diviner: AbstractModule = await ArchivistPayloadDiviner.create({
         config: { archivist: archivist.address, schema: XyoArchivistPayloadDivinerConfigSchema },
       })
-      node.register(archivist)
-      node.attach(archivist.address)
-      node.register(diviner)
-      node.attach(diviner.address)
-      expect((await node.registered()).length).toBe(2)
-      expect((await node.attached()).length).toBe(2)
+      await node.register(archivist).attach(archivist.address, true)
+      await node.register(diviner).attach(diviner.address, true)
+      expect(node.registered()).toBeArrayOfSize(2)
+      expect(await node.attached()).toBeArrayOfSize(2)
       const foundArchivist = (await node.resolve({ address: [archivist.address] })).shift()
       expect(foundArchivist).toBeDefined()
       expect(foundArchivist?.address).toBe(archivist.address)
@@ -145,17 +144,34 @@ describe('MemoryNode', () => {
       module = await MemoryArchivist.create()
       node.register(module)
     })
-    it('attaches module', () => {
-      node.attach(module.address)
+    it('attaches module', async () => {
+      await node.attach(module.address, true)
     })
-    it('emits event on module attach', (done) => {
-      node.on('moduleAttached', (args) => {
-        expect(args.module).toBeObject()
-        expect(args.module.address).toBe(module.address)
-        expect(args.module).toBe(module)
-        done()
+    it('emits event on module attach', async () => {
+      let attachDone = false
+      let eventDone = false
+      return await new Promise<void>((resolve, reject) => {
+        node.on('moduleAttached', (args) => {
+          expect(args.module).toBeObject()
+          expect(args.module.address).toBe(module.address)
+          expect(args.module).toBe(module)
+          eventDone = true
+          if (attachDone) {
+            resolve()
+          }
+        })
+        node
+          .attach(module.address, true)
+          .then(() => {
+            attachDone = true
+            if (eventDone) {
+              resolve()
+            }
+          })
+          .catch(() => {
+            reject('Attach failed')
+          })
       })
-      node.attach(module.address)
     })
   })
   describe('attached', () => {
@@ -171,11 +187,8 @@ describe('MemoryNode', () => {
       })
     })
     describe('with modules attached', () => {
-      beforeEach(() => {
-        node.attach(module.address)
-      })
       it('lists addresses of attached modules', async () => {
-        node.attach(module.address)
+        await node.attach(module.address, true)
         const result = await node.attached()
         expect(result).toBeArrayOfSize(1)
         expect(result).toEqual([module.address])
@@ -187,7 +200,7 @@ describe('MemoryNode', () => {
     beforeEach(async () => {
       module = await MemoryArchivist.create()
       node.register(module)
-      node.attach(module.address)
+      await node.attach(module.address, true)
     })
     it('deregisters existing module', () => {
       node.detach(module.address)
@@ -236,12 +249,14 @@ describe('MemoryNode', () => {
     }
     describe('node without child modules', () => {
       it('describes node alone', async () => {
-        const description = await node.description()
+        const wrapper = NodeWrapper.wrap(node)
+        const description = await wrapper.describe()
         validateModuleDescription(description)
         expect(description.children).toBeArrayOfSize(0)
       })
       it('serializes to JSON consistently', async () => {
-        const description = await node.description()
+        const wrapper = NodeWrapper.wrap(node)
+        const description = await wrapper.describe()
         expect(prettyPrintDescription(description)).toMatchSnapshot()
       })
     })
@@ -251,19 +266,21 @@ describe('MemoryNode', () => {
           await MemoryArchivist.create({ account: testAccount2, config: archivistConfig }),
           await MemoryArchivist.create({ account: testAccount3, config: archivistConfig }),
         ])
-        modules.map((mod) => {
+        modules.map(async (mod) => {
           node.register(mod)
-          node.attach(mod.address)
+          await node.attach(mod.address, true)
         })
       })
       it('describes node and child modules', async () => {
-        const description = await node.description()
+        const wrapper = NodeWrapper.wrap(node)
+        const description = await wrapper.describe()
         validateModuleDescription(description)
         expect(description.children).toBeArrayOfSize(2)
         description.children?.map(validateModuleDescription)
       })
       it('serializes to JSON consistently', async () => {
-        const description = await node.description()
+        const wrapper = NodeWrapper.wrap(node)
+        const description = await wrapper.describe()
         expect(prettyPrintDescription(description)).toMatchSnapshot()
       })
     })
@@ -271,25 +288,32 @@ describe('MemoryNode', () => {
       beforeEach(async () => {
         const nestedNode = await MemoryNode.create({ account: testAccount2, config: nodeConfig })
         const nestedModules = await Promise.all([await MemoryArchivist.create({ account: testAccount3, config: archivistConfig })])
-        nestedModules.map((mod) => {
+        nestedModules.map(async (mod) => {
           nestedNode.register(mod)
-          nestedNode.attach(mod.address)
+          await nestedNode.attach(mod.address, true)
         })
         const rootModules: AbstractModule[] = await Promise.all([await MemoryArchivist.create({ account: testAccount4, config: archivistConfig })])
         rootModules.push(nestedNode)
-        rootModules.map((mod) => {
+        rootModules.map(async (mod) => {
           node.register(mod)
-          node.attach(mod.address)
+          await node.attach(mod.address, true)
         })
       })
       it('describes node and all nested nodes and child modules', async () => {
-        const description = await node.description()
+        const memoryNode = await MemoryNode.create()
+        const archivist1 = await MemoryArchivist.create()
+        const archivist2 = await MemoryArchivist.create()
+        const wrapper = NodeWrapper.wrap(memoryNode)
+        await memoryNode.register(archivist1).attach(archivist1.address, true)
+        await memoryNode.register(archivist2).attach(archivist2.address, true)
+        const description = await wrapper.describe()
         validateModuleDescription(description)
         expect(description.children).toBeArrayOfSize(2)
         description.children?.map(validateModuleDescription)
       })
       it('serializes to JSON consistently', async () => {
-        const description = await node.description()
+        const wrapper = NodeWrapper.wrap(node)
+        const description = await wrapper.describe()
         expect(prettyPrintDescription(description)).toMatchSnapshot()
       })
     })
@@ -304,7 +328,7 @@ describe('MemoryNode', () => {
       const config = response.find((p) => p.schema === mod.config.schema)
       expect(config).toBeObject()
       expect(config).toEqual(mod.config)
-      const queries = response.filter((p) => mod.queries().includes(p.schema))
+      const queries = response.filter((p) => mod.queries.includes(p.schema))
       expect(queries.length).toBeGreaterThanOrEqual(0)
       queries.map((query) => {
         expect(query).toBeObject()
@@ -318,19 +342,22 @@ describe('MemoryNode', () => {
     })
     describe('node with child modules', () => {
       it('describes node and child modules', async () => {
+        const memoryNode = await MemoryNode.create()
         const modules = await Promise.all([
           await MemoryArchivist.create({ account: testAccount2, config: archivistConfig }),
           await MemoryArchivist.create({ account: testAccount3, config: archivistConfig }),
         ])
-        modules.map((mod) => {
-          node.register(mod)
-          node.attach(mod.address)
-        })
-        const description = await node.discover()
-        validateDiscoveryResponse(node, description)
-        const address0 = description.find((p) => p.schema === AddressSchema && (p as AddressPayload).address === modules[0].address) as AddressPayload
+        await Promise.all(
+          modules.map(async (mod) => {
+            memoryNode.register(mod)
+            await memoryNode.attach(mod.address, true)
+          }),
+        )
+        const discover = await memoryNode.discover()
+
+        const address0 = discover.find((p) => p.schema === AddressSchema && (p as AddressPayload).address === modules[0].address) as AddressPayload
         expect(address0).toBeObject()
-        const address1 = description.find((p) => p.schema === AddressSchema && (p as AddressPayload).address === modules[1].address) as AddressPayload
+        const address1 = discover.find((p) => p.schema === AddressSchema && (p as AddressPayload).address === modules[1].address) as AddressPayload
         expect(address1).toBeObject()
       })
     })
@@ -338,15 +365,15 @@ describe('MemoryNode', () => {
       beforeEach(async () => {
         const nestedNode = await MemoryNode.create({ account: testAccount2, config: nodeConfig })
         const nestedModules = await Promise.all([await MemoryArchivist.create({ account: testAccount3, config: archivistConfig })])
-        nestedModules.map((mod) => {
+        nestedModules.map(async (mod) => {
           nestedNode.register(mod)
-          nestedNode.attach(mod.address)
+          await nestedNode.attach(mod.address, true)
         })
         const rootModules: AbstractModule[] = await Promise.all([await MemoryArchivist.create({ account: testAccount4, config: archivistConfig })])
         rootModules.push(nestedNode)
-        rootModules.map((mod) => {
+        rootModules.map(async (mod) => {
           node.register(mod)
-          node.attach(mod.address)
+          await node.attach(mod.address, true)
         })
       })
       it('describes node and all nested nodes and child modules', async () => {
@@ -361,9 +388,9 @@ describe('MemoryNode', () => {
         await MemoryArchivist.create({ account: testAccount2, config: archivistConfig }),
         await MemoryArchivist.create({ account: testAccount3, config: archivistConfig }),
       ])
-      modules.map((mod) => {
+      modules.map(async (mod) => {
         node.register(mod)
-        node.attach(mod.address)
+        await node.attach(mod.address, true)
       })
     })
     it('resolves modules wrapped as the specified type', async () => {

package/src/spec/__snapshots__/MemoryNode.spec.ts.snap

@@ -79,22 +79,20 @@ exports[`MemoryNode description node with nested nodes and modules serializes to
         "network.xyo.query.node.registered",
         "network.xyo.query.module.discover",
         "network.xyo.query.module.subscribe"
-      ],
-      "children": [
-        {
-          "address": "ca2e94ac3ae1084072b3a4407881bf940dc2019c",
-          "queries": [
-            "network.xyo.query.archivist.all",
-            "network.xyo.query.archivist.delete",
-            "network.xyo.query.archivist.clear",
-            "network.xyo.query.archivist.find",
-            "network.xyo.query.archivist.insert",
-            "network.xyo.query.archivist.commit",
-            "network.xyo.query.archivist.get",
-            "network.xyo.query.module.discover",
-            "network.xyo.query.module.subscribe"
-          ]
-        }
+      ]
+    },
+    {
+      "address": "ca2e94ac3ae1084072b3a4407881bf940dc2019c",
+      "queries": [
+        "network.xyo.query.archivist.all",
+        "network.xyo.query.archivist.delete",
+        "network.xyo.query.archivist.clear",
+        "network.xyo.query.archivist.find",
+        "network.xyo.query.archivist.insert",
+        "network.xyo.query.archivist.commit",
+        "network.xyo.query.archivist.get",
+        "network.xyo.query.module.discover",
+        "network.xyo.query.module.subscribe"
       ]
     }
   ]