videomail-client 10.0.4 → 10.0.6

package/dist/index.cjs

@@ -3848,6 +3848,22 @@ function __webpack_require__(moduleId) {
         return getBrowser_browser;
     }
     /* ESM default export */ const getBrowser = getBrowser_getBrowser;
+    function HTTPError_define_property(obj, key, value) {
+        if (key in obj) Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+        else obj[key] = value;
+        return obj;
+    }
+    class HTTPError_HTTPError extends Error {
+        constructor(...args){
+            super(...args), HTTPError_define_property(this, "code", void 0), HTTPError_define_property(this, "status", void 0);
+        }
+    }
+    /* ESM default export */ const HTTPError = HTTPError_HTTPError;
     function VideomailError_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
@@ -3858,7 +3874,7 @@ function __webpack_require__(moduleId) {
         else obj[key] = value;
         return obj;
     }
-    class VideomailError extends Error {
+    class VideomailError extends HTTPError {
         hasClass(name) {
             var _this_classList;
             return null === (_this_classList = this.classList) || void 0 === _this_classList ? void 0 : _this_classList.includes(name);
@@ -3907,7 +3923,6 @@ function __webpack_require__(moduleId) {
     VideomailError_define_property(VideomailError, "BROWSER_PROBLEM", "browser-problem");
     VideomailError_define_property(VideomailError, "WEBCAM_PROBLEM", "webcam-problem");
     VideomailError_define_property(VideomailError, "OVERCONSTRAINED", "OverconstrainedError");
-    VideomailError_define_property(VideomailError, "NOT_FOUND_ERROR", "NotFoundError");
     VideomailError_define_property(VideomailError, "NOT_READABLE_ERROR", "NotReadableError");
     VideomailError_define_property(VideomailError, "SECURITY_ERROR", "SecurityError");
     VideomailError_define_property(VideomailError, "TRACK_START_ERROR", "TrackStartError");
@@ -3915,30 +3930,18 @@ function __webpack_require__(moduleId) {
     /* ESM default export */ const error_VideomailError = VideomailError;
     function createError(errorParams) {
         const { exc, options } = errorParams;
+        let err = errorParams.err;
+        if (!err && exc instanceof Error) err = exc;
+        if (err instanceof error_VideomailError) return err;
         let message = errorParams.message;
         let explanation = errorParams.explanation;
-        let err = errorParams.err;
         var _errorParams_classList;
         const classList = null !== (_errorParams_classList = errorParams.classList) && void 0 !== _errorParams_classList ? _errorParams_classList : [];
-        if (!err && exc instanceof Error) err = exc;
-        if (err instanceof error_VideomailError) return err;
         const audioEnabled = isAudioEnabled(options);
         const browser = getBrowser(options);
-        let errorCode;
-        let errType;
-        // whole code is ugly because all browsers behave so differently :(
-        if ("object" == typeof err) {
-            if ("code" in err) errorCode = err.code;
-            if (err.name === error_VideomailError.TRACK_START_ERROR) errType = error_VideomailError.TRACK_START_ERROR;
-            else if (err.name === error_VideomailError.SECURITY_ERROR) errType = error_VideomailError.SECURITY_ERROR;
-            else if (8 === errorCode && err.name === error_VideomailError.NOT_FOUND_ERROR) errType = error_VideomailError.NOT_FOUND_ERROR;
-            else if (35 === errorCode || err.name === error_VideomailError.NOT_ALLOWED_ERROR) // https://github.com/binarykitchen/videomail.io/issues/411
-            errType = error_VideomailError.NOT_ALLOWED_ERROR;
-            else if (err.constructor.name === error_VideomailError.DOM_EXCEPTION) errType = err.name === error_VideomailError.NOT_READABLE_ERROR ? error_VideomailError.NOT_READABLE_ERROR : error_VideomailError.DOM_EXCEPTION;
-            else if (err.constructor.name === error_VideomailError.OVERCONSTRAINED) errType = error_VideomailError.OVERCONSTRAINED;
-            else if (err.name) errType = err.name;
-        } else errType = err;
-        switch(errType){
+        var _err_name;
+        const errName = null !== (_err_name = null == err ? void 0 : err.name) && void 0 !== _err_name ? _err_name : null == err ? void 0 : err.constructor.name;
+        switch(errName){
             case error_VideomailError.SECURITY_ERROR:
                 message = "The operation was insecure";
                 explanation = "Probably you have disallowed Cookies for this page?";
@@ -3956,7 +3959,6 @@ function __webpack_require__(moduleId) {
                 message = "Source of your webcam cannot be accessed";
                 explanation = "Probably it is locked from another process or has a hardware error.";
                 break;
-            case error_VideomailError.NOT_FOUND_ERROR:
             case "NO_DEVICES_FOUND":
                 if (audioEnabled) {
                     message = "No webcam nor microphone found";
@@ -4012,31 +4014,8 @@ function __webpack_require__(moduleId) {
                 classList.push(error_VideomailError.WEBCAM_PROBLEM);
                 break;
             case error_VideomailError.DOM_EXCEPTION:
-                switch(errorCode){
-                    case 8:
-                        message = "Requested webcam not found";
-                        explanation = "A webcam is needed but could not be found";
-                        classList.push(error_VideomailError.WEBCAM_PROBLEM);
-                        break;
-                    case 9:
-                        {
-                            const newUrl = `https:${window.location.href.substring(window.location.protocol.length)}`;
-                            message = "Security upgrade needed";
-                            explanation = `Click <a href="${newUrl}">here</a> to switch to HTTPs which is more safe  and enables encrypted videomail transfers.`;
-                            classList.push(error_VideomailError.BROWSER_PROBLEM);
-                            break;
-                        }
-                    case 11:
-                        message = "Invalid State";
-                        explanation = "The object is in an invalid, unusable state";
-                        classList.push(error_VideomailError.BROWSER_PROBLEM);
-                        break;
-                    default:
-                        message = "DOM Exception";
-                        explanation = pretty(err);
-                        classList.push(error_VideomailError.BROWSER_PROBLEM);
-                        break;
-                }
+                message = "DOM Exception";
+                explanation = pretty(err);
                 break;
             /*
      * Chrome has a weird problem where if you try to do a getUserMedia request too early, it
@@ -4056,12 +4035,11 @@ function __webpack_require__(moduleId) {
                     /*
        * it can be that explanation itself is an error object
        * error objects can be prettified to undefined sometimes
-       */ if (!explanation && originalExplanation) // tried toString before but nah
-                    explanation = `Inspected: ${originalExplanation}`;
+       */ if (!explanation && originalExplanation) explanation = `Inspected: ${originalExplanation}`;
                     if (!message && (null == err ? void 0 : err.message)) message = err.message;
                     // for weird, undefined cases
                     if (!message) {
-                        if (errType) message = `${errType} (weird)`;
+                        if (errName) message = `${errName} (weird)`;
                         if (!explanation) explanation = pretty(err);
                         // avoid dupes
                         if (pretty(message) === explanation) explanation = void 0;
@@ -4082,6 +4060,10 @@ function __webpack_require__(moduleId) {
             err
         };
         const videomailError = new error_VideomailError(null != message ? message : "(undefined message)", options, classList, errData);
+        if (err) {
+            videomailError.status = err.status;
+            videomailError.code = err.code;
+        }
         if (options.reportErrors) {
             const resource = new src_resource(options);
             resource.reportError(videomailError).catch((reason)=>{
@@ -4466,14 +4448,14 @@ function __webpack_require__(moduleId) {
             const body = response.body;
             if ("error" in body) {
                 const message = body.error.message;
-                const name = body.error.name;
-                const stack = body.error.stack;
                 const cause = body.error.cause;
-                const error = new Error(message, {
+                const error = new HTTPError(message, {
                     cause
                 });
-                error.name = name;
-                error.stack = stack;
+                if (body.error.name) error.name = body.error.name;
+                if (body.error.stack) error.stack = body.error.stack;
+                if (body.error.status) error.status = body.error.status;
+                if (body.error.code) error.code = body.error.code;
                 return error;
             }
         }
@@ -5811,7 +5793,7 @@ function __webpack_require__(moduleId) {
     const external_is_power_of_two_namespaceObject = require("is-power-of-two");
     var external_is_power_of_two_default = /*#__PURE__*/ __webpack_require__.n(external_is_power_of_two_namespaceObject);
     var package_namespaceObject = {
-        i8: "10.0.2"
+        i8: "10.0.6"
     }; // CONCATENATED MODULE: ./src/types/env.ts
     // ... and these actually define the runtime mode of Node.js and are
     // set either in package.json, via Jest or in the Dockerfile
@@ -8854,7 +8836,7 @@ function __webpack_require__(moduleId) {
         return "test" === isTest_process.env.ENVIRON;
     }
     /* ESM default export */ const isTest = isTest_isTest;
-    function mergeWithDefaultOptions() {
+    function mergeWithDefaultOptions_mergeWithDefaultOptions() {
         let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
         const newOptions = external_deepmerge_default()(src_options, options, {
             arrayMerge (_destination, source) {
@@ -8867,7 +8849,7 @@ function __webpack_require__(moduleId) {
         if (isTest()) newOptions.verbose = false;
         return newOptions;
     }
-    /* ESM default export */ const options_mergeWithDefaultOptions = mergeWithDefaultOptions;
+    /* ESM default export */ const mergeWithDefaultOptions = mergeWithDefaultOptions_mergeWithDefaultOptions;
     function client_define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
             value: value,
@@ -8964,7 +8946,7 @@ function __webpack_require__(moduleId) {
             if (this.options.logger.getLines) return this.options.logger.getLines();
         }
         constructor(options = {}){
-            super("VideomailClient", options_mergeWithDefaultOptions(options)), client_define_property(this, "container", void 0);
+            super("VideomailClient", mergeWithDefaultOptions(options)), client_define_property(this, "container", void 0);
             this.validateOptions();
             util_Despot.removeAllListeners();
             this.container = new wrappers_container(this.options);

package/dist/index.js

@@ -3781,7 +3781,12 @@ function getBrowser_getBrowser(localOptions) {
     return getBrowser_browser;
 }
 /* ESM default export */ const getBrowser = getBrowser_getBrowser;
-class VideomailError extends Error {
+class HTTPError extends Error {
+    code;
+    status;
+}
+/* ESM default export */ const error_HTTPError = HTTPError;
+class VideomailError extends error_HTTPError {
     title = "videomail-client error";
     location = window.location.href;
     explanation;
@@ -3807,7 +3812,6 @@ class VideomailError extends Error {
     static BROWSER_PROBLEM = "browser-problem";
     static WEBCAM_PROBLEM = "webcam-problem";
     static OVERCONSTRAINED = "OverconstrainedError";
-    static NOT_FOUND_ERROR = "NotFoundError";
     static NOT_READABLE_ERROR = "NotReadableError";
     static SECURITY_ERROR = "SecurityError";
     static TRACK_START_ERROR = "TrackStartError";
@@ -3854,29 +3858,16 @@ class VideomailError extends Error {
 /* ESM default export */ const error_VideomailError = VideomailError;
 function createError(errorParams) {
     const { exc, options } = errorParams;
-    let message = errorParams.message;
-    let explanation = errorParams.explanation;
     let err = errorParams.err;
-    const classList = errorParams.classList ?? [];
     if (!err && exc instanceof Error) err = exc;
     if (err instanceof error_VideomailError) return err;
+    let message = errorParams.message;
+    let explanation = errorParams.explanation;
+    const classList = errorParams.classList ?? [];
     const audioEnabled = isAudioEnabled(options);
     const browser = getBrowser(options);
-    let errorCode;
-    let errType;
-    // whole code is ugly because all browsers behave so differently :(
-    if ("object" == typeof err) {
-        if ("code" in err) errorCode = err.code;
-        if (err.name === error_VideomailError.TRACK_START_ERROR) errType = error_VideomailError.TRACK_START_ERROR;
-        else if (err.name === error_VideomailError.SECURITY_ERROR) errType = error_VideomailError.SECURITY_ERROR;
-        else if (8 === errorCode && err.name === error_VideomailError.NOT_FOUND_ERROR) errType = error_VideomailError.NOT_FOUND_ERROR;
-        else if (35 === errorCode || err.name === error_VideomailError.NOT_ALLOWED_ERROR) // https://github.com/binarykitchen/videomail.io/issues/411
-        errType = error_VideomailError.NOT_ALLOWED_ERROR;
-        else if (err.constructor.name === error_VideomailError.DOM_EXCEPTION) errType = err.name === error_VideomailError.NOT_READABLE_ERROR ? error_VideomailError.NOT_READABLE_ERROR : error_VideomailError.DOM_EXCEPTION;
-        else if (err.constructor.name === error_VideomailError.OVERCONSTRAINED) errType = error_VideomailError.OVERCONSTRAINED;
-        else if (err.name) errType = err.name;
-    } else errType = err;
-    switch(errType){
+    const errName = err?.name ?? err?.constructor.name;
+    switch(errName){
         case error_VideomailError.SECURITY_ERROR:
             message = "The operation was insecure";
             explanation = "Probably you have disallowed Cookies for this page?";
@@ -3894,7 +3885,6 @@ function createError(errorParams) {
             message = "Source of your webcam cannot be accessed";
             explanation = "Probably it is locked from another process or has a hardware error.";
             break;
-        case error_VideomailError.NOT_FOUND_ERROR:
         case "NO_DEVICES_FOUND":
             if (audioEnabled) {
                 message = "No webcam nor microphone found";
@@ -3950,31 +3940,8 @@ function createError(errorParams) {
             classList.push(error_VideomailError.WEBCAM_PROBLEM);
             break;
         case error_VideomailError.DOM_EXCEPTION:
-            switch(errorCode){
-                case 8:
-                    message = "Requested webcam not found";
-                    explanation = "A webcam is needed but could not be found";
-                    classList.push(error_VideomailError.WEBCAM_PROBLEM);
-                    break;
-                case 9:
-                    {
-                        const newUrl = `https:${window.location.href.substring(window.location.protocol.length)}`;
-                        message = "Security upgrade needed";
-                        explanation = `Click <a href="${newUrl}">here</a> to switch to HTTPs which is more safe  and enables encrypted videomail transfers.`;
-                        classList.push(error_VideomailError.BROWSER_PROBLEM);
-                        break;
-                    }
-                case 11:
-                    message = "Invalid State";
-                    explanation = "The object is in an invalid, unusable state";
-                    classList.push(error_VideomailError.BROWSER_PROBLEM);
-                    break;
-                default:
-                    message = "DOM Exception";
-                    explanation = pretty(err);
-                    classList.push(error_VideomailError.BROWSER_PROBLEM);
-                    break;
-            }
+            message = "DOM Exception";
+            explanation = pretty(err);
             break;
         /*
      * Chrome has a weird problem where if you try to do a getUserMedia request too early, it
@@ -3994,12 +3961,11 @@ function createError(errorParams) {
                 /*
        * it can be that explanation itself is an error object
        * error objects can be prettified to undefined sometimes
-       */ if (!explanation && originalExplanation) // tried toString before but nah
-                explanation = `Inspected: ${originalExplanation}`;
+       */ if (!explanation && originalExplanation) explanation = `Inspected: ${originalExplanation}`;
                 if (!message && err?.message) message = err.message;
                 // for weird, undefined cases
                 if (!message) {
-                    if (errType) message = `${errType} (weird)`;
+                    if (errName) message = `${errName} (weird)`;
                     if (!explanation) explanation = pretty(err);
                     // avoid dupes
                     if (pretty(message) === explanation) explanation = void 0;
@@ -4020,6 +3986,10 @@ function createError(errorParams) {
         err
     };
     const videomailError = new error_VideomailError(message ?? "(undefined message)", options, classList, errData);
+    if (err) {
+        videomailError.status = err.status;
+        videomailError.code = err.code;
+    }
     if (options.reportErrors) {
         const resource = new src_resource(options);
         resource.reportError(videomailError).catch((reason)=>{
@@ -4368,14 +4338,14 @@ function findOriginalExc(exc) {
         const body = response.body;
         if ("error" in body) {
             const message = body.error.message;
-            const name = body.error.name;
-            const stack = body.error.stack;
             const cause = body.error.cause;
-            const error = new Error(message, {
+            const error = new error_HTTPError(message, {
                 cause
             });
-            error.name = name;
-            error.stack = stack;
+            if (body.error.name) error.name = body.error.name;
+            if (body.error.stack) error.stack = body.error.stack;
+            if (body.error.status) error.status = body.error.status;
+            if (body.error.code) error.code = body.error.code;
             return error;
         }
     }
@@ -5596,7 +5566,7 @@ function isPromise_isPromise(anything) {
 }
 /* ESM default export */ const isPromise = isPromise_isPromise;
 var package_namespaceObject = {
-    i8: "10.0.2"
+    i8: "10.0.6"
 }; // CONCATENATED MODULE: ./src/types/env.ts
 // ... and these actually define the runtime mode of Node.js and are
 // set either in package.json, via Jest or in the Dockerfile
@@ -8545,7 +8515,7 @@ function isTest_isTest() {
     return "test" === isTest_process.env.ENVIRON;
 }
 /* ESM default export */ const isTest = isTest_isTest;
-function mergeWithDefaultOptions(options = {}) {
+function mergeWithDefaultOptions_mergeWithDefaultOptions(options = {}) {
     const newOptions = (0, __WEBPACK_EXTERNAL_MODULE_deepmerge__["default"])(src_options, options, {
         arrayMerge (_destination, source) {
             return source;
@@ -8557,13 +8527,13 @@ function mergeWithDefaultOptions(options = {}) {
     if (isTest()) newOptions.verbose = false;
     return newOptions;
 }
-/* ESM default export */ const options_mergeWithDefaultOptions = mergeWithDefaultOptions;
+/* ESM default export */ const mergeWithDefaultOptions = mergeWithDefaultOptions_mergeWithDefaultOptions;
 class VideomailClient extends util_Despot {
     container;
     static ENC_TYPE_APP_JSON = constants.public.ENC_TYPE_APP_JSON;
     static ENC_TYPE_FORM = constants.public.ENC_TYPE_FORM;
     constructor(options = {}){
-        super("VideomailClient", options_mergeWithDefaultOptions(options));
+        super("VideomailClient", mergeWithDefaultOptions(options));
         this.validateOptions();
         util_Despot.removeAllListeners();
         this.container = new wrappers_container(this.options);

package/dist/util/error/HTTPError.d.ts

@@ -0,0 +1,5 @@
+declare class HTTPError extends Error {
+    code?: string | undefined;
+    status?: number | undefined;
+}
+export default HTTPError;

package/dist/util/error/VideomailError.d.ts

@@ -1,11 +1,12 @@
 import { IBrowser, ICPU, IDevice, IEngine, IOS } from "ua-parser-js";
 import { VideomailClientOptions } from "../../types/options";
+import HTTPError from "./HTTPError";
 export interface ErrData extends ErrorOptions {
     explanation: string | undefined;
     logLines?: string[] | undefined;
     err?: Error | undefined;
 }
-declare class VideomailError extends Error {
+declare class VideomailError extends HTTPError {
     readonly title = "videomail-client error";
     readonly location: string;
     explanation: string | undefined;
@@ -31,7 +32,6 @@ declare class VideomailError extends Error {
     static readonly BROWSER_PROBLEM = "browser-problem";
     static readonly WEBCAM_PROBLEM = "webcam-problem";
     static readonly OVERCONSTRAINED = "OverconstrainedError";
-    static readonly NOT_FOUND_ERROR = "NotFoundError";
     static readonly NOT_READABLE_ERROR = "NotReadableError";
     static readonly SECURITY_ERROR = "SecurityError";
     static readonly TRACK_START_ERROR = "TrackStartError";

package/dist/util/error/createError.d.ts

@@ -1,7 +1,8 @@
 import VideomailError from "./VideomailError";
 import { VideomailClientOptions } from "../../types/options";
+import HTTPError from "./HTTPError";
 interface ErrorParams {
-    err?: Error;
+    err?: HTTPError;
     exc?: unknown;
     message?: string;
     explanation?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "videomail-client",
-  "version": "10.0.4",
+  "version": "10.0.6",
   "description": "A wicked npm package to record videos directly in the browser, wohooo!",
   "keywords": [
     "webcam",
@@ -49,7 +49,7 @@
     "prettier:fix": "prettier --write ./etc ./src ./.storybook ./*.ts",
     "release": "release-it --only-version --config ./etc/release-it.ts",
     "storybook": "cross-env BROWSER=chromium storybook dev -p 8443 --https --ssl-cert ./etc/ssl-certs/localhost.crt --ssl-key ./etc/ssl-certs/localhost.key",
-    "test": "cross-env ENVIRON=test vitest",
+    "test": "cross-env ENVIRON=test vitest --watch=false",
     "types:check": "tsc --noEmit",
     "types:config": "tsc --showConfig"
   },
@@ -105,7 +105,7 @@
     "eslint-plugin-storybook": "0.11.0",
     "globals": "15.12.0",
     "jsdom": "25.0.1",
-    "msw": "2.6.4",
+    "msw": "2.6.5",
     "msw-storybook-addon": "2.0.4",
     "prettier": "3.3.3",
     "prettier-plugin-curly": "0.3.1",