@naylence/advanced-security 0.3.7-test.123 → 0.3.7-test.125

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-import { EncryptionResult, getLogger as getLogger$1, urlsafeBase64Decode, sealedDecrypt, sealedEncrypt, FIXED_PREFIX_LEN, urlsafeBase64Encode, EncryptionManagerFactory, ENCRYPTION_MANAGER_FACTORY_BASE_TYPE, requireCryptoSupport, SECURE_CHANNEL_MANAGER_FACTORY_BASE_TYPE, SecureChannelManagerFactory, ENVELOPE_SIGNER_FACTORY_BASE_TYPE, EnvelopeSignerFactory, SigningConfigClass, validateSigningKey, JWKValidationError, secureDigest, ENVELOPE_VERIFIER_FACTORY_BASE_TYPE, EnvelopeVerifierFactory, TaskSpawner, getKeyStore, DefaultKeyManager, validateJwkComplete, currentTraceId, DeliveryOriginType, KEY_MANAGER_FACTORY_BASE_TYPE, KeyManagerFactory, KeyStoreFactory, BaseNodeEventListener, LOAD_BALANCER_STICKINESS_MANAGER_FACTORY_BASE_TYPE, LoadBalancerStickinessManagerFactory, REPLICA_STICKINESS_MANAGER_FACTORY_BASE_TYPE, ReplicaStickinessManagerFactory, color, AnsiColor, validateHostLogicals, HTTP_CONNECTION_GRANT_TYPE, formatTimestamp, jsonDumps, WELCOME_SERVICE_FACTORY_BASE_TYPE, WelcomeServiceFactory, NodePlacementStrategyFactory, TransportProvisionerFactory, TokenIssuerFactory, AuthorizerFactory, AuthInjectionStrategyFactory } from '@naylence/runtime';
+import { getLogger, EncryptionResult, urlsafeBase64Decode, sealedDecrypt, sealedEncrypt, FIXED_PREFIX_LEN, urlsafeBase64Encode, EncryptionManagerFactory, ENCRYPTION_MANAGER_FACTORY_BASE_TYPE, requireCryptoSupport, SECURE_CHANNEL_MANAGER_FACTORY_BASE_TYPE, SecureChannelManagerFactory, ENVELOPE_SIGNER_FACTORY_BASE_TYPE, EnvelopeSignerFactory, SigningConfigClass, validateSigningKey, JWKValidationError, decodeBase64Url, canonicalJson, secureDigest, frameDigest, immutableHeaders, encodeUtf8, ENVELOPE_VERIFIER_FACTORY_BASE_TYPE, EnvelopeVerifierFactory, TaskSpawner, getKeyStore, DefaultKeyManager, validateJwkComplete, currentTraceId, DeliveryOriginType, KEY_MANAGER_FACTORY_BASE_TYPE, KeyManagerFactory, KeyStoreFactory, BaseNodeEventListener, LOAD_BALANCER_STICKINESS_MANAGER_FACTORY_BASE_TYPE, LoadBalancerStickinessManagerFactory, REPLICA_STICKINESS_MANAGER_FACTORY_BASE_TYPE, ReplicaStickinessManagerFactory, color, AnsiColor, validateHostLogicals, HTTP_CONNECTION_GRANT_TYPE, formatTimestamp, jsonDumps, WELCOME_SERVICE_FACTORY_BASE_TYPE, WelcomeServiceFactory, NodePlacementStrategyFactory, TransportProvisionerFactory, TokenIssuerFactory, AuthorizerFactory, validateHostLogical, AuthInjectionStrategyFactory, CERTIFICATE_MANAGER_FACTORY_BASE_TYPE, CertificateManagerFactory } from '@naylence/runtime';
 import { ExtensionManager, AbstractResourceFactory, createResource, createDefaultResource, Registry } from '@naylence/factory';
 import { AsnConvert, OctetString } from '@peculiar/asn1-schema';
 import { Attributes, CertificationRequestInfo, CertificationRequest } from '@peculiar/asn1-csr';
@@ -6,8 +6,6 @@ import { Certificate, SubjectAlternativeName, NameConstraints, id_ce_subjectAltN
 import { verify, etc } from '@noble/ed25519';
 import { sha256, sha512 } from '@noble/hashes/sha2.js';
 import { localDeliveryContext, createFameEnvelope, generateId, formatAddress, FameAddress, SigningMaterial, DeliveryOriginType as DeliveryOriginType$1 } from '@naylence/core';
-import { decodeBase64Url, canonicalJson, frameDigest, immutableHeaders } from '@naylence/runtime/naylence/fame/security/signing/eddsa-signer-verifier.js';
-import { encodeUtf8 } from '@naylence/runtime/naylence/fame/security/signing/eddsa-utils.js';
 import { chacha20poly1305 } from '@noble/ciphers/chacha.js';
 import { x25519 } from '@noble/curves/ed25519.js';
 import { hkdf } from '@noble/hashes/hkdf.js';
@@ -15,15 +13,14 @@ import { utf8ToBytes, randomBytes as randomBytes$1 } from '@noble/hashes/utils.j
 import { SignJWT, importPKCS8, compactVerify, importJWK, importSPKI } from 'jose';
 import { sha256 as sha256$1 } from '@noble/hashes/sha256.js';
 import { X509Certificate } from '@peculiar/x509';
-import { getLogger, secureDigest as secureDigest$1, validateHostLogical, CERTIFICATE_MANAGER_FACTORY_BASE_TYPE, CertificateManagerFactory, SigningConfigClass as SigningConfigClass$1 } from '@naylence/runtime/node';
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.7-test.123
+// Generated from package.json version: 0.3.7-test.125
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.7-test.123';
+const VERSION = '0.3.7-test.125';
 
 const logger$h = getLogger("naylence.fame.security.cert.util");
 const CACHE_LIMIT = 512;
@@ -1257,7 +1254,7 @@ class CAServiceClient {
     }
 }
 
-const logger$f = getLogger$1("naylence.fame.security.encryption.sealed.x25519_encryption_manager");
+const logger$f = getLogger("naylence.fame.security.encryption.sealed.x25519_encryption_manager");
 class X25519EncryptionManager {
     constructor({ keyProvider, nodeLike = null, cryptoProvider = null, }) {
         this.pendingEnvelopes = new Map();
@@ -1886,7 +1883,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
     X25519EncryptionManagerFactory: X25519EncryptionManagerFactory
 });
 
-const logger$e = getLogger$1("naylence.fame.security.encryption.channel.channel_encryption_manager");
+const logger$e = getLogger("naylence.fame.security.encryption.channel.channel_encryption_manager");
 const SUPPORTED_CHANNEL_ALGORITHMS = ["chacha20-poly1305-channel"];
 const CHANNEL_ENCRYPTION_ALGORITHM = "chacha20-poly1305-channel";
 const HANDSHAKE_ALGORITHM = "CHACHA20P1305";
@@ -2620,7 +2617,7 @@ class ChannelEncryptionManager {
     }
 }
 
-const logger$d = getLogger$1("naylence.fame.security.encryption.channel.channel_encryption_manager_factory");
+const logger$d = getLogger("naylence.fame.security.encryption.channel.channel_encryption_manager_factory");
 const DEFAULT_SUPPORTED_ALGORITHMS = ["chacha20-poly1305-channel"];
 const FACTORY_META$c = {
     base: ENCRYPTION_MANAGER_FACTORY_BASE_TYPE,
@@ -2714,7 +2711,7 @@ var index = /*#__PURE__*/Object.freeze({
     ChannelEncryptionManagerFactory: ChannelEncryptionManagerFactory
 });
 
-const logger$c = getLogger$1("naylence.fame.security.encryption.default_secure_channel_manager");
+const logger$c = getLogger("naylence.fame.security.encryption.default_secure_channel_manager");
 const DEFAULT_ALGORITHM = "CHACHA20P1305";
 const CHANNEL_KEY_LENGTH = 32;
 const NONCE_PREFIX_LENGTH = 4;
@@ -3044,7 +3041,7 @@ var defaultSecureChannelManagerFactory = /*#__PURE__*/Object.freeze({
     default: DefaultSecureChannelManagerFactory
 });
 
-const logger$b = getLogger$1("naylence.fame.security.encryption.encryption_manager_registry");
+const logger$b = getLogger("naylence.fame.security.encryption.encryption_manager_registry");
 class EncryptionManagerFactoryRegistry {
     constructor(autoDiscover = true) {
         this.factories = [];
@@ -3205,7 +3202,7 @@ function getEncryptionManagerFactoryRegistry() {
     return globalRegistry;
 }
 
-const logger$a = getLogger$1("naylence.fame.security.encryption.composite_encryption_manager");
+const logger$a = getLogger("naylence.fame.security.encryption.composite_encryption_manager");
 const DEFAULT_SEALED_ALGORITHMS = [
     "X25519",
     "ECDH-ES+A256GCM",
@@ -3524,7 +3521,7 @@ class CompositeEncryptionManager {
     }
 }
 
-const logger$9 = getLogger$1("naylence.fame.security.encryption.composite_encryption_manager_factory");
+const logger$9 = getLogger("naylence.fame.security.encryption.composite_encryption_manager_factory");
 const DEFAULT_PRIORITY = 1000;
 const DEFAULT_ENCRYPTION_TYPE = "composite";
 const FACTORY_META$a = {
@@ -3649,7 +3646,7 @@ const FACTORY_META$9 = {
 let eddsaEnvelopeSignerModulePromise = null;
 async function getEdDSAEnvelopeSignerModule() {
     if (!eddsaEnvelopeSignerModulePromise) {
-        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime/naylence/fame/security/signing/eddsa-envelope-signer.js');
+        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime');
     }
     return eddsaEnvelopeSignerModulePromise;
 }
@@ -3935,7 +3932,7 @@ var eddsaEnvelopeVerifierFactory = /*#__PURE__*/Object.freeze({
     default: AdvancedEdDSAEnvelopeVerifierFactory
 });
 
-const logger$8 = getLogger$1("naylence.fame.security.keys.x5c_key_manager");
+const logger$8 = getLogger("naylence.fame.security.keys.x5c_key_manager");
 let x509ModulePromise$1 = null;
 async function loadX509Module$1() {
     if (!x509ModulePromise$1) {
@@ -4539,7 +4536,7 @@ function utf8Decode(data) {
     return decodeURIComponent(escape(str));
 }
 
-const logger$7 = getLogger$1("naylence.fame.stickiness.aft_signer");
+const logger$7 = getLogger("naylence.fame.stickiness.aft_signer");
 class AbstractAFTSigner {
     constructor(kid, maxTtlSec = 7200) {
         this.kid = kid;
@@ -4681,7 +4678,7 @@ function createAftSigner(options) {
     }
 }
 
-const logger$6 = getLogger$1("naylence.fame.stickiness.aft_helper");
+const logger$6 = getLogger("naylence.fame.stickiness.aft_helper");
 class AFTHelper {
     constructor(options) {
         this.signer = options.signer;
@@ -4750,7 +4747,7 @@ function createAftHelper(options) {
 }
 const DEFAULT_STICKINESS_SECURITY_LEVEL = StickinessMode.SIGNED_OPTIONAL;
 
-const logger$5 = getLogger$1("naylence.fame.stickiness.aft_verifier");
+const logger$5 = getLogger("naylence.fame.stickiness.aft_verifier");
 function decodeToken(token) {
     const parts = token.split(".");
     if (parts.length !== 3) {
@@ -5036,7 +5033,7 @@ function createAftVerifier(options) {
     }
 }
 
-const logger$4 = getLogger$1("naylence.fame.stickiness.aft_load_balancer_stickiness_manager");
+const logger$4 = getLogger("naylence.fame.stickiness.aft_load_balancer_stickiness_manager");
 class AFTAssociation {
     constructor(params) {
         this.replicaId = params.replicaId;
@@ -5546,7 +5543,7 @@ var aftLoadBalancerStickinessManagerFactory = /*#__PURE__*/Object.freeze({
     default: AFTLoadBalancerStickinessManagerFactory
 });
 
-const logger$3 = getLogger$1("naylence.fame.stickiness.aft_replica_stickiness_manager");
+const logger$3 = getLogger("naylence.fame.stickiness.aft_replica_stickiness_manager");
 function isStickinessRequired(context) {
     if (typeof context.stickinessRequired === "boolean") {
         return context.stickinessRequired;
@@ -5796,7 +5793,7 @@ var aftReplicaStickinessManagerFactory = /*#__PURE__*/Object.freeze({
     default: AFTReplicaStickinessManagerFactory
 });
 
-const logger$2 = getLogger$1("naylence.fame.welcome.advanced_welcome_service");
+const logger$2 = getLogger("naylence.fame.welcome.advanced_welcome_service");
 const ENV_VAR_SHOW_ENVELOPES = "FAME_SHOW_ENVELOPES";
 const DEFAULT_TTL_SEC = 3600;
 const showEnvelopes = typeof process !== "undefined" &&
@@ -6888,7 +6885,7 @@ class CASigningService extends CAService {
         const publicKeyPem = derToPem(publicKeyDer, "PUBLIC KEY");
         // Determine node SID and physical path (mirrors Python logic)
         const physicalPath = csr.physicalPath || `/unknown/${csr.requesterId}`;
-        const nodeSid = secureDigest$1(physicalPath);
+        const nodeSid = secureDigest(physicalPath);
         const logicals = csr.logicals || [];
         // Issue the certificate (short-lived: 1 day)
         const certificatePem = await this.signNodeCert(publicKeyPem, csr.requesterId, // Use requesterId as node_id
@@ -6920,7 +6917,7 @@ class CASigningService extends CAService {
         await this.ensureSigningMaterials();
         const signingCert = this.getSigningCertificate();
         const signingKey = this.getSigningKey();
-        const expectedSid = secureDigest$1(physicalPath);
+        const expectedSid = secureDigest(physicalPath);
         if (expectedSid !== nodeSid) {
             throw new Error("Provided SID does not match the computed SID for the physical path");
         }
@@ -7665,7 +7662,7 @@ function encodeBitString(signature) {
     return result.buffer;
 }
 
-const logger$1 = getLogger$1("naylence.fame.security.cert.default_certificate_manager");
+const logger$1 = getLogger("naylence.fame.security.cert.default_certificate_manager");
 const CONNECTION_GRANTS_CAMEL = "connectionGrants";
 const CONNECTION_GRANTS_SNAKE = "connection_grants";
 class DefaultCertificateManager {
@@ -8499,18 +8496,18 @@ function normalizeSecuritySettings(config, explicit) {
     return null;
 }
 function normalizeSigning(config, explicit) {
-    if (explicit instanceof SigningConfigClass$1) {
+    if (explicit instanceof SigningConfigClass) {
         return explicit;
     }
     if (explicit && typeof explicit === "object") {
-        return new SigningConfigClass$1(explicit);
+        return new SigningConfigClass(explicit);
     }
     const candidate = config.signing ?? null;
-    if (candidate instanceof SigningConfigClass$1) {
+    if (candidate instanceof SigningConfigClass) {
         return candidate;
     }
     if (candidate && typeof candidate === "object") {
-        return new SigningConfigClass$1(candidate);
+        return new SigningConfigClass(candidate);
     }
     return null;
 }
@@ -8659,7 +8656,7 @@ function bytesToUtf8$1(data) {
 
 const DEFAULT_REFRESH_INTERVAL_MS = 86400000; // 24 hours
 const MIN_REFRESH_INTERVAL_MS = 60000; // 1 minute
-const logger = getLogger$1("naylence.fame.security.cert.trust_store.http_bundle_provider");
+const logger = getLogger("naylence.fame.security.cert.trust_store.http_bundle_provider");
 function isTruthyFlag(value) {
     if (typeof value === "boolean") {
         return value;

package/dist/node/node.cjs

@@ -4,30 +4,27 @@ var asn1Schema = require('@peculiar/asn1-schema');
 var asn1X509 = require('@peculiar/asn1-x509');
 var sha2_js = require('@noble/hashes/sha2.js');
 var ed25519 = require('@noble/ed25519');
-var node = require('@naylence/runtime/node');
+var runtime = require('@naylence/runtime');
 var asn1Csr = require('@peculiar/asn1-csr');
 var x509 = require('@peculiar/x509');
 var core = require('@naylence/core');
-var runtime = require('@naylence/runtime');
 var chacha_js = require('@noble/ciphers/chacha.js');
 var ed25519_js = require('@noble/curves/ed25519.js');
 var hkdf_js = require('@noble/hashes/hkdf.js');
 var utils_js = require('@noble/hashes/utils.js');
-var eddsaSignerVerifier_js = require('@naylence/runtime/naylence/fame/security/signing/eddsa-signer-verifier.js');
-var eddsaUtils_js = require('@naylence/runtime/naylence/fame/security/signing/eddsa-utils.js');
 var factory = require('@naylence/factory');
 var jose = require('jose');
 var sha256_js = require('@noble/hashes/sha256.js');
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.7-test.123
+// Generated from package.json version: 0.3.7-test.125
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.7-test.123';
+const VERSION = '0.3.7-test.125';
 
-const logger$h = node.getLogger("naylence.fame.security.cert.util");
+const logger$h = runtime.getLogger("naylence.fame.security.cert.util");
 const CACHE_LIMIT = 512;
 const OID_ED25519 = "1.3.101.112";
 const textEncoder = new TextEncoder();
@@ -3662,7 +3659,7 @@ const FACTORY_META$a = {
 let eddsaEnvelopeSignerModulePromise = null;
 async function getEdDSAEnvelopeSignerModule() {
     if (!eddsaEnvelopeSignerModulePromise) {
-        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime/naylence/fame/security/signing/eddsa-envelope-signer.js');
+        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime');
     }
     return eddsaEnvelopeSignerModulePromise;
 }
@@ -3798,7 +3795,7 @@ class EdDSAEnvelopeVerifier {
             }
             throw error;
         }
-        const publicKey = eddsaSignerVerifier_js.decodeBase64Url(candidate);
+        const publicKey = runtime.decodeBase64Url(candidate);
         return { normalizedJwk, publicKey };
     }
     async verifyEnvelope(envelope, options = {}) {
@@ -3821,7 +3818,7 @@ class EdDSAEnvelopeVerifier {
                     throw new Error("DataFrame missing payload digest (pd field)");
                 }
                 const payload = envelope.frame.payload ?? "";
-                const payloadString = payload === "" ? "" : eddsaSignerVerifier_js.canonicalJson(payload);
+                const payloadString = payload === "" ? "" : runtime.canonicalJson(payload);
                 const actualDigest = runtime.secureDigest(payloadString);
                 if (actualDigest !== envelope.frame.pd) {
                     throw new Error("Payload digest mismatch in DataFrame");
@@ -3836,18 +3833,18 @@ class EdDSAEnvelopeVerifier {
             }
         }
         else {
-            trustedDigest = eddsaSignerVerifier_js.frameDigest(envelope.frame);
+            trustedDigest = runtime.frameDigest(envelope.frame);
         }
         const sid = assertString(normalizedJwk.sid, "Signing key missing sid");
-        const immutable = eddsaSignerVerifier_js.canonicalJson(eddsaSignerVerifier_js.immutableHeaders(envelope));
-        const tbs = new Uint8Array(eddsaUtils_js.encodeUtf8(sid).length +
+        const immutable = runtime.canonicalJson(runtime.immutableHeaders(envelope));
+        const tbs = new Uint8Array(runtime.encodeUtf8(sid).length +
             1 +
-            eddsaUtils_js.encodeUtf8(immutable).length +
+            runtime.encodeUtf8(immutable).length +
             1 +
-            eddsaUtils_js.encodeUtf8(trustedDigest).length);
-        const sidBytes = eddsaUtils_js.encodeUtf8(sid);
-        const immBytes = eddsaUtils_js.encodeUtf8(immutable);
-        const digestBytes = eddsaUtils_js.encodeUtf8(trustedDigest);
+            runtime.encodeUtf8(trustedDigest).length);
+        const sidBytes = runtime.encodeUtf8(sid);
+        const immBytes = runtime.encodeUtf8(immutable);
+        const digestBytes = runtime.encodeUtf8(trustedDigest);
         let offset = 0;
         tbs.set(sidBytes, offset);
         offset += sidBytes.length;
@@ -3858,7 +3855,7 @@ class EdDSAEnvelopeVerifier {
         tbs[offset] = 0x1f;
         offset += 1;
         tbs.set(digestBytes, offset);
-        const signatureBytes = eddsaSignerVerifier_js.decodeBase64Url(signatureValue);
+        const signatureBytes = runtime.decodeBase64Url(signatureValue);
         if (signatureBytes.length !== 64) {
             throw new Error("Signature must be 64 bytes for Ed25519");
         }
@@ -7473,7 +7470,7 @@ async function resolveTrustStorePemFromEnvironment() {
 }
 
 const FACTORY_META$4 = {
-    base: node.CERTIFICATE_MANAGER_FACTORY_BASE_TYPE,
+    base: runtime.CERTIFICATE_MANAGER_FACTORY_BASE_TYPE,
     key: "DefaultCertificateManager",
 };
 function normalizeConfig$1(config) {
@@ -7500,18 +7497,18 @@ function normalizeSecuritySettings(config, explicit) {
     return null;
 }
 function normalizeSigning(config, explicit) {
-    if (explicit instanceof node.SigningConfigClass) {
+    if (explicit instanceof runtime.SigningConfigClass) {
         return explicit;
     }
     if (explicit && typeof explicit === "object") {
-        return new node.SigningConfigClass(explicit);
+        return new runtime.SigningConfigClass(explicit);
     }
     const candidate = config.signing ?? null;
-    if (candidate instanceof node.SigningConfigClass) {
+    if (candidate instanceof runtime.SigningConfigClass) {
         return candidate;
     }
     if (candidate && typeof candidate === "object") {
-        return new node.SigningConfigClass(candidate);
+        return new runtime.SigningConfigClass(candidate);
     }
     return null;
 }
@@ -7525,7 +7522,7 @@ function normalizeOptions(config, securitySettings, signing) {
         cryptoProvider,
     };
 }
-class DefaultCertificateManagerFactory extends node.CertificateManagerFactory {
+class DefaultCertificateManagerFactory extends runtime.CertificateManagerFactory {
     constructor() {
         super(...arguments);
         this.type = "DefaultCertificateManager";
@@ -9168,7 +9165,7 @@ class CASigningService extends CAService {
         const publicKeyPem = derToPem(publicKeyDer, "PUBLIC KEY");
         // Determine node SID and physical path (mirrors Python logic)
         const physicalPath = csr.physicalPath || `/unknown/${csr.requesterId}`;
-        const nodeSid = node.secureDigest(physicalPath);
+        const nodeSid = runtime.secureDigest(physicalPath);
         const logicals = csr.logicals || [];
         // Issue the certificate (short-lived: 1 day)
         const certificatePem = await this.signNodeCert(publicKeyPem, csr.requesterId, // Use requesterId as node_id
@@ -9200,13 +9197,13 @@ class CASigningService extends CAService {
         await this.ensureSigningMaterials();
         const signingCert = this.getSigningCertificate();
         const signingKey = this.getSigningKey();
-        const expectedSid = node.secureDigest(physicalPath);
+        const expectedSid = runtime.secureDigest(physicalPath);
         if (expectedSid !== nodeSid) {
             throw new Error("Provided SID does not match the computed SID for the physical path");
         }
         const logicalHosts = logicals ?? [];
         for (const logical of logicalHosts) {
-            const [valid, error] = node.validateHostLogical(logical);
+            const [valid, error] = runtime.validateHostLogical(logical);
             if (!valid) {
                 throw new Error(`Invalid logical host '${logical}': ${error ?? "unknown error"}`);
             }

package/dist/node/node.mjs

@@ -2,28 +2,25 @@ import { AsnConvert, OctetString } from '@peculiar/asn1-schema';
 import { Certificate, id_ce_subjectAltName, SubjectAlternativeName, id_ce_nameConstraints, NameConstraints, Name, RelativeDistinguishedName, AttributeTypeAndValue, AttributeValue, SubjectPublicKeyInfo, GeneralName, Extensions, Extension, Attribute, AlgorithmIdentifier, TBSCertificate, Validity, Version, BasicConstraints, id_ce_basicConstraints, KeyUsageFlags, KeyUsage, id_ce_keyUsage, SubjectKeyIdentifier, id_ce_subjectKeyIdentifier, AuthorityKeyIdentifier, KeyIdentifier, id_ce_authorityKeyIdentifier, GeneralSubtrees, GeneralSubtree, ExtendedKeyUsage, id_kp_clientAuth, id_kp_serverAuth, id_ce_extKeyUsage } from '@peculiar/asn1-x509';
 import { sha512, sha256 } from '@noble/hashes/sha2.js';
 import { verify, etc } from '@noble/ed25519';
-import { getLogger, CERTIFICATE_MANAGER_FACTORY_BASE_TYPE, SigningConfigClass as SigningConfigClass$1, CertificateManagerFactory, secureDigest as secureDigest$1, validateHostLogical } from '@naylence/runtime/node';
+import { getLogger, EncryptionResult, urlsafeBase64Decode, sealedDecrypt, sealedEncrypt, FIXED_PREFIX_LEN, urlsafeBase64Encode, ENCRYPTION_MANAGER_FACTORY_BASE_TYPE, EncryptionManagerFactory, requireCryptoSupport, SECURE_CHANNEL_MANAGER_FACTORY_BASE_TYPE, SecureChannelManagerFactory, ENVELOPE_SIGNER_FACTORY_BASE_TYPE, EnvelopeSignerFactory, SigningConfigClass, validateSigningKey, JWKValidationError, decodeBase64Url, canonicalJson, secureDigest, frameDigest, immutableHeaders, encodeUtf8, ENVELOPE_VERIFIER_FACTORY_BASE_TYPE, EnvelopeVerifierFactory, TaskSpawner, getKeyStore, DefaultKeyManager, validateJwkComplete, currentTraceId, DeliveryOriginType, KEY_MANAGER_FACTORY_BASE_TYPE, KeyManagerFactory, KeyStoreFactory, BaseNodeEventListener, LOAD_BALANCER_STICKINESS_MANAGER_FACTORY_BASE_TYPE, LoadBalancerStickinessManagerFactory, REPLICA_STICKINESS_MANAGER_FACTORY_BASE_TYPE, ReplicaStickinessManagerFactory, color, formatTimestamp, AnsiColor, jsonDumps, validateHostLogicals, HTTP_CONNECTION_GRANT_TYPE, WELCOME_SERVICE_FACTORY_BASE_TYPE, WelcomeServiceFactory, NodePlacementStrategyFactory, TransportProvisionerFactory, TokenIssuerFactory, AuthorizerFactory, AuthInjectionStrategyFactory, CERTIFICATE_MANAGER_FACTORY_BASE_TYPE, CertificateManagerFactory, validateHostLogical } from '@naylence/runtime';
 import { Attributes, CertificationRequestInfo, CertificationRequest } from '@peculiar/asn1-csr';
 import { X509Certificate } from '@peculiar/x509';
 import { localDeliveryContext, createFameEnvelope, FameAddress, generateId, formatAddress, SigningMaterial, DeliveryOriginType as DeliveryOriginType$1 } from '@naylence/core';
-import { getLogger as getLogger$1, EncryptionResult, urlsafeBase64Decode, sealedDecrypt, sealedEncrypt, FIXED_PREFIX_LEN, urlsafeBase64Encode, ENCRYPTION_MANAGER_FACTORY_BASE_TYPE, EncryptionManagerFactory, requireCryptoSupport, SECURE_CHANNEL_MANAGER_FACTORY_BASE_TYPE, SecureChannelManagerFactory, ENVELOPE_SIGNER_FACTORY_BASE_TYPE, EnvelopeSignerFactory, SigningConfigClass, validateSigningKey, JWKValidationError, secureDigest, ENVELOPE_VERIFIER_FACTORY_BASE_TYPE, EnvelopeVerifierFactory, TaskSpawner, getKeyStore, DefaultKeyManager, validateJwkComplete, currentTraceId, DeliveryOriginType, KEY_MANAGER_FACTORY_BASE_TYPE, KeyManagerFactory, KeyStoreFactory, BaseNodeEventListener, LOAD_BALANCER_STICKINESS_MANAGER_FACTORY_BASE_TYPE, LoadBalancerStickinessManagerFactory, REPLICA_STICKINESS_MANAGER_FACTORY_BASE_TYPE, ReplicaStickinessManagerFactory, color, formatTimestamp, AnsiColor, jsonDumps, validateHostLogicals, HTTP_CONNECTION_GRANT_TYPE, WELCOME_SERVICE_FACTORY_BASE_TYPE, WelcomeServiceFactory, NodePlacementStrategyFactory, TransportProvisionerFactory, TokenIssuerFactory, AuthorizerFactory, AuthInjectionStrategyFactory } from '@naylence/runtime';
 import { chacha20poly1305 } from '@noble/ciphers/chacha.js';
 import { x25519 } from '@noble/curves/ed25519.js';
 import { hkdf } from '@noble/hashes/hkdf.js';
 import { utf8ToBytes, randomBytes as randomBytes$1 } from '@noble/hashes/utils.js';
-import { decodeBase64Url, canonicalJson, frameDigest, immutableHeaders } from '@naylence/runtime/naylence/fame/security/signing/eddsa-signer-verifier.js';
-import { encodeUtf8 } from '@naylence/runtime/naylence/fame/security/signing/eddsa-utils.js';
 import { ExtensionManager, AbstractResourceFactory, createResource, createDefaultResource, Registry } from '@naylence/factory';
 import { SignJWT, importPKCS8, compactVerify, importJWK, importSPKI } from 'jose';
 import { sha256 as sha256$1 } from '@noble/hashes/sha256.js';
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.7-test.123
+// Generated from package.json version: 0.3.7-test.125
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.7-test.123';
+const VERSION = '0.3.7-test.125';
 
 const logger$h = getLogger("naylence.fame.security.cert.util");
 const CACHE_LIMIT = 512;
@@ -1263,7 +1260,7 @@ class CAServiceClient {
     }
 }
 
-const logger$f = getLogger$1("naylence.fame.security.encryption.sealed.x25519_encryption_manager");
+const logger$f = getLogger("naylence.fame.security.encryption.sealed.x25519_encryption_manager");
 class X25519EncryptionManager {
     constructor({ keyProvider, nodeLike = null, cryptoProvider = null, }) {
         this.pendingEnvelopes = new Map();
@@ -1892,7 +1889,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
     X25519EncryptionManagerFactory: X25519EncryptionManagerFactory
 });
 
-const logger$e = getLogger$1("naylence.fame.security.encryption.channel.channel_encryption_manager");
+const logger$e = getLogger("naylence.fame.security.encryption.channel.channel_encryption_manager");
 const SUPPORTED_CHANNEL_ALGORITHMS = ["chacha20-poly1305-channel"];
 const CHANNEL_ENCRYPTION_ALGORITHM = "chacha20-poly1305-channel";
 const HANDSHAKE_ALGORITHM = "CHACHA20P1305";
@@ -2628,7 +2625,7 @@ class ChannelEncryptionManager {
     }
 }
 
-const logger$d = getLogger$1("naylence.fame.security.encryption.channel.channel_encryption_manager_factory");
+const logger$d = getLogger("naylence.fame.security.encryption.channel.channel_encryption_manager_factory");
 const DEFAULT_SUPPORTED_ALGORITHMS = ["chacha20-poly1305-channel"];
 const FACTORY_META$d = {
     base: ENCRYPTION_MANAGER_FACTORY_BASE_TYPE,
@@ -2722,7 +2719,7 @@ var index = /*#__PURE__*/Object.freeze({
     ChannelEncryptionManagerFactory: ChannelEncryptionManagerFactory
 });
 
-const logger$c = getLogger$1("naylence.fame.security.encryption.default_secure_channel_manager");
+const logger$c = getLogger("naylence.fame.security.encryption.default_secure_channel_manager");
 const DEFAULT_ALGORITHM = "CHACHA20P1305";
 const CHANNEL_KEY_LENGTH = 32;
 const NONCE_PREFIX_LENGTH = 4;
@@ -3052,7 +3049,7 @@ var defaultSecureChannelManagerFactory = /*#__PURE__*/Object.freeze({
     default: DefaultSecureChannelManagerFactory
 });
 
-const logger$b = getLogger$1("naylence.fame.security.encryption.encryption_manager_registry");
+const logger$b = getLogger("naylence.fame.security.encryption.encryption_manager_registry");
 class EncryptionManagerFactoryRegistry {
     constructor(autoDiscover = true) {
         this.factories = [];
@@ -3216,7 +3213,7 @@ function registerEncryptionManagerFactory(factory) {
     globalRegistry.registerFactory(factory);
 }
 
-const logger$a = getLogger$1("naylence.fame.security.encryption.composite_encryption_manager");
+const logger$a = getLogger("naylence.fame.security.encryption.composite_encryption_manager");
 const DEFAULT_SEALED_ALGORITHMS = [
     "X25519",
     "ECDH-ES+A256GCM",
@@ -3535,7 +3532,7 @@ class CompositeEncryptionManager {
     }
 }
 
-const logger$9 = getLogger$1("naylence.fame.security.encryption.composite_encryption_manager_factory");
+const logger$9 = getLogger("naylence.fame.security.encryption.composite_encryption_manager_factory");
 const DEFAULT_PRIORITY = 1000;
 const DEFAULT_ENCRYPTION_TYPE = "composite";
 const FACTORY_META$b = {
@@ -3660,7 +3657,7 @@ const FACTORY_META$a = {
 let eddsaEnvelopeSignerModulePromise = null;
 async function getEdDSAEnvelopeSignerModule() {
     if (!eddsaEnvelopeSignerModulePromise) {
-        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime/naylence/fame/security/signing/eddsa-envelope-signer.js');
+        eddsaEnvelopeSignerModulePromise = import('@naylence/runtime');
     }
     return eddsaEnvelopeSignerModulePromise;
 }
@@ -3946,7 +3943,7 @@ var eddsaEnvelopeVerifierFactory = /*#__PURE__*/Object.freeze({
     default: AdvancedEdDSAEnvelopeVerifierFactory
 });
 
-const logger$8 = getLogger$1("naylence.fame.security.keys.x5c_key_manager");
+const logger$8 = getLogger("naylence.fame.security.keys.x5c_key_manager");
 let x509ModulePromise$1 = null;
 async function loadX509Module$1() {
     if (!x509ModulePromise$1) {
@@ -4557,7 +4554,7 @@ function utf8Decode(data) {
     return decodeURIComponent(escape(str));
 }
 
-const logger$7 = getLogger$1("naylence.fame.stickiness.aft_signer");
+const logger$7 = getLogger("naylence.fame.stickiness.aft_signer");
 class AbstractAFTSigner {
     constructor(kid, maxTtlSec = 7200) {
         this.kid = kid;
@@ -4699,7 +4696,7 @@ function createAftSigner(options) {
     }
 }
 
-const logger$6 = getLogger$1("naylence.fame.stickiness.aft_helper");
+const logger$6 = getLogger("naylence.fame.stickiness.aft_helper");
 class AFTHelper {
     constructor(options) {
         this.signer = options.signer;
@@ -4768,7 +4765,7 @@ function createAftHelper(options) {
 }
 const DEFAULT_STICKINESS_SECURITY_LEVEL = StickinessMode.SIGNED_OPTIONAL;
 
-const logger$5 = getLogger$1("naylence.fame.stickiness.aft_verifier");
+const logger$5 = getLogger("naylence.fame.stickiness.aft_verifier");
 function decodeToken(token) {
     const parts = token.split(".");
     if (parts.length !== 3) {
@@ -5054,7 +5051,7 @@ function createAftVerifier(options) {
     }
 }
 
-const logger$4 = getLogger$1("naylence.fame.stickiness.aft_load_balancer_stickiness_manager");
+const logger$4 = getLogger("naylence.fame.stickiness.aft_load_balancer_stickiness_manager");
 class AFTAssociation {
     constructor(params) {
         this.replicaId = params.replicaId;
@@ -5564,7 +5561,7 @@ var aftLoadBalancerStickinessManagerFactory = /*#__PURE__*/Object.freeze({
     default: AFTLoadBalancerStickinessManagerFactory
 });
 
-const logger$3 = getLogger$1("naylence.fame.stickiness.aft_replica_stickiness_manager");
+const logger$3 = getLogger("naylence.fame.stickiness.aft_replica_stickiness_manager");
 function isStickinessRequired(context) {
     if (typeof context.stickinessRequired === "boolean") {
         return context.stickinessRequired;
@@ -5814,7 +5811,7 @@ var aftReplicaStickinessManagerFactory = /*#__PURE__*/Object.freeze({
     default: AFTReplicaStickinessManagerFactory
 });
 
-const logger$2 = getLogger$1("naylence.fame.welcome.advanced_welcome_service");
+const logger$2 = getLogger("naylence.fame.welcome.advanced_welcome_service");
 const ENV_VAR_SHOW_ENVELOPES = "FAME_SHOW_ENVELOPES";
 const DEFAULT_TTL_SEC = 3600;
 const showEnvelopes = typeof process !== "undefined" &&
@@ -6664,7 +6661,7 @@ function encodeBitString(signature) {
     return result.buffer;
 }
 
-const logger$1 = getLogger$1("naylence.fame.security.cert.default_certificate_manager");
+const logger$1 = getLogger("naylence.fame.security.cert.default_certificate_manager");
 const CONNECTION_GRANTS_CAMEL = "connectionGrants";
 const CONNECTION_GRANTS_SNAKE = "connection_grants";
 class DefaultCertificateManager {
@@ -7498,18 +7495,18 @@ function normalizeSecuritySettings(config, explicit) {
     return null;
 }
 function normalizeSigning(config, explicit) {
-    if (explicit instanceof SigningConfigClass$1) {
+    if (explicit instanceof SigningConfigClass) {
         return explicit;
     }
     if (explicit && typeof explicit === "object") {
-        return new SigningConfigClass$1(explicit);
+        return new SigningConfigClass(explicit);
     }
     const candidate = config.signing ?? null;
-    if (candidate instanceof SigningConfigClass$1) {
+    if (candidate instanceof SigningConfigClass) {
         return candidate;
     }
     if (candidate && typeof candidate === "object") {
-        return new SigningConfigClass$1(candidate);
+        return new SigningConfigClass(candidate);
     }
     return null;
 }
@@ -7665,7 +7662,7 @@ function bytesToUtf8$1(data) {
 
 const DEFAULT_REFRESH_INTERVAL_MS = 86400000; // 24 hours
 const MIN_REFRESH_INTERVAL_MS = 60000; // 1 minute
-const logger = getLogger$1("naylence.fame.security.cert.trust_store.http_bundle_provider");
+const logger = getLogger("naylence.fame.security.cert.trust_store.http_bundle_provider");
 function isTruthyFlag(value) {
     if (typeof value === "boolean") {
         return value;
@@ -9166,7 +9163,7 @@ class CASigningService extends CAService {
         const publicKeyPem = derToPem(publicKeyDer, "PUBLIC KEY");
         // Determine node SID and physical path (mirrors Python logic)
         const physicalPath = csr.physicalPath || `/unknown/${csr.requesterId}`;
-        const nodeSid = secureDigest$1(physicalPath);
+        const nodeSid = secureDigest(physicalPath);
         const logicals = csr.logicals || [];
         // Issue the certificate (short-lived: 1 day)
         const certificatePem = await this.signNodeCert(publicKeyPem, csr.requesterId, // Use requesterId as node_id
@@ -9198,7 +9195,7 @@ class CASigningService extends CAService {
         await this.ensureSigningMaterials();
         const signingCert = this.getSigningCertificate();
         const signingKey = this.getSigningKey();
-        const expectedSid = secureDigest$1(physicalPath);
+        const expectedSid = secureDigest(physicalPath);
         if (expectedSid !== nodeSid) {
             throw new Error("Provided SID does not match the computed SID for the physical path");
         }

package/dist/types/naylence/fame/security/cert/default-certificate-manager-factory.d.ts

@@ -1,7 +1,5 @@
 import type { SecuritySettings } from "@naylence/core";
-import { CertificateManagerFactory, type CertificateManagerConfig } from "@naylence/runtime/node";
-import type { SigningConfig } from "@naylence/runtime";
-import type { CertificateManager } from "@naylence/runtime";
+import { CertificateManagerFactory, type CertificateManagerConfig, type SigningConfig, type CertificateManager } from "@naylence/runtime";
 export interface DefaultCertificateManagerConfig extends CertificateManagerConfig {
     type: "DefaultCertificateManager";
     caServiceUrl?: string | null;

package/dist/types/naylence/fame/security/cert/default-certificate-manager-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-certificate-manager-factory.d.ts","sourceRoot":"","sources":["../../../../../../src/naylence/fame/security/cert/default-certificate-manager-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EACL,yBAAyB,EAEzB,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAOhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,MAAM,WAAW,+BACf,SAAQ,wBAAwB;IAChC,IAAI,EAAE,2BAA2B,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAClC;AAED,eAAO,MAAM,YAAY;;;CAGf,CAAC;AA6EX,qBAAa,gCAAiC,SAAQ,yBAAyB,CAAC,+BAA+B,CAAC;IAC9G,SAAgB,IAAI,+BAA+B;IACnD,SAAgB,SAAS,QAAQ;IACjC,SAAgB,QAAQ,OAAO;IAElB,MAAM,CACjB,MAAM,CAAC,EAAE,+BAA+B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACzE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAC1C,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,EAC9B,GAAG,YAAY,EAAE,OAAO,EAAE,GACzB,OAAO,CAAC,kBAAkB,CAAC;CAe/B;AAED,eAAe,gCAAgC,CAAC"}
+{"version":3,"file":"default-certificate-manager-factory.d.ts","sourceRoot":"","sources":["../../../../../../src/naylence/fame/security/cert/default-certificate-manager-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAEL,yBAAyB,EAEzB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,WAAW,+BACf,SAAQ,wBAAwB;IAChC,IAAI,EAAE,2BAA2B,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAClC;AAED,eAAO,MAAM,YAAY;;;CAGf,CAAC;AA6EX,qBAAa,gCAAiC,SAAQ,yBAAyB,CAAC,+BAA+B,CAAC;IAC9G,SAAgB,IAAI,+BAA+B;IACnD,SAAgB,SAAS,QAAQ;IACjC,SAAgB,QAAQ,OAAO;IAElB,MAAM,CACjB,MAAM,CAAC,EAAE,+BAA+B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACzE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAC1C,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,EAC9B,GAAG,YAAY,EAAE,OAAO,EAAE,GACzB,OAAO,CAAC,kBAAkB,CAAC;CAe/B;AAED,eAAe,gCAAgC,CAAC"}

package/dist/types/naylence/fame/security/signing/eddsa-envelope-signer-factory.d.ts

@@ -1,6 +1,5 @@
-import type { EnvelopeSigner } from "@naylence/runtime";
+import type { EnvelopeSigner, EdDSAEnvelopeSignerOptions } from "@naylence/runtime";
 import { EnvelopeSignerFactory, type EnvelopeSignerConfig } from "@naylence/runtime";
-import type { EdDSAEnvelopeSignerOptions } from "@naylence/runtime/naylence/fame/security/signing/eddsa-envelope-signer.js";
 export interface EdDSAEnvelopeSignerConfig extends EnvelopeSignerConfig {
     readonly type: "EdDSAEnvelopeSigner";
 }

package/dist/types/naylence/fame/security/signing/eddsa-envelope-signer-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eddsa-envelope-signer-factory.d.ts","sourceRoot":"","sources":["../../../../../../src/naylence/fame/security/signing/eddsa-envelope-signer-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAEL,qBAAqB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2EAA2E,CAAC;AAE5H,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACrE,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;CACtC;AAED,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAkBX,qBAAa,kCAAmC,SAAQ,qBAAqB,CAAC,yBAAyB,CAAC;IACtG,SAAgB,IAAI,yBAAyB;IAC7C,SAAgB,SAAS,QAAQ;IACjC,SAAgB,QAAQ,OAAO;IAElB,MAAM,CACjB,OAAO,CAAC,EAAE,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACpE,OAAO,CAAC,EAAE,0BAA0B,GAAG,IAAI,GAC1C,OAAO,CAAC,cAAc,CAAC;CAY3B;AAED,eAAe,kCAAkC,CAAC"}
+{"version":3,"file":"eddsa-envelope-signer-factory.d.ts","sourceRoot":"","sources":["../../../../../../src/naylence/fame/security/signing/eddsa-envelope-signer-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAEL,qBAAqB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACrE,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;CACtC;AAED,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAeX,qBAAa,kCAAmC,SAAQ,qBAAqB,CAAC,yBAAyB,CAAC;IACtG,SAAgB,IAAI,yBAAyB;IAC7C,SAAgB,SAAS,QAAQ;IACjC,SAAgB,QAAQ,OAAO;IAElB,MAAM,CACjB,OAAO,CAAC,EAAE,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACpE,OAAO,CAAC,EAAE,0BAA0B,GAAG,IAAI,GAC1C,OAAO,CAAC,cAAc,CAAC;CAY3B;AAED,eAAe,kCAAkC,CAAC"}