@hashtree/worker 0.1.19 → 0.1.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +68 -6
- package/dist/app-runtime.d.ts +60 -0
- package/dist/app-runtime.d.ts.map +1 -0
- package/dist/app-runtime.js +271 -0
- package/dist/app-runtime.js.map +1 -0
- package/dist/capabilities/blossomTransport.d.ts.map +1 -1
- package/dist/capabilities/blossomTransport.js +53 -26
- package/dist/capabilities/blossomTransport.js.map +1 -1
- package/dist/client-id.d.ts +18 -0
- package/dist/client-id.d.ts.map +1 -0
- package/dist/client-id.js +98 -0
- package/dist/client-id.js.map +1 -0
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/runtime-network.d.ts +23 -0
- package/dist/runtime-network.d.ts.map +1 -0
- package/dist/runtime-network.js +105 -0
- package/dist/runtime-network.js.map +1 -0
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -14,21 +14,83 @@ npm install @hashtree/worker
|
|
|
14
14
|
|
|
15
15
|
```typescript
|
|
16
16
|
import { HashtreeWorkerClient } from '@hashtree/worker';
|
|
17
|
+
import HashtreeWorker from './workers/hashtree.worker.ts?worker';
|
|
17
18
|
|
|
18
|
-
const client = new HashtreeWorkerClient({
|
|
19
|
-
|
|
20
|
-
await client.configure({
|
|
19
|
+
const client = new HashtreeWorkerClient(HashtreeWorker, {
|
|
21
20
|
blossomServers: [{ url: 'https://upload.iris.to', read: true, write: true }],
|
|
22
21
|
});
|
|
22
|
+
await client.init();
|
|
23
23
|
|
|
24
24
|
// Store and retrieve blobs
|
|
25
|
-
await client.
|
|
26
|
-
const blob = await client.
|
|
25
|
+
const { hashHex } = await client.putBlob(data);
|
|
26
|
+
const { data: blob } = await client.getBlob(hashHex);
|
|
27
|
+
```
|
|
28
|
+
|
|
29
|
+
## Iris-Compatible Runtime Defaults
|
|
30
|
+
|
|
31
|
+
When the app runs inside Iris or another shell that injects `window.__HTREE_SERVER_URL__`
|
|
32
|
+
(or the launch URL carries `iris_htree_server`), the main app-facing API should be
|
|
33
|
+
`createHtreeRuntime(...)`:
|
|
34
|
+
|
|
35
|
+
```typescript
|
|
36
|
+
import {
|
|
37
|
+
HashtreeWorkerClient,
|
|
38
|
+
createHtreeRuntime,
|
|
39
|
+
} from '@hashtree/worker';
|
|
40
|
+
import HashtreeWorker from './workers/hashtree.worker.ts?worker';
|
|
41
|
+
|
|
42
|
+
const DEFAULT_RELAYS = [
|
|
43
|
+
'wss://relay.damus.io',
|
|
44
|
+
'wss://relay.primal.net',
|
|
45
|
+
];
|
|
46
|
+
|
|
47
|
+
const DEFAULT_BLOSSOM_SERVERS = [
|
|
48
|
+
{ url: 'https://upload.iris.to', read: false, write: true },
|
|
49
|
+
{ url: 'https://cdn.iris.to', read: true, write: false },
|
|
50
|
+
];
|
|
51
|
+
|
|
52
|
+
const runtime = createHtreeRuntime({
|
|
53
|
+
appId: 'my-app',
|
|
54
|
+
relays: DEFAULT_RELAYS,
|
|
55
|
+
blossomServers: DEFAULT_BLOSSOM_SERVERS,
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
const workerClient = new HashtreeWorkerClient(HashtreeWorker, {
|
|
59
|
+
...runtime.getWorkerConfig({
|
|
60
|
+
storeName: 'my-app-worker',
|
|
61
|
+
}),
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
const mediaUrl = runtime.urls.media('htree://nhash1example/video.mp4', {
|
|
65
|
+
clientScoped: true,
|
|
66
|
+
mimeType: 'video/mp4',
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
await runtime.media.ensureReady({
|
|
70
|
+
registerMediaPort: (port) => workerClient.registerMediaPort(port),
|
|
71
|
+
});
|
|
27
72
|
```
|
|
28
73
|
|
|
74
|
+
Behavior:
|
|
75
|
+
|
|
76
|
+
- In plain web mode, `runtime.endpoints` keeps your configured public relays and Blossom servers.
|
|
77
|
+
- In Iris/native child runtimes, `runtime.endpoints` and `runtime.getWorkerConfig()` switch transport defaults to the local daemon endpoints.
|
|
78
|
+
- `runtime.urls.media(...)` handles `/htree/...` URL generation plus the per-client `htree_c` and optional `htree_t` query params.
|
|
79
|
+
- `runtime.media.ensureReady(...)` handles the common page-side service-worker/media-port handshake.
|
|
80
|
+
|
|
81
|
+
## Service Worker Client Keys
|
|
82
|
+
|
|
83
|
+
If your service worker intercepts `/htree/...` media requests and forwards them to a worker over `MessagePort`, use a stable per-tab client key:
|
|
84
|
+
|
|
85
|
+
- `createHtreeRuntime(...)` generates it once per tab/webview.
|
|
86
|
+
- `runtime.urls.media(..., { clientScoped: true })` appends it as the `htree_c` query param.
|
|
87
|
+
- `runtime.media.ensureReady(...)` sends the same key in `REGISTER_WORKER_PORT` and `PING_WORKER_PORT`.
|
|
88
|
+
|
|
89
|
+
That lets the service worker map fetches back to the correct worker port when multiple tabs or isolated Iris child webviews are active at once, without falling back to a single global port.
|
|
90
|
+
|
|
29
91
|
## Exports
|
|
30
92
|
|
|
31
|
-
- `@hashtree/worker` — `
|
|
93
|
+
- `@hashtree/worker` — `createHtreeRuntime`, `resolveRuntimeEndpoints`, and `HashtreeWorkerClient`
|
|
32
94
|
- `@hashtree/worker/p2p` — `WebRTCController` / `WebRTCProxy` for P2P data channel management
|
|
33
95
|
- `@hashtree/worker/entry` — Worker entry point
|
|
34
96
|
- `@hashtree/worker/protocol` — Shared message types between main thread and worker
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import type { WorkerConfig, BlossomServerConfig } from './protocol.js';
|
|
2
|
+
import type { HtreeRuntimeWindowLike } from './runtime.js';
|
|
3
|
+
import type { ParsedHtreeUrl, ResolveHtreeRequestUrlOptions } from './htree-url.js';
|
|
4
|
+
import type { HtreeClientIdStorageLike } from './client-id.js';
|
|
5
|
+
import { type RuntimeEndpoints } from './runtime-network.js';
|
|
6
|
+
export type RuntimeValueSource<T> = T | (() => T);
|
|
7
|
+
export interface HtreeRuntimeEndpointOverrides {
|
|
8
|
+
relays?: readonly string[];
|
|
9
|
+
blossomServers?: readonly BlossomServerConfig[];
|
|
10
|
+
}
|
|
11
|
+
export interface HtreeRuntimeOptions {
|
|
12
|
+
appId?: string | null;
|
|
13
|
+
fallbackBaseUrl?: string | null;
|
|
14
|
+
windowLike?: HtreeRuntimeWindowLike;
|
|
15
|
+
storage?: HtreeClientIdStorageLike | null;
|
|
16
|
+
clientIdFactory?: () => string;
|
|
17
|
+
clientIdStorageKey?: string;
|
|
18
|
+
clientIdPrefix?: string;
|
|
19
|
+
serviceWorker?: ServiceWorkerContainer | null;
|
|
20
|
+
relays?: RuntimeValueSource<readonly string[]>;
|
|
21
|
+
blossomServers?: RuntimeValueSource<readonly BlossomServerConfig[]>;
|
|
22
|
+
}
|
|
23
|
+
export interface HtreeRuntimeRequestUrlOptions extends Omit<ResolveHtreeRequestUrlOptions, 'windowLike' | 'fallbackBaseUrl'> {
|
|
24
|
+
}
|
|
25
|
+
export interface HtreeRuntimeMediaUrlOptions extends HtreeRuntimeRequestUrlOptions {
|
|
26
|
+
clientScoped?: boolean;
|
|
27
|
+
mimeType?: string | null | undefined;
|
|
28
|
+
query?: Record<string, string | number | boolean | null | undefined>;
|
|
29
|
+
}
|
|
30
|
+
export interface HtreeRuntimeWorkerConfigOptions extends Omit<WorkerConfig, 'relays' | 'blossomServers'> {
|
|
31
|
+
relays?: readonly string[];
|
|
32
|
+
blossomServers?: readonly BlossomServerConfig[];
|
|
33
|
+
}
|
|
34
|
+
export interface HtreeRuntimeMediaPortOptions {
|
|
35
|
+
registerMediaPort: (port: MessagePort, debug?: boolean) => Promise<void> | void;
|
|
36
|
+
debug?: boolean;
|
|
37
|
+
attempts?: number;
|
|
38
|
+
delayMs?: number;
|
|
39
|
+
pingTimeoutMs?: number;
|
|
40
|
+
registrationTimeoutMs?: number;
|
|
41
|
+
controllerTimeoutMs?: number;
|
|
42
|
+
}
|
|
43
|
+
export interface HtreeRuntime {
|
|
44
|
+
readonly appId: string | null;
|
|
45
|
+
readonly clientId: string | null;
|
|
46
|
+
readonly endpoints: RuntimeEndpoints;
|
|
47
|
+
getEndpoints(overrides?: HtreeRuntimeEndpointOverrides): RuntimeEndpoints;
|
|
48
|
+
getWorkerConfig(options?: HtreeRuntimeWorkerConfigOptions): WorkerConfig;
|
|
49
|
+
urls: {
|
|
50
|
+
request: (input: string | ParsedHtreeUrl, options?: HtreeRuntimeRequestUrlOptions) => string;
|
|
51
|
+
media: (input: string | ParsedHtreeUrl, options?: HtreeRuntimeMediaUrlOptions) => string;
|
|
52
|
+
appendClientId: (url: string) => string;
|
|
53
|
+
};
|
|
54
|
+
media: {
|
|
55
|
+
ensureReady: (options: HtreeRuntimeMediaPortOptions) => Promise<boolean>;
|
|
56
|
+
reset: () => void;
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
export declare function createHtreeRuntime(options?: HtreeRuntimeOptions): HtreeRuntime;
|
|
60
|
+
//# sourceMappingURL=app-runtime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-runtime.d.ts","sourceRoot":"","sources":["../src/app-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AACpF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAQ/D,OAAO,EAA2B,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEtF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAElD,MAAM,WAAW,6BAA6B;IAC5C,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,OAAO,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC1C,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC9C,MAAM,CAAC,EAAE,kBAAkB,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IAC/C,cAAc,CAAC,EAAE,kBAAkB,CAAC,SAAS,mBAAmB,EAAE,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,6BAA8B,SAAQ,IAAI,CAAC,6BAA6B,EAAE,YAAY,GAAG,iBAAiB,CAAC;CAAG;AAE/H,MAAM,WAAW,2BAA4B,SAAQ,6BAA6B;IAChF,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,+BAAgC,SAAQ,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IACtG,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,4BAA4B;IAC3C,iBAAiB,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,YAAY,CAAC,SAAS,CAAC,EAAE,6BAA6B,GAAG,gBAAgB,CAAC;IAC1E,eAAe,CAAC,OAAO,CAAC,EAAE,+BAA+B,GAAG,YAAY,CAAC;IACzE,IAAI,EAAE;QACJ,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,OAAO,CAAC,EAAE,6BAA6B,KAAK,MAAM,CAAC;QAC7F,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,OAAO,CAAC,EAAE,2BAA2B,KAAK,MAAM,CAAC;QACzF,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;KACzC,CAAC;IACF,KAAK,EAAE;QACL,WAAW,EAAE,CAAC,OAAO,EAAE,4BAA4B,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QACzE,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;CACH;AAsCD,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,mBAAwB,GAAG,YAAY,CA2RlF"}
|
|
@@ -0,0 +1,271 @@
|
|
|
1
|
+
import { appendHtreeClientId, appendHtreeQueryParam, getOrCreateHtreeClientId, } from './client-id.js';
|
|
2
|
+
import { resolveHtreeRequestUrl } from './htree-url.js';
|
|
3
|
+
import { canUseInjectedHtreeServerUrl, canUseSameOriginHtreeProtocolStreaming } from './runtime.js';
|
|
4
|
+
import { resolveRuntimeEndpoints } from './runtime-network.js';
|
|
5
|
+
const DEFAULT_FALLBACK_BASE_URL = '';
|
|
6
|
+
const DEFAULT_MEDIA_PORT_ATTEMPTS = 3;
|
|
7
|
+
const DEFAULT_MEDIA_PORT_DELAY_MS = 500;
|
|
8
|
+
const DEFAULT_MEDIA_PORT_PING_TIMEOUT_MS = 1_500;
|
|
9
|
+
const DEFAULT_MEDIA_PORT_REGISTRATION_TIMEOUT_MS = 5_000;
|
|
10
|
+
const DEFAULT_MEDIA_PORT_CONTROLLER_TIMEOUT_MS = 5_000;
|
|
11
|
+
const RECONNECT_REQUEST_COOLDOWN_MS = 1_000;
|
|
12
|
+
function resolveRuntimeValue(value, fallback) {
|
|
13
|
+
if (typeof value === 'function') {
|
|
14
|
+
return value();
|
|
15
|
+
}
|
|
16
|
+
return value ?? fallback;
|
|
17
|
+
}
|
|
18
|
+
function getServiceWorkerContainer(serviceWorker) {
|
|
19
|
+
if (typeof serviceWorker !== 'undefined') {
|
|
20
|
+
return serviceWorker;
|
|
21
|
+
}
|
|
22
|
+
if (typeof navigator === 'undefined') {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
return navigator.serviceWorker ?? null;
|
|
26
|
+
}
|
|
27
|
+
function isDirectMediaRuntime(windowLike) {
|
|
28
|
+
return canUseInjectedHtreeServerUrl(windowLike)
|
|
29
|
+
|| canUseSameOriginHtreeProtocolStreaming(windowLike);
|
|
30
|
+
}
|
|
31
|
+
function createMessageId(prefix) {
|
|
32
|
+
return `${prefix}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
33
|
+
}
|
|
34
|
+
export function createHtreeRuntime(options = {}) {
|
|
35
|
+
const appId = options.appId?.trim() || null;
|
|
36
|
+
const fallbackBaseUrl = options.fallbackBaseUrl ?? DEFAULT_FALLBACK_BASE_URL;
|
|
37
|
+
const windowLike = options.windowLike;
|
|
38
|
+
const storage = typeof options.storage === 'undefined' ? undefined : options.storage;
|
|
39
|
+
const storageKey = options.clientIdStorageKey ?? (appId ? `${appId}.mediaClientId` : 'htree.mediaClientId');
|
|
40
|
+
const clientIdPrefix = options.clientIdPrefix ?? (appId ? appId.replace(/[^a-z0-9]+/gi, '').toLowerCase() || 'htree' : 'htree');
|
|
41
|
+
const serviceWorker = getServiceWorkerContainer(options.serviceWorker);
|
|
42
|
+
let setupPromise = null;
|
|
43
|
+
let mediaReady = false;
|
|
44
|
+
let activeController = null;
|
|
45
|
+
let controllerListenerAttached = false;
|
|
46
|
+
let messageListenerAttached = false;
|
|
47
|
+
let reconnectPromise = null;
|
|
48
|
+
let lastReconnectRequestAt = 0;
|
|
49
|
+
let lastEnsureOptions = null;
|
|
50
|
+
const getClientId = () => getOrCreateHtreeClientId({
|
|
51
|
+
storage,
|
|
52
|
+
storageKey,
|
|
53
|
+
prefix: clientIdPrefix,
|
|
54
|
+
uuidFactory: options.clientIdFactory,
|
|
55
|
+
});
|
|
56
|
+
const getEndpoints = (overrides = {}) => {
|
|
57
|
+
const relays = overrides.relays ?? resolveRuntimeValue(options.relays, []);
|
|
58
|
+
const blossomServers = overrides.blossomServers ?? resolveRuntimeValue(options.blossomServers, []);
|
|
59
|
+
return resolveRuntimeEndpoints({
|
|
60
|
+
windowLike,
|
|
61
|
+
relays,
|
|
62
|
+
blossomServers,
|
|
63
|
+
});
|
|
64
|
+
};
|
|
65
|
+
const appendRuntimeClientId = (url) => appendHtreeClientId(url, getClientId());
|
|
66
|
+
const resolveRequestUrl = (input, urlOptions = {}) => resolveHtreeRequestUrl(input, {
|
|
67
|
+
...urlOptions,
|
|
68
|
+
windowLike,
|
|
69
|
+
fallbackBaseUrl,
|
|
70
|
+
});
|
|
71
|
+
const resolveMediaUrl = (input, mediaOptions = {}) => {
|
|
72
|
+
let url = resolveRequestUrl(input, mediaOptions);
|
|
73
|
+
if (mediaOptions.clientScoped) {
|
|
74
|
+
url = appendRuntimeClientId(url);
|
|
75
|
+
}
|
|
76
|
+
url = appendHtreeQueryParam(url, 'htree_t', mediaOptions.mimeType);
|
|
77
|
+
for (const [key, value] of Object.entries(mediaOptions.query ?? {})) {
|
|
78
|
+
url = appendHtreeQueryParam(url, key, value == null ? value : String(value));
|
|
79
|
+
}
|
|
80
|
+
return url;
|
|
81
|
+
};
|
|
82
|
+
const getWorkerConfig = (configOptions = {}) => {
|
|
83
|
+
const { relays, blossomServers, ...rest } = configOptions;
|
|
84
|
+
const endpoints = getEndpoints({ relays, blossomServers });
|
|
85
|
+
return {
|
|
86
|
+
...rest,
|
|
87
|
+
relays: endpoints.nostrRelays,
|
|
88
|
+
blossomServers: endpoints.blossomServers,
|
|
89
|
+
};
|
|
90
|
+
};
|
|
91
|
+
const resetMedia = () => {
|
|
92
|
+
mediaReady = false;
|
|
93
|
+
setupPromise = null;
|
|
94
|
+
activeController = null;
|
|
95
|
+
};
|
|
96
|
+
const ensureControllerListener = () => {
|
|
97
|
+
if (controllerListenerAttached || !serviceWorker)
|
|
98
|
+
return;
|
|
99
|
+
controllerListenerAttached = true;
|
|
100
|
+
serviceWorker.addEventListener('controllerchange', () => {
|
|
101
|
+
resetMedia();
|
|
102
|
+
});
|
|
103
|
+
};
|
|
104
|
+
const requestMediaReconnect = (requestedClientKey) => {
|
|
105
|
+
const clientId = getClientId();
|
|
106
|
+
if (!lastEnsureOptions)
|
|
107
|
+
return;
|
|
108
|
+
if (requestedClientKey && clientId && requestedClientKey !== clientId) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
const now = Date.now();
|
|
112
|
+
if (reconnectPromise || now - lastReconnectRequestAt < RECONNECT_REQUEST_COOLDOWN_MS) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
lastReconnectRequestAt = now;
|
|
116
|
+
resetMedia();
|
|
117
|
+
reconnectPromise = ensureMediaPortReady(lastEnsureOptions)
|
|
118
|
+
.then(() => undefined)
|
|
119
|
+
.catch(() => undefined)
|
|
120
|
+
.finally(() => {
|
|
121
|
+
reconnectPromise = null;
|
|
122
|
+
});
|
|
123
|
+
};
|
|
124
|
+
const ensureMessageListener = () => {
|
|
125
|
+
if (messageListenerAttached || !serviceWorker)
|
|
126
|
+
return;
|
|
127
|
+
messageListenerAttached = true;
|
|
128
|
+
serviceWorker.addEventListener('message', (event) => {
|
|
129
|
+
const data = event.data;
|
|
130
|
+
if (data?.type !== 'REQUEST_WORKER_PORT_RECONNECT') {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
requestMediaReconnect(data.clientKey ?? null);
|
|
134
|
+
});
|
|
135
|
+
};
|
|
136
|
+
const waitForController = async (timeoutMs) => {
|
|
137
|
+
if (!serviceWorker)
|
|
138
|
+
return null;
|
|
139
|
+
if (serviceWorker.controller)
|
|
140
|
+
return serviceWorker.controller;
|
|
141
|
+
await serviceWorker.ready.catch(() => undefined);
|
|
142
|
+
if (serviceWorker.controller)
|
|
143
|
+
return serviceWorker.controller;
|
|
144
|
+
return await new Promise((resolve) => {
|
|
145
|
+
const timeoutId = setTimeout(() => resolve(serviceWorker.controller ?? null), timeoutMs);
|
|
146
|
+
serviceWorker.addEventListener('controllerchange', () => {
|
|
147
|
+
clearTimeout(timeoutId);
|
|
148
|
+
resolve(serviceWorker.controller ?? null);
|
|
149
|
+
}, { once: true });
|
|
150
|
+
});
|
|
151
|
+
};
|
|
152
|
+
const pingMediaPort = async (clientKey, controller, timeoutMs) => {
|
|
153
|
+
if (!serviceWorker)
|
|
154
|
+
return false;
|
|
155
|
+
const requestId = createMessageId('media-ping');
|
|
156
|
+
const ackPromise = new Promise((resolve) => {
|
|
157
|
+
const timeoutId = setTimeout(() => {
|
|
158
|
+
serviceWorker.removeEventListener('message', onMessage);
|
|
159
|
+
resolve(false);
|
|
160
|
+
}, timeoutMs);
|
|
161
|
+
const onMessage = (event) => {
|
|
162
|
+
const data = event.data;
|
|
163
|
+
if (data?.type === 'WORKER_PORT_PONG' && data.requestId === requestId) {
|
|
164
|
+
clearTimeout(timeoutId);
|
|
165
|
+
serviceWorker.removeEventListener('message', onMessage);
|
|
166
|
+
resolve(!!data.ok);
|
|
167
|
+
}
|
|
168
|
+
};
|
|
169
|
+
serviceWorker.addEventListener('message', onMessage);
|
|
170
|
+
});
|
|
171
|
+
controller.postMessage({ type: 'PING_WORKER_PORT', requestId, clientKey });
|
|
172
|
+
return await ackPromise;
|
|
173
|
+
};
|
|
174
|
+
const setupMediaPort = async (portOptions) => {
|
|
175
|
+
if (!serviceWorker) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
ensureControllerListener();
|
|
179
|
+
ensureMessageListener();
|
|
180
|
+
const controller = await waitForController(portOptions.controllerTimeoutMs ?? DEFAULT_MEDIA_PORT_CONTROLLER_TIMEOUT_MS);
|
|
181
|
+
if (!controller) {
|
|
182
|
+
return false;
|
|
183
|
+
}
|
|
184
|
+
const clientKey = getClientId() ?? undefined;
|
|
185
|
+
if (mediaReady && activeController === controller) {
|
|
186
|
+
if (!clientKey) {
|
|
187
|
+
return true;
|
|
188
|
+
}
|
|
189
|
+
const alive = await pingMediaPort(clientKey, controller, portOptions.pingTimeoutMs ?? DEFAULT_MEDIA_PORT_PING_TIMEOUT_MS);
|
|
190
|
+
if (alive) {
|
|
191
|
+
return true;
|
|
192
|
+
}
|
|
193
|
+
resetMedia();
|
|
194
|
+
}
|
|
195
|
+
const channel = new MessageChannel();
|
|
196
|
+
const requestId = createMessageId('media');
|
|
197
|
+
const ackPromise = new Promise((resolve) => {
|
|
198
|
+
const timeoutId = setTimeout(() => {
|
|
199
|
+
serviceWorker.removeEventListener('message', onMessage);
|
|
200
|
+
resolve(false);
|
|
201
|
+
}, portOptions.registrationTimeoutMs ?? DEFAULT_MEDIA_PORT_REGISTRATION_TIMEOUT_MS);
|
|
202
|
+
const onMessage = (event) => {
|
|
203
|
+
const data = event.data;
|
|
204
|
+
if (data?.type === 'WORKER_PORT_READY' && data.requestId === requestId) {
|
|
205
|
+
clearTimeout(timeoutId);
|
|
206
|
+
serviceWorker.removeEventListener('message', onMessage);
|
|
207
|
+
resolve(true);
|
|
208
|
+
}
|
|
209
|
+
};
|
|
210
|
+
serviceWorker.addEventListener('message', onMessage);
|
|
211
|
+
});
|
|
212
|
+
controller.postMessage({
|
|
213
|
+
type: 'REGISTER_WORKER_PORT',
|
|
214
|
+
port: channel.port1,
|
|
215
|
+
requestId,
|
|
216
|
+
clientKey,
|
|
217
|
+
debug: !!portOptions.debug,
|
|
218
|
+
}, [channel.port1]);
|
|
219
|
+
await portOptions.registerMediaPort(channel.port2, !!portOptions.debug);
|
|
220
|
+
const acked = await ackPromise;
|
|
221
|
+
mediaReady = acked;
|
|
222
|
+
activeController = acked ? controller : null;
|
|
223
|
+
return acked;
|
|
224
|
+
};
|
|
225
|
+
const ensureMediaPortReady = async (portOptions) => {
|
|
226
|
+
lastEnsureOptions = portOptions;
|
|
227
|
+
if (isDirectMediaRuntime(windowLike)) {
|
|
228
|
+
return true;
|
|
229
|
+
}
|
|
230
|
+
const attempts = portOptions.attempts ?? DEFAULT_MEDIA_PORT_ATTEMPTS;
|
|
231
|
+
const delayMs = portOptions.delayMs ?? DEFAULT_MEDIA_PORT_DELAY_MS;
|
|
232
|
+
for (let attempt = 0; attempt < attempts; attempt += 1) {
|
|
233
|
+
if (!setupPromise) {
|
|
234
|
+
setupPromise = setupMediaPort(portOptions).finally(() => {
|
|
235
|
+
if (!mediaReady) {
|
|
236
|
+
setupPromise = null;
|
|
237
|
+
}
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
const ready = await setupPromise.catch(() => false);
|
|
241
|
+
if (ready) {
|
|
242
|
+
return true;
|
|
243
|
+
}
|
|
244
|
+
if (attempt < attempts - 1) {
|
|
245
|
+
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return false;
|
|
249
|
+
};
|
|
250
|
+
return {
|
|
251
|
+
appId,
|
|
252
|
+
get clientId() {
|
|
253
|
+
return getClientId();
|
|
254
|
+
},
|
|
255
|
+
get endpoints() {
|
|
256
|
+
return getEndpoints();
|
|
257
|
+
},
|
|
258
|
+
getEndpoints,
|
|
259
|
+
getWorkerConfig,
|
|
260
|
+
urls: {
|
|
261
|
+
request: resolveRequestUrl,
|
|
262
|
+
media: resolveMediaUrl,
|
|
263
|
+
appendClientId: appendRuntimeClientId,
|
|
264
|
+
},
|
|
265
|
+
media: {
|
|
266
|
+
ensureReady: ensureMediaPortReady,
|
|
267
|
+
reset: resetMedia,
|
|
268
|
+
},
|
|
269
|
+
};
|
|
270
|
+
}
|
|
271
|
+
//# sourceMappingURL=app-runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-runtime.js","sourceRoot":"","sources":["../src/app-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blossomTransport.d.ts","sourceRoot":"","sources":["../../src/capabilities/blossomTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,KAAK,qBAAqB,EAI3B,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EACnC,MAAM,8BAA8B,CAAC;AAEtC,eAAO,MAAM,uBAAuB,EAAE,mBAAmB,EAKxD,CAAC;AAQF,YAAY,EACV,2BAA2B,EAC3B,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"blossomTransport.d.ts","sourceRoot":"","sources":["../../src/capabilities/blossomTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,KAAK,qBAAqB,EAI3B,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EACnC,MAAM,8BAA8B,CAAC;AAEtC,eAAO,MAAM,uBAAuB,EAAE,mBAAmB,EAKxD,CAAC;AAQF,YAAY,EACV,2BAA2B,EAC3B,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AA6EtC,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA0B;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiD;IACjF,OAAO,CAAC,KAAK,CAAe;gBAEhB,OAAO,CAAC,EAAE,mBAAmB,EAAE,EAAE,iBAAiB,CAAC,EAAE,6BAA6B;IAO9F,UAAU,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,IAAI;IAKhD,UAAU,IAAI,mBAAmB,EAAE;IAInC,eAAe,IAAI,mBAAmB,EAAE;IAIxC,iBAAiB,IAAI,qBAAqB;IAI1C,OAAO,CAAC,WAAW;IAWnB,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,YAAY;IAInE,MAAM,CACV,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,qBAAqB,GACvC,OAAO,CAAC,IAAI,CAAC;IAYV,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YAc1C,oBAAoB;YAwCpB,eAAe;CAkB9B"}
|
|
@@ -50,30 +50,35 @@ function createEphemeralSigner() {
|
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
-
async function acquireReadFetchSlot() {
|
|
54
|
-
if (activeReadFetches < MAX_CONCURRENT_READ_FETCHES) {
|
|
55
|
-
activeReadFetches += 1;
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
await new Promise((resolve) => {
|
|
59
|
-
pendingReadFetchWaiters.push(() => {
|
|
60
|
-
activeReadFetches += 1;
|
|
61
|
-
resolve();
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
53
|
function releaseReadFetchSlot() {
|
|
66
54
|
activeReadFetches = Math.max(0, activeReadFetches - 1);
|
|
67
55
|
pendingReadFetchWaiters.shift()?.();
|
|
68
56
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
57
|
+
function withReadFetchSlot(loader) {
|
|
58
|
+
return new Promise((resolve, reject) => {
|
|
59
|
+
const start = () => {
|
|
60
|
+
activeReadFetches += 1;
|
|
61
|
+
let pending;
|
|
62
|
+
try {
|
|
63
|
+
pending = loader();
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
releaseReadFetchSlot();
|
|
67
|
+
reject(error);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
pending
|
|
71
|
+
.then(resolve, reject)
|
|
72
|
+
.finally(() => {
|
|
73
|
+
releaseReadFetchSlot();
|
|
74
|
+
});
|
|
75
|
+
};
|
|
76
|
+
if (activeReadFetches < MAX_CONCURRENT_READ_FETCHES) {
|
|
77
|
+
start();
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
pendingReadFetchWaiters.push(start);
|
|
81
|
+
});
|
|
77
82
|
}
|
|
78
83
|
export class BlossomTransport {
|
|
79
84
|
servers;
|
|
@@ -141,13 +146,35 @@ export class BlossomTransport {
|
|
|
141
146
|
if (readServers.length === 0) {
|
|
142
147
|
return null;
|
|
143
148
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
149
|
+
const pendingFetches = readServers.map((server) => this.fetchFromServer(normalizeServerUrl(server.url), hashHex));
|
|
150
|
+
return await new Promise((resolve) => {
|
|
151
|
+
let settled = false;
|
|
152
|
+
let remaining = pendingFetches.length;
|
|
153
|
+
for (const fetchPromise of pendingFetches) {
|
|
154
|
+
fetchPromise
|
|
155
|
+
.then((result) => {
|
|
156
|
+
if (settled)
|
|
157
|
+
return;
|
|
158
|
+
if (result) {
|
|
159
|
+
settled = true;
|
|
160
|
+
resolve(result);
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
remaining -= 1;
|
|
164
|
+
if (remaining === 0) {
|
|
165
|
+
resolve(null);
|
|
166
|
+
}
|
|
167
|
+
})
|
|
168
|
+
.catch(() => {
|
|
169
|
+
if (settled)
|
|
170
|
+
return;
|
|
171
|
+
remaining -= 1;
|
|
172
|
+
if (remaining === 0) {
|
|
173
|
+
resolve(null);
|
|
174
|
+
}
|
|
175
|
+
});
|
|
148
176
|
}
|
|
149
|
-
}
|
|
150
|
-
return null;
|
|
177
|
+
});
|
|
151
178
|
}
|
|
152
179
|
async fetchFromServer(baseUrl, hashHex) {
|
|
153
180
|
return await withReadFetchSlot(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blossomTransport.js","sourceRoot":"","sources":["../../src/capabilities/blossomTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,MAAM,EACN,KAAK,EACL,OAAO,GACR,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,uBAAuB,GAGxB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,EAAE,GAAG,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;IACxD,EAAE,GAAG,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;IAC7D,EAAE,GAAG,EAAE,4BAA4B,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;IAC/D,EAAE,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;CAC5D,CAAC;AAEF,MAAM,qBAAqB,GAAG,MAAM,CAAC;AACrC,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAEvC,IAAI,iBAAiB,GAAG,CAAC,CAAC;AAC1B,MAAM,uBAAuB,GAAsB,EAAE,CAAC;AAQtD,SAAS,kBAAkB,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA0C;IAClE,MAAM,MAAM,GAAG,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC;IACjF,MAAM,MAAM,GAAG,IAAI,GAAG,EAA+B,CAAC;IACtD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;YACd,GAAG;YACH,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,IAAI;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;SAC7B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,qBAAqB;IAC5B,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;IACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,KAAK,GAAG,aAAa,CAAC;YAC1B,GAAG,QAAQ;YACX,IAAI,EAAE,QAAQ,CAAC,IAAa;YAC5B,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,EAAE,SAAS,CAAC,CAAC;QACd,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,GAAG,EAAE,KAAK,CAAC,GAAG;SACf,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"blossomTransport.js","sourceRoot":"","sources":["../../src/capabilities/blossomTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface HtreeClientIdStorageLike {
|
|
2
|
+
getItem(key: string): string | null;
|
|
3
|
+
setItem(key: string, value: string): void;
|
|
4
|
+
}
|
|
5
|
+
export interface ResolveHtreeClientIdOptions {
|
|
6
|
+
storageKey?: string;
|
|
7
|
+
prefix?: string;
|
|
8
|
+
storage?: HtreeClientIdStorageLike | null;
|
|
9
|
+
uuidFactory?: () => string;
|
|
10
|
+
}
|
|
11
|
+
export interface AppendHtreeQueryParamOptions {
|
|
12
|
+
baseOrigin?: string | null;
|
|
13
|
+
}
|
|
14
|
+
export declare function createHtreeClientId(prefix?: string, uuidFactory?: () => string): string;
|
|
15
|
+
export declare function getOrCreateHtreeClientId(options?: ResolveHtreeClientIdOptions): string | null;
|
|
16
|
+
export declare function appendHtreeQueryParam(url: string, key: string, value: string | null | undefined, options?: AppendHtreeQueryParamOptions): string;
|
|
17
|
+
export declare function appendHtreeClientId(url: string, clientId: string | null | undefined, options?: AppendHtreeQueryParamOptions): string;
|
|
18
|
+
//# sourceMappingURL=client-id.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-id.d.ts","sourceRoot":"","sources":["../src/client-id.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA0CD,wBAAgB,mBAAmB,CACjC,MAAM,SAAiB,EACvB,WAAW,CAAC,EAAE,MAAM,MAAM,GACzB,MAAM,CAQR;AAED,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,2BAAgC,GACxC,MAAM,GAAG,IAAI,CA8Bf;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,OAAO,GAAE,4BAAiC,GACzC,MAAM,CAoBR;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACnC,OAAO,GAAE,4BAAiC,GACzC,MAAM,CAER"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
const DEFAULT_STORAGE_KEY = 'htree.mediaClientId';
|
|
2
|
+
const DEFAULT_PREFIX = 'htc';
|
|
3
|
+
const cachedClientIds = new Map();
|
|
4
|
+
function getDefaultStorage() {
|
|
5
|
+
try {
|
|
6
|
+
if (typeof sessionStorage !== 'undefined') {
|
|
7
|
+
return sessionStorage;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
try {
|
|
14
|
+
if (typeof window !== 'undefined' && window.sessionStorage) {
|
|
15
|
+
return window.sessionStorage;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
function hasClientRuntime(options) {
|
|
24
|
+
return typeof window !== 'undefined'
|
|
25
|
+
|| typeof options.storage !== 'undefined'
|
|
26
|
+
|| typeof options.uuidFactory === 'function';
|
|
27
|
+
}
|
|
28
|
+
function getBaseOrigin(baseOrigin) {
|
|
29
|
+
if (typeof baseOrigin === 'string' && baseOrigin.trim()) {
|
|
30
|
+
return baseOrigin.trim().replace(/\/+$/, '');
|
|
31
|
+
}
|
|
32
|
+
if (typeof window !== 'undefined' && typeof window.location?.origin === 'string' && window.location.origin) {
|
|
33
|
+
return window.location.origin;
|
|
34
|
+
}
|
|
35
|
+
return 'https://example.invalid';
|
|
36
|
+
}
|
|
37
|
+
export function createHtreeClientId(prefix = DEFAULT_PREFIX, uuidFactory) {
|
|
38
|
+
if (typeof uuidFactory === 'function') {
|
|
39
|
+
return uuidFactory();
|
|
40
|
+
}
|
|
41
|
+
if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
|
|
42
|
+
return crypto.randomUUID();
|
|
43
|
+
}
|
|
44
|
+
return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
|
|
45
|
+
}
|
|
46
|
+
export function getOrCreateHtreeClientId(options = {}) {
|
|
47
|
+
const storageKey = options.storageKey?.trim() || DEFAULT_STORAGE_KEY;
|
|
48
|
+
const cached = cachedClientIds.get(storageKey);
|
|
49
|
+
if (cached) {
|
|
50
|
+
return cached;
|
|
51
|
+
}
|
|
52
|
+
const storage = typeof options.storage === 'undefined' ? getDefaultStorage() : options.storage;
|
|
53
|
+
try {
|
|
54
|
+
const existing = storage?.getItem(storageKey);
|
|
55
|
+
if (existing) {
|
|
56
|
+
cachedClientIds.set(storageKey, existing);
|
|
57
|
+
return existing;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
// Ignore storage access failures and fall back to an in-memory id.
|
|
62
|
+
}
|
|
63
|
+
if (!hasClientRuntime(options)) {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
const nextId = createHtreeClientId(options.prefix ?? DEFAULT_PREFIX, options.uuidFactory);
|
|
67
|
+
try {
|
|
68
|
+
storage?.setItem(storageKey, nextId);
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
// Ignore storage write failures.
|
|
72
|
+
}
|
|
73
|
+
cachedClientIds.set(storageKey, nextId);
|
|
74
|
+
return nextId;
|
|
75
|
+
}
|
|
76
|
+
export function appendHtreeQueryParam(url, key, value, options = {}) {
|
|
77
|
+
const trimmedValue = `${value ?? ''}`.trim();
|
|
78
|
+
if (!trimmedValue) {
|
|
79
|
+
return url;
|
|
80
|
+
}
|
|
81
|
+
try {
|
|
82
|
+
const baseOrigin = getBaseOrigin(options.baseOrigin);
|
|
83
|
+
const parsed = new URL(url, baseOrigin);
|
|
84
|
+
parsed.searchParams.set(key, trimmedValue);
|
|
85
|
+
if (!/^[a-z][a-z0-9+.-]*:\/\//i.test(url) && parsed.origin === baseOrigin) {
|
|
86
|
+
return `${parsed.pathname}${parsed.search}${parsed.hash}`;
|
|
87
|
+
}
|
|
88
|
+
return parsed.toString();
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
const separator = url.includes('?') ? '&' : '?';
|
|
92
|
+
return `${url}${separator}${encodeURIComponent(key)}=${encodeURIComponent(trimmedValue)}`;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
export function appendHtreeClientId(url, clientId, options = {}) {
|
|
96
|
+
return appendHtreeQueryParam(url, 'htree_c', clientId, options);
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=client-id.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-id.js","sourceRoot":"","sources":["../src/client-id.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,8 +2,13 @@ export { HashtreeWorkerClient } from './client.js';
|
|
|
2
2
|
export type { WorkerFactory, P2PFetchHandler } from './client.js';
|
|
3
3
|
export { canUseInjectedHtreeServerUrl, canUseSameOriginHtreeProtocolStreaming, getInjectedHtreeServerUrl, resolveRuntimeHtreeBaseUrl, shouldEagerLoadMediaInNativeChildRuntime, shouldPreferSameOriginHtreeRoutes, } from './runtime.js';
|
|
4
4
|
export type { HtreeRuntimeLocationLike, HtreeRuntimeWindowLike, ResolveRuntimeHtreeBaseUrlOptions, } from './runtime.js';
|
|
5
|
+
export { resolveRuntimeEndpoints, } from './runtime-network.js';
|
|
6
|
+
export type { ResolveRuntimeEndpointsOptions, RuntimeEndpoints, } from './runtime-network.js';
|
|
7
|
+
export { createHtreeRuntime } from './app-runtime.js';
|
|
8
|
+
export type { HtreeRuntime, HtreeRuntimeEndpointOverrides, HtreeRuntimeMediaPortOptions, HtreeRuntimeMediaUrlOptions, HtreeRuntimeOptions, HtreeRuntimeRequestUrlOptions, HtreeRuntimeWorkerConfigOptions, RuntimeValueSource, } from './app-runtime.js';
|
|
5
9
|
export { buildHtreeRequestPath, parseHtreeUrl, resolveHtreeRequestUrl, } from './htree-url.js';
|
|
6
10
|
export type { MutableHtreeRequestStyle, ParsedHtreeUrl, ResolveHtreeRequestUrlOptions, } from './htree-url.js';
|
|
11
|
+
export type { HtreeClientIdStorageLike } from './client-id.js';
|
|
7
12
|
export type { BlossomServerConfig, WorkerConfig, WorkerRequest, WorkerResponse, RootResolveOptions, ConnectivityState, UploadProgressState, WorkerDiagnosticEvent, WorkerDiagnosticLevel, BlossomBandwidthState, BlossomBandwidthServerStats, BlobSource, } from './protocol.js';
|
|
8
13
|
export { WebRTCController, WebRTCProxy, initWebRTCProxy, getWebRTCProxy, closeWebRTCProxy, } from './p2p/index.js';
|
|
9
14
|
export type { WebRTCControllerConfig } from './p2p/index.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EACL,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,0BAA0B,EAC1B,wCAAwC,EACxC,iCAAiC,GAClC,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,wBAAwB,EACxB,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,wBAAwB,EACxB,cAAc,EACd,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,qBAAqB,EACrB,2BAA2B,EAC3B,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EACL,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,0BAA0B,EAC1B,wCAAwC,EACxC,iCAAiC,GAClC,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,wBAAwB,EACxB,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,8BAA8B,EAC9B,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,mBAAmB,EACnB,6BAA6B,EAC7B,+BAA+B,EAC/B,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,wBAAwB,EACxB,cAAc,EACd,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,qBAAqB,EACrB,2BAA2B,EAC3B,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export { HashtreeWorkerClient } from './client.js';
|
|
2
2
|
export { canUseInjectedHtreeServerUrl, canUseSameOriginHtreeProtocolStreaming, getInjectedHtreeServerUrl, resolveRuntimeHtreeBaseUrl, shouldEagerLoadMediaInNativeChildRuntime, shouldPreferSameOriginHtreeRoutes, } from './runtime.js';
|
|
3
|
+
export { resolveRuntimeEndpoints, } from './runtime-network.js';
|
|
4
|
+
export { createHtreeRuntime } from './app-runtime.js';
|
|
3
5
|
export { buildHtreeRequestPath, parseHtreeUrl, resolveHtreeRequestUrl, } from './htree-url.js';
|
|
4
6
|
export { WebRTCController, WebRTCProxy, initWebRTCProxy, getWebRTCProxy, closeWebRTCProxy, } from './p2p/index.js';
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EACL,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,0BAA0B,EAC1B,wCAAwC,EACxC,iCAAiC,GAClC,MAAM,cAAc,CAAC;AAMtB,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EACL,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,0BAA0B,EAC1B,wCAAwC,EACxC,iCAAiC,GAClC,MAAM,cAAc,CAAC;AAMtB,OAAO,EACL,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAWtD,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AAsBxB,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { BlossomServerConfig } from './protocol.js';
|
|
2
|
+
import { type HtreeRuntimeWindowLike } from './runtime.js';
|
|
3
|
+
export interface RuntimeNetworkOptions {
|
|
4
|
+
windowLike?: HtreeRuntimeWindowLike;
|
|
5
|
+
}
|
|
6
|
+
export interface ResolveRuntimeEndpointsOptions extends RuntimeNetworkOptions {
|
|
7
|
+
relays?: readonly string[];
|
|
8
|
+
blossomServers?: readonly BlossomServerConfig[];
|
|
9
|
+
}
|
|
10
|
+
export interface RuntimeEndpoints {
|
|
11
|
+
htreeServerUrl: string | null;
|
|
12
|
+
nostrRelays: string[];
|
|
13
|
+
blossomServers: BlossomServerConfig[];
|
|
14
|
+
}
|
|
15
|
+
export declare function normalizeRuntimeServerUrl(url: string): string;
|
|
16
|
+
export declare function normalizeRuntimeRelayUrl(url: string): string;
|
|
17
|
+
export declare function getRuntimeHtreeServerUrl(windowLike?: HtreeRuntimeWindowLike): string | null;
|
|
18
|
+
export declare function getRuntimeNostrRelayUrl(windowLike?: HtreeRuntimeWindowLike): string | null;
|
|
19
|
+
export declare function getRuntimeBlossomServer(windowLike?: HtreeRuntimeWindowLike): BlossomServerConfig | null;
|
|
20
|
+
export declare function getRuntimeNostrRelays(relays: readonly string[], options?: RuntimeNetworkOptions): string[];
|
|
21
|
+
export declare function getRuntimeBlossomServers(servers: readonly BlossomServerConfig[], options?: RuntimeNetworkOptions): BlossomServerConfig[];
|
|
22
|
+
export declare function resolveRuntimeEndpoints(options?: ResolveRuntimeEndpointsOptions): RuntimeEndpoints;
|
|
23
|
+
//# sourceMappingURL=runtime-network.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-network.d.ts","sourceRoot":"","sources":["../src/runtime-network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAA6B,KAAK,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtF,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACrC;AAED,MAAM,WAAW,8BAA+B,SAAQ,qBAAqB;IAC3E,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5D;AAwBD,wBAAgB,wBAAwB,CAAC,UAAU,CAAC,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAI3F;AAED,wBAAgB,uBAAuB,CAAC,UAAU,CAAC,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAoB1F;AAED,wBAAgB,uBAAuB,CAAC,UAAU,CAAC,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,IAAI,CAQvG;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,OAAO,GAAE,qBAA0B,GAClC,MAAM,EAAE,CAMV;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EACvC,OAAO,GAAE,qBAA0B,GAClC,mBAAmB,EAAE,CAuBvB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,8BAAmC,GAC3C,gBAAgB,CAMlB"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { getInjectedHtreeServerUrl } from './runtime.js';
|
|
2
|
+
export function normalizeRuntimeServerUrl(url) {
|
|
3
|
+
return url.trim().replace(/\/+$/, '');
|
|
4
|
+
}
|
|
5
|
+
export function normalizeRuntimeRelayUrl(url) {
|
|
6
|
+
return url.trim().replace(/\/+$/, '');
|
|
7
|
+
}
|
|
8
|
+
function normalizeBlossomServer(server) {
|
|
9
|
+
const url = normalizeRuntimeServerUrl(server.url);
|
|
10
|
+
if (!url)
|
|
11
|
+
return null;
|
|
12
|
+
return {
|
|
13
|
+
url,
|
|
14
|
+
read: server.read ?? true,
|
|
15
|
+
write: server.write ?? false,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
function uniqueRelayUrls(relays) {
|
|
19
|
+
const seen = new Set();
|
|
20
|
+
const normalized = [];
|
|
21
|
+
for (const relay of relays) {
|
|
22
|
+
const url = normalizeRuntimeRelayUrl(relay);
|
|
23
|
+
if (!url || seen.has(url))
|
|
24
|
+
continue;
|
|
25
|
+
seen.add(url);
|
|
26
|
+
normalized.push(url);
|
|
27
|
+
}
|
|
28
|
+
return normalized;
|
|
29
|
+
}
|
|
30
|
+
export function getRuntimeHtreeServerUrl(windowLike) {
|
|
31
|
+
const serverUrl = getInjectedHtreeServerUrl(windowLike);
|
|
32
|
+
if (!serverUrl)
|
|
33
|
+
return null;
|
|
34
|
+
return normalizeRuntimeServerUrl(serverUrl);
|
|
35
|
+
}
|
|
36
|
+
export function getRuntimeNostrRelayUrl(windowLike) {
|
|
37
|
+
const serverUrl = getRuntimeHtreeServerUrl(windowLike);
|
|
38
|
+
if (!serverUrl)
|
|
39
|
+
return null;
|
|
40
|
+
try {
|
|
41
|
+
const url = new URL(serverUrl);
|
|
42
|
+
if (url.protocol === 'http:') {
|
|
43
|
+
url.protocol = 'ws:';
|
|
44
|
+
}
|
|
45
|
+
else if (url.protocol === 'https:') {
|
|
46
|
+
url.protocol = 'wss:';
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
url.pathname = '/ws';
|
|
52
|
+
url.search = '';
|
|
53
|
+
url.hash = '';
|
|
54
|
+
return normalizeRuntimeRelayUrl(url.toString());
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
return null;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
export function getRuntimeBlossomServer(windowLike) {
|
|
61
|
+
const serverUrl = getRuntimeHtreeServerUrl(windowLike);
|
|
62
|
+
if (!serverUrl)
|
|
63
|
+
return null;
|
|
64
|
+
return {
|
|
65
|
+
url: serverUrl,
|
|
66
|
+
read: true,
|
|
67
|
+
write: true,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
export function getRuntimeNostrRelays(relays, options = {}) {
|
|
71
|
+
const runtimeRelayUrl = getRuntimeNostrRelayUrl(options.windowLike);
|
|
72
|
+
if (runtimeRelayUrl) {
|
|
73
|
+
return [runtimeRelayUrl];
|
|
74
|
+
}
|
|
75
|
+
return uniqueRelayUrls(relays);
|
|
76
|
+
}
|
|
77
|
+
export function getRuntimeBlossomServers(servers, options = {}) {
|
|
78
|
+
const merged = new Map();
|
|
79
|
+
const runtimeServer = getRuntimeBlossomServer(options.windowLike);
|
|
80
|
+
const candidates = runtimeServer ? [runtimeServer, ...servers] : [...servers];
|
|
81
|
+
for (const candidate of candidates) {
|
|
82
|
+
const normalized = normalizeBlossomServer(candidate);
|
|
83
|
+
if (!normalized)
|
|
84
|
+
continue;
|
|
85
|
+
const existing = merged.get(normalized.url);
|
|
86
|
+
if (existing) {
|
|
87
|
+
merged.set(normalized.url, {
|
|
88
|
+
url: normalized.url,
|
|
89
|
+
read: existing.read || normalized.read,
|
|
90
|
+
write: existing.write || normalized.write,
|
|
91
|
+
});
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
merged.set(normalized.url, normalized);
|
|
95
|
+
}
|
|
96
|
+
return Array.from(merged.values());
|
|
97
|
+
}
|
|
98
|
+
export function resolveRuntimeEndpoints(options = {}) {
|
|
99
|
+
return {
|
|
100
|
+
htreeServerUrl: getRuntimeHtreeServerUrl(options.windowLike),
|
|
101
|
+
nostrRelays: getRuntimeNostrRelays(options.relays ?? [], options),
|
|
102
|
+
blossomServers: getRuntimeBlossomServers(options.blossomServers ?? [], options),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=runtime-network.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-network.js","sourceRoot":"","sources":["../src/runtime-network.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hashtree/worker",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.20",
|
|
4
4
|
"description": "Modular browser worker for hashtree blob caching, tree-root state, and Blossom connectivity",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -71,8 +71,8 @@
|
|
|
71
71
|
"dexie": "^4.2.1",
|
|
72
72
|
"nostr-tools": "^2.18.2",
|
|
73
73
|
"@hashtree/core": "0.1.3",
|
|
74
|
-
"@hashtree/
|
|
75
|
-
"@hashtree/
|
|
74
|
+
"@hashtree/nostr": "0.1.6",
|
|
75
|
+
"@hashtree/dexie": "0.1.3"
|
|
76
76
|
},
|
|
77
77
|
"peerDependencies": {
|
|
78
78
|
"ndk": "*",
|
|
@@ -93,9 +93,9 @@
|
|
|
93
93
|
"devDependencies": {
|
|
94
94
|
"typescript": "^5.3.0",
|
|
95
95
|
"vitest": "^2.1.9",
|
|
96
|
-
"
|
|
96
|
+
"nostr-social-graph": "1.0.36",
|
|
97
97
|
"ndk-cache": "0.1.1",
|
|
98
|
-
"
|
|
98
|
+
"ndk": "0.1.1"
|
|
99
99
|
},
|
|
100
100
|
"scripts": {
|
|
101
101
|
"build": "tsc",
|