@peers-app/peers-sdk 0.21.0 → 0.21.2

package/dist/package-loader/package-loader.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageLoader = void 0;
 exports.setDefaultRequire = setDefaultRequire;
+const registry_1 = require("../contracts/registry");
+const system_contracts_1 = require("../contracts/system-contracts");
 const files_1 = require("../data/files");
 const package_version_resolver_1 = require("../data/package-version-resolver");
 const package_versions_1 = require("../data/package-versions");
@@ -9,6 +11,9 @@ const packages_1 = require("../data/packages");
 const tools_1 = require("../data/tools");
 const tools_2 = require("../tools");
 const contract_package_loader_1 = require("./contract-package-loader");
+const resolve_consumed_contracts_1 = require("./resolve-consumed-contracts");
+// Ensure built-in system contracts are cataloged before any PackageLoader installs them.
+require("../contracts/system");
 class PackageLoader {
     dataContext;
     static PeersSDK;
@@ -16,9 +21,17 @@ class PackageLoader {
     packageInstances = {};
     /** Packages that were installed via the contract-based path (tools/assistants/tables already saved with packageId). */
     contractInstalledPackages = new Set();
+    /**
+     * In-memory contract providers for this data context. Seeded with system
+     * contracts at construction; package providers are added via
+     * {@link installContractPackage}.
+     */
+    contractRegistry;
     require = undefined;
     constructor(dataContext) {
         this.dataContext = dataContext;
+        this.contractRegistry = new registry_1.ContractRegistry();
+        (0, system_contracts_1.installSystemContracts)(this.contractRegistry);
     }
     /** Returns true if a package was installed via the contract-based definePackage() path. */
     isContractInstalled(packageId) {
@@ -104,9 +117,9 @@ class PackageLoader {
     }
     /**
      * Post-correction: if the package definition carries a version string,
-     * update the active IPackageVersion record to match. This fixes cases where
-     * the PV record was created with stale or placeholder values (e.g. "0.0.1")
-     * before the bundle was evaluated.
+     * update the active IPackageVersion record to match — but only when that
+     * active version is the mutable `dev` working copy. Never rewrite
+     * beta/stable version labels from a local package.json bump.
      */
     correctPackageVersion(pkg, def) {
         if (!pkg.activePackageVersionId)
@@ -119,8 +132,18 @@ class PackageLoader {
             .then((pv) => {
             if (!pv)
                 return;
+            if (pv.versionTag !== "dev")
+                return;
             if (def.version && pv.version !== def.version) {
-                return pvTable.signAndSave({ ...pv, version: def.version });
+                const packageVersionHash = (0, package_versions_1.computePackageVersionHash)(def.version, pv.versionTag || "dev", pv.packageBundleFileHash, pv.routesBundleFileHash, pv.uiBundleFileHash);
+                // Version is part of both the content hash and the author-signed
+                // payload — clear any prior author signature so it cannot go stale.
+                const { packageAuthorSignature: _staleSig, ...rest } = pv;
+                return pvTable.signAndSave({
+                    ...rest,
+                    version: def.version,
+                    packageVersionHash,
+                });
             }
         })
             .catch((err) => {
@@ -198,7 +221,10 @@ class PackageLoader {
                 if (packageDefinition.packageId !== pkg.packageId) {
                     console.warn(`[PackageLoader] packageId mismatch: definition has "${packageDefinition.packageId}" but DB record has "${pkg.packageId}"`);
                 }
-                await (0, contract_package_loader_1.installContractPackage)(this.dataContext, packageDefinition);
+                await (0, contract_package_loader_1.installContractPackage)(this.dataContext, packageDefinition, {
+                    registry: this.contractRegistry,
+                });
+                await (0, resolve_consumed_contracts_1.resolveConsumedContracts)(this.dataContext, this.contractRegistry, packageDefinition);
                 this.contractInstalledPackages.add(packageDefinition.packageId);
                 this.correctPackageVersion(pkg, packageDefinition);
                 // Build a proper IPeersPackage from the contract definition so callers

package/dist/package-loader/package-loader.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/package-loader/package-loader.test.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mockGet = jest.fn();
+const mockSignAndSave = jest.fn();
+const mockComputePackageVersionHash = jest.fn((version, _tag, packageBundleFileHash, _routesBundleFileHash, _uiBundleFileHash) => `hash-${version}-${packageBundleFileHash}`);
+jest.mock("../data/package-versions", () => ({
+    PackageVersions: () => ({
+        get: (...args) => mockGet(...args),
+        signAndSave: (...args) => mockSignAndSave(...args),
+    }),
+    computePackageVersionHash: (version, versionTag, packageBundleFileHash, routesBundleFileHash, uiBundleFileHash) => mockComputePackageVersionHash(version, versionTag, packageBundleFileHash, routesBundleFileHash, uiBundleFileHash),
+}));
+const registry_1 = require("../contracts/registry");
+const system_ids_1 = require("../system-ids");
+const package_loader_1 = require("./package-loader");
+describe("PackageLoader.correctPackageVersion", () => {
+    const activePvId = "pv-active";
+    const pkg = {
+        packageId: "pkg-1",
+        name: "Test Package",
+        activePackageVersionId: activePvId,
+    };
+    const def = { version: "0.3.6" };
+    let loader;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockSignAndSave.mockResolvedValue(undefined);
+        loader = new package_loader_1.PackageLoader({ dataContextId: "ctx" });
+    });
+    async function correctPackageVersion() {
+        loader.correctPackageVersion(pkg, def);
+        // Flush the fire-and-forget promise chain
+        await new Promise((r) => setImmediate(r));
+    }
+    it("updates the active PV hash and clears a stale author signature", async () => {
+        mockGet.mockResolvedValue({
+            packageVersionId: activePvId,
+            version: "0.3.1",
+            versionTag: "dev",
+            packageBundleFileHash: "bundle-hash",
+            routesBundleFileHash: "routes-hash",
+            uiBundleFileHash: "ui-hash",
+            packageAuthorSignature: "stale-sig",
+            packageVersionHash: "old-hash",
+        });
+        await correctPackageVersion();
+        expect(mockComputePackageVersionHash).toHaveBeenCalledWith("0.3.6", "dev", "bundle-hash", "routes-hash", "ui-hash");
+        expect(mockSignAndSave).toHaveBeenCalledWith(expect.objectContaining({
+            packageVersionId: activePvId,
+            version: "0.3.6",
+            versionTag: "dev",
+            packageVersionHash: "hash-0.3.6-bundle-hash",
+        }));
+        expect(mockSignAndSave.mock.calls[0][0].packageAuthorSignature).toBeUndefined();
+    });
+    it("does not update the active PV when it is stable", async () => {
+        mockGet.mockResolvedValue({
+            packageVersionId: activePvId,
+            version: "0.3.5",
+            versionTag: "stable",
+        });
+        await correctPackageVersion();
+        expect(mockSignAndSave).not.toHaveBeenCalled();
+    });
+    it("does not update the active PV when it is beta", async () => {
+        mockGet.mockResolvedValue({
+            packageVersionId: activePvId,
+            version: "0.3.5",
+            versionTag: "beta",
+        });
+        await correctPackageVersion();
+        expect(mockSignAndSave).not.toHaveBeenCalled();
+    });
+    it("does nothing when the active PV version already matches", async () => {
+        mockGet.mockResolvedValue({
+            packageVersionId: activePvId,
+            version: "0.3.6",
+            versionTag: "dev",
+        });
+        await correctPackageVersion();
+        expect(mockSignAndSave).not.toHaveBeenCalled();
+    });
+});
+describe("PackageLoader.contractRegistry", () => {
+    it("owns an in-memory ContractRegistry per loader instance", () => {
+        const loaderA = new package_loader_1.PackageLoader({ dataContextId: "ctx-a" });
+        const loaderB = new package_loader_1.PackageLoader({ dataContextId: "ctx-b" });
+        expect(loaderA.contractRegistry).toBeInstanceOf(registry_1.ContractRegistry);
+        expect(loaderB.contractRegistry).toBeInstanceOf(registry_1.ContractRegistry);
+        expect(loaderA.contractRegistry).not.toBe(loaderB.contractRegistry);
+    });
+    it("installs system contracts into each new registry", () => {
+        const loader = new package_loader_1.PackageLoader({ dataContextId: "ctx-system" });
+        expect(loader.contractRegistry.getProviderPackageId(system_ids_1.logsContractId, 1)).toBe(system_ids_1.peersSystemPackageId);
+        expect(loader.contractRegistry.resolve(system_ids_1.logsContractId, 1)?.name).toBe("System Logs");
+        expect(loader.contractRegistry.getProviderPackageId(system_ids_1.deviceOperationsContractId, 1)).toBe(system_ids_1.peersSystemPackageId);
+    });
+});

package/dist/package-loader/resolve-consumed-contracts.d.ts

@@ -0,0 +1,13 @@
+import type { DataContext } from "../context/data-context";
+import type { ContractRegistry } from "../contracts/registry";
+import type { IPackageDefinitionResult } from "../contracts/types";
+/**
+ * Settle each deferred `consumes` handle on a package definition after its
+ * providers have been registered.
+ *
+ * A consume succeeds only when {@link ContractRegistry.selectProvider} finds a
+ * matching provider **and** a live {@link getContractResolver|ContractResolver}
+ * exists for that contract version. Missing optional deps settle to `undefined`;
+ * missing required deps reject the handle.
+ */
+export declare function resolveConsumedContracts(dataContext: DataContext, registry: ContractRegistry, packageDefinition: IPackageDefinitionResult): Promise<void>;

package/dist/package-loader/resolve-consumed-contracts.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveConsumedContracts = resolveConsumedContracts;
+const builder_1 = require("../contracts/builder");
+const contract_resolvers_1 = require("../contracts/contract-resolvers");
+const create_local_consumer_1 = require("../contracts/create-local-consumer");
+/**
+ * Settle each deferred `consumes` handle on a package definition after its
+ * providers have been registered.
+ *
+ * A consume succeeds only when {@link ContractRegistry.selectProvider} finds a
+ * matching provider **and** a live {@link getContractResolver|ContractResolver}
+ * exists for that contract version. Missing optional deps settle to `undefined`;
+ * missing required deps reject the handle.
+ */
+async function resolveConsumedContracts(dataContext, registry, packageDefinition) {
+    for (const dep of packageDefinition.consumes) {
+        const handle = dep.handle;
+        if (!handle) {
+            continue;
+        }
+        try {
+            const selected = registry.selectProvider(dep);
+            if (!selected) {
+                settleMissing(dep.optional === true, handle, dep.contractId, dep.version, "no matching provider");
+                continue;
+            }
+            const resolver = (0, contract_resolvers_1.getContractResolver)(dep.contractId, dep.version);
+            if (!resolver) {
+                settleMissing(dep.optional === true, handle, dep.contractId, dep.version, `provider ${selected.providerPackageId} has no live resolver`);
+                continue;
+            }
+            const resolution = await resolver({ dataContext });
+            const consumer = (0, create_local_consumer_1.createLocalContractConsumer)(selected.definition, resolution, {
+                dataContextId: dataContext.dataContextId,
+            });
+            (0, builder_1.settleConsumedContractHandle)(handle, consumer);
+        }
+        catch (err) {
+            if (dep.optional === true) {
+                (0, builder_1.settleConsumedContractHandle)(handle, undefined);
+            }
+            else {
+                (0, builder_1.rejectConsumedContractHandle)(handle, err);
+            }
+        }
+    }
+}
+function settleMissing(optional, handle, contractId, version, reason) {
+    if (optional) {
+        (0, builder_1.settleConsumedContractHandle)(handle, undefined);
+        return;
+    }
+    (0, builder_1.rejectConsumedContractHandle)(handle, new Error(`Required contract ${contractId}@${version} could not be resolved: ${reason}`));
+}

package/dist/package-loader/resolve-consumed-contracts.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/package-loader/resolve-consumed-contracts.test.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const builder_1 = require("../contracts/builder");
+const contract_resolvers_1 = require("../contracts/contract-resolvers");
+const registry_1 = require("../contracts/registry");
+const utils_1 = require("../utils");
+const resolve_consumed_contracts_1 = require("./resolve-consumed-contracts");
+describe("resolveConsumedContracts", () => {
+    const contractId = (0, utils_1.newid)();
+    const providerPackageId = (0, utils_1.newid)();
+    function mockDataContext() {
+        return { dataContextId: "test-ctx" };
+    }
+    function makeProvidingRegistry() {
+        const registry = new registry_1.ContractRegistry();
+        registry.register(providerPackageId, {
+            contractId,
+            version: 1,
+            devTag: "dev",
+            name: "Fake Contract",
+            description: "test",
+            tables: [
+                {
+                    name: "Items",
+                    description: "Items table",
+                    primaryKeyName: "itemId",
+                    fields: [],
+                },
+            ],
+            tools: [],
+            observables: [],
+            events: [],
+        });
+        return registry;
+    }
+    beforeEach(() => {
+        const resolution = {
+            contractId,
+            version: 1,
+            tables: {
+                Items: {
+                    list: jest.fn().mockResolvedValue([{ itemId: "1" }]),
+                    count: jest.fn().mockResolvedValue(1),
+                },
+            },
+        };
+        (0, contract_resolvers_1.registerContractResolver)(contractId, 1, () => resolution);
+    });
+    it("settles a required consume with a live local consumer proxy", async () => {
+        const registry = makeProvidingRegistry();
+        let consumeHandle;
+        const packageDefinition = (0, builder_1.definePackage)((pkg) => {
+            pkg.packageId = (0, utils_1.newid)();
+            pkg.version = "1.0.0";
+            consumeHandle = pkg.consumes(contractId, 1);
+        });
+        await (0, resolve_consumed_contracts_1.resolveConsumedContracts)(mockDataContext(), registry, packageDefinition);
+        if (!consumeHandle) {
+            throw new Error("expected consume handle");
+        }
+        const consumer = (await consumeHandle.consumer);
+        expect(consumer).toBeDefined();
+        expect(consumer?.contractId).toBe(contractId);
+        expect(consumer?.version).toBe(1);
+        await expect(consumer?.tables.Items.list()).resolves.toEqual([{ itemId: "1" }]);
+        await expect(consumer?.tables.Items.count()).resolves.toBe(1);
+    });
+    it("settles optional missing consumes to undefined", async () => {
+        const registry = new registry_1.ContractRegistry();
+        let consumeHandle;
+        const packageDefinition = (0, builder_1.definePackage)((pkg) => {
+            pkg.packageId = (0, utils_1.newid)();
+            pkg.version = "1.0.0";
+            consumeHandle = pkg.consumes(contractId, 1, { optional: true });
+        });
+        await (0, resolve_consumed_contracts_1.resolveConsumedContracts)(mockDataContext(), registry, packageDefinition);
+        if (!consumeHandle) {
+            throw new Error("expected consume handle");
+        }
+        await expect(consumeHandle.consumer).resolves.toBeUndefined();
+    });
+    it("rejects required consumes when no provider is available", async () => {
+        const registry = new registry_1.ContractRegistry();
+        let consumeHandle;
+        const packageDefinition = (0, builder_1.definePackage)((pkg) => {
+            pkg.packageId = (0, utils_1.newid)();
+            pkg.version = "1.0.0";
+            consumeHandle = pkg.consumes(contractId, 1);
+        });
+        await (0, resolve_consumed_contracts_1.resolveConsumedContracts)(mockDataContext(), registry, packageDefinition);
+        if (!consumeHandle) {
+            throw new Error("expected consume handle");
+        }
+        await expect(consumeHandle.consumer).rejects.toThrow(/could not be resolved/);
+    });
+    it("treats a registered provider without a live resolver as missing", async () => {
+        const noResolverContractId = (0, utils_1.newid)();
+        const registry = new registry_1.ContractRegistry();
+        registry.register(providerPackageId, {
+            contractId: noResolverContractId,
+            version: 1,
+            devTag: "dev",
+            name: "No Resolver",
+            description: "test",
+            tables: [],
+            tools: [],
+            observables: [],
+            events: [],
+        });
+        expect((0, contract_resolvers_1.getContractResolver)(noResolverContractId, 1)).toBeUndefined();
+        let consumeHandle;
+        const packageDefinition = (0, builder_1.definePackage)((pkg) => {
+            pkg.packageId = (0, utils_1.newid)();
+            pkg.version = "1.0.0";
+            consumeHandle = pkg.consumes(noResolverContractId, 1, { optional: true });
+        });
+        await (0, resolve_consumed_contracts_1.resolveConsumedContracts)(mockDataContext(), registry, packageDefinition);
+        if (!consumeHandle) {
+            throw new Error("expected consume handle");
+        }
+        await expect(consumeHandle.consumer).resolves.toBeUndefined();
+    });
+});

package/dist/rpc-types.d.ts

@@ -2,6 +2,7 @@ import type { IDeviceDatabaseQueryResult, IDeviceOperationStatus, IDeviceToolRun
 import type { ITool } from "./data/tools";
 import type { DevicePairingCeremonyAction, DevicePairingStartDestinationInput, DevicePairingStartSourceResult, DevicePairingState } from "./device-pairing";
 import type { IConsoleLog } from "./logging/console-logs.table";
+import type { IAppNav } from "./types/app-nav";
 /** Named event payload sent across the frontend RPC bridge. */
 export interface IEventData<T = any> {
     name: string;
@@ -115,6 +116,8 @@ export declare const rpcServerCalls: {
     /**
      * Sign a package version with the package author's key (server-side only — key never leaves the server).
      * Returns the base64url detached signature, or undefined if the signing key isn't available.
+     * Optional fields (appNavs, createdBy, createdAt) must match the PV record when present so
+     * propagation verification of the full record succeeds.
      */
     signPackageAuthorVersion: (pvFields: {
         packageId: string;
@@ -124,6 +127,9 @@ export declare const rpcServerCalls: {
         packageBundleFileHash: string;
         routesBundleFileHash?: string;
         uiBundleFileHash?: string;
+        appNavs?: IAppNav[];
+        createdBy?: string;
+        createdAt?: string;
     }) => Promise<string | undefined>;
     registerWithPeersServices: () => Promise<string>;
     appQuit: () => Promise<void>;

package/dist/rpc-types.js

@@ -58,6 +58,8 @@ exports.rpcServerCalls = {
     /**
      * Sign a package version with the package author's key (server-side only — key never leaves the server).
      * Returns the base64url detached signature, or undefined if the signing key isn't available.
+     * Optional fields (appNavs, createdBy, createdAt) must match the PV record when present so
+     * propagation verification of the full record succeeds.
      */
     signPackageAuthorVersion: rpcStub("signPackageAuthorVersion"),
     registerWithPeersServices: rpcStub("registerWithPeersServices"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peers-app/peers-sdk",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/peers-app/peers-sdk.git"