devchain-cli 0.20.3 → 0.22.0

package/dist/server/modules/e2ee/controllers/e2ee-trust.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2ee-trust.controller.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/controllers/e2ee-trust.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,oEAAqE;AACrE,uEAKwC;AAmBjC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IACD;IAA7B,YAA6B,KAAuB;QAAvB,UAAK,GAAL,KAAK,CAAkB;IAAG,CAAC;IAGxD,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAe,GAAW;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAGD,MAAM,CAAe,GAAW;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAGD,YAAY,CAAe,GAAW;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAGD,KAAK,CAAS,IAAe;QAC3B,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,6BAAe,CAAC,mCAAmC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACjC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAlCY,kDAAmB;AAI9B;IADC,IAAA,YAAG,GAAE;;;;sDAGL;AAGK;IADL,IAAA,YAAG,EAAC,oBAAoB,CAAC;IACN,WAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;uDAE/B;AAGD;IADC,IAAA,aAAI,EAAC,aAAa,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;iDAEnB;AAGD;IADC,IAAA,eAAM,EAAC,MAAM,CAAC;IACD,WAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;uDAEzB;AAGD;IADC,IAAA,aAAI,EAAC,OAAO,CAAC;IACP,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gDASZ;8BAjCU,mBAAmB;IAD/B,IAAA,mBAAU,EAAC,kBAAkB,CAAC;qCAEO,qCAAgB;GADzC,mBAAmB,CAkC/B"}
+{"version":3,"file":"e2ee-trust.controller.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/controllers/e2ee-trust.controller.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/e2ee/e2ee.module.js

@@ -14,14 +14,29 @@ const e2ee_pairing_service_1 = require("./services/e2ee-pairing.service");
 const e2ee_trust_service_1 = require("./services/e2ee-trust.service");
 const e2ee_pairing_controller_1 = require("./controllers/e2ee-pairing.controller");
 const e2ee_trust_controller_1 = require("./controllers/e2ee-trust.controller");
+const events_infra_module_1 = require("../events/events-infra.module");
+const paired_device_workspace_access_service_1 = require("./services/paired-device-workspace-access.service");
 let E2eeModule = class E2eeModule {
 };
 exports.E2eeModule = E2eeModule;
 exports.E2eeModule = E2eeModule = __decorate([
     (0, common_1.Module)({
+        imports: [events_infra_module_1.EventsInfraModule],
         controllers: [e2ee_pairing_controller_1.E2eePairingController, e2ee_trust_controller_1.E2eeTrustController],
-        providers: [e2ee_keypair_service_1.E2eeKeypairService, e2ee_device_store_service_1.E2eeDeviceStoreService, e2ee_pairing_service_1.E2eePairingService, e2ee_trust_service_1.E2eeTrustService],
-        exports: [e2ee_keypair_service_1.E2eeKeypairService, e2ee_device_store_service_1.E2eeDeviceStoreService, e2ee_pairing_service_1.E2eePairingService, e2ee_trust_service_1.E2eeTrustService],
+        providers: [
+            e2ee_keypair_service_1.E2eeKeypairService,
+            e2ee_device_store_service_1.E2eeDeviceStoreService,
+            e2ee_pairing_service_1.E2eePairingService,
+            e2ee_trust_service_1.E2eeTrustService,
+            paired_device_workspace_access_service_1.PairedDeviceWorkspaceAccessService,
+        ],
+        exports: [
+            e2ee_keypair_service_1.E2eeKeypairService,
+            e2ee_device_store_service_1.E2eeDeviceStoreService,
+            e2ee_pairing_service_1.E2eePairingService,
+            e2ee_trust_service_1.E2eeTrustService,
+            paired_device_workspace_access_service_1.PairedDeviceWorkspaceAccessService,
+        ],
     })
 ], E2eeModule);
 //# sourceMappingURL=e2ee.module.js.map

package/dist/server/modules/e2ee/e2ee.module.js.map

@@ -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;AAgBnE,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IALtB,IAAA,eAAM,EAAC;QACN,WAAW,EAAE,CAAC,+CAAqB,EAAE,2CAAmB,CAAC;QACzD,SAAS,EAAE,CAAC,yCAAkB,EAAE,kDAAsB,EAAE,yCAAkB,EAAE,qCAAgB,CAAC;QAC7F,OAAO,EAAE,CAAC,yCAAkB,EAAE,kDAAsB,EAAE,yCAAkB,EAAE,qCAAgB,CAAC;KAC5F,CAAC;GACW,UAAU,CAAG"}
+{"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"}

package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.d.ts

@@ -0,0 +1,6 @@
+export declare const PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = "e2ee.device.workspace-access.revoked";
+export interface PairedDeviceWorkspaceAccessRevokedEvent {
+    readonly deviceKid: string;
+    readonly reason: 'workspace-access-updated' | 'device-revoked';
+    readonly workspaceIds?: string[];
+}

package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = void 0;
+exports.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT = 'e2ee.device.workspace-access.revoked';
+//# sourceMappingURL=paired-device-workspace-access.events.js.map

package/dist/server/modules/e2ee/events/paired-device-workspace-access.events.js.map

@@ -0,0 +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"}

package/dist/server/modules/e2ee/services/e2ee-device-label.d.ts

@@ -0,0 +1 @@
+export declare function normalizeDeviceLabel(value: unknown): string | undefined;

package/dist/server/modules/e2ee/services/e2ee-device-label.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDeviceLabel = normalizeDeviceLabel;
+const error_types_1 = require("../../../common/errors/error-types");
+const MAX_DEVICE_LABEL_LENGTH = 120;
+function normalizeDeviceLabel(value) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value !== 'string')
+        throw new error_types_1.ValidationError('label must be a string');
+    const label = value.trim();
+    if (label.length > MAX_DEVICE_LABEL_LENGTH) {
+        throw new error_types_1.ValidationError(`label must be at most ${MAX_DEVICE_LABEL_LENGTH} characters`);
+    }
+    return label || undefined;
+}
+//# sourceMappingURL=e2ee-device-label.js.map

package/dist/server/modules/e2ee/services/e2ee-device-label.js.map

@@ -0,0 +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"}

package/dist/server/modules/e2ee/services/e2ee-device-store.service.d.ts

@@ -1,3 +1,4 @@
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
 import { type E2eeTrustStatus, type E2eeVerificationMethod, type E2eeAdoptionMethod, type IncomingPeerKey } from '@devchain/shared';
 export interface E2eePeerDevice {
@@ -9,13 +10,17 @@ export interface E2eePeerDevice {
     verifiedVia?: E2eeVerificationMethod;
     verifiedAt?: string;
     label?: string;
+    localAlias?: string;
     installId?: string;
+    notificationRoutingKid?: string;
 }
 export declare class E2eeDeviceStoreService {
     private readonly db;
+    private readonly eventEmitter?;
     private sqlite;
-    constructor(db: BetterSQLite3Database);
-    add(device: Omit<E2eePeerDevice, 'addedAt' | 'trust'> & {
+    private readonly transactionRunner;
+    constructor(db: BetterSQLite3Database, eventEmitter?: EventEmitter2 | undefined);
+    add(device: Omit<E2eePeerDevice, 'addedAt' | 'trust' | 'localAlias'> & {
         addedAt?: string;
         trust?: E2eeTrustStatus;
     }, opts?: {
@@ -29,8 +34,12 @@ export declare class E2eeDeviceStoreService {
     private toDevice;
     private supersedeByInstallId;
     get(kid: string): E2eePeerDevice | null;
+    setLocalAlias(kid: string, localAlias: string | null): E2eePeerDevice | null;
+    setNotificationRoutingKid(kid: string, routingKid: string): E2eePeerDevice | null;
     revoke(kid: string): boolean;
     list(): E2eePeerDevice[];
     private load;
     private save;
+    private deleteWorkspaceGrants;
+    private emitDeviceRevocations;
 }

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js

@@ -14,12 +14,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eeDeviceStoreService = void 0;
 const common_1 = require("@nestjs/common");
+const event_emitter_1 = require("@nestjs/event-emitter");
 const crypto_1 = require("crypto");
 const better_sqlite3_1 = require("drizzle-orm/better-sqlite3");
 const shared_1 = require("@devchain/shared");
 const db_provider_1 = require("../../storage/db/db.provider");
 const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
+const transaction_runner_1 = require("../../storage/db/transaction-runner");
 const logger_1 = require("../../../common/logging/logger");
+const paired_device_workspace_access_events_1 = require("../events/paired-device-workspace-access.events");
 const logger = (0, logger_1.createLogger)('E2eeDeviceStore');
 const SETTINGS_KEY = 'cloud.e2ee.devices';
 const STORE_VERSION = 1;
@@ -27,15 +30,22 @@ const CANONICAL_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a
 function isCanonicalUuid(value) {
     return typeof value === 'string' && CANONICAL_UUID_RE.test(value);
 }
+const ROUTING_KID_RE = /^[A-Za-z0-9_-]{43}$/;
+function isRoutingKid(value) {
+    return typeof value === 'string' && ROUTING_KID_RE.test(value);
+}
 let E2eeDeviceStoreService = class E2eeDeviceStoreService {
     db;
+    eventEmitter;
     sqlite;
-    constructor(db) {
+    transactionRunner;
+    constructor(db, eventEmitter) {
         this.db = db;
+        this.eventEmitter = eventEmitter;
         this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(this.db);
+        this.transactionRunner = new transaction_runner_1.TransactionRunner(this.sqlite);
     }
     add(device, opts = {}) {
-        const dir = this.load();
         const record = {
             kid: device.kid,
             publicKeyB64: device.publicKeyB64,
@@ -47,27 +57,54 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             ...(device.label !== undefined ? { label: device.label } : {}),
             ...(isCanonicalUuid(device.installId) ? { installId: device.installId } : {}),
         };
-        dir.devices[record.kid] = record;
-        const superseded = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
-        this.save(dir);
-        logger.info({ kid: record.kid, trust: record.trust, superseded }, 'Peer E2EE device public key added');
+        const supersededKids = this.transactionRunner.runImmediate(() => {
+            const dir = this.load();
+            const existing = dir.devices[record.kid];
+            if (existing?.localAlias !== undefined)
+                record.localAlias = existing.localAlias;
+            if (existing?.notificationRoutingKid !== undefined) {
+                record.notificationRoutingKid = existing.notificationRoutingKid;
+            }
+            if (!existing)
+                this.deleteWorkspaceGrants(record.kid);
+            dir.devices[record.kid] = record;
+            const evicted = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
+            for (const kid of evicted)
+                this.deleteWorkspaceGrants(kid);
+            this.save(dir);
+            return evicted;
+        });
+        this.emitDeviceRevocations(supersededKids);
+        logger.info({ kid: record.kid, trust: record.trust, superseded: supersededKids.length }, 'Peer E2EE device public key added');
         return record;
     }
     reconcile(incoming, now = new Date().toISOString(), opts = {}) {
-        const dir = this.load();
-        const existing = (dir.devices[incoming.kid] ?? null);
-        const prior = existing ??
-            Object.values(dir.devices).find((d) => d.publicKeyB64 === incoming.publicKeyB64) ??
-            null;
-        const reconciled = (0, shared_1.reconcilePeerKey)(prior, incoming, now);
-        const record = this.toDevice(reconciled);
-        if (isCanonicalUuid(opts.installId)) {
-            record.installId = opts.installId;
-        }
-        dir.devices[record.kid] = record;
-        const superseded = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
-        this.save(dir);
-        logger.info({ kid: record.kid, trust: record.trust, adoptedVia: record.adoptedVia, superseded }, 'Peer E2EE device reconciled (TOFU adopt / rotation)');
+        const { record, supersededKids } = this.transactionRunner.runImmediate(() => {
+            const dir = this.load();
+            const existing = dir.devices[incoming.kid] ?? null;
+            const prior = existing ??
+                Object.values(dir.devices).find((d) => d.publicKeyB64 === incoming.publicKeyB64) ??
+                null;
+            const reconciled = (0, shared_1.reconcilePeerKey)(prior, incoming, now);
+            const next = this.toDevice(reconciled);
+            if (isCanonicalUuid(opts.installId))
+                next.installId = opts.installId;
+            if (!existing)
+                this.deleteWorkspaceGrants(next.kid);
+            dir.devices[next.kid] = next;
+            const evicted = this.supersedeByInstallId(dir.devices, next.installId, next.kid, opts.evictVerified ?? false);
+            for (const kid of evicted)
+                this.deleteWorkspaceGrants(kid);
+            this.save(dir);
+            return { record: next, supersededKids: evicted };
+        });
+        this.emitDeviceRevocations(supersededKids);
+        logger.info({
+            kid: record.kid,
+            trust: record.trust,
+            adoptedVia: record.adoptedVia,
+            superseded: supersededKids.length,
+        }, 'Peer E2EE device reconciled (TOFU adopt / rotation)');
         return record;
     }
     markVerified(kid, now = new Date().toISOString()) {
@@ -91,13 +128,17 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             ...(rec.verifiedVia !== undefined ? { verifiedVia: rec.verifiedVia } : {}),
             ...(rec.verifiedAt !== undefined ? { verifiedAt: rec.verifiedAt } : {}),
             ...(rec.label !== undefined ? { label: rec.label } : {}),
+            ...(rec.localAlias !== undefined ? { localAlias: rec.localAlias } : {}),
             ...(rec.installId !== undefined ? { installId: rec.installId } : {}),
+            ...(rec.notificationRoutingKid !== undefined
+                ? { notificationRoutingKid: rec.notificationRoutingKid }
+                : {}),
         };
     }
     supersedeByInstallId(devices, installId, keepKid, evictVerified) {
         if (!isCanonicalUuid(installId))
-            return 0;
-        let evicted = 0;
+            return [];
+        const evicted = [];
         for (const [kid, device] of Object.entries(devices)) {
             if (kid === keepKid)
                 continue;
@@ -106,19 +147,56 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             if (!evictVerified && device.trust === 'verified')
                 continue;
             delete devices[kid];
-            evicted++;
+            evicted.push(kid);
         }
         return evicted;
     }
     get(kid) {
         return this.load().devices[kid] ?? null;
     }
+    setLocalAlias(kid, localAlias) {
+        return this.transactionRunner.runImmediate(() => {
+            const dir = this.load();
+            const existing = dir.devices[kid];
+            if (!existing)
+                return null;
+            if (localAlias === null)
+                delete existing.localAlias;
+            else
+                existing.localAlias = localAlias;
+            this.save(dir);
+            return existing;
+        });
+    }
+    setNotificationRoutingKid(kid, routingKid) {
+        if (!isRoutingKid(routingKid))
+            return null;
+        const record = this.transactionRunner.runImmediate(() => {
+            const dir = this.load();
+            const existing = dir.devices[kid];
+            if (!existing)
+                return null;
+            existing.notificationRoutingKid = routingKid;
+            this.save(dir);
+            return existing;
+        });
+        if (record)
+            logger.info({ kid }, 'Notification routing kid bound to paired device');
+        return record;
+    }
     revoke(kid) {
-        const dir = this.load();
-        if (!dir.devices[kid])
+        const removed = this.transactionRunner.runImmediate(() => {
+            const dir = this.load();
+            if (!dir.devices[kid])
+                return false;
+            delete dir.devices[kid];
+            this.deleteWorkspaceGrants(kid);
+            this.save(dir);
+            return true;
+        });
+        if (!removed)
             return false;
-        delete dir.devices[kid];
-        this.save(dir);
+        this.emitDeviceRevocations([kid]);
         logger.info({ kid }, 'Peer E2EE device public key revoked');
         return true;
     }
@@ -157,11 +235,25 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
          ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
             .run((0, crypto_1.randomUUID)(), SETTINGS_KEY, JSON.stringify(dir), now, now);
     }
+    deleteWorkspaceGrants(kid) {
+        this.sqlite.prepare('DELETE FROM paired_device_workspace_grants WHERE device_kid = ?').run(kid);
+    }
+    emitDeviceRevocations(kids) {
+        for (const deviceKid of kids) {
+            const event = {
+                deviceKid,
+                reason: 'device-revoked',
+            };
+            this.eventEmitter?.emit(paired_device_workspace_access_events_1.PAIRED_DEVICE_WORKSPACE_ACCESS_REVOKED_EVENT, event);
+        }
+    }
 };
 exports.E2eeDeviceStoreService = E2eeDeviceStoreService;
 exports.E2eeDeviceStoreService = E2eeDeviceStoreService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(db_provider_1.DB_CONNECTION)),
-    __metadata("design:paramtypes", [better_sqlite3_1.BetterSQLite3Database])
+    __param(1, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [better_sqlite3_1.BetterSQLite3Database,
+        event_emitter_1.EventEmitter2])
 ], E2eeDeviceStoreService);
 //# sourceMappingURL=e2ee-device-store.service.js.map

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js.map

@@ -1 +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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"}
+{"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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"}

package/dist/server/modules/e2ee/services/e2ee-pairing.service.js

@@ -17,6 +17,7 @@ const error_types_1 = require("../../../common/errors/error-types");
 const logger_1 = require("../../../common/logging/logger");
 const e2ee_keypair_service_1 = require("./e2ee-keypair.service");
 const e2ee_device_store_service_1 = require("./e2ee-device-store.service");
+const e2ee_device_label_1 = require("./e2ee-device-label");
 const logger = (0, logger_1.createLogger)('E2eePairing');
 const PENDING_TTL_MS = 5 * 60 * 1000;
 let E2eePairingService = class E2eePairingService {
@@ -49,6 +50,7 @@ let E2eePairingService = class E2eePairingService {
         if (!input.deviceEncPubKey || !input.deviceEncKid || !input.pairingMac) {
             throw new error_types_1.ValidationError('deviceEncPubKey, deviceEncKid and pairingMac are required');
         }
+        const label = (0, e2ee_device_label_1.normalizeDeviceLabel)(input.label);
         let devicePublicKey;
         let mac;
         try {
@@ -86,7 +88,7 @@ let E2eePairingService = class E2eePairingService {
             trust: 'verified',
             verifiedVia: 'qr',
             verifiedAt: new Date().toISOString(),
-            ...(input.label !== undefined ? { label: input.label } : {}),
+            ...(label ? { label } : {}),
             ...(input.installId !== undefined ? { installId: input.installId } : {}),
         }, { evictVerified: true });
         this.pending.delete(input.channelId);

package/dist/server/modules/e2ee/services/e2ee-pairing.service.js.map

@@ -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;AAErE,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,aAAa,CAAC,CAAC;AAG3C,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAoD9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAKV;IACA;IAJF,OAAO,GAAG,IAAI,GAAG,EAAqD,CAAC;IAExF,YACmB,OAA2B,EAC3B,WAAmC;QADnC,YAAO,GAAP,OAAO,CAAoB;QAC3B,gBAAW,GAAX,WAAW,CAAwB;IACnD,CAAC;IAOJ,KAAK,CAAC,cAAc,CAAC,SAAiB;QACpC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,6BAAe,CAAC,uBAAuB,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,IAAA,oBAAW,EAAC,6BAAoB,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE/D,OAAO;YACL,WAAW,EAAE,GAAG,CAAC,YAAY;YAC7B,QAAQ,EAAE,GAAG,CAAC,GAAG;YACjB,aAAa,EAAE,IAAA,sBAAa,EAAC,MAAM,CAAC;SACrC,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,iBAAiB,CAAC,KAA6B;QACnD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,2BAAa,CAAC,iBAAiB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YACvE,MAAM,IAAI,6BAAe,CAAC,2DAA2D,CAAC,CAAC;QACzF,CAAC;QAED,IAAI,eAA2B,CAAC;QAChC,IAAI,GAAe,CAAC;QACpB,IAAI,CAAC;YACH,eAAe,GAAG,IAAA,sBAAa,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACvD,GAAG,GAAG,IAAA,sBAAa,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,6BAAe,CAAC,mDAAmD,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,eAAe,CAAC,MAAM,KAAK,gCAAuB,EAAE,CAAC;YACvD,MAAM,IAAI,6BAAe,CAAC,kCAAkC,gCAAuB,QAAQ,CAAC,CAAC;QAC/F,CAAC;QAKD,IAAI,IAAA,kBAAS,EAAC,eAAe,CAAC,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;YACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,CAAC,IAAI,CACT,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,YAAY,EAAE,EAC/D,gGAAgG,CACjG,CAAC;YACF,MAAM,IAAI,4BAAc,CAAC,kCAAkC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAA,+BAAsB,EAAC;YACxC,WAAW,EAAE,EAAE,CAAC,SAAS;YACzB,KAAK,EAAE,EAAE,CAAC,GAAG;YACb,eAAe,EAAE,eAAe;YAChC,SAAS,EAAE,KAAK,CAAC,YAAY;YAC7B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,IAAA,yBAAgB,EAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC;YAEvD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,CAAC,IAAI,CACT,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,YAAY,EAAE,EAC7D,uFAAuF,CACxF,CAAC;YACF,MAAM,IAAI,4BAAc,CAAC,kCAAkC,CAAC,CAAC;QAC/D,CAAC;QAKD,IAAA,wBAAe,EAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CACjC;YACE,GAAG,EAAE,KAAK,CAAC,YAAY;YACvB,YAAY,EAAE,KAAK,CAAC,eAAe;YACnC,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACpC,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzE,EAGD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CACT,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,EACrD,wDAAwD,CACzD,CAAC;QACF,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAClD,CAAC;IAEO,YAAY;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;QAC3C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9C,IAAI,KAAK,CAAC,SAAS,GAAG,MAAM;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF,CAAA;AA1HY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAMiB,yCAAkB;QACd,kDAAsB;GAN3C,kBAAkB,CA0H9B"}
+{"version":3,"file":"e2ee-pairing.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-pairing.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/e2ee/services/e2ee-trust.service.d.ts

@@ -15,6 +15,7 @@ export interface DeviceTrustResult {
 export interface PairedDeviceSummary {
     kid: string;
     label?: string;
+    localAlias?: string;
     trust: E2eeTrustStatus;
     adoptedVia?: E2eeAdoptionMethod;
     verifiedVia?: E2eeVerificationMethod;
@@ -26,11 +27,19 @@ export declare class E2eeTrustService {
     private readonly deviceStore;
     constructor(keypair: E2eeKeypairService, deviceStore: E2eeDeviceStoreService);
     listDevices(): PairedDeviceSummary[];
+    resolveEffectiveDeviceName(kid: string): string | undefined;
+    setLocalAlias(kid: string, localAlias: string | null): PairedDeviceSummary;
     getSafetyNumber(kid: string): Promise<DeviceSafetyNumberResult>;
     verifyDevice(kid: string): DeviceTrustResult;
     revokeDevice(kid: string): {
         kid: string;
         removed: boolean;
     };
+    bindNotificationRoutingIdentity(kid: string, routingKid: string): {
+        kid: string;
+        routingKid: string;
+        bound: boolean;
+    };
     adoptPeerKeyTofu(incoming: IncomingPeerKey, installId?: string): DeviceTrustResult;
+    private toSummary;
 }

package/dist/server/modules/e2ee/services/e2ee-trust.service.js

@@ -16,6 +16,7 @@ const error_types_1 = require("../../../common/errors/error-types");
 const logger_1 = require("../../../common/logging/logger");
 const e2ee_keypair_service_1 = require("./e2ee-keypair.service");
 const e2ee_device_store_service_1 = require("./e2ee-device-store.service");
+const e2ee_device_label_1 = require("./e2ee-device-label");
 const logger = (0, logger_1.createLogger)('E2eeTrust');
 let E2eeTrustService = class E2eeTrustService {
     keypair;
@@ -27,17 +28,21 @@ let E2eeTrustService = class E2eeTrustService {
     listDevices() {
         return this.deviceStore
             .list()
-            .map((d) => ({
-            kid: d.kid,
-            trust: d.trust,
-            addedAt: d.addedAt,
-            ...(d.label !== undefined ? { label: d.label } : {}),
-            ...(d.adoptedVia !== undefined ? { adoptedVia: d.adoptedVia } : {}),
-            ...(d.verifiedVia !== undefined ? { verifiedVia: d.verifiedVia } : {}),
-            ...(d.verifiedAt !== undefined ? { verifiedAt: d.verifiedAt } : {}),
-        }))
+            .map((d) => this.toSummary(d))
             .sort((a, b) => b.addedAt.localeCompare(a.addedAt));
     }
+    resolveEffectiveDeviceName(kid) {
+        const device = this.deviceStore.get(kid);
+        if (!device)
+            return undefined;
+        return device.localAlias ?? device.label ?? 'Mobile device';
+    }
+    setLocalAlias(kid, localAlias) {
+        const record = this.deviceStore.setLocalAlias(kid, localAlias);
+        if (!record)
+            throw new error_types_1.NotFoundError('E2EE device', kid);
+        return this.toSummary(record);
+    }
     async getSafetyNumber(kid) {
         if (!kid)
             throw new error_types_1.ValidationError('kid is required');
@@ -84,6 +89,17 @@ let E2eeTrustService = class E2eeTrustService {
             logger.info({ kid }, 'E2EE device un-paired from Paired devices');
         return { kid, removed };
     }
+    bindNotificationRoutingIdentity(kid, routingKid) {
+        if (!kid)
+            throw new error_types_1.ValidationError('kid is required');
+        if (!routingKid || !/^[A-Za-z0-9_-]{43}$/.test(routingKid)) {
+            throw new error_types_1.ValidationError('routingKid must be a 43-char base64url JWK thumbprint');
+        }
+        const record = this.deviceStore.setNotificationRoutingKid(kid, routingKid);
+        if (!record)
+            throw new error_types_1.NotFoundError('E2EE device', kid);
+        return { kid: record.kid, routingKid, bound: true };
+    }
     adoptPeerKeyTofu(incoming, installId) {
         if (!incoming?.kid || !incoming.publicKeyB64) {
             throw new error_types_1.ValidationError('kid and publicKeyB64 are required');
@@ -103,7 +119,13 @@ let E2eeTrustService = class E2eeTrustService {
             logger.warn({ suppliedKid: incoming.kid, derivedKid }, 'E2EE adopt rejected — kid does not match public key (possible substitution)');
             throw new error_types_1.ValidationError('kid does not match public key');
         }
-        const record = this.deviceStore.reconcile(incoming, undefined, {
+        const label = (0, e2ee_device_label_1.normalizeDeviceLabel)(incoming.label);
+        const normalizedIncoming = {
+            kid: incoming.kid,
+            publicKeyB64: incoming.publicKeyB64,
+            ...(label !== undefined ? { label } : {}),
+        };
+        const record = this.deviceStore.reconcile(normalizedIncoming, undefined, {
             installId,
             evictVerified: false,
         });
@@ -113,6 +135,18 @@ let E2eeTrustService = class E2eeTrustService {
             ...(record.verifiedVia !== undefined ? { verifiedVia: record.verifiedVia } : {}),
         };
     }
+    toSummary(record) {
+        return {
+            kid: record.kid,
+            trust: record.trust,
+            addedAt: record.addedAt,
+            ...(record.label !== undefined ? { label: record.label } : {}),
+            ...(record.localAlias !== undefined ? { localAlias: record.localAlias } : {}),
+            ...(record.adoptedVia !== undefined ? { adoptedVia: record.adoptedVia } : {}),
+            ...(record.verifiedVia !== undefined ? { verifiedVia: record.verifiedVia } : {}),
+            ...(record.verifiedAt !== undefined ? { verifiedAt: record.verifiedAt } : {}),
+        };
+    }
 };
 exports.E2eeTrustService = E2eeTrustService;
 exports.E2eeTrustService = E2eeTrustService = __decorate([

package/dist/server/modules/e2ee/services/e2ee-trust.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/e2ee/services/paired-device-workspace-access.service.d.ts

@@ -0,0 +1,20 @@
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
+import { E2eeDeviceStoreService } from './e2ee-device-store.service';
+export interface PairedDeviceWorkspaceAccess {
+    readonly kid: string;
+    readonly explicit: boolean;
+    readonly workspaceIds: string[];
+}
+export declare function canAccessWorkspace(access: Pick<PairedDeviceWorkspaceAccess, 'workspaceIds'>, workspaceId: string): boolean;
+export declare class PairedDeviceWorkspaceAccessService {
+    private readonly devices;
+    private readonly eventEmitter;
+    private readonly sqlite;
+    private readonly transactionRunner;
+    constructor(db: BetterSQLite3Database, devices: E2eeDeviceStoreService, eventEmitter: EventEmitter2);
+    getAccess(kid: string): PairedDeviceWorkspaceAccess;
+    updateAccess(kid: string, workspaceIds: string[]): Promise<PairedDeviceWorkspaceAccess>;
+    private assertKnownDevice;
+    private readAccess;
+}