@qvac/core 0.5.0 → 0.6.1
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 +92 -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 +31 -11
- package/dist-lib/lib/assistant.js +846 -390
- 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 +50 -31
- 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 +70 -0
- package/dist-lib/lib/core/collections.js +70 -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.d.ts +2 -0
- package/dist-lib/lib/core/contract/chat.js +67 -1
- package/dist-lib/lib/core/contract/chunks.js +15 -9
- package/dist-lib/lib/core/contract/compute.d.ts +1 -1
- package/dist-lib/lib/core/contract/compute.js +4 -2
- 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 +10 -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 +46 -52
- package/dist-lib/lib/core/files/index.js +149 -94
- package/dist-lib/lib/core/files/knowledge.d.ts +2 -5
- package/dist-lib/lib/core/files/local-index.d.ts +4 -1
- 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 +21 -13
- package/dist-lib/lib/core/files/processing/index.js +74 -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 +14 -11
- package/dist-lib/lib/core/files/processing/state.js +24 -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 +12 -13
- package/dist-lib/lib/core/files/rag/index.js +9 -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/index.d.ts +1 -0
- package/dist-lib/lib/core/files/records/index.js +1 -0
- 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/purge.d.ts +4 -0
- package/dist-lib/lib/core/files/records/purge.js +108 -0
- package/dist-lib/lib/core/files/records/reclaim.js +43 -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 +11 -10
- package/dist-lib/lib/core/files/store/blob.js +54 -19
- package/dist-lib/lib/core/files/store/index.d.ts +2 -6
- package/dist-lib/lib/core/files/store/index.js +10 -5
- 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.d.ts +2 -0
- package/dist-lib/lib/core/local/files.js +51 -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 +33 -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 +1009 -541
- package/dist-lib/lib/credential-pusher.d.ts +20 -20
- package/dist-lib/lib/credential-pusher.js +65 -43
- 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 +18 -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/db.json +16 -1
- package/dist-lib/spec/mesh/hyperdb/index.js +72 -3
- package/dist-lib/spec/mesh/hyperdb/messages.js +400 -221
- package/dist-lib/spec/mesh/hyperdispatch/dispatch.json +7 -1
- package/dist-lib/spec/mesh/hyperdispatch/index.js +18 -1
- package/dist-lib/spec/mesh/hyperdispatch/messages.js +117 -2
- package/dist-lib/spec/mesh/hyperschema/index.js +117 -2
- package/dist-lib/spec/mesh/hyperschema/schema.json +65 -1
- package/dist-lib/spec/mesh/hyperschema/types.d.ts +19 -1
- package/package.json +8 -4
- package/tui/app.mjs +2424 -941
- package/tui/boot.mjs +18 -49
- 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,9 +1,9 @@
|
|
|
1
1
|
import type { Harness } from './assistant.ts';
|
|
2
2
|
import type { openLocalStore } from './core/local/index.ts';
|
|
3
3
|
type LocalStore = Awaited<ReturnType<typeof openLocalStore>>;
|
|
4
|
-
|
|
4
|
+
interface Logger {
|
|
5
5
|
warn(...args: unknown[]): void;
|
|
6
|
-
}
|
|
6
|
+
}
|
|
7
7
|
export type ModelIdleTarget = Pick<Harness, 'setModelIdleTimeout'>;
|
|
8
8
|
export type ModelIdleSource = Pick<LocalStore, 'get' | 'watch' | 'unwatch'>;
|
|
9
9
|
export declare function startModelIdlePusher(harness: ModelIdleTarget, state: ModelIdleSource, logger?: Logger | null): () => Promise<void>;
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import ScopeLock from 'scope-lock';
|
|
2
2
|
import { MODEL_IDLE_UNLOAD_KEY, MODEL_IDLE_UNLOAD_MINUTES } from './constants.js';
|
|
3
|
+
import { errorMessage } from './guards.js';
|
|
3
4
|
export function startModelIdlePusher(harness, state, logger) {
|
|
4
5
|
const lock = new ScopeLock({ debounce: true });
|
|
5
6
|
let disposed = false;
|
|
6
7
|
let pushed = null;
|
|
7
8
|
const push = async () => {
|
|
8
9
|
const ms = idleUnloadMs(await state.get(MODEL_IDLE_UNLOAD_KEY));
|
|
9
|
-
if (disposed || ms === pushed)
|
|
10
|
+
if (disposed || ms === pushed) {
|
|
10
11
|
return;
|
|
12
|
+
}
|
|
11
13
|
await harness.setModelIdleTimeout?.(ms);
|
|
12
14
|
pushed = ms;
|
|
13
15
|
};
|
|
@@ -37,6 +39,3 @@ export function startModelIdlePusher(harness, state, logger) {
|
|
|
37
39
|
function idleUnloadMs(value) {
|
|
38
40
|
return typeof value === 'number' && MODEL_IDLE_UNLOAD_MINUTES.includes(value) ? value * 60_000 : 0;
|
|
39
41
|
}
|
|
40
|
-
function errorMessage(error) {
|
|
41
|
-
return error instanceof Error ? error.message : String(error);
|
|
42
|
-
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
export
|
|
2
|
-
port: number;
|
|
3
|
-
state: string;
|
|
4
|
-
timeoutMs?: number;
|
|
5
|
-
onListening?: () => void;
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
export interface WaitForOAuthCallbackOptions {
|
|
2
|
+
readonly port: number;
|
|
3
|
+
readonly state: string;
|
|
4
|
+
readonly timeoutMs?: number;
|
|
5
|
+
readonly onListening?: () => void;
|
|
6
|
+
}
|
|
7
|
+
export interface OAuthCallbackCode {
|
|
8
|
+
readonly code: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function waitForOAuthCallback(opts: WaitForOAuthCallbackOptions): Promise<OAuthCallbackCode>;
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { createServer } from 'http';
|
|
2
2
|
import { URL } from 'url';
|
|
3
|
-
import {
|
|
3
|
+
import { OAUTH_CALLBACK_PATH, OAUTH_WAIT_FOR_CODE_TIMEOUT_MS } from './keys.js';
|
|
4
4
|
export function waitForOAuthCallback(opts) {
|
|
5
|
-
const { port, state, timeoutMs =
|
|
5
|
+
const { port, state, timeoutMs = OAUTH_WAIT_FOR_CODE_TIMEOUT_MS, onListening } = opts;
|
|
6
6
|
return new Promise((resolve, reject) => {
|
|
7
7
|
let settled = false;
|
|
8
|
-
const respond = (res, status, body = '', close = false) => {
|
|
8
|
+
const respond = (res, status, { body = '', close = false } = {}) => {
|
|
9
9
|
const headers = { 'Content-Type': 'text/html; charset=utf-8' };
|
|
10
|
-
if (close)
|
|
10
|
+
if (close) {
|
|
11
11
|
headers.Connection = 'close';
|
|
12
|
+
}
|
|
12
13
|
res.writeHead(status, headers);
|
|
13
14
|
res.end(body);
|
|
14
15
|
};
|
|
15
|
-
const settle = (
|
|
16
|
+
const settle = (outcome, res) => {
|
|
16
17
|
if (settled)
|
|
17
18
|
return;
|
|
18
19
|
settled = true;
|
|
@@ -22,37 +23,49 @@ export function waitForOAuthCallback(opts) {
|
|
|
22
23
|
server.closeAllConnections?.();
|
|
23
24
|
};
|
|
24
25
|
const socket = res?.socket;
|
|
25
|
-
if (socket)
|
|
26
|
+
if (socket) {
|
|
26
27
|
socket.once('close', close);
|
|
27
|
-
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
28
30
|
close();
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
}
|
|
32
|
+
if ('error' in outcome) {
|
|
33
|
+
reject(outcome.error);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
resolve(outcome);
|
|
37
|
+
}
|
|
33
38
|
};
|
|
34
39
|
const server = createServer((req, res) => {
|
|
35
40
|
const url = new URL(req.url ?? '/', `http://127.0.0.1:${port}`);
|
|
36
|
-
if (url.pathname !==
|
|
37
|
-
return respond(res, 404, 'Not found');
|
|
38
|
-
|
|
41
|
+
if (url.pathname !== OAUTH_CALLBACK_PATH) {
|
|
42
|
+
return respond(res, 404, { body: 'Not found' });
|
|
43
|
+
}
|
|
44
|
+
if (url.searchParams.get('state') !== state) {
|
|
39
45
|
return respond(res, 204);
|
|
46
|
+
}
|
|
40
47
|
const error = url.searchParams.get('error');
|
|
41
48
|
const code = url.searchParams.get('code');
|
|
42
49
|
if (error) {
|
|
43
|
-
respond(res, 200,
|
|
44
|
-
|
|
50
|
+
respond(res, 200, {
|
|
51
|
+
body: '<html><body><p>Authorization failed. You can close this tab.</p></body></html>',
|
|
52
|
+
close: true
|
|
53
|
+
});
|
|
54
|
+
settle({ error: new Error(`OAuth error: ${error}`) }, res);
|
|
45
55
|
}
|
|
46
56
|
else if (code) {
|
|
47
|
-
respond(res, 200,
|
|
48
|
-
|
|
57
|
+
respond(res, 200, {
|
|
58
|
+
body: '<html><body><p>You can close this tab.</p></body></html>',
|
|
59
|
+
close: true
|
|
60
|
+
});
|
|
61
|
+
settle({ code }, res);
|
|
49
62
|
}
|
|
50
63
|
else {
|
|
51
64
|
respond(res, 204);
|
|
52
65
|
}
|
|
53
66
|
});
|
|
54
|
-
const timer = setTimeout(() => settle(new Error('OAuth callback timed out')), timeoutMs);
|
|
55
|
-
server.once('error', (err) => settle(err));
|
|
67
|
+
const timer = setTimeout(() => settle({ error: new Error('OAuth callback timed out') }), timeoutMs);
|
|
68
|
+
server.once('error', (err) => settle({ error: err }));
|
|
56
69
|
server.listen(port, '127.0.0.1', () => onListening?.());
|
|
57
70
|
});
|
|
58
71
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { type OAuthRuntimeFlowDeps } from './flow-core.ts';
|
|
2
2
|
import { isTokenExpired } from './token-exchange-core.ts';
|
|
3
3
|
import type { OAuthProviderConfig, OAuthRuntime, OAuthTokens } from './types.ts';
|
|
4
|
-
export
|
|
4
|
+
export interface OAuthClient {
|
|
5
5
|
readonly runOAuthFlow: (config: OAuthProviderConfig, deps: OAuthRuntimeFlowDeps) => Promise<OAuthTokens>;
|
|
6
6
|
readonly refreshOAuthTokens: (config: OAuthProviderConfig, refreshToken: string) => Promise<OAuthTokens>;
|
|
7
|
-
}
|
|
7
|
+
}
|
|
8
8
|
export declare function createOAuthClient(runtime: OAuthRuntime): OAuthClient;
|
|
9
9
|
export { isTokenExpired };
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { generateRuntimePkceChallenge } from './pkce-runtime.js';
|
|
2
2
|
import { resolveDynamicClientId } from './register.js';
|
|
3
3
|
import { exchangeCodeWithFetch } from './token-exchange-core.js';
|
|
4
|
-
function buildAuthParams(config, clientId, redirectUri, state, pkce) {
|
|
4
|
+
function buildAuthParams(config, { clientId, redirectUri, state, pkce }) {
|
|
5
5
|
const params = new URLSearchParams({
|
|
6
|
-
...
|
|
6
|
+
...config.extraAuthParams,
|
|
7
7
|
client_id: clientId,
|
|
8
8
|
redirect_uri: redirectUri,
|
|
9
9
|
response_type: 'code',
|
|
@@ -11,25 +11,39 @@ function buildAuthParams(config, clientId, redirectUri, state, pkce) {
|
|
|
11
11
|
code_challenge: pkce.challenge,
|
|
12
12
|
code_challenge_method: 'S256'
|
|
13
13
|
});
|
|
14
|
-
if (config.scopes.length > 0)
|
|
14
|
+
if (config.scopes.length > 0) {
|
|
15
15
|
params.set('scope', config.scopes.join(' '));
|
|
16
|
+
}
|
|
16
17
|
return params;
|
|
17
18
|
}
|
|
18
19
|
export async function runOAuthFlowWithRuntime(config, deps, runtime) {
|
|
19
20
|
const openUrl = deps.openUrl ??
|
|
20
21
|
(() => Promise.reject(new Error('OAuth browser launcher is unavailable; inject openUrl or createRedirect')));
|
|
21
|
-
const
|
|
22
|
+
const pkce = await generateRuntimePkceChallenge(runtime);
|
|
23
|
+
const state = runtime.randomBase64Url(16);
|
|
24
|
+
const redirect = await deps.createRedirect({ port: config.port, credentialKey: config.credentialKey, state }, { openUrl });
|
|
22
25
|
try {
|
|
23
26
|
const clientId = config.dynamicRegistration && !config.clientId
|
|
24
27
|
? await resolveDynamicClientId(config, redirect.redirectUri, deps, runtime.fetch)
|
|
25
28
|
: config.clientId;
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
const authParams = buildAuthParams(config, {
|
|
30
|
+
clientId,
|
|
31
|
+
redirectUri: redirect.redirectUri,
|
|
32
|
+
state,
|
|
33
|
+
pkce
|
|
34
|
+
});
|
|
29
35
|
const callback = await redirect.authorize(`${config.authUrl}?${authParams.toString()}`, deps.timeoutMs, state);
|
|
30
|
-
if (callback.state !== state)
|
|
36
|
+
if (callback.state !== state) {
|
|
31
37
|
throw new Error('OAuth state mismatch (possible CSRF)');
|
|
32
|
-
|
|
38
|
+
}
|
|
39
|
+
return exchangeCodeWithFetch(config, {
|
|
40
|
+
clientId,
|
|
41
|
+
redirectUri: redirect.redirectUri,
|
|
42
|
+
code: callback.code,
|
|
43
|
+
verifier: pkce.verifier,
|
|
44
|
+
deps,
|
|
45
|
+
fetchImpl: runtime.fetch
|
|
46
|
+
});
|
|
33
47
|
}
|
|
34
48
|
finally {
|
|
35
49
|
redirect.close();
|
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import type { OAuthFlowDeps, OAuthProviderConfig, OAuthTokens } from './types.ts';
|
|
2
|
-
export declare function cancelOAuthFlow(target:
|
|
3
|
-
credentialKey: string;
|
|
4
|
-
}): Promise<boolean>;
|
|
2
|
+
export declare function cancelOAuthFlow(target: Pick<OAuthProviderConfig, 'credentialKey'>): Promise<boolean>;
|
|
5
3
|
export declare function runOAuthFlow(config: OAuthProviderConfig, deps?: OAuthFlowDeps): Promise<OAuthTokens>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { abortOAuthLoopback,
|
|
1
|
+
import { abortOAuthLoopback, openOAuthLoopback } from '#oauth-loopback';
|
|
2
2
|
import { randomBase64Url, sha256Base64Url } from '@qvac/core/oauth/runtime/crypto';
|
|
3
3
|
import defaultFetch from '@qvac/core/oauth/runtime/fetch';
|
|
4
4
|
import { runOAuthFlowWithRuntime } from './flow-core.js';
|
|
@@ -6,12 +6,15 @@ export function cancelOAuthFlow(target) {
|
|
|
6
6
|
return abortOAuthLoopback(target.credentialKey);
|
|
7
7
|
}
|
|
8
8
|
const loopbackRedirect = async (target, deps) => {
|
|
9
|
-
const loopback = await
|
|
9
|
+
const loopback = await openOAuthLoopback(target.port, {
|
|
10
|
+
credentialKey: target.credentialKey,
|
|
11
|
+
state: target.state
|
|
12
|
+
});
|
|
10
13
|
return {
|
|
11
14
|
redirectUri: loopback.redirectUri,
|
|
12
|
-
async authorize(authUrl, timeoutMs
|
|
13
|
-
const callback = loopback.waitForCode(timeoutMs
|
|
14
|
-
callback.catch(
|
|
15
|
+
async authorize(authUrl, timeoutMs) {
|
|
16
|
+
const callback = loopback.waitForCode(timeoutMs);
|
|
17
|
+
callback.catch(noop);
|
|
15
18
|
await deps.openUrl(authUrl);
|
|
16
19
|
return callback;
|
|
17
20
|
},
|
|
@@ -21,3 +24,4 @@ const loopbackRedirect = async (target, deps) => {
|
|
|
21
24
|
export function runOAuthFlow(config, deps = {}) {
|
|
22
25
|
return runOAuthFlowWithRuntime(config, { ...deps, createRedirect: deps.createRedirect ?? loopbackRedirect }, { fetch: defaultFetch, randomBase64Url, sha256Base64Url });
|
|
23
26
|
}
|
|
27
|
+
function noop() { }
|
|
@@ -4,7 +4,7 @@ export type OAuthKeySpec = SkillOAuthConfig & {
|
|
|
4
4
|
readonly credentialKey: string;
|
|
5
5
|
readonly provider: string;
|
|
6
6
|
};
|
|
7
|
-
|
|
7
|
+
interface OAuthConfigLike {
|
|
8
8
|
readonly stateKey?: string | null | undefined;
|
|
9
9
|
readonly authUrl?: string | null | undefined;
|
|
10
10
|
readonly tokenUrl?: string | null | undefined;
|
|
@@ -14,12 +14,12 @@ type OAuthConfigLike = {
|
|
|
14
14
|
readonly registrationEndpoint?: string | null | undefined;
|
|
15
15
|
readonly port?: number | null | undefined;
|
|
16
16
|
readonly sharedIosSession?: boolean | null | undefined;
|
|
17
|
-
}
|
|
18
|
-
export
|
|
17
|
+
}
|
|
18
|
+
export interface OAuthRouteLike {
|
|
19
19
|
readonly credentialKey?: string | null | undefined;
|
|
20
20
|
readonly provider?: string | null | undefined;
|
|
21
21
|
readonly oauth?: OAuthConfigLike | null | undefined;
|
|
22
|
-
}
|
|
22
|
+
}
|
|
23
23
|
export declare function specFromRoute(route: OAuthRouteLike): OAuthKeySpec | null;
|
|
24
24
|
export declare const OAUTH_CALLBACK_PATH = "/callback";
|
|
25
25
|
export declare const OAUTH_WAIT_FOR_CODE_TIMEOUT_MS = 120000;
|
|
@@ -18,27 +18,33 @@ function httpsUrl(value) {
|
|
|
18
18
|
function portOf(value) {
|
|
19
19
|
if (value === undefined || value === null)
|
|
20
20
|
return null;
|
|
21
|
-
return Number.isInteger(value) && value >= 0 && value <= 65535
|
|
21
|
+
return typeof value === 'number' && Number.isInteger(value) && value >= 0 && value <= 65535
|
|
22
22
|
? value
|
|
23
23
|
: null;
|
|
24
24
|
}
|
|
25
25
|
export function specFromRoute(route) {
|
|
26
26
|
const oauth = route.oauth;
|
|
27
|
-
if (!oauth)
|
|
27
|
+
if (!oauth) {
|
|
28
28
|
return null;
|
|
29
|
+
}
|
|
29
30
|
const tokenAuth = tokenAuthOf(oauth.tokenAuth);
|
|
30
31
|
const authUrl = httpsUrl(oauth.authUrl);
|
|
31
32
|
const tokenUrl = httpsUrl(oauth.tokenUrl);
|
|
32
|
-
if (!route.credentialKey || !oauth.stateKey || !authUrl || !tokenUrl || !tokenAuth)
|
|
33
|
+
if (!route.credentialKey || !oauth.stateKey || !authUrl || !tokenUrl || !tokenAuth) {
|
|
33
34
|
return null;
|
|
34
|
-
|
|
35
|
+
}
|
|
36
|
+
if (oauth.stateKey === route.credentialKey) {
|
|
35
37
|
return null;
|
|
36
|
-
|
|
38
|
+
}
|
|
39
|
+
if (oauth.port !== undefined && oauth.port !== null && portOf(oauth.port) === null) {
|
|
37
40
|
return null;
|
|
38
|
-
|
|
41
|
+
}
|
|
42
|
+
if (oauth.registrationEndpoint && !httpsUrl(oauth.registrationEndpoint)) {
|
|
39
43
|
return null;
|
|
40
|
-
|
|
44
|
+
}
|
|
45
|
+
if (oauth.registrationEndpoint && tokenAuth !== 'pkce-only') {
|
|
41
46
|
return null;
|
|
47
|
+
}
|
|
42
48
|
const extraParams = stringRecord(oauth.extraAuthParams);
|
|
43
49
|
const port = portOf(oauth.port);
|
|
44
50
|
return {
|
|
@@ -49,16 +55,16 @@ export function specFromRoute(route) {
|
|
|
49
55
|
tokenUrl,
|
|
50
56
|
tokenAuth,
|
|
51
57
|
scopes: stringList(oauth.scopes),
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
58
|
+
extraAuthParams: extraParams ?? undefined,
|
|
59
|
+
registrationEndpoint: oauth.registrationEndpoint || undefined,
|
|
60
|
+
port: port ?? undefined,
|
|
61
|
+
sharedIosSession: oauth.sharedIosSession === true || undefined
|
|
56
62
|
};
|
|
57
63
|
}
|
|
58
64
|
function stringRecord(value) {
|
|
59
65
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
60
66
|
return null;
|
|
61
|
-
const entries = Object.entries(value).filter((
|
|
67
|
+
const entries = Object.entries(value).filter((entry) => typeof entry[1] === 'string');
|
|
62
68
|
return entries.length > 0 ? Object.fromEntries(entries) : null;
|
|
63
69
|
}
|
|
64
70
|
function stringList(value) {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { OAuthLoopbackServer } from './redirect-types.ts';
|
|
1
|
+
import type { OAuthLoopbackServer, OAuthLoopbackTarget } from './redirect-types.ts';
|
|
2
2
|
export declare function abortOAuthLoopback(credentialKey: string): Promise<boolean>;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function openOAuthLoopback(port: number, target: OAuthLoopbackTarget): Promise<OAuthLoopbackServer>;
|
|
@@ -1,132 +1,172 @@
|
|
|
1
1
|
import { createServer } from 'http';
|
|
2
2
|
import { OAUTH_CALLBACK_PATH, OAUTH_WAIT_FOR_CODE_TIMEOUT_MS, oauthRedirectUri } from './keys.js';
|
|
3
|
-
const
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
server.closeAllConnections?.();
|
|
11
|
-
server.close(() => resolve());
|
|
12
|
-
});
|
|
13
|
-
}
|
|
14
|
-
async function abortMatching(matches, reason) {
|
|
15
|
-
await Promise.all(matches.map((handle) => handle.abort(reason)));
|
|
16
|
-
return matches.length > 0;
|
|
3
|
+
const DONE_PAGE = '<html><body><p>Authorization complete. You may close this tab.</p>' +
|
|
4
|
+
'<script>window.close();</script></body></html>';
|
|
5
|
+
const STALE_PAGE = '<html><body><p>This sign-in link is from an earlier attempt. ' +
|
|
6
|
+
'You can close this tab.</p></body></html>';
|
|
7
|
+
const loopbacks = new Set();
|
|
8
|
+
export async function abortOAuthLoopback(credentialKey) {
|
|
9
|
+
return abortFor(credentialKey, new Error('OAuth flow cancelled'));
|
|
17
10
|
}
|
|
18
11
|
function abortFor(credentialKey, reason) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
12
|
+
const pending = [...loopbacks]
|
|
13
|
+
.flatMap((loopback) => [...loopback.waiters.values()])
|
|
14
|
+
.filter((waiter) => waiter.credentialKey === credentialKey && waiter.settled === null);
|
|
15
|
+
for (const waiter of pending) {
|
|
16
|
+
settle(waiter, { ok: false, error: reason });
|
|
17
|
+
}
|
|
18
|
+
return pending.length > 0;
|
|
23
19
|
}
|
|
24
|
-
export async function
|
|
20
|
+
export async function openOAuthLoopback(port, target) {
|
|
25
21
|
if (!Number.isInteger(port) || port < 0 || port > 65535) {
|
|
26
22
|
throw new Error(`OAuth loopback port must be an integer in [0, 65535], got ${port}`);
|
|
27
23
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
24
|
+
abortFor(target.credentialKey, new Error('OAuth loopback superseded by a new connect attempt'));
|
|
25
|
+
const loopback = acquire(port);
|
|
26
|
+
if (loopback.waiters.has(target.state)) {
|
|
27
|
+
throw new Error(`OAuth loopback on port ${port} already has a flow on state ${target.state}`);
|
|
28
|
+
}
|
|
29
|
+
const waiter = { credentialKey: target.credentialKey, deliver: null, settled: null };
|
|
30
|
+
loopback.waiters.set(target.state, waiter);
|
|
31
|
+
let bound;
|
|
32
|
+
try {
|
|
33
|
+
bound = await loopback.ready;
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
release(loopback, target.state);
|
|
37
|
+
throw error;
|
|
31
38
|
}
|
|
32
|
-
let
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
let released = false;
|
|
40
|
+
return {
|
|
41
|
+
redirectUri: oauthRedirectUri(bound.port),
|
|
42
|
+
waitForCode(timeoutMs = OAUTH_WAIT_FOR_CODE_TIMEOUT_MS) {
|
|
43
|
+
if (waiter.settled) {
|
|
44
|
+
return promiseFor(waiter.settled);
|
|
45
|
+
}
|
|
46
|
+
if (waiter.deliver) {
|
|
47
|
+
throw new Error('OAuth loopback is already waiting for this code');
|
|
48
|
+
}
|
|
49
|
+
return new Promise((resolve, reject) => {
|
|
50
|
+
const timer = globalThis.setTimeout(() => settle(waiter, { ok: false, error: new Error('OAuth callback timed out') }), timeoutMs);
|
|
51
|
+
waiter.deliver = (settlement) => {
|
|
52
|
+
globalThis.clearTimeout(timer);
|
|
53
|
+
if (settlement.ok) {
|
|
54
|
+
resolve(settlement.result);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
reject(settlement.error);
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
});
|
|
61
|
+
},
|
|
62
|
+
close() {
|
|
63
|
+
if (released)
|
|
64
|
+
return;
|
|
65
|
+
released = true;
|
|
66
|
+
settle(waiter, { ok: false, error: new Error('OAuth loopback closed') });
|
|
67
|
+
release(loopback, target.state);
|
|
68
|
+
}
|
|
41
69
|
};
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
70
|
+
}
|
|
71
|
+
function acquire(port) {
|
|
72
|
+
const existing = port === 0 ? undefined : [...loopbacks].find((l) => l.requestedPort === port);
|
|
73
|
+
if (existing && !existing.teardown) {
|
|
74
|
+
return existing;
|
|
75
|
+
}
|
|
76
|
+
const settled = existing?.teardown ?? Promise.resolve();
|
|
77
|
+
if (existing) {
|
|
78
|
+
loopbacks.delete(existing);
|
|
79
|
+
}
|
|
80
|
+
const waiters = new Map();
|
|
81
|
+
const loopback = {
|
|
82
|
+
requestedPort: port,
|
|
83
|
+
waiters,
|
|
84
|
+
ready: settled.then(() => listen(port, waiters)),
|
|
85
|
+
teardown: null
|
|
53
86
|
};
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
response.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
71
|
-
response.end('<html><body><p>Authorization complete. You may close this tab.</p>' +
|
|
72
|
-
'<script>window.close();</script></body></html>');
|
|
73
|
-
settle(error, code, state);
|
|
74
|
-
response.on('close', () => server.close());
|
|
87
|
+
loopbacks.add(loopback);
|
|
88
|
+
return loopback;
|
|
89
|
+
}
|
|
90
|
+
function release(loopback, state) {
|
|
91
|
+
loopback.waiters.delete(state);
|
|
92
|
+
if (loopback.waiters.size > 0) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const teardown = loopback.ready.then(closeServer, () => undefined);
|
|
96
|
+
loopback.teardown = teardown;
|
|
97
|
+
teardown.then(() => loopbacks.delete(loopback));
|
|
98
|
+
}
|
|
99
|
+
function closeServer(bound) {
|
|
100
|
+
return new Promise((resolve) => {
|
|
101
|
+
bound.server.closeAllConnections?.();
|
|
102
|
+
bound.server.close(() => resolve());
|
|
75
103
|
});
|
|
104
|
+
}
|
|
105
|
+
function listen(port, waiters) {
|
|
76
106
|
return new Promise((resolve, reject) => {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (
|
|
107
|
+
const server = createServer((request, response) => {
|
|
108
|
+
const url = new URL(request.url ?? '/', 'http://127.0.0.1');
|
|
109
|
+
if (url.pathname !== OAUTH_CALLBACK_PATH) {
|
|
110
|
+
respond(response, 404, { contentType: 'text/plain', body: 'Not found' });
|
|
80
111
|
return;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
112
|
+
}
|
|
113
|
+
const state = url.searchParams.get('state');
|
|
114
|
+
if (state === null) {
|
|
115
|
+
respond(response, 200, { contentType: 'text/html; charset=utf-8', body: STALE_PAGE });
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
const waiter = waiters.get(state);
|
|
119
|
+
if (!waiter || waiter.settled) {
|
|
120
|
+
respond(response, 200, { contentType: 'text/html; charset=utf-8', body: STALE_PAGE });
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
respond(response, 200, { contentType: 'text/html; charset=utf-8', body: DONE_PAGE });
|
|
124
|
+
settle(waiter, callbackSettlement(url.searchParams, state));
|
|
125
|
+
});
|
|
126
|
+
let listening = false;
|
|
127
|
+
server.on('error', (error) => {
|
|
128
|
+
if (listening)
|
|
129
|
+
return;
|
|
130
|
+
reject('code' in error && error.code === 'EADDRINUSE'
|
|
84
131
|
? new Error(`OAuth loopback port ${port} is already in use by another process`)
|
|
85
132
|
: error);
|
|
86
|
-
};
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return;
|
|
90
|
-
listenSettled = true;
|
|
91
|
-
server.removeListener('error', onError);
|
|
133
|
+
});
|
|
134
|
+
server.once('listening', () => {
|
|
135
|
+
listening = true;
|
|
92
136
|
const address = server.address();
|
|
93
137
|
if (typeof address !== 'object' || !address) {
|
|
94
138
|
server.close();
|
|
95
139
|
reject(new Error('OAuth loopback bound to no address'));
|
|
96
140
|
return;
|
|
97
141
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
port: address.port,
|
|
101
|
-
abort: (reason) => {
|
|
102
|
-
abortedReason = reason;
|
|
103
|
-
rejectWaiter(reason);
|
|
104
|
-
return closeServer(server);
|
|
105
|
-
}
|
|
106
|
-
};
|
|
107
|
-
activeLoopbacks.add(handle);
|
|
108
|
-
server.once('close', () => activeLoopbacks.delete(handle));
|
|
109
|
-
resolve({
|
|
110
|
-
redirectUri: oauthRedirectUri(address.port),
|
|
111
|
-
waitForCode(timeoutMs = OAUTH_WAIT_FOR_CODE_TIMEOUT_MS, expected) {
|
|
112
|
-
if (abortedReason)
|
|
113
|
-
throw abortedReason;
|
|
114
|
-
expectedState = expected ?? null;
|
|
115
|
-
return new Promise((resolveWait, rejectWait) => {
|
|
116
|
-
resolveCode = resolveWait;
|
|
117
|
-
rejectCode = rejectWait;
|
|
118
|
-
const timeout = globalThis.setTimeout(() => {
|
|
119
|
-
server.close();
|
|
120
|
-
rejectWait(new Error('OAuth callback timed out'));
|
|
121
|
-
}, timeoutMs);
|
|
122
|
-
server.once('close', () => globalThis.clearTimeout(timeout));
|
|
123
|
-
});
|
|
124
|
-
},
|
|
125
|
-
close: () => server.close()
|
|
126
|
-
});
|
|
127
|
-
};
|
|
128
|
-
server.once('error', onError);
|
|
129
|
-
server.once('listening', onListening);
|
|
142
|
+
resolve({ server, port: address.port });
|
|
143
|
+
});
|
|
130
144
|
server.listen(port, '127.0.0.1');
|
|
131
145
|
});
|
|
132
146
|
}
|
|
147
|
+
function callbackSettlement(params, state) {
|
|
148
|
+
const error = params.get('error');
|
|
149
|
+
if (error) {
|
|
150
|
+
return { ok: false, error: new Error(`OAuth error: ${error}`) };
|
|
151
|
+
}
|
|
152
|
+
const code = params.get('code');
|
|
153
|
+
if (!code) {
|
|
154
|
+
return { ok: false, error: new Error('OAuth callback missing code') };
|
|
155
|
+
}
|
|
156
|
+
return { ok: true, result: { code, state } };
|
|
157
|
+
}
|
|
158
|
+
function settle(waiter, settlement) {
|
|
159
|
+
if (waiter.settled)
|
|
160
|
+
return;
|
|
161
|
+
waiter.settled = settlement;
|
|
162
|
+
const deliver = waiter.deliver;
|
|
163
|
+
waiter.deliver = null;
|
|
164
|
+
deliver?.(settlement);
|
|
165
|
+
}
|
|
166
|
+
function promiseFor(settlement) {
|
|
167
|
+
return settlement.ok ? Promise.resolve(settlement.result) : Promise.reject(settlement.error);
|
|
168
|
+
}
|
|
169
|
+
function respond(response, status, { contentType, body }) {
|
|
170
|
+
response.writeHead(status, { 'Content-Type': contentType, Connection: 'close' });
|
|
171
|
+
response.end(body);
|
|
172
|
+
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { OAuthLoopbackServer } from './redirect-types.ts';
|
|
1
|
+
import type { OAuthLoopbackServer, OAuthLoopbackTarget } from './redirect-types.ts';
|
|
2
2
|
export declare function abortOAuthLoopback(_credentialKey: string): Promise<boolean>;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function openOAuthLoopback(_port: number, _target: OAuthLoopbackTarget): Promise<OAuthLoopbackServer>;
|