@olane/o-node 0.7.12-alpha.1 → 0.7.12-alpha.4

package/LICENSE

@@ -0,0 +1,34 @@
+# Dual License: MIT OR Apache-2.0
+
+Copyright (c) 2025 Olane Inc.
+
+Olane OS is dual-licensed under your choice of either:
+
+- **MIT License** (LICENSE-MIT or https://opensource.org/licenses/MIT)
+- **Apache License, Version 2.0** (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
+
+## Why Dual Licensing?
+
+Dual licensing provides developers with flexibility when integrating Olane OS into their projects:
+
+- **Choose MIT**: If you prefer a simple, permissive license without patent provisions
+- **Choose Apache 2.0**: If you desire explicit patent protection and other features of the Apache license
+
+You may choose either license to govern your use of this software.
+
+## License Terms
+
+### MIT License
+The MIT license is very permissive and allows users to do almost anything with the software, including using, copying, modifying, merging, publishing, distributing, and selling it. The primary requirement is that the original copyright and license notice must be included in all copies of the software.
+
+See LICENSE-MIT for the full license text.
+
+### Apache License 2.0
+The Apache License 2.0 is also a permissive free software license. It grants users the right to use, modify, and distribute the software. It also includes provisions regarding patent grants, which are not present in the MIT license.
+
+See LICENSE-APACHE for the full license text.
+
+## Contributing
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you shall be dual-licensed as above, without any additional terms or conditions.
+

package/dist/src/router/resolvers/o-node.search-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node.search-resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.search-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EAEL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;IACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ;gBAAjB,OAAO,EAAE,QAAQ;IAIhD,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,QAAQ;IAIxC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,MAAM;IAInC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG;IAOnD;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,GAAG,EAAE;IASjE;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAIlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,GAAG,cAAc,EAAE;IAOtD;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,wBAAwB,CAChC,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,IAAI,EAAE,KAAK,GACV,cAAc,EAAE;IAgBnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,KAAK,EACX,qBAAqB,EAAE,QAAQ,EAC/B,YAAY,EAAE,GAAG,GAChB,QAAQ;IAsBL,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CA8D/D"}
+{"version":3,"file":"o-node.search-resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.search-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EAEL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;IACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ;gBAAjB,OAAO,EAAE,QAAQ;IAIhD,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,QAAQ;IAIxC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,MAAM;IAInC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG;IAOnD;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,GAAG,EAAE;IASjE;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAIlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,GAAG,cAAc,EAAE;IAOtD;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,wBAAwB,CAChC,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,IAAI,EAAE,KAAK,GACV,cAAc,EAAE;IAgBnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,KAAK,EACX,qBAAqB,EAAE,QAAQ,EAC/B,YAAY,EAAE,GAAG,GAChB,QAAQ;IAsBL,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAoE/D"}

package/dist/src/router/resolvers/o-node.search-resolver.js

@@ -241,7 +241,12 @@ export class oSearchResolver extends oAddressResolver {
             .toString() // o://embeddings-text replace o://embeddings-text = ''
             .replace(address.toRootAddress().toString(), '');
         this.logger.debug('Extra params:', extraParams);
-        const resolvedTargetAddress = new oAddress(selectedResult.address + extraParams);
+        // Check if selectedResult.address already contains the complete path
+        // This happens when registry finds via staticAddress - the returned address
+        // is the canonical hierarchical location, so we shouldn't append extraParams
+        const resultAddress = selectedResult.address;
+        const shouldAppendParams = extraParams && !resultAddress.endsWith(extraParams);
+        const resolvedTargetAddress = new oAddress(shouldAppendParams ? resultAddress + extraParams : resultAddress);
         // Set transports on the target address
         resolvedTargetAddress.setTransports(this.mapTransports(selectedResult));
         // Determine next hop and configure transports

package/dist/test/search-resolver.spec.js

@@ -515,6 +515,85 @@ describe('oSearchResolver', () => {
             }
         });
     });
+    describe('Address duplication bug fix', () => {
+        it('should NOT duplicate path segments when registry returns full hierarchical address', async () => {
+            // This test verifies the fix for the bug where o://services/embeddings-text
+            // was being resolved to o://leader/services/embeddings-text/services/embeddings-text
+            const address = new oNodeAddress('o://services/embeddings-text');
+            mockNode.use = async () => createResponse({
+                data: [
+                    {
+                        address: 'o://leader/services/embeddings-text',
+                        staticAddress: 'o://embeddings-text',
+                        transports: [
+                            {
+                                value: '/ip4/127.0.0.1/tcp/6001',
+                                type: TransportType.LIBP2P,
+                            },
+                        ],
+                    },
+                ],
+            });
+            const result = await resolver.resolve({
+                address,
+                targetAddress: address,
+                node: mockNode,
+                request: createRouterRequest(),
+            });
+            // Should be o://leader/services/embeddings-text, NOT o://leader/services/embeddings-text/embeddings-text
+            expect(result.targetAddress.value).to.equal('o://leader/services/embeddings-text');
+        });
+        it('should NOT duplicate when calling via static address', async () => {
+            const address = new oNodeAddress('o://embeddings-text');
+            mockNode.use = async () => createResponse({
+                data: [
+                    {
+                        address: 'o://leader/services/embeddings-text',
+                        staticAddress: 'o://embeddings-text',
+                        transports: [
+                            {
+                                value: '/ip4/127.0.0.1/tcp/6001',
+                                type: TransportType.LIBP2P,
+                            },
+                        ],
+                    },
+                ],
+            });
+            const result = await resolver.resolve({
+                address,
+                targetAddress: address,
+                node: mockNode,
+                request: createRouterRequest(),
+            });
+            expect(result.targetAddress.value).to.equal('o://leader/services/embeddings-text');
+        });
+        it('should still append legitimate extra params beyond the service name', async () => {
+            // If someone calls o://embeddings-text/custom/path, we should preserve /custom/path
+            const address = new oNodeAddress('o://embeddings-text/custom/path');
+            mockNode.use = async () => createResponse({
+                data: [
+                    {
+                        address: 'o://leader/services/embeddings-text',
+                        staticAddress: 'o://embeddings-text',
+                        transports: [
+                            {
+                                value: '/ip4/127.0.0.1/tcp/6001',
+                                type: TransportType.LIBP2P,
+                            },
+                        ],
+                    },
+                ],
+            });
+            const result = await resolver.resolve({
+                address,
+                targetAddress: address,
+                node: mockNode,
+                request: createRouterRequest(),
+            });
+            // Should append the extra /custom/path
+            expect(result.targetAddress.value).to.equal('o://leader/services/embeddings-text/custom/path');
+        });
+    });
     describe('Edge cases', () => {
         it('should handle address with long nested paths', async () => {
             const address = new oNodeAddress('o://leader/a/b/c/d/e/f');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.12-alpha.1",
+  "version": "0.7.12-alpha.4",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -54,11 +54,12 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-config": "^0.7.11",
-    "@olane/o-core": "^0.7.11",
-    "@olane/o-protocol": "^0.7.11",
-    "@olane/o-tool": "^0.7.11",
+    "@olane/o-config": "0.7.12-alpha.4",
+    "@olane/o-core": "0.7.12-alpha.4",
+    "@olane/o-protocol": "0.7.12-alpha.4",
+    "@olane/o-tool": "0.7.12-alpha.4",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
-  }
+  },
+  "gitHead": "13c575d61a455fce146303f4060c6628851a7223"
 }