@dxos/client-services 0.4.10-main.fa5a270 → 0.4.10-main.fd8ea31

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.
Files changed (122) hide show
  1. package/dist/lib/browser/{chunk-7PYX6UUA.mjs → chunk-WLE7E36I.mjs} +1518 -1077
  2. package/dist/lib/browser/chunk-WLE7E36I.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +62 -22
  4. package/dist/lib/browser/index.mjs.map +3 -3
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/packlets/testing/index.mjs +136 -116
  7. package/dist/lib/browser/packlets/testing/index.mjs.map +3 -3
  8. package/dist/lib/node/{chunk-4TX623I7.cjs → chunk-YXZQQAQN.cjs} +1409 -1056
  9. package/dist/lib/node/chunk-YXZQQAQN.cjs.map +7 -0
  10. package/dist/lib/node/index.cjs +98 -58
  11. package/dist/lib/node/index.cjs.map +3 -3
  12. package/dist/lib/node/meta.json +1 -1
  13. package/dist/lib/node/packlets/testing/index.cjs +135 -118
  14. package/dist/lib/node/packlets/testing/index.cjs.map +3 -3
  15. package/dist/types/src/index.d.ts +1 -0
  16. package/dist/types/src/index.d.ts.map +1 -1
  17. package/dist/types/src/packlets/diagnostics/browser-diagnostics-broadcast.d.ts +5 -0
  18. package/dist/types/src/packlets/diagnostics/browser-diagnostics-broadcast.d.ts.map +1 -0
  19. package/dist/types/src/packlets/diagnostics/diagnostics-broadcast.d.ts +5 -0
  20. package/dist/types/src/packlets/diagnostics/diagnostics-broadcast.d.ts.map +1 -0
  21. package/dist/types/src/packlets/diagnostics/diagnostics-collector.d.ts +15 -0
  22. package/dist/types/src/packlets/diagnostics/diagnostics-collector.d.ts.map +1 -0
  23. package/dist/types/src/packlets/{services → diagnostics}/diagnostics.d.ts +1 -1
  24. package/dist/types/src/packlets/diagnostics/diagnostics.d.ts.map +1 -0
  25. package/dist/types/src/packlets/diagnostics/index.d.ts +4 -0
  26. package/dist/types/src/packlets/diagnostics/index.d.ts.map +1 -0
  27. package/dist/types/src/packlets/identity/identity-manager.d.ts.map +1 -1
  28. package/dist/types/src/packlets/indexing/util.d.ts +2 -6
  29. package/dist/types/src/packlets/indexing/util.d.ts.map +1 -1
  30. package/dist/types/src/packlets/invitations/device-invitation-protocol.d.ts +3 -1
  31. package/dist/types/src/packlets/invitations/device-invitation-protocol.d.ts.map +1 -1
  32. package/dist/types/src/packlets/invitations/index.d.ts +1 -0
  33. package/dist/types/src/packlets/invitations/index.d.ts.map +1 -1
  34. package/dist/types/src/packlets/invitations/invitation-extension.d.ts +1 -0
  35. package/dist/types/src/packlets/invitations/invitation-extension.d.ts.map +1 -1
  36. package/dist/types/src/packlets/invitations/invitation-protocol.d.ts +6 -1
  37. package/dist/types/src/packlets/invitations/invitation-protocol.d.ts.map +1 -1
  38. package/dist/types/src/packlets/invitations/invitations-handler.d.ts +8 -4
  39. package/dist/types/src/packlets/invitations/invitations-handler.d.ts.map +1 -1
  40. package/dist/types/src/packlets/invitations/invitations-manager.d.ts +44 -0
  41. package/dist/types/src/packlets/invitations/invitations-manager.d.ts.map +1 -0
  42. package/dist/types/src/packlets/invitations/invitations-service.d.ts +7 -23
  43. package/dist/types/src/packlets/invitations/invitations-service.d.ts.map +1 -1
  44. package/dist/types/src/packlets/invitations/space-invitation-protocol.d.ts +2 -1
  45. package/dist/types/src/packlets/invitations/space-invitation-protocol.d.ts.map +1 -1
  46. package/dist/types/src/packlets/services/index.d.ts +1 -1
  47. package/dist/types/src/packlets/services/index.d.ts.map +1 -1
  48. package/dist/types/src/packlets/services/service-context.d.ts +9 -5
  49. package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
  50. package/dist/types/src/packlets/services/service-host.d.ts +6 -1
  51. package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
  52. package/dist/types/src/packlets/services/util.d.ts +1 -0
  53. package/dist/types/src/packlets/services/util.d.ts.map +1 -1
  54. package/dist/types/src/packlets/spaces/data-space-manager.d.ts +5 -1
  55. package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
  56. package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
  57. package/dist/types/src/packlets/storage/index.d.ts +1 -0
  58. package/dist/types/src/packlets/storage/index.d.ts.map +1 -1
  59. package/dist/types/src/packlets/storage/level.d.ts +4 -0
  60. package/dist/types/src/packlets/storage/level.d.ts.map +1 -0
  61. package/dist/types/src/packlets/storage/storage.d.ts.map +1 -1
  62. package/dist/types/src/packlets/storage/util.d.ts +4 -0
  63. package/dist/types/src/packlets/storage/util.d.ts.map +1 -0
  64. package/dist/types/src/packlets/system/system-service.d.ts +1 -1
  65. package/dist/types/src/packlets/system/system-service.d.ts.map +1 -1
  66. package/dist/types/src/packlets/testing/invitation-utils.d.ts.map +1 -1
  67. package/dist/types/src/packlets/testing/test-builder.d.ts +7 -2
  68. package/dist/types/src/packlets/testing/test-builder.d.ts.map +1 -1
  69. package/dist/types/src/packlets/vault/shared-worker-connection.d.ts +5 -5
  70. package/dist/types/src/packlets/vault/shared-worker-connection.d.ts.map +1 -1
  71. package/dist/types/src/packlets/vault/worker-runtime.d.ts +2 -0
  72. package/dist/types/src/packlets/vault/worker-runtime.d.ts.map +1 -1
  73. package/dist/types/src/packlets/vault/worker-session.d.ts +2 -0
  74. package/dist/types/src/packlets/vault/worker-session.d.ts.map +1 -1
  75. package/dist/types/src/version.d.ts +1 -1
  76. package/package.json +36 -34
  77. package/src/index.ts +1 -0
  78. package/src/packlets/devices/devices-service.test.ts +1 -1
  79. package/src/packlets/diagnostics/browser-diagnostics-broadcast.ts +94 -0
  80. package/src/packlets/diagnostics/diagnostics-broadcast.ts +20 -0
  81. package/src/packlets/diagnostics/diagnostics-collector.ts +65 -0
  82. package/src/packlets/{services → diagnostics}/diagnostics.ts +2 -2
  83. package/src/packlets/diagnostics/index.ts +7 -0
  84. package/src/packlets/identity/identity-manager.ts +1 -0
  85. package/src/packlets/identity/identity-service.test.ts +1 -1
  86. package/src/packlets/identity/identity.test.ts +3 -0
  87. package/src/packlets/indexing/util.ts +11 -68
  88. package/src/packlets/invitations/device-invitation-protocol.test.ts +1 -1
  89. package/src/packlets/invitations/device-invitation-protocol.ts +6 -1
  90. package/src/packlets/invitations/index.ts +1 -0
  91. package/src/packlets/invitations/invitation-extension.ts +28 -1
  92. package/src/packlets/invitations/invitation-protocol.ts +7 -1
  93. package/src/packlets/invitations/invitations-handler.ts +75 -96
  94. package/src/packlets/invitations/invitations-manager.ts +271 -0
  95. package/src/packlets/invitations/invitations-service.ts +23 -168
  96. package/src/packlets/invitations/space-invitation-protocol.ts +45 -3
  97. package/src/packlets/network/network-service.test.ts +1 -1
  98. package/src/packlets/services/automerge-host.test.ts +10 -4
  99. package/src/packlets/services/index.ts +1 -1
  100. package/src/packlets/services/service-context.test.ts +9 -6
  101. package/src/packlets/services/service-context.ts +30 -11
  102. package/src/packlets/services/service-host.ts +63 -24
  103. package/src/packlets/services/service-registry.test.ts +1 -1
  104. package/src/packlets/services/util.ts +2 -0
  105. package/src/packlets/spaces/data-space-manager.test.ts +4 -4
  106. package/src/packlets/spaces/data-space-manager.ts +48 -2
  107. package/src/packlets/spaces/data-space.ts +51 -2
  108. package/src/packlets/spaces/spaces-service.test.ts +1 -1
  109. package/src/packlets/storage/index.ts +1 -0
  110. package/src/packlets/storage/level.ts +19 -0
  111. package/src/packlets/storage/storage.ts +3 -9
  112. package/src/packlets/storage/util.ts +19 -0
  113. package/src/packlets/system/system-service.ts +1 -1
  114. package/src/packlets/testing/invitation-utils.ts +100 -97
  115. package/src/packlets/testing/test-builder.ts +42 -6
  116. package/src/packlets/vault/shared-worker-connection.ts +3 -8
  117. package/src/packlets/vault/worker-runtime.ts +27 -2
  118. package/src/packlets/vault/worker-session.ts +6 -0
  119. package/src/version.ts +1 -1
  120. package/dist/lib/browser/chunk-7PYX6UUA.mjs.map +0 -7
  121. package/dist/lib/node/chunk-4TX623I7.cjs.map +0 -7
  122. package/dist/types/src/packlets/services/diagnostics.d.ts.map +0 -1
@@ -25,11 +25,11 @@ export declare class SharedWorkerConnection {
25
25
  private _shellRuntime?;
26
26
  constructor({ config, systemPort, shellPort }: SharedWorkerConnectionOptions);
27
27
  get shell(): ShellRuntime | undefined;
28
- open(
29
- /**
30
- * @deprecated Only used with iframes.
31
- */
32
- origin: string): Promise<void>;
28
+ open(params: {
29
+ origin: string;
30
+ observabilityGroup?: string;
31
+ signalTelemetryEnabled?: boolean;
32
+ }): Promise<void>;
33
33
  close(): Promise<void>;
34
34
  private _lockKey;
35
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shared-worker-connection.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/shared-worker-connection.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAiB,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,UAAU,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0C;IAC1E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAC,CAAmB;gBAE7B,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,6BAA6B;IAU5E,IAAI,KAAK,IAAI,YAAY,GAAG,SAAS,CAEpC;IAEK,IAAI;IACR;;OAEG;IACH,MAAM,EAAE,MAAM;IA0CV,KAAK;IAWX,OAAO,CAAC,QAAQ;CAGjB"}
1
+ {"version":3,"file":"shared-worker-connection.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/shared-worker-connection.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAiB,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,UAAU,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0C;IAC1E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAC,CAAmB;gBAE7B,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,6BAA6B;IAU5E,IAAI,KAAK,IAAI,YAAY,GAAG,SAAS,CAEpC;IAEK,IAAI,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;KAAE;IAyC9F,KAAK;IAWX,OAAO,CAAC,QAAQ;CAGjB"}
@@ -27,6 +27,8 @@ export declare class WorkerRuntime {
27
27
  private readonly _clientServices;
28
28
  private _sessionForNetworking?;
29
29
  private _config;
30
+ private _signalMetadataTags;
31
+ private _signalTelemetryEnabled;
30
32
  constructor(_configProvider: () => MaybePromise<Config>, { acquireLock, releaseLock, onReset }: WorkerRuntimeCallbacks);
31
33
  get host(): ClientServicesHost;
32
34
  start(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;gBAGN,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,EAC5D,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAW/D,IAAI,IAAI,uBAEP;IAEK,KAAK;IAuBL,IAAI;IAMV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IA0B3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}
1
+ {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAW3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAatB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAZlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,mBAAmB,CAAsC;IACjE,OAAO,CAAC,uBAAuB,CAAkB;gBAG9B,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,EAC5D,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAW/D,IAAI,IAAI,uBAEP;IAEK,KAAK;IA8BL,IAAI;IAMV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IAoC3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}
@@ -21,6 +21,8 @@ export declare class WorkerSession {
21
21
  private readonly _serviceHost;
22
22
  readonly onClose: Callback<() => Promise<void>>;
23
23
  origin?: string;
24
+ observabilityGroup?: string;
25
+ signalTelemetryEnabled?: boolean;
24
26
  lockKey?: string;
25
27
  bridgeService?: BridgeService;
26
28
  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }: WorkerSessionParams);
@@ -1 +1 @@
1
- {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,mBAAmB;IAkEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
1
+ {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAGjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,mBAAmB;IAoEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
@@ -1,2 +1,2 @@
1
- export declare const DXOS_VERSION = "0.4.10-main.fa5a270";
1
+ export declare const DXOS_VERSION = "0.4.10-main.fd8ea31";
2
2
  //# sourceMappingURL=version.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.4.10-main.fa5a270",
3
+ "version": "0.4.10-main.fd8ea31",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
10
10
  "browser": {
11
11
  "jsondown": false,
12
12
  "./src/packlets/locks/node.ts": "./src/packlets/locks/browser.ts",
13
+ "./src/packlets/diagnostics/diagnostics-broadcast.ts": "./src/packlets/diagnostics/browser-diagnostics-broadcast.ts",
13
14
  "./dist/lib/node/index.cjs": "./dist/lib/browser/index.mjs",
14
15
  "./testing.js": "./dist/lib/browser/packlets/testing/index.mjs"
15
16
  },
@@ -21,44 +22,45 @@
21
22
  "src"
22
23
  ],
23
24
  "dependencies": {
25
+ "level": "^8.0.1",
24
26
  "platform": "^1.3.6",
25
- "@dxos/async": "0.4.10-main.fa5a270",
26
- "@dxos/client-protocol": "0.4.10-main.fa5a270",
27
- "@dxos/automerge": "0.4.10-main.fa5a270",
28
- "@dxos/config": "0.4.10-main.fa5a270",
29
- "@dxos/codec-protobuf": "0.4.10-main.fa5a270",
30
- "@dxos/context": "0.4.10-main.fa5a270",
31
- "@dxos/credentials": "0.4.10-main.fa5a270",
32
- "@dxos/crypto": "0.4.10-main.fa5a270",
33
- "@dxos/debug": "0.4.10-main.fa5a270",
34
- "@dxos/echo-db": "0.4.10-main.fa5a270",
35
- "@dxos/echo-pipeline": "0.4.10-main.fa5a270",
36
- "@dxos/echo-schema": "0.4.10-main.fa5a270",
37
- "@dxos/feed-store": "0.4.10-main.fa5a270",
38
- "@dxos/indexing": "0.4.10-main.fa5a270",
39
- "@dxos/invariant": "0.4.10-main.fa5a270",
40
- "@dxos/keyring": "0.4.10-main.fa5a270",
41
- "@dxos/keys": "0.4.10-main.fa5a270",
42
- "@dxos/lock-file": "0.4.10-main.fa5a270",
43
- "@dxos/messaging": "0.4.10-main.fa5a270",
44
- "@dxos/network-manager": "0.4.10-main.fa5a270",
45
- "@dxos/log": "0.4.10-main.fa5a270",
46
- "@dxos/node-std": "0.4.10-main.fa5a270",
47
- "@dxos/random-access-storage": "0.4.10-main.fa5a270",
48
- "@dxos/protocols": "0.4.10-main.fa5a270",
49
- "@dxos/rpc": "0.4.10-main.fa5a270",
50
- "@dxos/teleport": "0.4.10-main.fa5a270",
51
- "@dxos/teleport-extension-gossip": "0.4.10-main.fa5a270",
52
- "@dxos/teleport-extension-object-sync": "0.4.10-main.fa5a270",
53
- "@dxos/tracing": "0.4.10-main.fa5a270",
54
- "@dxos/websocket-rpc": "0.4.10-main.fa5a270",
55
- "@dxos/timeframe": "0.4.10-main.fa5a270",
56
- "@dxos/util": "0.4.10-main.fa5a270"
27
+ "@dxos/async": "0.4.10-main.fd8ea31",
28
+ "@dxos/automerge": "0.4.10-main.fd8ea31",
29
+ "@dxos/codec-protobuf": "0.4.10-main.fd8ea31",
30
+ "@dxos/config": "0.4.10-main.fd8ea31",
31
+ "@dxos/client-protocol": "0.4.10-main.fd8ea31",
32
+ "@dxos/context": "0.4.10-main.fd8ea31",
33
+ "@dxos/credentials": "0.4.10-main.fd8ea31",
34
+ "@dxos/debug": "0.4.10-main.fd8ea31",
35
+ "@dxos/crypto": "0.4.10-main.fd8ea31",
36
+ "@dxos/echo-db": "0.4.10-main.fd8ea31",
37
+ "@dxos/echo-pipeline": "0.4.10-main.fd8ea31",
38
+ "@dxos/echo-schema": "0.4.10-main.fd8ea31",
39
+ "@dxos/feed-store": "0.4.10-main.fd8ea31",
40
+ "@dxos/indexing": "0.4.10-main.fd8ea31",
41
+ "@dxos/invariant": "0.4.10-main.fd8ea31",
42
+ "@dxos/keys": "0.4.10-main.fd8ea31",
43
+ "@dxos/keyring": "0.4.10-main.fd8ea31",
44
+ "@dxos/log": "0.4.10-main.fd8ea31",
45
+ "@dxos/lock-file": "0.4.10-main.fd8ea31",
46
+ "@dxos/messaging": "0.4.10-main.fd8ea31",
47
+ "@dxos/network-manager": "0.4.10-main.fd8ea31",
48
+ "@dxos/random-access-storage": "0.4.10-main.fd8ea31",
49
+ "@dxos/node-std": "0.4.10-main.fd8ea31",
50
+ "@dxos/protocols": "0.4.10-main.fd8ea31",
51
+ "@dxos/rpc": "0.4.10-main.fd8ea31",
52
+ "@dxos/teleport-extension-object-sync": "0.4.10-main.fd8ea31",
53
+ "@dxos/teleport-extension-gossip": "0.4.10-main.fd8ea31",
54
+ "@dxos/teleport": "0.4.10-main.fd8ea31",
55
+ "@dxos/timeframe": "0.4.10-main.fd8ea31",
56
+ "@dxos/tracing": "0.4.10-main.fd8ea31",
57
+ "@dxos/util": "0.4.10-main.fd8ea31",
58
+ "@dxos/websocket-rpc": "0.4.10-main.fd8ea31"
57
59
  },
58
60
  "devDependencies": {
59
61
  "@types/platform": "^1.3.4",
60
62
  "@types/readable-stream": "^2.3.9",
61
- "@dxos/signal": "0.4.10-main.fa5a270"
63
+ "@dxos/signal": "0.4.10-main.fd8ea31"
62
64
  },
63
65
  "publishConfig": {
64
66
  "access": "public"
package/src/index.ts CHANGED
@@ -10,3 +10,4 @@ export * from './packlets/spaces';
10
10
  export * from './packlets/storage';
11
11
  export * from './packlets/vault';
12
12
  export * from './packlets/locks';
13
+ export * from './packlets/diagnostics';
@@ -19,7 +19,7 @@ describe('DevicesService', () => {
19
19
  let devicesService: DevicesService;
20
20
 
21
21
  beforeEach(async () => {
22
- serviceContext = createServiceContext();
22
+ serviceContext = await createServiceContext();
23
23
  await serviceContext.open(new Context());
24
24
  devicesService = new DevicesServiceImpl(serviceContext.identityManager);
25
25
  });
@@ -0,0 +1,94 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { Trigger } from '@dxos/async';
6
+ import { log } from '@dxos/log';
7
+ import { type SystemService } from '@dxos/protocols/proto/dxos/client/services';
8
+
9
+ import {
10
+ type CollectDiagnosticsBroadcastSender,
11
+ type CollectDiagnosticsBroadcastHandler,
12
+ } from './diagnostics-collector';
13
+
14
+ const CHANNEL_NAME = 'dxos.diagnostics.broadcast';
15
+
16
+ enum MessageType {
17
+ PROBE = 'probe',
18
+ PROBE_ACK = 'probe-ack',
19
+ REQUEST_DIAGNOSTICS = 'request-diagnostics',
20
+ RECEIVE_DIAGNOSTICS = 'receive-diagnostics',
21
+ }
22
+
23
+ interface Message {
24
+ type: MessageType;
25
+ payload?: any;
26
+ }
27
+
28
+ export const createCollectDiagnosticsBroadcastSender = (): CollectDiagnosticsBroadcastSender => {
29
+ return {
30
+ broadcastDiagnosticsRequest: async () => {
31
+ let expectedResponse = MessageType.PROBE_ACK;
32
+ let channel: BroadcastChannel | undefined;
33
+ try {
34
+ const trigger = new Trigger<Message>();
35
+ channel = new BroadcastChannel(CHANNEL_NAME);
36
+ channel.onmessage = (msg) => {
37
+ if (expectedResponse === msg.data.type) {
38
+ trigger.wake(msg.data);
39
+ }
40
+ };
41
+ channel.postMessage({ type: MessageType.PROBE });
42
+ await trigger.wait({ timeout: 200 });
43
+ expectedResponse = MessageType.RECEIVE_DIAGNOSTICS;
44
+ trigger.reset();
45
+ channel.postMessage({ type: MessageType.REQUEST_DIAGNOSTICS });
46
+ const diagnostics = await trigger.wait({ timeout: 5000 });
47
+ return diagnostics.payload;
48
+ } catch (e) {
49
+ const errorDescription = e instanceof Error ? e.message : JSON.stringify(e);
50
+ return { expectedResponse, errorDescription };
51
+ } finally {
52
+ safeClose(channel);
53
+ }
54
+ },
55
+ };
56
+ };
57
+
58
+ export const createCollectDiagnosticsBroadcastHandler = (
59
+ systemService: SystemService,
60
+ ): CollectDiagnosticsBroadcastHandler => {
61
+ let channel: BroadcastChannel | undefined;
62
+ return {
63
+ start: () => {
64
+ channel = new BroadcastChannel(CHANNEL_NAME);
65
+ channel.onmessage = async (message) => {
66
+ try {
67
+ if (message.data.type === MessageType.PROBE) {
68
+ channel?.postMessage({ type: MessageType.PROBE_ACK });
69
+ } else if (message.data.type === MessageType.REQUEST_DIAGNOSTICS) {
70
+ const diagnostics = await systemService.getDiagnostics({});
71
+ channel?.postMessage({
72
+ type: MessageType.RECEIVE_DIAGNOSTICS,
73
+ payload: diagnostics,
74
+ });
75
+ }
76
+ } catch (error) {
77
+ log.catch(error);
78
+ }
79
+ };
80
+ },
81
+ stop: () => {
82
+ safeClose(channel);
83
+ channel = undefined;
84
+ },
85
+ };
86
+ };
87
+
88
+ const safeClose = (channel?: BroadcastChannel) => {
89
+ try {
90
+ channel?.close();
91
+ } catch (e) {
92
+ // ignored
93
+ }
94
+ };
@@ -0,0 +1,20 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+ import { type SystemService } from '@dxos/protocols/proto/dxos/client/services';
5
+
6
+ import {
7
+ type CollectDiagnosticsBroadcastSender,
8
+ type CollectDiagnosticsBroadcastHandler,
9
+ } from './diagnostics-collector';
10
+
11
+ export const createCollectDiagnosticsBroadcastSender = (): CollectDiagnosticsBroadcastSender => {
12
+ return { broadcastDiagnosticsRequest: async () => undefined };
13
+ };
14
+
15
+ export const createCollectDiagnosticsBroadcastHandler = (_: SystemService): CollectDiagnosticsBroadcastHandler => {
16
+ return {
17
+ start: () => {},
18
+ stop: () => {},
19
+ };
20
+ };
@@ -0,0 +1,65 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { type ClientServicesProvider } from '@dxos/client-protocol';
6
+ import { type Config, ConfigResource } from '@dxos/config';
7
+ import { GetDiagnosticsRequest } from '@dxos/protocols/proto/dxos/client/services';
8
+ import { TRACE_PROCESSOR } from '@dxos/tracing';
9
+ import { type JsonKeyOptions, jsonKeyReplacer, nonNullable } from '@dxos/util';
10
+
11
+ import { createCollectDiagnosticsBroadcastSender } from './diagnostics-broadcast';
12
+ import { ClientServicesProviderResource } from '../services';
13
+
14
+ export interface CollectDiagnosticsBroadcastSender {
15
+ broadcastDiagnosticsRequest(): any;
16
+ }
17
+
18
+ export interface CollectDiagnosticsBroadcastHandler {
19
+ start(): void;
20
+ stop(): void;
21
+ }
22
+
23
+ export class DiagnosticsCollector {
24
+ private static broadcastSender = createCollectDiagnosticsBroadcastSender();
25
+
26
+ public static async collect(
27
+ config: Config | Config[] = findConfigs(),
28
+ services: ClientServicesProvider | null = findSystemServiceProvider(),
29
+ options: JsonKeyOptions = {},
30
+ ): Promise<any> {
31
+ const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
32
+ keys: options.humanize
33
+ ? GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
34
+ : options.truncate
35
+ ? GetDiagnosticsRequest.KEY_OPTION.TRUNCATE
36
+ : undefined,
37
+ });
38
+
39
+ const clientDiagnostics = {
40
+ config,
41
+ trace: TRACE_PROCESSOR.getDiagnostics(),
42
+ };
43
+
44
+ const diagnostics =
45
+ serviceDiagnostics != null
46
+ ? { client: clientDiagnostics, services: serviceDiagnostics }
47
+ : {
48
+ client: clientDiagnostics,
49
+ broadcast: await this.broadcastSender.broadcastDiagnosticsRequest(),
50
+ };
51
+
52
+ return JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer(options)));
53
+ }
54
+ }
55
+
56
+ const findSystemServiceProvider = (): ClientServicesProvider | null => {
57
+ const serviceProviders = TRACE_PROCESSOR.findByAnnotation(ClientServicesProviderResource);
58
+ const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
59
+ return providerResource?.instance?.deref() ?? null;
60
+ };
61
+
62
+ const findConfigs = (): Config[] => {
63
+ const configs = TRACE_PROCESSOR.findByAnnotation(ConfigResource);
64
+ return configs.map((r) => r.instance.deref()).filter(nonNullable);
65
+ };
@@ -25,9 +25,9 @@ import { type Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
25
25
  import { type Resource, type Span } from '@dxos/protocols/proto/dxos/tracing';
26
26
  import { TRACE_PROCESSOR } from '@dxos/tracing';
27
27
 
28
- import { getPlatform } from './platform';
29
- import { type ServiceContext } from './service-context';
30
28
  import { DXOS_VERSION } from '../../version';
29
+ import { type ServiceContext } from '../services';
30
+ import { getPlatform } from '../services/platform';
31
31
  import { type DataSpace } from '../spaces';
32
32
 
33
33
  const DEFAULT_TIMEOUT = 1_000;
@@ -0,0 +1,7 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ export * from './diagnostics';
6
+ export * from './diagnostics-collector';
7
+ export * from './diagnostics-broadcast';
@@ -385,6 +385,7 @@ export class IdentityManager {
385
385
  log.warn('auth failure');
386
386
  },
387
387
  memberKey: identityKey,
388
+ onDelegatedInvitationStatusChange: async () => {}, // TODO: will be used for recovery keys
388
389
  });
389
390
  }
390
391
  }
@@ -22,7 +22,7 @@ describe('IdentityService', () => {
22
22
  let identityService: IdentityService;
23
23
 
24
24
  beforeEach(async () => {
25
- serviceContext = createServiceContext();
25
+ serviceContext = await createServiceContext();
26
26
  await serviceContext.open(new Context());
27
27
  identityService = new IdentityServiceImpl(
28
28
  (options) => serviceContext.createIdentity(options),
@@ -94,6 +94,7 @@ describe('identity/identity', () => {
94
94
  metadataStore,
95
95
  snapshotManager: new SnapshotManager(snapshotStore, blobStore, protocol.blobSync),
96
96
  snapshotId: undefined,
97
+ onDelegatedInvitationStatusChange: async () => {},
97
98
  });
98
99
  await space.setControlFeed(controlFeed);
99
100
  await space.setDataFeed(dataFeed);
@@ -206,6 +207,7 @@ describe('identity/identity', () => {
206
207
  memberKey: identityKey,
207
208
  metadataStore,
208
209
  snapshotManager: new SnapshotManager(snapshotStore, blobStore, protocol.blobSync),
210
+ onDelegatedInvitationStatusChange: async () => {},
209
211
  });
210
212
  await space.setControlFeed(controlFeed);
211
213
  await space.setDataFeed(dataFeed);
@@ -296,6 +298,7 @@ describe('identity/identity', () => {
296
298
  memberKey: identityKey,
297
299
  metadataStore,
298
300
  snapshotManager: new SnapshotManager(snapshotStore, blobStore, protocol.blobSync),
301
+ onDelegatedInvitationStatusChange: async () => {},
299
302
  });
300
303
  await space.setControlFeed(controlFeed);
301
304
  await space.setDataFeed(dataFeed);
@@ -3,87 +3,30 @@
3
3
  //
4
4
 
5
5
  import { getHeads } from '@dxos/automerge/automerge';
6
- import { type DocHandle } from '@dxos/automerge/automerge-repo';
7
- import { warnAfterTimeout } from '@dxos/debug';
6
+ import { type DocumentId } from '@dxos/automerge/automerge-repo';
8
7
  import { type AutomergeHost } from '@dxos/echo-pipeline';
9
- import { type ObjectSnapshot } from '@dxos/indexing';
10
- import { idCodec } from '@dxos/protocols';
8
+ import { type ObjectPointerEncoded, idCodec } from '@dxos/protocols';
11
9
 
12
10
  /**
13
11
  * Factory for `loadDocuments` iterator.
14
12
  */
15
- export const createLoadDocuments = (automergeHost: AutomergeHost) =>
13
+ export const createSelectedDocumentsIterator = (automergeHost: AutomergeHost) =>
16
14
  /**
17
15
  * Get object data blobs from Automerge Repo by ids.
18
16
  * @param ids
19
17
  */
20
18
  // TODO(mykola): Unload automerge handles after usage.
21
- async function* loadDocuments(ids: string[]) {
19
+ async function* loadDocuments(ids: ObjectPointerEncoded[]) {
22
20
  for (const id of ids) {
23
21
  const { documentId, objectId } = idCodec.decode(id);
24
- const handle = automergeHost.repo.find(documentId as any);
25
- await warnAfterTimeout(5000, 'to long to load doc', () => handle.whenReady());
26
- const doc = handle.docSync();
27
- const hash = getHeads(doc).join('');
28
- yield [{ id, object: doc.objects[objectId], currentHash: hash }];
29
- }
30
- };
31
-
32
- /**
33
- * Factory for `getAllDocuments` iterator.
34
- */
35
- export const createGetAllDocuments = (automergeHost: AutomergeHost) =>
36
- /**
37
- * Recursively get all object data blobs from Automerge Repo.
38
- * @param ids
39
- */
40
- // TODO(mykola): Unload automerge handles after usage.
41
- async function* getAllDocuments(): AsyncGenerator<ObjectSnapshot[], void, 'done'> {
42
- /** visited automerge handles */
43
- const visited = new Set<string>();
44
-
45
- async function* getObjectsFromHandle(handle: DocHandle<any>): AsyncGenerator<ObjectSnapshot[]> {
46
- if (visited.has(handle.documentId)) {
47
- return;
22
+ const handle =
23
+ automergeHost.repo.handles[documentId as DocumentId] ?? automergeHost.repo.find(documentId as DocumentId);
24
+ if (!handle.isReady()) {
25
+ // `whenReady` creates a timeout so we guard it with an if to skip it if the handle is already ready.
26
+ await handle.whenReady();
48
27
  }
49
-
50
- await warnAfterTimeout(5000, 'to long to load doc', () => handle.whenReady());
51
28
  const doc = handle.docSync();
52
-
53
- const heads = getHeads(doc);
54
-
55
- if (doc.objects) {
56
- yield Object.entries(doc.objects as { [key: string]: any }).map(([objectId, object]) => {
57
- return {
58
- id: idCodec.encode({ documentId: handle.documentId, objectId }),
59
- object,
60
- currentHash: heads.at(-1)!,
61
- };
62
- });
63
- }
64
-
65
- if (doc.links) {
66
- for (const id of Object.values(doc.links as { [echoId: string]: string })) {
67
- if (visited.has(id)) {
68
- continue;
69
- }
70
- const linkHandle = automergeHost.repo.find(id as any);
71
- for await (const result of getObjectsFromHandle(linkHandle)) {
72
- yield result;
73
- }
74
- }
75
- }
76
-
77
- visited.add(handle.documentId);
78
- }
79
-
80
- for (const handle of Object.values(automergeHost.repo.handles)) {
81
- if (visited.has(handle.documentId)) {
82
- continue;
83
- }
84
- for await (const result of getObjectsFromHandle(handle)) {
85
- yield result;
86
- }
87
- visited.add(handle.documentId);
29
+ const hash = getHeads(doc).join('');
30
+ yield doc.objects?.[objectId] ? [{ id, object: doc.objects[objectId], currentHash: hash }] : [];
88
31
  }
89
32
  };
@@ -20,7 +20,7 @@ const closeAfterTest = async (peer: ServiceContext) => {
20
20
 
21
21
  describe('services/device', () => {
22
22
  test('creates identity', async () => {
23
- const peer = createServiceContext();
23
+ const peer = await createServiceContext();
24
24
  await peer.open(new Context());
25
25
  afterTest(() => peer.close());
26
26
 
@@ -4,6 +4,7 @@
4
4
 
5
5
  import { invariant } from '@dxos/invariant';
6
6
  import { type Keyring } from '@dxos/keyring';
7
+ import { type PublicKey } from '@dxos/keys';
7
8
  import { AlreadyJoinedError } from '@dxos/protocols';
8
9
  import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
9
10
  import type { DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -33,7 +34,11 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
33
34
  };
34
35
  }
35
36
 
36
- async admit(request: AdmissionRequest): Promise<AdmissionResponse> {
37
+ async delegate(invitation: Invitation): Promise<PublicKey> {
38
+ throw new Error('delegation not supported');
39
+ }
40
+
41
+ async admit(_: Invitation, request: AdmissionRequest): Promise<AdmissionResponse> {
37
42
  invariant(request.device);
38
43
  const identity = this._getIdentity();
39
44
  await identity.admitDevice(request.device);
@@ -7,3 +7,4 @@ export * from './invitation-protocol';
7
7
  export * from './invitations-handler';
8
8
  export * from './invitations-service';
9
9
  export * from './space-invitation-protocol';
10
+ export * from './invitations-manager';
@@ -4,6 +4,7 @@
4
4
 
5
5
  import { Trigger } from '@dxos/async';
6
6
  import { cancelWithContext, Context } from '@dxos/context';
7
+ import { randomBytes, verify } from '@dxos/crypto';
7
8
  import { invariant } from '@dxos/invariant';
8
9
  import { PublicKey } from '@dxos/keys';
9
10
  import { log } from '@dxos/log';
@@ -51,6 +52,8 @@ export class InvitationHostExtension extends RpcExtension<
51
52
  private _remoteOptions?: Options;
52
53
  private _remoteOptionsTrigger = new Trigger();
53
54
 
55
+ private _challenge?: Buffer = undefined;
56
+
54
57
  public invitation?: Invitation = undefined;
55
58
 
56
59
  public guestProfile?: ProfileDocument = undefined;
@@ -113,13 +116,17 @@ export class InvitationHostExtension extends RpcExtension<
113
116
 
114
117
  this._callbacks.onStateUpdate({ ...this.invitation, state: Invitation.State.READY_FOR_AUTHENTICATION });
115
118
 
119
+ this._challenge =
120
+ this.invitation.authMethod === Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : undefined;
121
+
116
122
  log.trace('dxos.sdk.invitation-handler.host.introduce', trace.end({ id: traceId }));
117
123
  return {
118
124
  authMethod: this.invitation.authMethod,
125
+ challenge: this._challenge,
119
126
  };
120
127
  },
121
128
 
122
- authenticate: async ({ authCode: code }) => {
129
+ authenticate: async ({ authCode: code, signedChallenge }) => {
123
130
  const traceId = PublicKey.random().toHex();
124
131
  log.trace('dxos.sdk.invitation-handler.host.authenticate', trace.begin({ id: traceId }));
125
132
  log('received authentication request', { authCode: code });
@@ -145,6 +152,26 @@ export class InvitationHostExtension extends RpcExtension<
145
152
  break;
146
153
  }
147
154
 
155
+ case Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
156
+ if (!this.invitation.guestKeypair) {
157
+ status = AuthenticationResponse.Status.INTERNAL_ERROR;
158
+ break;
159
+ }
160
+ const isSignatureValid =
161
+ this._challenge &&
162
+ verify(
163
+ this._challenge,
164
+ Buffer.from(signedChallenge ?? []),
165
+ this.invitation.guestKeypair.publicKey.asBuffer(),
166
+ );
167
+ if (isSignatureValid) {
168
+ this.authenticationPassed = true;
169
+ } else {
170
+ status = AuthenticationResponse.Status.INVALID_SIGNATURE;
171
+ }
172
+ break;
173
+ }
174
+
148
175
  default: {
149
176
  log.error('invalid authentication method', { authMethod: this.invitation.authMethod });
150
177
  status = AuthenticationResponse.Status.INTERNAL_ERROR;
@@ -2,6 +2,7 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
+ import { type PublicKey } from '@dxos/keys';
5
6
  import type { ApiError } from '@dxos/protocols';
6
7
  import type { Invitation } from '@dxos/protocols/proto/dxos/client/services';
7
8
  import type { ProfileDocument, DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -33,7 +34,12 @@ export interface InvitationProtocol {
33
34
  /**
34
35
  * Once authentication is successful, the host can admit the guest to the requested resource.
35
36
  */
36
- admit(request: AdmissionRequest, guestProfile?: ProfileDocument): Promise<AdmissionResponse>;
37
+ delegate(invitation: Invitation): Promise<PublicKey>;
38
+
39
+ /**
40
+ * Once authentication is successful, the host can admit the guest to the requested resource.
41
+ */
42
+ admit(invitation: Invitation, request: AdmissionRequest, guestProfile?: ProfileDocument): Promise<AdmissionResponse>;
37
43
 
38
44
  //
39
45
  // Guest