@naylence/runtime 0.3.5-test.910 → 0.3.5-test.913

package/dist/esm/naylence/fame/security/crypto/providers/default-crypto-provider.js

@@ -1,6 +1,3 @@
-import { AsnConvert, OctetString } from '@peculiar/asn1-schema';
-import { AlgorithmIdentifier, Attribute, AttributeTypeAndValue, AttributeValue, Extension, Extensions, GeneralName, Name, RelativeDistinguishedName, SubjectAlternativeName, SubjectPublicKeyInfo, id_ce_subjectAltName, } from '@peculiar/asn1-x509';
-import { Attributes, CertificationRequest, CertificationRequestInfo, } from '@peculiar/asn1-csr';
 import { generateId } from '@naylence/core';
 import { getLogger } from '../../../util/logging.js';
 import { secureDigest } from '../../../util/util.js';
@@ -16,11 +13,6 @@ const DEFAULT_AUDIENCE = 'router-dev';
 const DEFAULT_TTL_SEC = 3600;
 const DEFAULT_HMAC_SECRET_BYTES = 32;
 const ENCRYPTION_ALG = 'ECDH-ES';
-const EXTENSION_REQUEST_OID = '1.2.840.113549.1.9.14';
-const COMMON_NAME_OID = '2.5.4.3';
-const ED25519_OID = '1.3.101.112';
-const CSR_PEM_TAG = 'CERTIFICATE REQUEST';
-const LOGICAL_URI_PREFIX = 'naylence://';
 function normalizeDefaultCryptoProviderOptions(options) {
     if (!options) {
         return {};
@@ -286,76 +278,6 @@ export class DefaultCryptoProvider {
             has_chain: Boolean(certificateChainPem),
         });
     }
-    async createCsr(nodeId, physicalPath, logicals, subjectName) {
-        const trimmedNodeId = assertNonEmptyString(nodeId, 'nodeId');
-        const trimmedPhysicalPath = assertNonEmptyString(physicalPath, 'physicalPath');
-        try {
-            if (this.artifacts.signing.algorithm !== 'EdDSA') {
-                throw new Error('CSR creation only supported for Ed25519 signing keys in the default crypto provider');
-            }
-            const cryptoImpl = await ensureWebCrypto();
-            const privateKey = await cryptoImpl.subtle.importKey('pkcs8', pemToArrayBuffer(this.signingPrivatePem), {
-                name: 'Ed25519',
-            }, false, ['sign']);
-            const publicKeyDer = pemToArrayBuffer(this.signingPublicPem);
-            const subjectPkInfo = AsnConvert.parse(publicKeyDer, SubjectPublicKeyInfo);
-            const sanitizedLogicals = Array.isArray(logicals)
-                ? logicals.filter((value) => typeof value === 'string' && value.trim().length > 0)
-                : [];
-            const commonName = typeof subjectName === 'string' && subjectName.trim().length > 0
-                ? subjectName.trim()
-                : trimmedNodeId;
-            const subject = buildSubjectName(commonName);
-            const attributes = new Attributes();
-            if (sanitizedLogicals.length > 0) {
-                const san = new SubjectAlternativeName(sanitizedLogicals.map((logical) => new GeneralName({
-                    uniformResourceIdentifier: `${LOGICAL_URI_PREFIX}${logical}`,
-                })));
-                const extensions = new Extensions([
-                    new Extension({
-                        extnID: id_ce_subjectAltName,
-                        critical: false,
-                        extnValue: new OctetString(AsnConvert.serialize(san)),
-                    }),
-                ]);
-                attributes.push(new Attribute({
-                    type: EXTENSION_REQUEST_OID,
-                    values: [AsnConvert.serialize(extensions)],
-                }));
-            }
-            const requestInfo = new CertificationRequestInfo({
-                subject,
-                subjectPKInfo: subjectPkInfo,
-                attributes,
-            });
-            const requestInfoDer = AsnConvert.serialize(requestInfo);
-            const signature = await cryptoImpl.subtle.sign('Ed25519', privateKey, requestInfoDer);
-            const certificationRequest = new CertificationRequest({
-                certificationRequestInfo: requestInfo,
-                signatureAlgorithm: new AlgorithmIdentifier({
-                    algorithm: ED25519_OID,
-                }),
-                signature: encodeBitString(signature),
-            });
-            certificationRequest.certificationRequestInfoRaw = requestInfoDer;
-            const csrDer = AsnConvert.serialize(certificationRequest);
-            const csrPem = arrayBufferToPem(csrDer, CSR_PEM_TAG);
-            logger.debug('csr_created', {
-                node_id: trimmedNodeId,
-                physical_path: trimmedPhysicalPath,
-                logical_count: sanitizedLogicals.length,
-            });
-            return csrPem;
-        }
-        catch (error) {
-            logger.error('csr_creation_failed', {
-                node_id: trimmedNodeId,
-                physical_path: trimmedPhysicalPath,
-                error: error instanceof Error ? error.message : String(error),
-            });
-            throw error;
-        }
-    }
 }
 async function buildProviderArtifacts(options) {
     const algorithm = normalizeAlgorithm(options.algorithm ?? readEnvAlgorithm());
@@ -591,90 +513,6 @@ function pemToDerBase64(pem) {
     // Ensure the output is valid base64 without whitespace
     return base64.replace(/\s+/g, '');
 }
-let cryptoPromise = null;
-async function ensureWebCrypto() {
-    if (typeof globalThis.crypto !== 'undefined' && globalThis.crypto?.subtle) {
-        return globalThis.crypto;
-    }
-    if (!cryptoPromise) {
-        if (typeof process !== 'undefined' &&
-            typeof process.versions?.node === 'string') {
-            cryptoPromise = import('node:crypto').then((module) => {
-                const webcrypto = module.webcrypto;
-                if (!webcrypto || !webcrypto.subtle) {
-                    throw new Error('WebCrypto API is not available in this Node.js runtime');
-                }
-                globalThis.crypto = webcrypto;
-                return webcrypto;
-            });
-        }
-        else {
-            cryptoPromise = Promise.reject(new Error('WebCrypto API is not available in this environment'));
-        }
-    }
-    return cryptoPromise;
-}
-function pemToArrayBuffer(pem) {
-    const normalized = pem
-        .replace(/-----BEGIN[^-]+-----/g, '')
-        .replace(/-----END[^-]+-----/g, '')
-        .replace(/\s+/g, '');
-    const bytes = base64ToBytes(normalized);
-    return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
-}
-function base64ToBytes(base64) {
-    if (typeof Buffer !== 'undefined') {
-        const buffer = Buffer.from(base64, 'base64');
-        const bytes = new Uint8Array(buffer.length);
-        for (let i = 0; i < buffer.length; i += 1) {
-            bytes[i] = buffer[i];
-        }
-        return bytes;
-    }
-    if (typeof atob === 'function') {
-        const binary = atob(base64);
-        const bytes = new Uint8Array(binary.length);
-        for (let i = 0; i < binary.length; i += 1) {
-            bytes[i] = binary.charCodeAt(i);
-        }
-        return bytes;
-    }
-    throw new Error('No base64 decoder available in this environment');
-}
-function arrayBufferToPem(buffer, tag) {
-    const base64 = bytesToBase64(new Uint8Array(buffer));
-    return `-----BEGIN ${tag}-----\n${formatPem(base64)}\n-----END ${tag}-----\n`;
-}
-function formatPem(base64) {
-    const lines = [];
-    for (let i = 0; i < base64.length; i += 64) {
-        lines.push(base64.slice(i, i + 64));
-    }
-    return lines.join('\n');
-}
-function encodeBitString(signature) {
-    const bytes = new Uint8Array(signature);
-    const bitString = new Uint8Array(bytes.length + 1);
-    bitString.set(bytes, 1);
-    return bitString.buffer;
-}
-function buildSubjectName(commonName) {
-    const attribute = new AttributeTypeAndValue({
-        type: COMMON_NAME_OID,
-        value: new AttributeValue({ utf8String: commonName }),
-    });
-    return new Name([new RelativeDistinguishedName([attribute])]);
-}
-function assertNonEmptyString(value, name) {
-    if (typeof value !== 'string') {
-        throw new TypeError(`${name} must be a string`);
-    }
-    const trimmed = value.trim();
-    if (trimmed.length === 0) {
-        throw new TypeError(`${name} must be a non-empty string`);
-    }
-    return trimmed;
-}
 function cloneJson(value) {
     return JSON.parse(JSON.stringify(value));
 }

package/dist/esm/naylence/fame/telemetry/open-telemetry-trace-emitter-factory.js

@@ -4,15 +4,25 @@ import { safeImport } from '../util/lazy-import.js';
 import { TRACE_EMITTER_FACTORY_BASE_TYPE, TraceEmitterFactory, } from './trace-emitter-factory.js';
 import { getLogger } from '../util/logging.js';
 let openTelemetryTraceEmitterModulePromise = null;
+let otelApiModulePromise = null;
 const logger = getLogger('naylence.fame.telemetry.open_telemetry_trace_emitter_factory');
+const MISSING_OTEL_HELP_MESSAGE = 'Missing optional OpenTelemetry dependency. Install @opentelemetry/api (and related packages) to enable trace emission.';
 function getOpenTelemetryTraceEmitterModule() {
     if (!openTelemetryTraceEmitterModulePromise) {
         openTelemetryTraceEmitterModulePromise = safeImport(() => import('./open-telemetry-trace-emitter.js'), '@opentelemetry/api', {
-            helpMessage: 'Missing optional OpenTelemetry dependency. Install @opentelemetry/api (and related packages) to enable trace emission.',
+            helpMessage: MISSING_OTEL_HELP_MESSAGE,
         });
     }
     return openTelemetryTraceEmitterModulePromise;
 }
+function getOtelApiModule() {
+    if (!otelApiModulePromise) {
+        otelApiModulePromise = safeImport(() => import('@opentelemetry/api'), '@opentelemetry/api', {
+            helpMessage: MISSING_OTEL_HELP_MESSAGE,
+        });
+    }
+    return otelApiModulePromise;
+}
 export const FACTORY_META = {
     base: TRACE_EMITTER_FACTORY_BASE_TYPE,
     key: 'OpenTelemetryTraceEmitter',
@@ -75,9 +85,16 @@ export class OpenTelemetryTraceEmitterFactory extends TraceEmitterFactory {
             }
             throw error;
         }
-        const { OpenTelemetryTraceEmitter } = await getOpenTelemetryTraceEmitterModule();
+        const [{ OpenTelemetryTraceEmitter }, otelModule] = await Promise.all([
+            getOpenTelemetryTraceEmitterModule(),
+            getOtelApiModule(),
+        ]);
         const emitterOptions = {
             serviceName: normalized.serviceName,
+            otelApi: {
+                trace: otelModule.trace,
+                SpanStatusCode: otelModule.SpanStatusCode,
+            },
         };
         if (options.tracer) {
             emitterOptions.tracer = options.tracer;

package/dist/esm/naylence/fame/telemetry/open-telemetry-trace-emitter.js

@@ -1,9 +1,9 @@
-import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { BaseTraceEmitter } from './base-trace-emitter.js';
 import { resetOtelSpanId, resetOtelTraceId, setOtelSpanId, setOtelTraceId, } from './otel-context.js';
 class OpenTelemetryTraceSpan {
-    constructor(span) {
+    constructor(span, api) {
         this.span = span;
+        this.api = api;
     }
     setAttribute(key, value) {
         try {
@@ -29,7 +29,7 @@ class OpenTelemetryTraceSpan {
     setStatusError(description) {
         try {
             const status = {
-                code: SpanStatusCode.ERROR,
+                code: this.api.SpanStatusCode.ERROR,
             };
             if (description !== undefined) {
                 status.message = description;
@@ -42,10 +42,10 @@ class OpenTelemetryTraceSpan {
     }
 }
 class OpenTelemetrySpanScope {
-    constructor(span) {
+    constructor(span, api) {
         this.span = span;
         this.entered = false;
-        this.wrapper = new OpenTelemetryTraceSpan(span);
+        this.wrapper = new OpenTelemetryTraceSpan(span, api);
     }
     enter() {
         if (!this.entered) {
@@ -80,7 +80,9 @@ export class OpenTelemetryTraceEmitter extends BaseTraceEmitter {
         super();
         this.shutdownInvoked = false;
         const normalized = normalizeOpenTelemetryTraceEmitterOptions(options);
-        this.tracer = normalized.tracer ?? trace.getTracer(normalized.serviceName);
+        this.otelApi = normalized.otelApi;
+        this.tracer =
+            normalized.tracer ?? this.otelApi.trace.getTracer(normalized.serviceName);
         this.lifecycle = normalized.lifecycle ?? null;
         this.authStrategy = normalized.authStrategy ?? null;
     }
@@ -98,7 +100,7 @@ export class OpenTelemetryTraceEmitter extends BaseTraceEmitter {
         if (typeof envelopeTraceId === 'string') {
             this.applyEnvelopeTraceId(span, envelopeTraceId);
         }
-        return new OpenTelemetrySpanScope(span);
+        return new OpenTelemetrySpanScope(span, this.otelApi);
     }
     async flush() {
         if (this.lifecycle?.forceFlush) {
@@ -111,7 +113,7 @@ export class OpenTelemetryTraceEmitter extends BaseTraceEmitter {
             }
         }
         try {
-            const provider = trace.getTracerProvider();
+            const provider = this.otelApi.trace.getTracerProvider();
             if (provider && typeof provider.forceFlush === 'function') {
                 await provider.forceFlush();
             }
@@ -146,7 +148,7 @@ export class OpenTelemetryTraceEmitter extends BaseTraceEmitter {
             }
         }
         try {
-            const provider = trace.getTracerProvider();
+            const provider = this.otelApi.trace.getTracerProvider();
             if (provider && typeof provider.shutdown === 'function') {
                 await provider.shutdown();
             }
@@ -187,6 +189,13 @@ function normalizeOpenTelemetryTraceEmitterOptions(input) {
     const source = (input ?? {});
     const serviceName = extractNonEmptyString(pickFirst(source, ['serviceName', 'service_name'])) ?? 'naylence-service';
     const tracer = pickFirst(source, ['tracer']);
+    const otelApi = pickFirst(source, [
+        'otelApi',
+        'otel_api',
+    ]);
+    if (!otelApi) {
+        throw new Error('OpenTelemetryTraceEmitter requires OpenTelemetry API bindings. Provide otelApi via options.');
+    }
     const lifecycle = pickFirst(source, [
         'lifecycle',
         'lifeCycle',
@@ -199,6 +208,7 @@ function normalizeOpenTelemetryTraceEmitterOptions(input) {
     return {
         serviceName,
         tracer,
+        otelApi,
         lifecycle,
         authStrategy,
     };

package/dist/esm/naylence/fame/util/register-runtime-factories.js

@@ -8,6 +8,9 @@ const NODE_ONLY_FACTORY_MODULES = new Set([
     './telemetry/open-telemetry-trace-emitter-factory.js',
     './security/credential/prompt-credential-provider-factory.js',
 ]);
+const BROWSER_ONLY_FACTORY_MODULES = new Set([
+    './security/auth/oauth2-pkce-token-provider-factory.js',
+]);
 const isNodeEnvironment = typeof process !== 'undefined' && Boolean(process?.versions?.node);
 function detectModuleUrl() {
     // Prefer Node-friendly __filename when available.
@@ -150,6 +153,9 @@ async function performRegistration(registry) {
         if (!isNodeEnvironment && NODE_ONLY_FACTORY_MODULES.has(spec)) {
             return;
         }
+        if (isNodeEnvironment && BROWSER_ONLY_FACTORY_MODULES.has(spec)) {
+            return;
+        }
         try {
             let mod;
             let lastError;

package/dist/esm/version.js

@@ -1,7 +1,7 @@
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.910
+// Generated from package.json version: 0.3.5-test.913
 /**
  * The package version, injected at build time.
  * @internal
  */
-export const VERSION = '0.3.5-test.910';
+export const VERSION = '0.3.5-test.913';