@xyo-network/api 2.32.1 → 2.33.0-rc.10

package/dist/esm/Archivist/RemoteArchivistError.d.ts

@@ -0,0 +1,6 @@
+export declare class RemoteArchivistError extends Error {
+    constructor(action: string, error: Error['cause'], message?: string);
+    isRemoteArchivistError: boolean;
+    static isRemoteArchivistError(error: unknown): RemoteArchivistError | undefined;
+}
+//# sourceMappingURL=RemoteArchivistError.d.ts.map

package/dist/esm/Archivist/RemoteArchivistError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RemoteArchivistError.d.ts","sourceRoot":"","sources":["../../../src/Archivist/RemoteArchivistError.ts"],"names":[],"mappings":"AAAA,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM;IAGnE,sBAAsB,UAAO;IAC7B,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS;CAGhF"}

package/dist/esm/Archivist/RemoteArchivistError.js

@@ -0,0 +1,10 @@
+export class RemoteArchivistError extends Error {
+    constructor(action, error, message) {
+        super(`Remote Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error });
+    }
+    isRemoteArchivistError = true;
+    static isRemoteArchivistError(error) {
+        return error.isRemoteArchivistError ? error : undefined;
+    }
+}
+//# sourceMappingURL=RemoteArchivistError.js.map

package/dist/esm/Archivist/RemoteArchivistError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RemoteArchivistError.js","sourceRoot":"","sources":["../../../src/Archivist/RemoteArchivistError.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,MAAc,EAAE,KAAqB,EAAE,OAAgB;QACjE,KAAK,CAAC,qBAAqB,MAAM,WAAW,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IACjG,CAAC;IACD,sBAAsB,GAAG,IAAI,CAAA;IAC7B,MAAM,CAAC,sBAAsB,CAAC,KAAc;QAC1C,OAAQ,KAA8B,CAAC,sBAAsB,CAAC,CAAC,CAAE,KAA8B,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7G,CAAC;CACF"}

package/dist/esm/Archivist/XyoRemoteArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoRemoteArchivist.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA+B,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AACxG,OAAO,EAAE,eAAe,EAAyD,MAAM,2BAA2B,CAAA;AAClH,OAAO,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAQrE,uFAAuF;AACvF,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,wBAAwB,CAAC;IAC5E,IAAW,GAAG,oCAEb;IAEe,OAAO;IAIvB,IAAW,OAAO,uBAEjB;IAEY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE;;;;;;IAgBpB,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IA+BxD,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAejG"}
+{"version":3,"file":"XyoRemoteArchivist.d.ts","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA+B,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AACxG,OAAO,EAAE,eAAe,EAAkF,MAAM,2BAA2B,CAAA;AAC3I,OAAO,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAA;AAGpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,uFAAuF;AACvF,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,wBAAwB,CAAC;IAC5E,IAAW,GAAG,oCAEb;IAEe,OAAO;IAIvB,IAAW,OAAO,uBAEjB;IAEY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE;;;;;;IAoBpB,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IA2BxD,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAmBjG"}

package/dist/esm/Archivist/XyoRemoteArchivist.js

@@ -2,11 +2,7 @@ import { assertEx } from '@xylabs/sdk-js';
 import { XyoArchivist, XyoArchivistFindQuerySchema } from '@xyo-network/archivist';
 import { XyoBoundWitnessSchema } from '@xyo-network/boundwitness';
 import { XyoPayloadWrapper } from '@xyo-network/payload';
-class RemoteArchivistError extends Error {
-    constructor(action, error, message) {
-        super(`Remote Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error });
-    }
-}
+import { RemoteArchivistError } from './RemoteArchivistError';
 /** @description Archivist Context that connects to a remote archivist using the API */
 export class XyoRemoteArchivist extends XyoArchivist {
     get api() {
@@ -21,14 +17,18 @@ export class XyoRemoteArchivist extends XyoArchivist {
     async get(hashes) {
         return await Promise.all(hashes.map(async (hash) => {
             try {
-                const [payloads, { error }] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
-                if (error?.length) {
-                    throw new RemoteArchivistError('get', error);
+                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}]`);
+                }
+                if (response?.error?.length) {
+                    throw new RemoteArchivistError('get', response?.error);
                 }
                 return payloads?.pop() ?? null;
             }
             catch (ex) {
-                throw new RemoteArchivistError('get', ex, 'unexpected');
+                console.error(ex);
+                throw ex;
             }
         }));
     }
@@ -42,25 +42,21 @@ export class XyoRemoteArchivist extends XyoArchivist {
                         return boundwitness.payload_hashes.includes(hash);
                     });
             });
-            payloads.forEach((payload) => {
-                let found = false;
-                const hash = new XyoPayloadWrapper(payload).hash;
-                boundwitnesses.forEach((boundwitnesses) => {
-                    if (boundwitnesses.payload_hashes.includes(hash)) {
-                        found = true;
-                    }
-                });
-                assertEx(found, 'Payload not in Boundwitness received');
-            });
-            const boundwitness = this.bindPayloads(payloads);
-            const [, { error }] = await this.api.archive(this.archive).block.post([boundwitness, ...boundwitnesses], 'tuple');
-            if (error?.length) {
-                throw new RemoteArchivistError('insert', error);
+            const [boundwitness] = await this.bindPayloads(payloads);
+            const bwWithMeta = { ...boundwitness, _payloads: payloads };
+            const bwResult = await this.api.archive(this.archive).block.post([bwWithMeta], 'tuple');
+            const [, response, error] = bwResult;
+            if (error?.status >= 400) {
+                throw new RemoteArchivistError('insert', `${error.statusText} [${error.status}]`);
+            }
+            if (response?.error?.length) {
+                throw new RemoteArchivistError('insert', response?.error);
             }
             return boundwitness;
         }
         catch (ex) {
-            throw new RemoteArchivistError('insert', ex, 'unexpected');
+            console.error(ex);
+            throw ex;
         }
     }
     async find(filter) {
@@ -69,14 +65,18 @@ export class XyoRemoteArchivist extends XyoArchivist {
             if (payloadError?.length) {
                 throw new RemoteArchivistError('find', payloadError, 'payloads');
             }
-            const [blocks = [], { error: blockError }] = await this.api.archive(this.archive).block.find(filter, 'tuple');
-            if (blockError?.length) {
-                throw new RemoteArchivistError('find', blockError, 'blocks');
+            const [blocks = [], response, error] = await this.api.archive(this.archive).block.find(filter, 'tuple');
+            if (error?.status >= 400) {
+                throw new RemoteArchivistError('find', `${error.statusText} [${error.status}]`);
+            }
+            if (response?.error?.length) {
+                throw new RemoteArchivistError('find', response?.error);
             }
             return payloads.concat(blocks);
         }
         catch (ex) {
-            throw new RemoteArchivistError('find', ex, 'unexpected');
+            console.error(ex);
+            throw ex;
         }
     }
 }

package/dist/esm/Archivist/XyoRemoteArchivist.js.map

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

package/package.json

@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.7",
-    "@xyo-network/account": "^2.32.1",
-    "@xyo-network/archivist": "^2.32.1",
-    "@xyo-network/boundwitness": "^2.32.1",
-    "@xyo-network/core": "^2.32.1",
-    "@xyo-network/payload": "^2.32.1",
-    "@xyo-network/schema-payload-plugin": "^2.32.1",
+    "@xyo-network/account": "^2.33.0-rc.10",
+    "@xyo-network/archivist": "^2.33.0-rc.10",
+    "@xyo-network/boundwitness": "^2.33.0-rc.10",
+    "@xyo-network/core": "^2.33.0-rc.10",
+    "@xyo-network/payload": "^2.33.0-rc.10",
+    "@xyo-network/schema-payload-plugin": "^2.33.0-rc.10",
     "axios": "^0.27.2",
     "pako": "^2.0.4",
     "tslib": "^2.4.0"
@@ -57,5 +57,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.32.1"
+  "version": "2.33.0-rc.10",
+  "stableVersion": "2.32.1"
 }

package/src/Archivist/RemoteArchivistError.ts

@@ -0,0 +1,9 @@
+export class RemoteArchivistError extends Error {
+  constructor(action: string, error: Error['cause'], message?: string) {
+    super(`Remote Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
+  }
+  isRemoteArchivistError = true
+  static isRemoteArchivistError(error: unknown): RemoteArchivistError | undefined {
+    return (error as RemoteArchivistError).isRemoteArchivistError ? (error as RemoteArchivistError) : undefined
+  }
+}

package/src/Archivist/XyoRemoteArchivist.spec.ts

@@ -0,0 +1,28 @@
+import { XyoPayloadWrapper } from '@xyo-network/payload'
+
+import { XyoApiConfig } from '../models'
+import { XyoArchivistApi } from './Api'
+import { XyoRemoteArchivist } from './XyoRemoteArchivist'
+import { XyoRemoteArchivistConfigSchema } from './XyoRemoteArchivistConfig'
+
+const configData: XyoApiConfig = {
+  apiDomain: process.env.API_DOMAIN || 'https://beta.api.archivist.xyo.network',
+  onError: (error) => console.error(`Error: ${JSON.stringify(error)}`),
+  onFailure: (response) => response, //console.error(`Failure: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
+  onSuccess: (response) => response, //console.log(`Success: ${response.statusText} [${response.status}] [${JSON.stringify(response.data)}]`),
+}
+
+test('XyoRemoteArchivist', async () => {
+  const api = new XyoArchivistApi(configData)
+  const archivist = new XyoRemoteArchivist({ api, schema: XyoRemoteArchivistConfigSchema })
+  const payload = {
+    salt: `${Math.random() * 10000}`,
+    schema: 'network.xyo.id',
+  }
+  const result = await archivist.insert([payload])
+  expect(result.payload_hashes.length).toBe(1)
+  const getResult = await archivist.get([new XyoPayloadWrapper(payload).hash])
+  console.log(`getResult: ${JSON.stringify(getResult)}`)
+  expect(getResult.length).toBe(1)
+  expect(getResult[0]?.schema).toBe(payload.schema)
+})

package/src/Archivist/XyoRemoteArchivist.ts

@@ -1,16 +1,11 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoArchivist, XyoArchivistFindQuerySchema, XyoPayloadFindFilter } from '@xyo-network/archivist'
-import { XyoBoundWitness, XyoBoundWitnessSchema, XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
+import { XyoBoundWitness, XyoBoundWitnessSchema, XyoBoundWitnessWithMeta, XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
 
+import { RemoteArchivistError } from './RemoteArchivistError'
 import { XyoRemoteArchivistConfig } from './XyoRemoteArchivistConfig'
 
-class RemoteArchivistError extends Error {
-  constructor(action: string, error: Error['cause'], message?: string) {
-    super(`Remote Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
-  }
-}
-
 /** @description Archivist Context that connects to a remote archivist using the API */
 export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
   public get api() {
@@ -29,13 +24,17 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
     return await Promise.all(
       hashes.map(async (hash) => {
         try {
-          const [payloads, { error }] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
-          if (error?.length) {
-            throw new RemoteArchivistError('get', error)
+          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}]`)
+          }
+          if (response?.error?.length) {
+            throw new RemoteArchivistError('get', response?.error)
           }
           return payloads?.pop() ?? null
         } catch (ex) {
-          throw new RemoteArchivistError('get', ex, 'unexpected')
+          console.error(ex)
+          throw ex
         }
       }),
     )
@@ -51,24 +50,20 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
             return boundwitness.payload_hashes.includes(hash)
           })
       })
-      payloads.forEach((payload) => {
-        let found = false
-        const hash = new XyoPayloadWrapper(payload).hash
-        boundwitnesses.forEach((boundwitnesses) => {
-          if (boundwitnesses.payload_hashes.includes(hash)) {
-            found = true
-          }
-        })
-        assertEx(found, 'Payload not in Boundwitness received')
-      })
-      const boundwitness = this.bindPayloads(payloads)
-      const [, { error }] = await this.api.archive(this.archive).block.post([boundwitness, ...boundwitnesses], 'tuple')
-      if (error?.length) {
-        throw new RemoteArchivistError('insert', error)
+      const [boundwitness] = await this.bindPayloads(payloads)
+      const bwWithMeta: Partial<XyoBoundWitnessWithMeta> & XyoBoundWitness = { ...boundwitness, _payloads: payloads }
+      const bwResult = await this.api.archive(this.archive).block.post([bwWithMeta], 'tuple')
+      const [, response, error] = bwResult
+      if (error?.status >= 400) {
+        throw new RemoteArchivistError('insert', `${error.statusText} [${error.status}]`)
+      }
+      if (response?.error?.length) {
+        throw new RemoteArchivistError('insert', response?.error)
       }
       return boundwitness
     } catch (ex) {
-      throw new RemoteArchivistError('insert', ex, 'unexpected')
+      console.error(ex)
+      throw ex
     }
   }
 
@@ -78,13 +73,17 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
       if (payloadError?.length) {
         throw new RemoteArchivistError('find', payloadError, 'payloads')
       }
-      const [blocks = [], { error: blockError }] = await this.api.archive(this.archive).block.find(filter, 'tuple')
-      if (blockError?.length) {
-        throw new RemoteArchivistError('find', blockError, 'blocks')
+      const [blocks = [], response, error] = await this.api.archive(this.archive).block.find(filter, 'tuple')
+      if (error?.status >= 400) {
+        throw new RemoteArchivistError('find', `${error.statusText} [${error.status}]`)
+      }
+      if (response?.error?.length) {
+        throw new RemoteArchivistError('find', response?.error)
       }
       return payloads.concat(blocks) as R[]
     } catch (ex) {
-      throw new RemoteArchivistError('find', ex, 'unexpected')
+      console.error(ex)
+      throw ex
     }
   }
 }