diff --git a/deno.json b/deno.json index 3eae632..aa6c475 100644 --- a/deno.json +++ b/deno.json @@ -24,6 +24,7 @@ "@std/json": "jsr:@std/json@^0.223.0", "@std/media-types": "jsr:@std/media-types@^0.224.0", "@std/streams": "jsr:@std/streams@^0.223.0", + "comlink": "npm:comlink@^4.4.1", "hono": "https://deno.land/x/hono@v3.10.1/mod.ts", "hono/middleware": "https://deno.land/x/hono@v3.10.1/middleware.ts", "kysely": "npm:kysely@^0.27.3", diff --git a/deno.lock b/deno.lock index f984b36..2258654 100644 --- a/deno.lock +++ b/deno.lock @@ -1313,15 +1313,18 @@ "https://deno.land/x/hono@v3.10.1/adapter/deno/serve-static.ts": "ba10cf6aaf39da942b0d49c3b9877ddba69d41d414c6551d890beb1085f58eea", "https://deno.land/x/hono@v3.10.1/client/client.ts": "ff340f58041203879972dd368b011ed130c66914f789826610869a90603406bf", "https://deno.land/x/hono@v3.10.1/client/index.ts": "3ff4cf246f3543f827a85a2c84d66a025ac350ee927613629bda47e854bfb7ba", + "https://deno.land/x/hono@v3.10.1/client/types.ts": "52c66cbe74540e1811259a48c30622ac915666196eb978092d166435cbc15213", "https://deno.land/x/hono@v3.10.1/client/utils.ts": "053273c002963b549d38268a1b423ac8ca211a8028bdab1ed0b781a62aa5e661", "https://deno.land/x/hono@v3.10.1/compose.ts": "e8ab4b345aa367f2dd65f221c9fe829dd885326a613f4215b654f93a4066bb5c", "https://deno.land/x/hono@v3.10.1/context.ts": "261cc8b8b1e8f04b98beab1cca6692f317b7dc6d2b75b4f84c982e54cf1db730", + "https://deno.land/x/hono@v3.10.1/helper/adapter/index.ts": "eea9b4caedbfa3a3b4a020bf46c88c0171a00008cd6c10708cd85a3e39d86e62", "https://deno.land/x/hono@v3.10.1/helper/cookie/index.ts": "55ccd20bbd8d9a8bb2ecd998e90845c1d306c19027f54b3d1b89a5be35968b80", "https://deno.land/x/hono@v3.10.1/helper/html/index.ts": "aba19e8d29f217c7fffa5719cf606c4e259b540d51296e82bbea3c992e2ecbc6", "https://deno.land/x/hono@v3.10.1/hono-base.ts": "cc55e0a4c63a7bdf44df3e804ea4737d5399eeb6606b45d102f8e48c3ff1e925", "https://deno.land/x/hono@v3.10.1/hono.ts": "2cc4c292e541463a4d6f83edbcea58048d203e9564ae62ec430a3d466b49a865", "https://deno.land/x/hono@v3.10.1/http-exception.ts": "6071df078b5f76d279684d52fe82a590f447a64ffe1b75eb5064d0c8a8d2d676", "https://deno.land/x/hono@v3.10.1/jsx/index.ts": "019512d3a9b3897b879e87fa5fb179cd34f3d326f8ff8b93379c2bb707ec168a", + "https://deno.land/x/hono@v3.10.1/jsx/intrinsic-elements.ts": "03250beb610bda1c72017bc0912c2505ff764b7a8d869e7e4add40eb4cfec096", "https://deno.land/x/hono@v3.10.1/jsx/streaming.ts": "5d03b4d02eaa396c8f0f33c3f6e8c7ed3afb7598283c2d4a7ddea0ada8c212a7", "https://deno.land/x/hono@v3.10.1/middleware.ts": "57b2047c4b9d775a052a9c44a3b805802c1d1cb477ab9c4bb6185d27382d1b96", "https://deno.land/x/hono@v3.10.1/middleware/basic-auth/index.ts": "5505288ccf9364f56f7be2dfac841543b72e20656e54ac646a1a73a0aa853261", @@ -1353,6 +1356,7 @@ "https://deno.land/x/hono@v3.10.1/router/trie-router/index.ts": "3eb75e7f71ba81801631b30de6b1f5cefb2c7239c03797e2b2cbab5085911b41", "https://deno.land/x/hono@v3.10.1/router/trie-router/node.ts": "3af15fa9c9994a8664a2b7a7c11233504b5bb9d4fcf7bb34cf30d7199052c39f", "https://deno.land/x/hono@v3.10.1/router/trie-router/router.ts": "54ced78d35676302c8fcdda4204f7bdf5a7cc907fbf9967c75674b1e394f830d", + "https://deno.land/x/hono@v3.10.1/types.ts": "edc414a92383f9deb82f5f7a09e95bcf76f6100c23457c27d041986768f5345c", "https://deno.land/x/hono@v3.10.1/utils/body.ts": "7a16a6656331a96bcae57642f8d5e3912bd361cbbcc2c0d2157ecc3f218f7a92", "https://deno.land/x/hono@v3.10.1/utils/buffer.ts": "9066a973e64498cb262c7e932f47eed525a51677b17f90893862b7279dc0773e", "https://deno.land/x/hono@v3.10.1/utils/cookie.ts": "19920ba6756944aae1ad8585c3ddeaa9df479733f59d05359db096f7361e5e4b", @@ -1360,11 +1364,13 @@ "https://deno.land/x/hono@v3.10.1/utils/encode.ts": "3b7c7d736123b5073542b34321700d4dbf5ff129c138f434bb2144a4d425ee89", "https://deno.land/x/hono@v3.10.1/utils/filepath.ts": "18461b055a914d6da85077f453051b516281bb17cf64fa74bf5ef604dc9d2861", "https://deno.land/x/hono@v3.10.1/utils/html.ts": "01c1520a4256f899da1954357cf63ae11c348eda141a505f72d7090cf5481aba", + "https://deno.land/x/hono@v3.10.1/utils/http-status.ts": "e0c4343ea7717c314dc600131e16b636c29d61cfdaf9df93b267258d1729d1a0", "https://deno.land/x/hono@v3.10.1/utils/jwt/index.ts": "5e4b82a42eb3603351dfce726cd781ca41cb57437395409d227131aec348d2d5", "https://deno.land/x/hono@v3.10.1/utils/jwt/jwt.ts": "02ff7bbf1298ffcc7a40266842f8eac44b6c136453e32d4441e24d0cbfba3a95", "https://deno.land/x/hono@v3.10.1/utils/jwt/types.ts": "58ddf908f76ba18d9c62ddfc2d1e40cc2e306bf987409a6169287efa81ce2546", "https://deno.land/x/hono@v3.10.1/utils/mime.ts": "0105d2b5e8e91f07acc70f5d06b388313995d62af23c802fcfba251f5a744d95", "https://deno.land/x/hono@v3.10.1/utils/stream.ts": "1789dcc73c5b0ede28f83d7d34e47ae432c20e680907cb3275a9c9187f293983", + "https://deno.land/x/hono@v3.10.1/utils/types.ts": "ddff055e6d35066232efdfbd42c8954e855c04279c27dcd735d929b6b4f319b3", "https://deno.land/x/hono@v3.10.1/utils/url.ts": "5fc3307ef3cb2e6f34ec2a03e3d7f2126c6a9f5f0eab677222df3f0e40bd7567", "https://deno.land/x/hono@v3.10.1/validator/index.ts": "6c986e8b91dcf857ecc8164a506ae8eea8665792a4ff7215471df669c632ae7c", "https://deno.land/x/hono@v3.10.1/validator/validator.ts": "afa5e52495e0996fbba61996736fab5c486590d72d376f809e9f9ff4e0c463e9", @@ -1496,6 +1502,7 @@ "jsr:@std/json@^0.223.0", "jsr:@std/media-types@^0.224.0", "jsr:@std/streams@^0.223.0", + "npm:comlink@^4.4.1", "npm:kysely@^0.27.3", "npm:nostr-tools@^2.5.1", "npm:nostr-wasm@^0.1.0", diff --git a/src/deps.ts b/src/deps.ts index 2c84d9e..2111f0f 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -36,7 +36,6 @@ export { S3Client } from 'https://deno.land/x/s3_lite_client@0.6.1/mod.ts'; export { default as IpfsHash } from 'npm:ipfs-only-hash@^4.0.0'; export { default as uuid62 } from 'npm:uuid62@^1.0.2'; export { Machina } from 'https://gitlab.com/soapbox-pub/nostr-machina/-/raw/08a157d39f2741c9a3a4364cb97db36e71d8c03a/mod.ts'; -export * as Comlink from 'npm:comlink@^4.4.1'; export { EventEmitter } from 'npm:tseep@^1.1.3'; export { default as stringifyStable } from 'npm:fast-stable-stringify@^1.0.0'; export { default as Debug } from 'https://gitlab.com/soapbox-pub/stickynotes/-/raw/v0.3.0/debug.ts'; diff --git a/src/workers/fetch.ts b/src/workers/fetch.ts index 510d806..f0bece5 100644 --- a/src/workers/fetch.ts +++ b/src/workers/fetch.ts @@ -1,4 +1,4 @@ -import { Comlink } from '@/deps.ts'; +import * as Comlink from 'comlink'; import './handlers/abortsignal.ts'; diff --git a/src/workers/fetch.worker.ts b/src/workers/fetch.worker.ts index 8e79465..c3b4c72 100644 --- a/src/workers/fetch.worker.ts +++ b/src/workers/fetch.worker.ts @@ -1,4 +1,6 @@ -import { Comlink, Debug } from '@/deps.ts'; +import * as Comlink from 'comlink'; + +import { Debug } from '@/deps.ts'; import './handlers/abortsignal.ts'; diff --git a/src/workers/handlers/abortsignal.ts b/src/workers/handlers/abortsignal.ts index c4c6a3e..14cf9f4 100644 --- a/src/workers/handlers/abortsignal.ts +++ b/src/workers/handlers/abortsignal.ts @@ -1,4 +1,4 @@ -import { Comlink } from '@/deps.ts'; +import * as Comlink from 'comlink'; const signalFinalizers = new FinalizationRegistry((port: MessagePort) => { port.postMessage(null); diff --git a/src/workers/sqlite.ts b/src/workers/sqlite.ts index 1d29d4a..c6f2d2e 100644 --- a/src/workers/sqlite.ts +++ b/src/workers/sqlite.ts @@ -1,6 +1,5 @@ -import type { CompiledQuery, QueryResult } from 'kysely'; - -import { Comlink } from '@/deps.ts'; +import * as Comlink from 'comlink'; +import { CompiledQuery, QueryResult } from 'kysely'; import type { SqliteWorker as _SqliteWorker } from './sqlite.worker.ts'; diff --git a/src/workers/sqlite.worker.ts b/src/workers/sqlite.worker.ts index 4739638..753e7ae 100644 --- a/src/workers/sqlite.worker.ts +++ b/src/workers/sqlite.worker.ts @@ -1,8 +1,9 @@ /// import { ScopedPerformance } from 'https://deno.land/x/scoped_performance@v2.0.0/mod.ts'; +import * as Comlink from 'comlink'; import { CompiledQuery, QueryResult } from 'kysely'; -import { Comlink, DenoSqlite3, Stickynotes } from '@/deps.ts'; +import { DenoSqlite3, Stickynotes } from '@/deps.ts'; import '@/sentry.ts'; let db: DenoSqlite3 | undefined; diff --git a/src/workers/trends.ts b/src/workers/trends.ts index b455283..31db381 100644 --- a/src/workers/trends.ts +++ b/src/workers/trends.ts @@ -1,4 +1,4 @@ -import { Comlink } from '@/deps.ts'; +import * as Comlink from 'comlink'; import type { TrendsWorker as _TrendsWorker } from '@/workers/trends.worker.ts'; diff --git a/src/workers/trends.worker.ts b/src/workers/trends.worker.ts index df06fbb..819883f 100644 --- a/src/workers/trends.worker.ts +++ b/src/workers/trends.worker.ts @@ -1,4 +1,6 @@ -import { Comlink, Sqlite } from '@/deps.ts'; +import * as Comlink from 'comlink'; + +import { Sqlite } from '@/deps.ts'; import { hashtagSchema } from '@/schema.ts'; import { nostrIdSchema } from '@/schemas/nostr.ts'; import { generateDateRange, Time } from '@/utils/time.ts'; diff --git a/src/workers/verify.ts b/src/workers/verify.ts index 0dde872..15ad783 100644 --- a/src/workers/verify.ts +++ b/src/workers/verify.ts @@ -1,5 +1,5 @@ import { NostrEvent } from '@nostrify/nostrify'; -import { Comlink } from '@/deps.ts'; +import * as Comlink from 'comlink'; import type { VerifyWorker } from './verify.worker.ts'; diff --git a/src/workers/verify.worker.ts b/src/workers/verify.worker.ts index d72387a..e218474 100644 --- a/src/workers/verify.worker.ts +++ b/src/workers/verify.worker.ts @@ -1,7 +1,7 @@ import { NostrEvent } from '@nostrify/nostrify'; +import * as Comlink from 'comlink'; import { VerifiedEvent, verifyEvent } from 'nostr-tools'; -import { Comlink } from '@/deps.ts'; import '@/nostr-wasm.ts'; export const VerifyWorker = {