@xyo-network/os-runtime 8.0.0 → 8.0.2

package/dist/node/index.mjs

@@ -126,7 +126,7 @@ var DappSeedPhraseRepository = class extends OsCallerBase {
       schemas: [DappWalletSeedPhraseSchema]
     };
     const results = await diviner.divine([query]);
-    return results.length > 0 ? results[0] : void 0;
+    return results[0];
   }
   async checkWalletId(walletId) {
     const diviner = await this.getDappsArchivistPayloadDiviner();
@@ -138,7 +138,7 @@ var DappSeedPhraseRepository = class extends OsCallerBase {
       walletId
     };
     const results = await diviner.divine([query]);
-    return results.length > 0 ? results[0] : void 0;
+    return results[0];
   }
   newPhrase() {
     return HDWallet.generateMnemonic();
@@ -355,11 +355,12 @@ var DappAccessPayloads = class {
   async payloads() {
     const osCaller = new OsCallerBase(this.context);
     const archivist = await osCaller.getRegisteredDappInterfacesArchivist();
-    return await archivist.all();
+    return await archivist.next();
   }
 };
 
 // src/dapp/context/creator/DefaultPayloads/NodeInfoPayload.ts
+import { ZERO_ADDRESS } from "@xylabs/sdk-js";
 import { NodeOsInfoSchema } from "@xyo-network/os-model";
 var NodeInfoPayload = class {
   _context;
@@ -375,7 +376,7 @@ var NodeInfoPayload = class {
     }
     await Promise.resolve();
     const nodeOsInfo = {
-      publicAddress: exposedNode?.address ?? "",
+      publicAddress: exposedNode?.address ?? ZERO_ADDRESS,
       schema: NodeOsInfoSchema
     };
     return [nodeOsInfo];
@@ -439,10 +440,11 @@ var ExternalModulePermissions = class {
     }
   }
   async registerAndAttachModule(mod) {
-    if (mod) {
-      await this.dappWindowNode.register?.(mod);
-      await this.dappWindowNode.attach(mod.address, true);
+    if (!mod) {
+      return;
     }
+    await this.dappWindowNode.register?.(mod);
+    await this.dappWindowNode.attach(mod.address, true);
   }
   async resolveExternalModule(id) {
     return await this.context.root.resolve(id);
@@ -482,7 +484,7 @@ var DappContextCreator = class _DappContextCreator {
     } = config;
     const { external, manifestPayload } = this.parseDappPackageManifestPayload(payload, xnsNodeUrl, xnsNetwork);
     console.debug("[DEBUG] dApp manifest", manifestPayload);
-    const dappWallet = await wallet.derivePath(_DappContextCreator.DAPP_WINDOW_WALLET_PATH);
+    const dappWallet = await wallet.derivePath(this.DAPP_WINDOW_WALLET_PATH);
     const targetDappManifestParams = [
       manifestPayload,
       dappWallet,
@@ -582,19 +584,22 @@ import { ModuleFactoryLocator as ModuleFactoryLocator8 } from "@xyo-network/sdk-
 // src/event/bus/Connection.ts
 import { assertEx as assertEx4, BaseEmitter } from "@xylabs/sdk-js";
 var EventBusConnection = class extends BaseEmitter {
-  _id;
   description;
   type;
+  #id;
   constructor(request) {
     super({});
     this.description = request.description;
     this.type = request.type;
   }
+  get hasId() {
+    return this.#id !== void 0;
+  }
   get id() {
-    return assertEx4(this._id, () => "Connection ID not set.  Did you forget to call buildConnection()?");
+    return assertEx4(this.#id, () => "Connection ID not set.  Did you forget to call buildConnection()?");
   }
   buildConnection(id) {
-    this._id = id;
+    this.#id = id;
   }
 };
 
@@ -660,15 +665,18 @@ var EventBus = class {
       this.archivist.on("inserted", ({ payloads }) => {
         const eventBusEvent = findAs(payloads, asOptionalEventBusEvent);
         if (!eventBusEvent) return;
+        const notifySubscribableEvent = ([eventName, callback]) => {
+          if (eventName !== eventBusEvent.name) return;
+          if (callback) {
+            const forgettable = async () => await callback({ payloads });
+            forget(forgettable());
+          }
+        };
         for (const connectionId in this.connections) {
           const connection = this.connections[connectionId];
           if (isPubSubConnections(connection) && connection.subscribableEvents) {
-            for (const [eventName, callback] of connection.subscribableEvents.entries()) {
-              if (eventName !== eventBusEvent.name) continue;
-              if (callback) {
-                const forgettable = async () => await callback({ payloads });
-                forget(forgettable());
-              }
+            for (const subscribableEvent of connection.subscribableEvents) {
+              notifySubscribableEvent(subscribableEvent);
             }
           }
         }
@@ -904,12 +912,11 @@ var PayloadStore = class {
   }) {
     const instance = new this(archivist);
     const insertListener = async ({ payloads }) => {
-      if (payloads.some(idFunction)) {
-        const latest = await getLatest();
-        if (isEqual(latest, instance.latest)) return;
-        instance.latest = latest;
-        instance.emitChange();
-      }
+      if (!payloads.some(idFunction)) return;
+      const latest = await getLatest();
+      if (isEqual(latest, instance.latest)) return;
+      instance.latest = latest;
+      instance.emitChange();
     };
     const deleteListener = async () => {
       instance.latest = await getLatest();
@@ -1059,12 +1066,12 @@ var DappIntentCaller = class _DappIntentCaller extends DappCallerBase {
   // Get all intents
   async allIntents() {
     const archivist = await this.getDappIntentArchivist();
-    return await archivist.all();
+    return await archivist.next();
   }
   // Get the latest intent saved to the archivist
   async latestIntent() {
     const archivist = await this.getDappIntentArchivist();
-    return (await archivist.all()).at(-1);
+    return (await archivist.next()).at(-1);
   }
   // Get the latest intent for a dapp
   async latestIntentForDappName(dappName) {
@@ -1115,13 +1122,13 @@ var DappIntentResource = class extends DappCallerBase {
     const archivist = await this.getDappIntentArchivist();
     this._allDappIntents = await PayloadStore.create({
       archivist,
-      getLatest: async () => await archivist.all(),
+      getLatest: async () => await archivist.next(),
       idFunction: isDappIntent
     });
     this._latestDappIntent = await PayloadStore.create({
       archivist,
       getLatest: async () => {
-        const all = await archivist.all();
+        const all = await archivist.next();
         const result = all.length > 0 ? [all.at(-1)] : NO_RESULTS;
         return result;
       },
@@ -1230,7 +1237,7 @@ var ManageSystemDapps = class extends OsCallerBase {
   async insertPayloads() {
     const archivist = this.developmentMode ? await this.getDappsArchivistDevelopment() : await this.getDappsArchivist();
     try {
-      const allPayloads = await archivist.all();
+      const allPayloads = await archivist.next();
       if (allPayloads.length === 0) {
         await this.freshInstall(archivist);
         return true;
@@ -1530,14 +1537,14 @@ var ValidateDappAccessDiviner = class extends AbstractDiviner {
   static configSchemas = [ValidateDappAccessDivinerConfigSchema];
   async divineHandler(payloads) {
     const dappManifest = payloads?.filter(isDappPackageManifestPayload) ?? [];
-    const accessors = payloads?.filter(isUnregisteredDappAccess) ?? [];
-    const dappParams = this.params.dappParams;
     if (dappManifest.length > 1) {
       throw new Error("Only one dapp manifest payload is allowed");
     }
+    const accessors = payloads?.filter(isUnregisteredDappAccess) ?? [];
     if (dappManifest.length === 0 || accessors.length === 0) {
       return [];
     }
+    const dappParams = this.params.dappParams;
     const registeredAccessors = [];
     const failedAccessors = [];
     for (const access of accessors) {
@@ -1635,6 +1642,10 @@ var DappRegistry = class {
       } = this.extractDappProperties(dapp);
       try {
         const walletId = await this.dappSeedPhraseRepository.findOrCreate(name);
+        if (this.dappRegistry.get(name)) {
+          console.warn("tried to register two dapps with the same name", name);
+          return null;
+        }
         const registeredAccessors = await this.validateDappAccessPayloads(manifest, dapp.accessors, params);
         const registeredDapp = {
           accessors: registeredAccessors,
@@ -1652,10 +1663,6 @@ var DappRegistry = class {
           params,
           widgetConfigs
         };
-        if (this.dappRegistry.get(name)) {
-          console.warn("tried to register two dapps with the same name", name);
-          return null;
-        }
         this.dappRegistry.set(name, registeredDapp);
         return registeredDapp;
       } catch (e) {
@@ -1807,21 +1814,22 @@ var DappRegistrationService = class {
     return this.context.user;
   }
   async postRegistrationHandlers(registeredDapp) {
-    if (registeredDapp.dapp) {
-      if (isRegisteredDappExposedDappSet(registeredDapp)) {
-        this.registeredExposedDappSets.add(registeredDapp);
-        const exposeIntent = DappIntentCaller.buildIntent(
-          DappIntentCaller.OsDappName,
-          DappIntentTypes.Launch,
-          registeredDapp.dapp.config.name,
-          DappMode2.Exposed
-        );
-        await this.exposeDappRequestConnection.emit(ExposeDappRequestEvent, { payloads: [registeredDapp.dapp.config, exposeIntent] });
-      }
-      if (isRegisteredDappAccessDappSet(registeredDapp)) {
-        this.registeredAccessDappSets.add(registeredDapp);
-        await this.dappAccessRequestConnection.emit(DappAccessRequestEvent, { payloads: registeredDapp.dapp.accessors });
-      }
+    if (!registeredDapp.dapp) {
+      return;
+    }
+    if (isRegisteredDappExposedDappSet(registeredDapp)) {
+      this.registeredExposedDappSets.add(registeredDapp);
+      const exposeIntent = DappIntentCaller.buildIntent(
+        DappIntentCaller.OsDappName,
+        DappIntentTypes.Launch,
+        registeredDapp.dapp.config.name,
+        DappMode2.Exposed
+      );
+      await this.exposeDappRequestConnection.emit(ExposeDappRequestEvent, { payloads: [registeredDapp.dapp.config, exposeIntent] });
+    }
+    if (isRegisteredDappAccessDappSet(registeredDapp)) {
+      this.registeredAccessDappSets.add(registeredDapp);
+      await this.dappAccessRequestConnection.emit(DappAccessRequestEvent, { payloads: registeredDapp.dapp.accessors });
     }
   }
 };
@@ -1855,7 +1863,7 @@ var Signers = class {
   }
   async initialize() {
     for (const [walletKindName, signerPaths] of this.paths) {
-      for (const [signerName, walletPath] of signerPaths.entries()) {
+      for (const [signerName, walletPath] of signerPaths) {
         await this.initializeSigners(walletKindName, signerName, walletPath);
       }
     }
@@ -2001,7 +2009,7 @@ var StackManager = class {
     this.stackMap = stackMap;
   }
   get stacks() {
-    return Object.keys(this.initializedStacksMap);
+    return this.initializedStacksMap.keys().toArray();
   }
   get initializedStacks() {
     return this.initializedStacksMap;
@@ -2099,21 +2107,21 @@ var NodeAdapterBase = class extends BaseEmitter4 {
 
 // src/adapter/Network.ts
 var NetworkAdapter = class extends NodeAdapterBase {
-  _connection;
+  #connection;
   constructor(kernel, driverName) {
     super(kernel, driverName);
     this.on("driverReady", ({ node }) => {
-      this._connection = node;
+      this.#connection = node;
     });
   }
   get connection() {
-    return this._connection;
+    return this.#connection;
   }
   get hasConnection() {
     return !!this.connection;
   }
   removeConnection() {
-    this._connection = void 0;
+    this.#connection = void 0;
   }
 };
 
@@ -2175,24 +2183,22 @@ var OsPubSubNetworkStack = class extends StackBase {
     this.context.eventBus.addConnection(this.busConnection);
     this.on("initialized", () => this.busConnection.emit(OsPubSubNetworkReadyEvent, {}));
     super.on("driverReady", async ({ node }) => {
-      if (node.id === PubSubBridgeNodeNodeName2) {
-        const httpBridge = assertEx13(await node.resolve("NsHttpBridge"), () => "HttpBridge not found");
-        const xnsNode = asNodeInstance(await httpBridge.resolve("XNS"));
-        if (xnsNode) {
-          const initializedXns = await initializeXns(xnsNode);
-          console.log(`Xns: ${initializedXns}`);
-        } else {
-          console.log("Xns: Failed to contact Xns Node");
-        }
+      if (node.id !== PubSubBridgeNodeNodeName2) return;
+      const httpBridge = assertEx13(await node.resolve("NsHttpBridge"), () => "HttpBridge not found");
+      const xnsNode = asNodeInstance(await httpBridge.resolve("XNS"));
+      if (xnsNode) {
+        const initializedXns = await initializeXns(xnsNode);
+        console.log(`Xns: ${initializedXns}`);
+      } else {
+        console.log("Xns: Failed to contact Xns Node");
       }
     });
     super.on("driverReady", async ({ node }) => {
-      if (node.id === ExposedNodeOuterNodeName2) {
-        this._exposedNodeOuter = node;
-        const mod = assertEx13(await node.resolve("ExposedNode"), () => "ExposedNode not found");
-        const exposedNode = asAttachableNodeInstance3(mod, () => "ExposedNode is not a node");
-        this._exposedNode = exposedNode;
-      }
+      if (node.id !== ExposedNodeOuterNodeName2) return;
+      this._exposedNodeOuter = node;
+      const mod = assertEx13(await node.resolve("ExposedNode"), () => "ExposedNode not found");
+      const exposedNode = asAttachableNodeInstance3(mod, () => "ExposedNode is not a node");
+      this._exposedNode = exposedNode;
     });
     super.on("driverError", (error) => console.error("Unable to assign exposed node(s) to context", error));
   }
@@ -2200,7 +2206,7 @@ var OsPubSubNetworkStack = class extends StackBase {
     super.stop();
     this._exposedNode = void 0;
     this._exposedNodeOuter = void 0;
-    if (this.busConnection._id)
+    if (this.busConnection.hasId)
       this.context.eventBus.removeConnection(this.busConnection.id);
   }
 };
@@ -2369,13 +2375,13 @@ var XyOs = class _XyOs extends XyOsContextBase {
 
 // src/RunningDappCache.ts
 var findOrCreateMutex = new Mutex3();
-var RunningDappCache = class _RunningDappCache {
+var RunningDappCache = class {
   static _cache = {};
   static async findOrCreate(dapp, xyOs, allowedNames, xnsNodeUrl, xnsNetwork) {
     const dappId = dapp.config.name;
     return await XyOs.monitor(
       async () => await findOrCreateMutex.runExclusive(async () => {
-        const existingWindowDappSet = _RunningDappCache.get(dappId);
+        const existingWindowDappSet = this.get(dappId);
         if (existingWindowDappSet) {
           console.debug("[DEBUG]", `RunningDappCache, using existing node for ${dappId}`);
           const existingDappContext = assertEx15(existingWindowDappSet.context, () => "No context found in existing dapp node");
@@ -2384,7 +2390,7 @@ var RunningDappCache = class _RunningDappCache {
         }
         console.debug("[DEBUG]", "RunningDappCache:creating", dappId);
         const windowDappSet = await createDappContext(dapp, xyOs, allowedNames, xnsNodeUrl, xnsNetwork);
-        _RunningDappCache.set(dappId, windowDappSet);
+        this.set(dappId, windowDappSet);
         return windowDappSet;
       }),
       { additionalProperties: { dappId }, name: "Loading dApp" }
@@ -2394,7 +2400,7 @@ var RunningDappCache = class _RunningDappCache {
     return this._cache[key];
   }
   static has(key) {
-    return key ? !!this._cache[key] : false;
+    return key ? Object.hasOwn(this._cache, key) : false;
   }
   static set(key, value) {
     this._cache[key] = value;
@@ -2408,7 +2414,7 @@ var RunningDappAccessCache = class {
     return this._cache[key];
   }
   static has(key) {
-    return key ? !!this._cache[key] : false;
+    return key ? Object.hasOwn(this._cache, key) : false;
   }
   static set(key, value) {
     this._cache[key] = value;
@@ -2496,7 +2502,7 @@ var AccessNodeQueries = class {
   }
   async getPayloadsFromAccessNode() {
     const archivistFromAccessNode = await this.resolveArchivistFromAccessNode();
-    return await archivistFromAccessNode.all();
+    return await archivistFromAccessNode.next();
   }
   async insertAccessNodePayloadsIntoDappNodeArchivist(payloads) {
     const archivist = await this.getArchivistFromDappNode();
@@ -2568,7 +2574,7 @@ var XnsRegistrationsResourceQueries = {
     return await diviner.divine([query]);
   },
   getRecentRegistrations: async (archivist) => {
-    return (await archivist.all()).toReversed();
+    return (await archivist.next()).toReversed();
   }
 };
 
@@ -2801,9 +2807,8 @@ var DappCaller = class extends DappCallerBase {
     const account = this.context.user.signers?.get(dappName);
     if (account) {
       return account;
-    } else {
-      throw new Error("Unable to find user wallet");
     }
+    throw new Error("Unable to find user wallet");
   }
   /**
    * Get all wallets for the user
@@ -2849,10 +2854,7 @@ var DappCaller = class extends DappCallerBase {
    */
   async setDappInjectableRouteParams(searchParams = new URLSearchParams(), pathname) {
     const dappArchivist = await this.getDappArchivist();
-    const params = {};
-    for (const [key, value] of searchParams.entries()) {
-      params[key] = value;
-    }
+    const params = Object.fromEntries(searchParams);
     const payload = {
       params,
       path: pathname,
@@ -3224,7 +3226,8 @@ var buildWalletSeedPhrasePayload = async (mnemonic, $label) => {
     $label,
     $timestamp: Date.now()
   };
-  const payload = new PayloadBuilder8({ schema: WalletSeedPhraseSchema }).fields(fields).build();
+  const builder = new PayloadBuilder8({ schema: WalletSeedPhraseSchema });
+  const payload = builder.fields(fields).build();
   const rootHash = await PayloadBuilder8.hash(payload);
   return { payload, rootHash };
 };
@@ -3287,7 +3290,8 @@ var OsSettingsQueries = {
         $label: legacyMeta?.label,
         $timestamp: legacyMeta?.$timestamp
       };
-      const payload = new PayloadBuilder9({ schema: WalletSeedPhraseSchema2 }).fields(newWalletPayloadFields).build();
+      const builder = new PayloadBuilder9({ schema: WalletSeedPhraseSchema2 });
+      const payload = builder.fields(newWalletPayloadFields).build();
       await archivist.insert([payload]);
       return [payload];
     }
@@ -3348,12 +3352,13 @@ var OsSettingsCaller = class extends OsSettingsCallerBase {
     const archivist = await this.getOsSettingsArchivist();
     const storedSeedPhrasePayload = (await OsSettingsQueries.getLatestUserWallet(diviner, archivist)).pop();
     const biosWalletSeedPhrase = assertEx26(await this.context.kernel?.bios?.seedPhraseStore.get("user"), () => "No user seed phrase found from BIOS");
-    const biosWalletSeedPhraseParts = biosWalletSeedPhrase.split(" ");
     if (!storedSeedPhrasePayload?.mnemonic?.mnemonic) {
       const { payload: biosSeedPhrasePayload } = await buildUserWalletSeedPhrasePayload(biosWalletSeedPhrase);
       await this.addWalletSeedPhrase(biosSeedPhrasePayload);
       return biosSeedPhrasePayload;
-    } else if (!isEqual(storedSeedPhrasePayload.mnemonic.mnemonic, biosWalletSeedPhraseParts)) {
+    }
+    const biosWalletSeedPhraseParts = biosWalletSeedPhrase.split(" ");
+    if (!isEqual(storedSeedPhrasePayload.mnemonic.mnemonic, biosWalletSeedPhraseParts)) {
       const updatedBiosSeedPhrase = storedSeedPhrasePayload.mnemonic.mnemonic.join(" ");
       await this.context.kernel?.bios?.seedPhraseStore.set("user", updatedBiosSeedPhrase);
     }