diff --git a/apps/web/focus-go-api/routes/anonymousCounts.js b/apps/web/focus-go-api/routes/anonymousCounts.js index 87f77ca..88b7912 100644 --- a/apps/web/focus-go-api/routes/anonymousCounts.js +++ b/apps/web/focus-go-api/routes/anonymousCounts.js @@ -1,6 +1,6 @@ import { Router, json } from 'express' -export const PUBLIC_PAGES = ['/', '/zh/', '/features/pomodoro/', '/zh/features/pomodoro/', '/features/local-first/', '/zh/features/local-first/', '/guides/task-to-focus/', '/zh/guides/task-to-focus/', '/privacy/', '/zh/privacy/', '/terms/', '/zh/terms/'] +export const PUBLIC_PAGES = ['/', '/zh/', '/features/pomodoro/', '/zh/features/pomodoro/', '/features/local-first/', '/zh/features/local-first/', '/guides/task-to-focus/', '/zh/guides/task-to-focus/', '/about/', '/zh/about/', '/privacy/', '/zh/privacy/', '/terms/', '/zh/terms/'] const WEBSITE = 'https://nestflow.art' const APPLICATION = 'https://app.nestflow.art' const RETENTION_DAYS = 90 diff --git a/apps/web/focus-go-api/routes/anonymousCounts.test.js b/apps/web/focus-go-api/routes/anonymousCounts.test.js index 9add7ee..d35efee 100644 --- a/apps/web/focus-go-api/routes/anonymousCounts.test.js +++ b/apps/web/focus-go-api/routes/anonymousCounts.test.js @@ -65,3 +65,16 @@ test('prunes aggregates older than ninety UTC days and bounds report window', as assert.equal(readAnonymousCounts(f.database, 10000, clock).days, 90) } finally { await f.close() } }) + + +test('counts public identity pages but rejects nested or query-bearing variants', async () => { + const f = await fixture() + try { + for (const [page, language] of [['/about/', 'en'], ['/zh/about/', 'zh-CN']]) { + assert.equal((await f.post({ event: 'website_view', page, language })).status, 204) + } + assert.equal((await f.post({ event: 'website_view', page: '/about/private', language: 'en' })).status, 400) + assert.equal((await f.post({ event: 'website_view', page: '/about/?token=excluded', language: 'en' })).status, 400) + assert.equal(readAnonymousCounts(f.database, 28, clock).rows.reduce((sum, row) => sum + row.count, 0), 2) + } finally { await f.close() } +}) diff --git a/apps/web/src/shared/metrics/anonymousCounts.test.ts b/apps/web/src/shared/metrics/anonymousCounts.test.ts index d4c5afa..8e64818 100644 --- a/apps/web/src/shared/metrics/anonymousCounts.test.ts +++ b/apps/web/src/shared/metrics/anonymousCounts.test.ts @@ -34,6 +34,8 @@ describe('anonymous browser counter', () => { it('rejects dev hosts and private/query paths rather than transmit them', async () => { const dev = fixture('http://localhost:5173'); await dev.counter.firstSuccess('en'); await dev.counter.website('website_view','/'); expect(dev.sent).toEqual([]) const site = fixture('https://nestflow.art'); await site.counter.website('website_view','/tasks/private'); await site.counter.website('app_open','/?q=private'); expect(site.sent).toEqual([]) - await site.counter.website('app_open','/zh/features/pomodoro/'); expect(site.sent).toEqual([{ event: 'app_open', page: '/zh/features/pomodoro/', language: 'zh-CN' }]) + await site.counter.website('app_open','/zh/features/pomodoro/'); + await site.counter.website('website_view','/about/'); await site.counter.website('website_view','/zh/about/'); + expect(site.sent).toEqual([{ event: 'app_open', page: '/zh/features/pomodoro/', language: 'zh-CN' }, { event: 'website_view', page: '/about/', language: 'en' }, { event: 'website_view', page: '/zh/about/', language: 'zh-CN' }]) }) }) diff --git a/apps/web/src/shared/metrics/anonymousCounts.ts b/apps/web/src/shared/metrics/anonymousCounts.ts index 319dff1..706c0f6 100644 --- a/apps/web/src/shared/metrics/anonymousCounts.ts +++ b/apps/web/src/shared/metrics/anonymousCounts.ts @@ -2,7 +2,7 @@ const PREFERENCE = 'focusgo.anonymous-counts.enabled' const FIRST_SUCCESS = 'focusgo.anonymous-counts.first-success' const ENDPOINT = 'https://api.nestflow.art/api/public-counts' const CHANGE_EVENT = 'focusgo-anonymous-counts-change' -const PAGES = ['/', '/zh/', '/features/pomodoro/', '/zh/features/pomodoro/', '/features/local-first/', '/zh/features/local-first/', '/guides/task-to-focus/', '/zh/guides/task-to-focus/', '/privacy/', '/zh/privacy/', '/terms/', '/zh/terms/'] +const PAGES = ['/', '/zh/', '/features/pomodoro/', '/zh/features/pomodoro/', '/features/local-first/', '/zh/features/local-first/', '/guides/task-to-focus/', '/zh/guides/task-to-focus/', '/about/', '/zh/about/', '/privacy/', '/zh/privacy/', '/terms/', '/zh/terms/'] type CounterRuntime = { origin: string diff --git a/apps/web/website/index.html b/apps/web/website/index.html index 4a59391..120ad7a 100644 --- a/apps/web/website/index.html +++ b/apps/web/website/index.html @@ -561,6 +561,7 @@

Stop configuring.
Start w
© 2026 Focus&go · nestflow.art. + About Focus&go Privacy Terms Contact @@ -651,7 +652,7 @@

Stop configuring.
Start w 'final.title':'别再配置了。
开始工作。', 'final.sub':'所有当前功能免费。官方 Web 版的受保护交互需要登录，云同步可在设置中关闭。', 'foot.tag':'© 2026 Focus&go · nestflow.art。', - 'foot.privacy':'隐私政策','foot.terms':'服务条款','foot.contact':'联系我们', + 'foot.about':'关于 Focus&go','foot.privacy':'隐私政策','foot.terms':'服务条款','foot.contact':'联系我们', 'chip.focus':'专注','chip.task':'写发布随笔','price.badge':'✳ 已包含', 'ck.ph':'在应用里，这样搜索一切——或者直接记下一个任务。', 'ck.msg':'看，你已经会用这个产品了。', diff --git a/apps/web/website/sitemap.xml b/apps/web/website/sitemap.xml index 5a42a81..0571dd8 100644 --- a/apps/web/website/sitemap.xml +++ b/apps/web/website/sitemap.xml @@ -8,6 +8,8 @@ https://nestflow.art/zh/features/local-first/ https://nestflow.art/guides/task-to-focus/ https://nestflow.art/zh/guides/task-to-focus/ + https://nestflow.art/about/ + https://nestflow.art/zh/about/ https://nestflow.art/privacy/ https://nestflow.art/zh/privacy/ https://nestflow.art/terms/ diff --git a/scripts/verify-discovery.mjs b/scripts/verify-discovery.mjs index 4b43b71..fe4ac6b 100644 --- a/scripts/verify-discovery.mjs +++ b/scripts/verify-discovery.mjs @@ -87,6 +87,12 @@ for (const route of routes) { assert.equal(trail[0].item, `https://nestflow.art${zh ? '/zh/' : '/'}`) assert.equal(trail[1].item, `https://nestflow.art${route}`) } + if (/\/about\/$/.test(route)) { + assert(typed('AboutPage'), `${route}: official identity page type missing`) + assert.equal(typed('AboutPage').mainEntity?.['@id'], typed('SoftwareApplication')['@id'], `${route}: main identity must reference the official app`) + assert(typed('SoftwareApplication').sameAs.includes('https://github.com/VelvetAbyss/Focus-Go')) + for (const link of ['https://nestflow.art/', 'https://app.nestflow.art/', 'https://github.com/VelvetAbyss/Focus-Go']) assert(html.includes(`href="${link}"`), `${route}: visible official link missing`) + } if (policy) { const key = policy === 'privacy' ? 'privacy-policy' : 'terms-of-service', document = LEGAL_DOCUMENTS[lang][key] assert(html.includes(`data-policy-version="${POLICY_VERSION}"`), `${route}: policy version changed`) diff --git a/scripts/verify-discovery.test.mjs b/scripts/verify-discovery.test.mjs index bd53c35..fc68511 100644 --- a/scripts/verify-discovery.test.mjs +++ b/scripts/verify-discovery.test.mjs @@ -24,7 +24,8 @@ async function check(t, transform) { } test('accepts JSON-LD and CDN scripts outside unchanged static articles', async t => { const result = await check(t, response => ({ ...response, html: response.html.replace('', '') })) - assert.match(result.stdout, /PASS 12 public routes/) + const publishedRoutes = JSON.parse(await readFile(path.join(output, 'public-pages.json'), 'utf8')) + assert(result.stdout.includes(`PASS ${publishedRoutes.length} public routes`)) }) test('rejects policy text that differs from the verified build', async t => { await assert.rejects(check(t, response => ({ ...response, html: response.route === '/privacy/' ? response.html.replace('', '

Unexpected policy change

') : response.html })), error => /static body differs/.test(error.stderr)) @@ -35,3 +36,7 @@ test('rejects a missing-page response that returns HTTP 200', async t => { test('rejects a Chinese page canonicalized to English', async t => { await assert.rejects(check(t, response => ({ ...response, html: response.route === '/zh/' ? response.html.replace('rel="canonical" href="https://nestflow.art/zh/"', 'rel="canonical" href="https://nestflow.art/"') : response.html })), error => /canonical mismatch/.test(error.stderr)) }) + +test('rejects an identity page whose main entity is an unrelated product', async t => { + await assert.rejects(check(t, response => ({ ...response, html: response.route === '/about/' ? response.html.replace('"mainEntity":{"@id":"https://nestflow.art/#application"}', '"mainEntity":{"@id":"https://example.invalid/other"}') : response.html })), error => /main identity/.test(error.stderr)) +}) diff --git a/scripts/website-content.json b/scripts/website-content.json index 195c904..c3e8ed5 100644 --- a/scripts/website-content.json +++ b/scripts/website-content.json @@ -275,5 +275,153 @@ } ] } + }, + { + "path": "about", + "pageType": "AboutPage", + "checked": "2026-10-23", + "sourceRef": "a3bec9f9a1fded2ed167f36098dcb07a79cc5a42", + "en": { + "title": "About Focus&go | Official website, app and open-source project", + "h1": "About Focus&go", + "description": "Focus&go is a local-first workspace for tasks, a Pomodoro timer, notes and a diary, maintained by Dylan Feng. Find its official website, Web app and MIT-licensed source project.", + "summary": "Focus&go is an open-source personal workspace for tasks, a Pomodoro timer, notes and a diary, maintained personally by Dylan Feng. Its official website is nestflow.art; the Web app is app.nestflow.art. Open the app, sign in and add a task.", + "sections": [ + { + "title": "The product and its official home", + "paragraphs": [ + "Focus&go is the product name. Nestflow is retained in the official domain nestflow.art. The website explains the product; app.nestflow.art is the official Web app.", + "Use the official domain and the source repository together to identify this project when a similar name appears in search results. The repository is VelvetAbyss/Focus-Go on GitHub." + ] + }, + { + "title": "What you can do", + "paragraphs": [ + "Add a task, connect it to a focus session and keep notes alongside the next action. The workspace also includes a diary. The guides below explain the task and timer workflow.", + "All current features are free. Optional sponsorship does not unlock features or change account access. The source code is available under the MIT license." + ] + }, + { + "title": "Sign-in, local saving and sync", + "paragraphs": [ + "The official Web app requires sign-in for protected interactions. Supported content is saved to the device first. Offline availability depends on cached resources and the applicable sign-in state.", + "On a new device, official cloud sync is enabled by default and attempts to sync after sign-in. It can be disabled in Settings after sign-in. Local saving and a cloud copy are separate parts of this behavior." + ] + }, + { + "title": "Maintainer and contact", + "paragraphs": [ + "Dylan Feng maintains and operates Focus&go personally. Product and privacy questions can be sent to support@nestflow.art. The current Privacy Policy and Terms identify the service provider and contact details." + ] + } + ], + "links": [ + { + "label": "Official website", + "href": "https://nestflow.art/" + }, + { + "label": "Official Web app", + "href": "https://app.nestflow.art/" + }, + { + "label": "Source project on GitHub", + "href": "https://github.com/VelvetAbyss/Focus-Go" + }, + { + "label": "MIT license at the checked source version", + "href": "https://github.com/VelvetAbyss/Focus-Go/blob/a3bec9f9a1fded2ed167f36098dcb07a79cc5a42/LICENSE" + } + ], + "faq": [ + { + "q": "What is the official website for Focus&go?", + "a": "The official website is https://nestflow.art/. The official Web app is https://app.nestflow.art/." + }, + { + "q": "Is Nestflow a different name for the product?", + "a": "Focus&go is the product name. Nestflow is retained in its official domain, nestflow.art. Use that domain and the linked source project to identify it." + }, + { + "q": "Who maintains Focus&go?", + "a": "Dylan Feng maintains and operates it personally. Contact support@nestflow.art or consult the linked source repository." + }, + { + "q": "Is Focus&go free, and does the Web app need an account?", + "a": "All current features are free. Protected interactions on the official Web app require sign-in. Optional sponsorship does not unlock features." + } + ] + }, + "zh": { + "title": "关于 Focus&go｜官方网站、在线应用与开源项目", + "h1": "关于 Focus&go", + "description": "Focus&go 是整合任务、番茄钟、笔记和日记的本地优先个人工作台，由 Dylan Feng 以个人身份维护。本页列出官网、在线应用、MIT 开源项目及联系信息。", + "summary": "Focus&go 是整合任务、番茄钟、笔记和日记的开源个人工作台，由 Dylan Feng 以个人身份维护。官网是 nestflow.art，在线应用是 app.nestflow.art。打开应用，登录后添加任务，再开始专注。", + "sections": [ + { + "title": "产品名称与官方归属", + "paragraphs": [ + "Focus&go 是产品主名称，Nestflow 保留在官网域名 nestflow.art 中。官网用于了解产品，app.nestflow.art 是官方在线应用。", + "搜索结果出现相似名称时，可以同时核对官网域名与开源仓库。此项目的 GitHub 仓库为 VelvetAbyss/Focus-Go。" + ] + }, + { + "title": "从一项任务开始", + "paragraphs": [ + "添加任务，将任务关联到一次专注，再用笔记留下结果或下一步。工作台也提供日记；下方指南说明任务与番茄钟的具体操作。", + "所有当前功能免费，源代码使用 MIT 许可证。可选赞助不会解锁功能，也不会改变账户访问权限。" + ] + }, + { + "title": "登录、本地保存与同步", + "paragraphs": [ + "官方 Web 版的受保护交互需要登录。支持的内容优先保存在本机；离线能否使用，取决于已缓存的资源和适用的登录状态。", + "新设备的官方云同步默认开启，登录后会尝试同步；登录后可以在设置中关闭。本地保存和云端副本是两个不同环节。" + ] + }, + { + "title": "维护者与联系信息", + "paragraphs": [ + "Focus&go 由 Dylan Feng 以个人身份维护和运营。产品或隐私问题可以联系 support@nestflow.art；现行隐私政策和服务条款列明服务提供者与联系信息。" + ] + } + ], + "links": [ + { + "label": "官方网站", + "href": "https://nestflow.art/" + }, + { + "label": "官方在线应用", + "href": "https://app.nestflow.art/" + }, + { + "label": "GitHub 开源项目", + "href": "https://github.com/VelvetAbyss/Focus-Go" + }, + { + "label": "核对版本的 MIT 许可证", + "href": "https://github.com/VelvetAbyss/Focus-Go/blob/a3bec9f9a1fded2ed167f36098dcb07a79cc5a42/LICENSE" + } + ], + "faq": [ + { + "q": "Focus&go 的官方网站是哪个？", + "a": "官网是 https://nestflow.art/，官方在线应用是 https://app.nestflow.art/。" + }, + { + "q": "Focus&go 和 Nestflow 是什么关系？", + "a": "Focus&go 是产品主名称，Nestflow 保留在官网域名 nestflow.art 中。可以通过域名与本页开源仓库核对产品身份。" + }, + { + "q": "谁在维护 Focus&go？", + "a": "Dylan Feng 以个人身份维护和运营。联系邮箱为 support@nestflow.art，源代码位于本页链接的 GitHub 仓库。" + }, + { + "q": "Focus&go 免费吗，是否需要登录？", + "a": "所有当前功能免费；官方 Web 版的受保护交互需要登录。可选赞助不会解锁功能。" + } + ] + } } ] diff --git a/scripts/website-home.mjs b/scripts/website-home.mjs index 2d9b6f7..72e0278 100644 --- a/scripts/website-home.mjs +++ b/scripts/website-home.mjs @@ -34,7 +34,7 @@ export async function buildHomePages(output, source, release) { html = html.replace('', '').replace('', '') html = html.replace('href="/zh/" lang="zh-CN" hreflang="zh-CN"', 'href="/" lang="en" hreflang="en"') html = html.replace(/(]*\bid="langToggle"[^>]*>)[\s\S]*?<\/a>/, '$1EN') - for (const route of ['/features/pomodoro/', '/features/local-first/', '/guides/task-to-focus/', '/privacy/', '/terms/']) html = html.replaceAll(`href="${route}"`, `href="/zh${route}"`) + for (const route of ['/features/pomodoro/', '/features/local-first/', '/guides/task-to-focus/', '/privacy/', '/terms/', '/about/']) html = html.replaceAll(`href="${route}"`, `href="/zh${route}"`) } html = html.replace(/[\s\S]*?<\/title>/, `<title>${escape(c.title)}`) .replace(//, ``) diff --git a/scripts/website-pages.mjs b/scripts/website-pages.mjs index 6d1e877..d893463 100644 --- a/scripts/website-pages.mjs +++ b/scripts/website-pages.mjs @@ -14,6 +14,13 @@ export async function buildContentPages(output, release) { for (const page of content) { for (const lang of ['en', 'zh']) { const c = page[lang], t = copy[lang], route = urlFor(page, lang) + const checked = page.checked ? (lang === 'zh' ? `内容核对：${page.checked}` : `Content checked: ${page.checked}`) : t.checked + const sourceRef = page.sourceRef || 'e21f3b89452f94753bbd7687bc394e030269df7f' + const links = c.links ? `

${lang === 'zh' ? '核对官方入口' : 'Official links'}

    ${c.links.map(link => { + const url = new URL(link.href) + if (url.protocol !== 'https:' || !['nestflow.art', 'app.nestflow.art', 'github.com'].includes(url.hostname)) throw new Error('Unexpected official-link host') + return `
  • ${escape(link.label)}
    • ` + }).join('')}
` : '' const navigation = content.map(item => `${escape(item[lang].h1)}`).join('') const sections = c.sections.map(section => `

${escape(section.title)}

${section.paragraphs.map(p => `

${escape(p)}

`).join('')}
`).join('') const questions = c.faq.map(item => `

${escape(item.q)}

${escape(item.a)}

`).join('') @@ -22,9 +29,9 @@ export async function buildContentPages(output, release) { ${escape(c.title)} -${structuredData({ route, lang, title: c.title, description: c.description, breadcrumb: c.h1, application: true })} +${structuredData({ route, lang, title: c.title, description: c.description, breadcrumb: c.h1, application: true, pageType: page.pageType })}
-
${breadcrumbs(lang, route, c.h1)}

${t.related}

${navigation}
` +
${breadcrumbs(lang, route, c.h1)}

${t.related}

${navigation}
` const dir = path.join(output, route) await mkdir(dir, { recursive: true }) await writeFile(path.join(dir, 'index.html'), html) diff --git a/scripts/website-schema.mjs b/scripts/website-schema.mjs index d946810..266ae40 100644 --- a/scripts/website-schema.mjs +++ b/scripts/website-schema.mjs @@ -7,15 +7,16 @@ export const languageLinks = (en, zh) => `
  1. ${lang === 'zh' ? '首页' : 'Home'}
  2. ${escape(name)}
` } -export function structuredData({ route, lang, title, description, breadcrumb, application = false }) { +export function structuredData({ route, lang, title, description, breadcrumb, application = false, pageType }) { const person = { '@type': 'Person', '@id': `${origin}/#maintainer`, name: POLICY_OPERATOR, url: `${origin}/#maintainer` } const website = { '@type': 'WebSite', '@id': `${origin}/#website`, name: 'Focus&go', url: `${origin}/`, inLanguage: ['en', 'zh-CN'], publisher: { '@id': person['@id'] } } - const page = { '@type': 'WebPage', '@id': `${origin}${route}#webpage`, url: `${origin}${route}`, name: title, description, inLanguage: lang === 'zh' ? 'zh-CN' : 'en', isPartOf: { '@id': website['@id'] }, publisher: { '@id': person['@id'] } } + const page = { '@type': pageType === 'AboutPage' ? ['WebPage', 'AboutPage'] : 'WebPage', '@id': `${origin}${route}#webpage`, url: `${origin}${route}`, name: title, description, inLanguage: lang === 'zh' ? 'zh-CN' : 'en', isPartOf: { '@id': website['@id'] }, publisher: { '@id': person['@id'] } } const graph = [person, website, page] if (application) { const software = { '@type': ['SoftwareApplication', 'WebApplication'], '@id': `${origin}/#application`, name: 'Focus&go', url: `${origin}/`, applicationCategory: 'BusinessApplication', operatingSystem: 'Web browser', browserRequirements: 'A supported modern Web browser', description: lang === 'zh' ? '整合任务、番茄钟、笔记与日记的个人工作台。当前功能免费，官方 Web 版的受保护交互需要登录。' : 'A personal workspace for tasks, a Pomodoro timer, notes and a diary. Current features are free; protected interactions on the official Web app require sign-in.', isAccessibleForFree: true, offers: { '@type': 'Offer', price: 0, priceCurrency: 'USD', url: 'https://app.nestflow.art/' }, publisher: { '@id': person['@id'] }, license: 'https://github.com/VelvetAbyss/Focus-Go/blob/main/LICENSE', sameAs: ['https://github.com/VelvetAbyss/Focus-Go'] } graph.push(software) page.about = { '@id': software['@id'] } + if (pageType === 'AboutPage') page.mainEntity = { '@id': software['@id'] } } if (breadcrumb) { const trail = { '@type': 'BreadcrumbList', '@id': `${origin}${route}#breadcrumb`, itemListElement: [{ '@type': 'ListItem', position: 1, name: lang === 'zh' ? '首页' : 'Home', item: `${origin}${homeFor(lang)}` }, { '@type': 'ListItem', position: 2, name: breadcrumb, item: `${origin}${route}` }] }