@xyo-network/location-payload-plugin 2.25.4 → 2.26.1

package/dist/esm/Plugin.d.ts

@@ -1,5 +1,6 @@
-import { XyoPayloadPluginFunc } from '@xyo-network/payload-plugin';
+import { XyoPayloadPluginConfig, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin';
 import { XyoLocationPayload } from './Payload';
 import { XyoLocationPayloadSchema } from './Schema';
-export declare const XyoLocationPayloadPlugin: XyoPayloadPluginFunc<XyoLocationPayloadSchema, XyoLocationPayload>;
+import { XyoLocationWitnessConfig } from './Witness';
+export declare const XyoLocationPayloadPlugin: XyoPayloadPluginFunc<XyoLocationPayloadSchema, XyoLocationPayload, XyoPayloadPluginConfig<XyoLocationWitnessConfig>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/esm/Plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAE1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAInD,eAAO,MAAM,wBAAwB,EAAE,oBAAoB,CAAC,wBAAwB,EAAE,kBAAkB,CAQpG,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElH,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,OAAO,EAAsB,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAExE,eAAO,MAAM,wBAAwB,EAAE,oBAAoB,CACzD,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,CAAC,wBAAwB,CAAC,CAS9C,CAAA"}

package/dist/esm/Plugin.js

@@ -1,13 +1,14 @@
+import { assertEx } from '@xylabs/assert';
 import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
 import { XyoLocationPayloadSchema } from './Schema';
 import { XyoLocationPayloadTemplate } from './Template';
 import { XyoLocationWitness } from './Witness';
-export const XyoLocationPayloadPlugin = () => createXyoPayloadPlugin({
+export const XyoLocationPayloadPlugin = (config) => createXyoPayloadPlugin({
     auto: true,
     schema: XyoLocationPayloadSchema,
     template: XyoLocationPayloadTemplate,
     witness: () => {
-        return new XyoLocationWitness();
+        return new XyoLocationWitness(assertEx(config?.witness, 'Missing config'));
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAwB,MAAM,6BAA6B,CAAA;AAG1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE9C,MAAM,CAAC,MAAM,wBAAwB,GAAuE,GAAG,EAAE,CAC/G,sBAAsB,CAAC;IACrB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,wBAAwB;IAChC,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,GAAuB,EAAE;QAChC,OAAO,IAAI,kBAAkB,EAAE,CAAA;IACjC,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAAgD,MAAM,6BAA6B,CAAA;AAGlH,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAA4B,MAAM,WAAW,CAAA;AAExE,MAAM,CAAC,MAAM,wBAAwB,GAIjC,CAAC,MAAO,EAAE,EAAE,CACd,sBAAsB,CAAC;IACrB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,wBAAwB;IAChC,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,GAAuB,EAAE;QAChC,OAAO,IAAI,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF,CAAC,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,11 +1,19 @@
-import { XyoSimpleWitness } from '@xyo-network/witness';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoWitness, XyoWitnessConfig, XyoWitnessQueryPayload } from '@xyo-network/witness';
 import { XyoLocationPayload } from './Payload';
 import { XyoLocationPayloadSchema } from './Schema';
-export declare class XyoLocationWitness extends XyoSimpleWitness<XyoLocationPayload> {
+export declare type XyoLocationWitnessConfig = XyoWitnessConfig<{
+    schema: 'network.xyo.location.config';
+    targetSchema: 'network.xyo.location';
+    geoLocation: Geolocation;
+}>;
+export declare class XyoLocationWitness extends XyoWitness<XyoLocationPayload> {
     private geoLocation;
-    constructor();
+    constructor(config: XyoLocationWitnessConfig);
     getCurrentPosition(): Promise<GeolocationPosition>;
-    observe(): Promise<XyoLocationPayload>;
+    observe(_fields: Partial<XyoLocationPayload>, _query?: XyoWitnessQueryPayload<XyoPayload<{
+        schema: string;
+    }>> | undefined): Promise<XyoLocationPayload>;
     static schema: XyoLocationPayloadSchema;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/esm/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAGnD,qBAAa,kBAAmB,SAAQ,gBAAgB,CAAC,kBAAkB,CAAC;IAC1E,OAAO,CAAC,WAAW,CAAa;;IAUzB,kBAAkB;IAaV,OAAO;IAkBtB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAA2B;CACnE"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,oBAAY,wBAAwB,GAAG,gBAAgB,CAAC;IACtD,MAAM,EAAE,6BAA6B,CAAA;IACrC,YAAY,EAAE,sBAAsB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAC,CAAA;AAEF,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,kBAAkB,CAAC;IACpE,OAAO,CAAC,WAAW,CAAa;gBACpB,MAAM,EAAE,wBAAwB;IAKrC,kBAAkB;IAaV,OAAO,CACpB,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACpC,MAAM,CAAC,EAAE,sBAAsB,CAAC,UAAU,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,GAAG,SAAS,GAC1E,OAAO,CAAC,kBAAkB,CAAC;IAmB9B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAA2B;CACnE"}

package/dist/esm/Witness.js

@@ -1,14 +1,10 @@
-import { XyoSimpleWitness } from '@xyo-network/witness';
+import { delay } from '@xylabs/delay';
+import { XyoWitness } from '@xyo-network/witness';
 import { XyoLocationPayloadSchema } from './Schema';
-import { XyoLocationPayloadTemplate } from './Template';
-export class XyoLocationWitness extends XyoSimpleWitness {
+export class XyoLocationWitness extends XyoWitness {
     geoLocation;
-    constructor() {
-        const template = XyoLocationPayloadTemplate();
-        super({
-            schema: template.schema,
-            template,
-        });
+    constructor(config) {
+        super(config);
         this.geoLocation = navigator.geolocation;
     }
     getCurrentPosition() {
@@ -20,9 +16,10 @@ export class XyoLocationWitness extends XyoSimpleWitness {
             });
         });
     }
-    async observe() {
+    async observe(_fields, _query) {
+        await delay(0);
         const location = await this.getCurrentPosition();
-        return await super.observe({
+        return {
             currentLocation: {
                 coords: {
                     accuracy: location.coords.accuracy,
@@ -35,7 +32,7 @@ export class XyoLocationWitness extends XyoSimpleWitness {
                 },
                 timestamp: location.timestamp,
             },
-        });
+        };
     }
     static schema = XyoLocationPayloadSchema;
 }

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AAEvD,MAAM,OAAO,kBAAmB,SAAQ,gBAAoC;IAClE,WAAW,CAAa;IAChC;QACE,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAA;QAC7C,KAAK,CAAC;YACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;IAC1C,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC,CAAC,QAA6B,EAAE,EAAE;gBAChC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnB,CAAC,EACD,CAAC,KAA+B,EAAE,EAAE;gBAClC,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAChD,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,eAAe,EAAE;gBACf,MAAM,EAAE;oBACN,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;oBAClC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;oBAC/C,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,IAAI,SAAS;oBAC/D,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS;oBAC7C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;oBAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;oBACpC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS;iBAC1C;gBACD,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B;SACF,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,MAAM,GAA6B,wBAAwB,CAAA"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,OAAO,EAAE,UAAU,EAA4C,MAAM,sBAAsB,CAAA;AAG3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAQnD,MAAM,OAAO,kBAAmB,SAAQ,UAA8B;IAC5D,WAAW,CAAa;IAChC,YAAY,MAAgC;QAC1C,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;IAC1C,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACjC,CAAC,QAA6B,EAAE,EAAE;gBAChC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnB,CAAC,EACD,CAAC,KAA+B,EAAE,EAAE;gBAClC,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,OAAO,CACpB,OAAoC,EACpC,MAA2E;QAE3E,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAChD,OAAO;YACL,eAAe,EAAE;gBACf,MAAM,EAAE;oBACN,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;oBAClC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;oBAC/C,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,IAAI,SAAS;oBAC/D,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,SAAS;oBAC7C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;oBAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;oBACpC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS;iBAC1C;gBACD,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B;SACoB,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,MAAM,GAA6B,wBAAwB,CAAA"}

package/package.json

@@ -10,13 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/payload": "^2.25.4",
-    "@xyo-network/payload-plugin": "^2.25.4",
-    "@xyo-network/witness": "^2.25.4",
+    "@xylabs/assert": "^2.6.6",
+    "@xylabs/delay": "^2.6.6",
+    "@xyo-network/payload": "^2.26.1",
+    "@xyo-network/payload-plugin": "^2.26.1",
+    "@xyo-network/witness": "^2.26.1",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@xylabs/tsconfig": "^2.5.98"
+    "@xylabs/tsconfig": "^2.5.118"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -51,5 +53,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.25.4"
+  "version": "2.26.1"
 }

package/src/Plugin.ts

@@ -1,16 +1,21 @@
-import { createXyoPayloadPlugin, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin'
+import { assertEx } from '@xylabs/assert'
+import { createXyoPayloadPlugin, XyoPayloadPluginConfig, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin'
 
 import { XyoLocationPayload } from './Payload'
 import { XyoLocationPayloadSchema } from './Schema'
 import { XyoLocationPayloadTemplate } from './Template'
-import { XyoLocationWitness } from './Witness'
+import { XyoLocationWitness, XyoLocationWitnessConfig } from './Witness'
 
-export const XyoLocationPayloadPlugin: XyoPayloadPluginFunc<XyoLocationPayloadSchema, XyoLocationPayload> = () =>
+export const XyoLocationPayloadPlugin: XyoPayloadPluginFunc<
+  XyoLocationPayloadSchema,
+  XyoLocationPayload,
+  XyoPayloadPluginConfig<XyoLocationWitnessConfig>
+> = (config?) =>
   createXyoPayloadPlugin({
     auto: true,
     schema: XyoLocationPayloadSchema,
     template: XyoLocationPayloadTemplate,
     witness: (): XyoLocationWitness => {
-      return new XyoLocationWitness()
+      return new XyoLocationWitness(assertEx(config?.witness, 'Missing config'))
     },
   })

package/src/Witness.ts

@@ -1,17 +1,20 @@
-import { XyoSimpleWitness } from '@xyo-network/witness'
+import { delay } from '@xylabs/delay'
+import { XyoPayload } from '@xyo-network/payload'
+import { XyoWitness, XyoWitnessConfig, XyoWitnessQueryPayload } from '@xyo-network/witness'
 
 import { XyoLocationPayload } from './Payload'
 import { XyoLocationPayloadSchema } from './Schema'
-import { XyoLocationPayloadTemplate } from './Template'
 
-export class XyoLocationWitness extends XyoSimpleWitness<XyoLocationPayload> {
+export type XyoLocationWitnessConfig = XyoWitnessConfig<{
+  schema: 'network.xyo.location.config'
+  targetSchema: 'network.xyo.location'
+  geoLocation: Geolocation
+}>
+
+export class XyoLocationWitness extends XyoWitness<XyoLocationPayload> {
   private geoLocation: Geolocation
-  constructor() {
-    const template = XyoLocationPayloadTemplate()
-    super({
-      schema: template.schema,
-      template,
-    })
+  constructor(config: XyoLocationWitnessConfig) {
+    super(config)
     this.geoLocation = navigator.geolocation
   }
 
@@ -28,9 +31,13 @@ export class XyoLocationWitness extends XyoSimpleWitness<XyoLocationPayload> {
     })
   }
 
-  override async observe() {
+  override async observe(
+    _fields: Partial<XyoLocationPayload>,
+    _query?: XyoWitnessQueryPayload<XyoPayload<{ schema: string }>> | undefined,
+  ): Promise<XyoLocationPayload> {
+    await delay(0)
     const location = await this.getCurrentPosition()
-    return await super.observe({
+    return {
       currentLocation: {
         coords: {
           accuracy: location.coords.accuracy,
@@ -43,7 +50,7 @@ export class XyoLocationWitness extends XyoSimpleWitness<XyoLocationPayload> {
         },
         timestamp: location.timestamp,
       },
-    })
+    } as XyoLocationPayload
   }
 
   static schema: XyoLocationPayloadSchema = XyoLocationPayloadSchema