@olane/o-core 0.7.9 → 0.7.10

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

@@ -1 +1 @@
-{"version":3,"file":"o-address.d.ts","sourceRoot":"","sources":["../../../src/router/o-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D,qBAAa,QAAS,SAAQ,OAAO;aAIjB,KAAK,EAAE,MAAM;IAHxB,UAAU,EAAE,UAAU,EAAE,CAAC;gBAGd,KAAK,EAAE,MAAM,EAC7B,UAAU,GAAE,UAAU,EAAO;IAM/B,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO;IAIhC,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO;IAMzC,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI;IAI7C,QAAQ,IAAI,OAAO;IAOnB,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,eAAe,IAAI,QAAQ;IAQ3B,aAAa,IAAI,QAAQ;IAQzB,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI;QACR,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB;IAOD,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO;IAI3C,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAI3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO;IAIhD,MAAM,CAAC,MAAM,IAAI,QAAQ;IAIzB,MAAM,CAAC,IAAI,IAAI,QAAQ;IAIvB,MAAM,CAAC,QAAQ,IAAI,QAAQ;IAI3B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAI3C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,GAAG,QAAQ;CAqBlE"}
+{"version":3,"file":"o-address.d.ts","sourceRoot":"","sources":["../../../src/router/o-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D,qBAAa,QAAS,SAAQ,OAAO;aAIjB,KAAK,EAAE,MAAM;IAHxB,UAAU,EAAE,UAAU,EAAE,CAAC;gBAGd,KAAK,EAAE,MAAM,EAC7B,UAAU,GAAE,UAAU,EAAO;IAM/B,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO;IAIhC,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO;IAMzC,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI;IAI7C,QAAQ,IAAI,OAAO;IAOnB,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,eAAe,IAAI,QAAQ;IAQ3B,aAAa,IAAI,QAAQ;IAQzB,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI;QACR,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB;IAOD,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO;IAI3C,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAI3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO;IAIhD,MAAM,CAAC,MAAM,IAAI,QAAQ;IAIzB,MAAM,CAAC,IAAI,IAAI,QAAQ;IAIvB,MAAM,CAAC,QAAQ,IAAI,QAAQ;IAI3B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAI3C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,GAAG,QAAQ;CAkClE"}

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

@@ -88,10 +88,23 @@ export class oAddress extends oObject {
         if (remainingPath === '') {
             return address;
         }
+        // if remainingPath equals targetAddress.protocol, the replace didn't match
+        // this means we're either at destination (addresses are equal) or on different branch
+        if (remainingPath === targetAddress.protocol) {
+            // check if we're actually at the destination
+            if (address.value === targetAddress.value) {
+                return address;
+            }
+            // we're on a different branch, need to go back to leader for resolution
+            if (!address.equals(oAddress.leader())) {
+                return oAddress.leader();
+            }
+            // we ARE the leader, and we can't make progress - stay at leader for resolution
+            return address;
+        }
         // do we need to go back to the leader?
         if (!address.equals(oAddress.leader()) && // if we are a leader, do not got back to self
-            (remainingPath === targetAddress.protocol ||
-                oAddress.isStatic(targetAddress))) {
+            oAddress.isStatic(targetAddress)) {
             return oAddress.leader();
         }
         // we need to go to the child address

package/dist/test/router/o-address.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=o-address.spec.d.ts.map

package/dist/test/router/o-address.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"o-address.spec.d.ts","sourceRoot":"","sources":["../../../test/router/o-address.spec.ts"],"names":[],"mappings":""}

package/dist/test/router/o-address.spec.js

@@ -0,0 +1,163 @@
+import { oAddress } from '../../src/index.js';
+import { expect } from 'chai';
+describe('oAddress helper properties', () => {
+    describe('protocol getter', () => {
+        it('should convert o:// to /o/', () => {
+            const addr = new oAddress('o://leader');
+            expect(addr.protocol).to.equal('/o/leader');
+        });
+        it('should handle nested paths', () => {
+            const addr = new oAddress('o://leader/services/embeddings-text');
+            expect(addr.protocol).to.equal('/o/leader/services/embeddings-text');
+        });
+    });
+    describe('paths getter', () => {
+        it('should strip o:// prefix', () => {
+            const addr = new oAddress('o://leader');
+            expect(addr.paths).to.equal('leader');
+        });
+        it('should handle nested paths', () => {
+            const addr = new oAddress('o://leader/services/embeddings-text');
+            expect(addr.paths).to.equal('leader/services/embeddings-text');
+        });
+    });
+    describe('toRootAddress()', () => {
+        it('should return first path segment', () => {
+            const addr = new oAddress('o://leader/services/embeddings-text');
+            expect(addr.toRootAddress().toString()).to.equal('o://leader');
+        });
+        it('should return same address if already root', () => {
+            const addr = new oAddress('o://leader');
+            expect(addr.toRootAddress().toString()).to.equal('o://leader');
+        });
+        it('should handle static addresses', () => {
+            const addr = new oAddress('o://embeddings-text');
+            expect(addr.toRootAddress().toString()).to.equal('o://embeddings-text');
+        });
+    });
+});
+describe('oAddress.next() routing logic', () => {
+    describe('Basic next hop calculation', () => {
+        it('should return same address when at destination', () => {
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://leader');
+            const next = oAddress.next(current, target);
+            expect(next.toString()).to.equal('o://leader');
+        });
+        it('should go one level down when target is direct child', () => {
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://leader/services');
+            const next = oAddress.next(current, target);
+            expect(next.toString()).to.equal('o://leader/services');
+        });
+        it('should go one level down when target is two levels deep (BUG CASE)', () => {
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://leader/services/embeddings-text');
+            const next = oAddress.next(current, target);
+            // Expected: should return the next immediate child in the hierarchy
+            // which is o://leader/services
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            console.log('Expected:', 'o://leader/services');
+            expect(next.toString()).to.equal('o://leader/services');
+        });
+        it('should reach final destination when already at intermediate node', () => {
+            const current = new oAddress('o://leader/services');
+            const target = new oAddress('o://leader/services/embeddings-text');
+            const next = oAddress.next(current, target);
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            console.log('Expected:', 'o://leader/services/embeddings-text');
+            expect(next.toString()).to.equal('o://leader/services/embeddings-text');
+        });
+    });
+    describe('Multi-level routing', () => {
+        it('should route through three-level hierarchy', () => {
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://leader/services/embeddings-text/method');
+            const next = oAddress.next(current, target);
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            console.log('Expected:', 'o://leader/services');
+            // Should go to first child in path
+            expect(next.toString()).to.equal('o://leader/services');
+        });
+        it('should handle routing from second level to third level', () => {
+            const current = new oAddress('o://leader/services');
+            const target = new oAddress('o://leader/services/embeddings-text/method');
+            const next = oAddress.next(current, target);
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            console.log('Expected:', 'o://leader/services/embeddings-text');
+            expect(next.toString()).to.equal('o://leader/services/embeddings-text');
+        });
+    });
+    describe('Edge cases', () => {
+        it('should route to leader from non-leader node', () => {
+            const current = new oAddress('o://worker');
+            const target = new oAddress('o://leader/services');
+            const next = oAddress.next(current, target);
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            console.log('Expected:', 'o://leader');
+            // Should route back to leader for resolution
+            expect(next.toString()).to.equal('o://leader');
+        });
+        it('should route static address to leader for resolution', () => {
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://embeddings-text');
+            const next = oAddress.next(current, target);
+            console.log('Current:', current.toString());
+            console.log('Target:', target.toString());
+            console.log('Next hop returned:', next.toString());
+            // Static addresses should be resolved by leader
+            expect(next.toString()).to.equal('o://leader');
+        });
+    });
+    describe('Exact bug reproduction scenario', () => {
+        it('should correctly route o://leader -> o://leader/services/embeddings-text', () => {
+            // This is the exact scenario from the bug report
+            const current = new oAddress('o://leader');
+            const target = new oAddress('o://leader/services/embeddings-text');
+            const next = oAddress.next(current, target);
+            console.log('=== BUG REPRODUCTION TEST ===');
+            console.log('Current address:', current.toString());
+            console.log('Current paths:', current.paths);
+            console.log('Current protocol:', current.protocol);
+            console.log('');
+            console.log('Target address:', target.toString());
+            console.log('Target paths:', target.paths);
+            console.log('Target protocol:', target.protocol);
+            console.log('');
+            // Calculate what the function does internally
+            const remainingPath = target.protocol.replace(current.protocol + '/', '');
+            console.log('remainingPath calculation:');
+            console.log('  target.protocol:', target.protocol);
+            console.log('  current.protocol + "/":', current.protocol + '/');
+            console.log('  remainingPath:', remainingPath);
+            console.log('');
+            const parts = remainingPath.replace('/o/', '').split('/');
+            console.log('parts calculation:');
+            console.log('  remainingPath.replace("/o/", ""):', remainingPath.replace('/o/', ''));
+            console.log('  split("/"):', parts);
+            console.log('  reversed:', [...parts].reverse());
+            console.log('  pop():', [...parts].reverse().pop());
+            console.log('');
+            const nextHop = remainingPath.replace('/o/', '').split('/').reverse().pop();
+            console.log('nextHop:', nextHop);
+            console.log('constructed address:', current.value + '/' + nextHop);
+            console.log('');
+            console.log('Actual next hop returned:', next.toString());
+            console.log('Expected next hop:', 'o://leader/services');
+            console.log('=== END BUG REPRODUCTION TEST ===');
+            // The bug manifests here - it should return o://leader/services
+            // but may return something else causing the duplication
+            expect(next.toString()).to.equal('o://leader/services');
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-core",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "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.8"
+    "@olane/o-protocol": "^0.7.9"
   },
   "dependencies": {
     "chalk": "^5.4.1",