@t0ken.ai/memoryx-openclaw-plugin 2.2.73 → 2.2.74
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/constants.d.ts +1 -1
- package/dist/constants.js +1 -1
- package/dist/sidecar.d.ts.map +1 -1
- package/dist/sidecar.js +10 -21
- package/package.json +1 -1
package/dist/constants.d.ts
CHANGED
package/dist/constants.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import * as path from "path";
|
|
5
5
|
import * as os from "os";
|
|
6
6
|
// Plugin version - synced from package.json by prebuild script
|
|
7
|
-
export const PLUGIN_VERSION = "2.2.
|
|
7
|
+
export const PLUGIN_VERSION = "2.2.74";
|
|
8
8
|
export const DEFAULT_API_BASE = "https://t0ken.ai/api";
|
|
9
9
|
export const PLUGIN_DIR = path.join(os.homedir(), ".openclaw", "extensions", "memoryx-openclaw-plugin");
|
|
10
10
|
/** 真实上游 baseUrl 缓存文件：重启后若配置已被改成 localhost，从此文件恢复各厂商真实地址。 */
|
package/dist/sidecar.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,eAAe,CAAsC;IAC7D,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,gBAAgB,CAAuC;IAC/D,OAAO,CAAC,mBAAmB,CAAc;IACzC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,mBAAmB,CAAS;gBAGhC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EACpD,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC9D,OAAO,EAAE,cAAc;IAQrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../src/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE7D,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,eAAe,CAAsC;IAC7D,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,gBAAgB,CAAuC;IAC/D,OAAO,CAAC,mBAAmB,CAAc;IACzC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,mBAAmB,CAAS;gBAGhC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,eAAe,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EACpD,kBAAkB,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,EAC9D,OAAO,EAAE,cAAc;IAQrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,OAAO,IAAI,MAAM;YAMH,UAAU;IAuBxB,OAAO,CAAC,aAAa;IAIrB;;;;OAIG;YACW,kBAAkB;YA0GlB,aAAa;IAsM3B,OAAO,CAAC,QAAQ;CAQnB"}
|
package/dist/sidecar.js
CHANGED
|
@@ -43,6 +43,8 @@ export class SidecarServer {
|
|
|
43
43
|
});
|
|
44
44
|
server.listen(SIDECAR_PORT, () => {
|
|
45
45
|
this.server = server;
|
|
46
|
+
const agentTimeout = this.options.agentTimeoutSeconds || 600;
|
|
47
|
+
log(`[Sidecar] agentTimeoutSeconds=${agentTimeout}, fetchTimeout=${Math.round(agentTimeout * 1.2)}s`, { console: true });
|
|
46
48
|
const baseUrl = `http://localhost:${SIDECAR_PORT}`;
|
|
47
49
|
log(`[Sidecar] Started on port ${SIDECAR_PORT}. OpenClaw base URL: ${baseUrl} (proxy: ${this.options.proxyUrl})`);
|
|
48
50
|
log(`[Sidecar] Log file: ${LOG_FILE}`, { console: true });
|
|
@@ -109,11 +111,6 @@ export class SidecarServer {
|
|
|
109
111
|
return false;
|
|
110
112
|
}
|
|
111
113
|
const fallbackBody = { ...parsedBody };
|
|
112
|
-
if (fallbackBody.model === "auto") {
|
|
113
|
-
const match = this.availableProviders.find(p => p.provider === provider);
|
|
114
|
-
if (match?.model)
|
|
115
|
-
fallbackBody.model = match.model;
|
|
116
|
-
}
|
|
117
114
|
const upstreamUrl = realBaseUrl.replace(/\/+$/, "") + reqUrl;
|
|
118
115
|
const headers = { "Content-Type": "application/json" };
|
|
119
116
|
if (requestFormat === "anthropic") {
|
|
@@ -252,25 +249,17 @@ export class SidecarServer {
|
|
|
252
249
|
const incomingApiKey = authHeader.startsWith("Bearer ")
|
|
253
250
|
? authHeader.slice(7).trim()
|
|
254
251
|
: req.headers["x-api-key"]?.trim() || authHeader;
|
|
255
|
-
const realProvider =
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
}
|
|
261
|
-
const messages = parsedBody.messages || [];
|
|
262
|
-
const lastUserMsg = [...messages].reverse().find((m) => m.role === "user");
|
|
263
|
-
const searchQuery = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
|
|
252
|
+
const realProvider = req.headers["x-memoryx-real-provider"]?.trim()
|
|
253
|
+
|| urlProvider
|
|
254
|
+
|| this.defaultProvider.provider
|
|
255
|
+
|| "";
|
|
256
|
+
const realBaseUrl = baseUrlMapObj[realProvider] || "";
|
|
264
257
|
const proxyRequestBody = {
|
|
265
|
-
base_url_map: baseUrlMapObj,
|
|
266
|
-
credentials: credentialsObj,
|
|
267
|
-
incoming_api_key: incomingApiKey || undefined,
|
|
268
258
|
body: parsedBody,
|
|
259
|
+
provider: realProvider,
|
|
260
|
+
api_base: realBaseUrl,
|
|
261
|
+
api_key: incomingApiKey,
|
|
269
262
|
request_format: requestFormat,
|
|
270
|
-
request_headers: { "x-memoryx-real-provider": realProvider },
|
|
271
|
-
search_query: searchQuery,
|
|
272
|
-
agent_id: this.cachedAgentId,
|
|
273
|
-
available_models: this.availableProviders.map((p) => `${p.provider}/${p.model}`),
|
|
274
263
|
};
|
|
275
264
|
const pathLog = url.split("?")[0] || "/";
|
|
276
265
|
log(`[Sidecar] ${reqId} ${method} ${pathLog} fmt=${requestFormat} provider=${realProvider} model=${parsedBody.model ?? "-"} stream=${stream}`, { console: true });
|
package/package.json
CHANGED