@dxos/client-services 0.1.48-next.83f55fd → 0.1.48

package/dist/types/src/packlets/logging/logging-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/logging/logging-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAExG;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IAEhD,IAAI;IAIJ,KAAK;IAKX,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;IA0BtD,OAAO,CAAC,aAAa,CAEnB;CACH"}
+{"version":3,"file":"logging-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/logging/logging-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAGxG;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IAEhD,IAAI;IAIJ,KAAK;IAKX,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;IAgCtD,OAAO,CAAC,aAAa,CAEnB;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.48-next.83f55fd",
+  "version": "0.1.48",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,38 +20,38 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "0.1.48-next.83f55fd",
-    "@dxos/client-protocol": "0.1.48-next.83f55fd",
-    "@dxos/codec-protobuf": "0.1.48-next.83f55fd",
-    "@dxos/config": "0.1.48-next.83f55fd",
-    "@dxos/context": "0.1.48-next.83f55fd",
-    "@dxos/credentials": "0.1.48-next.83f55fd",
-    "@dxos/crypto": "0.1.48-next.83f55fd",
-    "@dxos/debug": "0.1.48-next.83f55fd",
-    "@dxos/document-model": "0.1.48-next.83f55fd",
-    "@dxos/echo-db": "0.1.48-next.83f55fd",
-    "@dxos/echo-pipeline": "0.1.48-next.83f55fd",
-    "@dxos/errors": "0.1.48-next.83f55fd",
-    "@dxos/feed-store": "0.1.48-next.83f55fd",
-    "@dxos/keyring": "0.1.48-next.83f55fd",
-    "@dxos/keys": "0.1.48-next.83f55fd",
-    "@dxos/log": "0.1.48-next.83f55fd",
-    "@dxos/messaging": "0.1.48-next.83f55fd",
-    "@dxos/model-factory": "0.1.48-next.83f55fd",
-    "@dxos/network-manager": "0.1.48-next.83f55fd",
-    "@dxos/node-std": "0.1.48-next.83f55fd",
-    "@dxos/protocols": "0.1.48-next.83f55fd",
-    "@dxos/random-access-storage": "0.1.48-next.83f55fd",
-    "@dxos/rpc": "0.1.48-next.83f55fd",
-    "@dxos/teleport": "0.1.48-next.83f55fd",
-    "@dxos/teleport-extension-gossip": "0.1.48-next.83f55fd",
-    "@dxos/text-model": "0.1.48-next.83f55fd",
-    "@dxos/timeframe": "0.1.48-next.83f55fd",
-    "@dxos/util": "0.1.48-next.83f55fd"
+    "@dxos/async": "0.1.48",
+    "@dxos/client-protocol": "0.1.48",
+    "@dxos/codec-protobuf": "0.1.48",
+    "@dxos/config": "0.1.48",
+    "@dxos/context": "0.1.48",
+    "@dxos/credentials": "0.1.48",
+    "@dxos/crypto": "0.1.48",
+    "@dxos/debug": "0.1.48",
+    "@dxos/document-model": "0.1.48",
+    "@dxos/echo-db": "0.1.48",
+    "@dxos/echo-pipeline": "0.1.48",
+    "@dxos/errors": "0.1.48",
+    "@dxos/feed-store": "0.1.48",
+    "@dxos/keyring": "0.1.48",
+    "@dxos/keys": "0.1.48",
+    "@dxos/log": "0.1.48",
+    "@dxos/messaging": "0.1.48",
+    "@dxos/model-factory": "0.1.48",
+    "@dxos/network-manager": "0.1.48",
+    "@dxos/node-std": "0.1.48",
+    "@dxos/protocols": "0.1.48",
+    "@dxos/random-access-storage": "0.1.48",
+    "@dxos/rpc": "0.1.48",
+    "@dxos/teleport": "0.1.48",
+    "@dxos/teleport-extension-gossip": "0.1.48",
+    "@dxos/text-model": "0.1.48",
+    "@dxos/timeframe": "0.1.48",
+    "@dxos/util": "0.1.48"
   },
   "devDependencies": {
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.48-next.83f55fd"
+    "@dxos/signal": "0.1.48"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/logging/logging-service.ts

@@ -4,8 +4,9 @@
 
 import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { log, LogEntry as NaturalLogEntry, LogProcessor, shouldLog } from '@dxos/log';
+import { log, LogEntry as NaturalLogEntry, LogProcessor, shouldLog, getContextFromEntry } from '@dxos/log';
 import { LoggingService, LogEntry, QueryLogsRequest } from '@dxos/protocols/proto/dxos/client/services';
+import { jsonify } from '@dxos/util';
 
 /**
  * Logging service used to spy on logs of the host.
@@ -36,7 +37,13 @@ export class LoggingServiceImpl implements LoggingService {
         }
 
         if (shouldLog(entry, filters)) {
-          next(jsonify(entry));
+          const record = {
+            ...entry,
+            context: jsonify(getContextFromEntry(entry)),
+          } satisfies NaturalLogEntry;
+          delete record.meta?.bugcheck;
+          delete record.meta?.scope;
+          next(record);
         }
       };
 
@@ -52,32 +59,3 @@ export class LoggingServiceImpl implements LoggingService {
     this._logs.emit(entry);
   };
 }
-
-/**
- * Recursively converts an object into a JSON-compatible object.
- */
-const jsonify = (value: any, handles = new WeakSet<any>()): any => {
-  if (typeof value === 'function') {
-    return null;
-  } else if (typeof value === 'object' && value !== null) {
-    if (handles.has(value)) {
-      return null;
-    }
-    handles.add(value);
-
-    if (Array.isArray(value)) {
-      return value.map((x) => jsonify(x, handles));
-    } else {
-      if (typeof value.toJSON === 'function') {
-        return value.toJSON();
-      }
-      const res: any = {};
-      for (const key of Object.keys(value)) {
-        res[key] = jsonify(value[key], handles);
-      }
-      return res;
-    }
-  } else {
-    return value;
-  }
-};