@serve.zone/interfaces 31.9.0 → 32.0.0

package/dist_ts/data/nodeenrollment.d.ts

@@ -1,5 +1,5 @@
 import type { TNodeCredentialPurpose } from './nodecredential.js';
-export interface INodeEnrollmentCredentialProposalV1 {
+export interface INodeEnrollmentCredentialProposal {
     purpose: TNodeCredentialPurpose;
     installationId: string;
     mutationId: string;
@@ -9,8 +9,7 @@ export interface INodeEnrollmentCredentialProposalV1 {
     expectedSessionEpoch: number;
 }
 /** Value-free, immutable proposal. Hashes are still sensitive transport fields. */
-export interface INodeEnrollmentV1 {
-    schemaVersion: 1;
+export interface INodeEnrollment {
     /** 32 CSPRNG bytes encoded as lowercase hexadecimal; retain across every retry. */
     enrollmentId: string;
     cloudlyOrigin: string;
@@ -24,23 +23,23 @@ export interface INodeEnrollmentV1 {
         proofHash: string;
     };
     credentials: [
-        INodeEnrollmentCredentialProposalV1 & {
+        INodeEnrollmentCredentialProposal & {
             purpose: 'spark';
         },
-        INodeEnrollmentCredentialProposalV1 & {
+        INodeEnrollmentCredentialProposal & {
             purpose: 'pallet';
         }
     ];
 }
-export interface INodeEnrollmentRequestV1 {
-    enrollment: INodeEnrollmentV1;
+export interface INodeEnrollmentRequest {
+    enrollment: INodeEnrollment;
     /** Never persist on the server, log, put in URLs, or expose in transport hooks. */
     proof: {
         kind: 'bootstrap' | 'pending-spark';
         bearer: string;
     };
 }
-export interface INodeEnrollmentCredentialAcknowledgementV1 {
+export interface INodeEnrollmentCredentialAcknowledgement {
     purpose: TNodeCredentialPurpose;
     installationId: string;
     mutationId: string;
@@ -48,24 +47,22 @@ export interface INodeEnrollmentCredentialAcknowledgementV1 {
     generation: number;
 }
 /** Immutable commit evidence, not authorization or workload readiness. */
-export interface INodeEnrollmentAcknowledgementV1 {
-    schemaVersion: 1;
+export interface INodeEnrollmentAcknowledgement {
     enrollmentId: string;
     cloudlyOrigin: string;
     nodeId: string;
     requestDigest: string;
     credentials: [
-        INodeEnrollmentCredentialAcknowledgementV1 & {
+        INodeEnrollmentCredentialAcknowledgement & {
             purpose: 'spark';
         },
-        INodeEnrollmentCredentialAcknowledgementV1 & {
+        INodeEnrollmentCredentialAcknowledgement & {
             purpose: 'pallet';
         }
     ];
 }
 /** Returned only after current Spark authentication and proof that Pallet is absent. */
-export interface INodeEnrollmentStateV1 {
-    schemaVersion: 1;
+export interface INodeEnrollmentState {
     nodeId: string;
     spark: {
         generation: number;
@@ -74,8 +71,7 @@ export interface INodeEnrollmentStateV1 {
     pallet: 'absent';
 }
 /** Root-authenticated, node-local IPC only. Initial Pallet authority is always absent. */
-export interface IPalletNodeEnrollmentPreparationV1 {
-    schemaVersion: 1;
+export interface IPalletNodeEnrollmentPreparation {
     purpose: 'pallet';
     installationId: string;
     mutationId: string;
@@ -83,70 +79,69 @@ export interface IPalletNodeEnrollmentPreparationV1 {
     nodeId: string | null;
 }
 /** Full exact activation wire body; Cloudly authentication remains the coordinator's responsibility. */
-export interface IPalletNodeEnrollmentActivationV1 {
-    enrollment: INodeEnrollmentV1;
-    acknowledgement: INodeEnrollmentAcknowledgementV1;
+export interface IPalletNodeEnrollmentActivation {
+    enrollment: INodeEnrollment;
+    acknowledgement: INodeEnrollmentAcknowledgement;
 }
-interface IPalletNodeEnrollmentConfirmationBaseV1 {
-    schemaVersion: 1;
+interface IPalletNodeEnrollmentConfirmationBase {
     purpose: 'pallet';
     enrollmentId: string;
     cloudlyOrigin: string;
     requestDigest: string;
 }
 /** The exact pending binding is durable now, not merely a historical receipt. */
-export interface IPalletNodeEnrollmentBoundV1 extends IPalletNodeEnrollmentConfirmationBaseV1 {
+export interface IPalletNodeEnrollmentBound extends IPalletNodeEnrollmentConfirmationBase {
     phase: 'bound';
     /** Null before Cloudly assigns a fresh Jump node; exact existing node for adoption. */
     nodeId: string | null;
 }
 /** Exact CURRENT local Pallet identity, not Spark activation or remote authorization. */
-export interface IPalletNodeEnrollmentActiveV1 extends IPalletNodeEnrollmentConfirmationBaseV1 {
+export interface IPalletNodeEnrollmentActive extends IPalletNodeEnrollmentConfirmationBase {
     phase: 'active';
     nodeId: string;
 }
-export type TPalletNodeEnrollmentConfirmationV1 = IPalletNodeEnrollmentBoundV1 | IPalletNodeEnrollmentActiveV1;
+export type TPalletNodeEnrollmentConfirmation = IPalletNodeEnrollmentBound | IPalletNodeEnrollmentActive;
 /** Wire bounds, not a listener, permission check, timeout implementation or storage API. */
-export declare const palletNodeEnrollmentV1Contract: Readonly<{
+export declare const palletNodeEnrollmentContract: Readonly<{
     readonly socketPath: "/run/serve.zone/pallet/control.sock";
     readonly frame: "u32be-length-prefixed-utf8-json-then-write-half-close";
     readonly requestsPerConnection: 1;
     readonly maxRequestBytes: 32768;
     readonly maxResponseBytes: 16384;
 }>;
-export declare const nodeEnrollmentV1Contract: Readonly<{
-    readonly digestDomain: "serve.zone/node-enrollment-v1";
+export declare const nodeEnrollmentContract: Readonly<{
+    readonly digestDomain: "serve.zone/node-enrollment";
     readonly localActivation: "independently-durable-convergence";
     readonly bootstrapProof: "first-commit-only";
     readonly pendingSparkProof: "committed-exact-receipt-only";
 }>;
 /** Detached frozen snapshot, captured synchronously before hashing or other awaits. */
-export declare const snapshotNodeEnrollmentV1: (valueArg: unknown) => INodeEnrollmentV1;
-export declare const computeNodeEnrollmentV1Digest: (valueArg: INodeEnrollmentV1) => Promise<string>;
-export declare const snapshotNodeEnrollmentRequestV1: (valueArg: unknown) => INodeEnrollmentRequestV1;
+export declare const snapshotNodeEnrollment: (valueArg: unknown) => INodeEnrollment;
+export declare const computeNodeEnrollmentDigest: (valueArg: INodeEnrollment) => Promise<string>;
+export declare const snapshotNodeEnrollmentRequest: (valueArg: unknown) => INodeEnrollmentRequest;
 /**
  * Pure proof binding/mode check only, NOT authentication. The server must derive
  * receiptState from its owned transaction, compare the complete stored proposal,
  * and fence current Jump/Spark/Pallet authority before any commit or replay.
  */
-export declare const verifyNodeEnrollmentProofV1: (valueArg: INodeEnrollmentRequestV1, receiptStateArg: "absent" | "committed") => Promise<boolean>;
-export declare const snapshotNodeEnrollmentAcknowledgementV1: (valueArg: unknown) => INodeEnrollmentAcknowledgementV1;
+export declare const verifyNodeEnrollmentProof: (valueArg: INodeEnrollmentRequest, receiptStateArg: "absent" | "committed") => Promise<boolean>;
+export declare const snapshotNodeEnrollmentAcknowledgement: (valueArg: unknown) => INodeEnrollmentAcknowledgement;
 /** Content binding only. Authenticate Cloudly first; persist only the returned snapshot. */
-export declare const bindNodeEnrollmentAcknowledgementV1: (enrollmentArg: INodeEnrollmentV1, acknowledgementArg: INodeEnrollmentAcknowledgementV1) => Promise<INodeEnrollmentAcknowledgementV1>;
-export declare const snapshotNodeEnrollmentStateV1: (valueArg: unknown) => INodeEnrollmentStateV1;
+export declare const bindNodeEnrollmentAcknowledgement: (enrollmentArg: INodeEnrollment, acknowledgementArg: INodeEnrollmentAcknowledgement) => Promise<INodeEnrollmentAcknowledgement>;
+export declare const snapshotNodeEnrollmentState: (valueArg: unknown) => INodeEnrollmentState;
 /** Decoded JSON/data records only, captured synchronously; never invokes getters. */
-export declare const snapshotPalletNodeEnrollmentPreparationV1: (valueArg: unknown) => IPalletNodeEnrollmentPreparationV1;
+export declare const snapshotPalletNodeEnrollmentPreparation: (valueArg: unknown) => IPalletNodeEnrollmentPreparation;
 /** Content binding only. Authenticate the local Pallet transport before trusting this proposal. */
-export declare const bindPalletNodeEnrollmentPreparationV1: (preparationArg: IPalletNodeEnrollmentPreparationV1, proposalArg: unknown) => INodeEnrollmentV1["credentials"][1];
+export declare const bindPalletNodeEnrollmentPreparation: (preparationArg: IPalletNodeEnrollmentPreparation, proposalArg: unknown) => INodeEnrollment["credentials"][1];
 /** Capture the exact wrapper and both nested values before any asynchronous content binding. */
-export declare const snapshotPalletNodeEnrollmentActivationV1: (valueArg: unknown) => IPalletNodeEnrollmentActivationV1;
-export declare const snapshotPalletNodeEnrollmentConfirmationV1: (valueArg: unknown) => TPalletNodeEnrollmentConfirmationV1;
+export declare const snapshotPalletNodeEnrollmentActivation: (valueArg: unknown) => IPalletNodeEnrollmentActivation;
+export declare const snapshotPalletNodeEnrollmentConfirmation: (valueArg: unknown) => TPalletNodeEnrollmentConfirmation;
 /** Pure binding only. Pallet must prove its durable pending binding before issuing this response. */
-export declare const bindPalletNodeEnrollmentBoundV1: (enrollmentArg: INodeEnrollmentV1, confirmationArg: IPalletNodeEnrollmentBoundV1) => Promise<IPalletNodeEnrollmentBoundV1>;
+export declare const bindPalletNodeEnrollmentBound: (enrollmentArg: INodeEnrollment, confirmationArg: IPalletNodeEnrollmentBound) => Promise<IPalletNodeEnrollmentBound>;
 /**
  * Pure binding only, NOT authentication or a database check. The root-authenticated
  * Pallet owner must first prove its exact CURRENT local identity, not just a receipt.
  * This does not assert Spark activation, current Cloudly authority or workload readiness.
  */
-export declare const bindPalletNodeEnrollmentActiveV1: (activationArg: IPalletNodeEnrollmentActivationV1, confirmationArg: IPalletNodeEnrollmentActiveV1) => Promise<IPalletNodeEnrollmentActiveV1>;
+export declare const bindPalletNodeEnrollmentActive: (activationArg: IPalletNodeEnrollmentActivation, confirmationArg: IPalletNodeEnrollmentActive) => Promise<IPalletNodeEnrollmentActive>;
 export {};

package/dist_ts/data/nodeenrollment.js

@@ -1,14 +1,15 @@
 import { canonicalizeStrictJson, createCanonicalJsonSha256Hex, createSha256Hex, deepFreezeValue, } from '../private/canonicaljson.js';
+import { readDataElements, readDataProperty, readExactDataRecord, } from '../private/dataproperties.js';
 /** Wire bounds, not a listener, permission check, timeout implementation or storage API. */
-export const palletNodeEnrollmentV1Contract = Object.freeze({
+export const palletNodeEnrollmentContract = Object.freeze({
     socketPath: '/run/serve.zone/pallet/control.sock',
     frame: 'u32be-length-prefixed-utf8-json-then-write-half-close',
     requestsPerConnection: 1,
     maxRequestBytes: 32768,
     maxResponseBytes: 16384,
 });
-export const nodeEnrollmentV1Contract = Object.freeze({
-    digestDomain: 'serve.zone/node-enrollment-v1',
+export const nodeEnrollmentContract = Object.freeze({
+    digestDomain: 'serve.zone/node-enrollment',
     localActivation: 'independently-durable-convergence',
     bootstrapProof: 'first-commit-only',
     pendingSparkProof: 'committed-exact-receipt-only',
@@ -18,30 +19,17 @@ function requireValue(valueArg) {
     if (!valueArg)
         fail();
 }
-/** Decoded JSON/data records only. No input accessor is executed or preserved. */
+/** Exactly this shape's keys, read once as data; an accessor is refused, never invoked. */
 const record = (valueArg, keysArg) => {
-    requireValue(valueArg !== null && typeof valueArg === 'object' && !Array.isArray(valueArg));
-    const prototype = Object.getPrototypeOf(valueArg);
-    requireValue(prototype === Object.prototype || prototype === null);
-    const keys = Reflect.ownKeys(valueArg);
-    requireValue(keys.length === keysArg.length);
-    const snapshot = Object.create(null);
-    for (const key of keys) {
-        requireValue(typeof key === 'string' && keysArg.includes(key));
-        const descriptor = Object.getOwnPropertyDescriptor(valueArg, key);
-        requireValue(descriptor?.enumerable && Object.hasOwn(descriptor, 'value'));
-        snapshot[key] = descriptor.value;
-    }
+    const snapshot = readExactDataRecord(valueArg, keysArg);
+    requireValue(snapshot !== null);
     return snapshot;
 };
+/** The dense two-element credential tuple, read the same way as a record. */
 const pair = (valueArg) => {
-    requireValue(Array.isArray(valueArg) && Object.getPrototypeOf(valueArg) === Array.prototype);
-    requireValue(Reflect.ownKeys(valueArg).length === 3 && valueArg.length === 2);
-    const first = Object.getOwnPropertyDescriptor(valueArg, '0');
-    const second = Object.getOwnPropertyDescriptor(valueArg, '1');
-    requireValue(first?.enumerable && Object.hasOwn(first, 'value'));
-    requireValue(second?.enumerable && Object.hasOwn(second, 'value'));
-    return [first.value, second.value];
+    const elements = readDataElements(valueArg, 2);
+    requireValue(elements !== null && elements.length === 2);
+    return [elements[0], elements[1]];
 };
 const id = (valueArg) => {
     requireValue(typeof valueArg === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(valueArg));
@@ -87,14 +75,12 @@ const distinctOwners = (sparkArg, palletArg) => {
         && sparkArg.mutationId !== palletArg.mutationId && sparkArg.tokenHash !== palletArg.tokenHash);
 };
 /** Detached frozen snapshot, captured synchronously before hashing or other awaits. */
-export const snapshotNodeEnrollmentV1 = (valueArg) => {
-    const value = record(valueArg, ['schemaVersion', 'enrollmentId', 'cloudlyOrigin', 'hostname',
+export const snapshotNodeEnrollment = (valueArg) => {
+    const value = record(valueArg, ['enrollmentId', 'cloudlyOrigin', 'hostname',
         'bootstrap', 'credentials']);
-    requireValue(value.schemaVersion === 1);
-    // Read the discriminant from its data descriptor, never an input getter.
-    requireValue(value.bootstrap !== null && typeof value.bootstrap === 'object');
-    const kind = Object.getOwnPropertyDescriptor(value.bootstrap, 'kind');
-    requireValue(kind && Object.hasOwn(kind, 'value'));
+    // Read the discriminant as data, never through an input getter.
+    const kind = readDataProperty(value.bootstrap, 'kind');
+    requireValue(kind !== null);
     const bootstrap = record(value.bootstrap, kind.value === 'jump'
         ? ['kind', 'proofHash'] : ['kind', 'nodeId', 'proofHash']);
     requireValue(bootstrap.kind === 'jump' || bootstrap.kind === 'adopt-existing');
@@ -106,22 +92,22 @@ export const snapshotNodeEnrollmentV1 = (valueArg) => {
     requireValue(bootstrap.kind === 'jump'
         ? spark.expectedGeneration === 0 && spark.expectedSessionEpoch === 0
         : spark.expectedGeneration > 0);
-    return deepFreezeValue({ schemaVersion: 1, enrollmentId: hash(value.enrollmentId),
+    return deepFreezeValue({ enrollmentId: hash(value.enrollmentId),
         cloudlyOrigin: origin(value.cloudlyOrigin), hostname: hostname(value.hostname),
         bootstrap: bootstrap.kind === 'jump'
             ? { kind: 'jump', proofHash: hash(bootstrap.proofHash) }
             : { kind: 'adopt-existing', nodeId: id(bootstrap.nodeId), proofHash: hash(bootstrap.proofHash) },
         credentials: [spark, pallet] });
 };
-export const computeNodeEnrollmentV1Digest = async (valueArg) => {
-    const payload = snapshotNodeEnrollmentV1(valueArg);
+export const computeNodeEnrollmentDigest = async (valueArg) => {
+    const payload = snapshotNodeEnrollment(valueArg);
     return createCanonicalJsonSha256Hex(canonicalizeStrictJson({
-        domain: nodeEnrollmentV1Contract.digestDomain, payload,
+        domain: nodeEnrollmentContract.digestDomain, payload,
     }, fail), fail);
 };
-export const snapshotNodeEnrollmentRequestV1 = (valueArg) => {
+export const snapshotNodeEnrollmentRequest = (valueArg) => {
     const value = record(valueArg, ['enrollment', 'proof']);
-    const enrollment = snapshotNodeEnrollmentV1(value.enrollment);
+    const enrollment = snapshotNodeEnrollment(value.enrollment);
     const proof = record(value.proof, ['kind', 'bearer']);
     requireValue(proof.kind === 'bootstrap' || proof.kind === 'pending-spark');
     requireValue(typeof proof.bearer === 'string');
@@ -134,9 +120,9 @@ export const snapshotNodeEnrollmentRequestV1 = (valueArg) => {
  * receiptState from its owned transaction, compare the complete stored proposal,
  * and fence current Jump/Spark/Pallet authority before any commit or replay.
  */
-export const verifyNodeEnrollmentProofV1 = async (valueArg, receiptStateArg) => {
+export const verifyNodeEnrollmentProof = async (valueArg, receiptStateArg) => {
     try {
-        const { enrollment, proof } = snapshotNodeEnrollmentRequestV1(valueArg);
+        const { enrollment, proof } = snapshotNodeEnrollmentRequest(valueArg);
         if (!(proof.kind === 'bootstrap' && receiptStateArg === 'absent')
             && !(proof.kind === 'pending-spark' && receiptStateArg === 'committed'))
             return false;
@@ -155,23 +141,22 @@ const credentialAcknowledgement = (valueArg, purposeArg) => {
     return { purpose: purposeArg, installationId: id(value.installationId), mutationId: id(value.mutationId),
         tokenHash: hash(value.tokenHash), generation: counter(value.generation, 1) };
 };
-export const snapshotNodeEnrollmentAcknowledgementV1 = (valueArg) => {
-    const value = record(valueArg, ['schemaVersion', 'enrollmentId', 'cloudlyOrigin', 'nodeId',
+export const snapshotNodeEnrollmentAcknowledgement = (valueArg) => {
+    const value = record(valueArg, ['enrollmentId', 'cloudlyOrigin', 'nodeId',
         'requestDigest', 'credentials']);
-    requireValue(value.schemaVersion === 1);
     const [sparkInput, palletInput] = pair(value.credentials);
     const spark = credentialAcknowledgement(sparkInput, 'spark');
     const pallet = credentialAcknowledgement(palletInput, 'pallet');
     distinctOwners(spark, pallet);
     requireValue(pallet.generation === 1);
-    return deepFreezeValue({ schemaVersion: 1, enrollmentId: hash(value.enrollmentId),
+    return deepFreezeValue({ enrollmentId: hash(value.enrollmentId),
         cloudlyOrigin: origin(value.cloudlyOrigin), nodeId: id(value.nodeId),
         requestDigest: hash(value.requestDigest), credentials: [spark, pallet] });
 };
 /** Content binding only. Authenticate Cloudly first; persist only the returned snapshot. */
-export const bindNodeEnrollmentAcknowledgementV1 = async (enrollmentArg, acknowledgementArg) => {
-    const enrollment = snapshotNodeEnrollmentV1(enrollmentArg);
-    const ack = snapshotNodeEnrollmentAcknowledgementV1(acknowledgementArg);
+export const bindNodeEnrollmentAcknowledgement = async (enrollmentArg, acknowledgementArg) => {
+    const enrollment = snapshotNodeEnrollment(enrollmentArg);
+    const ack = snapshotNodeEnrollmentAcknowledgement(acknowledgementArg);
     requireValue(ack.enrollmentId === enrollment.enrollmentId && ack.cloudlyOrigin === enrollment.cloudlyOrigin
         && (enrollment.bootstrap.kind === 'jump' || ack.nodeId === enrollment.bootstrap.nodeId));
     for (const index of [0, 1]) {
@@ -181,28 +166,28 @@ export const bindNodeEnrollmentAcknowledgementV1 = async (enrollmentArg, acknowl
             && actual.mutationId === expected.mutationId && actual.tokenHash === expected.tokenHash
             && actual.generation === expected.expectedGeneration + 1);
     }
-    requireValue(ack.requestDigest === await computeNodeEnrollmentV1Digest(enrollment));
+    requireValue(ack.requestDigest === await computeNodeEnrollmentDigest(enrollment));
     return ack;
 };
-export const snapshotNodeEnrollmentStateV1 = (valueArg) => {
-    const value = record(valueArg, ['schemaVersion', 'nodeId', 'spark', 'pallet']);
-    requireValue(value.schemaVersion === 1 && value.pallet === 'absent');
+export const snapshotNodeEnrollmentState = (valueArg) => {
+    const value = record(valueArg, ['nodeId', 'spark', 'pallet']);
+    requireValue(value.pallet === 'absent');
     const spark = record(value.spark, ['generation', 'sessionEpoch']);
-    return deepFreezeValue({ schemaVersion: 1, nodeId: id(value.nodeId), pallet: 'absent',
+    return deepFreezeValue({ nodeId: id(value.nodeId), pallet: 'absent',
         spark: { generation: counter(spark.generation, 1, true), sessionEpoch: counter(spark.sessionEpoch, 0, true) } });
 };
 /** Decoded JSON/data records only, captured synchronously; never invokes getters. */
-export const snapshotPalletNodeEnrollmentPreparationV1 = (valueArg) => {
-    const value = record(valueArg, ['schemaVersion', 'purpose', 'installationId', 'mutationId',
+export const snapshotPalletNodeEnrollmentPreparation = (valueArg) => {
+    const value = record(valueArg, ['purpose', 'installationId', 'mutationId',
         'cloudlyOrigin', 'nodeId']);
-    requireValue(value.schemaVersion === 1 && value.purpose === 'pallet');
-    return deepFreezeValue({ schemaVersion: 1, purpose: 'pallet',
+    requireValue(value.purpose === 'pallet');
+    return deepFreezeValue({ purpose: 'pallet',
         installationId: id(value.installationId), mutationId: id(value.mutationId),
         cloudlyOrigin: origin(value.cloudlyOrigin), nodeId: value.nodeId === null ? null : id(value.nodeId) });
 };
 /** Content binding only. Authenticate the local Pallet transport before trusting this proposal. */
-export const bindPalletNodeEnrollmentPreparationV1 = (preparationArg, proposalArg) => {
-    const preparation = snapshotPalletNodeEnrollmentPreparationV1(preparationArg);
+export const bindPalletNodeEnrollmentPreparation = (preparationArg, proposalArg) => {
+    const preparation = snapshotPalletNodeEnrollmentPreparation(preparationArg);
     const result = proposal(proposalArg, 'pallet');
     requireValue(result.installationId === preparation.installationId
         && result.mutationId === preparation.mutationId
@@ -210,17 +195,17 @@ export const bindPalletNodeEnrollmentPreparationV1 = (preparationArg, proposalAr
     return deepFreezeValue(result);
 };
 /** Capture the exact wrapper and both nested values before any asynchronous content binding. */
-export const snapshotPalletNodeEnrollmentActivationV1 = (valueArg) => {
+export const snapshotPalletNodeEnrollmentActivation = (valueArg) => {
     const value = record(valueArg, ['enrollment', 'acknowledgement']);
-    return deepFreezeValue({ enrollment: snapshotNodeEnrollmentV1(value.enrollment),
-        acknowledgement: snapshotNodeEnrollmentAcknowledgementV1(value.acknowledgement) });
+    return deepFreezeValue({ enrollment: snapshotNodeEnrollment(value.enrollment),
+        acknowledgement: snapshotNodeEnrollmentAcknowledgement(value.acknowledgement) });
 };
-export const snapshotPalletNodeEnrollmentConfirmationV1 = (valueArg) => {
-    const value = record(valueArg, ['schemaVersion', 'purpose', 'enrollmentId', 'cloudlyOrigin',
+export const snapshotPalletNodeEnrollmentConfirmation = (valueArg) => {
+    const value = record(valueArg, ['purpose', 'enrollmentId', 'cloudlyOrigin',
         'requestDigest', 'phase', 'nodeId']);
-    requireValue(value.schemaVersion === 1 && value.purpose === 'pallet'
+    requireValue(value.purpose === 'pallet'
         && (value.phase === 'bound' || value.phase === 'active'));
-    const common = { schemaVersion: 1, purpose: 'pallet',
+    const common = { purpose: 'pallet',
         enrollmentId: hash(value.enrollmentId), cloudlyOrigin: origin(value.cloudlyOrigin),
         requestDigest: hash(value.requestDigest) };
     return deepFreezeValue(value.phase === 'bound'
@@ -228,13 +213,13 @@ export const snapshotPalletNodeEnrollmentConfirmationV1 = (valueArg) => {
         : { ...common, phase: 'active', nodeId: id(value.nodeId) });
 };
 /** Pure binding only. Pallet must prove its durable pending binding before issuing this response. */
-export const bindPalletNodeEnrollmentBoundV1 = async (enrollmentArg, confirmationArg) => {
-    const enrollment = snapshotNodeEnrollmentV1(enrollmentArg);
-    const confirmation = snapshotPalletNodeEnrollmentConfirmationV1(confirmationArg);
+export const bindPalletNodeEnrollmentBound = async (enrollmentArg, confirmationArg) => {
+    const enrollment = snapshotNodeEnrollment(enrollmentArg);
+    const confirmation = snapshotPalletNodeEnrollmentConfirmation(confirmationArg);
     requireValue(confirmation.phase === 'bound' && confirmation.enrollmentId === enrollment.enrollmentId
         && confirmation.cloudlyOrigin === enrollment.cloudlyOrigin
         && confirmation.nodeId === (enrollment.bootstrap.kind === 'jump' ? null : enrollment.bootstrap.nodeId));
-    requireValue(confirmation.requestDigest === await computeNodeEnrollmentV1Digest(enrollment));
+    requireValue(confirmation.requestDigest === await computeNodeEnrollmentDigest(enrollment));
     return confirmation;
 };
 /**
@@ -242,14 +227,14 @@ export const bindPalletNodeEnrollmentBoundV1 = async (enrollmentArg, confirmatio
  * Pallet owner must first prove its exact CURRENT local identity, not just a receipt.
  * This does not assert Spark activation, current Cloudly authority or workload readiness.
  */
-export const bindPalletNodeEnrollmentActiveV1 = async (activationArg, confirmationArg) => {
+export const bindPalletNodeEnrollmentActive = async (activationArg, confirmationArg) => {
     // Capture every caller-owned value before the asynchronous shared acknowledgement binder.
-    const { enrollment, acknowledgement } = snapshotPalletNodeEnrollmentActivationV1(activationArg);
-    const confirmation = snapshotPalletNodeEnrollmentConfirmationV1(confirmationArg);
+    const { enrollment, acknowledgement } = snapshotPalletNodeEnrollmentActivation(activationArg);
+    const confirmation = snapshotPalletNodeEnrollmentConfirmation(confirmationArg);
     requireValue(confirmation.phase === 'active');
-    const ack = await bindNodeEnrollmentAcknowledgementV1(enrollment, acknowledgement);
+    const ack = await bindNodeEnrollmentAcknowledgement(enrollment, acknowledgement);
     requireValue(confirmation.enrollmentId === ack.enrollmentId && confirmation.cloudlyOrigin === ack.cloudlyOrigin
         && confirmation.nodeId === ack.nodeId && confirmation.requestDigest === ack.requestDigest);
     return confirmation;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodeenrollment.js","sourceRoot":"","sources":["../../ts/data/nodeenrollment.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodeenrollment.js","sourceRoot":"","sources":["../../ts/data/nodeenrollment.ts"],"names":[],"mappings":"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"}

package/dist_ts/data/privatenetwork.d.ts

@@ -1,5 +1,5 @@
 /** Cloudly owns these definitions. Membership never follows node placement. */
-export interface IPrivateNetworkPolicyV1 {
+export interface IPrivateNetworkPolicy {
     connectivity: 'member-full-mesh';
     /** null denies external resolution; private names are never forwarded. */
     externalDns: {
@@ -12,8 +12,7 @@ export interface IPrivateNetworkPolicyV1 {
         permittedSuffixes: string[];
     } | null;
 }
-export interface IPrivateNetworkV1 {
-    schemaVersion: 1;
+export interface IPrivateNetwork {
     id: string;
     organizationId: string;
     /** Immutable server-owned keys; display-name changes do not rename DNS. */
@@ -22,43 +21,41 @@ export interface IPrivateNetworkV1 {
     name: string;
     revision: number;
     state: 'active' | 'retiring' | 'retired';
-    policy: IPrivateNetworkPolicyV1;
+    policy: IPrivateNetworkPolicy;
     createdAt: number;
     updatedAt: number;
 }
-export interface IPrivateNetworkAttachmentV1 {
+export interface IPrivateNetworkAttachment {
     networkId: string;
     /** Sorted unique single-label aliases, reserved per network for this service. */
     aliases: string[];
 }
 /** Desired membership only. Acceptance is neither packet enforcement nor DNS readiness. */
-export interface IServicePrivateNetworksV1 {
-    schemaVersion: 1;
+export interface IServicePrivateNetworks {
     organizationId: string;
     serviceId: string;
     revision: number;
     /** Sorted by networkId; every network must have the same canonical organization. */
-    attachments: IPrivateNetworkAttachmentV1[];
+    attachments: IPrivateNetworkAttachment[];
     /** Exactly the sole attachment, or explicit selection/null when several exist. */
     defaultNetworkId: string | null;
 }
-interface IPrivateNetworkMutationBaseV1 {
-    schemaVersion: 1;
+interface IPrivateNetworkMutationBase {
     organizationId: string;
     /** Retain the exact body and this identifier across retries. */
     mutationId: string;
 }
-export type TPrivateNetworkMutationV1 = IPrivateNetworkMutationBaseV1 & ({
+export type TPrivateNetworkMutation = IPrivateNetworkMutationBase & ({
     operation: 'create';
     expectedRevision: null;
     name: string;
-    policy: IPrivateNetworkPolicyV1;
+    policy: IPrivateNetworkPolicy;
 } | {
     operation: 'update';
     networkId: string;
     expectedRevision: number;
     name: string;
-    policy: IPrivateNetworkPolicyV1;
+    policy: IPrivateNetworkPolicy;
 }
 /** Retirement completes only after outstanding grants are denied or independently fenced. */
  | {
@@ -66,14 +63,14 @@ export type TPrivateNetworkMutationV1 = IPrivateNetworkMutationBaseV1 & ({
     networkId: string;
     expectedRevision: number;
 });
-export interface ISetServicePrivateNetworksV1 extends IPrivateNetworkMutationBaseV1 {
+export interface ISetServicePrivateNetworks extends IPrivateNetworkMutationBase {
     serviceId: string;
     /** null means the service has never had a membership document; not an empty list. */
     expectedRevision: number | null;
-    attachments: IPrivateNetworkAttachmentV1[];
+    attachments: IPrivateNetworkAttachment[];
     defaultNetworkId: string | null;
 }
-export declare const privateNetworkV1Contract: Readonly<{
+export declare const privateNetworkContract: Readonly<{
     readonly privateRoot: "internal.";
     readonly maximumAttachments: 16;
     readonly maximumAliasesPerAttachment: 32;
@@ -86,14 +83,14 @@ export declare const privateNetworkV1Contract: Readonly<{
     readonly omission: "no-effect";
 }>;
 /** Structural validation only; backend IP ownership/reachability and policy fences are required. */
-export declare const snapshotPrivateNetworkPolicyV1: (value: unknown) => IPrivateNetworkPolicyV1;
-export declare const snapshotPrivateNetworkV1: (value: unknown) => IPrivateNetworkV1;
-export declare const snapshotServicePrivateNetworksV1: (value: unknown) => IServicePrivateNetworksV1;
-export declare const snapshotSetServicePrivateNetworksV1: (value: unknown) => ISetServicePrivateNetworksV1;
-export declare const snapshotPrivateNetworkMutationV1: (value: unknown) => TPrivateNetworkMutationV1;
+export declare const snapshotPrivateNetworkPolicy: (value: unknown) => IPrivateNetworkPolicy;
+export declare const snapshotPrivateNetwork: (value: unknown) => IPrivateNetwork;
+export declare const snapshotServicePrivateNetworks: (value: unknown) => IServicePrivateNetworks;
+export declare const snapshotSetServicePrivateNetworks: (value: unknown) => ISetServicePrivateNetworks;
+export declare const snapshotPrivateNetworkMutation: (value: unknown) => TPrivateNetworkMutation;
 /** Pure naming helper; it does not reserve a name or create any public DNS/ingress record. */
-export declare const buildPrivateNetworkFqdnV1: (networkValue: unknown, aliasValue: unknown) => string;
-export interface IServicePrivateNetworkDnsPolicyV1 {
+export declare const buildPrivateNetworkFqdn: (networkValue: unknown, aliasValue: unknown) => string;
+export interface IServicePrivateNetworkDnsPolicy {
     organizationId: string;
     serviceId: string;
     membershipRevision: number;
@@ -120,5 +117,5 @@ export interface IServicePrivateNetworkDnsPolicyV1 {
  * The caller must fence these exact revisions before issuing runtime authority.
  * An inactive/missing/extra network is rejected, never silently omitted.
  */
-export declare const composeServicePrivateNetworkDnsPolicyV1: (membershipValue: unknown, networksValue: unknown) => IServicePrivateNetworkDnsPolicyV1;
+export declare const composeServicePrivateNetworkDnsPolicy: (membershipValue: unknown, networksValue: unknown) => IServicePrivateNetworkDnsPolicy;
 export {};