@dxos/client-services 0.1.11 → 0.1.12

package/dist/src/packlets/deprecated/system.d.ts

@@ -10,6 +10,9 @@ export declare class SystemServiceImpl implements SystemService {
     constructor(_config: Config, _serviceContext: ServiceContext);
     initSession(): Promise<void>;
     getConfig(request: void): Promise<import("@dxos/config").ConfigProto>;
+    getStatus(request: void): Promise<{
+        message: string;
+    }>;
     reset(request: any): Promise<void>;
 }
 //# sourceMappingURL=system.d.ts.map

package/dist/src/packlets/deprecated/system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../../../src/packlets/deprecated/system.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAjD,OAAO,EAAE,MAAM,EAAmB,eAAe,EAAE,cAAc;IAGxF,WAAW;IAIX,SAAS,CAAC,OAAO,EAAE,IAAI;IAIvB,KAAK,CAAC,OAAO,EAAE,GAAG;CAGzB"}
+{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../../../src/packlets/deprecated/system.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAjD,OAAO,EAAE,MAAM,EAAmB,eAAe,EAAE,cAAc;IAGxF,WAAW;IAIX,SAAS,CAAC,OAAO,EAAE,IAAI;IAKvB,SAAS,CAAC,OAAO,EAAE,IAAI;;;IAMvB,KAAK,CAAC,OAAO,EAAE,GAAG;CAGzB"}

package/dist/src/packlets/deprecated/system.js

@@ -19,6 +19,12 @@ class SystemServiceImpl {
     async getConfig(request) {
         return this._config.values;
     }
+    // TODO(burdon): Connect to iframe RPC heartbeat for network status?
+    async getStatus(request) {
+        return {
+            message: `ok: ${Date.now()}`
+        };
+    }
     async reset(request) {
         await this._serviceContext.reset();
     }

package/dist/src/packlets/deprecated/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../../src/packlets/deprecated/system.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAOF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,YAA6B,OAAe,EAAmB,eAA+B;QAAjE,YAAO,GAAP,OAAO,CAAQ;QAAmB,oBAAe,GAAf,eAAe,CAAgB;IAAG,CAAC;IAElG,wBAAwB;IACxB,KAAK,CAAC,WAAW;QACf,MAAM;IACR,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAa;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAY;QACtB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACrC,CAAC;CACF;AAfD,8CAeC"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../../../src/packlets/deprecated/system.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAOF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,YAA6B,OAAe,EAAmB,eAA+B;QAAjE,YAAO,GAAP,OAAO,CAAQ;QAAmB,oBAAe,GAAf,eAAe,CAAgB;IAAG,CAAC;IAElG,wBAAwB;IACxB,KAAK,CAAC,WAAW;QACf,MAAM;IACR,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAa;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,oEAAoE;IACpE,KAAK,CAAC,SAAS,CAAC,OAAa;QAC3B,OAAO;YACL,OAAO,EAAE,OAAO,IAAI,CAAC,GAAG,EAAE,EAAE;SAC7B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAY;QACtB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACrC,CAAC;CACF;AAtBD,8CAsBC"}

package/dist/src/packlets/vault/worker-session.d.ts

@@ -17,7 +17,7 @@ export type WorkerSessionParams = {
  */
 export declare class WorkerSession {
     private readonly _clientRpc;
-    private readonly _systemRpc;
+    private readonly _iframeRpc;
     private readonly _startTrigger;
     private readonly _getServices;
     private readonly _options;

package/dist/src/packlets/vault/worker-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAuB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtE,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAEvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,OAEC,EACF,EAAE,mBAAmB;IAiDhB,IAAI;IAkBJ,KAAK;CAaZ"}
+{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAuC,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAEvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,OAEC,EACF,EAAE,mBAAmB;IAmDhB,IAAI;IAqBJ,KAAK;CAaZ"}

package/dist/src/packlets/vault/worker-session.js

@@ -2,8 +2,12 @@
 //
 // Copyright 2022 DXOS.org
 //
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerSession = void 0;
+const assert_1 = __importDefault(require("assert"));
 const async_1 = require("@dxos/async");
 const log_1 = require("@dxos/log");
 const rpc_1 = require("@dxos/rpc");
@@ -19,6 +23,8 @@ class WorkerSession {
     } }) {
         this._startTrigger = new async_1.Trigger();
         this.onClose = new util_1.Callback();
+        (0, assert_1.default)(options);
+        (0, assert_1.default)(getServices);
         this._options = options;
         this._getServices = getServices;
         this._clientRpc = (0, rpc_1.createProtoRpcPeer)({
@@ -37,7 +43,7 @@ class WorkerSession {
             },
             port: appPort
         });
-        this._systemRpc = (0, rpc_1.createProtoRpcPeer)({
+        this._iframeRpc = (0, rpc_1.createProtoRpcPeer)({
             requested: services_2.iframeServiceBundle,
             exposed: services_2.workerServiceBundle,
             handlers: {
@@ -52,7 +58,7 @@ class WorkerSession {
                                 await this.close();
                             }
                             catch (err) {
-                                log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 83, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+                                log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 87, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
                             }
                         });
                     }
@@ -61,21 +67,24 @@ class WorkerSession {
             port: systemPort,
             timeout: 200
         });
-        this.bridgeService = this._systemRpc.rpc.BridgeService;
+        this.bridgeService = this._iframeRpc.rpc.BridgeService;
     }
     async open() {
-        await Promise.all([this._clientRpc.open(), this._systemRpc.open()]);
+        await Promise.all([this._clientRpc.open(), this._iframeRpc.open()]);
         await this._startTrigger.wait({ timeout: 3000 });
+        // Detect if bridge is present.
+        // TODO(burdon): Add heartbeat to client's System service.
+        //  How do we detect if the client's tab closed?
         this._heartbeatTimer = setInterval(async () => {
             try {
-                await this._systemRpc.rpc.IframeService.heartbeat();
+                await this._iframeRpc.rpc.IframeService.heartbeat();
             }
             catch (err) {
                 try {
                     await this.close();
                 }
                 catch (err) {
-                    log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 108, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+                    log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 115, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
                 }
             }
         }, this._options.heartbeatInterval);
@@ -85,12 +94,12 @@ class WorkerSession {
             await this.onClose.callIfSet();
         }
         catch (err) {
-            log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 118, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+            log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 125, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
         }
         if (this._heartbeatTimer !== undefined) {
             clearInterval(this._heartbeatTimer);
         }
-        await Promise.all([this._clientRpc.close(), this._systemRpc.close()]);
+        await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
     }
 }
 exports.WorkerSession = WorkerSession;

package/dist/src/packlets/vault/worker-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAAsC;AACtC,mCAAgC;AAEhC,mCAAsE;AACtE,qCAAsC;AAEtC,0CAAsE;AACtE,yCAA2F;AAY3F;;GAEG;AACH,MAAa,aAAa;IAaxB,YAAY,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,OAAO,GAAG;QACR,iBAAiB,EAAE,IAAI;KACxB,EACmB;QAjBL,kBAAa,GAAG,IAAI,eAAO,EAAE,CAAC;QAK/B,YAAO,GAAG,IAAI,eAAQ,EAAuB,CAAC;QAa5D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAEhC,IAAI,CAAC,UAAU,GAAG,IAAA,wBAAkB,EAAC;YACnC,OAAO,EAAE,8BAAmB;YAC5B,QAAQ,EAAE;gBACR,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,sBAAsB;gBAC/F,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc;gBAC/E,uBAAuB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB;gBACjG,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa;gBAC7E,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY;gBAC3E,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW;gBACzE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc;gBAC/E,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa;gBAC7E,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY;gBAC3E,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc;aAChF;YACD,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAA,wBAAkB,EAAC;YACnC,SAAS,EAAE,8BAAmB;YAC9B,OAAO,EAAE,8BAAmB;YAC5B,QAAQ,EAAE;gBACR,aAAa,EAAE;oBACb,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;wBACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;wBAC7B,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;oBAC5B,CAAC;oBAED,IAAI,EAAE,KAAK,IAAI,EAAE;wBACf,UAAU,CAAC,KAAK,IAAI,EAAE;4BACpB,IAAI;gCACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;6BACpB;4BAAC,OAAO,GAAQ,EAAE;gCACjB,SAAG,CAAC,KAAK,CAAC,GAAG,wUAAC,CAAC;6BAChB;wBACH,CAAC,CAAC,CAAC;oBACL,CAAC;iBACF;aACF;YACD,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEpE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAK,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI;gBACF,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;aACrD;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI;oBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;iBACpB;gBAAC,OAAO,GAAQ,EAAE;oBACjB,SAAG,CAAC,KAAK,CAAC,GAAG,yUAAC,CAAC;iBAChB;aACF;QACH,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SAChC;QAAC,OAAO,GAAQ,EAAE;YACjB,SAAG,CAAC,KAAK,CAAC,GAAG,yUAAC,CAAC;SAChB;QAED,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE;YACtC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACrC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;CACF;AApGD,sCAoGC"}
+{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,36 +24,36 @@
     "jsondown": "dxos/jsondown#main",
     "level-js": "^5.0.2",
     "memdown": "^5.1.0",
-    "@dxos/async": "0.1.11",
-    "@dxos/codec-protobuf": "0.1.11",
-    "@dxos/config": "0.1.11",
-    "@dxos/credentials": "0.1.11",
-    "@dxos/crypto": "0.1.11",
-    "@dxos/debug": "0.1.11",
-    "@dxos/echo-db": "0.1.11",
-    "@dxos/errors": "0.1.9",
-    "@dxos/feed-store": "0.1.11",
-    "@dxos/keyring": "0.1.11",
-    "@dxos/keys": "0.1.11",
-    "@dxos/log": "0.1.11",
-    "@dxos/messaging": "0.1.11",
-    "@dxos/model-factory": "0.1.11",
-    "@dxos/network-manager": "0.1.11",
-    "@dxos/object-model": "0.1.11",
-    "@dxos/protocol-plugin-rpc": "0.1.11",
-    "@dxos/protocols": "0.1.11",
-    "@dxos/random-access-storage": "0.1.11",
-    "@dxos/rpc": "0.1.11",
-    "@dxos/text-model": "0.1.11",
-    "@dxos/timeframe": "0.1.11",
-    "@dxos/util": "0.1.11"
+    "@dxos/async": "0.1.12",
+    "@dxos/codec-protobuf": "0.1.12",
+    "@dxos/config": "0.1.12",
+    "@dxos/credentials": "0.1.12",
+    "@dxos/crypto": "0.1.12",
+    "@dxos/debug": "0.1.12",
+    "@dxos/echo-db": "0.1.12",
+    "@dxos/errors": "0.1.12",
+    "@dxos/feed-store": "0.1.12",
+    "@dxos/keyring": "0.1.12",
+    "@dxos/keys": "0.1.12",
+    "@dxos/log": "0.1.12",
+    "@dxos/messaging": "0.1.12",
+    "@dxos/model-factory": "0.1.12",
+    "@dxos/network-manager": "0.1.12",
+    "@dxos/object-model": "0.1.12",
+    "@dxos/protocol-plugin-rpc": "0.1.12",
+    "@dxos/protocols": "0.1.12",
+    "@dxos/random-access-storage": "0.1.12",
+    "@dxos/rpc": "0.1.12",
+    "@dxos/text-model": "0.1.12",
+    "@dxos/timeframe": "0.1.12",
+    "@dxos/util": "0.1.12"
   },
   "devDependencies": {
     "@types/level-js": "~4.0.1",
     "@types/memdown": "^3.0.0",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.11",
-    "@dxos/testutils": "0.1.11"
+    "@dxos/signal": "0.1.12",
+    "@dxos/testutils": "0.1.12"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/deprecated/system.ts

@@ -22,6 +22,13 @@ export class SystemServiceImpl implements SystemService {
     return this._config.values;
   }
 
+  // TODO(burdon): Connect to iframe RPC heartbeat for network status?
+  async getStatus(request: void) {
+    return {
+      message: `ok: ${Date.now()}`
+    };
+  }
+
   async reset(request: any) {
     await this._serviceContext.reset();
   }

package/src/packlets/vault/worker-session.ts

@@ -2,13 +2,15 @@
 // Copyright 2022 DXOS.org
 //
 
+import assert from 'assert';
+
 import { Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { Callback } from '@dxos/util';
 
-import { clientServiceBundle, ClientServicesHost } from '../services';
+import { clientServiceBundle, ClientServices, ClientServicesHost } from '../services';
 import { IframeServiceBundle, iframeServiceBundle, workerServiceBundle } from './services';
 
 export type WorkerSessionParams = {
@@ -25,8 +27,8 @@ export type WorkerSessionParams = {
  * Represents a tab connection within the worker.
  */
 export class WorkerSession {
-  private readonly _clientRpc: ProtoRpcPeer<{}>;
-  private readonly _systemRpc: ProtoRpcPeer<IframeServiceBundle>;
+  private readonly _clientRpc: ProtoRpcPeer<ClientServices>;
+  private readonly _iframeRpc: ProtoRpcPeer<IframeServiceBundle>;
   private readonly _startTrigger = new Trigger();
   private readonly _getServices: () => Promise<ClientServicesHost>;
   private readonly _options: NonNullable<WorkerSessionParams['options']>;
@@ -42,9 +44,11 @@ export class WorkerSession {
     systemPort,
     appPort,
     options = {
-      heartbeatInterval: 1000
+      heartbeatInterval: 1_000
     }
   }: WorkerSessionParams) {
+    assert(options);
+    assert(getServices);
     this._options = options;
     this._getServices = getServices;
 
@@ -65,7 +69,7 @@ export class WorkerSession {
       port: appPort
     });
 
-    this._systemRpc = createProtoRpcPeer({
+    this._iframeRpc = createProtoRpcPeer({
       requested: iframeServiceBundle,
       exposed: workerServiceBundle,
       handlers: {
@@ -90,17 +94,20 @@ export class WorkerSession {
       timeout: 200
     });
 
-    this.bridgeService = this._systemRpc.rpc.BridgeService;
+    this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
 
   async open() {
-    await Promise.all([this._clientRpc.open(), this._systemRpc.open()]);
+    await Promise.all([this._clientRpc.open(), this._iframeRpc.open()]);
 
     await this._startTrigger.wait({ timeout: 3_000 });
 
+    // Detect if bridge is present.
+    // TODO(burdon): Add heartbeat to client's System service.
+    //  How do we detect if the client's tab closed?
     this._heartbeatTimer = setInterval(async () => {
       try {
-        await this._systemRpc.rpc.IframeService.heartbeat();
+        await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err) {
         try {
           await this.close();
@@ -122,6 +129,6 @@ export class WorkerSession {
       clearInterval(this._heartbeatTimer);
     }
 
-    await Promise.all([this._clientRpc.close(), this._systemRpc.close()]);
+    await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
   }
 }