@qvac/core 0.5.0 → 0.6.0
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/CHANGELOG.md +75 -1
- package/dist-lib/lib/api/agents.js +3 -2
- package/dist-lib/lib/api/app-config.d.ts +1 -1
- package/dist-lib/lib/api/app-config.js +54 -15
- package/dist-lib/lib/api/attachments.d.ts +6 -5
- package/dist-lib/lib/api/attachments.js +4 -2
- package/dist-lib/lib/api/chat.d.ts +7 -3
- package/dist-lib/lib/api/chat.js +4 -4
- package/dist-lib/lib/api/chunks.js +3 -3
- package/dist-lib/lib/api/config.js +2 -2
- package/dist-lib/lib/api/current-mesh.d.ts +3 -4
- package/dist-lib/lib/api/current-mesh.js +9 -4
- package/dist-lib/lib/api/custom-models.d.ts +8 -1
- package/dist-lib/lib/api/custom-models.js +53 -16
- package/dist-lib/lib/api/devices.d.ts +14 -5
- package/dist-lib/lib/api/devices.js +13 -8
- package/dist-lib/lib/api/diagnostics.d.ts +1 -0
- package/dist-lib/lib/api/diagnostics.js +1 -1
- package/dist-lib/lib/api/effective-ctx-size.d.ts +6 -1
- package/dist-lib/lib/api/effective-ctx-size.js +5 -3
- package/dist-lib/lib/api/execution.js +2 -1
- package/dist-lib/lib/api/files.js +2 -1
- package/dist-lib/lib/api/index.d.ts +5 -1
- package/dist-lib/lib/api/index.js +101 -102
- package/dist-lib/lib/api/instrument.js +29 -20
- package/dist-lib/lib/api/knowledge.d.ts +6 -5
- package/dist-lib/lib/api/knowledge.js +8 -6
- package/dist-lib/lib/api/local-files.js +1 -1
- package/dist-lib/lib/api/logs.js +6 -3
- package/dist-lib/lib/api/members.js +22 -13
- package/dist-lib/lib/api/mesh.js +3 -3
- package/dist-lib/lib/api/model-download.js +1 -1
- package/dist-lib/lib/api/network.d.ts +1 -0
- package/dist-lib/lib/api/network.js +1 -1
- package/dist-lib/lib/api/notifications.js +23 -13
- package/dist-lib/lib/api/rag.d.ts +6 -1
- package/dist-lib/lib/api/rag.js +20 -11
- package/dist-lib/lib/api/range.d.ts +2 -2
- package/dist-lib/lib/api/sync.js +1 -1
- package/dist-lib/lib/api/tool-activity.js +7 -3
- package/dist-lib/lib/api/tool-configs.js +2 -4
- package/dist-lib/lib/api/upload-frames.d.ts +7 -8
- package/dist-lib/lib/api/upload-frames.js +2 -1
- package/dist-lib/lib/api/watchable.d.ts +6 -1
- package/dist-lib/lib/api/watchable.js +23 -14
- package/dist-lib/lib/assistant/fetch-body.js +4 -2
- package/dist-lib/lib/assistant/harness.d.ts +48 -27
- package/dist-lib/lib/assistant/harness.js +40 -16
- package/dist-lib/lib/assistant/history.d.ts +9 -7
- package/dist-lib/lib/assistant/history.js +77 -42
- package/dist-lib/lib/assistant/message.d.ts +5 -3
- package/dist-lib/lib/assistant/message.js +4 -2
- package/dist-lib/lib/assistant/skill-encode.d.ts +3 -1
- package/dist-lib/lib/assistant/skill-encode.js +52 -62
- package/dist-lib/lib/assistant-client.js +7 -4
- package/dist-lib/lib/assistant-tree.js +27 -11
- package/dist-lib/lib/assistant.d.ts +30 -11
- package/dist-lib/lib/assistant.js +824 -378
- package/dist-lib/lib/audio-format.d.ts +1 -1
- package/dist-lib/lib/audio-format.js +1 -1
- package/dist-lib/lib/chat-title.js +9 -4
- package/dist-lib/lib/client.js +3 -2
- package/dist-lib/lib/collabora/convert.d.ts +2 -2
- package/dist-lib/lib/collabora/convert.js +6 -3
- package/dist-lib/lib/collabora/entry.js +9 -5
- package/dist-lib/lib/collabora/protocol.d.ts +2 -2
- package/dist-lib/lib/collabora/protocol.js +14 -7
- package/dist-lib/lib/collabora/worker.js +14 -7
- package/dist-lib/lib/compaction.d.ts +5 -6
- package/dist-lib/lib/compaction.js +14 -7
- package/dist-lib/lib/core/account-recovery.d.ts +4 -3
- package/dist-lib/lib/core/account-recovery.js +7 -4
- package/dist-lib/lib/core/agent.js +17 -15
- package/dist-lib/lib/core/approval-rules.d.ts +7 -6
- package/dist-lib/lib/core/approval-rules.js +12 -6
- package/dist-lib/lib/core/archived-mesh.d.ts +7 -5
- package/dist-lib/lib/core/archived-mesh.js +25 -22
- package/dist-lib/lib/core/async-iterable.js +10 -5
- package/dist-lib/lib/core/attachment-link.d.ts +2 -2
- package/dist-lib/lib/core/audio-attachment.js +1 -1
- package/dist-lib/lib/core/blind-peers.d.ts +2 -2
- package/dist-lib/lib/core/chat-activity.d.ts +2 -2
- package/dist-lib/lib/core/chat-activity.js +42 -21
- package/dist-lib/lib/core/chat-group.d.ts +8 -6
- package/dist-lib/lib/core/chat-group.js +17 -10
- package/dist-lib/lib/core/chat-order.d.ts +11 -9
- package/dist-lib/lib/core/chat-order.js +1 -3
- package/dist-lib/lib/core/chat-search.d.ts +4 -4
- package/dist-lib/lib/core/chat-search.js +38 -24
- package/dist-lib/lib/core/chat.d.ts +20 -14
- package/dist-lib/lib/core/chat.js +42 -28
- package/dist-lib/lib/core/chunk.d.ts +19 -23
- package/dist-lib/lib/core/chunk.js +27 -21
- package/dist-lib/lib/core/collections.d.ts +69 -0
- package/dist-lib/lib/core/collections.js +69 -0
- package/dist-lib/lib/core/contract/activity.d.ts +6 -2
- package/dist-lib/lib/core/contract/activity.js +15 -12
- package/dist-lib/lib/core/contract/agents.js +3 -2
- package/dist-lib/lib/core/contract/approval-rules.js +1 -1
- package/dist-lib/lib/core/contract/attestations.js +1 -1
- package/dist-lib/lib/core/contract/chat-group.js +1 -1
- package/dist-lib/lib/core/contract/chat.js +1 -1
- package/dist-lib/lib/core/contract/chunks.js +10 -9
- package/dist-lib/lib/core/contract/compute.js +2 -1
- package/dist-lib/lib/core/contract/devices.js +6 -5
- package/dist-lib/lib/core/contract/grant-order.js +5 -6
- package/dist-lib/lib/core/contract/index.js +4 -2
- package/dist-lib/lib/core/contract/indexing.js +3 -3
- package/dist-lib/lib/core/contract/invites.d.ts +8 -3
- package/dist-lib/lib/core/contract/invites.js +52 -26
- package/dist-lib/lib/core/contract/joined-meshes.js +3 -3
- package/dist-lib/lib/core/contract/knowledge.js +5 -5
- package/dist-lib/lib/core/contract/members.d.ts +13 -2
- package/dist-lib/lib/core/contract/members.js +46 -25
- package/dist-lib/lib/core/contract/mesh-kind.js +9 -8
- package/dist-lib/lib/core/contract/seal.js +1 -1
- package/dist-lib/lib/core/contract/seed-defaults.js +1 -3
- package/dist-lib/lib/core/contract/tool-activity.js +5 -5
- package/dist-lib/lib/core/contract/tool-configs.js +1 -2
- package/dist-lib/lib/core/contract/writers.d.ts +6 -1
- package/dist-lib/lib/core/contract/writers.js +55 -34
- package/dist-lib/lib/core/departures.js +16 -8
- package/dist-lib/lib/core/device-invites.js +3 -2
- package/dist-lib/lib/core/devices.js +6 -3
- package/dist-lib/lib/core/document-attachment.d.ts +20 -11
- package/dist-lib/lib/core/document-attachment.js +10 -5
- package/dist-lib/lib/core/files/attachments.d.ts +2 -5
- package/dist-lib/lib/core/files/attachments.js +6 -3
- package/dist-lib/lib/core/files/index.d.ts +44 -52
- package/dist-lib/lib/core/files/index.js +142 -93
- package/dist-lib/lib/core/files/knowledge.d.ts +2 -5
- package/dist-lib/lib/core/files/local-index.js +9 -5
- package/dist-lib/lib/core/files/preview/image.d.ts +0 -1
- package/dist-lib/lib/core/files/preview/image.js +9 -6
- package/dist-lib/lib/core/files/preview/index.d.ts +8 -11
- package/dist-lib/lib/core/files/preview/index.js +20 -15
- package/dist-lib/lib/core/files/processing/claims.d.ts +6 -5
- package/dist-lib/lib/core/files/processing/claims.js +16 -8
- package/dist-lib/lib/core/files/processing/document.d.ts +21 -50
- package/dist-lib/lib/core/files/processing/index.d.ts +18 -13
- package/dist-lib/lib/core/files/processing/index.js +65 -37
- package/dist-lib/lib/core/files/processing/ownership.d.ts +8 -1
- package/dist-lib/lib/core/files/processing/ownership.js +1 -1
- package/dist-lib/lib/core/files/processing/protocol.d.ts +19 -19
- package/dist-lib/lib/core/files/processing/protocol.js +5 -5
- package/dist-lib/lib/core/files/processing/settle.d.ts +10 -7
- package/dist-lib/lib/core/files/processing/settle.js +22 -11
- package/dist-lib/lib/core/files/processing/source.js +14 -8
- package/dist-lib/lib/core/files/processing/state.d.ts +13 -11
- package/dist-lib/lib/core/files/processing/state.js +19 -12
- package/dist-lib/lib/core/files/rag/build.d.ts +2 -2
- package/dist-lib/lib/core/files/rag/build.js +2 -1
- package/dist-lib/lib/core/files/rag/document-types.d.ts +4 -6
- package/dist-lib/lib/core/files/rag/index.d.ts +10 -13
- package/dist-lib/lib/core/files/rag/index.js +3 -2
- package/dist-lib/lib/core/files/rag/load.d.ts +10 -9
- package/dist-lib/lib/core/files/rag/load.js +26 -13
- package/dist-lib/lib/core/files/rag/policy.js +2 -1
- package/dist-lib/lib/core/files/rag/produce.js +33 -19
- package/dist-lib/lib/core/files/rag/retrieval/full-text.d.ts +5 -3
- package/dist-lib/lib/core/files/rag/retrieval/full-text.js +30 -10
- package/dist-lib/lib/core/files/records/chunks.js +4 -2
- package/dist-lib/lib/core/files/records/knowledge.d.ts +10 -11
- package/dist-lib/lib/core/files/records/knowledge.js +9 -8
- package/dist-lib/lib/core/files/records/linkage.js +6 -3
- package/dist-lib/lib/core/files/records/output.d.ts +5 -4
- package/dist-lib/lib/core/files/records/output.js +8 -4
- package/dist-lib/lib/core/files/records/reclaim.js +41 -25
- package/dist-lib/lib/core/files/records/routing.d.ts +4 -6
- package/dist-lib/lib/core/files/records/routing.js +15 -8
- package/dist-lib/lib/core/files/records/source.d.ts +5 -4
- package/dist-lib/lib/core/files/records/source.js +20 -14
- package/dist-lib/lib/core/files/records/sweep.js +1 -3
- package/dist-lib/lib/core/files/store/blob.d.ts +10 -10
- package/dist-lib/lib/core/files/store/blob.js +25 -19
- package/dist-lib/lib/core/files/store/index.d.ts +1 -6
- package/dist-lib/lib/core/files/store/index.js +4 -4
- package/dist-lib/lib/core/files/store/inline.d.ts +2 -2
- package/dist-lib/lib/core/files/store/inline.js +6 -3
- package/dist-lib/lib/core/files/store/reference.d.ts +6 -9
- package/dist-lib/lib/core/files/store/reference.js +25 -17
- package/dist-lib/lib/core/files/store/server.d.ts +7 -6
- package/dist-lib/lib/core/files/store/server.js +22 -11
- package/dist-lib/lib/core/files/store/sweep.js +13 -7
- package/dist-lib/lib/core/files/upload-input.d.ts +4 -12
- package/dist-lib/lib/core/files/upload-input.js +10 -5
- package/dist-lib/lib/core/files/upload.d.ts +27 -24
- package/dist-lib/lib/core/files/upload.js +74 -51
- package/dist-lib/lib/core/fs-drives.js +4 -2
- package/dist-lib/lib/core/grant-expiry.js +12 -7
- package/dist-lib/lib/core/handoff-channel.js +27 -13
- package/dist-lib/lib/core/harness-loan.js +35 -17
- package/dist-lib/lib/core/helpers/index.js +6 -2
- package/dist-lib/lib/core/hosted-agents.js +19 -12
- package/dist-lib/lib/core/id.js +1 -1
- package/dist-lib/lib/core/identity.js +6 -3
- package/dist-lib/lib/core/image/cache-sweep.d.ts +12 -10
- package/dist-lib/lib/core/image/cache-sweep.js +11 -6
- package/dist-lib/lib/core/image/normalize.d.ts +6 -0
- package/dist-lib/lib/core/image/normalize.js +12 -2
- package/dist-lib/lib/core/image/sniff.js +42 -21
- package/dist-lib/lib/core/inference-calls-receiver.js +7 -4
- package/dist-lib/lib/core/invite-grants.js +4 -2
- package/dist-lib/lib/core/invite.js +2 -1
- package/dist-lib/lib/core/local/files.js +20 -19
- package/dist-lib/lib/core/local/index.d.ts +69 -46
- package/dist-lib/lib/core/local/index.js +146 -129
- package/dist-lib/lib/core/membership.d.ts +12 -2
- package/dist-lib/lib/core/membership.js +55 -33
- package/dist-lib/lib/core/mesh-seed-handoff.js +7 -1
- package/dist-lib/lib/core/mesh.d.ts +37 -27
- package/dist-lib/lib/core/mesh.js +131 -73
- package/dist-lib/lib/core/migrations/agent-catalog.js +3 -2
- package/dist-lib/lib/core/migrations/agent-indexes.js +3 -3
- package/dist-lib/lib/core/migrations/file-index.js +7 -4
- package/dist-lib/lib/core/migrations/index.d.ts +4 -3
- package/dist-lib/lib/core/migrations/membership.js +9 -4
- package/dist-lib/lib/core/migrations/seal.js +3 -2
- package/dist-lib/lib/core/min-version.js +4 -2
- package/dist-lib/lib/core/next-frame.d.ts +5 -4
- package/dist-lib/lib/core/next-frame.js +6 -3
- package/dist-lib/lib/core/notification.d.ts +5 -1
- package/dist-lib/lib/core/notification.js +89 -77
- package/dist-lib/lib/core/ota-config.js +2 -1
- package/dist-lib/lib/core/pdf/rasterize.d.ts +18 -0
- package/dist-lib/lib/core/pdf/rasterize.js +57 -0
- package/dist-lib/lib/core/prompt-history.js +4 -2
- package/dist-lib/lib/core/range.d.ts +4 -4
- package/dist-lib/lib/core/range.js +12 -6
- package/dist-lib/lib/core/rank.d.ts +5 -4
- package/dist-lib/lib/core/rank.js +2 -1
- package/dist-lib/lib/core/send.d.ts +4 -4
- package/dist-lib/lib/core/send.js +6 -3
- package/dist-lib/lib/core/skill-overlay-receiver.js +7 -4
- package/dist-lib/lib/core/skill-secrets.js +16 -9
- package/dist-lib/lib/core/sync/chunks.js +2 -1
- package/dist-lib/lib/core/sync/devices.js +3 -1
- package/dist-lib/lib/core/sync/files.d.ts +2 -4
- package/dist-lib/lib/core/sync/files.js +28 -20
- package/dist-lib/lib/core/sync/index.d.ts +2 -5
- package/dist-lib/lib/core/sync/index.js +20 -15
- package/dist-lib/lib/core/sync-status.js +10 -7
- package/dist-lib/lib/core/system-info.js +4 -2
- package/dist-lib/lib/core/tool-activity.d.ts +4 -3
- package/dist-lib/lib/core/tool-activity.js +1 -1
- package/dist-lib/lib/core/tool-configs.js +12 -7
- package/dist-lib/lib/core.d.ts +38 -26
- package/dist-lib/lib/core.js +987 -539
- package/dist-lib/lib/credential-pusher.d.ts +12 -17
- package/dist-lib/lib/credential-pusher.js +61 -42
- package/dist-lib/lib/custom-model-pusher.d.ts +7 -3
- package/dist-lib/lib/custom-model-pusher.js +15 -7
- package/dist-lib/lib/custom-model-task.d.ts +1 -0
- package/dist-lib/lib/custom-model-task.js +12 -0
- package/dist-lib/lib/deadline.js +4 -2
- package/dist-lib/lib/diagnostics.d.ts +1 -5
- package/dist-lib/lib/frame-readable.d.ts +3 -0
- package/dist-lib/lib/frame-readable.js +3 -0
- package/dist-lib/lib/fs-drive-bridge.js +24 -14
- package/dist-lib/lib/fs-grants.js +13 -8
- package/dist-lib/lib/guards.d.ts +3 -0
- package/dist-lib/lib/guards.js +9 -0
- package/dist-lib/lib/inference-calls.d.ts +28 -23
- package/dist-lib/lib/inference-calls.js +25 -13
- package/dist-lib/lib/integrations/mcp-providers.d.ts +2 -2
- package/dist-lib/lib/integrations/setup-routes.d.ts +2 -2
- package/dist-lib/lib/knowledge-search.d.ts +6 -5
- package/dist-lib/lib/knowledge-search.js +26 -18
- package/dist-lib/lib/kv-cache-reclaim.js +4 -2
- package/dist-lib/lib/kv-cache.js +8 -4
- package/dist-lib/lib/legacy-core-domain.d.ts +42 -42
- package/dist-lib/lib/log-buffer.js +2 -1
- package/dist-lib/lib/log.js +25 -15
- package/dist-lib/lib/mesh-scoped-engine.js +12 -4
- package/dist-lib/lib/model-catalog-revision.js +6 -3
- package/dist-lib/lib/model-clamp.js +6 -3
- package/dist-lib/lib/model-context.d.ts +8 -3
- package/dist-lib/lib/model-context.js +13 -5
- package/dist-lib/lib/model-download-status.js +4 -2
- package/dist-lib/lib/model-download.d.ts +12 -4
- package/dist-lib/lib/model-download.js +200 -103
- package/dist-lib/lib/model-idle-pusher.d.ts +2 -2
- package/dist-lib/lib/model-idle-pusher.js +3 -4
- package/dist-lib/lib/oauth/browser-connect.d.ts +10 -8
- package/dist-lib/lib/oauth/browser-connect.js +33 -20
- package/dist-lib/lib/oauth/client.d.ts +2 -2
- package/dist-lib/lib/oauth/flow-core.js +23 -9
- package/dist-lib/lib/oauth/flow.d.ts +1 -3
- package/dist-lib/lib/oauth/flow.js +9 -5
- package/dist-lib/lib/oauth/keys.d.ts +4 -4
- package/dist-lib/lib/oauth/keys.js +18 -12
- package/dist-lib/lib/oauth/loopback.d.ts +2 -2
- package/dist-lib/lib/oauth/loopback.js +147 -107
- package/dist-lib/lib/oauth/loopback.stub.d.ts +2 -2
- package/dist-lib/lib/oauth/loopback.stub.js +1 -1
- package/dist-lib/lib/oauth/pkce.d.ts +4 -2
- package/dist-lib/lib/oauth/pkce.js +10 -0
- package/dist-lib/lib/oauth/providers.js +5 -5
- package/dist-lib/lib/oauth/redirect-types.d.ts +12 -7
- package/dist-lib/lib/oauth/register.js +3 -2
- package/dist-lib/lib/oauth/registry.d.ts +2 -2
- package/dist-lib/lib/oauth/registry.js +2 -1
- package/dist-lib/lib/oauth/resolve.d.ts +30 -10
- package/dist-lib/lib/oauth/resolve.js +12 -6
- package/dist-lib/lib/oauth/token-exchange-core.d.ts +12 -4
- package/dist-lib/lib/oauth/token-exchange-core.js +1 -1
- package/dist-lib/lib/oauth/types.d.ts +12 -12
- package/dist-lib/lib/oauth.d.ts +4 -5
- package/dist-lib/lib/oauth.js +2 -3
- package/dist-lib/lib/reconnecting-watch.d.ts +1 -1
- package/dist-lib/lib/reconnecting-watch.js +6 -6
- package/dist-lib/lib/retry-budget.js +6 -3
- package/dist-lib/lib/run-notices.d.ts +1 -0
- package/dist-lib/lib/run-notices.js +5 -2
- package/dist-lib/lib/run-transcript.d.ts +2 -4
- package/dist-lib/lib/run-transcript.js +4 -2
- package/dist-lib/lib/skill-readiness.js +4 -2
- package/dist-lib/lib/skill-types.d.ts +16 -16
- package/dist-lib/lib/suspend-lifecycle.d.ts +4 -4
- package/dist-lib/lib/suspend-lifecycle.js +10 -5
- package/dist-lib/lib/task.js +22 -12
- package/dist-lib/lib/unref.d.ts +3 -2
- package/dist-lib/lib/unref.js +2 -1
- package/dist-lib/lib/wav-duration.js +10 -5
- package/dist-lib/lib/write-queue.d.ts +5 -4
- package/dist-lib/lib/write-queue.js +2 -1
- package/dist-lib/schema/build.js +10 -6
- package/dist-lib/schema/config.d.ts +2 -3
- package/dist-lib/schema/content.d.ts +17 -2
- package/dist-lib/schema/content.js +2 -1
- package/dist-lib/schema/engine.d.ts +3 -2
- package/dist-lib/schema/engine.js +95 -6
- package/dist-lib/schema/field-order.js +22 -11
- package/dist-lib/schema/indexes.d.ts +22 -0
- package/dist-lib/schema/{helpers.js → indexes.js} +14 -57
- package/dist-lib/schema/local.d.ts +3 -2
- package/dist-lib/schema/local.js +7 -2
- package/dist-lib/schema/media-kind.d.ts +8 -0
- package/dist-lib/schema/media-kind.js +52 -0
- package/dist-lib/schema/qvac.d.ts +12 -9
- package/dist-lib/schema/qvac.js +8 -4
- package/dist-lib/spec/bind.js +12 -0
- package/dist-lib/spec/calls.js +4 -0
- package/dist-lib/spec/capabilities.d.ts +12 -4
- package/dist-lib/spec/hrpc/hrpc.json +54 -2
- package/dist-lib/spec/hrpc/index.js +53 -5
- package/dist-lib/spec/hrpc/messages.js +783 -494
- package/dist-lib/spec/hyperschema/index.js +783 -494
- package/dist-lib/spec/hyperschema/schema.json +247 -1
- package/dist-lib/spec/hyperschema/types.d.ts +69 -1
- package/dist-lib/spec/local/hyperdb/index.js +1 -1
- package/dist-lib/spec/local/hyperdb/messages.js +82 -14
- package/dist-lib/spec/local/hyperschema/index.js +42 -8
- package/dist-lib/spec/local/hyperschema/schema.json +27 -1
- package/dist-lib/spec/local/hyperschema/types.d.ts +6 -1
- package/dist-lib/spec/mesh/hyperdb/index.js +1 -1
- package/package.json +7 -3
- package/tui/app.mjs +2424 -941
- package/tui/boot.mjs +17 -46
- package/tui/index.mjs +10 -5
- package/tui/lib/boot-timing.mjs +8 -8
- package/tui/lib/busy-words.mjs +21 -22
- package/tui/lib/export.mjs +100 -32
- package/tui/lib/knowledge-command.mjs +64 -19
- package/tui/lib/knowledge-import.mjs +52 -18
- package/tui/lib/render.mjs +65 -33
- package/tui/lib/save-file.mjs +30 -13
- package/tui/lib/select.mjs +23 -5
- package/tui/lib/selection.mjs +6 -4
- package/tui/lib/setup.mjs +11 -19
- package/tui/lib/sidebar.mjs +23 -13
- package/tui/lib/splash.mjs +6 -7
- package/tui/lib/upload-frames.mjs +1 -2
- package/tui/lib/usage.mjs +13 -9
- package/tui/lib/wrap.mjs +35 -6
- package/tui/main.mjs +54 -78
- package/worker/assistant-sidecar.mjs +5 -10
- package/worker/stow-entry.mjs +7 -4
- package/dist-lib/lib/custom-model-source.d.ts +0 -15
- package/dist-lib/lib/custom-model-source.js +0 -46
- package/dist-lib/lib/oauth/common.d.ts +0 -38
- package/dist-lib/lib/oauth/common.js +0 -34
- package/dist-lib/schema/helpers.d.ts +0 -33
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { mediaKindOrdinal } from '../../../../schema/
|
|
1
|
+
import { mediaKindOrdinal } from '../../../../schema/media-kind.js';
|
|
2
|
+
import { ATTACHMENTS_BY_MEDIA_KIND, CHATS, CHUNKS, CHUNKS_BY_CHAT, KNOWLEDGE } from '../../collections.js';
|
|
2
3
|
export function attachmentRecord(chunk) {
|
|
3
4
|
const file = chunk.attachment;
|
|
4
|
-
if (chunk.type !== 'attachment' || !file)
|
|
5
|
+
if (chunk.type !== 'attachment' || !file) {
|
|
5
6
|
return null;
|
|
7
|
+
}
|
|
6
8
|
return {
|
|
7
9
|
...file,
|
|
8
10
|
chatId: chunk.chatId,
|
|
@@ -17,48 +19,52 @@ export function attachmentRecord(chunk) {
|
|
|
17
19
|
}
|
|
18
20
|
export async function fileRecord(view, id, input) {
|
|
19
21
|
if (input === 'knowledge') {
|
|
20
|
-
const row = await view.get(
|
|
22
|
+
const row = await view.get(KNOWLEDGE, { id });
|
|
21
23
|
return row && { ...row, kind: input };
|
|
22
24
|
}
|
|
23
|
-
const chunk = await view.get(
|
|
25
|
+
const chunk = await view.get(CHUNKS, { id });
|
|
24
26
|
return chunk && attachmentRecord(chunk);
|
|
25
27
|
}
|
|
26
28
|
export async function fileIds(view, input, mediaKind) {
|
|
27
29
|
if (input === 'knowledge') {
|
|
28
|
-
return (await view.find(
|
|
30
|
+
return (await view.find(KNOWLEDGE).toArray()).map((row) => row.id);
|
|
29
31
|
}
|
|
30
32
|
const ids = [];
|
|
31
33
|
const chunks = mediaKind
|
|
32
|
-
? view.find(
|
|
34
|
+
? view.find(ATTACHMENTS_BY_MEDIA_KIND, {
|
|
33
35
|
gte: { mediaKind: mediaKindOrdinal(mediaKind) },
|
|
34
36
|
lte: { mediaKind: mediaKindOrdinal(mediaKind) }
|
|
35
37
|
})
|
|
36
|
-
: view.find(
|
|
38
|
+
: view.find(CHUNKS);
|
|
37
39
|
for await (const chunk of chunks) {
|
|
38
|
-
if (chunk.type === 'attachment' && chunk.id === chunk.attachment?.id)
|
|
40
|
+
if (chunk.type === 'attachment' && chunk.id === chunk.attachment?.id) {
|
|
39
41
|
ids.push(chunk.id);
|
|
42
|
+
}
|
|
40
43
|
}
|
|
41
44
|
return ids;
|
|
42
45
|
}
|
|
43
46
|
export async function claimSource(view, id) {
|
|
44
47
|
const knowledge = await fileRecord(view, id, 'knowledge');
|
|
45
|
-
if (knowledge)
|
|
48
|
+
if (knowledge) {
|
|
46
49
|
return knowledge.deletedAt ? null : knowledge;
|
|
50
|
+
}
|
|
47
51
|
const file = await fileRecord(view, id, 'attachment');
|
|
48
52
|
return file?.id === id && file.preview && !file.deletedAt ? file : null;
|
|
49
53
|
}
|
|
50
54
|
export async function scopedFile(view, { chatId, fileId }) {
|
|
51
|
-
const chat = await view.get(
|
|
52
|
-
if (chat?.deletedAt)
|
|
55
|
+
const chat = await view.get(CHATS, { id: chatId });
|
|
56
|
+
if (chat?.deletedAt) {
|
|
53
57
|
return null;
|
|
54
|
-
|
|
58
|
+
}
|
|
59
|
+
const direct = await view.get(CHUNKS, { id: fileId });
|
|
55
60
|
if (direct?.chatId === chatId && direct.attachment?.id === fileId) {
|
|
56
61
|
return direct.attachment.deletedAt ? null : attachmentRecord(direct);
|
|
57
62
|
}
|
|
58
63
|
const row = await fileRecord(view, fileId, 'knowledge');
|
|
59
|
-
if (row)
|
|
64
|
+
if (row) {
|
|
60
65
|
return row.chatId === chatId && !row.deletedAt ? row : null;
|
|
61
|
-
|
|
66
|
+
}
|
|
67
|
+
for await (const chunk of view.find(CHUNKS_BY_CHAT, {
|
|
62
68
|
gte: { chatId },
|
|
63
69
|
lte: { chatId }
|
|
64
70
|
})) {
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
const KNOWLEDGE = '@qvac/knowledge';
|
|
3
|
-
const KNOWLEDGE_ARTIFACTS = '@qvac/knowledge-artifacts';
|
|
1
|
+
import { CHUNKS, KNOWLEDGE, KNOWLEDGE_ARTIFACTS } from '../../collections.js';
|
|
4
2
|
export async function referencedBlobs(mesh) {
|
|
5
3
|
const references = [];
|
|
6
4
|
const snapshot = mesh.view.snapshot();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { BlobId } from 'hyperblobs';
|
|
2
2
|
import type Hyperblobs from 'hyperblobs';
|
|
3
3
|
import type { AbortSignal } from 'bare-abort-controller';
|
|
4
|
+
import { type NextFrameOptions } from '../../next-frame.ts';
|
|
4
5
|
export interface BlobHost {
|
|
5
6
|
readonly blobs: Hyperblobs;
|
|
6
7
|
openBlobs(key: Buffer): Promise<Hyperblobs>;
|
|
@@ -12,18 +13,17 @@ export type WriteProgress = {
|
|
|
12
13
|
blobId: BlobId;
|
|
13
14
|
byteLength: number;
|
|
14
15
|
};
|
|
15
|
-
export declare function writeBlob(blobs: Hyperblobs, chunks: AsyncIterable<Uint8Array>, options?:
|
|
16
|
-
signal?: AbortSignal;
|
|
17
|
-
inactivityMs?: number;
|
|
18
|
-
}): AsyncGenerator<WriteProgress>;
|
|
16
|
+
export declare function writeBlob(blobs: Hyperblobs, chunks: AsyncIterable<Uint8Array>, options?: NextFrameOptions): AsyncGenerator<WriteProgress>;
|
|
19
17
|
export declare function stringifyBlobId(blobs: Hyperblobs, id: BlobId): string;
|
|
20
|
-
export
|
|
18
|
+
export interface ReadBlobOptions {
|
|
21
19
|
readonly wait?: boolean;
|
|
22
20
|
readonly timeout?: number;
|
|
23
21
|
readonly signal?: AbortSignal;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
22
|
+
}
|
|
23
|
+
export interface BlobReadChunk {
|
|
24
|
+
readonly data: Buffer;
|
|
25
|
+
readonly bytesRead: number;
|
|
26
|
+
readonly byteLength: number;
|
|
27
|
+
}
|
|
28
|
+
export declare function readBlob(blobs: Hyperblobs, blobId: BlobId, options?: ReadBlobOptions): AsyncGenerator<BlobReadChunk>;
|
|
29
29
|
export declare function clearBlob(mesh: BlobHost, blobId: string, id: string): Promise<boolean>;
|
|
@@ -18,21 +18,12 @@ export async function* writeBlob(blobs, chunks, options = {}) {
|
|
|
18
18
|
const chunk = next.value;
|
|
19
19
|
bytesWritten += chunk.length;
|
|
20
20
|
if (!ws.write(chunk)) {
|
|
21
|
-
|
|
22
|
-
const drained = new Promise((resolve) => {
|
|
23
|
-
onDrain = () => resolve();
|
|
24
|
-
ws.once('drain', onDrain);
|
|
25
|
-
});
|
|
26
|
-
try {
|
|
27
|
-
await Promise.race([drained, done]);
|
|
28
|
-
}
|
|
29
|
-
finally {
|
|
30
|
-
ws.off('drain', onDrain);
|
|
31
|
-
}
|
|
21
|
+
await drained(ws, done);
|
|
32
22
|
}
|
|
33
23
|
next = await nextFrame(it, options);
|
|
34
|
-
if (next.done)
|
|
24
|
+
if (next.done) {
|
|
35
25
|
break;
|
|
26
|
+
}
|
|
36
27
|
yield { bytesWritten };
|
|
37
28
|
}
|
|
38
29
|
ws.end();
|
|
@@ -45,19 +36,32 @@ export async function* writeBlob(blobs, chunks, options = {}) {
|
|
|
45
36
|
void it.return?.().catch(noop);
|
|
46
37
|
ws.end();
|
|
47
38
|
const settled = await done.then(() => true, () => false);
|
|
48
|
-
if (settled && ws.id.blockLength > 0)
|
|
39
|
+
if (settled && ws.id.blockLength > 0) {
|
|
49
40
|
await blobs.clear(ws.id).catch(noop);
|
|
41
|
+
}
|
|
50
42
|
}
|
|
51
43
|
}
|
|
52
44
|
}
|
|
45
|
+
async function drained(ws, done) {
|
|
46
|
+
const drain = Promise.withResolvers();
|
|
47
|
+
const onDrain = () => drain.resolve();
|
|
48
|
+
ws.once('drain', onDrain);
|
|
49
|
+
try {
|
|
50
|
+
await Promise.race([drain.promise, done]);
|
|
51
|
+
}
|
|
52
|
+
finally {
|
|
53
|
+
ws.off('drain', onDrain);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
53
56
|
const noop = () => { };
|
|
54
57
|
export function stringifyBlobId(blobs, id) {
|
|
55
58
|
return JSON.stringify({ ...id, coreKey: b4a.toHex(blobs.core.key) });
|
|
56
59
|
}
|
|
57
60
|
export async function* readBlob(blobs, blobId, options = {}) {
|
|
58
61
|
const { signal, ...readOptions } = options;
|
|
59
|
-
if (signal?.aborted)
|
|
62
|
+
if (signal?.aborted) {
|
|
60
63
|
throw new AbortedError();
|
|
64
|
+
}
|
|
61
65
|
const rs = blobs.createReadStream(blobId, readOptions);
|
|
62
66
|
const abort = () => rs.destroy(new AbortedError());
|
|
63
67
|
signal?.addEventListener('abort', abort, { once: true });
|
|
@@ -75,9 +79,11 @@ export async function* readBlob(blobs, blobId, options = {}) {
|
|
|
75
79
|
}
|
|
76
80
|
export async function clearBlob(mesh, blobId, id) {
|
|
77
81
|
try {
|
|
78
|
-
|
|
82
|
+
const reference = parseBlobReference(blobId);
|
|
83
|
+
if (reference.inline) {
|
|
79
84
|
return true;
|
|
80
|
-
|
|
85
|
+
}
|
|
86
|
+
await clearBlobRef(mesh, reference);
|
|
81
87
|
return true;
|
|
82
88
|
}
|
|
83
89
|
catch (err) {
|
|
@@ -85,13 +91,13 @@ export async function clearBlob(mesh, blobId, id) {
|
|
|
85
91
|
return false;
|
|
86
92
|
}
|
|
87
93
|
}
|
|
88
|
-
async function clearBlobRef(mesh,
|
|
89
|
-
const { coreKey,
|
|
94
|
+
async function clearBlobRef(mesh, reference) {
|
|
95
|
+
const { coreKey, blobId: id } = reference;
|
|
90
96
|
if (!coreKey || coreKey === b4a.toHex(mesh.blobs.core.key)) {
|
|
91
97
|
await mesh.blobs.clear(id);
|
|
92
98
|
return;
|
|
93
99
|
}
|
|
94
|
-
const remote = await mesh.openBlobs(
|
|
100
|
+
const remote = await mesh.openBlobs(b4a.from(coreKey, 'hex'));
|
|
95
101
|
try {
|
|
96
102
|
await remote.clear(id);
|
|
97
103
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Buffer } from 'buffer';
|
|
2
1
|
import EventEmitter from 'bare-events';
|
|
3
2
|
import type Hyperblobs from 'hyperblobs';
|
|
4
3
|
import { stringifyBlobId, writeBlob, type BlobHost } from './blob.ts';
|
|
@@ -23,11 +22,7 @@ export declare class BlobStore extends EventEmitter {
|
|
|
23
22
|
}>;
|
|
24
23
|
reference(id: Parameters<typeof stringifyBlobId>[1]): string;
|
|
25
24
|
inline(bytes: Buffer, mimeType: string): string;
|
|
26
|
-
read(reference: string, options?: Parameters<typeof readBlobReference>[2]): AsyncGenerator<
|
|
27
|
-
data: Buffer;
|
|
28
|
-
bytesRead: number;
|
|
29
|
-
byteLength: number;
|
|
30
|
-
}, any, any>;
|
|
25
|
+
read(reference: string, options?: Parameters<typeof readBlobReference>[2]): AsyncGenerator<import("./blob.ts").BlobReadChunk, any, any>;
|
|
31
26
|
readBytes(reference: string, options?: Parameters<typeof readBlobReferenceBytes>[2]): Promise<Buffer<ArrayBufferLike>>;
|
|
32
27
|
download(reference: string, options: Parameters<typeof downloadBlobReference>[2]): Promise<void>;
|
|
33
28
|
clear(reference: string, id: string): Promise<boolean>;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import b4a from 'b4a';
|
|
2
|
-
import { Buffer } from 'buffer';
|
|
3
2
|
import EventEmitter from 'bare-events';
|
|
4
3
|
import { sweepUnreferenced } from './sweep.js';
|
|
5
4
|
import { inlineReference } from './inline.js';
|
|
@@ -50,13 +49,14 @@ export class BlobStore extends EventEmitter {
|
|
|
50
49
|
return false;
|
|
51
50
|
try {
|
|
52
51
|
const { blobId, coreKey, inline } = parseBlobReference(reference);
|
|
53
|
-
if (inline)
|
|
52
|
+
if (inline) {
|
|
54
53
|
return true;
|
|
54
|
+
}
|
|
55
55
|
let blobs = this.blobs;
|
|
56
|
-
if (coreKey && coreKey !== b4a.
|
|
56
|
+
if (coreKey && coreKey !== b4a.toHex(blobs.core.key)) {
|
|
57
57
|
let reader = this._readers.get(coreKey);
|
|
58
58
|
if (!reader) {
|
|
59
|
-
reader = this.openBlobs(
|
|
59
|
+
reader = this.openBlobs(b4a.from(coreKey, 'hex')).then((remote) => {
|
|
60
60
|
remote.core.on('download', this._updated);
|
|
61
61
|
return remote;
|
|
62
62
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const MAX_INLINE_BYTES: number;
|
|
2
2
|
export declare const MAX_REFERENCE_CHARS: number;
|
|
3
|
-
export
|
|
3
|
+
export interface InlinePayload {
|
|
4
4
|
mimeType: string;
|
|
5
5
|
data: string;
|
|
6
|
-
}
|
|
6
|
+
}
|
|
7
7
|
export declare function inlineReference(bytes: Buffer, mimeType: string): string;
|
|
8
8
|
export declare function readInline(record: Record<string, unknown>): InlinePayload | undefined;
|
|
@@ -2,8 +2,9 @@ import b4a from 'b4a';
|
|
|
2
2
|
export const MAX_INLINE_BYTES = 512 * 1024;
|
|
3
3
|
export const MAX_REFERENCE_CHARS = 4 * Math.ceil(MAX_INLINE_BYTES / 3) + 1024;
|
|
4
4
|
export function inlineReference(bytes, mimeType) {
|
|
5
|
-
if (bytes.length > MAX_INLINE_BYTES)
|
|
5
|
+
if (bytes.length > MAX_INLINE_BYTES) {
|
|
6
6
|
throw new Error('inline output exceeds 512 KiB');
|
|
7
|
+
}
|
|
7
8
|
return JSON.stringify({
|
|
8
9
|
blockOffset: 0,
|
|
9
10
|
blockLength: 0,
|
|
@@ -30,9 +31,11 @@ export function readInline(record) {
|
|
|
30
31
|
}
|
|
31
32
|
const { data, mimeType } = inline;
|
|
32
33
|
const bytes = b4a.from(data, 'base64');
|
|
33
|
-
if (bytes.length > MAX_INLINE_BYTES)
|
|
34
|
+
if (bytes.length > MAX_INLINE_BYTES) {
|
|
34
35
|
throw new Error('inline output exceeds 512 KiB');
|
|
35
|
-
|
|
36
|
+
}
|
|
37
|
+
if (b4a.toString(bytes, 'base64') !== data) {
|
|
36
38
|
throw new TypeError('invalid inline output');
|
|
39
|
+
}
|
|
37
40
|
return { mimeType, data };
|
|
38
41
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { BlobId } from 'hyperblobs';
|
|
2
|
-
import { type BlobHost } from './blob.ts';
|
|
2
|
+
import { type BlobHost, type BlobReadChunk } from './blob.ts';
|
|
3
3
|
import type { AbortSignal } from 'bare-abort-controller';
|
|
4
4
|
import { type InlinePayload } from './inline.ts';
|
|
5
5
|
export interface ParsedBlobReference {
|
|
@@ -16,12 +16,9 @@ export declare function isInvalidBlobReferenceError(error: unknown): error is Ty
|
|
|
16
16
|
export declare function parseBlobReferenceCoreKey(blobReference: string): string | undefined;
|
|
17
17
|
export declare function parseBlobReference(blobReference: string): ParsedBlobReference;
|
|
18
18
|
export declare function compareBlobReferences(left: string, right: string, localCoreKey?: string): boolean | null;
|
|
19
|
-
export declare function readBlobReference(mesh: BlobHost, blobReference: string, options?: BlobReferenceReadOptions): AsyncGenerator<
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}>;
|
|
24
|
-
export declare function downloadBlobReference(mesh: BlobHost, reference: string, { signal }: {
|
|
25
|
-
signal: AbortSignal;
|
|
26
|
-
}): Promise<void>;
|
|
19
|
+
export declare function readBlobReference(mesh: BlobHost, blobReference: string, options?: BlobReferenceReadOptions): AsyncGenerator<BlobReadChunk>;
|
|
20
|
+
export interface DownloadBlobReferenceOptions {
|
|
21
|
+
readonly signal: AbortSignal;
|
|
22
|
+
}
|
|
23
|
+
export declare function downloadBlobReference(mesh: BlobHost, reference: string, { signal }: DownloadBlobReferenceOptions): Promise<void>;
|
|
27
24
|
export declare function readBlobReferenceBytes(mesh: BlobHost, blobReference: string, options?: BlobReferenceReadOptions): Promise<Buffer>;
|
|
@@ -2,6 +2,7 @@ import { readBlob } from './blob.js';
|
|
|
2
2
|
import { AbortedError, raceAbort } from '@qvac/harness/race-abort';
|
|
3
3
|
import { MAX_REFERENCE_CHARS, readInline } from './inline.js';
|
|
4
4
|
import b4a from 'b4a';
|
|
5
|
+
import { isRecord } from '../../../guards.js';
|
|
5
6
|
const CORE_KEY_PATTERN = /^[0-9a-f]{64}$/;
|
|
6
7
|
const DEFAULT_REMOTE_TIMEOUT_MS = 15_000;
|
|
7
8
|
const INVALID_BLOB_REFERENCE = 'invalid blob reference';
|
|
@@ -15,12 +16,10 @@ export function isInvalidBlobReferenceError(error) {
|
|
|
15
16
|
function blobUnavailable(cause) {
|
|
16
17
|
return new Error(BLOB_UNAVAILABLE, { cause });
|
|
17
18
|
}
|
|
18
|
-
function isRecord(value) {
|
|
19
|
-
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
20
|
-
}
|
|
21
19
|
function parseBlobReferenceRecord(blobReference) {
|
|
22
|
-
if (blobReference.length > MAX_REFERENCE_CHARS)
|
|
20
|
+
if (blobReference.length > MAX_REFERENCE_CHARS) {
|
|
23
21
|
throw invalidBlobReference();
|
|
22
|
+
}
|
|
24
23
|
let value;
|
|
25
24
|
try {
|
|
26
25
|
value = JSON.parse(blobReference);
|
|
@@ -28,8 +27,9 @@ function parseBlobReferenceRecord(blobReference) {
|
|
|
28
27
|
catch {
|
|
29
28
|
throw invalidBlobReference();
|
|
30
29
|
}
|
|
31
|
-
if (!isRecord(value))
|
|
30
|
+
if (!isRecord(value)) {
|
|
32
31
|
throw invalidBlobReference();
|
|
32
|
+
}
|
|
33
33
|
return value;
|
|
34
34
|
}
|
|
35
35
|
function readCoreKey(record) {
|
|
@@ -51,8 +51,9 @@ export function parseBlobReferenceCoreKey(blobReference) {
|
|
|
51
51
|
}
|
|
52
52
|
export function parseBlobReference(blobReference) {
|
|
53
53
|
const value = parseBlobReferenceRecord(blobReference);
|
|
54
|
-
if (value.blockMap)
|
|
54
|
+
if (value.blockMap) {
|
|
55
55
|
throw invalidBlobReference();
|
|
56
|
+
}
|
|
56
57
|
let inline;
|
|
57
58
|
try {
|
|
58
59
|
inline = readInline(value);
|
|
@@ -85,8 +86,9 @@ export function compareBlobReferences(left, right, localCoreKey) {
|
|
|
85
86
|
a.blobId.byteLength === b.blobId.byteLength);
|
|
86
87
|
}
|
|
87
88
|
catch (error) {
|
|
88
|
-
if (isInvalidBlobReferenceError(error))
|
|
89
|
+
if (isInvalidBlobReferenceError(error)) {
|
|
89
90
|
return null;
|
|
91
|
+
}
|
|
90
92
|
throw error;
|
|
91
93
|
}
|
|
92
94
|
}
|
|
@@ -107,10 +109,11 @@ async function closeRemote(remote) {
|
|
|
107
109
|
}
|
|
108
110
|
export async function* readBlobReference(mesh, blobReference, options = {}) {
|
|
109
111
|
const { blobId, coreKey, inline } = parseBlobReference(blobReference);
|
|
110
|
-
if (options.signal?.aborted)
|
|
112
|
+
if (options.signal?.aborted) {
|
|
111
113
|
throw new AbortedError();
|
|
114
|
+
}
|
|
112
115
|
if (inline) {
|
|
113
|
-
const data =
|
|
116
|
+
const data = b4a.from(inline.data, 'base64');
|
|
114
117
|
yield { data, bytesRead: data.length, byteLength: data.length };
|
|
115
118
|
return;
|
|
116
119
|
}
|
|
@@ -118,14 +121,16 @@ export async function* readBlobReference(mesh, blobReference, options = {}) {
|
|
|
118
121
|
const readOptions = options.wait === false ? { wait: false } : { timeout: remoteTimeout(options) };
|
|
119
122
|
let remote = null;
|
|
120
123
|
try {
|
|
121
|
-
if (!local)
|
|
122
|
-
remote = await mesh.openBlobs(
|
|
124
|
+
if (!local) {
|
|
125
|
+
remote = await mesh.openBlobs(b4a.from(coreKey, 'hex'));
|
|
126
|
+
}
|
|
123
127
|
const blobs = remote ?? mesh.blobs;
|
|
124
128
|
yield* readBlob(blobs, blobId, { ...readOptions, signal: options.signal });
|
|
125
129
|
}
|
|
126
130
|
catch (err) {
|
|
127
|
-
if (options.signal?.aborted || err instanceof AbortedError)
|
|
131
|
+
if (options.signal?.aborted || err instanceof AbortedError) {
|
|
128
132
|
throw new AbortedError();
|
|
133
|
+
}
|
|
129
134
|
throw blobUnavailable(err);
|
|
130
135
|
}
|
|
131
136
|
finally {
|
|
@@ -134,17 +139,20 @@ export async function* readBlobReference(mesh, blobReference, options = {}) {
|
|
|
134
139
|
}
|
|
135
140
|
export async function downloadBlobReference(mesh, reference, { signal }) {
|
|
136
141
|
const { blobId, coreKey, inline } = parseBlobReference(reference);
|
|
137
|
-
if (signal.aborted)
|
|
142
|
+
if (signal.aborted) {
|
|
138
143
|
throw new AbortedError();
|
|
139
|
-
|
|
144
|
+
}
|
|
145
|
+
if (inline || !blobId.blockLength) {
|
|
140
146
|
return;
|
|
147
|
+
}
|
|
141
148
|
let remote = null;
|
|
142
149
|
try {
|
|
143
150
|
if (coreKey && coreKey !== b4a.toHex(mesh.blobs.core.key)) {
|
|
144
|
-
remote = await mesh.openBlobs(
|
|
151
|
+
remote = await mesh.openBlobs(b4a.from(coreKey, 'hex'));
|
|
145
152
|
}
|
|
146
|
-
if (signal.aborted)
|
|
153
|
+
if (signal.aborted) {
|
|
147
154
|
throw new AbortedError();
|
|
155
|
+
}
|
|
148
156
|
const range = (remote ?? mesh.blobs).core.download({
|
|
149
157
|
start: blobId.blockOffset,
|
|
150
158
|
end: blobId.blockOffset + blobId.blockLength
|
|
@@ -165,5 +173,5 @@ export async function readBlobReferenceBytes(mesh, blobReference, options = {})
|
|
|
165
173
|
for await (const frame of readBlobReference(mesh, blobReference, options)) {
|
|
166
174
|
chunks.push(frame.data);
|
|
167
175
|
}
|
|
168
|
-
return
|
|
176
|
+
return b4a.concat(chunks);
|
|
169
177
|
}
|
|
@@ -2,13 +2,17 @@ import type Corestore from 'corestore';
|
|
|
2
2
|
import ReadyResource from 'ready-resource';
|
|
3
3
|
import type { LinkableAttachment } from '../../attachment-link.ts';
|
|
4
4
|
import type Hyperblobs from 'hyperblobs';
|
|
5
|
-
export
|
|
5
|
+
export interface MeshBlobKeys {
|
|
6
6
|
key: Buffer;
|
|
7
7
|
blobs: Hyperblobs;
|
|
8
8
|
encryptionKey: Buffer;
|
|
9
|
-
}
|
|
9
|
+
}
|
|
10
10
|
export type MeshForBlobCore = (coreKey: string, blockOffset: number | undefined, meshKey: Buffer | undefined) => MeshBlobKeys | null | Promise<MeshBlobKeys | null>;
|
|
11
11
|
export type BlobRead = (mesh: MeshBlobKeys, coreKey: Buffer, blockOffset: number) => void;
|
|
12
|
+
export interface CoreBlobServerOptions {
|
|
13
|
+
readonly readTimeoutMs?: number;
|
|
14
|
+
readonly onRead?: BlobRead | null;
|
|
15
|
+
}
|
|
12
16
|
export declare class CoreBlobServer extends ReadyResource {
|
|
13
17
|
private readonly _store;
|
|
14
18
|
private readonly _mesh;
|
|
@@ -17,10 +21,7 @@ export declare class CoreBlobServer extends ReadyResource {
|
|
|
17
21
|
private readonly _readTimeoutMs;
|
|
18
22
|
private readonly _onRead;
|
|
19
23
|
private _suspended;
|
|
20
|
-
constructor(store: Corestore, mesh: MeshForBlobCore, { readTimeoutMs, onRead }?:
|
|
21
|
-
readTimeoutMs?: number;
|
|
22
|
-
onRead?: BlobRead | null;
|
|
23
|
-
});
|
|
24
|
+
constructor(store: Corestore, mesh: MeshForBlobCore, { readTimeoutMs, onRead }?: CoreBlobServerOptions);
|
|
24
25
|
get port(): number;
|
|
25
26
|
link({ blobId, mimeType }: LinkableAttachment, source: MeshBlobKeys): string | null;
|
|
26
27
|
suspend(): Promise<void>;
|
|
@@ -27,8 +27,9 @@ export class CoreBlobServer extends ReadyResource {
|
|
|
27
27
|
if (!this.opened || this.closing)
|
|
28
28
|
return null;
|
|
29
29
|
const parsed = this._parse(blobId);
|
|
30
|
-
if (!parsed || parsed.inline)
|
|
30
|
+
if (!parsed || parsed.inline) {
|
|
31
31
|
return null;
|
|
32
|
+
}
|
|
32
33
|
return this._server.getLink(parsed.coreKey ?? b4a.toHex(source.blobs.core.key), {
|
|
33
34
|
blob: parsed.blobId,
|
|
34
35
|
drive: source.key,
|
|
@@ -39,8 +40,9 @@ export class CoreBlobServer extends ReadyResource {
|
|
|
39
40
|
if (this.closing)
|
|
40
41
|
return;
|
|
41
42
|
this._suspended = true;
|
|
42
|
-
if (!this.opened)
|
|
43
|
+
if (!this.opened) {
|
|
43
44
|
await this.ready();
|
|
45
|
+
}
|
|
44
46
|
await Promise.all([...this._probes].map((core) => core.close()));
|
|
45
47
|
await this._server.suspend();
|
|
46
48
|
}
|
|
@@ -49,13 +51,15 @@ export class CoreBlobServer extends ReadyResource {
|
|
|
49
51
|
return;
|
|
50
52
|
if (!this.opened)
|
|
51
53
|
await this.ready();
|
|
52
|
-
if (this.closing)
|
|
54
|
+
if (this.closing) {
|
|
53
55
|
return;
|
|
56
|
+
}
|
|
54
57
|
this._suspended = false;
|
|
55
58
|
const before = this._server.port;
|
|
56
59
|
await this._server.resume();
|
|
57
|
-
if (this._server.port !== before)
|
|
60
|
+
if (this._server.port !== before) {
|
|
58
61
|
this.emit('rebound', this._server.port);
|
|
62
|
+
}
|
|
59
63
|
}
|
|
60
64
|
async _open() {
|
|
61
65
|
await this._server.listen();
|
|
@@ -69,36 +73,42 @@ export class CoreBlobServer extends ReadyResource {
|
|
|
69
73
|
const { blob, range } = info;
|
|
70
74
|
const meshKey = info.drive ?? undefined;
|
|
71
75
|
const current = await this._mesh(b4a.toHex(key), blob?.blockOffset, meshKey);
|
|
72
|
-
if (!current || this.closing || this._suspended)
|
|
76
|
+
if (!current || this.closing || this._suspended) {
|
|
73
77
|
return null;
|
|
78
|
+
}
|
|
74
79
|
const keys = { encryptionKey: current.encryptionKey };
|
|
75
|
-
if (!blob || info.head || blob.byteLength === 0)
|
|
80
|
+
if (!blob || info.head || blob.byteLength === 0) {
|
|
76
81
|
return keys;
|
|
82
|
+
}
|
|
77
83
|
const start = range?.start ?? 0;
|
|
78
84
|
const end = !range || range.end === -1 ? blob.byteLength - 1 : Math.min(range.end, blob.byteLength - 1);
|
|
79
|
-
if (start > end)
|
|
85
|
+
if (start > end) {
|
|
80
86
|
return keys;
|
|
87
|
+
}
|
|
81
88
|
const core = this._store.get({ key, ...keys });
|
|
82
89
|
const deadline = Date.now() + this._readTimeoutMs;
|
|
83
90
|
this._probes.add(core);
|
|
84
91
|
try {
|
|
85
92
|
await core.ready();
|
|
86
|
-
if (this.closing || this._suspended || Date.now() >= deadline)
|
|
93
|
+
if (this.closing || this._suspended || Date.now() >= deadline) {
|
|
87
94
|
return null;
|
|
95
|
+
}
|
|
88
96
|
const position = start === 0
|
|
89
97
|
? [blob.blockOffset, 0]
|
|
90
98
|
: await core.seek(blob.byteOffset + start, {
|
|
91
99
|
timeout: Math.max(1, deadline - Date.now())
|
|
92
100
|
});
|
|
93
|
-
if (!position || this.closing || this._suspended || Date.now() >= deadline)
|
|
101
|
+
if (!position || this.closing || this._suspended || Date.now() >= deadline) {
|
|
94
102
|
return null;
|
|
103
|
+
}
|
|
95
104
|
const bytes = await core.get(position[0], { timeout: Math.max(1, deadline - Date.now()) });
|
|
96
105
|
const served = bytes &&
|
|
97
106
|
(await this._mesh(b4a.toHex(key), blob.blockOffset, meshKey)) === current &&
|
|
98
107
|
!this.closing &&
|
|
99
108
|
!this._suspended;
|
|
100
|
-
if (served)
|
|
109
|
+
if (served) {
|
|
101
110
|
this._onRead?.(current, key, blob.blockOffset);
|
|
111
|
+
}
|
|
102
112
|
return served ? keys : null;
|
|
103
113
|
}
|
|
104
114
|
catch {
|
|
@@ -114,8 +124,9 @@ export class CoreBlobServer extends ReadyResource {
|
|
|
114
124
|
return parseBlobReference(blobReference);
|
|
115
125
|
}
|
|
116
126
|
catch (err) {
|
|
117
|
-
if (isInvalidBlobReferenceError(err))
|
|
127
|
+
if (isInvalidBlobReferenceError(err)) {
|
|
118
128
|
return null;
|
|
129
|
+
}
|
|
119
130
|
throw err;
|
|
120
131
|
}
|
|
121
132
|
}
|
|
@@ -3,21 +3,25 @@ import b4a from 'b4a';
|
|
|
3
3
|
export async function sweepUnreferenced(blobs, references, coreLength) {
|
|
4
4
|
const ranges = [];
|
|
5
5
|
const key = b4a.toHex(blobs.core.key);
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
const local = { localCoreKey: key, coreLength };
|
|
7
|
+
for (const reference of references) {
|
|
8
|
+
addLocalRange(ranges, reference, local);
|
|
9
|
+
}
|
|
8
10
|
await clearGaps(blobs, mergeRanges(ranges), coreLength);
|
|
9
11
|
}
|
|
10
|
-
function addLocalRange(ranges, reference, localCoreKey, coreLength) {
|
|
12
|
+
function addLocalRange(ranges, reference, { localCoreKey, coreLength }) {
|
|
11
13
|
const coreKey = parseBlobReferenceCoreKey(reference);
|
|
12
|
-
if (coreKey && coreKey !== localCoreKey)
|
|
14
|
+
if (coreKey && coreKey !== localCoreKey) {
|
|
13
15
|
return;
|
|
16
|
+
}
|
|
14
17
|
const { blobId } = parseBlobReference(reference);
|
|
15
18
|
const end = blobId.blockOffset + blobId.blockLength;
|
|
16
19
|
if (!Number.isSafeInteger(end) || end > coreLength) {
|
|
17
20
|
throw new TypeError('blob reference exceeds local core');
|
|
18
21
|
}
|
|
19
|
-
if (blobId.blockLength > 0)
|
|
22
|
+
if (blobId.blockLength > 0) {
|
|
20
23
|
ranges.push({ start: blobId.blockOffset, end });
|
|
24
|
+
}
|
|
21
25
|
}
|
|
22
26
|
function mergeRanges(ranges) {
|
|
23
27
|
const sorted = [...ranges].sort((a, b) => a.start - b.start || a.end - b.end);
|
|
@@ -37,10 +41,12 @@ function mergeRanges(ranges) {
|
|
|
37
41
|
async function clearGaps(blobs, ranges, coreLength) {
|
|
38
42
|
let cursor = 0;
|
|
39
43
|
for (const range of ranges) {
|
|
40
|
-
if (cursor < range.start)
|
|
44
|
+
if (cursor < range.start) {
|
|
41
45
|
await blobs.core.clear(cursor, range.start);
|
|
46
|
+
}
|
|
42
47
|
cursor = range.end;
|
|
43
48
|
}
|
|
44
|
-
if (cursor < coreLength)
|
|
49
|
+
if (cursor < coreLength) {
|
|
45
50
|
await blobs.core.clear(cursor, coreLength);
|
|
51
|
+
}
|
|
46
52
|
}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
import type { HandlerFrames } from '../../../spec/capabilities.d.ts';
|
|
2
|
-
|
|
3
|
-
readonly
|
|
4
|
-
|
|
5
|
-
readonly destroying: boolean;
|
|
6
|
-
on(event: 'close', listener: () => void): void;
|
|
7
|
-
off(event: 'close', listener: () => void): void;
|
|
8
|
-
};
|
|
9
|
-
};
|
|
2
|
+
export interface UploadInputOptions {
|
|
3
|
+
readonly inactivityMs?: number;
|
|
4
|
+
}
|
|
10
5
|
export declare class UploadInput<T extends {
|
|
11
6
|
data?: Buffer | null;
|
|
12
7
|
}> {
|
|
@@ -17,11 +12,8 @@ export declare class UploadInput<T extends {
|
|
|
17
12
|
private readonly _onClose;
|
|
18
13
|
onData: ((bytes: number) => void) | null;
|
|
19
14
|
onFailure: ((error: unknown) => void) | null;
|
|
20
|
-
constructor(frames: AsyncIterable<T> |
|
|
21
|
-
inactivityMs?: number;
|
|
22
|
-
});
|
|
15
|
+
constructor(frames: AsyncIterable<T> | HandlerFrames<T>, options: UploadInputOptions);
|
|
23
16
|
check(): void;
|
|
24
17
|
fail(error: unknown): void;
|
|
25
18
|
close(): void;
|
|
26
19
|
}
|
|
27
|
-
export {};
|