Import assert from jslib-media and remove 3rd party assert

package.json

@@ -95,7 +95,6 @@
     "dependencies": {
         "@swc/helpers": "^0.3.13",
         "@whereby/jslib-media": "whereby/jslib-media.git#1.4.1",
-        "assert": "^2.0.0",
         "axios": "^1.2.3",
         "btoa": "^1.2.1",
         "events": "^3.3.0",

src/lib/api/ApiClient.ts

@@ -1,5 +1,5 @@
-import assert from "assert";
 import nodeBtoa from "btoa";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import HttpClient, { HttpClientRequestConfig } from "./HttpClient";
 import MultipartHttpClient from "./MultipartHttpClient";
 import { assertString } from "./parameterAssertUtils";
@@ -92,7 +92,7 @@ export default class ApiClient {
      */
     request(url: string, options: HttpClientRequestConfig): Promise<Response> {
         assertString(url, "url");
-        assert.equal(url[0], "/", 'url<String> only accepts relative URLs beginning with "/".');
+        assert.ok(url[0] === "/", 'url<String> only accepts relative URLs beginning with "/".');
         assert.ok(options, "options are required");
 
         return this.authenticatedHttpClient.request(url, options);
@@ -103,7 +103,7 @@ export default class ApiClient {
      */
     requestMultipart(url: string, options: HttpClientRequestConfig): Promise<Response> {
         assertString(url, "url");
-        assert.equal(url[0], "/", 'url<String> only accepts relative URLs beginning with "/".');
+        assert.ok(url[0] === "/", 'url<String> only accepts relative URLs beginning with "/".');
         assert.ok(options, "options are required");
 
         return this.authenticatedFormDataHttpClient.request(url, options);

src/lib/api/HttpClient.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios";
 import Response, { ErrorResponseObject } from "./Response";
 import { assertString } from "./parameterAssertUtils";
@@ -50,7 +50,7 @@ export default class HttpClient implements IHttpClient {
      */
     request(url: string, options: HttpClientRequestConfig): Promise<Response> {
         assertString(url, "url");
-        assert.equal(url[0], "/", 'url<String> only accepts relative URLs beginning with "/".');
+        assert.ok(url[0] === "/", 'url<String> only accepts relative URLs beginning with "/".');
         assert.ok(options, "options are required");
 
         return this._requestAxios(url, options)

src/lib/api/MultipartHttpClient.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import { HttpClientRequestConfig, IHttpClient } from "./HttpClient";
 import Response from "./Response";
 

src/lib/api/OrganizationApiClient.ts

@@ -1,5 +1,5 @@
+import assert from "@whereby/jslib-media/src/utils/assert";
 import ApiClient from "./ApiClient";
-import assert from "assert";
 import { assertString } from "./parameterAssertUtils";
 import { HttpClientRequestConfig } from "./HttpClient";
 import Response from "./Response";
@@ -41,7 +41,7 @@ export default class OrganizationApiClient {
         options: HttpClientRequestConfig
     ): Promise<Response> {
         assertString(url, "url");
-        assert.equal(url[0], "/", 'url<String> only accepts relative URLs beginning with "/".');
+        assert.ok(url[0] === "/", 'url<String> only accepts relative URLs beginning with "/".');
         assert.ok(options, "options are required");
         return this._fetchOrganization().then((organization) => {
             if (!organization) {

src/lib/api/models/Room.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 
 export default class Room {
     public readonly isLocked: boolean;

src/lib/api/organizationService/index.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import Organization, { OrganizationPreferences } from "../models/Organization";
 import {
     assertInstanceOf,

src/lib/api/parameterAssertUtils.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 
 /**
  * Asserts that value is truthy.
@@ -65,7 +65,7 @@ export function assertInstanceOf<T>(value: unknown, type: new (any: unknown) =>
  */
 export function assertRoomName(roomName: unknown, parameterName = "roomName"): string {
     assertString(roomName, parameterName);
-    assert.equal(typeof roomName === "string" && roomName[0], "/", `${parameterName} must begin with a '/'`);
+    assert.ok(typeof roomName === "string" && roomName[0] === "/", `${parameterName} must begin with a '/'`);
     return roomName as string;
 }
 

src/lib/api/test/extractUtils.spec.ts

@@ -13,7 +13,7 @@ import {
     nullOrTransform,
     Transformer,
 } from "../extractUtils";
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import { Json } from "../Response";
 import { assertString } from "../parameterAssertUtils";
 type User = { name: string; eyeColor: string | null; age: number; dob: Date };

src/lib/api/test/parameterAssertUtils.spec.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 import {
     assertBoolean,
     assertRoomName,

src/lib/utils/debounce.ts

@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert from "@whereby/jslib-media/src/utils/assert";
 
 interface Options {
     delay?: number;

src/types.d.ts

@@ -82,6 +82,16 @@ declare module "@whereby/jslib-media/src/webrtc/RtcManager" {
     }
 }
 
+declare const assert: {
+    (value: unknown, message?: string | Error): asserts value;
+    ok(value: unknown, message?: string | Error): asserts value;
+    notEqual<T>(actual: T, expected: T, message: string): void;
+};
+
+declare module "@whereby/jslib-media/src/utils/assert" {
+    export = assert;
+}
+
 declare module "@whereby/jslib-media/src/utils/urls" {
     export function fromLocation({ host }: { host: string }): { subdomain: string };
 }