@jant/core 1.0.1 → 1.2.0
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/bin/lib/site-snapshot.js +10 -0
- package/dist/{app-Gt7_skt6.js → app-CbOZ2Irh.js} +8704 -5180
- package/dist/client/.vite/manifest.json +125 -85
- package/dist/client/_assets/chunks/{confirm-D7GrwsCN.js → confirm-CMe01lne.js} +1 -1
- package/dist/client/_assets/chunks/{create-editor-5Y49x7h5.js → create-editor-hWapNE40.js} +26 -26
- package/dist/client/_assets/chunks/footnote-rail-9zwl6jtV.js +2 -0
- package/dist/client/_assets/chunks/{jant-locale-picker-DL6mIOT5.js → jant-locale-picker-2L4rkDaz.js} +1 -1
- package/dist/client/_assets/chunks/lit-Bw_voPoW.js +2 -0
- package/dist/client/_assets/chunks/preload-helper-Czpn1I53.js +1 -0
- package/dist/client/_assets/chunks/runtime-paths-y0_gHowM.js +1 -0
- package/dist/client/_assets/chunks/{settings-paths-h6RjIe3C.js → settings-paths-BBVT8zKj.js} +1 -1
- package/dist/client/_assets/chunks/slug-format-BuCPjSrB.js +1 -0
- package/dist/client/_assets/chunks/sortable-list-DJXwkaOv.js +2 -0
- package/dist/client/_assets/chunks/types-DrYFqJH2.js +1 -0
- package/dist/client/_assets/chunks/{unsafe-html-B5ZEXaxg.js → unsafe-html-CWos3v6N.js} +1 -1
- package/dist/client/_assets/chunks/unsafe-svg-CUrgo4Xg.js +1 -0
- package/dist/client/_assets/client-BO8GOFfT.js +354 -0
- package/dist/client/_assets/client-D8Rrsd73.css +2 -0
- package/dist/client/_assets/client-auth-CsUGM718.js +859 -0
- package/dist/client/_assets/client-author-QPm1whbO.css +2 -0
- package/dist/client/_assets/client-compose-BB4U7Wz0.js +2004 -0
- package/dist/client/_assets/{client-manage-C1eDB1Rc.js → client-manage-CI9-eh-8.js} +176 -176
- package/dist/client/_assets/{client-settings-DIM44Zqh.js → client-settings-BnGPuqwc.js} +166 -166
- package/dist/client/_assets/client-share-0DICJjAc.css +1 -0
- package/dist/client/_assets/client-share-C59mOLJ1.js +149 -0
- package/dist/index.js +1 -1
- package/dist/node.js +3 -2
- package/package.json +2 -1
- package/src/app.tsx +9 -0
- package/src/client/components/compose-types.ts +1 -0
- package/src/client/components/jant-compose-dialog.ts +1 -0
- package/src/client/components/jant-compose-editor.ts +30 -0
- package/src/client/components/jant-compose-fullscreen.ts +1 -0
- package/src/client/components/jant-post-menu.ts +80 -13
- package/src/client/components/jant-share-dialog.ts +422 -0
- package/src/client/components/jant-share-menu.ts +188 -0
- package/src/client/compose-bridge.ts +61 -1
- package/src/client/feed-video-player.ts +6 -0
- package/src/client/lazy-entries.ts +21 -1
- package/src/client/post-menu-shared.ts +100 -0
- package/src/client/share-capture.ts +443 -0
- package/src/client/share-launch.ts +133 -0
- package/src/client/tiptap/bubble-menu.ts +25 -2
- package/src/client/tiptap/create-editor.ts +2 -0
- package/src/client/tiptap/extensions.ts +4 -0
- package/src/client/video-processor.ts +106 -52
- package/src/client/view-confirm.ts +108 -0
- package/src/client-share.ts +8 -0
- package/src/client.ts +2 -0
- package/src/db/migrations/0035_brainy_next_avengers.sql +9 -0
- package/src/db/migrations/0036_gorgeous_smasher.sql +7 -0
- package/src/db/migrations/meta/0035_snapshot.json +2877 -0
- package/src/db/migrations/meta/0036_snapshot.json +2924 -0
- package/src/db/migrations/meta/_journal.json +14 -0
- package/src/db/migrations/pg/0033_cute_magdalene.sql +10 -0
- package/src/db/migrations/pg/0034_material_agent_brand.sql +8 -0
- package/src/db/migrations/pg/meta/0033_snapshot.json +3719 -0
- package/src/db/migrations/pg/meta/0034_snapshot.json +3766 -0
- package/src/db/migrations/pg/meta/_journal.json +14 -0
- package/src/db/pg/schema.ts +40 -0
- package/src/db/schema.ts +61 -0
- package/src/i18n/locales/public/en.po +5 -0
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +5 -0
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +5 -0
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +149 -0
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +149 -0
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +149 -0
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/lib/discover.ts +31 -0
- package/src/lib/env.ts +20 -0
- package/src/lib/github-app-state.ts +1 -1
- package/src/lib/github-app.ts +183 -1
- package/src/lib/markdown-manager.ts +129 -1
- package/src/lib/post-meta.ts +13 -3
- package/src/lib/referrer-aliases.ts +311 -0
- package/src/lib/render.tsx +10 -0
- package/src/lib/resolve-config.ts +14 -0
- package/src/lib/share-card.ts +653 -0
- package/src/lib/summary.ts +152 -54
- package/src/lib/tiptap-render.ts +1 -0
- package/src/lib/upload.ts +21 -1
- package/src/lib/version.ts +2 -0
- package/src/lib/video-playback.ts +55 -0
- package/src/lib/view-buffer.ts +201 -0
- package/src/lib/view-counting.ts +539 -0
- package/src/lib/view-token.ts +177 -0
- package/src/lib/view.ts +13 -1
- package/src/middleware/view-counter.ts +140 -0
- package/src/node/runtime.ts +4 -0
- package/src/preset.css +31 -14
- package/src/routes/api/media.ts +21 -3
- package/src/routes/auth/setup.tsx +37 -1
- package/src/routes/dash/settings.tsx +433 -168
- package/src/routes/pages/archive.tsx +1 -0
- package/src/routes/pages/collection.tsx +6 -0
- package/src/routes/pages/collections.tsx +1 -0
- package/src/routes/pages/featured.tsx +1 -0
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/page.tsx +3 -0
- package/src/routes/pages/partials.tsx +23 -0
- package/src/routes/pages/smart-collection.tsx +2 -0
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/view-confirm.ts +63 -0
- package/src/services/export-theme/assets/client-site.js +1 -1
- package/src/services/export-theme/styles/main.css +39 -21
- package/src/services/export.ts +2 -0
- package/src/services/index.ts +17 -0
- package/src/services/mcp.ts +31 -1
- package/src/services/media.ts +63 -0
- package/src/services/stats.ts +1130 -0
- package/src/style-share.css +16 -0
- package/src/styles/components-author.css +177 -0
- package/src/styles/components.css +25 -3
- package/src/styles/share.css +1103 -0
- package/src/styles/tokens.css +65 -30
- package/src/styles/ui.css +62 -13
- package/src/types/app-context.ts +9 -0
- package/src/types/bindings.ts +5 -0
- package/src/types/config.ts +54 -0
- package/src/types/views.ts +6 -0
- package/src/ui/compose/ComposeDialog.tsx +6 -0
- package/src/ui/dash/settings/SettingsRootContent.tsx +24 -6
- package/src/ui/dash/settings/StatsContent.tsx +855 -0
- package/src/ui/font-themes.ts +39 -6
- package/src/ui/layouts/BaseLayout.tsx +11 -2
- package/src/ui/layouts/SiteLayout.tsx +9 -3
- package/src/ui/share/ShareCard.tsx +298 -0
- package/src/ui/shared/Icon.tsx +23 -3
- package/src/ui/shared/MediaGallery.tsx +31 -4
- package/src/ui/shared/PostFooter.tsx +20 -4
- package/src/ui/shared/icon-collector.ts +28 -0
- package/src/ui/shared/post-article-attributes.ts +3 -0
- package/dist/client/_assets/chunks/footnote-rail-BJwswtVQ.js +0 -1
- package/dist/client/_assets/chunks/lit-DW8VmJAT.js +0 -2
- package/dist/client/_assets/chunks/slug-format-Dsi0e9Xn.js +0 -1
- package/dist/client/_assets/chunks/sortable-list-DWNKv782.js +0 -2
- package/dist/client/_assets/chunks/types-D5iF3H1a.js +0 -1
- package/dist/client/_assets/chunks/unsafe-svg-DTZZEvLU.js +0 -2
- package/dist/client/_assets/client-BaqmpPQ-.css +0 -2
- package/dist/client/_assets/client-C6melOtG.js +0 -296
- package/dist/client/_assets/client-auth-Ccq8kSqq.js +0 -828
- package/dist/client/_assets/client-author-CGVvrNZ8.css +0 -2
- package/dist/client/_assets/client-compose-oxzPb3SS.js +0 -2004
package/src/lib/summary.ts
CHANGED
|
@@ -39,7 +39,9 @@ export const NOTE_SUMMARY_MIN_HIDDEN_CHARS = 200;
|
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
41
|
* Block node types that carry user-visible content for summary extraction.
|
|
42
|
-
* Structural nodes (horizontalRule, moreBreak
|
|
42
|
+
* Structural nodes (horizontalRule, moreBreak) are excluded. Images are not
|
|
43
|
+
* content blocks either: they never count toward a summary's limits, and only
|
|
44
|
+
* an HTML summary that asks for them keeps any (see `SummaryImageOptions`).
|
|
43
45
|
*/
|
|
44
46
|
const SUMMARY_BLOCK_TYPES = new Set([
|
|
45
47
|
"paragraph",
|
|
@@ -51,6 +53,36 @@ const SUMMARY_BLOCK_TYPES = new Set([
|
|
|
51
53
|
"table",
|
|
52
54
|
]);
|
|
53
55
|
|
|
56
|
+
/**
|
|
57
|
+
* How much room a run of text takes on the page, in Latin characters.
|
|
58
|
+
*
|
|
59
|
+
* A Han, kana or hangul character is a full em wide where a Latin letter is
|
|
60
|
+
* about half of one, so a 500-character Chinese teaser stands twice as tall as
|
|
61
|
+
* a 500-character English one. Each East Asian wide or fullwidth character
|
|
62
|
+
* counts as two, which keeps the character budgets below meaning the same
|
|
63
|
+
* amount of screen in either script.
|
|
64
|
+
*
|
|
65
|
+
* @param text - Plain text
|
|
66
|
+
* @returns Its length with wide characters counted twice
|
|
67
|
+
*
|
|
68
|
+
* @example
|
|
69
|
+
* ```ts
|
|
70
|
+
* textWidth("hello"); // 5
|
|
71
|
+
* textWidth("你好"); // 4
|
|
72
|
+
* ```
|
|
73
|
+
*/
|
|
74
|
+
export function textWidth(text: string): number {
|
|
75
|
+
let width = 0;
|
|
76
|
+
for (const char of text) {
|
|
77
|
+
width += WIDE_CHAR.test(char) ? 2 : 1;
|
|
78
|
+
}
|
|
79
|
+
return width;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** Han, kana, hangul, CJK punctuation and fullwidth forms: one em wide. */
|
|
83
|
+
const WIDE_CHAR =
|
|
84
|
+
/[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}\u3000-\u303F\uFF00-\uFF60\uFFE0-\uFFE6]/u;
|
|
85
|
+
|
|
54
86
|
/**
|
|
55
87
|
* Recursively extracts plain text from a Tiptap node, ignoring marks.
|
|
56
88
|
*/
|
|
@@ -222,6 +254,33 @@ export function extractSummary(
|
|
|
222
254
|
return blocks.length > 0 ? blocks.join("\n\n") : null;
|
|
223
255
|
}
|
|
224
256
|
|
|
257
|
+
/**
|
|
258
|
+
* What an HTML summary keeps beyond the block and character limits.
|
|
259
|
+
*/
|
|
260
|
+
export interface SummaryOptions {
|
|
261
|
+
/**
|
|
262
|
+
* Keep images in the excerpt, each in its place. Before a `moreBreak`
|
|
263
|
+
* marker every image is kept, since the author chose that range. Otherwise
|
|
264
|
+
* the first image ahead of the cut is kept — one that sits after the last
|
|
265
|
+
* kept block but before the next dropped one counts as ahead of it — and
|
|
266
|
+
* the rest are left for the full page. Images never count toward the block
|
|
267
|
+
* or character limit, so keeping one never pushes text out. Default
|
|
268
|
+
* `false`: the excerpt is text only.
|
|
269
|
+
*/
|
|
270
|
+
includeImages?: boolean;
|
|
271
|
+
/**
|
|
272
|
+
* Stop ahead of the first heading once the summary holds a text block, so
|
|
273
|
+
* the summary is the post's lead: a heading opens the body proper, and a
|
|
274
|
+
* teaser that ran past one showed a section title with its first paragraph
|
|
275
|
+
* and nothing of the section. Headings the post opens with are kept, so a
|
|
276
|
+
* post that starts with one still has a summary. This cut is structural,
|
|
277
|
+
* never softened by `minHiddenChars`. Default `false`: headings are blocks
|
|
278
|
+
* like any other, which is what a note wants — its body is the content and
|
|
279
|
+
* the limits only cap runaway length.
|
|
280
|
+
*/
|
|
281
|
+
stopAtHeading?: boolean;
|
|
282
|
+
}
|
|
283
|
+
|
|
225
284
|
/**
|
|
226
285
|
* Extracts an HTML summary from a Tiptap JSON body by taking the first
|
|
227
286
|
* N content-bearing block nodes and rendering them as HTML.
|
|
@@ -229,9 +288,14 @@ export function extractSummary(
|
|
|
229
288
|
* Unlike the plain-text `extractSummary`, this preserves the original
|
|
230
289
|
* structure (lists, blockquotes, headings, etc.) for rich previews.
|
|
231
290
|
*
|
|
291
|
+
* Character limits count East Asian wide characters as two
|
|
292
|
+
* ({@link textWidth}), so a Chinese teaser takes the room an English one
|
|
293
|
+
* does. With `stopAtHeading`, the summary is the post's lead and ends ahead
|
|
294
|
+
* of its first heading; see {@link SummaryOptions}.
|
|
295
|
+
*
|
|
232
296
|
* @param bodyJson - Tiptap JSON string
|
|
233
297
|
* @param maxBlocks - Maximum number of top-level blocks to include
|
|
234
|
-
* @param maxChars - Maximum total plain-text
|
|
298
|
+
* @param maxChars - Maximum total plain-text width, in Latin characters
|
|
235
299
|
* @param minHiddenChars - Tolerance for limit-based truncation: when > 0 and a
|
|
236
300
|
* block/char limit would hide a tail shorter than this many plain-text
|
|
237
301
|
* characters, the truncation is cancelled — all remaining content blocks are
|
|
@@ -239,15 +303,21 @@ export function extractSummary(
|
|
|
239
303
|
* sliver of text. Explicit `moreBreak` markers reflect author intent and are
|
|
240
304
|
* never subject to this tolerance.
|
|
241
305
|
* @param renderOptions - Renderer options such as the post footnote namespace
|
|
306
|
+
* @param options - Whether the excerpt keeps images and whether it stops at
|
|
307
|
+
* a heading; see {@link SummaryOptions}
|
|
242
308
|
* @returns HTML summary, whether content was truncated, and the index in
|
|
243
309
|
* `doc.content` where the content after the summary boundary begins, or null.
|
|
244
310
|
* `breakAtIndex` lets callers align the summary with the full-body rendering
|
|
245
311
|
* when splitting at the "read more" boundary (e.g. to insert an anchor).
|
|
312
|
+
* With images kept, `hasMore` is also true when an image was left out.
|
|
246
313
|
*
|
|
247
314
|
* @example
|
|
248
315
|
* ```ts
|
|
249
316
|
* const result = extractSummaryHtml(body, 5, 500);
|
|
250
317
|
* // { html: "<ul><li><p>Item</p></li></ul>", hasMore: true, breakAtIndex: 1 }
|
|
318
|
+
*
|
|
319
|
+
* extractSummaryHtml(body, 5, 500, 0, {}, { includeImages: true });
|
|
320
|
+
* // { html: "<figure><img src=\"…\"></figure><p>Intro</p>", hasMore: true, breakAtIndex: 2 }
|
|
251
321
|
* ```
|
|
252
322
|
*/
|
|
253
323
|
export function extractSummaryHtml(
|
|
@@ -256,6 +326,7 @@ export function extractSummaryHtml(
|
|
|
256
326
|
maxChars: number = 500,
|
|
257
327
|
minHiddenChars: number = 0,
|
|
258
328
|
renderOptions: TiptapRenderOptions = {},
|
|
329
|
+
options: SummaryOptions = {},
|
|
259
330
|
): { html: string; hasMore: boolean; breakAtIndex: number } | null {
|
|
260
331
|
let doc: TiptapNode;
|
|
261
332
|
try {
|
|
@@ -267,26 +338,38 @@ export function extractSummaryHtml(
|
|
|
267
338
|
if (doc.type !== "doc" || !doc.content) return null;
|
|
268
339
|
|
|
269
340
|
const nodes = doc.content;
|
|
270
|
-
const
|
|
271
|
-
|
|
272
|
-
)
|
|
273
|
-
|
|
274
|
-
// Check for moreBreak — take all content nodes before it
|
|
275
|
-
const moreBreakIdx = nodes.findIndex((n) => n.type === "moreBreak");
|
|
276
|
-
if (moreBreakIdx !== -1) {
|
|
277
|
-
const selected = nodes
|
|
278
|
-
.slice(0, moreBreakIdx)
|
|
279
|
-
.filter((n) => SUMMARY_BLOCK_TYPES.has(n.type));
|
|
280
|
-
if (selected.length === 0) return null;
|
|
341
|
+
const includeImages = options.includeImages === true;
|
|
342
|
+
const stopAtHeading = options.stopAtHeading === true;
|
|
343
|
+
const render = (indices: number[]): string => {
|
|
281
344
|
const subDoc: JSONContent = {
|
|
282
345
|
type: "doc",
|
|
283
346
|
content: [
|
|
284
|
-
...
|
|
347
|
+
...indices
|
|
348
|
+
.sort((a, b) => a - b)
|
|
349
|
+
.map((i) => nodes[i])
|
|
350
|
+
.filter((node): node is TiptapNode => node !== undefined),
|
|
285
351
|
...nodes.filter((node) => node.type === "footnoteDefinition"),
|
|
286
352
|
] as JSONContent[],
|
|
287
353
|
};
|
|
354
|
+
return renderTiptapDocument(subDoc, renderOptions);
|
|
355
|
+
};
|
|
356
|
+
|
|
357
|
+
// Check for moreBreak — take all content nodes before it
|
|
358
|
+
const moreBreakIdx = nodes.findIndex((n) => n.type === "moreBreak");
|
|
359
|
+
if (moreBreakIdx !== -1) {
|
|
360
|
+
const selected: number[] = [];
|
|
361
|
+
for (let i = 0; i < moreBreakIdx; i++) {
|
|
362
|
+
const type = nodes[i]?.type ?? "";
|
|
363
|
+
if (
|
|
364
|
+
SUMMARY_BLOCK_TYPES.has(type) ||
|
|
365
|
+
(includeImages && type === "image")
|
|
366
|
+
) {
|
|
367
|
+
selected.push(i);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
if (selected.length === 0) return null;
|
|
288
371
|
return {
|
|
289
|
-
html:
|
|
372
|
+
html: render(selected),
|
|
290
373
|
hasMore: true,
|
|
291
374
|
// Anchor goes in place of the moreBreak marker, so the marker itself
|
|
292
375
|
// is NOT part of the pre-anchor body. It remains in the post-anchor
|
|
@@ -305,63 +388,77 @@ export function extractSummaryHtml(
|
|
|
305
388
|
if (!node || !SUMMARY_BLOCK_TYPES.has(node.type)) continue;
|
|
306
389
|
const text = extractPlainText(node).trim();
|
|
307
390
|
contentText.set(i, text);
|
|
308
|
-
totalContentChars += text
|
|
391
|
+
totalContentChars += textWidth(text);
|
|
309
392
|
}
|
|
310
393
|
|
|
311
|
-
const selected:
|
|
394
|
+
const selected: number[] = [];
|
|
312
395
|
let totalChars = 0;
|
|
313
396
|
let lastSelectedIdx = -1;
|
|
397
|
+
let hasTextBlock = false;
|
|
398
|
+
let cutAtHeading = false;
|
|
399
|
+
// Index of the first content block left out, or the end of the document
|
|
400
|
+
// when every block made it in.
|
|
401
|
+
let cutIdx = nodes.length;
|
|
402
|
+
|
|
403
|
+
for (const [i, text] of contentText) {
|
|
404
|
+
const isHeading = nodes[i]?.type === "heading";
|
|
405
|
+
const width = textWidth(text);
|
|
406
|
+
if (selected.length > 0) {
|
|
407
|
+
if (stopAtHeading && isHeading && hasTextBlock) {
|
|
408
|
+
cutIdx = i;
|
|
409
|
+
cutAtHeading = true;
|
|
410
|
+
break;
|
|
411
|
+
}
|
|
412
|
+
if (selected.length >= maxBlocks || totalChars + width > maxChars) {
|
|
413
|
+
cutIdx = i;
|
|
414
|
+
break;
|
|
415
|
+
}
|
|
416
|
+
}
|
|
314
417
|
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
if (!node || !SUMMARY_BLOCK_TYPES.has(node.type)) continue;
|
|
318
|
-
|
|
319
|
-
const text = contentText.get(i) ?? "";
|
|
320
|
-
if (
|
|
321
|
-
(selected.length >= maxBlocks || totalChars + text.length > maxChars) &&
|
|
322
|
-
selected.length > 0
|
|
323
|
-
)
|
|
324
|
-
break;
|
|
325
|
-
|
|
326
|
-
selected.push(node);
|
|
327
|
-
totalChars += text.length;
|
|
418
|
+
selected.push(i);
|
|
419
|
+
totalChars += width;
|
|
328
420
|
lastSelectedIdx = i;
|
|
421
|
+
if (!isHeading) hasTextBlock = true;
|
|
329
422
|
}
|
|
330
423
|
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
let hasMore = selected.length < totalContentNodes;
|
|
424
|
+
let hasMore = selected.length < contentText.size;
|
|
334
425
|
|
|
335
426
|
// Tolerance: don't truncate just to hide a tiny tail. When a block/char limit
|
|
336
427
|
// triggered the cut and the hidden content is shorter than `minHiddenChars`,
|
|
337
428
|
// include the remaining content blocks instead. `moreBreak` is handled above
|
|
338
|
-
// and never reaches this path.
|
|
429
|
+
// and never reaches this path; a heading cut is structural and stands.
|
|
339
430
|
if (
|
|
340
431
|
hasMore &&
|
|
432
|
+
!cutAtHeading &&
|
|
341
433
|
minHiddenChars > 0 &&
|
|
342
434
|
totalContentChars - totalChars < minHiddenChars
|
|
343
435
|
) {
|
|
344
|
-
for (
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
selected.push(node);
|
|
436
|
+
for (const i of contentText.keys()) {
|
|
437
|
+
if (i <= lastSelectedIdx) continue;
|
|
438
|
+
selected.push(i);
|
|
348
439
|
lastSelectedIdx = i;
|
|
349
440
|
}
|
|
441
|
+
cutIdx = nodes.length;
|
|
350
442
|
hasMore = false;
|
|
351
443
|
}
|
|
352
444
|
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
445
|
+
let breakAtIndex = lastSelectedIdx + 1;
|
|
446
|
+
if (includeImages) {
|
|
447
|
+
const imageIdx = nodes.findIndex(
|
|
448
|
+
(node, i) => i < cutIdx && node.type === "image",
|
|
449
|
+
);
|
|
450
|
+
if (imageIdx !== -1) {
|
|
451
|
+
selected.push(imageIdx);
|
|
452
|
+
breakAtIndex = Math.max(breakAtIndex, imageIdx + 1);
|
|
453
|
+
}
|
|
454
|
+
if (nodes.some((node, i) => node.type === "image" && i !== imageIdx)) {
|
|
455
|
+
hasMore = true;
|
|
456
|
+
}
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
if (selected.length === 0) return null;
|
|
460
|
+
|
|
461
|
+
return { html: render(selected), hasMore, breakAtIndex };
|
|
365
462
|
}
|
|
366
463
|
|
|
367
464
|
/**
|
|
@@ -369,10 +466,10 @@ export function extractSummaryHtml(
|
|
|
369
466
|
* the timeline uses.
|
|
370
467
|
*
|
|
371
468
|
* Wraps {@link extractSummaryHtml} with the limits that decide where a card
|
|
372
|
-
* stops: a titled post is an article whose excerpt is
|
|
373
|
-
* is a note whose body is the content and
|
|
374
|
-
* that boundary — the feed renderer, the
|
|
375
|
-
* than repeating five numbers each.
|
|
469
|
+
* stops: a titled post is an article whose excerpt is its lead, cut ahead of
|
|
470
|
+
* the first heading, an untitled one is a note whose body is the content and
|
|
471
|
+
* only needs a cap. Callers that need that boundary — the feed renderer, the
|
|
472
|
+
* theme exporter — share this rather than repeating five numbers each.
|
|
376
473
|
*
|
|
377
474
|
* @param bodyJson - TipTap JSON body, or null/undefined for a post without one
|
|
378
475
|
* @param hasTitle - Whether the post has a title, which makes it an article
|
|
@@ -395,6 +492,7 @@ export function extractTimelineSummary(
|
|
|
395
492
|
hasTitle ? ARTICLE_SUMMARY_MAX_CHARS : NOTE_SUMMARY_MAX_CHARS,
|
|
396
493
|
hasTitle ? 0 : NOTE_SUMMARY_MIN_HIDDEN_CHARS,
|
|
397
494
|
renderOptions,
|
|
495
|
+
{ stopAtHeading: hasTitle },
|
|
398
496
|
);
|
|
399
497
|
return result ? { html: result.html, hasMore: result.hasMore } : null;
|
|
400
498
|
}
|
package/src/lib/tiptap-render.ts
CHANGED
|
@@ -318,6 +318,7 @@ function renderDocumentContent(
|
|
|
318
318
|
}
|
|
319
319
|
|
|
320
320
|
const MARK_RENDERERS: Record<string, MarkRenderer> = {
|
|
321
|
+
highlight: (html) => `<mark>${html}</mark>`,
|
|
321
322
|
bold: (html) => `<strong>${html}</strong>`,
|
|
322
323
|
italic: (html) => `<em>${html}</em>`,
|
|
323
324
|
strike: (html) => `<s>${html}</s>`,
|
package/src/lib/upload.ts
CHANGED
|
@@ -684,12 +684,32 @@ export function generateSiteAssetStorageKey(
|
|
|
684
684
|
return { id, filename, storageKey };
|
|
685
685
|
}
|
|
686
686
|
|
|
687
|
+
/**
|
|
688
|
+
* Where a video's poster is stored.
|
|
689
|
+
*
|
|
690
|
+
* Posters are served `immutable`, so a replacement cannot reuse the key the
|
|
691
|
+
* poster it replaces had: caches would go on serving the old still. A
|
|
692
|
+
* replacement passes a `version`, which makes the key new.
|
|
693
|
+
*
|
|
694
|
+
* @param siteId - Owning site ID
|
|
695
|
+
* @param mediaId - The video's media ID
|
|
696
|
+
* @param ext - Poster file extension
|
|
697
|
+
* @param version - Distinguishes a replacement from the poster before it
|
|
698
|
+
* @returns The storage key
|
|
699
|
+
* @example
|
|
700
|
+
* ```ts
|
|
701
|
+
* getPosterStorageKey("sit_1", "med_1", "webp"); // "media/sit_1/posters/med_1.webp"
|
|
702
|
+
* getPosterStorageKey("sit_1", "med_1", "png", "k3x9"); // "media/sit_1/posters/med_1-k3x9.png"
|
|
703
|
+
* ```
|
|
704
|
+
*/
|
|
687
705
|
export function getPosterStorageKey(
|
|
688
706
|
siteId: string,
|
|
689
707
|
mediaId: string,
|
|
690
708
|
ext = "webp",
|
|
709
|
+
version?: string,
|
|
691
710
|
): string {
|
|
692
|
-
|
|
711
|
+
const name = version ? `${mediaId}-${version}` : mediaId;
|
|
712
|
+
return `${MEDIA_ROOT_PREFIX}/${siteId}/${MEDIA_POSTERS_STORAGE_PREFIX}/${name}.${ext}`;
|
|
693
713
|
}
|
|
694
714
|
|
|
695
715
|
export function getTemporaryUploadStorageKey(
|
package/src/lib/version.ts
CHANGED
|
@@ -19,6 +19,7 @@ declare const __CLIENT_AUTH_JS_FILE__: string;
|
|
|
19
19
|
declare const __CLIENT_COMPOSE_PRELOAD__: readonly string[];
|
|
20
20
|
declare const __CLIENT_CSS_FILE__: string;
|
|
21
21
|
declare const __CLIENT_AUTHOR_CSS_FILE__: string;
|
|
22
|
+
declare const __CLIENT_SHARE_CSS_FILE__: string;
|
|
22
23
|
declare const __CLIENT_CJK_CSS_FILE__: string;
|
|
23
24
|
declare const __CLIENT_CJK_TC_CSS_FILE__: string;
|
|
24
25
|
declare const __CLIENT_CJK_JP_CSS_FILE__: string;
|
|
@@ -30,6 +31,7 @@ export const CLIENT_AUTH_JS_FILE = __CLIENT_AUTH_JS_FILE__;
|
|
|
30
31
|
export const CLIENT_COMPOSE_PRELOAD = __CLIENT_COMPOSE_PRELOAD__;
|
|
31
32
|
export const CLIENT_CSS_FILE = __CLIENT_CSS_FILE__;
|
|
32
33
|
export const CLIENT_AUTHOR_CSS_FILE = __CLIENT_AUTHOR_CSS_FILE__;
|
|
34
|
+
export const CLIENT_SHARE_CSS_FILE = __CLIENT_SHARE_CSS_FILE__;
|
|
33
35
|
export const CLIENT_CJK_CSS_FILE = __CLIENT_CJK_CSS_FILE__;
|
|
34
36
|
export const CLIENT_CJK_TC_CSS_FILE = __CLIENT_CJK_TC_CSS_FILE__;
|
|
35
37
|
export const CLIENT_CJK_JP_CSS_FILE = __CLIENT_CJK_JP_CSS_FILE__;
|
|
@@ -71,3 +71,58 @@ export function shouldUseShortVideoExperience(media: {
|
|
|
71
71
|
|
|
72
72
|
return true;
|
|
73
73
|
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Where in a clip its poster frame is taken: a tenth of the way in, so the
|
|
77
|
+
* still is not the fade-from-black most clips open on, and never later than
|
|
78
|
+
* the first second. With no duration to take a tenth of, the opening frame is
|
|
79
|
+
* the only one to name.
|
|
80
|
+
*
|
|
81
|
+
* @param durationSeconds - Clip length in seconds, when known
|
|
82
|
+
* @returns Offset into the clip, in seconds
|
|
83
|
+
*
|
|
84
|
+
* @example
|
|
85
|
+
* ```ts
|
|
86
|
+
* getPosterFrameSeconds(4); // 0.4
|
|
87
|
+
* getPosterFrameSeconds(90); // 1
|
|
88
|
+
* getPosterFrameSeconds(undefined); // 0
|
|
89
|
+
* ```
|
|
90
|
+
*/
|
|
91
|
+
export function getPosterFrameSeconds(
|
|
92
|
+
durationSeconds: number | null | undefined,
|
|
93
|
+
): number {
|
|
94
|
+
if (
|
|
95
|
+
!Number.isFinite(durationSeconds) ||
|
|
96
|
+
!durationSeconds ||
|
|
97
|
+
durationSeconds <= 0
|
|
98
|
+
) {
|
|
99
|
+
return 0;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
return Math.min(durationSeconds * 0.1, 1);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* The address a `<video>` loads to show the poster frame itself, for a clip
|
|
107
|
+
* stored without a poster. The media fragment is what makes iOS Safari draw a
|
|
108
|
+
* frame under `preload="metadata"` at all, and a start of 0 is no fragment, so
|
|
109
|
+
* a clip of unknown length starts a tenth of a second in.
|
|
110
|
+
*
|
|
111
|
+
* @param url - The video file's address
|
|
112
|
+
* @param durationSeconds - Clip length in seconds, when known
|
|
113
|
+
* @returns The address with a `#t=` fragment at the poster frame
|
|
114
|
+
*
|
|
115
|
+
* @example
|
|
116
|
+
* ```ts
|
|
117
|
+
* getPosterFrameUrl("https://media.example/clip.mp4", 4);
|
|
118
|
+
* // "https://media.example/clip.mp4#t=0.4"
|
|
119
|
+
* ```
|
|
120
|
+
*/
|
|
121
|
+
export function getPosterFrameUrl(
|
|
122
|
+
url: string,
|
|
123
|
+
durationSeconds: number | null | undefined,
|
|
124
|
+
): string {
|
|
125
|
+
const seconds =
|
|
126
|
+
Math.round(getPosterFrameSeconds(durationSeconds) * 100) / 100;
|
|
127
|
+
return `${url}#t=${seconds > 0 ? seconds : 0.1}`;
|
|
128
|
+
}
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Views wait here for a few seconds and leave as one write.
|
|
3
|
+
*
|
|
4
|
+
* Counting a view costs a database write, and a write is the one thing a
|
|
5
|
+
* well-read page must not multiply. So a hit is added to an in-memory map and
|
|
6
|
+
* the map is written out once, five seconds after its first hit: three
|
|
7
|
+
* hundred readers opening one post from one link in those seconds are one row
|
|
8
|
+
* with `count` three hundred. Under ordinary traffic nothing changes — a view
|
|
9
|
+
* is still one write — and under a spike the writes fall by one or two orders
|
|
10
|
+
* of magnitude.
|
|
11
|
+
*
|
|
12
|
+
* The map lives as long as the process that holds it: the whole run on Node,
|
|
13
|
+
* an isolate's lifetime on Workers, where `keepAlive` hands the pending flush
|
|
14
|
+
* to `waitUntil` so the isolate stays up for it. A process that dies between
|
|
15
|
+
* a hit and its flush loses those few seconds of counts, which is the price
|
|
16
|
+
* of never making a reader wait, and is accepted: the numbers are a guide,
|
|
17
|
+
* not a ledger. The Node runtime flushes on `close()`.
|
|
18
|
+
*
|
|
19
|
+
* The buffer also holds the daily stop: once a flush reports the instance's
|
|
20
|
+
* daily limit reached, hits are dropped until the next UTC day, when the
|
|
21
|
+
* free-tier D1 write quota that the limit protects resets.
|
|
22
|
+
*/
|
|
23
|
+
|
|
24
|
+
/** How long a hit waits for company before the buffer is written out. */
|
|
25
|
+
export const VIEW_FLUSH_DELAY_MS = 5_000;
|
|
26
|
+
|
|
27
|
+
/** One reader opening one page, as the counter files it. */
|
|
28
|
+
export interface ViewHit {
|
|
29
|
+
siteId: string;
|
|
30
|
+
/** The site's calendar day, `YYYY-MM-DD`. */
|
|
31
|
+
day: string;
|
|
32
|
+
/** The site's hour, `YYYY-MM-DDTHH`, for today's chart. */
|
|
33
|
+
hour: string;
|
|
34
|
+
/** A post id, or the path of any other page. */
|
|
35
|
+
page: string;
|
|
36
|
+
/** The referring host, or `""`. */
|
|
37
|
+
referrer: string;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** A hit with the number of times it happened. */
|
|
41
|
+
export interface ViewCountEntry extends ViewHit {
|
|
42
|
+
count: number;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** What a sink reports back from writing a batch. */
|
|
46
|
+
export interface ViewRecordResult {
|
|
47
|
+
/** The instance has recorded its daily limit of views; stop until tomorrow. */
|
|
48
|
+
limitReached: boolean;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** Where a flush goes, and how the runtime is kept alive for it. */
|
|
52
|
+
export interface ViewSink {
|
|
53
|
+
record(entries: ViewCountEntry[]): Promise<ViewRecordResult>;
|
|
54
|
+
/**
|
|
55
|
+
* Hands the pending flush to the runtime so it outlives the response that
|
|
56
|
+
* scheduled it. Workers pass `waitUntil`; Node needs nothing.
|
|
57
|
+
*/
|
|
58
|
+
keepAlive?(promise: Promise<unknown>): void;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
interface ScheduledFlush {
|
|
62
|
+
timer: ReturnType<typeof setTimeout>;
|
|
63
|
+
settle: () => void;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function entryKey(hit: ViewHit): string {
|
|
67
|
+
return `${hit.siteId}\n${hit.hour}\n${hit.page}\n${hit.referrer}`;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function nextUtcMidnight(nowMs: number): number {
|
|
71
|
+
const date = new Date(nowMs);
|
|
72
|
+
return Date.UTC(
|
|
73
|
+
date.getUTCFullYear(),
|
|
74
|
+
date.getUTCMonth(),
|
|
75
|
+
date.getUTCDate() + 1,
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Collects view hits and writes them out in batches.
|
|
81
|
+
*
|
|
82
|
+
* One instance per process is the point; tests construct their own with a
|
|
83
|
+
* shorter delay and call `flush()` themselves.
|
|
84
|
+
*
|
|
85
|
+
* @example
|
|
86
|
+
* ```ts
|
|
87
|
+
* const buffer = new ViewBuffer();
|
|
88
|
+
* buffer.add(hit, { record: (entries) => services.stats.record(entries, opts) });
|
|
89
|
+
* // five seconds later, one write
|
|
90
|
+
* ```
|
|
91
|
+
*/
|
|
92
|
+
export class ViewBuffer {
|
|
93
|
+
readonly #delayMs: number;
|
|
94
|
+
readonly #now: () => number;
|
|
95
|
+
readonly #pending = new Map<string, ViewCountEntry>();
|
|
96
|
+
#sink: ViewSink | null = null;
|
|
97
|
+
#scheduled: ScheduledFlush | null = null;
|
|
98
|
+
#pausedUntil = 0;
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* @param options.delayMs - How long the first hit waits before the flush
|
|
102
|
+
* @param options.now - Clock in milliseconds, for tests
|
|
103
|
+
*/
|
|
104
|
+
constructor(options: { delayMs?: number; now?: () => number } = {}) {
|
|
105
|
+
this.#delayMs = options.delayMs ?? VIEW_FLUSH_DELAY_MS;
|
|
106
|
+
this.#now = options.now ?? Date.now;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** Hits waiting to be written, as distinct entries. */
|
|
110
|
+
get size(): number {
|
|
111
|
+
return this.#pending.size;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/** Whether the daily stop is in force right now. */
|
|
115
|
+
get paused(): boolean {
|
|
116
|
+
return this.#now() < this.#pausedUntil;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Add one hit and make sure a flush is coming.
|
|
121
|
+
*
|
|
122
|
+
* The sink of the latest hit is the one the flush uses: every sink in one
|
|
123
|
+
* process writes to the same database, so any of them will do.
|
|
124
|
+
*
|
|
125
|
+
* @param hit - The view
|
|
126
|
+
* @param sink - Where the batch goes
|
|
127
|
+
* @returns Nothing
|
|
128
|
+
*/
|
|
129
|
+
add(hit: ViewHit, sink: ViewSink): void {
|
|
130
|
+
if (this.paused) return;
|
|
131
|
+
this.#sink = sink;
|
|
132
|
+
|
|
133
|
+
const key = entryKey(hit);
|
|
134
|
+
const entry = this.#pending.get(key);
|
|
135
|
+
if (entry) {
|
|
136
|
+
entry.count += 1;
|
|
137
|
+
} else {
|
|
138
|
+
this.#pending.set(key, { ...hit, count: 1 });
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
if (this.#scheduled) return;
|
|
142
|
+
|
|
143
|
+
let settle!: () => void;
|
|
144
|
+
const done = new Promise<void>((resolve) => {
|
|
145
|
+
settle = resolve;
|
|
146
|
+
});
|
|
147
|
+
const timer = setTimeout(() => {
|
|
148
|
+
this.#scheduled = null;
|
|
149
|
+
void this.flush().finally(settle);
|
|
150
|
+
}, this.#delayMs);
|
|
151
|
+
// A pending flush must not hold a stopping Node process open; the runtime
|
|
152
|
+
// drains the buffer on close instead.
|
|
153
|
+
(timer as { unref?: () => void }).unref?.();
|
|
154
|
+
this.#scheduled = { timer, settle };
|
|
155
|
+
sink.keepAlive?.(done);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/**
|
|
159
|
+
* Write out everything pending now.
|
|
160
|
+
*
|
|
161
|
+
* Never rejects: a failed write is logged and its hits are gone, because
|
|
162
|
+
* nothing upstream can do anything with the failure.
|
|
163
|
+
*
|
|
164
|
+
* @returns Nothing, once the write has settled
|
|
165
|
+
*/
|
|
166
|
+
async flush(): Promise<void> {
|
|
167
|
+
const scheduled = this.#scheduled;
|
|
168
|
+
if (scheduled) {
|
|
169
|
+
this.#scheduled = null;
|
|
170
|
+
clearTimeout(scheduled.timer);
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
const entries = [...this.#pending.values()];
|
|
174
|
+
this.#pending.clear();
|
|
175
|
+
const sink = this.#sink;
|
|
176
|
+
|
|
177
|
+
try {
|
|
178
|
+
if (entries.length === 0 || !sink) return;
|
|
179
|
+
const { limitReached } = await sink.record(entries);
|
|
180
|
+
if (limitReached && !this.paused) {
|
|
181
|
+
this.#pausedUntil = nextUtcMidnight(this.#now());
|
|
182
|
+
// eslint-disable-next-line no-console -- An operator should see why a day's counts stop.
|
|
183
|
+
console.warn(
|
|
184
|
+
`[Jant] View counting paused until ${new Date(this.#pausedUntil).toISOString()}: STATS_DAILY_LIMIT reached.`,
|
|
185
|
+
);
|
|
186
|
+
}
|
|
187
|
+
} catch (error: unknown) {
|
|
188
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
189
|
+
// eslint-disable-next-line no-console -- Background failures must be visible.
|
|
190
|
+
console.error(`[Jant] View counting flush error: ${message}`);
|
|
191
|
+
} finally {
|
|
192
|
+
// The sink closes over a request's services and context; once nothing
|
|
193
|
+
// waits for it, let it go. A hit added meanwhile brought its own.
|
|
194
|
+
if (this.#sink === sink && this.#pending.size === 0) this.#sink = null;
|
|
195
|
+
scheduled?.settle();
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
/** The process's buffer, shared by every request. */
|
|
201
|
+
export const viewBuffer = new ViewBuffer();
|