@xyo-network/api 2.41.2 → 2.41.4

package/src/Archivist/XyoRemoteArchivist.spec.ts

@@ -13,21 +13,41 @@ const configData: XyoApiConfig = {
   onSuccess: (response) => response, //console.log(`Success: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
 }
 
-test('XyoRemoteArchivist', async () => {
-  const api = new XyoArchivistApi(configData)
-  const archivist = await XyoRemoteArchivist.create({ config: { api, schema: XyoRemoteArchivistConfigSchema } })
-  const payload = {
-    salt: `${Math.random() * 10000}`,
-    schema: 'network.xyo.id',
-  }
-  const result = (await archivist.insert([payload])).pop()
-  expect(result?.payload_hashes.length).toBe(1)
-  const getResult = await archivist.get([new PayloadWrapper(payload).hash])
-  console.log(`getResult: ${JSON.stringify(getResult)}`)
-  expect(getResult.length).toBe(1)
-  expect(getResult[0]?.schema).toBe(payload.schema)
-
-  const wrapper = new XyoArchivistWrapper(archivist)
-  const findResult = await wrapper.find()
-  expect(findResult.length).toBe(20)
+const payload = {
+  salt: `${Math.random() * 10000}`,
+  schema: 'network.xyo.id',
+}
+
+describe('XyoRemoteArchivist', () => {
+  let archivist: XyoRemoteArchivist
+  let wrapper: XyoArchivistWrapper
+
+  beforeEach(async () => {
+    const api = new XyoArchivistApi(configData)
+    archivist = await XyoRemoteArchivist.create({ config: { api, schema: XyoRemoteArchivistConfigSchema } })
+    wrapper = new XyoArchivistWrapper(archivist)
+  })
+
+  it('get return payloads', async () => {
+    const result = (await archivist.insert([payload])).pop()
+    expect(result?.payload_hashes.length).toBe(1)
+    const getResult = await archivist.get([new PayloadWrapper(payload).hash])
+    expect(getResult.length).toBe(1)
+    expect(getResult[0]?.schema).toBe(payload.schema)
+
+    const findResult = await wrapper.find()
+    expect(findResult.length).toBe(20)
+  })
+
+  it('get returns boundwitness', async () => {
+    const payload = {
+      payload_hashes: ['123456'],
+      payload_schemas: ['network.xyo.id'],
+      schema: 'network.xyo.boundwitness',
+    }
+
+    await archivist.insert([payload])
+    const getResult = await archivist.get([new PayloadWrapper(payload).hash])
+    expect(getResult?.[0].schema).toBe('network.xyo.boundwitness')
+  })
 })

package/src/Archivist/XyoRemoteArchivist.ts

@@ -69,14 +69,21 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
       await Promise.all(
         hashes.map(async (hash) => {
           try {
-            const [payloads, response, error] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
-            if (error?.status >= 400) {
-              throw new RemoteArchivistError('get', `${error.statusText} [${error.status}]`)
+            const [payloads = [], payloadEnvelope, payloadResponse] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
+            if (payloadResponse?.status >= 400) {
+              throw new RemoteArchivistError('get', `Invalid payload status [${payloadResponse.status}]`, 'payloads')
             }
-            if (response?.error?.length) {
-              throw new RemoteArchivistError('get', response?.error)
+            if (payloadEnvelope?.error?.length) {
+              throw new RemoteArchivistError('get', payloadEnvelope.error.shift(), 'payloads')
             }
-            return payloads?.pop()
+            const [blocks = [], blockEnvelope, blockResponse] = await this.api.archive(this.archive).block.hash(hash).get('tuple')
+            if (blockResponse?.status >= 400) {
+              throw new RemoteArchivistError('get', `Invalid block status [${blockResponse.status}]`, 'payloads')
+            }
+            if (blockEnvelope?.error?.length) {
+              throw new RemoteArchivistError('get', blockEnvelope.error.shift(), 'blocks')
+            }
+            return payloads?.[0] ?? blocks?.[0]
           } catch (ex) {
             console.error(ex)
             throw ex