devchain-cli 0.20.3 → 0.21.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/dist/cli.js +11 -1
- package/dist/drizzle/0072_fat_vulcan.sql +21 -0
- package/dist/drizzle/meta/0072_snapshot.json +6062 -0
- package/dist/drizzle/meta/_journal.json +7 -0
- package/dist/node_modules/@devchain/shared/e2ee/index.d.ts +1 -1
- package/dist/node_modules/@devchain/shared/e2ee/index.d.ts.map +1 -1
- package/dist/node_modules/@devchain/shared/e2ee/index.js +1 -1
- package/dist/node_modules/@devchain/shared/e2ee/index.js.map +1 -1
- package/dist/node_modules/@devchain/shared/e2ee/negotiation.d.ts +6 -0
- package/dist/node_modules/@devchain/shared/e2ee/negotiation.d.ts.map +1 -1
- package/dist/node_modules/@devchain/shared/e2ee/negotiation.js +13 -0
- package/dist/node_modules/@devchain/shared/e2ee/negotiation.js.map +1 -1
- package/dist/node_modules/@devchain/shared/index.d.ts +2 -2
- package/dist/node_modules/@devchain/shared/index.d.ts.map +1 -1
- package/dist/node_modules/@devchain/shared/index.js +2 -2
- package/dist/node_modules/@devchain/shared/index.js.map +1 -1
- package/dist/node_modules/@devchain/shared/mobile-rpc-contract/index.d.ts +11816 -0
- package/dist/node_modules/@devchain/shared/mobile-rpc-contract/index.d.ts.map +1 -0
- package/dist/node_modules/@devchain/shared/mobile-rpc-contract/index.js +1069 -0
- package/dist/node_modules/@devchain/shared/mobile-rpc-contract/index.js.map +1 -0
- package/dist/node_modules/@devchain/shared/tsconfig.tsbuildinfo +1 -1
- package/dist/node_modules/@devchain/shared/tunnel-protocol.d.ts +23 -2
- package/dist/node_modules/@devchain/shared/tunnel-protocol.d.ts.map +1 -1
- package/dist/node_modules/@devchain/shared/tunnel-protocol.js +24 -2
- package/dist/node_modules/@devchain/shared/tunnel-protocol.js.map +1 -1
- package/dist/server/app.main.module.js +2 -0
- package/dist/server/app.main.module.js.map +1 -1
- package/dist/server/app.normal.module.js +2 -0
- package/dist/server/app.normal.module.js.map +1 -1
- package/dist/server/common/test/app-bootstrap.helper.js +0 -1
- package/dist/server/common/test/app-bootstrap.helper.js.map +1 -1
- package/dist/server/modules/agent-message-delivery/adapters/legacy-delivery-formatter.adapter.js +10 -4
- package/dist/server/modules/agent-message-delivery/adapters/legacy-delivery-formatter.adapter.js.map +1 -1
- package/dist/server/modules/agent-message-delivery/agent-message-delivery.service.js +2 -0
- package/dist/server/modules/agent-message-delivery/agent-message-delivery.service.js.map +1 -1
- package/dist/server/modules/agent-message-delivery/dtos/delivery.types.d.ts +4 -1
- package/dist/server/modules/cloud/cloud.module.js +2 -1
- package/dist/server/modules/cloud/cloud.module.js.map +1 -1
- package/dist/server/modules/cloud/services/cloud-egress-bridge.service.d.ts +3 -1
- package/dist/server/modules/cloud/services/cloud-egress-bridge.service.js +16 -9
- package/dist/server/modules/cloud/services/cloud-egress-bridge.service.js.map +1 -1
- package/dist/server/modules/cloud/services/event-mapper.service.d.ts +1 -0
- package/dist/server/modules/cloud/services/event-mapper.service.js +14 -0
- package/dist/server/modules/cloud/services/event-mapper.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/cloud-tunnel.module.js +4 -0
- package/dist/server/modules/cloud-tunnel/cloud-tunnel.module.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/ask-user-question-push-gate.service.d.ts +5 -1
- package/dist/server/modules/cloud-tunnel/services/ask-user-question-push-gate.service.js +27 -7
- package/dist/server/modules/cloud-tunnel/services/ask-user-question-push-gate.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.d.ts +5 -2
- package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.js +12 -5
- package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-contract.generated.d.ts +11815 -0
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-contract.generated.js +1076 -0
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-contract.generated.js.map +1 -0
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-workspace-access.service.d.ts +67 -0
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-workspace-access.service.js +181 -0
- package/dist/server/modules/cloud-tunnel/services/mobile-rpc-workspace-access.service.js.map +1 -0
- package/dist/server/modules/cloud-tunnel/services/tunnel-client.service.d.ts +15 -2
- package/dist/server/modules/cloud-tunnel/services/tunnel-client.service.js +145 -6
- package/dist/server/modules/cloud-tunnel/services/tunnel-client.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-event-forwarder.service.d.ts +4 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-event-forwarder.service.js +16 -2
- package/dist/server/modules/cloud-tunnel/services/tunnel-event-forwarder.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-handler.service.d.ts +4 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-handler.service.js +64 -250
- package/dist/server/modules/cloud-tunnel/services/tunnel-handler.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-rpc-crypto.service.d.ts +0 -2
- package/dist/server/modules/cloud-tunnel/services/tunnel-rpc-crypto.service.js +7 -5
- package/dist/server/modules/cloud-tunnel/services/tunnel-rpc-crypto.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/tunnel-viewport-crypto.service.d.ts +1 -2
- package/dist/server/modules/cloud-tunnel/services/tunnel-viewport-crypto.service.js +14 -16
- package/dist/server/modules/cloud-tunnel/services/tunnel-viewport-crypto.service.js.map +1 -1
- package/dist/server/modules/cloud-tunnel/services/viewport-streamer.service.d.ts +20 -3
- package/dist/server/modules/cloud-tunnel/services/viewport-streamer.service.js +139 -9
- package/dist/server/modules/cloud-tunnel/services/viewport-streamer.service.js.map +1 -1
- package/dist/server/modules/e2ee/controllers/e2ee-pairing.controller.js +3 -1
- package/dist/server/modules/e2ee/controllers/e2ee-pairing.controller.js.map +1 -1
- package/dist/server/modules/e2ee/controllers/e2ee-trust.controller.d.ts +6 -1
- package/dist/server/modules/e2ee/controllers/e2ee-trust.controller.js +56 -2
- package/dist/server/modules/e2ee/controllers/e2ee-trust.controller.js.map +1 -1
- package/dist/server/modules/e2ee/e2ee.module.js +17 -2
- package/dist/server/modules/e2ee/e2ee.module.js.map +1 -1
- package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.d.ts +6 -0
- package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.js +5 -0
- package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.js.map +1 -0
- package/dist/server/modules/e2ee/services/e2ee-device-label.d.ts +1 -0
- package/dist/server/modules/e2ee/services/e2ee-device-label.js +17 -0
- package/dist/server/modules/e2ee/services/e2ee-device-label.js.map +1 -0
- package/dist/server/modules/e2ee/services/e2ee-device-store.service.d.ts +9 -2
- package/dist/server/modules/e2ee/services/e2ee-device-store.service.js +94 -28
- package/dist/server/modules/e2ee/services/e2ee-device-store.service.js.map +1 -1
- package/dist/server/modules/e2ee/services/e2ee-pairing.service.js +3 -1
- package/dist/server/modules/e2ee/services/e2ee-pairing.service.js.map +1 -1
- package/dist/server/modules/e2ee/services/e2ee-trust.service.d.ts +4 -0
- package/dist/server/modules/e2ee/services/e2ee-trust.service.js +33 -10
- package/dist/server/modules/e2ee/services/e2ee-trust.service.js.map +1 -1
- package/dist/server/modules/e2ee/services/paired-device-workspace-access.service.d.ts +19 -0
- package/dist/server/modules/e2ee/services/paired-device-workspace-access.service.js +103 -0
- package/dist/server/modules/e2ee/services/paired-device-workspace-access.service.js.map +1 -0
- package/dist/server/modules/epics/services/epics.service.d.ts +1 -0
- package/dist/server/modules/epics/services/epics.service.js +7 -1
- package/dist/server/modules/epics/services/epics.service.js.map +1 -1
- package/dist/server/modules/events/catalog/epic.updated.d.ts +26 -26
- package/dist/server/modules/events/catalog/index.d.ts +48 -48
- package/dist/server/modules/events/catalog/review.updated.d.ts +18 -18
- package/dist/server/modules/events/catalog/team.config.updated.d.ts +4 -4
- package/dist/server/modules/mcp/mcp-full.module.js +2 -3
- package/dist/server/modules/mcp/mcp-full.module.js.map +1 -1
- package/dist/server/modules/mcp/services/handlers/epic-tools.js +1 -1
- package/dist/server/modules/mcp/services/handlers/epic-tools.js.map +1 -1
- package/dist/server/modules/mcp/services/mcp-tool-binding.registry.d.ts +23 -0
- package/dist/server/modules/mcp/services/mcp-tool-binding.registry.js +120 -0
- package/dist/server/modules/mcp/services/mcp-tool-binding.registry.js.map +1 -0
- package/dist/server/modules/mcp/services/mcp.service.d.ts +4 -45
- package/dist/server/modules/mcp/services/mcp.service.js +15 -265
- package/dist/server/modules/mcp/services/mcp.service.js.map +1 -1
- package/dist/server/modules/mcp/services/testing/mcp-tool-binding-registry.fixture.d.ts +5 -0
- package/dist/server/modules/mcp/services/testing/mcp-tool-binding-registry.fixture.js +8 -0
- package/dist/server/modules/mcp/services/testing/mcp-tool-binding-registry.fixture.js.map +1 -0
- package/dist/server/modules/mcp/standalone-mcp.module.js +3 -10
- package/dist/server/modules/mcp/standalone-mcp.module.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/agent.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/agent.bindings.js +15 -2
- package/dist/server/modules/mcp/tool-descriptors/agent.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/binding-types.d.ts +38 -0
- package/dist/server/modules/mcp/tool-descriptors/binding-types.js +10 -0
- package/dist/server/modules/mcp/tool-descriptors/binding-types.js.map +1 -0
- package/dist/server/modules/mcp/tool-descriptors/chat.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/chat.bindings.js +16 -2
- package/dist/server/modules/mcp/tool-descriptors/chat.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/document.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/document.bindings.js +10 -2
- package/dist/server/modules/mcp/tool-descriptors/document.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/epic.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/epic.bindings.js +12 -6
- package/dist/server/modules/mcp/tool-descriptors/epic.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/index.d.ts +2 -3
- package/dist/server/modules/mcp/tool-descriptors/index.js +1 -25
- package/dist/server/modules/mcp/tool-descriptors/index.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/project.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/project.bindings.js +11 -2
- package/dist/server/modules/mcp/tool-descriptors/project.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/prompt.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/prompt.bindings.js +11 -2
- package/dist/server/modules/mcp/tool-descriptors/prompt.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/record.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/record.bindings.js +6 -2
- package/dist/server/modules/mcp/tool-descriptors/record.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/review.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/review.bindings.js +13 -2
- package/dist/server/modules/mcp/tool-descriptors/review.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/runtime-bindings.d.ts +2 -0
- package/dist/server/modules/mcp/tool-descriptors/runtime-bindings.js +29 -0
- package/dist/server/modules/mcp/tool-descriptors/runtime-bindings.js.map +1 -0
- package/dist/server/modules/mcp/tool-descriptors/session.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/session.bindings.js +11 -2
- package/dist/server/modules/mcp/tool-descriptors/session.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/skill.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/skill.bindings.js +10 -2
- package/dist/server/modules/mcp/tool-descriptors/skill.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/team.bindings.d.ts +1 -2
- package/dist/server/modules/mcp/tool-descriptors/team.bindings.js +11 -2
- package/dist/server/modules/mcp/tool-descriptors/team.bindings.js.map +1 -1
- package/dist/server/modules/mcp/tool-descriptors/types.d.ts +0 -2
- package/dist/server/modules/project-communication/project-communication.service.d.ts +2 -0
- package/dist/server/modules/project-communication/project-communication.service.js +72 -20
- package/dist/server/modules/project-communication/project-communication.service.js.map +1 -1
- package/dist/server/modules/projects/controllers/projects.controller.d.ts +2 -1
- package/dist/server/modules/projects/controllers/projects.controller.js +16 -3
- package/dist/server/modules/projects/controllers/projects.controller.js.map +1 -1
- package/dist/server/modules/projects/dtos/template-upgrade.dto.d.ts +1 -0
- package/dist/server/modules/projects/dtos/template-upgrade.dto.js +9 -0
- package/dist/server/modules/projects/dtos/template-upgrade.dto.js.map +1 -1
- package/dist/server/modules/projects/events/project-workspace-changed.events.d.ts +6 -0
- package/dist/server/modules/projects/events/project-workspace-changed.events.js +5 -0
- package/dist/server/modules/projects/events/project-workspace-changed.events.js.map +1 -0
- package/dist/server/modules/projects/helpers/template-loader.d.ts +1 -0
- package/dist/server/modules/projects/helpers/template-loader.js +1 -0
- package/dist/server/modules/projects/helpers/template-loader.js.map +1 -1
- package/dist/server/modules/projects/services/project-registry-import.service.d.ts +2 -0
- package/dist/server/modules/projects/services/project-registry-import.service.js +3 -1
- package/dist/server/modules/projects/services/project-registry-import.service.js.map +1 -1
- package/dist/server/modules/projects/services/projects.service.d.ts +4 -1
- package/dist/server/modules/projects/services/projects.service.js +17 -3
- package/dist/server/modules/projects/services/projects.service.js.map +1 -1
- package/dist/server/modules/scheduled-epics/services/scheduled-epics.service.js +14 -16
- package/dist/server/modules/scheduled-epics/services/scheduled-epics.service.js.map +1 -1
- package/dist/server/modules/seeders/seeders/0003_seed_preseed_jeffallan_claude_skills.js +45 -15
- package/dist/server/modules/seeders/seeders/0003_seed_preseed_jeffallan_claude_skills.js.map +1 -1
- package/dist/server/modules/seeders/seeders/0005_seed_renew_instructions_subscriber.js +2 -2
- package/dist/server/modules/seeders/seeders/0005_seed_renew_instructions_subscriber.js.map +1 -1
- package/dist/server/modules/session-reader/data/pricing.json +51 -4
- package/dist/server/modules/session-reader/services/transcript-serialization.d.ts +13 -0
- package/dist/server/modules/session-reader/services/transcript-serialization.js +41 -0
- package/dist/server/modules/session-reader/services/transcript-serialization.js.map +1 -1
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.module.d.ts +2 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.module.js +25 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.module.js.map +1 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.service.d.ts +19 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.service.js +118 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.service.js.map +1 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.types.d.ts +10 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.types.js +3 -0
- package/dist/server/modules/session-terminal-runtime/session-terminal-runtime.types.js.map +1 -0
- package/dist/server/modules/sessions/services/message-enqueue.service.d.ts +2 -1
- package/dist/server/modules/sessions/services/message-enqueue.service.js +1 -0
- package/dist/server/modules/sessions/services/message-enqueue.service.js.map +1 -1
- package/dist/server/modules/sessions/services/message-pool.types.d.ts +6 -1
- package/dist/server/modules/sessions/services/message-pool.types.js +10 -1
- package/dist/server/modules/sessions/services/message-pool.types.js.map +1 -1
- package/dist/server/modules/sessions/services/provider-runtime-preparation/index.d.ts +2 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/index.js +6 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/index.js.map +1 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.service.d.ts +24 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.service.js +297 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.service.js.map +1 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.d.ts +41 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.js +8 -0
- package/dist/server/modules/sessions/services/provider-runtime-preparation/provider-runtime-preparation.types.js.map +1 -0
- package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.d.ts +33 -37
- package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.js +37 -56
- package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.js.map +1 -1
- package/dist/server/modules/sessions/services/session-runtime/session-launch-pipeline.service.d.ts +3 -5
- package/dist/server/modules/sessions/services/session-runtime/session-launch-pipeline.service.js +23 -112
- package/dist/server/modules/sessions/services/session-runtime/session-launch-pipeline.service.js.map +1 -1
- package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.d.ts +3 -9
- package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.js +23 -125
- package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.js.map +1 -1
- package/dist/server/modules/sessions/services/sessions-message-pool.service.d.ts +13 -1
- package/dist/server/modules/sessions/services/sessions-message-pool.service.js +253 -20
- package/dist/server/modules/sessions/services/sessions-message-pool.service.js.map +1 -1
- package/dist/server/modules/sessions/services/sessions.service.d.ts +0 -13
- package/dist/server/modules/sessions/services/sessions.service.js +0 -66
- package/dist/server/modules/sessions/services/sessions.service.js.map +1 -1
- package/dist/server/modules/sessions/sessions-lifecycle.module.js.map +1 -1
- package/dist/server/modules/sessions/sessions.module.js +3 -1
- package/dist/server/modules/sessions/sessions.module.js.map +1 -1
- package/dist/server/modules/settings/dtos/settings.dto.d.ts +2 -2
- package/dist/server/modules/skills/controllers/community-sources.controller.d.ts +3 -3
- package/dist/server/modules/skills/controllers/community-sources.controller.js +8 -8
- package/dist/server/modules/skills/controllers/community-sources.controller.js.map +1 -1
- package/dist/server/modules/skills/controllers/local-sources.controller.d.ts +3 -3
- package/dist/server/modules/skills/controllers/local-sources.controller.js +8 -8
- package/dist/server/modules/skills/controllers/local-sources.controller.js.map +1 -1
- package/dist/server/modules/skills/controllers/skills.controller.d.ts +4 -3
- package/dist/server/modules/skills/controllers/skills.controller.js +7 -7
- package/dist/server/modules/skills/controllers/skills.controller.js.map +1 -1
- package/dist/server/modules/skills/services/skill-source-lifecycle.service.d.ts +42 -0
- package/dist/server/modules/skills/services/{local-sources.service.js → skill-source-lifecycle.service.js} +187 -62
- package/dist/server/modules/skills/services/skill-source-lifecycle.service.js.map +1 -0
- package/dist/server/modules/skills/services/skill-sync.service.d.ts +2 -20
- package/dist/server/modules/skills/services/skill-sync.service.js +30 -68
- package/dist/server/modules/skills/services/skill-sync.service.js.map +1 -1
- package/dist/server/modules/skills/services/skill-sync.types.d.ts +14 -0
- package/dist/server/modules/{mcp/services/handlers/types.js → skills/services/skill-sync.types.js} +1 -1
- package/dist/server/modules/skills/services/skill-sync.types.js.map +1 -0
- package/dist/server/modules/skills/services/skills.service.d.ts +0 -1
- package/dist/server/modules/skills/services/skills.service.js +0 -3
- package/dist/server/modules/skills/services/skills.service.js.map +1 -1
- package/dist/server/modules/skills/skills.module.js +2 -5
- package/dist/server/modules/skills/skills.module.js.map +1 -1
- package/dist/server/modules/storage/db/db.provider.d.ts +4 -0
- package/dist/server/modules/storage/db/db.provider.js +13 -1
- package/dist/server/modules/storage/db/db.provider.js.map +1 -1
- package/dist/server/modules/storage/db/schema.d.ts +182 -0
- package/dist/server/modules/storage/db/schema.js +23 -2
- package/dist/server/modules/storage/db/schema.js.map +1 -1
- package/dist/server/modules/storage/db/transaction-runner.d.ts +9 -0
- package/dist/server/modules/storage/db/transaction-runner.js +142 -4
- package/dist/server/modules/storage/db/transaction-runner.js.map +1 -1
- package/dist/server/modules/storage/interfaces/storage.interface.d.ts +31 -9
- package/dist/server/modules/storage/interfaces/storage.interface.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/agent.delegate.d.ts +3 -2
- package/dist/server/modules/storage/local/delegates/agent.delegate.js +45 -6
- package/dist/server/modules/storage/local/delegates/agent.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/base-storage.delegate.d.ts +2 -0
- package/dist/server/modules/storage/local/delegates/base-storage.delegate.js +3 -0
- package/dist/server/modules/storage/local/delegates/base-storage.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/document.delegate.d.ts +4 -6
- package/dist/server/modules/storage/local/delegates/document.delegate.js +86 -79
- package/dist/server/modules/storage/local/delegates/document.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/epic.delegate.d.ts +6 -4
- package/dist/server/modules/storage/local/delegates/epic.delegate.js +94 -60
- package/dist/server/modules/storage/local/delegates/epic.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/project-workspace.delegate.d.ts +16 -0
- package/dist/server/modules/storage/local/delegates/project-workspace.delegate.js +191 -0
- package/dist/server/modules/storage/local/delegates/project-workspace.delegate.js.map +1 -0
- package/dist/server/modules/storage/local/delegates/project.delegate.d.ts +7 -2
- package/dist/server/modules/storage/local/delegates/project.delegate.js +126 -140
- package/dist/server/modules/storage/local/delegates/project.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/prompt.delegate.d.ts +3 -2
- package/dist/server/modules/storage/local/delegates/prompt.delegate.js +65 -66
- package/dist/server/modules/storage/local/delegates/prompt.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/record.delegate.d.ts +3 -2
- package/dist/server/modules/storage/local/delegates/record.delegate.js +76 -62
- package/dist/server/modules/storage/local/delegates/record.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/review.delegate.d.ts +3 -6
- package/dist/server/modules/storage/local/delegates/review.delegate.js +93 -72
- package/dist/server/modules/storage/local/delegates/review.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/scheduled-epic.delegate.d.ts +4 -2
- package/dist/server/modules/storage/local/delegates/scheduled-epic.delegate.js +53 -20
- package/dist/server/modules/storage/local/delegates/scheduled-epic.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/skill-source.delegate.d.ts +7 -11
- package/dist/server/modules/storage/local/delegates/skill-source.delegate.js +135 -160
- package/dist/server/modules/storage/local/delegates/skill-source.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/delegates/tag.delegate.d.ts +1 -0
- package/dist/server/modules/storage/local/delegates/tag.delegate.js +11 -5
- package/dist/server/modules/storage/local/delegates/tag.delegate.js.map +1 -1
- package/dist/server/modules/storage/local/helpers/storage-helpers.d.ts +0 -2
- package/dist/server/modules/storage/local/helpers/storage-helpers.js +1 -24
- package/dist/server/modules/storage/local/helpers/storage-helpers.js.map +1 -1
- package/dist/server/modules/storage/local/local-storage.service.d.ts +15 -12
- package/dist/server/modules/storage/local/local-storage.service.js +40 -95
- package/dist/server/modules/storage/local/local-storage.service.js.map +1 -1
- package/dist/server/modules/storage/local/versioned-mutation.executor.d.ts +31 -0
- package/dist/server/modules/storage/local/versioned-mutation.executor.js +50 -0
- package/dist/server/modules/storage/local/versioned-mutation.executor.js.map +1 -0
- package/dist/server/modules/storage/models/domain.models.d.ts +18 -1
- package/dist/server/modules/subscribers/actions/action.interface.d.ts +4 -0
- package/dist/server/modules/subscribers/actions/actions.registry.js +4 -0
- package/dist/server/modules/subscribers/actions/actions.registry.js.map +1 -1
- package/dist/server/modules/subscribers/actions/delete-agent.action.d.ts +16 -0
- package/dist/server/modules/subscribers/actions/delete-agent.action.js +200 -0
- package/dist/server/modules/subscribers/actions/delete-agent.action.js.map +1 -0
- package/dist/server/modules/subscribers/actions/family-agent-targets.d.ts +4 -0
- package/dist/server/modules/subscribers/actions/family-agent-targets.js +35 -0
- package/dist/server/modules/subscribers/actions/family-agent-targets.js.map +1 -0
- package/dist/server/modules/subscribers/actions/send-message.action.js +22 -9
- package/dist/server/modules/subscribers/actions/send-message.action.js.map +1 -1
- package/dist/server/modules/subscribers/actions/terminate-session.action.d.ts +27 -0
- package/dist/server/modules/subscribers/actions/terminate-session.action.js +204 -0
- package/dist/server/modules/subscribers/actions/terminate-session.action.js.map +1 -0
- package/dist/server/modules/subscribers/dtos/subscriber.dto.js +3 -2
- package/dist/server/modules/subscribers/dtos/subscriber.dto.js.map +1 -1
- package/dist/server/modules/subscribers/events/event-fields-catalog.js +1 -1
- package/dist/server/modules/subscribers/events/event-fields-catalog.js.map +1 -1
- package/dist/server/modules/subscribers/services/subscriber-executor.service.d.ts +3 -3
- package/dist/server/modules/subscribers/services/subscriber-executor.service.js +7 -13
- package/dist/server/modules/subscribers/services/subscriber-executor.service.js.map +1 -1
- package/dist/server/modules/subscribers/subscribers.module.js +2 -0
- package/dist/server/modules/subscribers/subscribers.module.js.map +1 -1
- package/dist/server/modules/teams/services/teams.service.d.ts +9 -0
- package/dist/server/modules/teams/services/teams.service.js +24 -6
- package/dist/server/modules/teams/services/teams.service.js.map +1 -1
- package/dist/server/modules/terminal/gateways/terminal.gateway.d.ts +6 -4
- package/dist/server/modules/terminal/gateways/terminal.gateway.js +13 -12
- package/dist/server/modules/terminal/gateways/terminal.gateway.js.map +1 -1
- package/dist/server/modules/terminal/services/pty.service.d.ts +7 -7
- package/dist/server/modules/terminal/services/pty.service.js +21 -24
- package/dist/server/modules/terminal/services/pty.service.js.map +1 -1
- package/dist/server/modules/terminal/services/terminal-key-input/terminal-key-input.facade.js.map +1 -1
- package/dist/server/modules/terminal/services/terminal-registry-rehydrator.service.d.ts +3 -3
- package/dist/server/modules/terminal/services/terminal-registry-rehydrator.service.js +8 -12
- package/dist/server/modules/terminal/services/terminal-registry-rehydrator.service.js.map +1 -1
- package/dist/server/modules/terminal/services/terminal-seed.service.d.ts +3 -3
- package/dist/server/modules/terminal/services/terminal-seed.service.js +11 -18
- package/dist/server/modules/terminal/services/terminal-seed.service.js.map +1 -1
- package/dist/server/modules/terminal/services/terminal-viewport/terminal-viewport.facade.js.map +1 -1
- package/dist/server/modules/terminal/terminal-key-input.module.js.map +1 -1
- package/dist/server/modules/terminal/terminal-viewport.module.js.map +1 -1
- package/dist/server/modules/terminal/terminal.module.js +2 -2
- package/dist/server/modules/terminal/terminal.module.js.map +1 -1
- package/dist/server/modules/workspaces/controllers/workspaces.controller.d.ts +11 -0
- package/dist/server/modules/workspaces/controllers/workspaces.controller.js +101 -0
- package/dist/server/modules/workspaces/controllers/workspaces.controller.js.map +1 -0
- package/dist/server/modules/workspaces/services/workspace-mode-control.d.ts +6 -0
- package/dist/server/modules/workspaces/services/workspace-mode-control.js +5 -0
- package/dist/server/modules/workspaces/services/workspace-mode-control.js.map +1 -0
- package/dist/server/modules/workspaces/services/workspace-mode-coordinator.service.d.ts +23 -0
- package/dist/server/modules/workspaces/services/workspace-mode-coordinator.service.js +137 -0
- package/dist/server/modules/workspaces/services/workspace-mode-coordinator.service.js.map +1 -0
- package/dist/server/modules/workspaces/services/workspaces.service.d.ts +11 -0
- package/dist/server/modules/workspaces/services/workspaces.service.js +41 -0
- package/dist/server/modules/workspaces/services/workspaces.service.js.map +1 -0
- package/dist/server/modules/workspaces/workspaces.module.d.ts +2 -0
- package/dist/server/modules/workspaces/workspaces.module.js +26 -0
- package/dist/server/modules/workspaces/workspaces.module.js.map +1 -0
- package/dist/server/templates/teams-dev.json +214 -15
- package/dist/server/tsconfig.tsbuildinfo +1 -1
- package/dist/server/ui/assets/{ReviewDetailPage-BXLlZvPO.js → ReviewDetailPage-CNffXKv8.js} +1 -1
- package/dist/server/ui/assets/{ReviewsPage-CmFUc6IP.js → ReviewsPage-DAcufZ3r.js} +1 -1
- package/dist/server/ui/assets/index-7iCs8Dxj.js +1153 -0
- package/dist/server/ui/assets/index-CLXZjL_B.css +32 -0
- package/dist/server/ui/assets/{useReviewSubscription-Ch8K_5xz.js → useReviewSubscription-DD29I7uU.js} +1 -1
- package/dist/server/ui/index.html +2 -2
- package/dist/templates/teams-dev.json +214 -15
- package/package.json +13 -2
- package/dist/server/modules/mcp/services/handlers/types.d.ts +0 -2
- package/dist/server/modules/mcp/services/handlers/types.js.map +0 -1
- package/dist/server/modules/skills/services/community-sources.service.d.ts +0 -18
- package/dist/server/modules/skills/services/community-sources.service.js +0 -161
- package/dist/server/modules/skills/services/community-sources.service.js.map +0 -1
- package/dist/server/modules/skills/services/local-sources.service.d.ts +0 -20
- package/dist/server/modules/skills/services/local-sources.service.js.map +0 -1
- package/dist/server/ui/assets/index-LNBfBNWF.js +0 -1148
- package/dist/server/ui/assets/index-NypjSmlZ.css +0 -32
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2ee.module.js","sourceRoot":"","sources":["../../../src/modules/e2ee/e2ee.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,0EAAqE;AACrE,oFAA8E;AAC9E,0EAAqE;AACrE,sEAAiE;AACjE,mFAA8E;AAC9E,+EAA0E;
|
|
1
|
+
{"version":3,"file":"e2ee.module.js","sourceRoot":"","sources":["../../../src/modules/e2ee/e2ee.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,0EAAqE;AACrE,oFAA8E;AAC9E,0EAAqE;AACrE,sEAAiE;AACjE,mFAA8E;AAC9E,+EAA0E;AAC1E,uEAAkE;AAClE,8GAAuG;AA6BhG,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAlBtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uCAAiB,CAAC;QAC5B,WAAW,EAAE,CAAC,+CAAqB,EAAE,2CAAmB,CAAC;QACzD,SAAS,EAAE;YACT,yCAAkB;YAClB,kDAAsB;YACtB,yCAAkB;YAClB,qCAAgB;YAChB,2EAAkC;SACnC;QACD,OAAO,EAAE;YACP,yCAAkB;YAClB,kDAAsB;YACtB,yCAAkB;YAClB,qCAAgB;YAChB,2EAAkC;SACnC;KACF,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = "e2ee.device.workspace-access.revoked";
|
|
2
|
+
export interface PairedDeviceWorkspaceAccessRevokedEvent {
|
|
3
|
+
readonly deviceKid: string;
|
|
4
|
+
readonly reason: 'workspace-access-updated' | 'device-revoked';
|
|
5
|
+
readonly workspaceIds?: string[];
|
|
6
|
+
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = void 0;
|
|
4
|
+
exports.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = 'e2ee.device.workspace-access.revoked';
|
|
5
|
+
//# sourceMappingURL=paired-device-workspace-access.events.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paired-device-workspace-access.events.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/events/paired-device-workspace-access.events.ts"],"names":[],"mappings":";;;AAAa,QAAA,4CAA4C,GAAG,sCAAsC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function normalizeDeviceLabel(value: unknown): string | undefined;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeDeviceLabel = normalizeDeviceLabel;
|
|
4
|
+
const error_types_1 = require("../../../common/errors/error-types");
|
|
5
|
+
const MAX_DEVICE_LABEL_LENGTH = 120;
|
|
6
|
+
function normalizeDeviceLabel(value) {
|
|
7
|
+
if (value === undefined)
|
|
8
|
+
return undefined;
|
|
9
|
+
if (typeof value !== 'string')
|
|
10
|
+
throw new error_types_1.ValidationError('label must be a string');
|
|
11
|
+
const label = value.trim();
|
|
12
|
+
if (label.length > MAX_DEVICE_LABEL_LENGTH) {
|
|
13
|
+
throw new error_types_1.ValidationError(`label must be at most ${MAX_DEVICE_LABEL_LENGTH} characters`);
|
|
14
|
+
}
|
|
15
|
+
return label || undefined;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=e2ee-device-label.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"e2ee-device-label.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-device-label.ts"],"names":[],"mappings":";;AAIA,oDASC;AAbD,oEAAqE;AAErE,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC,SAAgB,oBAAoB,CAAC,KAAc;IACjD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,MAAM,IAAI,6BAAe,CAAC,wBAAwB,CAAC,CAAC;IAEnF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC3C,MAAM,IAAI,6BAAe,CAAC,yBAAyB,uBAAuB,aAAa,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,KAAK,IAAI,SAAS,CAAC;AAC5B,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
1
2
|
import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
|
|
2
3
|
import { type E2eeTrustStatus, type E2eeVerificationMethod, type E2eeAdoptionMethod, type IncomingPeerKey } from '@devchain/shared';
|
|
3
4
|
export interface E2eePeerDevice {
|
|
@@ -9,13 +10,16 @@ export interface E2eePeerDevice {
|
|
|
9
10
|
verifiedVia?: E2eeVerificationMethod;
|
|
10
11
|
verifiedAt?: string;
|
|
11
12
|
label?: string;
|
|
13
|
+
localAlias?: string;
|
|
12
14
|
installId?: string;
|
|
13
15
|
}
|
|
14
16
|
export declare class E2eeDeviceStoreService {
|
|
15
17
|
private readonly db;
|
|
18
|
+
private readonly eventEmitter?;
|
|
16
19
|
private sqlite;
|
|
17
|
-
|
|
18
|
-
|
|
20
|
+
private readonly transactionRunner;
|
|
21
|
+
constructor(db: BetterSQLite3Database, eventEmitter?: EventEmitter2 | undefined);
|
|
22
|
+
add(device: Omit<E2eePeerDevice, 'addedAt' | 'trust' | 'localAlias'> & {
|
|
19
23
|
addedAt?: string;
|
|
20
24
|
trust?: E2eeTrustStatus;
|
|
21
25
|
}, opts?: {
|
|
@@ -29,8 +33,11 @@ export declare class E2eeDeviceStoreService {
|
|
|
29
33
|
private toDevice;
|
|
30
34
|
private supersedeByInstallId;
|
|
31
35
|
get(kid: string): E2eePeerDevice | null;
|
|
36
|
+
setLocalAlias(kid: string, localAlias: string | null): E2eePeerDevice | null;
|
|
32
37
|
revoke(kid: string): boolean;
|
|
33
38
|
list(): E2eePeerDevice[];
|
|
34
39
|
private load;
|
|
35
40
|
private save;
|
|
41
|
+
private deleteWorkspaceGrants;
|
|
42
|
+
private emitDeviceRevocations;
|
|
36
43
|
}
|
|
@@ -14,12 +14,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.E2eeDeviceStoreService = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
17
18
|
const crypto_1 = require("crypto");
|
|
18
19
|
const better_sqlite3_1 = require("drizzle-orm/better-sqlite3");
|
|
19
20
|
const shared_1 = require("@devchain/shared");
|
|
20
21
|
const db_provider_1 = require("../../storage/db/db.provider");
|
|
21
22
|
const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
|
|
23
|
+
const transaction_runner_1 = require("../../storage/db/transaction-runner");
|
|
22
24
|
const logger_1 = require("../../../common/logging/logger");
|
|
25
|
+
const paired_device_workspace_access_events_1 = require("../events/paired-device-workspace-access.events");
|
|
23
26
|
const logger = (0, logger_1.createLogger)('E2eeDeviceStore');
|
|
24
27
|
const SETTINGS_KEY = 'cloud.e2ee.devices';
|
|
25
28
|
const STORE_VERSION = 1;
|
|
@@ -29,13 +32,16 @@ function isCanonicalUuid(value) {
|
|
|
29
32
|
}
|
|
30
33
|
let E2eeDeviceStoreService = class E2eeDeviceStoreService {
|
|
31
34
|
db;
|
|
35
|
+
eventEmitter;
|
|
32
36
|
sqlite;
|
|
33
|
-
|
|
37
|
+
transactionRunner;
|
|
38
|
+
constructor(db, eventEmitter) {
|
|
34
39
|
this.db = db;
|
|
40
|
+
this.eventEmitter = eventEmitter;
|
|
35
41
|
this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(this.db);
|
|
42
|
+
this.transactionRunner = new transaction_runner_1.TransactionRunner(this.sqlite);
|
|
36
43
|
}
|
|
37
44
|
add(device, opts = {}) {
|
|
38
|
-
const dir = this.load();
|
|
39
45
|
const record = {
|
|
40
46
|
kid: device.kid,
|
|
41
47
|
publicKeyB64: device.publicKeyB64,
|
|
@@ -47,27 +53,51 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
|
|
|
47
53
|
...(device.label !== undefined ? { label: device.label } : {}),
|
|
48
54
|
...(isCanonicalUuid(device.installId) ? { installId: device.installId } : {}),
|
|
49
55
|
};
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
56
|
+
const supersededKids = this.transactionRunner.runImmediate(() => {
|
|
57
|
+
const dir = this.load();
|
|
58
|
+
const existing = dir.devices[record.kid];
|
|
59
|
+
if (existing?.localAlias !== undefined)
|
|
60
|
+
record.localAlias = existing.localAlias;
|
|
61
|
+
if (!existing)
|
|
62
|
+
this.deleteWorkspaceGrants(record.kid);
|
|
63
|
+
dir.devices[record.kid] = record;
|
|
64
|
+
const evicted = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
|
|
65
|
+
for (const kid of evicted)
|
|
66
|
+
this.deleteWorkspaceGrants(kid);
|
|
67
|
+
this.save(dir);
|
|
68
|
+
return evicted;
|
|
69
|
+
});
|
|
70
|
+
this.emitDeviceRevocations(supersededKids);
|
|
71
|
+
logger.info({ kid: record.kid, trust: record.trust, superseded: supersededKids.length }, 'Peer E2EE device public key added');
|
|
54
72
|
return record;
|
|
55
73
|
}
|
|
56
74
|
reconcile(incoming, now = new Date().toISOString(), opts = {}) {
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
75
|
+
const { record, supersededKids } = this.transactionRunner.runImmediate(() => {
|
|
76
|
+
const dir = this.load();
|
|
77
|
+
const existing = dir.devices[incoming.kid] ?? null;
|
|
78
|
+
const prior = existing ??
|
|
79
|
+
Object.values(dir.devices).find((d) => d.publicKeyB64 === incoming.publicKeyB64) ??
|
|
80
|
+
null;
|
|
81
|
+
const reconciled = (0, shared_1.reconcilePeerKey)(prior, incoming, now);
|
|
82
|
+
const next = this.toDevice(reconciled);
|
|
83
|
+
if (isCanonicalUuid(opts.installId))
|
|
84
|
+
next.installId = opts.installId;
|
|
85
|
+
if (!existing)
|
|
86
|
+
this.deleteWorkspaceGrants(next.kid);
|
|
87
|
+
dir.devices[next.kid] = next;
|
|
88
|
+
const evicted = this.supersedeByInstallId(dir.devices, next.installId, next.kid, opts.evictVerified ?? false);
|
|
89
|
+
for (const kid of evicted)
|
|
90
|
+
this.deleteWorkspaceGrants(kid);
|
|
91
|
+
this.save(dir);
|
|
92
|
+
return { record: next, supersededKids: evicted };
|
|
93
|
+
});
|
|
94
|
+
this.emitDeviceRevocations(supersededKids);
|
|
95
|
+
logger.info({
|
|
96
|
+
kid: record.kid,
|
|
97
|
+
trust: record.trust,
|
|
98
|
+
adoptedVia: record.adoptedVia,
|
|
99
|
+
superseded: supersededKids.length,
|
|
100
|
+
}, 'Peer E2EE device reconciled (TOFU adopt / rotation)');
|
|
71
101
|
return record;
|
|
72
102
|
}
|
|
73
103
|
markVerified(kid, now = new Date().toISOString()) {
|
|
@@ -91,13 +121,14 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
|
|
|
91
121
|
...(rec.verifiedVia !== undefined ? { verifiedVia: rec.verifiedVia } : {}),
|
|
92
122
|
...(rec.verifiedAt !== undefined ? { verifiedAt: rec.verifiedAt } : {}),
|
|
93
123
|
...(rec.label !== undefined ? { label: rec.label } : {}),
|
|
124
|
+
...(rec.localAlias !== undefined ? { localAlias: rec.localAlias } : {}),
|
|
94
125
|
...(rec.installId !== undefined ? { installId: rec.installId } : {}),
|
|
95
126
|
};
|
|
96
127
|
}
|
|
97
128
|
supersedeByInstallId(devices, installId, keepKid, evictVerified) {
|
|
98
129
|
if (!isCanonicalUuid(installId))
|
|
99
|
-
return
|
|
100
|
-
|
|
130
|
+
return [];
|
|
131
|
+
const evicted = [];
|
|
101
132
|
for (const [kid, device] of Object.entries(devices)) {
|
|
102
133
|
if (kid === keepKid)
|
|
103
134
|
continue;
|
|
@@ -106,19 +137,40 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
|
|
|
106
137
|
if (!evictVerified && device.trust === 'verified')
|
|
107
138
|
continue;
|
|
108
139
|
delete devices[kid];
|
|
109
|
-
evicted
|
|
140
|
+
evicted.push(kid);
|
|
110
141
|
}
|
|
111
142
|
return evicted;
|
|
112
143
|
}
|
|
113
144
|
get(kid) {
|
|
114
145
|
return this.load().devices[kid] ?? null;
|
|
115
146
|
}
|
|
147
|
+
setLocalAlias(kid, localAlias) {
|
|
148
|
+
return this.transactionRunner.runImmediate(() => {
|
|
149
|
+
const dir = this.load();
|
|
150
|
+
const existing = dir.devices[kid];
|
|
151
|
+
if (!existing)
|
|
152
|
+
return null;
|
|
153
|
+
if (localAlias === null)
|
|
154
|
+
delete existing.localAlias;
|
|
155
|
+
else
|
|
156
|
+
existing.localAlias = localAlias;
|
|
157
|
+
this.save(dir);
|
|
158
|
+
return existing;
|
|
159
|
+
});
|
|
160
|
+
}
|
|
116
161
|
revoke(kid) {
|
|
117
|
-
const
|
|
118
|
-
|
|
162
|
+
const removed = this.transactionRunner.runImmediate(() => {
|
|
163
|
+
const dir = this.load();
|
|
164
|
+
if (!dir.devices[kid])
|
|
165
|
+
return false;
|
|
166
|
+
delete dir.devices[kid];
|
|
167
|
+
this.deleteWorkspaceGrants(kid);
|
|
168
|
+
this.save(dir);
|
|
169
|
+
return true;
|
|
170
|
+
});
|
|
171
|
+
if (!removed)
|
|
119
172
|
return false;
|
|
120
|
-
|
|
121
|
-
this.save(dir);
|
|
173
|
+
this.emitDeviceRevocations([kid]);
|
|
122
174
|
logger.info({ kid }, 'Peer E2EE device public key revoked');
|
|
123
175
|
return true;
|
|
124
176
|
}
|
|
@@ -157,11 +209,25 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
|
|
|
157
209
|
ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
|
|
158
210
|
.run((0, crypto_1.randomUUID)(), SETTINGS_KEY, JSON.stringify(dir), now, now);
|
|
159
211
|
}
|
|
212
|
+
deleteWorkspaceGrants(kid) {
|
|
213
|
+
this.sqlite.prepare('DELETE FROM paired_device_workspace_grants WHERE device_kid = ?').run(kid);
|
|
214
|
+
}
|
|
215
|
+
emitDeviceRevocations(kids) {
|
|
216
|
+
for (const deviceKid of kids) {
|
|
217
|
+
const event = {
|
|
218
|
+
deviceKid,
|
|
219
|
+
reason: 'device-revoked',
|
|
220
|
+
};
|
|
221
|
+
this.eventEmitter?.emit(paired_device_workspace_access_events_1.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT, event);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
160
224
|
};
|
|
161
225
|
exports.E2eeDeviceStoreService = E2eeDeviceStoreService;
|
|
162
226
|
exports.E2eeDeviceStoreService = E2eeDeviceStoreService = __decorate([
|
|
163
227
|
(0, common_1.Injectable)(),
|
|
164
228
|
__param(0, (0, common_1.Inject)(db_provider_1.DB_CONNECTION)),
|
|
165
|
-
|
|
229
|
+
__param(1, (0, common_1.Optional)()),
|
|
230
|
+
__metadata("design:paramtypes", [better_sqlite3_1.BetterSQLite3Database,
|
|
231
|
+
event_emitter_1.EventEmitter2])
|
|
166
232
|
], E2eeDeviceStoreService);
|
|
167
233
|
//# sourceMappingURL=e2ee-device-store.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2ee-device-store.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-device-store.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"e2ee-device-store.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-device-store.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const error_types_1 = require("../../../common/errors/error-types");
|
|
|
17
17
|
const logger_1 = require("../../../common/logging/logger");
|
|
18
18
|
const e2ee_keypair_service_1 = require("./e2ee-keypair.service");
|
|
19
19
|
const e2ee_device_store_service_1 = require("./e2ee-device-store.service");
|
|
20
|
+
const e2ee_device_label_1 = require("./e2ee-device-label");
|
|
20
21
|
const logger = (0, logger_1.createLogger)('E2eePairing');
|
|
21
22
|
const PENDING_TTL_MS = 5 * 60 * 1000;
|
|
22
23
|
let E2eePairingService = class E2eePairingService {
|
|
@@ -49,6 +50,7 @@ let E2eePairingService = class E2eePairingService {
|
|
|
49
50
|
if (!input.deviceEncPubKey || !input.deviceEncKid || !input.pairingMac) {
|
|
50
51
|
throw new error_types_1.ValidationError('deviceEncPubKey, deviceEncKid and pairingMac are required');
|
|
51
52
|
}
|
|
53
|
+
const label = (0, e2ee_device_label_1.normalizeDeviceLabel)(input.label);
|
|
52
54
|
let devicePublicKey;
|
|
53
55
|
let mac;
|
|
54
56
|
try {
|
|
@@ -86,7 +88,7 @@ let E2eePairingService = class E2eePairingService {
|
|
|
86
88
|
trust: 'verified',
|
|
87
89
|
verifiedVia: 'qr',
|
|
88
90
|
verifiedAt: new Date().toISOString(),
|
|
89
|
-
...(
|
|
91
|
+
...(label ? { label } : {}),
|
|
90
92
|
...(input.installId !== undefined ? { installId: input.installId } : {}),
|
|
91
93
|
}, { evictVerified: true });
|
|
92
94
|
this.pending.delete(input.channelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2ee-pairing.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-pairing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mCAAqC;AACrC,6CAU0B;AAC1B,oEAAoG;AACpG,2DAA8D;AAC9D,iEAA4D;AAC5D,2EAAqE;
|
|
1
|
+
{"version":3,"file":"e2ee-pairing.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-pairing.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export interface DeviceTrustResult {
|
|
|
15
15
|
export interface PairedDeviceSummary {
|
|
16
16
|
kid: string;
|
|
17
17
|
label?: string;
|
|
18
|
+
localAlias?: string;
|
|
18
19
|
trust: E2eeTrustStatus;
|
|
19
20
|
adoptedVia?: E2eeAdoptionMethod;
|
|
20
21
|
verifiedVia?: E2eeVerificationMethod;
|
|
@@ -26,6 +27,8 @@ export declare class E2eeTrustService {
|
|
|
26
27
|
private readonly deviceStore;
|
|
27
28
|
constructor(keypair: E2eeKeypairService, deviceStore: E2eeDeviceStoreService);
|
|
28
29
|
listDevices(): PairedDeviceSummary[];
|
|
30
|
+
resolveEffectiveDeviceName(kid: string): string | undefined;
|
|
31
|
+
setLocalAlias(kid: string, localAlias: string | null): PairedDeviceSummary;
|
|
29
32
|
getSafetyNumber(kid: string): Promise<DeviceSafetyNumberResult>;
|
|
30
33
|
verifyDevice(kid: string): DeviceTrustResult;
|
|
31
34
|
revokeDevice(kid: string): {
|
|
@@ -33,4 +36,5 @@ export declare class E2eeTrustService {
|
|
|
33
36
|
removed: boolean;
|
|
34
37
|
};
|
|
35
38
|
adoptPeerKeyTofu(incoming: IncomingPeerKey, installId?: string): DeviceTrustResult;
|
|
39
|
+
private toSummary;
|
|
36
40
|
}
|
|
@@ -16,6 +16,7 @@ const error_types_1 = require("../../../common/errors/error-types");
|
|
|
16
16
|
const logger_1 = require("../../../common/logging/logger");
|
|
17
17
|
const e2ee_keypair_service_1 = require("./e2ee-keypair.service");
|
|
18
18
|
const e2ee_device_store_service_1 = require("./e2ee-device-store.service");
|
|
19
|
+
const e2ee_device_label_1 = require("./e2ee-device-label");
|
|
19
20
|
const logger = (0, logger_1.createLogger)('E2eeTrust');
|
|
20
21
|
let E2eeTrustService = class E2eeTrustService {
|
|
21
22
|
keypair;
|
|
@@ -27,17 +28,21 @@ let E2eeTrustService = class E2eeTrustService {
|
|
|
27
28
|
listDevices() {
|
|
28
29
|
return this.deviceStore
|
|
29
30
|
.list()
|
|
30
|
-
.map((d) => (
|
|
31
|
-
kid: d.kid,
|
|
32
|
-
trust: d.trust,
|
|
33
|
-
addedAt: d.addedAt,
|
|
34
|
-
...(d.label !== undefined ? { label: d.label } : {}),
|
|
35
|
-
...(d.adoptedVia !== undefined ? { adoptedVia: d.adoptedVia } : {}),
|
|
36
|
-
...(d.verifiedVia !== undefined ? { verifiedVia: d.verifiedVia } : {}),
|
|
37
|
-
...(d.verifiedAt !== undefined ? { verifiedAt: d.verifiedAt } : {}),
|
|
38
|
-
}))
|
|
31
|
+
.map((d) => this.toSummary(d))
|
|
39
32
|
.sort((a, b) => b.addedAt.localeCompare(a.addedAt));
|
|
40
33
|
}
|
|
34
|
+
resolveEffectiveDeviceName(kid) {
|
|
35
|
+
const device = this.deviceStore.get(kid);
|
|
36
|
+
if (!device)
|
|
37
|
+
return undefined;
|
|
38
|
+
return device.localAlias ?? device.label ?? 'Mobile device';
|
|
39
|
+
}
|
|
40
|
+
setLocalAlias(kid, localAlias) {
|
|
41
|
+
const record = this.deviceStore.setLocalAlias(kid, localAlias);
|
|
42
|
+
if (!record)
|
|
43
|
+
throw new error_types_1.NotFoundError('E2EE device', kid);
|
|
44
|
+
return this.toSummary(record);
|
|
45
|
+
}
|
|
41
46
|
async getSafetyNumber(kid) {
|
|
42
47
|
if (!kid)
|
|
43
48
|
throw new error_types_1.ValidationError('kid is required');
|
|
@@ -103,7 +108,13 @@ let E2eeTrustService = class E2eeTrustService {
|
|
|
103
108
|
logger.warn({ suppliedKid: incoming.kid, derivedKid }, 'E2EE adopt rejected — kid does not match public key (possible substitution)');
|
|
104
109
|
throw new error_types_1.ValidationError('kid does not match public key');
|
|
105
110
|
}
|
|
106
|
-
const
|
|
111
|
+
const label = (0, e2ee_device_label_1.normalizeDeviceLabel)(incoming.label);
|
|
112
|
+
const normalizedIncoming = {
|
|
113
|
+
kid: incoming.kid,
|
|
114
|
+
publicKeyB64: incoming.publicKeyB64,
|
|
115
|
+
...(label !== undefined ? { label } : {}),
|
|
116
|
+
};
|
|
117
|
+
const record = this.deviceStore.reconcile(normalizedIncoming, undefined, {
|
|
107
118
|
installId,
|
|
108
119
|
evictVerified: false,
|
|
109
120
|
});
|
|
@@ -113,6 +124,18 @@ let E2eeTrustService = class E2eeTrustService {
|
|
|
113
124
|
...(record.verifiedVia !== undefined ? { verifiedVia: record.verifiedVia } : {}),
|
|
114
125
|
};
|
|
115
126
|
}
|
|
127
|
+
toSummary(record) {
|
|
128
|
+
return {
|
|
129
|
+
kid: record.kid,
|
|
130
|
+
trust: record.trust,
|
|
131
|
+
addedAt: record.addedAt,
|
|
132
|
+
...(record.label !== undefined ? { label: record.label } : {}),
|
|
133
|
+
...(record.localAlias !== undefined ? { localAlias: record.localAlias } : {}),
|
|
134
|
+
...(record.adoptedVia !== undefined ? { adoptedVia: record.adoptedVia } : {}),
|
|
135
|
+
...(record.verifiedVia !== undefined ? { verifiedVia: record.verifiedVia } : {}),
|
|
136
|
+
...(record.verifiedAt !== undefined ? { verifiedAt: record.verifiedAt } : {}),
|
|
137
|
+
};
|
|
138
|
+
}
|
|
116
139
|
};
|
|
117
140
|
exports.E2eeTrustService = E2eeTrustService;
|
|
118
141
|
exports.E2eeTrustService = E2eeTrustService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAS0B;AAC1B,oEAAoF;AACpF,2DAA8D;AAC9D,iEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
2
|
+
import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
|
|
3
|
+
import { E2eeDeviceStoreService } from './e2ee-device-store.service';
|
|
4
|
+
export interface PairedDeviceWorkspaceAccess {
|
|
5
|
+
readonly kid: string;
|
|
6
|
+
readonly explicit: boolean;
|
|
7
|
+
readonly workspaceIds: string[];
|
|
8
|
+
}
|
|
9
|
+
export declare class PairedDeviceWorkspaceAccessService {
|
|
10
|
+
private readonly devices;
|
|
11
|
+
private readonly eventEmitter;
|
|
12
|
+
private readonly sqlite;
|
|
13
|
+
private readonly transactionRunner;
|
|
14
|
+
constructor(db: BetterSQLite3Database, devices: E2eeDeviceStoreService, eventEmitter: EventEmitter2);
|
|
15
|
+
getAccess(kid: string): PairedDeviceWorkspaceAccess;
|
|
16
|
+
updateAccess(kid: string, workspaceIds: string[]): Promise<PairedDeviceWorkspaceAccess>;
|
|
17
|
+
private assertKnownDevice;
|
|
18
|
+
private readAccess;
|
|
19
|
+
}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.PairedDeviceWorkspaceAccessService = void 0;
|
|
16
|
+
const common_1 = require("@nestjs/common");
|
|
17
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
18
|
+
const error_types_1 = require("../../../common/errors/error-types");
|
|
19
|
+
const db_provider_1 = require("../../storage/db/db.provider");
|
|
20
|
+
const schema_1 = require("../../storage/db/schema");
|
|
21
|
+
const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
|
|
22
|
+
const transaction_runner_1 = require("../../storage/db/transaction-runner");
|
|
23
|
+
const paired_device_workspace_access_events_1 = require("../events/paired-device-workspace-access.events");
|
|
24
|
+
const e2ee_device_store_service_1 = require("./e2ee-device-store.service");
|
|
25
|
+
let PairedDeviceWorkspaceAccessService = class PairedDeviceWorkspaceAccessService {
|
|
26
|
+
devices;
|
|
27
|
+
eventEmitter;
|
|
28
|
+
sqlite;
|
|
29
|
+
transactionRunner;
|
|
30
|
+
constructor(db, devices, eventEmitter) {
|
|
31
|
+
this.devices = devices;
|
|
32
|
+
this.eventEmitter = eventEmitter;
|
|
33
|
+
this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(db);
|
|
34
|
+
this.transactionRunner = new transaction_runner_1.TransactionRunner(this.sqlite);
|
|
35
|
+
}
|
|
36
|
+
getAccess(kid) {
|
|
37
|
+
this.assertKnownDevice(kid);
|
|
38
|
+
return this.readAccess(kid);
|
|
39
|
+
}
|
|
40
|
+
async updateAccess(kid, workspaceIds) {
|
|
41
|
+
if (workspaceIds.length === 0) {
|
|
42
|
+
throw new error_types_1.ValidationError('At least one workspace must remain accessible');
|
|
43
|
+
}
|
|
44
|
+
if (new Set(workspaceIds).size !== workspaceIds.length) {
|
|
45
|
+
throw new error_types_1.ValidationError('workspaceIds must not contain duplicates');
|
|
46
|
+
}
|
|
47
|
+
const { result, removedWorkspaceIds } = await this.transactionRunner.runImmediateQueued(() => {
|
|
48
|
+
this.assertKnownDevice(kid);
|
|
49
|
+
const rows = this.sqlite.prepare('SELECT id FROM project_workspaces').all();
|
|
50
|
+
const known = new Set(rows.map((row) => row.id));
|
|
51
|
+
const unknown = workspaceIds.find((workspaceId) => !known.has(workspaceId));
|
|
52
|
+
if (unknown !== undefined) {
|
|
53
|
+
throw new error_types_1.NotFoundError('Project workspace', unknown);
|
|
54
|
+
}
|
|
55
|
+
const previous = this.readAccess(kid).workspaceIds;
|
|
56
|
+
this.sqlite
|
|
57
|
+
.prepare('DELETE FROM paired_device_workspace_grants WHERE device_kid = ?')
|
|
58
|
+
.run(kid);
|
|
59
|
+
const insert = this.sqlite.prepare('INSERT INTO paired_device_workspace_grants (device_kid, workspace_id) VALUES (?, ?)');
|
|
60
|
+
for (const workspaceId of workspaceIds)
|
|
61
|
+
insert.run(kid, workspaceId);
|
|
62
|
+
const selected = new Set(workspaceIds);
|
|
63
|
+
return {
|
|
64
|
+
result: { kid, explicit: true, workspaceIds: [...workspaceIds] },
|
|
65
|
+
removedWorkspaceIds: previous.filter((workspaceId) => !selected.has(workspaceId)),
|
|
66
|
+
};
|
|
67
|
+
});
|
|
68
|
+
if (removedWorkspaceIds.length > 0) {
|
|
69
|
+
const event = {
|
|
70
|
+
deviceKid: kid,
|
|
71
|
+
reason: 'workspace-access-updated',
|
|
72
|
+
workspaceIds: removedWorkspaceIds,
|
|
73
|
+
};
|
|
74
|
+
this.eventEmitter.emit(paired_device_workspace_access_events_1.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT, event);
|
|
75
|
+
}
|
|
76
|
+
return result;
|
|
77
|
+
}
|
|
78
|
+
assertKnownDevice(kid) {
|
|
79
|
+
if (!this.devices.get(kid))
|
|
80
|
+
throw new error_types_1.NotFoundError('E2EE device', kid);
|
|
81
|
+
}
|
|
82
|
+
readAccess(kid) {
|
|
83
|
+
const rows = this.sqlite
|
|
84
|
+
.prepare(`SELECT grant_row.workspace_id AS workspaceId
|
|
85
|
+
FROM paired_device_workspace_grants grant_row
|
|
86
|
+
INNER JOIN project_workspaces workspace ON workspace.id = grant_row.workspace_id
|
|
87
|
+
WHERE grant_row.device_kid = ?
|
|
88
|
+
ORDER BY workspace.position, workspace.id`)
|
|
89
|
+
.all(kid);
|
|
90
|
+
if (rows.length === 0) {
|
|
91
|
+
return { kid, explicit: false, workspaceIds: [schema_1.DEFAULT_PROJECT_WORKSPACE_ID] };
|
|
92
|
+
}
|
|
93
|
+
return { kid, explicit: true, workspaceIds: rows.map((row) => row.workspaceId) };
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
exports.PairedDeviceWorkspaceAccessService = PairedDeviceWorkspaceAccessService;
|
|
97
|
+
exports.PairedDeviceWorkspaceAccessService = PairedDeviceWorkspaceAccessService = __decorate([
|
|
98
|
+
(0, common_1.Injectable)(),
|
|
99
|
+
__param(0, (0, common_1.Inject)(db_provider_1.DB_CONNECTION)),
|
|
100
|
+
__metadata("design:paramtypes", [Function, e2ee_device_store_service_1.E2eeDeviceStoreService,
|
|
101
|
+
event_emitter_1.EventEmitter2])
|
|
102
|
+
], PairedDeviceWorkspaceAccessService);
|
|
103
|
+
//# sourceMappingURL=paired-device-workspace-access.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paired-device-workspace-access.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/paired-device-workspace-access.service.ts"],"names":[],"mappings":"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"}
|