@olane/o-core 0.7.6 → 0.7.8

package/dist/src/core/interfaces/o-core.interface.d.ts

@@ -1,7 +1,7 @@
 import { Multiaddr } from '@olane/o-config';
 import { oAddress } from '../../router/o-address';
 import { oConnectionManager } from '../../connection/o-connection-manager';
-import { oAddressResolution } from '../../router/o-address-resolution';
+import { oResolverChain } from '../../router/o-resolver-chain';
 import { NodeState } from './state.enum';
 export interface oCoreInterface {
     leaders: Multiaddr[];
@@ -10,7 +10,7 @@ export interface oCoreInterface {
     state: NodeState;
     errors: Error[];
     connectionManager: oConnectionManager;
-    addressResolution: oAddressResolution;
+    addressResolution: oResolverChain;
     description: string;
     start: () => Promise<void>;
     stop: () => Promise<void>;

package/dist/src/core/interfaces/o-core.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-core.interface.d.ts","sourceRoot":"","sources":["../../../../src/core/interfaces/o-core.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,EAAE,QAAQ,CAAC;IAClB,aAAa,EAAE,QAAQ,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IAEpB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"o-core.interface.d.ts","sourceRoot":"","sources":["../../../../src/core/interfaces/o-core.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,EAAE,QAAQ,CAAC;IAClB,aAAa,EAAE,QAAQ,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,iBAAiB,EAAE,cAAc,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IAEpB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}

package/dist/src/core/o-core.d.ts

@@ -24,6 +24,7 @@ export declare abstract class oCore extends oObject {
     metrics: oMetrics;
     requestManager: oRequestManager;
     router: oRouter;
+    private heartbeatInterval?;
     constructor(config: oCoreConfig);
     get isLeader(): boolean;
     get leader(): oAddress | null;
@@ -176,6 +177,11 @@ export declare abstract class oCore extends oObject {
     stop(): Promise<void>;
     teardown(): Promise<void>;
     get dependencies(): oDependency[];
+    /**
+     * Start sending periodic heartbeats to the monitor node
+     * This is optional and only runs if MONITOR_ENABLED=true and MONITOR_ADDRESS is set
+     */
+    private startHeartbeat;
     get methods(): {
         [key: string]: oMethod;
     };

package/dist/src/core/o-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-core.d.ts","sourceRoot":"","sources":["../../../src/core/o-core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"o-core.d.ts","sourceRoot":"","sources":["../../../src/core/o-core.ts"],"names":[],"mappings":"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"}

package/dist/src/core/o-core.js

@@ -92,6 +92,7 @@ export class oCore extends oObject {
             throw new Error('Invalid address');
         }
         this.logger.debug('Using address: ', address.toString());
+        // check for static match
         if (address.toStaticAddress().equals(this.address.toStaticAddress())) {
             return this.useSelf(data);
         }
@@ -152,7 +153,14 @@ export class oCore extends oObject {
             throw new Error('Node is not running');
         }
         if (!childAddress.transports) {
-            this.logger.warn('Child address has no transports, this might break!');
+            const child = this.hierarchyManager.getChild(childAddress);
+            if (!child) {
+                this.logger.warn('Child address has no transports, this might break!');
+            }
+            else {
+                this.logger.debug('Setting transports for child: ', child.transports.map((t) => t.toString()));
+                childAddress.setTransports(child?.transports || []);
+            }
         }
         const connection = await this.connect(childAddress, childAddress);
         // communicate the payload to the target node
@@ -224,6 +232,11 @@ export class oCore extends oObject {
                 this.logger.error('Failed to register node', error);
             });
             this.state = NodeState.RUNNING;
+            // Start optional heartbeat to monitor if enabled
+            if (process.env.MONITOR_ENABLED === 'true' &&
+                process.env.MONITOR_ADDRESS) {
+                this.startHeartbeat();
+            }
         }
         catch (error) {
             this.logger.error('Failed to start node', error);
@@ -270,6 +283,11 @@ export class oCore extends oObject {
             return;
         }
         this.state = NodeState.STOPPING;
+        // Stop heartbeat if running
+        if (this.heartbeatInterval) {
+            clearInterval(this.heartbeatInterval);
+            this.heartbeatInterval = undefined;
+        }
         try {
             await this.teardown();
             this.state = NodeState.STOPPED;
@@ -304,6 +322,36 @@ export class oCore extends oObject {
     get dependencies() {
         return this.config.dependencies?.map((d) => new oDependency(d)) || [];
     }
+    /**
+     * Start sending periodic heartbeats to the monitor node
+     * This is optional and only runs if MONITOR_ENABLED=true and MONITOR_ADDRESS is set
+     */
+    startHeartbeat() {
+        const interval = parseInt(process.env.MONITOR_HEARTBEAT_INTERVAL || '30000', 10);
+        const monitorAddress = new oAddress(process.env.MONITOR_ADDRESS || 'o://monitor');
+        this.logger.debug(`Starting heartbeat to ${monitorAddress.toString()} every ${interval}ms`);
+        this.heartbeatInterval = setInterval(async () => {
+            try {
+                await this.use(monitorAddress, {
+                    method: 'record_heartbeat',
+                    params: {
+                        address: this.address.toString(),
+                        timestamp: Date.now(),
+                        metrics: {
+                            successCount: this.metrics.successCount,
+                            errorCount: this.metrics.errorCount,
+                            activeRequests: this.requestManager.activeRequests.length,
+                            state: this.state,
+                        },
+                    },
+                });
+            }
+            catch (error) {
+                // Monitor unavailable, fail silently
+                this.logger.debug('Heartbeat failed (monitor unavailable):', error);
+            }
+        }, interval);
+    }
     get methods() {
         return this.config.methods || {};
     }

package/dist/src/router/index.d.ts

@@ -2,8 +2,10 @@ export * from './o-router.js';
 export * from './o-address.js';
 export * from './interfaces/route.response.js';
 export * from './enums/restricted-addresses.enum.js';
-export * from './o-address-resolution.js';
+export * from './o-resolver-chain.js';
 export * from './o-address-resolver.js';
+export * from './o-routing-policy.js';
+export * from './o-request-preparation.js';
 export * from './interfaces/resolve.request.js';
 export * from './o-request.router.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}

package/dist/src/router/index.js

@@ -2,7 +2,9 @@ export * from './o-router.js';
 export * from './o-address.js';
 export * from './interfaces/route.response.js';
 export * from './enums/restricted-addresses.enum.js';
-export * from './o-address-resolution.js';
+export * from './o-resolver-chain.js';
 export * from './o-address-resolver.js';
+export * from './o-routing-policy.js';
+export * from './o-request-preparation.js';
 export * from './interfaces/resolve.request.js';
 export * from './o-request.router.js';

package/dist/src/router/o-address.js

@@ -43,7 +43,7 @@ export class oAddress extends oObject {
         if (paths.length === 0) {
             return this;
         }
-        return new oAddress(`o://${paths[paths.length - 1]}`);
+        return new oAddress(`o://${paths[paths.length - 1]}`, this.transports);
     }
     toRootAddress() {
         const paths = this.paths.split('/');

package/dist/src/router/o-request-preparation.d.ts

@@ -0,0 +1,37 @@
+import { oObject } from '../core/o-object.js';
+import { oAddress } from './o-address.js';
+import { oRouterRequest } from './o-request.router.js';
+/**
+ * Handles request transformation and preparation for routing.
+ * Manages payload wrapping/unwrapping, parameter merging, and request envelope handling.
+ */
+export declare class oRequestPreparation extends oObject {
+    /**
+     * Prepares a routing request by applying overrides and updating addresses.
+     * @param originalRequest The original router request
+     * @param requestOverride Optional request override from resolvers
+     * @param targetAddress The final target address
+     * @returns The prepared routing request
+     */
+    prepareRequest(originalRequest: oRouterRequest, requestOverride: oRouterRequest | undefined, targetAddress: oAddress): oRouterRequest;
+    /**
+     * Applies handshake-specific transformations to a request.
+     * @param request The routing request to modify
+     * @param requestOverride The request override from resolvers
+     */
+    applyHandshakeTransform(request: oRouterRequest, requestOverride: oRouterRequest | undefined): oRouterRequest;
+    /**
+     * Merges parameters from original payload and resolver overrides.
+     * @param request The routing request to modify
+     * @param originalPayload The original request payload
+     */
+    applyParameterMerge(request: oRouterRequest, originalPayload: any): oRouterRequest;
+    /**
+     * Checks if the request is a handshake request.
+     * @param method The method to check
+     * @param handshakeMethod The handshake method constant
+     * @returns True if this is a handshake request
+     */
+    isHandshakeRequest(method: string, handshakeMethod: string): boolean;
+}
+//# sourceMappingURL=o-request-preparation.d.ts.map

package/dist/src/router/o-request-preparation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"o-request-preparation.d.ts","sourceRoot":"","sources":["../../../src/router/o-request-preparation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,OAAO;IAC9C;;;;;;OAMG;IACH,cAAc,CACZ,eAAe,EAAE,cAAc,EAC/B,eAAe,EAAE,cAAc,GAAG,SAAS,EAC3C,aAAa,EAAE,QAAQ,GACtB,cAAc;IAkBjB;;;;OAIG;IACH,uBAAuB,CACrB,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,cAAc,GAAG,SAAS,GAC1C,cAAc;IAmBjB;;;;OAIG;IACH,mBAAmB,CACjB,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,GAAG,GACnB,cAAc;IAUjB;;;;;OAKG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO;CAGrE"}

package/dist/src/router/o-request-preparation.js

@@ -0,0 +1,75 @@
+import { oObject } from '../core/o-object.js';
+import { oRouterRequest } from './o-request.router.js';
+import { JSONRPC_VERSION, oProtocolMethods } from '@olane/o-protocol';
+/**
+ * Handles request transformation and preparation for routing.
+ * Manages payload wrapping/unwrapping, parameter merging, and request envelope handling.
+ */
+export class oRequestPreparation extends oObject {
+    /**
+     * Prepares a routing request by applying overrides and updating addresses.
+     * @param originalRequest The original router request
+     * @param requestOverride Optional request override from resolvers
+     * @param targetAddress The final target address
+     * @returns The prepared routing request
+     */
+    prepareRequest(originalRequest, requestOverride, targetAddress) {
+        const finalRequest = requestOverride || originalRequest;
+        const req = new oRouterRequest({
+            method: finalRequest.method,
+            params: finalRequest.params,
+            id: finalRequest.id,
+            jsonrpc: JSONRPC_VERSION,
+            stream: originalRequest.stream,
+        });
+        // Update target address in request
+        if (finalRequest && targetAddress) {
+            finalRequest.params.address = targetAddress.toString();
+        }
+        return req;
+    }
+    /**
+     * Applies handshake-specific transformations to a request.
+     * @param request The routing request to modify
+     * @param requestOverride The request override from resolvers
+     */
+    applyHandshakeTransform(request, requestOverride) {
+        const params = request.params.payload.params;
+        const { method } = request.params.payload;
+        try {
+            if (requestOverride) {
+                // This is likely a method resolver, so we need to override the method
+                // Let's specify the method in the request params to optimize on context window
+                params.tool = request.params?.payload?.method;
+            }
+        }
+        catch (e) {
+            this.logger.error('Error assigning tool to handshake: ', e);
+        }
+        // Update the method to be the handshake
+        request.params.payload.method = oProtocolMethods.HANDSHAKE;
+        return request;
+    }
+    /**
+     * Merges parameters from original payload and resolver overrides.
+     * @param request The routing request to modify
+     * @param originalPayload The original request payload
+     */
+    applyParameterMerge(request, originalPayload) {
+        const params = request.params.payload.params;
+        request.params.payload.params = {
+            ...originalPayload.params, // initial params
+            ...params, // overloaded params
+        };
+        return request;
+    }
+    /**
+     * Checks if the request is a handshake request.
+     * @param method The method to check
+     * @param handshakeMethod The handshake method constant
+     * @returns True if this is a handshake request
+     */
+    isHandshakeRequest(method, handshakeMethod) {
+        return method === handshakeMethod;
+    }
+}

package/dist/src/router/o-resolver-chain.d.ts

@@ -0,0 +1,32 @@
+import { oAddress } from './o-address.js';
+import { oAddressResolver } from './o-address-resolver.js';
+import { oObject } from '../core/o-object.js';
+import { RouteResponse } from './interfaces/route.response.js';
+import { ResolveRequest } from './interfaces/resolve.request.js';
+/**
+ * Manages a chain of address resolvers using the Chain of Responsibility pattern.
+ * Sequentially executes registered resolvers to transform addresses and routing requests.
+ */
+export declare class oResolverChain extends oObject {
+    private readonly resolvers;
+    /**
+     * Registers a resolver in the chain.
+     * @param resolver The resolver to add
+     * @param isPriority If true, adds to the front of the chain; otherwise appends to the end
+     */
+    addResolver(resolver: oAddressResolver, isPriority?: boolean): void;
+    /**
+     * Checks if any resolver in the chain supports the given address.
+     * @param address The address to check
+     * @returns True if at least one resolver supports this address
+     */
+    supportsAddress(address: oAddress): boolean;
+    /**
+     * Executes the resolver chain to transform an address and request.
+     * Each resolver in sequence can modify the nextHopAddress, targetAddress, and request.
+     * @param request The resolve request containing address, node, and optional request override
+     * @returns The final route response after all resolvers have executed
+     */
+    resolve(request: ResolveRequest): Promise<RouteResponse>;
+}
+//# sourceMappingURL=o-resolver-chain.d.ts.map

package/dist/src/router/o-resolver-chain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"o-resolver-chain.d.ts","sourceRoot":"","sources":["../../../src/router/o-resolver-chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGjE;;;GAGG;AACH,qBAAa,cAAe,SAAQ,OAAO;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,EAAE,UAAU,GAAE,OAAe;IAQnE;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAQ3C;;;;;OAKG;IACG,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CA+B/D"}

package/dist/src/router/o-resolver-chain.js

@@ -0,0 +1,62 @@
+import { oAddress } from './o-address.js';
+import { oObject } from '../core/o-object.js';
+/**
+ * Manages a chain of address resolvers using the Chain of Responsibility pattern.
+ * Sequentially executes registered resolvers to transform addresses and routing requests.
+ */
+export class oResolverChain extends oObject {
+    constructor() {
+        super(...arguments);
+        this.resolvers = [];
+    }
+    /**
+     * Registers a resolver in the chain.
+     * @param resolver The resolver to add
+     * @param isPriority If true, adds to the front of the chain; otherwise appends to the end
+     */
+    addResolver(resolver, isPriority = false) {
+        if (isPriority) {
+            this.resolvers.unshift(resolver);
+        }
+        else {
+            this.resolvers.push(resolver);
+        }
+    }
+    /**
+     * Checks if any resolver in the chain supports the given address.
+     * @param address The address to check
+     * @returns True if at least one resolver supports this address
+     */
+    supportsAddress(address) {
+        return this.resolvers.some((r) => address.transports.some((t) => {
+            return r.transportTypes.some((r) => r === t.type);
+        }));
+    }
+    /**
+     * Executes the resolver chain to transform an address and request.
+     * Each resolver in sequence can modify the nextHopAddress, targetAddress, and request.
+     * @param request The resolve request containing address, node, and optional request override
+     * @returns The final route response after all resolvers have executed
+     */
+    async resolve(request) {
+        let resolvedAddress = new oAddress(request.address.toString(), request.address.transports);
+        let targetAddress = resolvedAddress;
+        let requestOverride = request.request;
+        for (const resolver of this.resolvers) {
+            const { nextHopAddress, targetAddress: resolverTargetAddress, requestOverride: resolverRequestOverride, } = await resolver.resolve({
+                address: resolvedAddress,
+                targetAddress: targetAddress,
+                node: request.node,
+                request: requestOverride,
+            });
+            requestOverride = resolverRequestOverride || requestOverride;
+            targetAddress = resolverTargetAddress || targetAddress;
+            resolvedAddress = nextHopAddress;
+        }
+        return {
+            nextHopAddress: resolvedAddress,
+            targetAddress: targetAddress,
+            requestOverride: requestOverride,
+        };
+    }
+}

package/dist/src/router/o-router.d.ts

@@ -1,13 +1,13 @@
 import { oAddress } from './o-address.js';
 import { oObject } from '../core/o-object.js';
-import { oAddressResolution } from './o-address-resolution.js';
+import { oResolverChain } from './o-resolver-chain.js';
 import { oAddressResolver } from './o-address-resolver.js';
 import { oRequest } from '../connection/o-request.js';
 import type { oCore } from '../core/o-core.js';
 import { RouteResponse } from './interfaces/route.response.js';
 import { oRouterRequest } from './o-request.router.js';
 export declare abstract class oRouter extends oObject {
-    addressResolution: oAddressResolution;
+    addressResolution: oResolverChain;
     constructor();
     abstract translate(addressWithLeaderTransports: oAddress, node: oCore): Promise<RouteResponse>;
     abstract isInternal(addressWithLeaderTransports: oAddress, node: oCore): boolean;

package/dist/src/router/o-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-router.d.ts","sourceRoot":"","sources":["../../../src/router/o-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,8BAAsB,OAAQ,SAAQ,OAAO;IACpC,iBAAiB,EAAG,kBAAkB,CAAC;;IAQ9C,QAAQ,CAAC,SAAS,CAChB,2BAA2B,EAAE,QAAQ,EACrC,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC;IAGzB,QAAQ,CAAC,UAAU,CACjB,2BAA2B,EAAE,QAAQ,EACrC,IAAI,EAAE,KAAK,GACV,OAAO;IAKV,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAG5E,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAAG,cAAc,EAClC,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IAEf,WAAW,CAAC,QAAQ,EAAE,gBAAgB,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAI1E,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;CAG5C"}
+{"version":3,"file":"o-router.d.ts","sourceRoot":"","sources":["../../../src/router/o-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,8BAAsB,OAAQ,SAAQ,OAAO;IACpC,iBAAiB,EAAG,cAAc,CAAC;;IAQ1C,QAAQ,CAAC,SAAS,CAChB,2BAA2B,EAAE,QAAQ,EACrC,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC;IAGzB,QAAQ,CAAC,UAAU,CACjB,2BAA2B,EAAE,QAAQ,EACrC,IAAI,EAAE,KAAK,GACV,OAAO;IAKV,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAG5E,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAAG,cAAc,EAClC,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IAEf,WAAW,CAAC,QAAQ,EAAE,gBAAgB,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAI1E,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;CAG5C"}

package/dist/src/router/o-router.js

@@ -1,9 +1,9 @@
 import { oObject } from '../core/o-object.js';
-import { oAddressResolution } from './o-address-resolution.js';
+import { oResolverChain } from './o-resolver-chain.js';
 export class oRouter extends oObject {
     constructor() {
         super();
-        this.addressResolution = new oAddressResolution();
+        this.addressResolution = new oResolverChain();
     }
     addResolver(resolver, isPriority = false) {
         this.addressResolution.addResolver(resolver, isPriority);

package/dist/src/router/o-routing-policy.d.ts

@@ -0,0 +1,36 @@
+import { oAddress } from './o-address.js';
+import { oObject } from '../core/o-object.js';
+import type { oCore } from '../core/o-core.js';
+import { RouteResponse } from './interfaces/route.response.js';
+/**
+ * Provides routing policy decisions based on network topology and address characteristics.
+ * Determines whether addresses are internal/external, when to route to leaders, etc.
+ *
+ * This layer separates network topology awareness from address resolution logic,
+ * making routing decisions testable without network calls.
+ */
+export declare abstract class oRoutingPolicy extends oObject {
+    /**
+     * Determines if an address is internal to the current network/hierarchy.
+     * @param address The address to check
+     * @param node The current node context
+     * @returns True if the address is internal, false if external
+     */
+    abstract isInternalAddress(address: oAddress, node: oCore): boolean;
+    /**
+     * Determines if the given address points to the node itself.
+     * @param address The address to check
+     * @param node The current node context
+     * @returns True if this is a self-reference
+     */
+    isSelfAddress(address: oAddress, node: oCore): boolean;
+    /**
+     * Checks if an address should be routed to a leader node.
+     * Returns a RouteResponse if leader routing is required, null otherwise.
+     * @param address The address to evaluate
+     * @param node The current node context
+     * @returns RouteResponse for leader routing, or null if not applicable
+     */
+    abstract getExternalRoutingStrategy(address: oAddress, node: oCore): RouteResponse | null;
+}
+//# sourceMappingURL=o-routing-policy.d.ts.map

package/dist/src/router/o-routing-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"o-routing-policy.d.ts","sourceRoot":"","sources":["../../../src/router/o-routing-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;;;;GAMG;AACH,8BAAsB,cAAe,SAAQ,OAAO;IAClD;;;;;OAKG;IACH,QAAQ,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;IAEnE;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,QAAQ,CAAC,0BAA0B,CACjC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,aAAa,GAAG,IAAI;CACxB"}

package/dist/src/router/o-routing-policy.js

@@ -0,0 +1,19 @@
+import { oObject } from '../core/o-object.js';
+/**
+ * Provides routing policy decisions based on network topology and address characteristics.
+ * Determines whether addresses are internal/external, when to route to leaders, etc.
+ *
+ * This layer separates network topology awareness from address resolution logic,
+ * making routing decisions testable without network calls.
+ */
+export class oRoutingPolicy extends oObject {
+    /**
+     * Determines if the given address points to the node itself.
+     * @param address The address to check
+     * @param node The current node context
+     * @returns True if this is a self-reference
+     */
+    isSelfAddress(address, node) {
+        return node.address.equals(address);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-core",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -61,7 +61,7 @@
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "@olane/o-protocol": "^0.7.5"
+    "@olane/o-protocol": "^0.7.7"
   },
   "dependencies": {
     "chalk": "^5.4.1",