@xyo-network/diviner 2.32.0 → 2.32.1

package/dist/esm/Payload/Archivist/Diviner.d.ts

@@ -1,11 +1,11 @@
 import { Archivist, XyoArchivist } from '@xyo-network/archivist';
-import { PartialModuleConfig } from '@xyo-network/module';
+import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
 export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-    protected readonly archivist: Archivist;
-    constructor(config: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist);
+    protected readonly archivist?: Archivist;
+    constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist, resolver?: XyoModuleResolverFunc);
     queries(): import("../../Queries").XyoDivinerQuerySchema[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }

package/dist/esm/Payload/Archivist/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAmD,MAAM,wBAAwB,CAAA;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;IAC7G,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;gBAE3B,MAAM,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,YAAY;IAU1F,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAQxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAmD,MAAM,wBAAwB,CAAA;AACjH,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;IAC7G,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAA;gBAE5B,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAS7H,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}

package/dist/esm/Payload/Archivist/Diviner.js

@@ -8,14 +8,12 @@ import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfigSchema } from './Config';
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     archivist;
-    constructor(config, archivist) {
-        super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema });
-        if (archivist) {
-            this.archivist = new XyoArchivistWrapper(archivist);
-        }
-        else {
-            const resolvedArchivist = this.resolver?.(assertEx(config.archivist, 'No archivist specified'));
-            this.archivist = new XyoArchivistWrapper(assertEx(resolvedArchivist, 'Unable to resolve archivist'));
+    constructor(config, archivist, resolver) {
+        super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema }, undefined, resolver);
+        const configArchivistAddress = config?.archivist;
+        const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) : null);
+        if (resolvedArchivist) {
+            this.archivist = new XyoArchivistWrapper(resolvedArchivist);
         }
     }
     queries() {
@@ -24,8 +22,12 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     async divine(payloads) {
         const huriPayload = assertEx(payloads?.find((payload) => payload?.schema === XyoHuriSchema));
         const huriObj = new Huri(huriPayload.huri);
-        const [[, [payload = null]]] = await profile(async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }));
-        return payload ?? null;
+        const activeArchvist = this.archivist;
+        if (activeArchvist) {
+            const [[, [payload = null]]] = await profile(async () => await activeArchvist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }));
+            return payload ?? null;
+        }
+        return null;
     }
 }
 //# sourceMappingURL=Diviner.js.map

package/dist/esm/Payload/Archivist/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA2B,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEjH,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC1F,SAAS,CAAW;IAEvC,YAAY,MAA6D,EAAE,SAAwB;QACjG,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC,CAAA;QACpE,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SACpD;aAAM;YACL,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAA;YAC/F,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,EAAE,6BAA6B,CAAC,CAAC,CAAA;SACrG;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;QACD,OAAO,OAAO,IAAI,IAAI,CAAA;IACxB,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA2B,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEjH,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC1F,SAAS,CAAY;IAExC,YAAY,MAA8D,EAAE,SAAwB,EAAE,QAAgC;QACpI,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,EAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GAAG,SAAS,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAChH,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAA;SAC5D;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAA;QACrC,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;YACD,OAAO,OAAO,IAAI,IAAI,CAAA;SACvB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/package.json

@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/archivist": "^2.32.0",
-    "@xyo-network/module": "^2.32.0",
-    "@xyo-network/payload": "^2.32.0",
-    "@xyo-network/promisable": "^2.32.0",
+    "@xyo-network/archivist": "^2.32.1",
+    "@xyo-network/module": "^2.32.1",
+    "@xyo-network/payload": "^2.32.1",
+    "@xyo-network/promisable": "^2.32.1",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -50,5 +50,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.32.0"
+  "version": "2.32.1"
 }

package/src/Payload/Archivist/Diviner.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { Archivist, XyoArchivist, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
-import { PartialModuleConfig } from '@xyo-network/module'
+import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
 import { XyoDivinerDivineQuerySchema } from '../../Queries'
@@ -10,15 +10,14 @@ import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config'
 
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-  protected readonly archivist: Archivist
+  protected readonly archivist?: Archivist
 
-  constructor(config: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist) {
-    super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema })
-    if (archivist) {
-      this.archivist = new XyoArchivistWrapper(archivist)
-    } else {
-      const resolvedArchivist = this.resolver?.(assertEx(config.archivist, 'No archivist specified'))
-      this.archivist = new XyoArchivistWrapper(assertEx(resolvedArchivist, 'Unable to resolve archivist'))
+  constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist, resolver?: XyoModuleResolverFunc) {
+    super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema }, undefined, resolver)
+    const configArchivistAddress = config?.archivist
+    const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) : null)
+    if (resolvedArchivist) {
+      this.archivist = new XyoArchivistWrapper(resolvedArchivist)
     }
   }
 
@@ -29,9 +28,13 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, Xy
   public async divine(payloads?: XyoPayloads): Promise<XyoPayload | null> {
     const huriPayload = assertEx(payloads?.find((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriSchema))
     const huriObj = new Huri(huriPayload.huri)
-    const [[, [payload = null]]] = await profile(
-      async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }),
-    )
-    return payload ?? null
+    const activeArchvist = this.archivist
+    if (activeArchvist) {
+      const [[, [payload = null]]] = await profile(
+        async () => await activeArchvist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }),
+      )
+      return payload ?? null
+    }
+    return null
   }
 }