@tloncorp/openclaw 0.4.3 → 0.6.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.
- package/README.md +130 -141
- package/dist/index.js +703 -152
- package/dist/index.js.map +1 -1
- package/dist/setup-api.js +2 -2
- package/dist/setup-entry.js +2 -2
- package/dist/setup-entry.js.map +1 -1
- package/dist/src/account-fields.js +7 -3
- package/dist/src/account-fields.js.map +1 -1
- package/dist/src/actions.js +73 -52
- package/dist/src/actions.js.map +1 -1
- package/dist/src/channel.js +63 -39
- package/dist/src/channel.js.map +1 -1
- package/dist/src/channel.runtime.js +61 -32
- package/dist/src/channel.runtime.js.map +1 -1
- package/dist/src/config-schema.js +24 -4
- package/dist/src/config-schema.js.map +1 -1
- package/dist/src/diagnostic-subscriptions.js +49 -0
- package/dist/src/diagnostic-subscriptions.js.map +1 -0
- package/dist/src/effective-owner.js.map +1 -1
- package/dist/src/gateway-status.js +55 -7
- package/dist/src/gateway-status.js.map +1 -1
- package/dist/src/monitor/approval.js +71 -62
- package/dist/src/monitor/approval.js.map +1 -1
- package/dist/src/monitor/command-auth.js +7 -7
- package/dist/src/monitor/command-auth.js.map +1 -1
- package/dist/src/monitor/command-bridge.js +3 -2
- package/dist/src/monitor/command-bridge.js.map +1 -1
- package/dist/src/monitor/computing-presence.js +76 -12
- package/dist/src/monitor/computing-presence.js.map +1 -1
- package/dist/src/monitor/discovery.js +16 -9
- package/dist/src/monitor/discovery.js.map +1 -1
- package/dist/src/monitor/history.js +58 -26
- package/dist/src/monitor/history.js.map +1 -1
- package/dist/src/monitor/index.js +3018 -2496
- package/dist/src/monitor/index.js.map +1 -1
- package/dist/src/monitor/media.js +106 -78
- package/dist/src/monitor/media.js.map +1 -1
- package/dist/src/monitor/nudge-runner.js +36 -27
- package/dist/src/monitor/nudge-runner.js.map +1 -1
- package/dist/src/monitor/nudge-state.js +7 -11
- package/dist/src/monitor/nudge-state.js.map +1 -1
- package/dist/src/monitor/owner-reply-persistence.js +27 -26
- package/dist/src/monitor/owner-reply-persistence.js.map +1 -1
- package/dist/src/monitor/processed-messages.js.map +1 -1
- package/dist/src/monitor/session-routing.js +261 -0
- package/dist/src/monitor/session-routing.js.map +1 -0
- package/dist/src/monitor/settings-sync.js +1 -8
- package/dist/src/monitor/settings-sync.js.map +1 -1
- package/dist/src/monitor/utils.js +77 -71
- package/dist/src/monitor/utils.js.map +1 -1
- package/dist/src/nudge-decision.js +40 -43
- package/dist/src/nudge-decision.js.map +1 -1
- package/dist/src/nudge-messages.js +9 -9
- package/dist/src/nudge-scheduler.js.map +1 -1
- package/dist/src/owner-listen-command.js +38 -28
- package/dist/src/owner-listen-command.js.map +1 -1
- package/dist/src/pending-nudge.js.map +1 -1
- package/dist/src/runtime.js +10 -6
- package/dist/src/runtime.js.map +1 -1
- package/dist/src/session-roles.js +2 -1
- package/dist/src/session-roles.js.map +1 -1
- package/dist/src/session-route.js +44 -0
- package/dist/src/session-route.js.map +1 -0
- package/dist/src/settings.js +233 -102
- package/dist/src/settings.js.map +1 -1
- package/dist/src/setup-core.js +32 -32
- package/dist/src/setup-core.js.map +1 -1
- package/dist/src/setup-surface.js +19 -19
- package/dist/src/setup-surface.js.map +1 -1
- package/dist/src/shared-state.js +46 -0
- package/dist/src/shared-state.js.map +1 -0
- package/dist/src/targets.js +17 -10
- package/dist/src/targets.js.map +1 -1
- package/dist/src/telemetry.js +764 -34
- package/dist/src/telemetry.js.map +1 -1
- package/dist/src/tlon-binary.js +20 -12
- package/dist/src/tlon-binary.js.map +1 -1
- package/dist/src/tlon-tool-guard.js +5 -5
- package/dist/src/tool-trace.js +17 -13
- package/dist/src/tool-trace.js.map +1 -1
- package/dist/src/types.js +30 -12
- package/dist/src/types.js.map +1 -1
- package/dist/src/urbit/api-client.js +16 -12
- package/dist/src/urbit/api-client.js.map +1 -1
- package/dist/src/urbit/auth.js +9 -9
- package/dist/src/urbit/auth.js.map +1 -1
- package/dist/src/urbit/base-url.js +11 -11
- package/dist/src/urbit/base-url.js.map +1 -1
- package/dist/src/urbit/channel-ops.js +25 -19
- package/dist/src/urbit/channel-ops.js.map +1 -1
- package/dist/src/urbit/context.js +8 -8
- package/dist/src/urbit/context.js.map +1 -1
- package/dist/src/urbit/errors.js +33 -7
- package/dist/src/urbit/errors.js.map +1 -1
- package/dist/src/urbit/fetch.js +3 -3
- package/dist/src/urbit/fetch.js.map +1 -1
- package/dist/src/urbit/http-poke.js +10 -10
- package/dist/src/urbit/http-poke.js.map +1 -1
- package/dist/src/urbit/send.js +27 -23
- package/dist/src/urbit/send.js.map +1 -1
- package/dist/src/urbit/sse-client.js +45 -41
- package/dist/src/urbit/sse-client.js.map +1 -1
- package/dist/src/urbit/story.js +31 -30
- package/dist/src/urbit/story.js.map +1 -1
- package/dist/src/urbit/upload.js +8 -8
- package/dist/src/urbit/upload.js.map +1 -1
- package/dist/src/version.generated.js +2 -1
- package/dist/src/version.generated.js.map +1 -1
- package/dist/src/version.js +134 -0
- package/dist/src/version.js.map +1 -0
- package/openclaw.plugin.json +37 -0
- package/package.json +9 -15
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { randomUUID } from
|
|
2
|
-
import { Readable } from
|
|
3
|
-
import { ensureUrbitChannelOpen, pokeUrbitChannel, scryUrbitPath } from
|
|
4
|
-
import { getUrbitContext, normalizeUrbitCookie } from
|
|
5
|
-
import { urbitFetch } from
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { Readable } from 'node:stream';
|
|
3
|
+
import { ensureUrbitChannelOpen, pokeUrbitChannel, scryUrbitPath, } from './channel-ops.js';
|
|
4
|
+
import { getUrbitContext, normalizeUrbitCookie } from './context.js';
|
|
5
|
+
import { urbitFetch } from './fetch.js';
|
|
6
6
|
export class UrbitSSEClient {
|
|
7
7
|
url;
|
|
8
8
|
cookie;
|
|
@@ -50,13 +50,17 @@ export class UrbitSSEClient {
|
|
|
50
50
|
const subId = this.subscriptions.length + 1;
|
|
51
51
|
const subscription = {
|
|
52
52
|
id: subId,
|
|
53
|
-
action:
|
|
53
|
+
action: 'subscribe',
|
|
54
54
|
ship: this.ship,
|
|
55
55
|
app: params.app,
|
|
56
56
|
path: params.path,
|
|
57
57
|
};
|
|
58
58
|
this.subscriptions.push(subscription);
|
|
59
|
-
this.eventHandlers.set(subId, {
|
|
59
|
+
this.eventHandlers.set(subId, {
|
|
60
|
+
event: params.event,
|
|
61
|
+
err: params.err,
|
|
62
|
+
quit: params.quit,
|
|
63
|
+
});
|
|
60
64
|
if (this.isConnected) {
|
|
61
65
|
try {
|
|
62
66
|
await this.sendSubscription(subscription);
|
|
@@ -73,9 +77,9 @@ export class UrbitSSEClient {
|
|
|
73
77
|
baseUrl: this.url,
|
|
74
78
|
path: `/~/channel/${this.channelId}`,
|
|
75
79
|
init: {
|
|
76
|
-
method:
|
|
80
|
+
method: 'PUT',
|
|
77
81
|
headers: {
|
|
78
|
-
|
|
82
|
+
'Content-Type': 'application/json',
|
|
79
83
|
Cookie: this.cookie,
|
|
80
84
|
},
|
|
81
85
|
body: JSON.stringify([subscription]),
|
|
@@ -84,12 +88,12 @@ export class UrbitSSEClient {
|
|
|
84
88
|
lookupFn: this.lookupFn,
|
|
85
89
|
fetchImpl: this.fetchImpl,
|
|
86
90
|
timeoutMs: 30_000,
|
|
87
|
-
auditContext:
|
|
91
|
+
auditContext: 'tlon-urbit-subscribe',
|
|
88
92
|
});
|
|
89
93
|
try {
|
|
90
94
|
if (!response.ok && response.status !== 204) {
|
|
91
|
-
const errorText = await response.text().catch(() =>
|
|
92
|
-
throw new Error(`Subscribe failed: ${response.status}${errorText ? ` - ${errorText}` :
|
|
95
|
+
const errorText = await response.text().catch(() => '');
|
|
96
|
+
throw new Error(`Subscribe failed: ${response.status}${errorText ? ` - ${errorText}` : ''}`);
|
|
93
97
|
}
|
|
94
98
|
}
|
|
95
99
|
finally {
|
|
@@ -107,7 +111,7 @@ export class UrbitSSEClient {
|
|
|
107
111
|
fetchImpl: this.fetchImpl,
|
|
108
112
|
}, {
|
|
109
113
|
createBody: this.subscriptions,
|
|
110
|
-
createAuditContext:
|
|
114
|
+
createAuditContext: 'tlon-urbit-channel-create',
|
|
111
115
|
});
|
|
112
116
|
await this.openStream();
|
|
113
117
|
this.isConnected = true;
|
|
@@ -123,9 +127,9 @@ export class UrbitSSEClient {
|
|
|
123
127
|
baseUrl: this.url,
|
|
124
128
|
path: `/~/channel/${this.channelId}`,
|
|
125
129
|
init: {
|
|
126
|
-
method:
|
|
130
|
+
method: 'GET',
|
|
127
131
|
headers: {
|
|
128
|
-
Accept:
|
|
132
|
+
Accept: 'text/event-stream',
|
|
129
133
|
Cookie: this.cookie,
|
|
130
134
|
},
|
|
131
135
|
},
|
|
@@ -133,7 +137,7 @@ export class UrbitSSEClient {
|
|
|
133
137
|
lookupFn: this.lookupFn,
|
|
134
138
|
fetchImpl: this.fetchImpl,
|
|
135
139
|
signal: controller.signal,
|
|
136
|
-
auditContext:
|
|
140
|
+
auditContext: 'tlon-urbit-sse-stream',
|
|
137
141
|
});
|
|
138
142
|
this.streamRelease = release;
|
|
139
143
|
// Clear timeout once connection established (headers received).
|
|
@@ -160,7 +164,7 @@ export class UrbitSSEClient {
|
|
|
160
164
|
}
|
|
161
165
|
// oxlint-disable-next-line typescript/no-explicit-any
|
|
162
166
|
const stream = body instanceof ReadableStream ? Readable.fromWeb(body) : body;
|
|
163
|
-
let buffer =
|
|
167
|
+
let buffer = '';
|
|
164
168
|
try {
|
|
165
169
|
for await (const chunk of stream) {
|
|
166
170
|
if (this.aborted) {
|
|
@@ -168,7 +172,7 @@ export class UrbitSSEClient {
|
|
|
168
172
|
}
|
|
169
173
|
buffer += chunk.toString();
|
|
170
174
|
let eventEnd;
|
|
171
|
-
while ((eventEnd = buffer.indexOf(
|
|
175
|
+
while ((eventEnd = buffer.indexOf('\n\n')) !== -1) {
|
|
172
176
|
const eventData = buffer.substring(0, eventEnd);
|
|
173
177
|
buffer = buffer.substring(eventEnd + 2);
|
|
174
178
|
this.processEvent(eventData);
|
|
@@ -184,20 +188,20 @@ export class UrbitSSEClient {
|
|
|
184
188
|
this.streamController = null;
|
|
185
189
|
if (!this.aborted && this.autoReconnect) {
|
|
186
190
|
this.isConnected = false;
|
|
187
|
-
this.logger.log?.(
|
|
191
|
+
this.logger.log?.('[SSE] Stream ended, attempting reconnection...');
|
|
188
192
|
await this.attemptReconnect();
|
|
189
193
|
}
|
|
190
194
|
}
|
|
191
195
|
}
|
|
192
196
|
processEvent(eventData) {
|
|
193
|
-
const lines = eventData.split(
|
|
197
|
+
const lines = eventData.split('\n');
|
|
194
198
|
let data = null;
|
|
195
199
|
let eventId = null;
|
|
196
200
|
for (const line of lines) {
|
|
197
|
-
if (line.startsWith(
|
|
201
|
+
if (line.startsWith('id: ')) {
|
|
198
202
|
eventId = parseInt(line.substring(4), 10);
|
|
199
203
|
}
|
|
200
|
-
if (line.startsWith(
|
|
204
|
+
if (line.startsWith('data: ')) {
|
|
201
205
|
data = line.substring(6);
|
|
202
206
|
}
|
|
203
207
|
}
|
|
@@ -219,7 +223,7 @@ export class UrbitSSEClient {
|
|
|
219
223
|
try {
|
|
220
224
|
const parsed = JSON.parse(data);
|
|
221
225
|
// Log poke ack/nack responses (normally silent — critical for debugging DM delivery issues)
|
|
222
|
-
if (parsed.response ===
|
|
226
|
+
if (parsed.response === 'poke') {
|
|
223
227
|
if (parsed.err) {
|
|
224
228
|
this.logger.error?.(`[SSE] Poke NACK id=${parsed.id}: ${JSON.stringify(parsed.err)}`);
|
|
225
229
|
}
|
|
@@ -228,7 +232,7 @@ export class UrbitSSEClient {
|
|
|
228
232
|
}
|
|
229
233
|
return;
|
|
230
234
|
}
|
|
231
|
-
if (parsed.response ===
|
|
235
|
+
if (parsed.response === 'quit') {
|
|
232
236
|
if (parsed.id) {
|
|
233
237
|
const handlers = this.eventHandlers.get(parsed.id);
|
|
234
238
|
if (handlers?.quit) {
|
|
@@ -266,7 +270,7 @@ export class UrbitSSEClient {
|
|
|
266
270
|
ssrfPolicy: this.ssrfPolicy,
|
|
267
271
|
lookupFn: this.lookupFn,
|
|
268
272
|
fetchImpl: this.fetchImpl,
|
|
269
|
-
}, { ...params, auditContext:
|
|
273
|
+
}, { ...params, auditContext: 'tlon-urbit-poke' });
|
|
270
274
|
}
|
|
271
275
|
async scry(path) {
|
|
272
276
|
return await scryUrbitPath({
|
|
@@ -275,7 +279,7 @@ export class UrbitSSEClient {
|
|
|
275
279
|
ssrfPolicy: this.ssrfPolicy,
|
|
276
280
|
lookupFn: this.lookupFn,
|
|
277
281
|
fetchImpl: this.fetchImpl,
|
|
278
|
-
}, { path, auditContext:
|
|
282
|
+
}, { path, auditContext: 'tlon-urbit-scry' });
|
|
279
283
|
}
|
|
280
284
|
/**
|
|
281
285
|
* Update the cookie used for authentication.
|
|
@@ -288,16 +292,16 @@ export class UrbitSSEClient {
|
|
|
288
292
|
this.lastAcknowledgedEventId = eventId;
|
|
289
293
|
const ackData = {
|
|
290
294
|
id: Date.now(),
|
|
291
|
-
action:
|
|
292
|
-
|
|
295
|
+
action: 'ack',
|
|
296
|
+
'event-id': eventId,
|
|
293
297
|
};
|
|
294
298
|
const { response, release } = await urbitFetch({
|
|
295
299
|
baseUrl: this.url,
|
|
296
300
|
path: `/~/channel/${this.channelId}`,
|
|
297
301
|
init: {
|
|
298
|
-
method:
|
|
302
|
+
method: 'PUT',
|
|
299
303
|
headers: {
|
|
300
|
-
|
|
304
|
+
'Content-Type': 'application/json',
|
|
301
305
|
Cookie: this.cookie,
|
|
302
306
|
},
|
|
303
307
|
body: JSON.stringify([ackData]),
|
|
@@ -306,7 +310,7 @@ export class UrbitSSEClient {
|
|
|
306
310
|
lookupFn: this.lookupFn,
|
|
307
311
|
fetchImpl: this.fetchImpl,
|
|
308
312
|
timeoutMs: 10_000,
|
|
309
|
-
auditContext:
|
|
313
|
+
auditContext: 'tlon-urbit-ack',
|
|
310
314
|
});
|
|
311
315
|
try {
|
|
312
316
|
if (!response.ok) {
|
|
@@ -319,7 +323,7 @@ export class UrbitSSEClient {
|
|
|
319
323
|
}
|
|
320
324
|
async attemptReconnect() {
|
|
321
325
|
if (this.aborted || !this.autoReconnect) {
|
|
322
|
-
this.logger.log?.(
|
|
326
|
+
this.logger.log?.('[SSE] Reconnection aborted or disabled');
|
|
323
327
|
return;
|
|
324
328
|
}
|
|
325
329
|
// If we've hit max attempts, wait longer then reset and keep trying
|
|
@@ -329,7 +333,7 @@ export class UrbitSSEClient {
|
|
|
329
333
|
const extendedBackoff = 10000; // 10 seconds
|
|
330
334
|
await new Promise((resolve) => setTimeout(resolve, extendedBackoff));
|
|
331
335
|
this.reconnectAttempts = 0; // Reset counter to continue trying
|
|
332
|
-
this.logger.log?.(
|
|
336
|
+
this.logger.log?.('[SSE] Reconnection attempts reset, resuming reconnection...');
|
|
333
337
|
}
|
|
334
338
|
this.reconnectAttempts += 1;
|
|
335
339
|
const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts - 1), this.maxReconnectDelay);
|
|
@@ -342,7 +346,7 @@ export class UrbitSSEClient {
|
|
|
342
346
|
await this.onReconnect(this);
|
|
343
347
|
}
|
|
344
348
|
await this.connect();
|
|
345
|
-
this.logger.log?.(
|
|
349
|
+
this.logger.log?.('[SSE] Reconnection successful!');
|
|
346
350
|
}
|
|
347
351
|
catch (error) {
|
|
348
352
|
this.logger.error?.(`[SSE] Reconnection failed: ${String(error)}`);
|
|
@@ -374,7 +378,7 @@ export class UrbitSSEClient {
|
|
|
374
378
|
const newSubId = this.subscriptions.length + 1;
|
|
375
379
|
const newSub = {
|
|
376
380
|
id: newSubId,
|
|
377
|
-
action:
|
|
381
|
+
action: 'subscribe',
|
|
378
382
|
ship: this.ship,
|
|
379
383
|
app: oldSub.app,
|
|
380
384
|
path: oldSub.path,
|
|
@@ -399,7 +403,7 @@ export class UrbitSSEClient {
|
|
|
399
403
|
try {
|
|
400
404
|
const unsubscribes = this.subscriptions.map((sub) => ({
|
|
401
405
|
id: sub.id,
|
|
402
|
-
action:
|
|
406
|
+
action: 'unsubscribe',
|
|
403
407
|
subscription: sub.id,
|
|
404
408
|
}));
|
|
405
409
|
{
|
|
@@ -407,9 +411,9 @@ export class UrbitSSEClient {
|
|
|
407
411
|
baseUrl: this.url,
|
|
408
412
|
path: `/~/channel/${this.channelId}`,
|
|
409
413
|
init: {
|
|
410
|
-
method:
|
|
414
|
+
method: 'PUT',
|
|
411
415
|
headers: {
|
|
412
|
-
|
|
416
|
+
'Content-Type': 'application/json',
|
|
413
417
|
Cookie: this.cookie,
|
|
414
418
|
},
|
|
415
419
|
body: JSON.stringify(unsubscribes),
|
|
@@ -418,7 +422,7 @@ export class UrbitSSEClient {
|
|
|
418
422
|
lookupFn: this.lookupFn,
|
|
419
423
|
fetchImpl: this.fetchImpl,
|
|
420
424
|
timeoutMs: 30_000,
|
|
421
|
-
auditContext:
|
|
425
|
+
auditContext: 'tlon-urbit-unsubscribe',
|
|
422
426
|
});
|
|
423
427
|
try {
|
|
424
428
|
void response.body?.cancel();
|
|
@@ -432,7 +436,7 @@ export class UrbitSSEClient {
|
|
|
432
436
|
baseUrl: this.url,
|
|
433
437
|
path: `/~/channel/${this.channelId}`,
|
|
434
438
|
init: {
|
|
435
|
-
method:
|
|
439
|
+
method: 'DELETE',
|
|
436
440
|
headers: {
|
|
437
441
|
Cookie: this.cookie,
|
|
438
442
|
},
|
|
@@ -441,7 +445,7 @@ export class UrbitSSEClient {
|
|
|
441
445
|
lookupFn: this.lookupFn,
|
|
442
446
|
fetchImpl: this.fetchImpl,
|
|
443
447
|
timeoutMs: 30_000,
|
|
444
|
-
auditContext:
|
|
448
|
+
auditContext: 'tlon-urbit-channel-close',
|
|
445
449
|
});
|
|
446
450
|
try {
|
|
447
451
|
void response.body?.cancel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-client.js","sourceRoot":"","sources":["../../../src/urbit/sse-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sse-client.js","sourceRoot":"","sources":["../../../src/urbit/sse-client.ts"],"names":[],"mappings":"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"}
|
package/dist/src/urbit/story.js
CHANGED
|
@@ -43,7 +43,7 @@ function parseInlineMarkdown(text) {
|
|
|
43
43
|
// Inline code: `code`
|
|
44
44
|
const codeMatch = remaining.match(/^`([^`]+)`/);
|
|
45
45
|
if (codeMatch) {
|
|
46
|
-
result.push({
|
|
46
|
+
result.push({ 'inline-code': codeMatch[1] });
|
|
47
47
|
remaining = remaining.slice(codeMatch[0].length);
|
|
48
48
|
continue;
|
|
49
49
|
}
|
|
@@ -81,16 +81,16 @@ function parseInlineMarkdown(text) {
|
|
|
81
81
|
// Plain text: consume until next markdown token or URL start.
|
|
82
82
|
// This prevents swallowing the "https" prefix before "://".
|
|
83
83
|
const specialTokenIndices = [
|
|
84
|
-
remaining.indexOf(
|
|
85
|
-
remaining.indexOf(
|
|
86
|
-
remaining.indexOf(
|
|
87
|
-
remaining.indexOf(
|
|
88
|
-
remaining.indexOf(
|
|
89
|
-
remaining.indexOf(
|
|
90
|
-
remaining.indexOf(
|
|
91
|
-
remaining.indexOf(
|
|
92
|
-
remaining.indexOf(
|
|
93
|
-
remaining.indexOf(
|
|
84
|
+
remaining.indexOf('**'),
|
|
85
|
+
remaining.indexOf('__'),
|
|
86
|
+
remaining.indexOf('~~'),
|
|
87
|
+
remaining.indexOf('`'),
|
|
88
|
+
remaining.indexOf('['),
|
|
89
|
+
remaining.indexOf('!'),
|
|
90
|
+
remaining.indexOf('~'),
|
|
91
|
+
remaining.indexOf('\n'),
|
|
92
|
+
remaining.indexOf('*'),
|
|
93
|
+
remaining.indexOf('_'),
|
|
94
94
|
].filter((idx) => idx >= 0);
|
|
95
95
|
const urlIndex = remaining.search(/https?:\/\//);
|
|
96
96
|
if (urlIndex >= 0) {
|
|
@@ -115,7 +115,8 @@ function parseInlineMarkdown(text) {
|
|
|
115
115
|
function mergeAdjacentStrings(inlines) {
|
|
116
116
|
const result = [];
|
|
117
117
|
for (const item of inlines) {
|
|
118
|
-
if (typeof item ===
|
|
118
|
+
if (typeof item === 'string' &&
|
|
119
|
+
typeof result[result.length - 1] === 'string') {
|
|
119
120
|
result[result.length - 1] = result[result.length - 1] + item;
|
|
120
121
|
}
|
|
121
122
|
else {
|
|
@@ -127,7 +128,7 @@ function mergeAdjacentStrings(inlines) {
|
|
|
127
128
|
/**
|
|
128
129
|
* Create an image block
|
|
129
130
|
*/
|
|
130
|
-
export function createImageBlock(src, alt =
|
|
131
|
+
export function createImageBlock(src, alt = '', height = 0, width = 0) {
|
|
131
132
|
return {
|
|
132
133
|
block: {
|
|
133
134
|
image: { src, height, width, alt },
|
|
@@ -148,7 +149,7 @@ function processInlinesForImages(inlines) {
|
|
|
148
149
|
const cleanInlines = [];
|
|
149
150
|
const imageBlocks = [];
|
|
150
151
|
for (const inline of inlines) {
|
|
151
|
-
if (typeof inline ===
|
|
152
|
+
if (typeof inline === 'object' && '__image' in inline) {
|
|
152
153
|
const img = inline.__image;
|
|
153
154
|
imageBlocks.push(createImageBlock(img.src, img.alt));
|
|
154
155
|
}
|
|
@@ -163,23 +164,23 @@ function processInlinesForImages(inlines) {
|
|
|
163
164
|
*/
|
|
164
165
|
export function markdownToStory(markdown) {
|
|
165
166
|
const story = [];
|
|
166
|
-
const lines = markdown.split(
|
|
167
|
+
const lines = markdown.split('\n');
|
|
167
168
|
let i = 0;
|
|
168
169
|
while (i < lines.length) {
|
|
169
170
|
const line = lines[i];
|
|
170
171
|
// Code block: ```lang\ncode\n```
|
|
171
|
-
if (line.startsWith(
|
|
172
|
-
const lang = line.slice(3).trim() ||
|
|
172
|
+
if (line.startsWith('```')) {
|
|
173
|
+
const lang = line.slice(3).trim() || 'plaintext';
|
|
173
174
|
const codeLines = [];
|
|
174
175
|
i++;
|
|
175
|
-
while (i < lines.length && !lines[i].startsWith(
|
|
176
|
+
while (i < lines.length && !lines[i].startsWith('```')) {
|
|
176
177
|
codeLines.push(lines[i]);
|
|
177
178
|
i++;
|
|
178
179
|
}
|
|
179
180
|
story.push({
|
|
180
181
|
block: {
|
|
181
182
|
code: {
|
|
182
|
-
code: codeLines.join(
|
|
183
|
+
code: codeLines.join('\n'),
|
|
183
184
|
lang,
|
|
184
185
|
},
|
|
185
186
|
},
|
|
@@ -210,43 +211,43 @@ export function markdownToStory(markdown) {
|
|
|
210
211
|
continue;
|
|
211
212
|
}
|
|
212
213
|
// Blockquote: > text
|
|
213
|
-
if (line.startsWith(
|
|
214
|
+
if (line.startsWith('> ')) {
|
|
214
215
|
const quoteLines = [];
|
|
215
|
-
while (i < lines.length && lines[i].startsWith(
|
|
216
|
+
while (i < lines.length && lines[i].startsWith('> ')) {
|
|
216
217
|
quoteLines.push(lines[i].slice(2));
|
|
217
218
|
i++;
|
|
218
219
|
}
|
|
219
|
-
const quoteText = quoteLines.join(
|
|
220
|
+
const quoteText = quoteLines.join('\n');
|
|
220
221
|
story.push({
|
|
221
222
|
inline: [{ blockquote: parseInlineMarkdown(quoteText) }],
|
|
222
223
|
});
|
|
223
224
|
continue;
|
|
224
225
|
}
|
|
225
226
|
// Empty line - skip
|
|
226
|
-
if (line.trim() ===
|
|
227
|
+
if (line.trim() === '') {
|
|
227
228
|
i++;
|
|
228
229
|
continue;
|
|
229
230
|
}
|
|
230
231
|
// Regular paragraph - collect consecutive non-empty lines
|
|
231
232
|
const paragraphLines = [];
|
|
232
233
|
while (i < lines.length &&
|
|
233
|
-
lines[i].trim() !==
|
|
234
|
-
!lines[i].startsWith(
|
|
235
|
-
!lines[i].startsWith(
|
|
236
|
-
!lines[i].startsWith(
|
|
234
|
+
lines[i].trim() !== '' &&
|
|
235
|
+
!lines[i].startsWith('#') &&
|
|
236
|
+
!lines[i].startsWith('```') &&
|
|
237
|
+
!lines[i].startsWith('> ') &&
|
|
237
238
|
!/^(-{3,}|\*{3,})$/.test(lines[i].trim())) {
|
|
238
239
|
paragraphLines.push(lines[i]);
|
|
239
240
|
i++;
|
|
240
241
|
}
|
|
241
242
|
if (paragraphLines.length > 0) {
|
|
242
|
-
const paragraphText = paragraphLines.join(
|
|
243
|
+
const paragraphText = paragraphLines.join('\n');
|
|
243
244
|
// Convert newlines within paragraph to break elements
|
|
244
245
|
const inlines = parseInlineMarkdown(paragraphText);
|
|
245
246
|
// Replace \n in strings with break elements
|
|
246
247
|
const withBreaks = [];
|
|
247
248
|
for (const inline of inlines) {
|
|
248
|
-
if (typeof inline ===
|
|
249
|
-
const parts = inline.split(
|
|
249
|
+
if (typeof inline === 'string' && inline.includes('\n')) {
|
|
250
|
+
const parts = inline.split('\n');
|
|
250
251
|
for (let j = 0; j < parts.length; j++) {
|
|
251
252
|
if (parts[j]) {
|
|
252
253
|
withBreaks.push(parts[j]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"story.js","sourceRoot":"","sources":["../../../src/urbit/story.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"story.js","sourceRoot":"","sources":["../../../src/urbit/story.ts"],"names":[],"mappings":"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"}
|
package/dist/src/urbit/upload.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Upload an image from a URL to Tlon storage.
|
|
3
3
|
*/
|
|
4
|
-
import { uploadFile } from
|
|
5
|
-
import { fetchWithSsrFGuard } from
|
|
6
|
-
import { getDefaultSsrFPolicy } from
|
|
4
|
+
import { uploadFile } from '@tloncorp/api';
|
|
5
|
+
import { fetchWithSsrFGuard } from 'openclaw/plugin-sdk/ssrf-runtime';
|
|
6
|
+
import { getDefaultSsrFPolicy } from './context.js';
|
|
7
7
|
/**
|
|
8
8
|
* Fetch an image from a URL and upload it to Tlon storage.
|
|
9
9
|
* Returns the uploaded URL, or falls back to the original URL on error.
|
|
@@ -14,7 +14,7 @@ export async function uploadImageFromUrl(imageUrl) {
|
|
|
14
14
|
try {
|
|
15
15
|
// Validate URL is http/https before fetching
|
|
16
16
|
const url = new URL(imageUrl);
|
|
17
|
-
if (url.protocol !==
|
|
17
|
+
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
|
18
18
|
console.warn(`[tlon] Rejected non-http(s) URL: ${imageUrl}`);
|
|
19
19
|
return imageUrl;
|
|
20
20
|
}
|
|
@@ -22,20 +22,20 @@ export async function uploadImageFromUrl(imageUrl) {
|
|
|
22
22
|
// Use fetchWithSsrFGuard directly (not urbitFetch) to preserve the full URL path
|
|
23
23
|
const { response, release } = await fetchWithSsrFGuard({
|
|
24
24
|
url: imageUrl,
|
|
25
|
-
init: { method:
|
|
25
|
+
init: { method: 'GET' },
|
|
26
26
|
policy: getDefaultSsrFPolicy(),
|
|
27
|
-
auditContext:
|
|
27
|
+
auditContext: 'tlon-upload-image',
|
|
28
28
|
});
|
|
29
29
|
try {
|
|
30
30
|
if (!response.ok) {
|
|
31
31
|
console.warn(`[tlon] Failed to fetch image from ${imageUrl}: ${response.status}`);
|
|
32
32
|
return imageUrl;
|
|
33
33
|
}
|
|
34
|
-
const contentType = response.headers.get(
|
|
34
|
+
const contentType = response.headers.get('content-type') || 'image/png';
|
|
35
35
|
const blob = await response.blob();
|
|
36
36
|
// Extract filename from URL or use a default
|
|
37
37
|
const urlPath = new URL(imageUrl).pathname;
|
|
38
|
-
const fileName = urlPath.split(
|
|
38
|
+
const fileName = urlPath.split('/').pop() || `upload-${Date.now()}.png`;
|
|
39
39
|
// Upload to Tlon storage
|
|
40
40
|
const result = await uploadFile({
|
|
41
41
|
blob,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/urbit/upload.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/urbit/upload.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IACvD,IAAI,CAAC;QACH,6CAA6C;QAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1D,OAAO,CAAC,IAAI,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;YAC7D,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,uCAAuC;QACvC,iFAAiF;QACjF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,kBAAkB,CAAC;YACrD,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;YACvB,MAAM,EAAE,oBAAoB,EAAE;YAC9B,YAAY,EAAE,mBAAmB;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CACV,qCAAqC,QAAQ,KAAK,QAAQ,CAAC,MAAM,EAAE,CACpE,CAAC;gBACF,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC;YACxE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnC,6CAA6C;YAC7C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;YAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,UAAU,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;YAExE,yBAAyB;YACzB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,IAAI;gBACJ,QAAQ;gBACR,WAAW;aACZ,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC;QACpB,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,sDAAsD,GAAG,EAAE,CAAC,CAAC;QAC1E,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.generated.js","sourceRoot":"","sources":["../../src/version.generated.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,CAAC,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"version.generated.js","sourceRoot":"","sources":["../../src/version.generated.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AACtC,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC"}
|