@dxos/client-services 0.1.51-main.04d9478 → 0.1.51-main.0e88376

package/dist/lib/browser/{chunk-QUJROKKU.mjs → chunk-YPN5TDAA.mjs}

@@ -3566,8 +3566,7 @@ var DevicesServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event7 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { getContextFromEntry, log as log14 } from "@dxos/log";
-import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
+import { log as log14, shouldLog, getContextFromEntry } from "@dxos/log";
 import { jsonify } from "@dxos/util";
 var LoggingServiceImpl = class {
   constructor() {
@@ -3584,60 +3583,31 @@ var LoggingServiceImpl = class {
     log14.runtimeConfig.processors.splice(index, 1);
   }
   queryLogs(request) {
+    var _a;
+    const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
     return new Stream11(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a, _b, _c, _d, _e;
-        if (LOG_PROCESSING > 0) {
-          return;
-        }
-        if (((_a = entry2.meta) == null ? void 0 : _a.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
-          return;
-        }
-        if (!shouldLog(entry2, request)) {
+        var _a2, _b, _c;
+        if (((_a2 = entry2.meta) == null ? void 0 : _a2.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
           return;
         }
-        const record = {
-          ...entry2,
-          context: jsonify(getContextFromEntry(entry2)),
-          timestamp: new Date(),
-          meta: {
-            // TODO(dmaretskyi): Fix proto.
-            file: (_c = (_b = entry2.meta) == null ? void 0 : _b.file) != null ? _c : "",
-            line: (_e = (_d = entry2.meta) == null ? void 0 : _d.line) != null ? _e : 0
-          }
-        };
-        try {
-          LOG_PROCESSING++;
+        if (shouldLog(entry2, filters)) {
+          const record = {
+            ...entry2,
+            context: jsonify(getContextFromEntry(entry2))
+          };
+          (_b = record.meta) == null ? true : delete _b.bugcheck;
+          (_c = record.meta) == null ? true : delete _c.scope;
           next(record);
-        } finally {
-          LOG_PROCESSING--;
         }
       };
-      this._logs.on(ctx, handler);
-    });
-  }
-};
-var matchFilter = (filter, level, path, options) => {
-  switch (options) {
-    case QueryLogsRequest.MatchingOptions.INCLUSIVE:
-      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
-    case QueryLogsRequest.MatchingOptions.EXPLICIT:
-      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
-  }
-};
-var shouldLog = (entry2, request) => {
-  var _a;
-  const options = (_a = request.options) != null ? _a : QueryLogsRequest.MatchingOptions.INCLUSIVE;
-  if (request.filters === void 0) {
-    return options === QueryLogsRequest.MatchingOptions.INCLUSIVE;
-  } else {
-    return request.filters.some((filter) => {
-      var _a2, _b;
-      return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.file) != null ? _b : "", options);
+      ctx.onDispose(() => {
+        this._logs.off(handler);
+      });
+      this._logs.on(handler);
     });
   }
 };
-var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
@@ -3994,4 +3964,4 @@ export {
   ClientServicesHost,
   LocalClientServices
 };
-//# sourceMappingURL=chunk-QUJROKKU.mjs.map
+//# sourceMappingURL=chunk-YPN5TDAA.mjs.map