Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"typedoc": "^0.28.19",
"typescript": "rc",
"ultracite": "7.8.3",
"vite-plugin-mkcert": "^2.1.0",
"vite-plugin-solid": "^2.11.12",
"vite-plus": "^0.1.24",
"vitest": "npm:@voidzero-dev/vite-plus-test@^0.1.24"
Expand Down
7 changes: 5 additions & 2 deletions apps/server/src/application/services/media-source-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type {
NewMediaSource,
} from "@solid-imager/core/domain/repositories/source-repository";
import { ccipVectorService } from "~/application/services/ccip-vector-service";
import { DrizzleSourceRepository } from "~/infrastructure/repositories/source-repository";
import { logger } from "~/infrastructure/logger";
import { DrizzleSourceRepository } from "~/infrastructure/repositories/source-repository";

/**
* Custom error class for fetch operations.
Expand Down Expand Up @@ -64,7 +64,10 @@ const deleteSourceServer = async (
try {
await ccipVectorService.deleteBySource(mediaSourceId);
} catch (err) {
logger.warn({ err, mediaSourceId }, "Failed to delete CCIP vectors during source deletion");
logger.warn(
{ err, mediaSourceId },
"Failed to delete CCIP vectors during source deletion",
);
}
return source ? [source] : [];
};
Expand Down
14 changes: 9 additions & 5 deletions apps/server/src/infrastructure/ai/rust-ai-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { tmpdir } from "node:os";
import path from "node:path";
import { createClient } from "@solid-imager/client";
import type { IAiClient } from "@solid-imager/core/domain/interfaces/ai-client";
import { asyncPool } from "@solid-imager/core/utils/async-pool";
import {
type CcipDifferenceResponse,
type CcipFeatureResponse,
Expand All @@ -11,6 +10,7 @@ import {
type TaggingResponse,
taggingResponseSchema,
} from "@solid-imager/core/domain/tagging/schemas";
import { asyncPool } from "@solid-imager/core/utils/async-pool";
import type { appRouter } from "~/domain/shared/api-contract";

function createRemoteOrpcClient(remoteUrl: string, timeoutMs: number) {
Expand Down Expand Up @@ -279,10 +279,14 @@ export class RustAiClient implements IAiClient {
return await nativeModule.ccipDistances(feature, candidates);
}
}
const settledResults = await asyncPool(candidates, 50, async (candidate) => {
const result = await this.calculateCcipDifference(feature, candidate);
return result.difference;
});
const settledResults = await asyncPool(
candidates,
50,
async (candidate) => {
const result = await this.calculateCcipDifference(feature, candidate);
return result.difference;
},
);
return settledResults.map((r) => {
if (r.status === "fulfilled") return r.value;
throw r.reason;
Expand Down
17 changes: 13 additions & 4 deletions apps/server/src/infrastructure/jobs/file-watcher-manager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from "node:path";
import chokidar, { type FSWatcher } from "chokidar";
import { logger } from "~/infrastructure/logger";
import { RealtimeEventBus } from "~/infrastructure/events/realtime-event-bus";
import { logger } from "~/infrastructure/logger";

const IGNORE_DOTFILES_REGEX = /(^|[/\\])\../;

Expand All @@ -25,7 +25,10 @@ if (!globalWatchers.__FILE_WATCHERS_CLEANUP_REGISTERED__) {
try {
await entry.watcher.close();
} catch (err) {
logger.error({ err, path: entry.path }, "Failed to close watcher during cleanup");
logger.error(
{ err, path: entry.path },
"Failed to close watcher during cleanup",
);
}
}),
);
Expand Down Expand Up @@ -74,7 +77,10 @@ export const FileWatcherManager = {
watcher.on("unlink", (filePath) => run(callbacks.onDelete, filePath));
watcher.on("change", (filePath) => run(callbacks.onChange, filePath));
watcher.on("error", (error) => {
const isUuid = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(mediaSourceId);
const isUuid =
/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
mediaSourceId,
);
try {
RealtimeEventBus.publishSource(mediaSourceId, "watcher-error", {
mediaSourceId: isUuid ? mediaSourceId : undefined,
Expand All @@ -100,7 +106,10 @@ export const FileWatcherManager = {
try {
await entry.watcher.close();
} catch (err) {
logger.error({ err, mediaSourceId }, "Failed to close watcher in stop method");
logger.error(
{ err, mediaSourceId },
"Failed to close watcher in stop method",
);
}
watchers.delete(mediaSourceId);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,19 @@ vi.mock("~/application/registry", () => ({

// Mock lancedb-dump-service
const mockReadMediaIds = vi.fn();
vi.mock("~/application/services/lancedb-dump-service", async (importOriginal) => {
const actual = await importOriginal<typeof import("~/application/services/lancedb-dump-service")>();
return {
...actual,
readMediaIds: mockReadMediaIds,
};
});
vi.mock(
"~/application/services/lancedb-dump-service",
async (importOriginal) => {
const actual =
await importOriginal<
typeof import("~/application/services/lancedb-dump-service")
>();
return {
...actual,
readMediaIds: mockReadMediaIds,
};
},
);

// Mock backup-service
const mockQueueSourceLanceDBDelta = vi.fn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@ describe("JobWorker", () => {
status: "pending",
} as Job;

processor = vi.fn().mockResolvedValue({ success: true, parentProcessed: true });
processor = vi
.fn()
.mockResolvedValue({ success: true, parentProcessed: true });
worker = new JobWorker(jobRepo, processor);
worker.updateConfig({
jobs: { concurrency: 1, aiConcurrency: 1, pollIntervalMs: 1000 },
Expand Down
Loading