@olane/o-core 0.4.3 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"core.node.d.ts","sourceRoot":"","sources":["../../../src/core/core.node.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,SAAS,EAET,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,8BAAsB,SAAS;IAmBjB,QAAQ,CAAC,MAAM,EAAE,UAAU;IAlBhC,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,YAAY,CAAC;IAC5B,OAAO,EAAE,QAAQ,CAAC;IACzB,SAAgB,aAAa,EAAE,QAAQ,CAAC;IACjC,MAAM,EAAG,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,CAAqB;IACrC,MAAM,EAAE,KAAK,EAAE,CAAM;IACrB,iBAAiB,EAAG,kBAAkB,CAAC;IACvC,OAAO,EAAE,SAAS,EAAE,CAAM;IAC1B,iBAAiB,EAAE,kBAAkB,CAAC;IAC7C,SAAgB,WAAW,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAEpC,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,MAAM,CAAK;gBAET,MAAM,EAAE,UAAU;IAiBvC,IAAI,IAAI,aAEP;IAED,IAAI,UAAU,IAAI,MAAM,EAAE,CAIzB;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAW5B,IAAI,MAAM,IAAI,QAAQ,GAAG,IAAI,CAE5B;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,IAAI,gBAAgB,IAAI,SAAS,EAAE,CAElC;IAED,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,EAAE;IAsCvC,8BAA8B,CAClC,YAAY,EAAE,QAAQ,GACrB,OAAO,CAAC,QAAQ,CAAC;IAgCd,gBAAgB,CAAC,2BAA2B,EAAE,QAAQ,GAAG,OAAO,CAAC;QACrE,cAAc,EAAE,QAAQ,CAAC;QACzB,aAAa,EAAE,QAAQ,CAAC;KACzB,CAAC;IAiCF,iBAAiB,CAAC,2BAA2B,EAAE,QAAQ,GAAG,OAAO;IAuBjE;;;;;;OAMG;IACG,GAAG,CACP,2BAA2B,EAAE,QAAQ,EACrC,IAAI,EAAE;QACJ,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAC;KACjC,GACA,OAAO,CAAC,SAAS,CAAC;IA+Bf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCzB,OAAO,CACX,cAAc,EAAE,QAAQ,EACxB,aAAa,EAAE,QAAQ,GACtB,OAAO,CAAC,WAAW,CAAC;IA2BV,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtC;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBnC;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAanC"}
1
+ {"version":3,"file":"core.node.d.ts","sourceRoot":"","sources":["../../../src/core/core.node.ts"],"names":[],"mappings":"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"}
@@ -165,9 +165,7 @@ export class oCoreNode {
165
165
  throw new Error('Invalid address');
166
166
  }
167
167
  const { nextHopAddress, targetAddress } = await this.translateAddress(addressWithLeaderTransports);
168
- this.logger.debug('Using address, target: ', targetAddress.toString(), 'nextHop: ', nextHopAddress.toString());
169
168
  const connection = await this.connect(nextHopAddress, targetAddress);
170
- this.logger.debug('Connected to: ', targetAddress.toString(), ' sending data: ', data);
171
169
  // communicate the payload to the target node
172
170
  const response = await connection.send({
173
171
  address: targetAddress?.toString() || '',
@@ -220,7 +218,7 @@ export class oCoreNode {
220
218
  },
221
219
  };
222
220
  await this.use(address, params);
223
- // TODO: handle the response from the leader
221
+ this.logger.debug('Registration successful');
224
222
  }
225
223
  async connect(nextHopAddress, targetAddress) {
226
224
  if (!this.connectionManager) {
@@ -12,7 +12,7 @@ export declare abstract class oNode extends oCoreNode {
12
12
  abstract configureTransports(): any[];
13
13
  myTools(): string[];
14
14
  applyBridgeTransports(address: oAddress, request: oRequest): Promise<oResponse>;
15
- matchAgainstMethods(address: oAddress): boolean;
15
+ matchAgainstMethods(address: oAddress): Promise<boolean>;
16
16
  extractMethod(address: oAddress): string;
17
17
  _tool_route(request: oRequest & {
18
18
  stream: Stream;
@@ -1 +1 @@
1
- {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAKZ,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKhE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAGhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAKnC,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAyBhE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,IAAI,MAAM,EAAE;IAMb,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOrB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAQ/C,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAwEvE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA2B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}
1
+ {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAKZ,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKhE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAGhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAKnC,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IA2BhE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,IAAI,MAAM,EAAE;IAMb,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOf,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAS9D,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAqEvE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA2B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}
@@ -26,13 +26,14 @@ export class oNode extends oCoreNode {
26
26
  }
27
27
  async _tool_handshake(handshake) {
28
28
  this.logger.debug('Performing handshake with intent: ', handshake.params.intent);
29
+ const mytools = await this.myTools();
29
30
  const pc = new oConfigurePlan({
30
31
  intent: `This is a handshake request. You have already found the tool to resolve the user's intent: ${this.address.toString()}. Configure the handshake for the request to use the tool with user intent: ${handshake.params.intent}`,
31
32
  currentNode: this,
32
33
  caller: this.address,
33
34
  context: new oPlanContext([
34
35
  `[Method Metadata Begin]\n${JSON.stringify(this.methods)}\n[Method Metadata End]`,
35
- `[Method Options Begin]\n${this.myTools().join(', ')}\n[Method Options End]`,
36
+ `[Method Options Begin]\n${mytools.join(', ')}\n[Method Options End]`,
36
37
  ]),
37
38
  });
38
39
  const result = await pc.execute();
@@ -51,8 +52,9 @@ export class oNode extends oCoreNode {
51
52
  async applyBridgeTransports(address, request) {
52
53
  throw new oToolError(oToolErrorCodes.TOOL_TRANSPORT_NOT_SUPPORTED, 'Bridge transports not implemented');
53
54
  }
54
- matchAgainstMethods(address) {
55
- const methods = this.myTools();
55
+ async matchAgainstMethods(address) {
56
+ const methods = await this.myTools();
57
+ this.logger.debug('Matching against methods: ', methods);
56
58
  const method = address
57
59
  .toString()
58
60
  .replace(this.address.toString() + '/', '');
@@ -64,26 +66,23 @@ export class oNode extends oCoreNode {
64
66
  async _tool_route(request) {
65
67
  const { payload } = request.params;
66
68
  const { address } = request.params;
67
- this.logger.debug('Routing request to: ', address, ' with payload: ', payload);
69
+ this.logger.debug('Routing request to: ', address);
68
70
  const destinationAddress = new oAddress(address);
69
71
  // determine the next hop address from the encapsulated address
70
72
  const nextHopAddress = await this.addressResolution.resolve(destinationAddress);
73
+ this.logger.debug('Next hop address: ', nextHopAddress.toString());
71
74
  // prepare the request for the destination receiver
72
75
  let forwardRequest = new oRequest({
73
76
  params: payload.params,
74
77
  id: request.id,
75
78
  method: payload.method,
76
79
  });
77
- // if the next hop is not a libp2p address, we need to communicate to it another way
78
- if (this.addressResolution.supportsTransport(nextHopAddress)) {
79
- return this.applyBridgeTransports(nextHopAddress, forwardRequest);
80
- }
81
80
  // assume the next hop is a libp2p address, so we need to set the transports and dial it
82
81
  nextHopAddress.setTransports(this.getTransports(nextHopAddress));
83
82
  const isAtDestination = nextHopAddress.value === destinationAddress.value;
84
83
  // if we are at the destination, let's look for the closest tool that can service the request
85
84
  const transports = nextHopAddress.transports.filter((t) => typeof t !== 'string');
86
- const isMethodMatch = this.matchAgainstMethods(destinationAddress);
85
+ const isMethodMatch = await this.matchAgainstMethods(destinationAddress);
87
86
  // handle address -> method resolution
88
87
  if (isMethodMatch) {
89
88
  this.logger.debug('Method match found, forwarding to self...');
@@ -98,6 +97,10 @@ export class oNode extends oCoreNode {
98
97
  }
99
98
  return response.result.data;
100
99
  }
100
+ // if the next hop is not a libp2p address, we need to communicate to it another way
101
+ if (this.addressResolution.supportsTransport(nextHopAddress)) {
102
+ return this.applyBridgeTransports(nextHopAddress, forwardRequest);
103
+ }
101
104
  const targetStream = await this.p2pNode.dialProtocol(transports, nextHopAddress.protocol);
102
105
  // if not at destination, we need to forward the request to the target
103
106
  if (!isAtDestination) {
@@ -179,7 +182,7 @@ export class oNode extends oCoreNode {
179
182
  ' with parent transports: ' +
180
183
  node.parentTransports.join(', '));
181
184
  await node.start();
182
- this.logger.debug('Node started with transports: ', node.transports);
185
+ this.logger.debug('Child node started: ', node.address.toString());
183
186
  // test the connection to the child node to add it to the p2p network peer store
184
187
  await this.connect(node.address, node.address);
185
188
  }
@@ -1 +1 @@
1
- {"version":3,"file":"o-plan.d.ts","sourceRoot":"","sources":["../../../src/plan/o-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D,qBAAa,KAAK;IAOJ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IANlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,KAAK,EAAE,CAAM;IACvB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IAErB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;gBAER,MAAM,EAAE,WAAW;IAKlD,IAAI,MAAM,aAET;IAED,IAAI,QAAQ,yBAEX;IAED,IAAI,IAAI,6CAEP;IAED,UAAU,IAAI,GAAG;IAQjB,IAAI;IAIJ,MAAM;;;;;IAQA,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,SAAS;IAef,IAAI,YAAY,WAef;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAmB3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKhC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAoB3C,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;IAoC3B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAQ/B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7B,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAc9D"}
1
+ {"version":3,"file":"o-plan.d.ts","sourceRoot":"","sources":["../../../src/plan/o-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D,qBAAa,KAAK;IAOJ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IANlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,KAAK,EAAE,CAAM;IACvB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IAErB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;gBAER,MAAM,EAAE,WAAW;IAKlD,IAAI,MAAM,aAET;IAED,IAAI,QAAQ,yBAEX;IAED,IAAI,IAAI,6CAEP;IAED,UAAU,IAAI,GAAG;IAQjB,IAAI;IAIJ,MAAM;;;;;IAQA,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,SAAS;IAef,IAAI,YAAY,WAef;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAmB3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAKhC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAoB3C,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;IAqC3B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAQ/B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7B,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAc9D"}
@@ -126,6 +126,7 @@ export class oPlan {
126
126
  throw new oToolError(error.code, error.message);
127
127
  }
128
128
  const data = response.result.data;
129
+ this.logger.debug('Plan response: ', data);
129
130
  const message = data.message;
130
131
  const planResult = this.extractResultFromAI(message);
131
132
  return planResult;
@@ -1 +1 @@
1
- {"version":3,"file":"custom.prompt.d.ts","sourceRoot":"","sources":["../../../../src/plan/prompts/custom.prompt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,mBAAmB,MAAM,EACzB,oBAAoB,MAAM,WAuD3B,CAAC"}
1
+ {"version":3,"file":"custom.prompt.d.ts","sourceRoot":"","sources":["../../../../src/plan/prompts/custom.prompt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,mBAAmB,MAAM,EACzB,oBAAoB,MAAM,WA4D3B,CAAC"}
@@ -32,6 +32,11 @@ You resolve user intents by "cycling" through the following steps:
32
32
  - Tool addresses are used to access the tool's functionality
33
33
  [Address Rules End]
34
34
 
35
+ [URL Address Rules Begin]
36
+ - HTTP/HTTPS URL addresses are not olane tool addresses
37
+ - When an address is provided in a user intent, get and analyze the contents of the address before assuming to know how to use it
38
+ [URL Address Rules End]
39
+
35
40
  [Cycle Instructions Begin]
36
41
  ${cycleInstructions}
37
42
  [Cycle Instructions End]
@@ -10,8 +10,8 @@ describe('in-process @memory', () => {
10
10
  await node.start();
11
11
  expect(node.state).to.equal(NodeState.RUNNING);
12
12
  const transports = node.transports;
13
- expect(transports.length).to.equal(1);
14
- expect(transports[0].toString()).to.contain('/memory');
13
+ // expect(transports.length).to.equal(1);
14
+ // expect(transports[0].toString()).to.contain('/memory');
15
15
  await node.stop();
16
16
  expect(node.state).to.equal(NodeState.STOPPED);
17
17
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@olane/o-core",
3
- "version": "0.4.3",
3
+ "version": "0.5.1",
4
4
  "type": "module",
5
5
  "main": "dist/src/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -19,6 +19,7 @@
19
19
  "test": "aegir test",
20
20
  "test:node": "aegir test -t node",
21
21
  "test:browser": "aegir test -t browser",
22
+ "deep:clean": "rm -rf node_modules && rm package-lock.json",
22
23
  "dev": "DEBUG=o-protocol:* npx tsx src/tests/index.ts",
23
24
  "build": "tsc",
24
25
  "start:prod": "node dist/index.js",
@@ -33,6 +34,8 @@
33
34
  "license": "ISC",
34
35
  "description": "Olane addressable p2p node used to host tools, data or anything else your heart can dream of.",
35
36
  "devDependencies": {
37
+ "@olane/o-config": "file:packages/o-config",
38
+ "@olane/o-protocol": "file:packages/o-protocol",
36
39
  "@eslint/eslintrc": "^3.3.1",
37
40
  "@eslint/js": "^9.29.0",
38
41
  "@tsconfig/node20": "^20.1.6",
@@ -54,8 +57,8 @@
54
57
  "typescript": "^5.8.3"
55
58
  },
56
59
  "peerDependencies": {
57
- "@olane/o-config": "^0.4.2",
58
- "@olane/o-protocol": "^0.4.2"
60
+ "@olane/o-config": "^0.5.0",
61
+ "@olane/o-protocol": "^0.5.0"
59
62
  },
60
63
  "dependencies": {
61
64
  "chalk": "^5.4.1",