@xyo-network/os-runtime 3.0.5 → 3.0.7

package/package.json

@@ -27,8 +27,8 @@
     "@xyo-network/diviner-payload-indexeddb": "^3.0.5",
     "@xyo-network/diviner-payload-model": "^3.0.5",
     "@xyo-network/diviner-temporal-indexing-model": "^3.0.5",
-    "@xyo-network/kernel": "^3.0.5",
-    "@xyo-network/kernel-model": "^3.0.5",
+    "@xyo-network/kernel": "^3.0.7",
+    "@xyo-network/kernel-model": "^3.0.7",
     "@xyo-network/manifest": "^3.0.5",
     "@xyo-network/manifest-wrapper": "^3.0.5",
     "@xyo-network/module-abstract": "^3.0.5",
@@ -37,7 +37,7 @@
     "@xyo-network/module-model": "^3.0.5",
     "@xyo-network/module-resolver": "^3.0.5",
     "@xyo-network/node-model": "^3.0.5",
-    "@xyo-network/os-model": "^3.0.5",
+    "@xyo-network/os-model": "^3.0.7",
     "@xyo-network/payload-builder": "^3.0.5",
     "@xyo-network/payload-model": "^3.0.5",
     "@xyo-network/wallet-model": "^3.0.5",
@@ -51,7 +51,9 @@
     "@types/uuid": "^10.0.0",
     "@xylabs/ts-scripts-yarn3": "^4.0.0-rc.29",
     "@xylabs/tsconfig": "^4.0.0-rc.29",
-    "typescript": "^5.5.4"
+    "@xyo-network/bios-nodejs": "^3.0.7",
+    "typescript": "^5.5.4",
+    "vitest": "^2.0.5"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "exports": {
@@ -73,6 +75,6 @@
     "url": "git+https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "3.0.5",
+  "version": "3.0.7",
   "type": "module"
 }

package/src/XyOs.ts

@@ -1,5 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import type { Promisable } from '@xylabs/promise'
+import { boot } from '@xyo-network/bios'
 import { Kernel } from '@xyo-network/kernel'
 import type { KernelExternal } from '@xyo-network/kernel-model'
 import type { PackageManifest } from '@xyo-network/manifest'
@@ -40,7 +41,7 @@ export interface XyOsParams<TManifest extends PackageManifest = PackageManifest>
 export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
   protected _exposedNode: NodeInstance | undefined
   protected _exposedNodeOuter: NodeInstance | undefined
-  protected _kernel: KernelExternal | undefined
+  protected _kernel: KernelExternal
   protected _locator: ModuleFactoryLocator
   protected dappRegistrationService: DappRegistrationService
   private stackManager: StackManager
@@ -103,6 +104,13 @@ export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
     console.warn('XyOs:boot', wallet.address)
     const fullLocator = this._locator.merge(locator)
     return await this._bootMutex.runExclusive(async () => {
+      await this.eventBus.start()
+      if (this.kernel?.status === 'created') {
+        await this.kernel.boot(await boot(), { locator: fullLocator })
+      }
+      if (this.kernel?.status !== 'booted') {
+        throw new Error('Kernel not booted')
+      }
       assertEx(this._root === undefined, () => 'XyOs already booted')
       const [root] = await XyOs.monitor(async () => await loadOsNode(wallet, fullLocator), { name: 'Load XyOs' })
       this._root = root

package/src/event/bus/EventBus.ts

@@ -16,6 +16,7 @@ import {
   isPubSubConnections,
 } from '@xyo-network/os-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { Mutex } from 'async-mutex'
 import { v4 as uuid } from 'uuid'
 
 /**
@@ -37,6 +38,8 @@ export class EventBus implements EventBusInterface {
   // Store all publisher callbacks for later removal
   private publisherCallbacks: Record<string, PublisherEventListener> = {}
 
+  private startMutex = new Mutex()
+
   get archivist() {
     return asArchivistInstance(
       assertEx(this._archivist, () => 'Archivist not found.  Did you forget to call start()?'),
@@ -78,38 +81,45 @@ export class EventBus implements EventBusInterface {
   }
 
   async start(storeName = 'EventBusArchivist') {
-    // Later versions could include a node that has a payload diviner to query past events
-    this._archivist = await MemoryArchivist.create({
-      config: {
-        name: storeName, schema: MemoryArchivistConfigSchema,
-      },
-    })
-
-    // start listening to inserted events from publishers
-    // NOTE: This is a very basic implementation and could be optimized by indexing on connection, eventName, and callback
-    // for faster lookups by event name
-    this.archivist.on('inserted', ({ payloads }: ArchivistModuleEventData['inserted']) => {
+    return await this.startMutex.runExclusive(async () => {
+      if (this._archivist) {
+        console.warn('EventBus already started')
+        return this
+      }
+      // Later versions could include a node that has a payload diviner to query past events
+      this._archivist = await MemoryArchivist.create({
+        config: {
+          name: storeName, schema: MemoryArchivistConfigSchema,
+        },
+      })
+
+      // start listening to inserted events from publishers
+      // NOTE: This is a very basic implementation and could be optimized by indexing on connection, eventName, and callback
+      // for faster lookups by event name
+      this.archivist.on('inserted', ({ payloads }: ArchivistModuleEventData['inserted']) => {
       // confirm an eventBusPayload was inserted
-      const eventBusEvent = payloads.find(isEventBusEvent)
-      // if not an eventBusPayload, return
-      if (!eventBusEvent) return
-      // Loop through all connections
-      for (const connectionId in this.connections) {
-        const connection = this.connections[connectionId]
-        // Target PubSub connections
-        if (isPubSubConnections(connection) && connection.subscribableEvents) {
+        const eventBusEvent = payloads.find(isEventBusEvent)
+        // if not an eventBusPayload, return
+        if (!eventBusEvent) return
+        // Loop through all connections
+        for (const connectionId in this.connections) {
+          const connection = this.connections[connectionId]
+          // Target PubSub connections
+          if (isPubSubConnections(connection) && connection.subscribableEvents) {
           // Loop through all subscribable events
-          for (const [eventName, callback] of connection.subscribableEvents.entries()) {
+            for (const [eventName, callback] of connection.subscribableEvents.entries()) {
             // check if the event name matches the payload name
-            if (eventName !== eventBusEvent.name) continue
-            // pass the event payloads to the callback
-            if (callback) {
-              const forgettable = async () => await callback({ payloads })
-              forget(forgettable())
+              if (eventName !== eventBusEvent.name) continue
+              // pass the event payloads to the callback
+              if (callback) {
+                const forgettable = async () => await callback({ payloads })
+                forget(forgettable())
+              }
             }
           }
         }
-      }
+      })
+      return this
     })
   }