feat: Initial clean release of CHM
一些检查失败了
automerge / automerge (push) Has been cancelled
react-native-android-build-apk / AssembleRelease (push) Has been cancelled
Build macOS M1 / Main (push) Has been cancelled
Joplin Continuous Integration / Main (macos-15-intel) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-11-vs2026-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-2025) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04-arm) (push) Has been cancelled
Joplin UI tests / Main (ubuntu-22.04) (push) Has been cancelled
Joplin UI tests / Main (windows-2025) (push) Has been cancelled
Joplin UI tests / Mobile (push) Has been cancelled
Close stale issues / ProcessStaleIssues (push) Has been cancelled
一些检查失败了
automerge / automerge (push) Has been cancelled
react-native-android-build-apk / AssembleRelease (push) Has been cancelled
Build macOS M1 / Main (push) Has been cancelled
Joplin Continuous Integration / Main (macos-15-intel) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-11-vs2026-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-2025) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04-arm) (push) Has been cancelled
Joplin UI tests / Main (ubuntu-22.04) (push) Has been cancelled
Joplin UI tests / Main (windows-2025) (push) Has been cancelled
Joplin UI tests / Mobile (push) Has been cancelled
Close stale issues / ProcessStaleIssues (push) Has been cancelled
这个提交包含在:
@@ -0,0 +1,352 @@
|
||||
import time from '../time';
|
||||
import NoteResource from '../models/NoteResource';
|
||||
import ResourceService from '../services/ResourceService';
|
||||
import shim from '../shim';
|
||||
import { resourceService, decryptionWorker, supportDir, encryptionService, loadEncryptionMasterKey, allSyncTargetItemsEncrypted, setupDatabaseAndSynchronizer, db, synchronizer, switchClient } from '../testing/test-utils';
|
||||
import Folder from '../models/Folder';
|
||||
import Note from '../models/Note';
|
||||
import Resource from '../models/Resource';
|
||||
import SearchEngine from './search/SearchEngine';
|
||||
import { loadMasterKeysFromSettings, setupAndEnableEncryption } from './e2ee/utils';
|
||||
import Setting from '../models/Setting';
|
||||
|
||||
describe('services/ResourceService', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await setupDatabaseAndSynchronizer(1);
|
||||
await setupDatabaseAndSynchronizer(2);
|
||||
await switchClient(1);
|
||||
});
|
||||
|
||||
it('should delete orphaned resources', (async () => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
note1 = await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`);
|
||||
const resource1 = (await Resource.all())[0];
|
||||
const resourcePath = Resource.fullPath(resource1);
|
||||
|
||||
await service.indexNoteResources();
|
||||
await service.deleteOrphanResources(0);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(true);
|
||||
|
||||
await Note.delete(note1.id);
|
||||
await service.deleteOrphanResources(0);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(true);
|
||||
|
||||
await service.indexNoteResources();
|
||||
await service.deleteOrphanResources(1000 * 60);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(true);
|
||||
|
||||
await service.deleteOrphanResources(0);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(false);
|
||||
expect(await shim.fsDriver().exists(resourcePath)).toBe(false);
|
||||
expect(!(await NoteResource.all()).length).toBe(true);
|
||||
}));
|
||||
|
||||
it.each([
|
||||
{
|
||||
linkStyle: 'image 1',
|
||||
markupTag: (id: string) => ``,
|
||||
},
|
||||
{
|
||||
linkStyle: 'image 2',
|
||||
markupTag: (id: string) => `![image][image]\n\n[image]: :/${id}`,
|
||||
},
|
||||
{
|
||||
linkStyle: 'html link',
|
||||
markupTag: (id: string) => `<a href=":/${id}">test</a>`,
|
||||
},
|
||||
])('should not delete resource if still associated with at least one note (link style: $linkStyle)', (async ({ markupTag }) => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
const note2 = await Note.save({ title: 'ma deuxième note', parent_id: folder1.id });
|
||||
note1 = await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`);
|
||||
const resource1 = (await Resource.all())[0];
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
await Note.delete(note1.id);
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
await Note.save({ id: note2.id, body: markupTag(resource1.id) });
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
await service.deleteOrphanResources(0);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(true);
|
||||
}));
|
||||
|
||||
// This is now handled below by more correct tests
|
||||
//
|
||||
// it('should not delete a resource that has never been associated with any note, because it probably means the resource came via sync, and associated note has not arrived yet', (async () => {
|
||||
// const service = new ResourceService();
|
||||
// await shim.createResourceFromPath(`${supportDir}/photo.jpg`);
|
||||
|
||||
// await service.indexNoteResources();
|
||||
// await service.deleteOrphanResources(0);
|
||||
|
||||
// expect((await Resource.all()).length).toBe(1);
|
||||
// }));
|
||||
|
||||
it('should not delete resource if it is used in an IMG tag', (async () => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
note1 = await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`);
|
||||
const resource1 = (await Resource.all())[0];
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
await Note.save({ id: note1.id, body: `This is HTML: <img src=":/${resource1.id}"/>` });
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
await service.deleteOrphanResources(0);
|
||||
|
||||
expect(!!(await Resource.load(resource1.id))).toBe(true);
|
||||
}));
|
||||
|
||||
it('should not process twice the same change', (async () => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`);
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
const before = (await NoteResource.all())[0];
|
||||
|
||||
await time.sleep(0.1);
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
const after = (await NoteResource.all())[0];
|
||||
|
||||
expect(before.last_seen_time).toBe(after.last_seen_time);
|
||||
}));
|
||||
|
||||
it('should index locked note resources when note lock is disabled', (async () => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
const resource1 = await shim.createResourceFromPath(`${supportDir}/photo.jpg`);
|
||||
const resource2 = await shim.createResourceFromPath(`${supportDir}/welcome.pdf`);
|
||||
const note1 = await Note.save({
|
||||
title: 'locked note',
|
||||
parent_id: folder1.id,
|
||||
body: `encrypted body [](:/${resource2.id})`,
|
||||
is_locked: 1,
|
||||
extracted_resource_ids: ` ${resource1.id},not-a-resource-id,${folder1.id},${resource1.id} `,
|
||||
});
|
||||
|
||||
Setting.setValue('featureFlag.noteLock', false);
|
||||
await service.indexNoteResources();
|
||||
|
||||
expect(await NoteResource.associatedNoteIds(resource1.id)).toEqual([note1.id]);
|
||||
expect(await NoteResource.associatedNoteIds(resource2.id)).toEqual([]);
|
||||
expect(await NoteResource.associatedNoteIds('not-a-resource-id')).toEqual([]);
|
||||
expect(await NoteResource.associatedNoteIds(folder1.id)).toEqual([]);
|
||||
|
||||
await Note.save({
|
||||
id: note1.id,
|
||||
body: 'modified encrypted body',
|
||||
});
|
||||
await service.indexNoteResources();
|
||||
|
||||
expect(await NoteResource.associatedNoteIds(resource1.id)).toEqual([note1.id]);
|
||||
|
||||
await Note.save({
|
||||
id: note1.id,
|
||||
body: 'encrypted body',
|
||||
is_locked: 1,
|
||||
extracted_resource_ids: '',
|
||||
});
|
||||
await service.indexNoteResources();
|
||||
|
||||
expect(await NoteResource.associatedNoteIds(resource1.id)).toEqual([]);
|
||||
}));
|
||||
|
||||
it('should continue indexing after a locked encrypted note', (async () => {
|
||||
const service = new ResourceService();
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
const lockedResource = await shim.createResourceFromPath(`${supportDir}/photo.jpg`);
|
||||
const normalResource = await shim.createResourceFromPath(`${supportDir}/welcome.pdf`);
|
||||
const lockedNote = await Note.save({
|
||||
title: 'locked note',
|
||||
parent_id: folder1.id,
|
||||
body: 'encrypted body',
|
||||
encryption_applied: 1,
|
||||
is_locked: 1,
|
||||
extracted_resource_ids: lockedResource.id,
|
||||
});
|
||||
const normalNote = await Note.save({
|
||||
title: 'normal note',
|
||||
parent_id: folder1.id,
|
||||
body: `[](:/${normalResource.id})`,
|
||||
});
|
||||
|
||||
await service.indexNoteResources();
|
||||
|
||||
expect(await NoteResource.associatedNoteIds(lockedResource.id)).toEqual([lockedNote.id]);
|
||||
expect(await NoteResource.associatedNoteIds(normalResource.id)).toEqual([normalNote.id]);
|
||||
}));
|
||||
|
||||
it('should index locked note resources after sync', (async () => {
|
||||
const resource = await shim.createResourceFromPath(`${supportDir}/photo.jpg`);
|
||||
const note = await Note.save({
|
||||
title: 'locked note',
|
||||
body: 'encrypted body',
|
||||
is_locked: 1,
|
||||
extracted_resource_ids: resource.id,
|
||||
});
|
||||
await synchronizer().start();
|
||||
|
||||
await switchClient(2);
|
||||
await synchronizer().start();
|
||||
await resourceService().indexNoteResources();
|
||||
|
||||
expect(await NoteResource.associatedNoteIds(resource.id)).toEqual([note.id]);
|
||||
}));
|
||||
|
||||
it('should not delete resources that are associated with an encrypted note', (async () => {
|
||||
// https://github.com/laurent22/joplin/issues/1433
|
||||
//
|
||||
// Client 1 and client 2 have E2EE setup.
|
||||
//
|
||||
// - Client 1 creates note N1 and add resource R1 to it
|
||||
// - Client 1 syncs
|
||||
// - Client 2 syncs and get N1
|
||||
// - Client 2 add resource R2 to N1
|
||||
// - Client 2 syncs
|
||||
// - Client 1 syncs
|
||||
// - Client 1 runs resource indexer - but because N1 hasn't been decrypted yet, it found that R1 is no longer associated with any note
|
||||
// - Client 1 decrypts notes, but too late
|
||||
//
|
||||
// Eventually R1 is deleted because service thinks that it was at some point associated with a note, but no longer.
|
||||
|
||||
const masterKey = await loadEncryptionMasterKey();
|
||||
await setupAndEnableEncryption(encryptionService(), masterKey, '123456');
|
||||
await loadMasterKeysFromSettings(encryptionService());
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`); // R1
|
||||
await resourceService().indexNoteResources();
|
||||
await synchronizer().start();
|
||||
expect(await allSyncTargetItemsEncrypted()).toBe(true);
|
||||
|
||||
await switchClient(2);
|
||||
|
||||
await synchronizer().start();
|
||||
await setupAndEnableEncryption(encryptionService(), masterKey, '123456');
|
||||
await loadMasterKeysFromSettings(encryptionService());
|
||||
await decryptionWorker().start();
|
||||
{
|
||||
const n1 = await Note.load(note1.id);
|
||||
await shim.attachFileToNote(n1, `${supportDir}/photo.jpg`); // R2
|
||||
}
|
||||
await synchronizer().start();
|
||||
|
||||
await switchClient(1);
|
||||
|
||||
await synchronizer().start();
|
||||
await resourceService().indexNoteResources();
|
||||
await resourceService().deleteOrphanResources(0); // Previously, R1 would be deleted here because it's not indexed
|
||||
expect((await Resource.all()).length).toBe(2);
|
||||
}));
|
||||
|
||||
it('should double-check if the resource is still linked before deleting it', (async () => {
|
||||
SearchEngine.instance().setDb(db()); // /!\ Note that we use the global search engine here, which we shouldn't but will work for now
|
||||
|
||||
const folder1 = await Folder.save({ title: 'folder1' });
|
||||
let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
|
||||
note1 = await shim.attachFileToNote(note1, `${supportDir}/photo.jpg`);
|
||||
await resourceService().indexNoteResources();
|
||||
const bodyWithResource = note1.body;
|
||||
await Note.save({ id: note1.id, body: '' });
|
||||
await resourceService().indexNoteResources();
|
||||
await Note.save({ id: note1.id, body: bodyWithResource });
|
||||
await SearchEngine.instance().syncTables();
|
||||
await resourceService().deleteOrphanResources(0);
|
||||
|
||||
expect((await Resource.all()).length).toBe(1); // It should not have deleted the resource
|
||||
const nr = (await NoteResource.all())[0];
|
||||
expect(!!nr.is_associated).toBe(true); // And it should have fixed the situation by re-indexing the note content
|
||||
}));
|
||||
|
||||
it('should delete a resource if it is not associated with any note and has never been synced', (async () => {
|
||||
// - User creates a note and attaches a resource
|
||||
// - User deletes the note
|
||||
// - NoteResource service runs - the resource can be deleted
|
||||
//
|
||||
// This is because, since the resource didn't come via sync, it's
|
||||
// guaranteed that it is orphaned, which means it can be safely deleted.
|
||||
// See related test below to handle case where the resource actually
|
||||
// comes via sync.
|
||||
|
||||
const note = await Note.save({});
|
||||
await shim.attachFileToNote(note, `${supportDir}/photo.jpg`);
|
||||
await Note.delete(note.id);
|
||||
const resource = (await Resource.all())[0];
|
||||
|
||||
await resourceService().indexNoteResources();
|
||||
await resourceService().deleteOrphanResources(-10);
|
||||
|
||||
expect(await Resource.load(resource.id)).toBeFalsy();
|
||||
}));
|
||||
|
||||
it('should NOT delete a resource if it arrived via synced, even if it is not associated with any note', (async () => {
|
||||
// - C1 creates Resource 1
|
||||
// - C1 sync
|
||||
// - C2 sync
|
||||
// - NoteResource service runs - should find an orphan resource, but not
|
||||
// delete it because the associated note might come later from U1.
|
||||
//
|
||||
// At this point, C1 has the knowledge about Resource 1 so whether it's
|
||||
// eventually deleted or not will come from there. If it's an orphaned
|
||||
// resource, it will be deleted on C1 first, then the deletion will be
|
||||
// synced to other clients.
|
||||
|
||||
const note = await Note.save({});
|
||||
await shim.attachFileToNote(note, `${supportDir}/photo.jpg`);
|
||||
await Note.delete(note.id);
|
||||
const resource = (await Resource.all())[0];
|
||||
await synchronizer().start();
|
||||
|
||||
await switchClient(2);
|
||||
|
||||
await synchronizer().start();
|
||||
await resourceService().indexNoteResources();
|
||||
await resourceService().deleteOrphanResources(0);
|
||||
expect(await Resource.load(resource.id)).toBeTruthy();
|
||||
}));
|
||||
|
||||
it('should still create associations for notes in the trash', async () => {
|
||||
const note = await Note.save({});
|
||||
await shim.attachFileToNote(note, `${supportDir}/photo.jpg`);
|
||||
await Note.delete(note.id, { toTrash: true });
|
||||
await resourceService().indexNoteResources();
|
||||
|
||||
// Check that the association is made despite the note being deleted
|
||||
const noteResources = await NoteResource.all();
|
||||
expect(noteResources.length).toBe(1);
|
||||
expect(noteResources[0].note_id).toBe(note.id);
|
||||
|
||||
// Also check that the resources are not deleted as orphan
|
||||
await resourceService().deleteOrphanResources(0);
|
||||
expect((await NoteResource.all()).length).toBe(1);
|
||||
});
|
||||
|
||||
});
|
||||
在新工单中引用
屏蔽一个用户