- DASHBOARD
跳过概览
查看草稿、社区贡献、累计跳过和当前运行状态。
DASHBOARD
跳过概览
查看草稿、社区贡献、累计跳过和当前运行状态。
已标记片段0个时间片段
涉及视频0个抖音作品
@@ -50,10 +50,9 @@
-
+ BEHAVIOR
跳过行为
设置社区时间片段和本地草稿的处理方式。
@@ -79,19 +78,30 @@
- COMMUNITY BETA
社区共享
默认连接项目公共 API；提交成功的广告片段会立即与其他用户共享。
COMMUNITY BETA
社区共享
与其他用户共享手动标记的时间片段。未明确同意前不会连网查询。
-
+
隐私设计远程查询失败时会立即回退到本地数据。扩展不会自动上传你创建的片段，只有点击播放器提交按钮或片段管理中的上传按钮时才会发送。
+
+ 隐私设计远程查询失败时会回退到本地数据。本地草稿不会自动上传；只有你点击播放器的提交按钮，或片段管理中的上传按钮时才会发送。撤回同意后会立即停止社区查询。
- ABOUT
关于抖音广告跳过
一个开源、社区驱动的 Chrome 扩展。
抖音广告跳过
支持本地片段和社区共享。社区查询默认启用，本地片段仍只会在你主动点击提交时上传。
ABOUT
关于抖音网页版社区片段助手
一个开源、社区驱动的 Chrome 扩展。
抖音网页版社区片段助手
支持本地时间片段和社区共享。社区查询需要你明确同意，本地草稿只会在你主动点击提交时上传。
diff --git a/options.js b/options.js
index 7145275..7a0931b 100644
--- a/options.js
+++ b/options.js
@@ -1,6 +1,6 @@
const DEFAULT_COMMUNITY_API='https://douyin-ad-skipper-api.douyin-skip-community.workers.dev';
const CATEGORY_LABELS={sponsor:'赞助/广告',selfpromo:'自我推广',interaction:'互动提醒'};
-const DEFAULTS = { enabled:true, skipLabeledAds:true, skipLocalSegments:true, showToast:true, debug:false, shortcutsEnabled:true, shortcutCreate:'Alt+KeyZ', shortcutCancel:'Alt+KeyX', shortcutSubmit:'Alt+Enter', skippedCount:0, localSegments:{}, communityEnabled:true, communityApiBase:DEFAULT_COMMUNITY_API, categoryModeSponsor:'auto', categoryModeSelfpromo:'manual', categoryModeInteraction:'manual', communityClientId:'' };
+const DEFAULTS = { enabled:true, skipLocalSegments:true, showToast:true, debug:false, shortcutsEnabled:true, shortcutCreate:'Alt+KeyZ', shortcutCancel:'Alt+KeyX', shortcutSubmit:'Alt+Enter', skippedCount:0, localSegments:{}, communityEnabled:false, communityConsentGranted:false, communityConsentPrompted:false, communityApiBase:DEFAULT_COMMUNITY_API, categoryModeSponsor:'auto', categoryModeSelfpromo:'manual', categoryModeInteraction:'manual', communityClientId:'' };
let state = { ...DEFAULTS };
let capturingShortcut='';
let communitySegments = [];
@@ -81,7 +81,7 @@ async function getContributorId() {
}
async function fetchMyContributions() {
- if(!state.communityEnabled||!state.communityApiBase||!state.communityClientId)return;
+ if(!state.communityConsentGranted||!state.communityEnabled||!state.communityApiBase||!state.communityClientId)return;
try{
const response=await fetch(`${new URL(state.communityApiBase).origin}/v1/me/segments?apiVersion=2`,{headers:{Accept:'application/json','X-Client-ID':state.communityClientId}});
if(!response.ok)throw new Error(`HTTP ${response.status}`);
@@ -100,7 +100,7 @@ async function fetchMyContributions() {
}
if(changed){state.localSegments=localSegments;await chrome.storage.local.set({localSegments})}
renderOverview();renderSegments();
- }catch(error){console.error('[抖音广告跳过] 获取我的社区片段失败',error)}
+ }catch(error){console.error('[抖音社区片段助手] 获取我的社区片段失败',error)}
}
async function deleteSegment(videoId,index) {
@@ -143,21 +143,11 @@ async function adjustSegment(videoId,index,field,delta) {
}
async function ensureCommunityReady() {
- if (!state.communityEnabled || !state.communityApiBase) {
- toast('请先在“社区共享”中授权并连接 API');
- return false;
- }
- try {
- const pattern=`${new URL(state.communityApiBase).origin}/*`;
- if (!await chrome.permissions.contains({origins:[pattern]})) {
- toast('社区 API 域名权限缺失，请重新授权连接');
- return false;
- }
- return true;
- } catch {
- toast('社区 API 地址无效');
+ if (!state.communityConsentGranted || !state.communityEnabled) {
+ toast('请先在“社区共享”中同意并启用社区');
return false;
}
+ return state.communityApiBase === DEFAULT_COMMUNITY_API;
}
async function uploadSegment(videoId,index) {
@@ -179,7 +169,7 @@ async function uploadSegment(videoId,index) {
await fetchMyContributions();
return true;
} catch(error) {
- console.error('[抖音广告跳过] 上传社区失败',error);
+ console.error('[抖音社区片段助手] 上传社区失败',error);
return false;
}
}
@@ -200,7 +190,7 @@ async function uploadAllPending() {
}
function exportData() {
- const payload = {format:'douyin-ad-skipper-backup',version:4,exportedAt:new Date().toISOString(),settings:{enabled:state.enabled,skipLabeledAds:state.skipLabeledAds,skipLocalSegments:state.skipLocalSegments,showToast:state.showToast,debug:state.debug,shortcutsEnabled:state.shortcutsEnabled,shortcutCreate:state.shortcutCreate,shortcutCancel:state.shortcutCancel,shortcutSubmit:state.shortcutSubmit,categoryModeSponsor:state.categoryModeSponsor,categoryModeSelfpromo:state.categoryModeSelfpromo,categoryModeInteraction:state.categoryModeInteraction},localSegments:state.localSegments};
+ const payload = {format:'douyin-ad-skipper-backup',version:5,exportedAt:new Date().toISOString(),settings:{enabled:state.enabled,skipLocalSegments:state.skipLocalSegments,showToast:state.showToast,debug:state.debug,shortcutsEnabled:state.shortcutsEnabled,shortcutCreate:state.shortcutCreate,shortcutCancel:state.shortcutCancel,shortcutSubmit:state.shortcutSubmit,categoryModeSponsor:state.categoryModeSponsor,categoryModeSelfpromo:state.categoryModeSelfpromo,categoryModeInteraction:state.categoryModeInteraction},localSegments:state.localSegments};
const url=URL.createObjectURL(new Blob([JSON.stringify(payload,null,2)],{type:'application/json'})); const a=document.createElement('a'); a.href=url; a.download=`douyin-ad-skipper-${new Date().toISOString().slice(0,10)}.json`; a.click(); setTimeout(()=>URL.revokeObjectURL(url),1000); toast('备份已导出');
}
@@ -216,9 +206,9 @@ async function importData(file) {
const valid=segments.map((item)=>normalizeImportedSegment(item,id));total+=valid.length;if(total>10000)throw new Error('too_many');
merged[id]=[...(merged[id]||[]),...valid].sort((a,b)=>a.start-b.start);
}
- const allowedSettings=['enabled','skipLabeledAds','skipLocalSegments','showToast','debug','shortcutsEnabled','shortcutCreate','shortcutCancel','shortcutSubmit','categoryModeSponsor','categoryModeSelfpromo','categoryModeInteraction'];
+ const allowedSettings=['enabled','skipLocalSegments','showToast','debug','shortcutsEnabled','shortcutCreate','shortcutCancel','shortcutSubmit','categoryModeSponsor','categoryModeSelfpromo','categoryModeInteraction'];
const importedSettings=Object.fromEntries(Object.entries(payload.settings||{}).filter(([key])=>allowedSettings.includes(key)));
- for(const key of ['enabled','skipLabeledAds','skipLocalSegments','showToast','debug','shortcutsEnabled'])if(key in importedSettings)importedSettings[key]=importedSettings[key]===true;
+ for(const key of ['enabled','skipLocalSegments','showToast','debug','shortcutsEnabled'])if(key in importedSettings)importedSettings[key]=importedSettings[key]===true;
for(const key of ['categoryModeSponsor','categoryModeSelfpromo','categoryModeInteraction'])if(key in importedSettings&&!['auto','manual','disabled'].includes(importedSettings[key]))delete importedSettings[key];
for(const key of ['shortcutCreate','shortcutCancel','shortcutSubmit'])if(key in importedSettings&&!/^(?:(?:Ctrl|Alt|Shift|Meta)\+)+(?:Key[A-Z]|Digit\d|Enter|Space|Arrow(?:Up|Down|Left|Right))$/.test(String(importedSettings[key])))delete importedSettings[key];
const update={...importedSettings,localSegments:merged};await chrome.storage.local.set(update);state={...state,...update};syncSettings();renderOverview();renderSegments();toast('备份已导入');
@@ -233,34 +223,42 @@ function normalizeImportedSegment(item,videoId){
}
function syncSettings() {
- ['enabled','skipLabeledAds','skipLocalSegments','showToast','debug','shortcutsEnabled','communityEnabled'].forEach((key)=>{ $(`#${key}`).checked=Boolean(state[key]); });
+ ['enabled','skipLocalSegments','showToast','debug','shortcutsEnabled','communityEnabled'].forEach((key)=>{ $(`#${key}`).checked=Boolean(state[key]); });
document.querySelectorAll('.category-mode').forEach((select)=>{select.value=state[select.dataset.setting]||DEFAULTS[select.dataset.setting]});
document.querySelectorAll('.shortcut-capture').forEach((button)=>{button.textContent=formatShortcut(state[button.dataset.setting]||DEFAULTS[button.dataset.setting])});
- $('#communityApiBase').value = state.communityApiBase || '';
renderCommunityStatus();
}
function shortcutSignature(event){return [event.ctrlKey?'Ctrl':'',event.altKey?'Alt':'',event.shiftKey?'Shift':'',event.metaKey?'Meta':'',event.code].filter(Boolean).join('+')}
function formatShortcut(value){return String(value||'').replace(/Key([A-Z])/,'$1').replace(/Digit(\d)/,'$1').split('+').join(' + ')}
-async function communityOriginPattern() {
- try { const url=new URL($('#communityApiBase').value.trim()); return url.protocol==='https:' ? `${url.origin}/*` : ''; } catch { return ''; }
+function renderCommunityStatus() {
+ const status=$('#communityStatus');
+ const granted=state.communityConsentGranted===true;
+ const enabled=granted&&state.communityEnabled===true;
+ status.textContent=enabled?'已启用':granted?'已暂停':state.communityConsentPrompted?'仅本地':'等待选择';
+ $('#overviewStatus').textContent=enabled?'社区已启用':granted?'社区已暂停':'仅本地';
+ $('#sidebarPrivacy').innerHTML=enabled?'社区查询已启用
草稿需手动提交':'本地草稿只保存在此浏览器';
+ $('#communityApiDisplay').textContent=DEFAULT_COMMUNITY_API;
+ $('#communityEnabled').disabled=!granted;
+ $('#grantCommunityConsent').hidden=granted;
+ $('#useLocalOnly').hidden=granted;
+ $('#revokeCommunityConsent').hidden=!granted;
+ $('#consentTitle').textContent=granted?'社区共享已授权':state.communityConsentPrompted?'当前为仅本地模式':'选择社区模式';
+ $('#consentDescription').textContent=granted
+ ? '扩展只在社区查询启用时发送当前作品 ID 的哈希；片段内容仍只会在你主动提交时上传。'
+ : '启用后，扩展会发送当前作品 ID 的哈希来查询共享片段；不会上传完整观看历史，本地草稿只有在你主动提交时才会上传。';
}
-async function renderCommunityStatus() {
- const status=$('#communityStatus');
- const button=$('#connectCommunity');
- const reset=$('#disconnectCommunity');
- const typed=$('#communityApiBase').value.trim();
- let typedOrigin,configuredOrigin;
- try { typedOrigin=new URL(typed).origin;configuredOrigin=new URL(state.communityApiBase).origin; } catch { status.textContent='地址无效';button.textContent='授权并连接';button.disabled=false;return; }
- const pattern=`${typedOrigin}/*`;
- const granted=await chrome.permissions.contains({origins:[pattern]});
- const connected=granted&&typedOrigin===configuredOrigin;
- status.textContent=connected&&state.communityEnabled?'已启用':connected?'已停用':granted?'待连接':'待授权';
- button.textContent=connected?'已授权':'授权并连接';
- button.disabled=connected;
- reset.disabled=typedOrigin===DEFAULT_COMMUNITY_API;
+async function setCommunityConsent(granted) {
+ const update={communityConsentPrompted:true,communityConsentGranted:granted===true,communityEnabled:granted===true,communityApiBase:DEFAULT_COMMUNITY_API};
+ Object.assign(state,update);
+ if(granted&&!state.communityClientId)state.communityClientId=await getContributorId();
+ if(!granted){communitySegments=[];communityStats={submittedCount:0,contributedSeconds:0,skipCount:0,helpedPeople:0,secondsSaved:0}}
+ await chrome.storage.local.set(update);
+ syncSettings();renderOverview();renderSegments();
+ if(granted)await fetchMyContributions();
+ toast(granted?'社区共享已启用':'已切换为仅本地使用');
}
document.querySelectorAll('nav button[data-page]').forEach((button)=>button.addEventListener('click',()=>showPage(button.dataset.page)));
@@ -281,25 +279,15 @@ document.addEventListener('keydown',async(event)=>{
if(conflict){toast('这个组合键已经用于其他操作');return}
const key=capturingShortcut;capturingShortcut='';state[key]=signature;await chrome.storage.local.set({[key]:signature});button?.classList.remove('capturing');syncSettings();toast('快捷键已保存');
},true);
-['enabled','skipLabeledAds','skipLocalSegments','showToast','debug','shortcutsEnabled'].forEach((key)=>$(`#${key}`).addEventListener('change',(event)=>{state[key]=event.target.checked;chrome.storage.local.set({[key]:state[key]});toast('设置已保存')}));
+['enabled','skipLocalSegments','showToast','debug','shortcutsEnabled'].forEach((key)=>$(`#${key}`).addEventListener('change',(event)=>{state[key]=event.target.checked;chrome.storage.local.set({[key]:state[key]});toast('设置已保存')}));
document.querySelectorAll('.category-mode').forEach((select)=>select.addEventListener('change',async(event)=>{const key=event.target.dataset.setting;state[key]=event.target.value;const update={[key]:state[key]};if(state[key]==='manual'){state.showToast=true;update.showToast=true;$('#showToast').checked=true}await chrome.storage.local.set(update);toast('分类处理方式已保存')}));
$('#communityEnabled').addEventListener('change',async(event)=>{
- if(event.target.checked&&!state.communityApiBase){event.target.checked=false;toast('请先授权并连接 API');return}
+ if(event.target.checked&&!state.communityConsentGranted){event.target.checked=false;await setCommunityConsent(true);return}
state.communityEnabled=event.target.checked;await chrome.storage.local.set({communityEnabled:state.communityEnabled});renderCommunityStatus();toast('社区查询设置已保存');
});
-$('#connectCommunity').addEventListener('click',async()=>{
- const pattern=await communityOriginPattern();if(!pattern){toast('请输入有效的 HTTPS API 地址');return}
- const granted=await chrome.permissions.request({origins:[pattern]});if(!granted){toast('未授予域名访问权限');return}
- const communityApiBase=new URL($('#communityApiBase').value.trim()).origin;state.communityApiBase=communityApiBase;state.communityEnabled=true;
- await chrome.storage.local.set({communityApiBase,communityEnabled:true});syncSettings();toast('社区 API 已连接');
-});
-$('#communityApiBase').addEventListener('input',renderCommunityStatus);
-$('#disconnectCommunity').addEventListener('click',async()=>{
- let oldOrigin='';try{oldOrigin=new URL(state.communityApiBase).origin}catch{}
- if(oldOrigin&&oldOrigin!==DEFAULT_COMMUNITY_API)await chrome.permissions.remove({origins:[`${oldOrigin}/*`]});
- state.communityApiBase=DEFAULT_COMMUNITY_API;state.communityEnabled=true;
- await chrome.storage.local.set({communityApiBase:DEFAULT_COMMUNITY_API,communityEnabled:true});syncSettings();await fetchMyContributions();toast('已恢复默认公共 API');
-});
+$('#grantCommunityConsent').addEventListener('click',()=>{void setCommunityConsent(true)});
+$('#useLocalOnly').addEventListener('click',()=>{void setCommunityConsent(false)});
+$('#revokeCommunityConsent').addEventListener('click',()=>{void setCommunityConsent(false)});
$('#segmentSearch').addEventListener('input',renderSegments);
$('#segmentList').addEventListener('click',async(event)=>{
const adjustButton=event.target.closest('[data-adjust]');if(adjustButton){await adjustSegment(adjustButton.dataset.videoId,Number(adjustButton.dataset.index),adjustButton.dataset.adjust,Number(adjustButton.dataset.delta));return}
@@ -318,5 +306,5 @@ $('#importData').addEventListener('click',()=>$('#importFile').click());
$('#importFile').addEventListener('change',(event)=>{if(event.target.files[0])importData(event.target.files[0]);event.target.value=''});
$('#clearSegments').addEventListener('click',async()=>{if(confirm('确定清空所有本地片段吗？此操作无法撤销。')){state.localSegments={};await chrome.storage.local.set({localSegments:{}});renderOverview();renderSegments();toast('本地片段已清空')}});
-(async()=>{const stored=await chrome.storage.local.get(null);state={...DEFAULTS,...stored};if(!Object.hasOwn(stored,'categoryModeSponsor')){const legacyMode=['auto','manual','disabled'].includes(stored.communitySkipMode)?stored.communitySkipMode:'auto';const categoryModes={categoryModeSponsor:legacyMode,categoryModeSelfpromo:legacyMode,categoryModeInteraction:legacyMode};state={...state,...categoryModes};await chrome.storage.local.set(categoryModes)}await chrome.storage.local.remove(['communitySkipMode','communityAutoSkipTrusted']);if(!state.communityApiBase||/^https:\/\/douyin-ad-skipper-api\.\d+\.workers\.dev\/?$/.test(state.communityApiBase)){state.communityApiBase=DEFAULT_COMMUNITY_API;state.communityEnabled=true;await chrome.storage.local.set({communityApiBase:DEFAULT_COMMUNITY_API,communityEnabled:true})}state.communityClientId=await getContributorId();$('#extensionVersion').textContent=`版本 ${chrome.runtime.getManifest().version}`;syncSettings();renderOverview();renderSegments();showPage(location.hash.slice(1)||'overview');await fetchMyContributions()})();
-chrome.storage.onChanged.addListener((changes,area)=>{if(area!=='local')return;for(const [key,change] of Object.entries(changes))state[key]=change.newValue;renderOverview()});
+(async()=>{const stored=await chrome.storage.local.get(null);state={...DEFAULTS,...stored};if(!Object.hasOwn(stored,'categoryModeSponsor')){const legacyMode=['auto','manual','disabled'].includes(stored.communitySkipMode)?stored.communitySkipMode:'auto';const categoryModes={categoryModeSponsor:legacyMode,categoryModeSelfpromo:legacyMode,categoryModeInteraction:legacyMode};state={...state,...categoryModes};await chrome.storage.local.set(categoryModes)}const migration={communityApiBase:DEFAULT_COMMUNITY_API};if(!Object.hasOwn(stored,'communityConsentPrompted'))Object.assign(migration,{communityConsentPrompted:false,communityConsentGranted:false,communityEnabled:false});else if(!state.communityConsentGranted&&state.communityEnabled)migration.communityEnabled=false;Object.assign(state,migration);await chrome.storage.local.set(migration);await chrome.storage.local.remove(['communitySkipMode','communityAutoSkipTrusted','skipLabeledAds']);if(state.communityConsentGranted)state.communityClientId=await getContributorId();const version=chrome.runtime.getManifest().version;$('#extensionVersion').textContent=`版本 ${version}`;$('#sidebarVersion').textContent=`社区片段助手 · v${version}`;syncSettings();renderOverview();renderSegments();showPage(location.hash.slice(1)||'overview');if(state.communityConsentGranted&&state.communityEnabled)await fetchMyContributions()})();
+chrome.storage.onChanged.addListener((changes,area)=>{if(area!=='local')return;for(const [key,change] of Object.entries(changes))state[key]=change.newValue;syncSettings();renderOverview()});
diff --git a/popup.css b/popup.css
index 27991e3..8da4fc9 100644
--- a/popup.css
+++ b/popup.css
@@ -1,10 +1,10 @@
:root { color-scheme: dark; }
* { box-sizing: border-box; }
-body { margin: 0; width: 322px; color: #f5f5f7; background: #111318; font: 14px/1.45 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+body { margin: 0; width: 348px; color: #f5f5f7; background: #111318; font: 14px/1.45 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
main { padding: 18px; }
header { display: flex; gap: 11px; align-items: center; margin-bottom: 18px; }
.mark { display: grid; place-items: center; width: 40px; height: 40px; border-radius: 13px; color: #111318; background: linear-gradient(135deg, #25f4ee, #fe2c55); font-size: 20px; font-weight: 900; }
-h1 { margin: 0; font-size: 16px; }
+h1 { margin: 0; font-size: 15px; line-height: 1.3; }
p { margin: 2px 0 0; color: #969ba8; font-size: 12px; }
.setting { display: flex; align-items: center; justify-content: space-between; min-height: 47px; padding: 10px 0; border-top: 1px solid #262933; cursor: pointer; }
.setting.primary { padding: 13px 12px; border: 1px solid #303440; border-radius: 12px; background: #1a1d24; margin-bottom: 8px; }
@@ -23,4 +23,10 @@ input:checked + i::after { transform: translateX(16px); }
.quick-actions button { padding:10px 7px; border:1px solid #303440; border-radius:9px; color:#e9eaf0; background:#1a1d24; cursor:pointer; }
.quick-actions button:hover { background:#252933; }
.quick-actions span { margin-right:4px; color:#25f4ee; }
+.consent-notice { margin-top:12px; padding:12px; border:1px solid rgba(37,244,238,.26); border-radius:11px; background:linear-gradient(135deg,rgba(37,244,238,.08),rgba(254,44,85,.05)); }
+.consent-notice[hidden] { display:none; }
+.consent-notice strong { font-size:13px; }
+.consent-notice p { margin:4px 0 9px; line-height:1.55; }
+.consent-notice button { width:100%; padding:8px 10px; border:1px solid rgba(37,244,238,.35); border-radius:8px; color:#25f4ee; background:rgba(37,244,238,.08); cursor:pointer; }
+.consent-notice button:hover { background:rgba(37,244,238,.15); }
.note { margin-top: 12px; text-align: center; }
diff --git a/popup.html b/popup.html
index 26528f1..fdabc01 100644
--- a/popup.html
+++ b/popup.html
@@ -3,22 +3,22 @@
- 抖音广告自动跳过
+ 抖音网页版社区片段助手
- 默认连接公共社区 API，只查询当前作品，不上传完整浏览记录。
+
+ 社区功能尚未启用
+ 明确同意后，扩展才会发送当前作品 ID 的哈希值来查询社区片段。
+
+
+ 本地草稿不会自动上传。
diff --git a/popup.js b/popup.js
index b93759e..4be40c6 100644
--- a/popup.js
+++ b/popup.js
@@ -1,13 +1,23 @@
-const DEFAULTS = { enabled: true, showToast: true, debug: false, skippedCount: 0, localSegments: {} };
+const DEFAULTS = { enabled: true, showToast: true, debug: false, skippedCount: 0, localSegments: {}, communityEnabled: false, communityConsentGranted: false, communityConsentPrompted: false };
const settingKeys = ['enabled', 'showToast', 'debug'];
+function renderCommunityState(settings) {
+ const connected = settings.communityConsentGranted && settings.communityEnabled;
+ document.getElementById('communitySummary').textContent = connected ? '社区共享已启用' : settings.communityConsentGranted ? '社区查询已暂停' : '仅本地模式';
+ document.getElementById('consentNotice').hidden = settings.communityConsentPrompted && settings.communityConsentGranted;
+}
+
chrome.storage.local.get(DEFAULTS, (settings) => {
for (const key of settingKeys) document.getElementById(key).checked = Boolean(settings[key]);
document.getElementById('count').textContent = Number(settings.skippedCount || 0).toLocaleString('zh-CN');
document.getElementById('segmentCount').textContent = Object.values(settings.localSegments || {}).reduce((sum, segments) => sum + segments.length, 0).toLocaleString('zh-CN');
+ renderCommunityState(settings);
});
document.getElementById('openOptions').addEventListener('click', () => chrome.runtime.openOptionsPage());
+document.getElementById('reviewConsent').addEventListener('click', () => {
+ chrome.tabs.create({ url: `${chrome.runtime.getURL('options.html')}#community` });
+});
document.getElementById('openSegments').addEventListener('click', () => {
chrome.tabs.create({ url: `${chrome.runtime.getURL('options.html')}#segments` });
});
@@ -25,4 +35,7 @@ chrome.storage.onChanged.addListener((changes, area) => {
if (area === 'local' && changes.localSegments) {
document.getElementById('segmentCount').textContent = Object.values(changes.localSegments.newValue || {}).reduce((sum, segments) => sum + segments.length, 0).toLocaleString('zh-CN');
}
+ if (area === 'local' && (changes.communityEnabled || changes.communityConsentGranted || changes.communityConsentPrompted)) {
+ chrome.storage.local.get(DEFAULTS, renderCommunityState);
+ }
});
diff --git a/scripts/extract-release-notes.mjs b/scripts/extract-release-notes.mjs
new file mode 100644
index 0000000..7d5f860
--- /dev/null
+++ b/scripts/extract-release-notes.mjs
@@ -0,0 +1,18 @@
+import assert from 'node:assert/strict';
+import { readFile, writeFile } from 'node:fs/promises';
+
+const tag = process.argv[2] || '';
+const output = process.argv[3] || '';
+assert.match(tag, /^v\d+\.\d+\.\d+$/, '标签必须为 vX.Y.Z');
+assert.ok(output, '缺少发布说明输出路径');
+const changelog = await readFile(new URL('../CHANGELOG.md', import.meta.url), 'utf8');
+const version = tag.slice(1);
+const heading = `## ${version}`;
+const start = changelog.split('\n').findIndex((line) => line.startsWith(heading));
+assert.notEqual(start, -1, `CHANGELOG 缺少 ${tag} 的发布内容`);
+const lines = changelog.split('\n').slice(start + 1);
+const end = lines.findIndex((line) => line.startsWith('## '));
+const section = lines.slice(0, end === -1 ? undefined : end).join('\n').trim();
+assert.ok(section, `CHANGELOG 缺少 ${tag} 的发布内容`);
+await writeFile(output, section + '\n');
+console.log(`已生成 ${tag} 发布说明`);
diff --git a/scripts/test-extension-logic.mjs b/scripts/test-extension-logic.mjs
new file mode 100644
index 0000000..d503462
--- /dev/null
+++ b/scripts/test-extension-logic.mjs
@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict';
+import { readFile } from 'node:fs/promises';
+import vm from 'node:vm';
+
+const content = await readFile(new URL('../content.js', import.meta.url), 'utf8');
+const options = await readFile(new URL('../options.js', import.meta.url), 'utf8');
+const manifest = JSON.parse(await readFile(new URL('../manifest.json', import.meta.url), 'utf8'));
+const worker = await readFile(new URL('../server/src/index.ts', import.meta.url), 'utf8');
+const idempotencyMigration = await readFile(new URL('../server/migrations/0007_idempotent_submissions.sql', import.meta.url), 'utf8');
+
+assert.doesNotMatch(content, /settings\.skipLabeledAds|const AD_LABELS|function checkCurrentVideo/, '不得恢复整条平台广告识别');
+assert.doesNotMatch(options, /chrome\.permissions|state\.skipLabeledAds|skipLabeledAds:/, '选项页不得申请任意 API 域名或恢复旧广告开关');
+assert.equal(manifest.optional_host_permissions, undefined, '公共版不得申请任意 HTTPS 域名权限');
+
+assert.match(content, /communityConsentGranted:\s*false/, '社区同意默认必须关闭');
+assert.match(content, /if \(!settings\.communityConsentGranted \|\| !settings\.communityEnabled\) return;/, '远程查询必须受同意状态保护');
+assert.match(content, /actions\.length === 0/, '带操作按钮的必要提示不能被普通提示开关隐藏');
+
+const delaysSource = content.match(/const COMMUNITY_RETRY_MS = (\[[^;]+\]);/)?.[1];
+const retryFunction = content.match(/function communityRetryDelay\(failureCount\) \{[\s\S]*?\n \}/)?.[0];
+assert.ok(delaysSource && retryFunction, '缺少社区查询退避函数');
+const retryContext = {};
+vm.runInNewContext(`const COMMUNITY_RETRY_MS=${delaysSource};${retryFunction};globalThis.retry=communityRetryDelay;`, retryContext);
+assert.deepEqual([1, 2, 3, 4, 99].map(retryContext.retry), [5000, 15000, 60000, 300000, 300000]);
+
+assert.match(content, /cannot_vote_own_segment:\s*'这是你提交的片段/, '自己的投稿必须显示明确反馈');
+assert.match(content, /ownedByMe:\s*item\.ownedByMe === true/, '社区查询必须保留投稿归属标识');
+assert.match(content, /failureCount[\s\S]*retryAt/, '查询失败必须使用短期退避而不是成功缓存时长');
+assert.match(worker, /ownedByMe/, '服务端查询必须返回当前匿名投稿归属');
+assert.match(worker, /ON CONFLICT\(submitter_hash, client_request_id\)/, '投稿必须按请求 ID 幂等写入');
+assert.match(idempotencyMigration, /CREATE UNIQUE INDEX[\s\S]*submitter_hash, client_request_id/, 'D1 必须有投稿幂等唯一索引');
+
+console.log('扩展行为契约测试通过');
diff --git a/scripts/validate-extension.mjs b/scripts/validate-extension.mjs
index 8f3be30..f981fae 100644
--- a/scripts/validate-extension.mjs
+++ b/scripts/validate-extension.mjs
@@ -3,12 +3,14 @@ import { access, readFile } from 'node:fs/promises';
const manifest = JSON.parse(await readFile(new URL('../manifest.json', import.meta.url), 'utf8'));
assert.equal(manifest.manifest_version, 3, '必须使用 Manifest V3');
+assert.equal(manifest.name, '抖音网页版社区片段助手');
assert.match(manifest.version, /^\d+\.\d+\.\d+$/, '扩展版本必须使用 x.y.z');
assert.deepEqual(manifest.permissions, ['storage'], '新增 Chrome 权限前必须经过安全审查');
assert.deepEqual(manifest.host_permissions, [
'https://www.douyin.com/*',
'https://douyin-ad-skipper-api.douyin-skip-community.workers.dev/*',
]);
+assert.equal(manifest.optional_host_permissions, undefined, '公共版不得申请任意 HTTPS 域名权限');
const requiredFiles = new Set([
'content.js', 'content.css', 'popup.html', 'popup.js', 'popup.css',
@@ -25,4 +27,5 @@ assert.match(changelog, new RegExp(`^## ${manifest.version.replaceAll('.', '\\.'
const source = await readFile(new URL('../content.js', import.meta.url), 'utf8');
assert(!/\beval\s*\(|new\s+Function\s*\(/.test(source), '内容脚本禁止动态执行代码');
+assert(!/settings\.skipLabeledAds|const AD_LABELS|function checkCurrentVideo/.test(source), '不得恢复整条平台广告识别');
console.log(`扩展校验通过 v${manifest.version}`);
diff --git a/scripts/validate-package.mjs b/scripts/validate-package.mjs
new file mode 100644
index 0000000..31fa988
--- /dev/null
+++ b/scripts/validate-package.mjs
@@ -0,0 +1,26 @@
+import assert from 'node:assert/strict';
+import { access, readFile, readdir } from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+const root = resolve(process.argv[2] || '');
+assert.ok(process.argv[2], '请提供解压后的扩展目录');
+const rootUrl = pathToFileURL(`${root}/`);
+const manifest = JSON.parse(await readFile(new URL('manifest.json', rootUrl), 'utf8'));
+const required = new Set([
+ manifest.action?.default_popup,
+ manifest.options_ui?.page,
+ ...Object.values(manifest.icons || {}),
+]);
+for (const entry of manifest.content_scripts || []) {
+ for (const file of [...(entry.js || []), ...(entry.css || [])]) required.add(file);
+}
+for (const file of required) {
+ assert.equal(typeof file, 'string');
+ await access(new URL(file, rootUrl));
+}
+const topLevel = await readdir(root);
+for (const forbidden of ['server', '.git', '.github', 'wrangler.jsonc', '.dev.vars']) {
+ assert.ok(!topLevel.includes(forbidden), `发布包不应包含 ${forbidden}`);
+}
+console.log(`发布包校验通过 v${manifest.version}`);
diff --git a/server/README.md b/server/README.md
index a9beed6..b00fbda 100644
--- a/server/README.md
+++ b/server/README.md
@@ -22,9 +22,10 @@ curl http://localhost:8787/v1/videos/7669344658548047311/segments
1. 登录 Cloudflare：`npx wrangler login`。
2. 设置匿名身份哈希盐：`npx wrangler secret put CLIENT_HASH_SALT`。
-3. 首次部署：`npm run deploy`。Wrangler 会自动配置 `DB` 绑定。
+3. 首次使用先运行 `npx wrangler d1 create douyin_ad_skipper`，把返回的数据库 ID 填入本地 `wrangler.jsonc` 的 `d1_databases[0].database_id`。
4. 应用远程迁移：`npm run db:migrate:remote`。
-5. 将 Worker 的 HTTPS 地址填写到扩展“社区共享”设置页并授权。
+5. 部署 Worker：`npm run deploy`。
+6. 自建分支需要同时替换扩展中的 API 常量和 `manifest.json` 精确域名权限；公共发布版不提供任意服务器地址输入框。
生产环境必须设置 `CLIENT_HASH_SALT`，否则所有写接口返回 `503`。不要提交 `.dev.vars`。
@@ -39,9 +40,9 @@ curl http://localhost:8787/v1/videos/7669344658548047311/segments
- `POST /v1/segments/:segmentId/reports`
- `POST /v1/segments/:segmentId/skips`
-写请求必须携带随机生成的 `X-Client-ID`。服务端使用加盐哈希保存稳定的匿名贡献身份，不保存客户端 ID 原值；来源 IP 会单独加盐哈希，仅用于第二层限流和基础设施安全，不参与贡献身份。`X-Client-ID` 不是登录凭证。
+写请求和需要识别“自己的投稿”的查询必须携带随机生成的 `X-Client-ID`。服务端使用加盐哈希保存稳定的匿名贡献身份，不保存客户端 ID 原值；来源 IP 会单独加盐哈希，仅用于第二层限流和基础设施安全，不参与贡献身份。`X-Client-ID` 不是登录凭证。
-写接口的 JSON 请求体最大为 8 KiB，并同时按匿名身份和来源 IP 限流。D1 中的限流桶会抽样清理超过 48 小时的数据。生产部署前应先导出 D1 备份，再应用迁移。
+写接口的 JSON 请求体最大为 8 KiB，并同时按匿名身份和来源 IP 限流。提交使用 `(submitter_hash, client_request_id)` 唯一约束保证网络重试幂等。D1 中的限流桶会抽样清理超过 48 小时的数据。生产部署前应先导出 D1 备份，再应用迁移。
## 可信规则（初版）
diff --git a/server/migrations/0007_idempotent_submissions.sql b/server/migrations/0007_idempotent_submissions.sql
new file mode 100644
index 0000000..c6f3b51
--- /dev/null
+++ b/server/migrations/0007_idempotent_submissions.sql
@@ -0,0 +1,6 @@
+ALTER TABLE segments ADD COLUMN client_request_id TEXT;
+
+-- Legacy rows keep NULL, while every new request is unique for its anonymous contributor.
+-- SQLite permits multiple NULL values in a UNIQUE index, so this is safe for existing data.
+CREATE UNIQUE INDEX IF NOT EXISTS idx_segments_submitter_request
+ON segments(submitter_hash, client_request_id);
diff --git a/server/src/index.ts b/server/src/index.ts
index e1c453f..5496b44 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1,4 +1,4 @@
-import { REPORT_REASONS, VIDEO_ID_PATTERN, parseSegmentInput, statusFromVotes } from './validation';
+import { REPORT_REASONS, VIDEO_ID_PATTERN, parseSegmentInput, statusFromVotes } from './validation.ts';
interface Env {
DB: D1Database;
@@ -10,6 +10,9 @@ type SegmentRow = {
status: string; upvotes: number; downvotes: number; created_at: string;
};
+type OwnedSegmentRow = SegmentRow & { owned_by_me: number };
+type SubmitterSegmentRow = SegmentRow & { submitter_hash: string };
+
const CORS = {
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Headers': 'Content-Type, X-Client-ID',
@@ -100,13 +103,14 @@ async function withinRateLimit(env: Env, identity: string, action: string, limit
return Boolean(row && row.count <= limit);
}
-function segmentJson(row: SegmentRow) {
- return {
+export function segmentJson(row: SegmentRow, ownedByMe?: boolean) {
+ const segment = {
id: row.id, videoId: row.video_id, start: row.start_ms / 1000, end: row.end_ms / 1000,
category: row.category, status: row.status, upvotes: row.upvotes, downvotes: row.downvotes,
score: row.upvotes + row.downvotes ? row.upvotes / (row.upvotes + row.downvotes) : 0,
createdAt: row.created_at,
};
+ return ownedByMe === undefined ? segment : { ...segment, ownedByMe };
}
async function getSegments(videoId: string, env: Env): Promise
{
@@ -118,18 +122,21 @@ async function getSegments(videoId: string, env: Env): Promise {
SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at
FROM segments WHERE video_id = ? AND status IN ('candidate', 'trusted') ORDER BY start_ms ASC LIMIT 200
`).bind(videoId).all();
- return json({ videoId, segments: result.results.map(segmentJson) });
+ return json({ videoId, segments: result.results.map((row) => segmentJson(row)) });
}
-async function getSegmentsByHash(videoHash: string, env: Env): Promise {
+async function getSegmentsByHash(request: Request, videoHash: string, env: Env): Promise {
if (!/^[0-9a-f]{64}$/i.test(videoHash)) return json({ error: 'invalid_video_hash' }, 400);
+ const identity = await contributorHash(request, env);
+ const ownershipIdentity = identity || '';
const result = await env.DB.prepare(`
- SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at
+ SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at,
+ CASE WHEN ? != '' AND submitter_hash = ? THEN 1 ELSE 0 END AS owned_by_me
FROM segments WHERE video_hash = ? AND status IN ('candidate', 'trusted') ORDER BY start_ms ASC LIMIT 200
- `).bind(videoHash.toLowerCase()).all();
+ `).bind(ownershipIdentity, ownershipIdentity, videoHash.toLowerCase()).all();
const segments = result.results.map((row) => {
const { videoId: _videoId, ...segment } = segmentJson(row);
- return segment;
+ return { ...segment, ownedByMe: Boolean(row.owned_by_me) };
});
return json({ segments });
}
@@ -153,7 +160,7 @@ async function getMySegments(request: Request, env: Env): Promise {
WHERE segments.submitter_hash = ?
`).bind(identity).first<{ skip_count: number; helped_people: number; seconds_saved: number }>();
return json({
- segments: result.results.map(segmentJson),
+ segments: result.results.map((row) => segmentJson(row)),
stats: {
submittedCount: result.results.length,
contributedSeconds: contributedMs / 1000,
@@ -195,19 +202,37 @@ async function submitSegment(request: Request, env: Env): Promise {
const input = parseSegmentInput(body);
if (!input) return json({ error: 'invalid_segment' }, 400);
const startMs = Math.round(input.start * 1000), endMs = Math.round(input.end * 1000);
+ const idempotent = await env.DB.prepare(`
+ SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at
+ FROM segments WHERE submitter_hash = ? AND client_request_id = ? LIMIT 1
+ `).bind(identity, input.clientRequestId).first();
+ if (idempotent) return json({ segment: segmentJson(idempotent, true), duplicate: true, idempotent: true });
const existing = await env.DB.prepare(`
- SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at FROM segments
+ SELECT id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at, submitter_hash FROM segments
WHERE video_id = ? AND category = ? AND ABS(start_ms - ?) <= 1500 AND ABS(end_ms - ?) <= 1500
AND status != 'rejected' LIMIT 1
- `).bind(input.videoId, input.category, startMs, endMs).first();
- if (existing) return json({ segment: segmentJson(existing), duplicate: true });
+ `).bind(input.videoId, input.category, startMs, endMs).first();
+ if (existing) return json({ segment: segmentJson(existing, existing.submitter_hash === identity), duplicate: true });
const id = crypto.randomUUID(), now = new Date().toISOString();
const videoHash = await sha256(input.videoId);
- await env.DB.prepare(`
- INSERT INTO segments (id, video_id, video_hash, start_ms, end_ms, duration_ms, category, status, submitter_hash, created_at, updated_at)
- VALUES (?, ?, ?, ?, ?, ?, ?, 'trusted', ?, ?, ?)
- `).bind(id, input.videoId, videoHash, startMs, endMs, input.duration == null ? null : Math.round(input.duration * 1000), input.category, identity, now, now).run();
- return json({ segment: { id, videoId: input.videoId, start: input.start, end: input.end, category: input.category, status: 'trusted', upvotes: 0, downvotes: 0, score: 0, createdAt: now } }, 201);
+ const inserted = await env.DB.prepare(`
+ INSERT INTO segments (
+ id, video_id, video_hash, start_ms, end_ms, duration_ms, category, status,
+ submitter_hash, client_request_id, created_at, updated_at
+ ) VALUES (?, ?, ?, ?, ?, ?, ?, 'trusted', ?, ?, ?, ?)
+ ON CONFLICT(submitter_hash, client_request_id) DO UPDATE SET
+ client_request_id = excluded.client_request_id
+ RETURNING id, video_id, start_ms, end_ms, category, status, upvotes, downvotes, created_at
+ `).bind(
+ id, input.videoId, videoHash, startMs, endMs,
+ input.duration == null ? null : Math.round(input.duration * 1000),
+ input.category, identity, input.clientRequestId, now, now,
+ ).first();
+ if (!inserted) throw new Error('segment_insert_returned_no_row');
+ if (inserted.id !== id) {
+ return json({ segment: segmentJson(inserted, true), duplicate: true, idempotent: true });
+ }
+ return json({ segment: segmentJson(inserted, true), duplicate: false, idempotent: false }, 201);
}
async function vote(request: Request, env: Env, segmentId: string): Promise {
@@ -262,11 +287,11 @@ export default {
if (request.method === 'OPTIONS') return new Response(null, { status: 204, headers: CORS });
const url = new URL(request.url), path = url.pathname;
try {
- if (request.method === 'GET' && path === '/health') return json({ ok: true, service: 'douyin-ad-skipper-api', version: 2 });
+ if (request.method === 'GET' && path === '/health') return json({ ok: true, service: 'douyin-ad-skipper-api', version: 3 });
const videoMatch = path.match(/^\/v1\/videos\/(\d+)\/segments$/);
if (request.method === 'GET' && videoMatch) return getSegments(videoMatch[1], env);
const videoHashMatch = path.match(/^\/v1\/videos\/by-hash\/([0-9a-f]{64})\/segments$/i);
- if (request.method === 'GET' && videoHashMatch) return getSegmentsByHash(videoHashMatch[1], env);
+ if (request.method === 'GET' && videoHashMatch) return getSegmentsByHash(request, videoHashMatch[1], env);
if (request.method === 'GET' && path === '/v1/me/segments') return getMySegments(request, env);
if (request.method === 'POST' && path === '/v1/segments') return submitSegment(request, env);
const voteMatch = path.match(/^\/v1\/segments\/([0-9a-f-]+)\/votes$/i);
diff --git a/server/tests/validation.test.ts b/server/tests/validation.test.ts
index 91a64b7..a14cff8 100644
--- a/server/tests/validation.test.ts
+++ b/server/tests/validation.test.ts
@@ -1,6 +1,7 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { parseSegmentInput, statusFromVotes } from '../src/validation.ts';
+import { segmentJson } from '../src/index.ts';
test('accepts a valid sponsor segment', () => {
const parsed = parseSegmentInput({ videoId:'7669344658548047311', start:10.2, end:25.4, duration:60, category:'sponsor', clientRequestId:'123e4567-e89b-12d3-a456-426614174000' });
@@ -19,6 +20,19 @@ test('rejects invalid ranges and oversized segments', () => {
assert.equal(parseSegmentInput({ videoId:'7669344658548047311', start:0, end:601, clientRequestId:'123e4567-e89b-12d3-a456-426614174000' }), null);
});
+test('requires a valid idempotency key', () => {
+ const base={videoId:'7669344658548047311',start:10,end:20,category:'sponsor'};
+ assert.equal(parseSegmentInput(base), null);
+ assert.equal(parseSegmentInput({...base,clientRequestId:'too-short'}), null);
+});
+
+test('exposes ownership without leaking the submitter hash', () => {
+ const segment=segmentJson({id:'segment-id',video_id:'7669344658548047311',start_ms:1000,end_ms:2000,category:'sponsor',status:'trusted',upvotes:0,downvotes:0,created_at:'2026-08-15T00:00:00Z'},true);
+ assert.ok('ownedByMe' in segment);
+ assert.equal(segment.ownedByMe,true);
+ assert.equal('submitter_hash' in segment,false);
+});
+
test('trusts submissions immediately and disputes bad segments', () => {
assert.equal(statusFromVotes(0,0), 'trusted');
assert.equal(statusFromVotes(1,0), 'trusted');