mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2025-12-06 02:30:47 -08:00
Feat/watch fs (#649)
* Add watch-filesystem-adaptor plugin and worker IPC Introduces the watch-filesystem-adaptor TiddlyWiki plugin, enabling tag-based routing of tiddlers to sub-wikis by querying workspace info via worker thread IPC. Adds workerServiceCaller utility for worker-to-main service calls, updates workerAdapter and bindServiceAndProxy to support explicit service registration for workers, and documents the new IPC architecture. Updates wikiWorker and startNodeJSWiki to preload workspace ID and load the new plugin. Also updates the plugin build script to compile and copy the new plugin. * test: wiki operation steps * Add per-wiki labeled logging and console hijack Introduces labeled loggers for each wiki, writing logs to separate files. Adds a logFor method to NativeService for logging with labels, updates interfaces, and hijacks worker thread console methods to redirect logs to main process for wiki-specific logging. Refactors workspaceID usage to workspace object for improved context. * Update log handling for wiki worker and tests Enhanced logging tests to check all log files, including wiki logs. Adjusted logger to write wiki worker logs to the main log directory. Updated e2e app script comment for correct usage. * Enable worker thread access to main process services Introduces a proxy system allowing worker threads to call main process services with full type safety and observable support. Adds worker-side service proxy creation, auto-attaches proxies to global.service, and updates service registration to use IPC descriptors. Documentation is added for usage and architecture. * Update ErrorDuringStart.md * chore: upgrade ipc cat and allow clean vite cache * Refactor wiki worker initialization and service readiness Moved wiki worker implementation from wikiWorker.ts to wikiWorker/index.ts and deleted the old file. Added servicesReady.ts to manage worker service readiness and callbacks, and integrated notifyServicesReady into the worker lifecycle. Updated console hijack logic to wait for service readiness before hijacking. Improved worker management in Wiki service to support detaching workers and notifying readiness. * Refactor wiki logging to use centralized logger Removed per-wiki loggers and console hijacking in favor of a single labeled logger. All wiki logs, including errors, are now written to a unified log file. Updated worker and service code to route logs through the main logger and removed obsolete log file naming and management logic. * fix: ipc cat log error * Refactor wiki test paths and improve file save logic Updated test step to use wikiTestRootPath for directory replacements and added wikiTestRootPath to paths.ts for clarity. Improved error handling and directory logic in watch-filesystem-adaptor.ts, including saving tiddlers directly to sub-wiki folders, more informative logging, and ensuring cleanup after file writes is properly awaited. * rename * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * feat: basic watch-fs * feat: check file not exist * refactor: use exponential-backoff * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * Initial commit when init a new git. * fix: cleanup * Refactor test setup and cleanup to separate file Moved Before and After hooks from application.ts to a new cleanup.ts file for better organization and separation of concerns. Also removed unused imports and related code from application.ts. Minor type simplification in agent.ts for row parsing. * test: modify and rename * feat: enableFileSystemWatch * refactor: unused utils.ts * Update watch-filesystem-adaptor.ts * refactor: use node-sentinel-file-watcher * refactor: extract to two classes * The logFor method lacks JSDoc describing the level parameter's * Update startNodeJSWiki.ts * fix: napi build * Update electron-rebuild command in workflows Changed the electron-rebuild command in release and test GitHub Actions workflows to use a comma-separated list for native modules instead of multiple -w flags. This simplifies the rebuild step for better-sqlite3 and nsfw modules. * lint * not build nsfw, try use prebuild * Update package.json * Update workerAdapter.ts * remove subWikiPlugin.ts as we use new filesystem adaptor that supports tag based sub wiki * fix: build * fix: wrong type * lint * remove `act(...)` warnings * uninstall chokidar * refactor and test * lint * remove unused logic, as we already use ipc syncadaptor, not afriad of wiki status change * Update translation.json * test: increast timeout in CI * Update application.ts * fix: AI's wrong cleanup logic hidden by as unknown as * fix: AI's wrong as unknown as * Update agent.feature * Update wikiSearchPlugin.ts * fix: A dynamic import callback was not specified.
This commit is contained in:
lin onetwo
GitHub
parent
ea78df0ab3
commit
9a6f3480f5
81 changed files with 5008 additions and 991 deletions
|
|
@ -1,10 +1,14 @@
|
|||
import { Then } from '@cucumber/cucumber';
|
||||
import { getDOMContent, getTextContent, isLoaded } from '../supports/webContentsViewHelper';
|
||||
import { Then, When } from '@cucumber/cucumber';
|
||||
import { backOff } from 'exponential-backoff';
|
||||
import { clickElement, clickElementWithText, elementExists, getDOMContent, getTextContent, isLoaded, pressKey, typeText } from '../supports/webContentsViewHelper';
|
||||
import type { ApplicationWorld } from './application';
|
||||
|
||||
// Constants for retry logic
|
||||
const MAX_ATTEMPTS = 3;
|
||||
const RETRY_INTERVAL_MS = 500;
|
||||
// Backoff configuration for retries
|
||||
const BACKOFF_OPTIONS = {
|
||||
numOfAttempts: 8,
|
||||
startingDelay: 100,
|
||||
timeMultiple: 2,
|
||||
};
|
||||
|
||||
Then('I should see {string} in the browser view content', async function(this: ApplicationWorld, expectedText: string) {
|
||||
if (!this.app) {
|
||||
|
|
@ -15,29 +19,20 @@ Then('I should see {string} in the browser view content', async function(this: A
|
|||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
// Retry logic to check for expected text in content
|
||||
const maxAttempts = MAX_ATTEMPTS;
|
||||
const retryInterval = RETRY_INTERVAL_MS;
|
||||
|
||||
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
||||
const content = await getTextContent(this.app);
|
||||
if (content && content.includes(expectedText)) {
|
||||
return; // Success, exit early
|
||||
}
|
||||
|
||||
// Wait before retrying (except for the last attempt)
|
||||
if (attempt < maxAttempts - 1) {
|
||||
await new Promise(resolve => setTimeout(resolve, retryInterval));
|
||||
}
|
||||
}
|
||||
|
||||
// Final attempt to get content for error message
|
||||
const finalContent = await getTextContent(this.app);
|
||||
throw new Error(
|
||||
`Expected text "${expectedText}" not found in browser view content after ${MAX_ATTEMPTS} attempts. Actual content: ${
|
||||
finalContent ? finalContent.substring(0, 200) + '...' : 'null'
|
||||
}`,
|
||||
);
|
||||
await backOff(
|
||||
async () => {
|
||||
const content = await getTextContent(this.app!);
|
||||
if (!content || !content.includes(expectedText)) {
|
||||
throw new Error(`Expected text "${expectedText}" not found`);
|
||||
}
|
||||
},
|
||||
BACKOFF_OPTIONS,
|
||||
).catch(async () => {
|
||||
const finalContent = await getTextContent(this.app!);
|
||||
throw new Error(
|
||||
`Expected text "${expectedText}" not found in browser view content. Actual content: ${finalContent ? finalContent.substring(0, 200) + '...' : 'null'}`,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
Then('I should see {string} in the browser view DOM', async function(this: ApplicationWorld, expectedText: string) {
|
||||
|
|
@ -49,29 +44,20 @@ Then('I should see {string} in the browser view DOM', async function(this: Appli
|
|||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
// Retry logic to check for expected text in DOM
|
||||
const maxAttempts = MAX_ATTEMPTS;
|
||||
const retryInterval = RETRY_INTERVAL_MS;
|
||||
|
||||
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
||||
const domContent = await getDOMContent(this.app);
|
||||
if (domContent && domContent.includes(expectedText)) {
|
||||
return; // Success, exit early
|
||||
}
|
||||
|
||||
// Wait before retrying (except for the last attempt)
|
||||
if (attempt < maxAttempts - 1) {
|
||||
await new Promise(resolve => setTimeout(resolve, retryInterval));
|
||||
}
|
||||
}
|
||||
|
||||
// Final attempt to get DOM content for error message
|
||||
const finalDomContent = await getDOMContent(this.app);
|
||||
throw new Error(
|
||||
`Expected text "${expectedText}" not found in browser view DOM after ${MAX_ATTEMPTS} attempts. Actual DOM: ${
|
||||
finalDomContent ? finalDomContent.substring(0, 200) + '...' : 'null'
|
||||
}`,
|
||||
);
|
||||
await backOff(
|
||||
async () => {
|
||||
const domContent = await getDOMContent(this.app!);
|
||||
if (!domContent || !domContent.includes(expectedText)) {
|
||||
throw new Error(`Expected text "${expectedText}" not found in DOM`);
|
||||
}
|
||||
},
|
||||
BACKOFF_OPTIONS,
|
||||
).catch(async () => {
|
||||
const finalDomContent = await getDOMContent(this.app!);
|
||||
throw new Error(
|
||||
`Expected text "${expectedText}" not found in browser view DOM. Actual DOM: ${finalDomContent ? finalDomContent.substring(0, 200) + '...' : 'null'}`,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
Then('the browser view should be loaded and visible', async function(this: ApplicationWorld) {
|
||||
|
|
@ -83,21 +69,125 @@ Then('the browser view should be loaded and visible', async function(this: Appli
|
|||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
// Retry logic to check if browser view is loaded
|
||||
const maxAttempts = MAX_ATTEMPTS;
|
||||
const retryInterval = RETRY_INTERVAL_MS;
|
||||
await backOff(
|
||||
async () => {
|
||||
const isLoadedResult = await isLoaded(this.app!);
|
||||
if (!isLoadedResult) {
|
||||
throw new Error('Browser view not loaded');
|
||||
}
|
||||
},
|
||||
BACKOFF_OPTIONS,
|
||||
).catch(() => {
|
||||
throw new Error('Browser view is not loaded or visible after multiple attempts');
|
||||
});
|
||||
});
|
||||
|
||||
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
||||
const isLoadedResult = await isLoaded(this.app);
|
||||
if (isLoadedResult) {
|
||||
return; // Success, exit early
|
||||
}
|
||||
|
||||
// Wait before retrying (except for the last attempt)
|
||||
if (attempt < maxAttempts - 1) {
|
||||
await new Promise(resolve => setTimeout(resolve, retryInterval));
|
||||
}
|
||||
When('I click on {string} element in browser view with selector {string}', async function(this: ApplicationWorld, elementComment: string, selector: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
throw new Error(`Browser view is not loaded or visible after ${MAX_ATTEMPTS} attempts`);
|
||||
try {
|
||||
// Check if selector contains :has-text() pseudo-selector
|
||||
const hasTextMatch = selector.match(/^(.+):has-text\(['"](.+)['"]\)$/);
|
||||
|
||||
if (hasTextMatch) {
|
||||
// Extract base selector and text content
|
||||
const baseSelector = hasTextMatch[1];
|
||||
const textContent = hasTextMatch[2];
|
||||
await clickElementWithText(this.app, baseSelector, textContent);
|
||||
} else {
|
||||
// Use regular selector
|
||||
await clickElement(this.app, selector);
|
||||
}
|
||||
} catch (error) {
|
||||
throw new Error(`Failed to click ${elementComment} element with selector "${selector}" in browser view: ${error as Error}`);
|
||||
}
|
||||
});
|
||||
|
||||
When('I type {string} in {string} element in browser view with selector {string}', async function(this: ApplicationWorld, text: string, elementComment: string, selector: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
try {
|
||||
await typeText(this.app, selector, text);
|
||||
} catch (error) {
|
||||
throw new Error(`Failed to type in ${elementComment} element with selector "${selector}" in browser view: ${error as Error}`);
|
||||
}
|
||||
});
|
||||
|
||||
When('I press {string} in browser view', async function(this: ApplicationWorld, key: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
try {
|
||||
await pressKey(this.app, key);
|
||||
} catch (error) {
|
||||
throw new Error(`Failed to press key "${key}" in browser view: ${error as Error}`);
|
||||
}
|
||||
});
|
||||
|
||||
Then('I should not see {string} in the browser view content', async function(this: ApplicationWorld, unexpectedText: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
if (!this.currentWindow) {
|
||||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
// Wait a bit for UI to update
|
||||
await new Promise(resolve => setTimeout(resolve, 500));
|
||||
|
||||
// Check that text does not exist in content
|
||||
const content = await getTextContent(this.app);
|
||||
if (content && content.includes(unexpectedText)) {
|
||||
throw new Error(`Unexpected text "${unexpectedText}" found in browser view content`);
|
||||
}
|
||||
});
|
||||
|
||||
Then('I should not see a(n) {string} element in browser view with selector {string}', async function(this: ApplicationWorld, elementComment: string, selector: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
if (!this.currentWindow) {
|
||||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
await backOff(
|
||||
async () => {
|
||||
const exists: boolean = await elementExists(this.app!, selector);
|
||||
if (exists) {
|
||||
throw new Error('Element still exists');
|
||||
}
|
||||
},
|
||||
BACKOFF_OPTIONS,
|
||||
).catch(() => {
|
||||
throw new Error(`Element "${elementComment}" with selector "${selector}" was found in browser view after multiple attempts, but should not be visible`);
|
||||
});
|
||||
});
|
||||
|
||||
Then('I should see a(n) {string} element in browser view with selector {string}', async function(this: ApplicationWorld, elementComment: string, selector: string) {
|
||||
if (!this.app) {
|
||||
throw new Error('Application not launched');
|
||||
}
|
||||
|
||||
if (!this.currentWindow) {
|
||||
throw new Error('No current window available');
|
||||
}
|
||||
|
||||
await backOff(
|
||||
async () => {
|
||||
const exists: boolean = await elementExists(this.app!, selector);
|
||||
if (!exists) {
|
||||
throw new Error('Element does not exist yet');
|
||||
}
|
||||
},
|
||||
BACKOFF_OPTIONS,
|
||||
).catch(() => {
|
||||
throw new Error(`Element "${elementComment}" with selector "${selector}" not found in browser view after multiple attempts`);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue