clawmarket 0.6.1 → 0.6.3
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.
- package/dist/buyer/discovery.d.ts.map +1 -1
- package/dist/buyer/discovery.js +3 -1
- package/dist/buyer/discovery.js.map +1 -1
- package/dist/local-proxy.js +25 -8
- package/dist/local-proxy.js.map +1 -1
- package/dist/seller-daemon.js +2 -1
- package/dist/seller-daemon.js.map +1 -1
- package/dist/types/protocol.d.ts +3 -0
- package/dist/types/protocol.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/buyer/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,sBAAsB,CAAC;AAE5E;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,UAAU,CAAS;gBAEf,MAAM,EAAE,WAAW;IAI/B;;OAEG;IACG,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAgC/E;;OAEG;IACH,OAAO,CAAC,aAAa;IAUrB;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU7D;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,uBAAuB;
|
|
1
|
+
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/buyer/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,sBAAsB,CAAC;AAE5E;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,UAAU,CAAS;gBAEf,MAAM,EAAE,WAAW;IAI/B;;OAEG;IACG,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAgC/E;;OAEG;IACH,OAAO,CAAC,aAAa;IAUrB;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU7D;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAQ/B;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKtG;;OAEG;IACH,UAAU,IAAI,IAAI;CAInB"}
|
package/dist/buyer/discovery.js
CHANGED
|
@@ -100,7 +100,9 @@ export class DiscoveryClient {
|
|
|
100
100
|
*/
|
|
101
101
|
selectHighestReputation(sellers) {
|
|
102
102
|
return sellers.reduce((best, current) => {
|
|
103
|
-
|
|
103
|
+
const currentScore = current.reputation.finalScore ?? current.reputation.score;
|
|
104
|
+
const bestScore = best.reputation.finalScore ?? best.reputation.score;
|
|
105
|
+
return currentScore > bestScore ? current : best;
|
|
104
106
|
});
|
|
105
107
|
}
|
|
106
108
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../src/buyer/discovery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../src/buyer/discovery.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,OAAO,eAAe;IAClB,MAAM,CAAc;IACpB,YAAY,GAAiB,EAAE,CAAC;IAChC,SAAS,GAAG,CAAC,CAAC;IACd,UAAU,GAAG,KAAK,CAAC,CAAC,aAAa;IAEzC,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,KAAc,EAAE,YAAY,GAAG,KAAK;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC5F,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,MAAM,EAAE,QAAQ;YAChB,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE;SACpD,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,eAAe,MAAM,EAAE,EACjD,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAyB,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QAErB,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,OAAqB,EAAE,KAAc;QACzD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,CACjF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;IAC1E,CAAC;IAED;;OAEG;IACK,aAAa,CACnB,OAAqB,EACrB,KAAa,EACb,QAA2B;QAE3B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAE3C,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,cAAc;gBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAChD,KAAK,gBAAgB;gBACnB,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC3C,KAAK,oBAAoB;gBACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;YAC/C;gBACE,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,OAAqB,EAAE,KAAa;QAC5D,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACtC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;YAC7D,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;YAEnE,IAAI,CAAC,SAAS;gBAAE,OAAO,OAAO,CAAC;YAC/B,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAE/B,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/E,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;YAExF,OAAO,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,mBAAmB,CAAC,OAAqB;QAC/C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACtC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;YACjD,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;YACvD,OAAO,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,uBAAuB,CAAC,OAAqB;QACnD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACtC,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/E,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACtE,OAAO,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,MAAkB,EAAE,KAAa;QAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAC/D,OAAO,SAAS,EAAE,OAAO,IAAI,IAAI,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACrB,CAAC;CACF"}
|
package/dist/local-proxy.js
CHANGED
|
@@ -328,10 +328,18 @@ function getSellerCandidates(sellers, model) {
|
|
|
328
328
|
model,
|
|
329
329
|
inputPer1m: modelInfo.input_per_1m ?? 9999,
|
|
330
330
|
outputPer1m: modelInfo.output_per_1m ?? 9999,
|
|
331
|
-
score: seller.reputation?.score ?? 0,
|
|
331
|
+
score: seller.reputation?.final_score ?? seller.reputation?.score ?? 0,
|
|
332
|
+
botScore: seller.reputation?.bot_score ?? 0,
|
|
333
|
+
buyerScore: seller.reputation?.buyer_score ?? 0,
|
|
332
334
|
latencyMs: seller.reputation?.avg_latency_ms ?? 99999,
|
|
333
335
|
});
|
|
334
336
|
}
|
|
337
|
+
const computeRank = (candidate) => {
|
|
338
|
+
const price = candidate.inputPer1m + candidate.outputPer1m;
|
|
339
|
+
const latencyPenalty = Math.min(Math.max(candidate.latencyMs, 0), 5000) / 500;
|
|
340
|
+
// Reputation-first with price/latency tradeoff. Keeps cheap + trustworthy sellers near top.
|
|
341
|
+
return candidate.score * 1.5 - price * 8 - latencyPenalty;
|
|
342
|
+
};
|
|
335
343
|
candidates.sort((a, b) => {
|
|
336
344
|
const aBlocked = isSellerBlocked(a.sellerId) ? 1 : 0;
|
|
337
345
|
const bBlocked = isSellerBlocked(b.sellerId) ? 1 : 0;
|
|
@@ -345,6 +353,10 @@ function getSellerCandidates(sellers, model) {
|
|
|
345
353
|
const bIsDefault = b.walletAddress.toLowerCase() === defaultSeller.toLowerCase() ? 1 : 0;
|
|
346
354
|
if (aIsDefault !== bIsDefault)
|
|
347
355
|
return bIsDefault - aIsDefault;
|
|
356
|
+
const aRank = computeRank(a);
|
|
357
|
+
const bRank = computeRank(b);
|
|
358
|
+
if (aRank !== bRank)
|
|
359
|
+
return bRank - aRank;
|
|
348
360
|
const aPrice = a.inputPer1m + a.outputPer1m;
|
|
349
361
|
const bPrice = b.inputPer1m + b.outputPer1m;
|
|
350
362
|
if (aPrice !== bPrice)
|
|
@@ -558,16 +570,19 @@ function parseRelayAnthropicEventChunk(payload) {
|
|
|
558
570
|
if (!parsed || typeof parsed !== 'object')
|
|
559
571
|
return null;
|
|
560
572
|
const chunk = parsed;
|
|
561
|
-
|
|
573
|
+
const streamMarker = chunk.__clawmarket_stream_v1 === true || chunk._clawmarket_stream_v1 === true;
|
|
574
|
+
if (!streamMarker)
|
|
562
575
|
return null;
|
|
563
|
-
|
|
576
|
+
const chunkKind = typeof chunk.kind === 'string' ? chunk.kind.trim() : '';
|
|
577
|
+
if (chunkKind !== 'anthropic_event')
|
|
564
578
|
return null;
|
|
565
|
-
|
|
579
|
+
const eventName = typeof chunk.event === 'string' ? chunk.event.trim() : '';
|
|
580
|
+
if (!eventName)
|
|
566
581
|
return null;
|
|
567
582
|
if (!chunk.data || typeof chunk.data !== 'object')
|
|
568
583
|
return null;
|
|
569
584
|
return {
|
|
570
|
-
event:
|
|
585
|
+
event: eventName,
|
|
571
586
|
data: chunk.data,
|
|
572
587
|
};
|
|
573
588
|
}
|
|
@@ -584,9 +599,11 @@ function parseRelayOpenAIEventChunk(payload) {
|
|
|
584
599
|
if (!parsed || typeof parsed !== 'object')
|
|
585
600
|
return null;
|
|
586
601
|
const chunk = parsed;
|
|
587
|
-
|
|
602
|
+
const streamMarker = chunk.__clawmarket_stream_v1 === true || chunk._clawmarket_stream_v1 === true;
|
|
603
|
+
if (!streamMarker)
|
|
588
604
|
return null;
|
|
589
|
-
|
|
605
|
+
const chunkKind = typeof chunk.kind === 'string' ? chunk.kind.trim() : '';
|
|
606
|
+
if (chunkKind !== 'openai_event')
|
|
590
607
|
return null;
|
|
591
608
|
if (!chunk.data || typeof chunk.data !== 'object')
|
|
592
609
|
return null;
|
|
@@ -671,7 +688,7 @@ function parseRelayStructuredChunks(payload) {
|
|
|
671
688
|
if (typeof payload !== 'string')
|
|
672
689
|
return chunks;
|
|
673
690
|
const text = payload.trim();
|
|
674
|
-
if (!text.includes('__clawmarket_stream_v1'))
|
|
691
|
+
if (!text.includes('__clawmarket_stream_v1') && !text.includes('_clawmarket_stream_v1'))
|
|
675
692
|
return chunks;
|
|
676
693
|
const objects = extractJsonObjectsFromConcatenatedText(text);
|
|
677
694
|
for (const obj of objects) {
|