@xyo-network/os-runtime 4.0.4 → 4.0.6

package/src/classes/settings/SettingsQueries.ts

@@ -2,20 +2,20 @@ import type { DivinerInstance } from '@xyo-network/diviner-model'
 import { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'
 import type { NodeBackground, WalletSeedPhrase } from '@xyo-network/os-model'
 import { NodeBackgroundSchema, WalletSeedPhraseSchema } from '@xyo-network/os-model'
-import type { WithMeta } from '@xyo-network/payload-model'
+import type { WithSources } from '@xyo-network/payload-model'
 
-const NO_RESULTS: WithMeta<WalletSeedPhrase>[] = []
+const NO_RESULTS: WithSources<WalletSeedPhrase>[] = []
 
 export const OsSettingsQueries = {
-  async getLatestUserWallet(diviner: DivinerInstance) {
+  async getLatestUserWallet(diviner: DivinerInstance): Promise<WithSources<WalletSeedPhrase>[]> {
     const query = {
       limit: 1,
       order: 'desc',
       schema: PayloadDivinerQuerySchema,
       schemas: [WalletSeedPhraseSchema],
     }
-    const results = (await diviner.divine([query])) as WithMeta<WalletSeedPhrase>[]
-    const wallet = results.find(payload => payload.$meta.label === 'userWallet')
+    const results = (await diviner.divine([query])) as WithSources<WalletSeedPhrase>[]
+    const wallet = results.find(payload => payload.$label === 'userWallet')
     return wallet ? [wallet] : NO_RESULTS
   },
   async getNodeBackground(diviner: DivinerInstance) {
@@ -25,7 +25,7 @@ export const OsSettingsQueries = {
       schema: PayloadDivinerQuerySchema,
       schemas: [NodeBackgroundSchema],
     }
-    return (await diviner.divine([query])) as WithMeta<NodeBackground>[]
+    return (await diviner.divine([query])) as WithSources<NodeBackground>[]
   },
   async getWallets(diviner: DivinerInstance) {
     const query = {
@@ -33,6 +33,6 @@ export const OsSettingsQueries = {
       schema: PayloadDivinerQuerySchema,
       schemas: [WalletSeedPhraseSchema],
     }
-    return (await diviner.divine([query])) as WithMeta<WalletSeedPhrase>[]
+    return (await diviner.divine([query])) as WithSources<WalletSeedPhrase>[]
   },
 }

package/src/classes/settings/badge/Queries.ts

@@ -2,6 +2,7 @@ import type { DivinerInstance } from '@xyo-network/diviner-model'
 import { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'
 import type { OsBadge } from '@xyo-network/os-model'
 import { OsBadgeSchema } from '@xyo-network/os-model'
+import type { WithSources } from '@xyo-network/payload-model'
 
 export const OsBadgeQueries = {
   getBadge: async (achievement: string, diviner: DivinerInstance) => {
@@ -13,6 +14,6 @@ export const OsBadgeQueries = {
       schemas: [OsBadgeSchema],
     }
 
-    return (await diviner.divine([query])) as OsBadge[]
+    return (await diviner.divine([query])) as WithSources<OsBadge>[]
   },
 }

package/src/classes/system/ManageSystemDapps.ts

@@ -4,7 +4,7 @@ import type {
   DappConfig, DappIcon, DappParams, DappSet, PayloadWithVersion, XyOsContext,
 } from '@xyo-network/os-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { WithMeta } from '@xyo-network/payload-model'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
 import semver from 'semver'
 
 import { OsCallerBase } from '../../OsCallerBase.ts'
@@ -56,7 +56,7 @@ export class ManageSystemDapps extends OsCallerBase {
   private async insertPayloads(): Promise<boolean> {
     const archivist = this.developmentMode ? await this.getDappsArchivistDevelopment() : await this.getDappsArchivist()
     try {
-      const allPayloads = (await archivist.all()) as WithMeta<DappIcon | DappConfig>[]
+      const allPayloads = (await archivist.all()) as WithStorageMeta<(DappIcon | DappConfig)>[]
       if (allPayloads.length === 0) {
         await this.freshInstall(archivist)
         return true

package/src/classes/system/Queries.ts

@@ -14,7 +14,6 @@ import {
   UnregisteredDappAccessSchema,
 } from '@xyo-network/os-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { WithMeta } from '@xyo-network/payload-model'
 
 export const SystemDappQueries = {
   async getDappAccess(diviner: DivinerInstance, name: string, version: string) {
@@ -25,7 +24,7 @@ export const SystemDappQueries = {
       schemas: [UnregisteredDappAccessSchema],
       version: version,
     }
-    return (await diviner.divine([accessQuery])) as WithMeta<UnregisteredDappAccess>[]
+    return (await diviner.divine([accessQuery])) as UnregisteredDappAccess[]
   },
   async getLatestConfig(diviner: DivinerInstance, name: string) {
     const configQuery = {
@@ -35,7 +34,7 @@ export const SystemDappQueries = {
       schema: PayloadDivinerQuerySchema,
       schemas: [DappConfigSchema],
     }
-    const [dappConfig] = (await diviner.divine([configQuery])) as WithMeta<DappConfig>[]
+    const [dappConfig] = (await diviner.divine([configQuery])) as DappConfig[]
     return dappConfig
   },
   async getLatestIcon(diviner: DivinerInstance, name: string, version: string) {
@@ -46,10 +45,10 @@ export const SystemDappQueries = {
       schemas: [DappIconSchema],
       version,
     }
-    const [dappIcon] = (await diviner.divine([iconQuery])) as WithMeta<DappIcon>[]
+    const [dappIcon] = (await diviner.divine([iconQuery])) as DappIcon[]
     return dappIcon
   },
-  async getWidgetConfigs(diviner: DivinerInstance, name: DappId, version: string): Promise<WithMeta<DappWidgetConfig>[]> {
+  async getWidgetConfigs(diviner: DivinerInstance, name: DappId, version: string): Promise<DappWidgetConfig[]> {
     const widgetConfigQuery = {
       dappId: name,
       order: 'desc',
@@ -57,9 +56,9 @@ export const SystemDappQueries = {
       schemas: [DappWidgetConfigSchema],
       version,
     }
-    const widgetConfigs = (await diviner.divine([widgetConfigQuery])) as WithMeta<DappWidgetConfig>[]
+    const widgetConfigs = (await diviner.divine([widgetConfigQuery])) as DappWidgetConfig[]
 
-    const uniqueConfigs: Record<string, WithMeta<DappWidgetConfig>> = {}
+    const uniqueConfigs: Record<string, DappWidgetConfig> = {}
     for (const widgetConfig of widgetConfigs) {
       const hash = await PayloadBuilder.dataHash(widgetConfig)
       uniqueConfigs[widgetConfig.mode ?? hash] = widgetConfig

package/src/intent/Caller.ts

@@ -3,7 +3,7 @@ import type {
   DappId, DappIntent, DappIntentTypes, XyOsContext,
 } from '@xyo-network/os-model'
 import { DappIntentSchema, DappMode } from '@xyo-network/os-model'
-import type { WithMeta } from '@xyo-network/payload-model'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
 
 import { DappCallerBase } from '../DappCallerBase.ts'
 
@@ -56,7 +56,7 @@ export class DappIntentCaller extends DappCallerBase {
   // Get the latest intent saved to the archivist
   async latestIntent() {
     const archivist = await this.getDappIntentArchivist()
-    return (await archivist.all()).at(-1) as WithMeta<DappIntent>
+    return (await archivist.all()).at(-1) as WithStorageMeta<DappIntent>
   }
 
   // Get the latest intent for a dapp
@@ -69,6 +69,6 @@ export class DappIntentCaller extends DappCallerBase {
       sourceDappId: dappName,
     }
 
-    return (await diviner.divine([query])) as WithMeta<DappIntent>[]
+    return (await diviner.divine([query])) as DappIntent[]
   }
 }

package/src/intent/Resource.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { DappIntent, XyOsContext } from '@xyo-network/os-model'
 import { isDappIntent } from '@xyo-network/os-model'
-import type { WithMeta } from '@xyo-network/payload-model'
+import type { WithSources, WithStorageMeta } from '@xyo-network/payload-model'
 
 import { DappCallerBase } from '../DappCallerBase.ts'
 import type { Listener, ResourceStore } from '../lib/index.ts'
@@ -50,7 +50,7 @@ export class DappIntentResource extends DappCallerBase implements ResourceStore<
 
     this._allDappIntents = await PayloadStore.create<DappIntent>({
       archivist,
-      getLatest: async () => (await archivist.all()) as WithMeta<DappIntent>[],
+      getLatest: async () => (await archivist.all()) as WithStorageMeta<WithSources<DappIntent>>[],
       idFunction: isDappIntent,
     })
     this._latestDappIntent = await PayloadStore.create<DappIntent>({
@@ -58,7 +58,7 @@ export class DappIntentResource extends DappCallerBase implements ResourceStore<
       getLatest: async () => {
         const all = await archivist.all()
         const result = all.length > 0 ? [all.at(-1)] : NO_RESULTS
-        return result as WithMeta<DappIntent>[]
+        return result as WithStorageMeta<WithSources<DappIntent>>[]
       },
       idFunction: isDappIntent,
     })

package/src/lib/PayloadStore.ts

@@ -1,19 +1,17 @@
 import type { ArchivistInstance, ArchivistModuleEventData } from '@xyo-network/archivist'
-import type {
-  Payload, WithMeta, WithSources,
-} from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 
 import type { ExternalStore } from './ExternalStore.ts'
 import type { Listener } from './Listener.ts'
 
 export interface PayloadStoreConfig<T extends Payload = Payload> {
   archivist: ArchivistInstance
-  getLatest: () => Promise<WithMeta<WithSources<T>>[]>
+  getLatest: () => Promise<WithSources<T>[]>
   idFunction: (schema: Payload) => boolean
 }
 
 export class PayloadStore<T extends Payload = Payload> implements ExternalStore {
-  latest: WithMeta<T>[] = []
+  latest: WithSources<T>[] = []
   private deleteListeners: WeakRef<(args: ArchivistModuleEventData['deleted']) => void>[] = []
   private insertListeners: WeakRef<(args: ArchivistModuleEventData['inserted']) => void>[] = []
   private listeners: Listener[] = []
@@ -70,7 +68,7 @@ export class PayloadStore<T extends Payload = Payload> implements ExternalStore
   /**
    * Get the current value of the store
    */
-  getSnapshot(): WithMeta<WithSources<T>>[] {
+  getSnapshot(): WithSources<T>[] {
     return this.latest
   }
 

package/src/utils/buildWalletSeedPhrasePayload.ts

@@ -19,10 +19,10 @@ export type WalletLabel = typeof userWalletLabel // TODO: More wallet types 'osW
 /**
  * Builds a WalletSeedPhrase payload from the supplied mnemonic seed phrase and label
  * @param mnemonic The mnemonic seed phrase
- * @param label The wallet label
+ * @param $label The wallet label
  * @returns A WalletSeedPhrase payload and its root hash
  */
-export const buildWalletSeedPhrasePayload = async (mnemonic: string, label: WalletLabel): Promise<{
+export const buildWalletSeedPhrasePayload = async (mnemonic: string, $label: WalletLabel): Promise<{
   payload: WalletSeedPhrase
   rootHash: Hash
 }> => {
@@ -31,11 +31,8 @@ export const buildWalletSeedPhrasePayload = async (mnemonic: string, label: Wall
       language, mnemonic: mnemonic.split(' '), standard,
     },
   }
-  const meta = { label, timestamp: Date.now() }
-  const builder = new PayloadBuilder<WalletSeedPhrase>({
-    fields, meta, schema: WalletSeedPhraseSchema,
-  })
-  const payload = await builder.build()
+  const meta = { $label, $timestamp: Date.now() }
+  const payload = new PayloadBuilder<WalletSeedPhrase>({ schema: WalletSeedPhraseSchema }).fields(fields).meta(meta).build()
   const rootHash = await PayloadBuilder.hash(payload)
   return { payload, rootHash }
 }

package/src/wallet/DappSeedPhraseRepository.ts

@@ -4,7 +4,6 @@ import type {
   DappId, DappWalletSeedPhrase, WalletId, XyOsContext,
 } from '@xyo-network/os-model'
 import { DappWalletSeedPhraseSchema } from '@xyo-network/os-model'
-import type { WithMeta } from '@xyo-network/payload-model'
 import { v4 as uuid } from 'uuid'
 
 import { OsCallerBase } from '../OsCallerBase.ts'
@@ -73,7 +72,7 @@ export class DappSeedPhraseRepository extends OsCallerBase implements SeedPhrase
       schemas: [DappWalletSeedPhraseSchema],
     }
 
-    const results = (await diviner.divine([query])) as WithMeta<DappWalletSeedPhrase>[]
+    const results = (await diviner.divine([query])) as DappWalletSeedPhrase[]
     return results.length > 0 ? results[0] : undefined
   }
 
@@ -87,7 +86,7 @@ export class DappSeedPhraseRepository extends OsCallerBase implements SeedPhrase
       walletId,
     }
 
-    const results = (await diviner.divine([query])) as WithMeta<DappWalletSeedPhrase>[]
+    const results = (await diviner.divine([query])) as DappWalletSeedPhrase[]
     return results.length > 0 ? results[0] : undefined
   }