@ai-matrx/meet 0.7.81 → 0.7.83

package/dist/index.js

@@ -139,22 +139,45 @@ function normalizeDeviceError(error, operation) {
       );
   }
 }
-function isScreenShareCancel(error) {
-  const named = (value) => typeof value?.name === "string" ? value.name : "";
+var SYSTEM_BLOCK = /by system|permissions?[- ]policy|display-capture|disallowed|not allowed by the system/i;
+function classifyScreenShareError(error) {
+  const read = (value, key) => {
+    const v = value?.[key];
+    return typeof v === "string" ? v : "";
+  };
   const cause = error instanceof MeetError ? error.cause : void 0;
-  const names = [named(error), named(cause)];
-  if (names.some((name) => name === "NotAllowedError" || name === "AbortError")) return true;
-  return error instanceof MeetError && error.code === "permission-denied";
+  const denied = [error, cause].some((value) => {
+    const name = read(value, "name");
+    return name === "NotAllowedError" || name === "AbortError" || name === "SecurityError";
+  });
+  if (denied) {
+    const text3 = [read(error, "message"), read(cause, "message")].join(" ");
+    return SYSTEM_BLOCK.test(text3) || [error, cause].some((v) => read(v, "name") === "SecurityError") ? "blocked" : "ambiguous";
+  }
+  if (error instanceof MeetError && error.code === "permission-denied" && cause === void 0) {
+    return "ambiguous";
+  }
+  return "other";
 }
+var SCREEN_SHARE_BLOCKED_REMEDY = "Your browser or computer is blocking screen sharing. On a Mac, open System Settings > Privacy & Security > Screen Recording, turn it on for your browser, then restart the browser. On a work computer, ask your administrator. You are still in the call.";
 function normalizeScreenShareError(error, operation) {
   if (error instanceof MeetError) return error;
   const raw = error ?? {};
   const message = typeof raw.message === "string" ? raw.message : String(error);
-  if (isScreenShareCancel(error)) {
+  const kind = classifyScreenShareError(error);
+  if (kind === "blocked") {
+    return new MeetError(
+      "permission-denied",
+      `${operation}: screen sharing is blocked (${message})`,
+      SCREEN_SHARE_BLOCKED_REMEDY,
+      error
+    );
+  }
+  if (kind === "ambiguous") {
     return new MeetError(
       "permission-denied",
-      `${operation}: screen sharing was cancelled`,
-      "Choose a screen, window or tab in the picker to share it.",
+      `${operation}: screen sharing was cancelled or refused`,
+      "Choose a screen, window or tab in the picker to share it. If no picker appeared, " + SCREEN_SHARE_BLOCKED_REMEDY,
       error
     );
   }
@@ -4914,6 +4937,7 @@ function createRoomEngine(options) {
   function report(level, message, remedy) {
     options.onDiagnostic?.(remedy === void 0 ? { level, message } : { level, message, remedy });
   }
+  let ambiguousShareDenials = 0;
   function fail(error, operation) {
     const normalized = normalizeMeetError(error, operation);
     store.patch({
@@ -5304,17 +5328,17 @@ function createRoomEngine(options) {
       if (driver === null) return;
       try {
         await driver.setScreenShareEnabled(enabled);
+        ambiguousShareDenials = 0;
       } catch (error) {
-        if (isScreenShareCancel(error)) return;
+        const kind = classifyScreenShareError(error);
+        if (kind === "ambiguous") {
+          ambiguousShareDenials += 1;
+          if (ambiguousShareDenials < 2) return;
+        }
         const normalized = normalizeScreenShareError(error, "meet.setScreenShareEnabled");
         report("warn", normalized.message, normalized.remedy);
-        store.patch({
-          actionNotice: {
-            text: `Screen sharing is not available. ${normalized.remedy}`,
-            failed: true,
-            at: now()
-          }
-        });
+        const text3 = kind === "other" ? `Screen sharing is not available. ${normalized.remedy}` : `Screen sharing did not start. ${SCREEN_SHARE_BLOCKED_REMEDY}`;
+        store.patch({ actionNotice: { text: text3, failed: true, at: now() } });
       }
     },
     async raiseHand(raised) {