Kieran/snort
5
14
Fork 14
Code Issues 37 Pull Requests 1 Packages Projects Releases 24 Wiki Activity

fix: main branch
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Kieran 2024-03-07 13:42:29 +00:00
parent 782feedae4
commit dbf2346176
6 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/package.json
View File

@ -119,7 +119,7 @@
"tailwindcss": "^3.3.3", "tailwindcss": "^3.3.3",
"tinybench": "^2.5.1", "tinybench": "^2.5.1",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"vite": "^5.0.12", "vite": "^5.1.5",
"vite-plugin-pwa": "^0.17.0", "vite-plugin-pwa": "^0.17.0",
"vite-plugin-version-mark": "^0.0.10", "vite-plugin-version-mark": "^0.0.10",
"vitest": "^0.34.6" "vitest": "^0.34.6"

6
packages/app/src/Cache/index.ts
View File

@ -1,14 +1,16 @@
import { RelayMetricCache, UserRelaysCache } from "@snort/system"; import { RelayMetricCache, UserRelaysCache } from "@snort/system";
import { SnortSystemDb } from "@snort/system-web"; import { SnortSystemDb } from "@snort/system-web";
import { WorkerRelayInterface } from "@snort/worker-relay"; import { WorkerRelayInterface } from "@snort/worker-relay";
import WorkerRelayPath from "@snort/worker-relay/dist/worker?worker&url"; import WorkerVite from "@snort/worker-relay/src/worker?worker";
import { EventCacheWorker } from "./EventCacheWorker"; import { EventCacheWorker } from "./EventCacheWorker";
import { GiftWrapCache } from "./GiftWrapCache"; import { GiftWrapCache } from "./GiftWrapCache";
import { ProfileCacheRelayWorker } from "./ProfileWorkerCache"; import { ProfileCacheRelayWorker } from "./ProfileWorkerCache";
import { UserFollowsWorker } from "./UserFollowsWorker"; import { UserFollowsWorker } from "./UserFollowsWorker";
export const Relay = new WorkerRelayInterface(WorkerRelayPath); export const Relay = new WorkerRelayInterface(
import.meta.env.DEV ? new URL("@snort/worker-relay/dist/esm/worker.mjs", import.meta.url) : new WorkerVite()
);
export async function initRelayWorker() { export async function initRelayWorker() {
try { try {
await Relay.init("relay.db"); await Relay.init("relay.db");

10
packages/app/vite.config.ts
View File

@ -55,19 +55,11 @@ export default defineConfig({
"Cross-Origin-Embedder-Policy": "require-corp", "Cross-Origin-Embedder-Policy": "require-corp",
}, },
}, },
optimizeDeps: {
exclude: ["@sqlite.org/sqlite-wasm"],
},
define: { define: {
CONFIG: JSON.stringify(appConfig), CONFIG: JSON.stringify(appConfig),
global: {}, // needed for custom-event lib global: {}, // needed for custom-event lib
}, },
worker: { worker: {
format: "es", format: "es"
rollupOptions: {
output: {
format: "module"
}
}
}, },
}); });

10
packages/worker-relay/src/custom.d.ts vendored
View File

@ -1,4 +1,8 @@
declare module "*.wasm" { declare module "*.wasm" {
const value: string; const value: string;
export default value; export default value;
} }
declare module "*.wasm?url" {
const value: string;
export default value;
}

2
packages/worker-relay/src/sqlite-relay.ts
View File

@ -5,7 +5,7 @@ import migrate from "./migrations";
import { debugLog } from "./debug"; import { debugLog } from "./debug";
// import wasm file directly, this needs to be copied from https://sqlite.org/download.html // import wasm file directly, this needs to be copied from https://sqlite.org/download.html
import SqlitePath from "./sqlite3.wasm"; import SqlitePath from "./sqlite3.wasm?url";
export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements RelayHandler { export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements RelayHandler {
#sqlite?: Sqlite3Static; #sqlite?: Sqlite3Static;

20
yarn.lock
View File

@ -3171,7 +3171,7 @@ __metadata:
use-long-press: ^3.2.0 use-long-press: ^3.2.0
use-sync-external-store: ^1.2.0 use-sync-external-store: ^1.2.0
uuid: ^9.0.0 uuid: ^9.0.0
vite: ^5.0.12 vite: ^5.1.5
vite-plugin-pwa: ^0.17.0 vite-plugin-pwa: ^0.17.0
vite-plugin-version-mark: ^0.0.10 vite-plugin-version-mark: ^0.0.10
vitest: ^0.34.6 vitest: ^0.34.6
@ -9854,14 +9854,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"postcss@npm:^8.4.32": "postcss@npm:^8.4.35":
version: 8.4.33 version: 8.4.35
resolution: "postcss@npm:8.4.33" resolution: "postcss@npm:8.4.35"
dependencies: dependencies:
nanoid: ^3.3.7 nanoid: ^3.3.7
picocolors: ^1.0.0 picocolors: ^1.0.0
source-map-js: ^1.0.2 source-map-js: ^1.0.2
checksum: 6f98b2af4b76632a3de20c4f47bf0e984a1ce1a531cf11adcb0b1d63a6cbda0aae4165e578b66c32ca4879038e3eaad386a6be725a8fb4429c78e3c1ab858fe9 checksum: cf3c3124d3912a507603f6d9a49b3783f741075e9aa73eb592a6dd9194f9edab9d20a8875d16d137d4f779fe7b6fbd1f5727e39bfd1c3003724980ee4995e1da
languageName: node languageName: node
linkType: hard linkType: hard
@ -12031,13 +12031,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"vite@npm:^5.0.12": "vite@npm:^5.1.5":
version: 5.0.12 version: 5.1.5
resolution: "vite@npm:5.0.12" resolution: "vite@npm:5.1.5"
dependencies: dependencies:
esbuild: ^0.19.3 esbuild: ^0.19.3
fsevents: ~2.3.3 fsevents: ~2.3.3
postcss: ^8.4.32 postcss: ^8.4.35
rollup: ^4.2.0 rollup: ^4.2.0
peerDependencies: peerDependencies:
"@types/node": ^18.0.0 || >=20.0.0 "@types/node": ^18.0.0 || >=20.0.0
@ -12067,7 +12067,7 @@ __metadata:
optional: true optional: true
bin: bin:
vite: bin/vite.js vite: bin/vite.js
checksum: b97b6f1c204d9091d0973626827a6e9d8e8b1959ebd0877b6f76e7068e1e7adf9ecd3b1cc382cbab9d421e3eeca5e1a95f27f9c1734439b229f5a58ef2052fa4 checksum: 14c079ebe508d55198a3b1ca528d13515c745d7ae279e4864e89110a1661a4cfa880d894c2d7dcf557f6ed3ffc17fa3abea9d9ea4b6f256f0cab99d16a3b385b
languageName: node languageName: node
linkType: hard linkType: hard