easyproctor 0.0.20 → 0.0.23

package/esm/index.js

@@ -87,6 +87,12 @@ var account = "iarisprod";
 var containerName = "iaris";
 var sas = "?sv=2020-08-04&ss=bfqt&srt=sco&sp=rwdlacupitfx&se=2025-12-28T06:34:02Z&st=2021-12-27T22:34:02Z&spr=https&sig=1rsgx389pHZCnJYd44peuWSfeCUdN8bQ9EfcLoMOdDc%3D";
 var blobServiceClient = new BlobServiceClient(`https://${account}.blob.core.windows.net${sas}`);
+async function setConfiguration(_account, _cointainerName, _sas) {
+  account = _account;
+  containerName = _cointainerName;
+  sas = _sas;
+  blobServiceClient = new BlobServiceClient(`https://${account}.blob.core.windows.net${sas}`);
+}
 async function upload(data) {
   const { file, onProgress } = data;
   const containerClient = blobServiceClient.getContainerClient(containerName);
@@ -101,6 +107,9 @@ var upload_default = upload;
 
 // src/modules/http.ts
 var baseUrl = "https://iaris.easyproctor.tech/api";
+async function setBaseUrl(_baseUrl) {
+  baseUrl = _baseUrl;
+}
 async function makeRequest(data) {
   const { url, method, body, jwt } = data;
   const resp = await fetch(baseUrl + url, {
@@ -218,11 +227,16 @@ async function clearBuffers(table) {
 var defaultProctoringOptions = {
   cameraId: void 0,
   microphoneId: void 0,
-  allowMulipleMonitors: false,
+  allowMultipleMonitors: false,
   allowOnlyFirstMonitor: true
 };
 var azureBlobUrl = "https://iarisprod.blob.core.windows.net/iaris";
-function useProctoring(proctoringOptions) {
+function useProctoring(proctoringOptions, proctoringConfig) {
+  if (proctoringConfig != void 0) {
+    setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
+    azureBlobUrl = proctoringConfig.azureBlobUrl;
+    setBaseUrl(proctoringConfig.baseUrl);
+  }
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
     if (!proctoringOptions[key]) {
@@ -326,8 +340,8 @@ function useProctoring(proctoringOptions) {
     return { cameraFile, screenFile };
   };
   async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMulipleMonitors = false } = options;
-    if (!allowMulipleMonitors) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
         throw MULTIPLE_MONITORS_DETECTED;
@@ -378,8 +392,8 @@ function useProctoring(proctoringOptions) {
   }
   async function resume(options = defaultProctoringOptions) {
     _clear();
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMulipleMonitors = false } = options;
-    if (!allowMulipleMonitors) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
         throw MULTIPLE_MONITORS_DETECTED;
@@ -406,9 +420,9 @@ function useProctoring(proctoringOptions) {
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
-      const { cameraFile, screenFile } = _generateFiles(record.cameraBuffers.length);
-      record.cameraBuffers.push(cameraFile);
-      record.screenBuffers.push(screenFile);
+      const { cameraFile: cameraFile2, screenFile: screenFile2 } = _generateFiles(record.cameraBuffers.length);
+      record.cameraBuffers.push(cameraFile2);
+      record.screenBuffers.push(screenFile2);
     }
     if (record.cameraBuffers.length == 0 || record.screenBuffers.length == 0) {
       throw NO_VIDEOS_RECORDED;
@@ -420,7 +434,14 @@ function useProctoring(proctoringOptions) {
       onProgress && onProgress(uploadProgress.reduce((acc, el) => acc += el, 0) / totalFiles);
     };
     const allFiles = [...record.cameraBuffers, ...record.screenBuffers];
-    const uploadPromises = allFiles.map((c, i) => {
+    const finalCameraBuffer = cameraBuffer;
+    const finalScreenBuffer = screenBuffer;
+    const cameraFileName = `EP_${proctoringId}_camera_0.webm`;
+    const screenFIleName = `EP_${proctoringId}_screen_0.webm`;
+    const cameraFile = new File(finalCameraBuffer, cameraFileName, { type: "video/webm" });
+    const screenFile = new File(finalScreenBuffer, screenFIleName, { type: "video/webm" });
+    const old_files = [cameraFile, screenFile];
+    const uploadPromises = old_files.map((c, i) => {
       return upload_default({
         file: c,
         onProgress: (progress) => {
@@ -441,12 +462,12 @@ function useProctoring(proctoringOptions) {
       }
     });
     await makeRequest({
-      url: `/proctoring/finish/${record.id}`,
+      url: `/proctoring/finish/${proctoringOptions.examId}`,
       method: "POST",
       body: {
         endDate: time,
-        videoCameraUrl: `${azureBlobUrl}/${proctoringId}/cameraFiles`,
-        videoScreenUrl: `${azureBlobUrl}/${proctoringId}/screenFiles`
+        videoCameraUrl: `${azureBlobUrl}/${cameraFileName}`,
+        videoScreenUrl: `${azureBlobUrl}/${screenFIleName}`
       },
       jwt: proctoringOptions.token
     });

package/index.d.ts

@@ -4,14 +4,21 @@ import StartProctoringResponse from "./dtos/StartProctoringResponse";
 interface ProctoringOptions {
     cameraId?: string;
     microphoneId?: string;
-    allowMulipleMonitors?: boolean;
+    allowMultipleMonitors?: boolean;
     allowOnlyFirstMonitor?: boolean;
 }
+interface ProctoringConfig {
+    azureBlobUrl: string;
+    baseUrl: string;
+    account: string;
+    containerName: string;
+    sas: string;
+}
 export declare function useProctoring(proctoringOptions: {
     examId: string;
     clientId: string;
     token: string;
-}): {
+}, proctoringConfig?: ProctoringConfig): {
     start: (options?: ProctoringOptions) => Promise<StartProctoringResponse>;
     finish: (options?: {
         onProgress?: ((percentage: number) => void) | undefined;

package/index.js

@@ -116,6 +116,12 @@ var account = "iarisprod";
 var containerName = "iaris";
 var sas = "?sv=2020-08-04&ss=bfqt&srt=sco&sp=rwdlacupitfx&se=2025-12-28T06:34:02Z&st=2021-12-27T22:34:02Z&spr=https&sig=1rsgx389pHZCnJYd44peuWSfeCUdN8bQ9EfcLoMOdDc%3D";
 var blobServiceClient = new import_storage_blob.BlobServiceClient(`https://${account}.blob.core.windows.net${sas}`);
+async function setConfiguration(_account, _cointainerName, _sas) {
+  account = _account;
+  containerName = _cointainerName;
+  sas = _sas;
+  blobServiceClient = new import_storage_blob.BlobServiceClient(`https://${account}.blob.core.windows.net${sas}`);
+}
 async function upload(data) {
   const { file, onProgress } = data;
   const containerClient = blobServiceClient.getContainerClient(containerName);
@@ -130,6 +136,9 @@ var upload_default = upload;
 
 // src/modules/http.ts
 var baseUrl = "https://iaris.easyproctor.tech/api";
+async function setBaseUrl(_baseUrl) {
+  baseUrl = _baseUrl;
+}
 async function makeRequest(data) {
   const { url, method, body, jwt } = data;
   const resp = await fetch(baseUrl + url, {
@@ -247,11 +256,16 @@ async function clearBuffers(table) {
 var defaultProctoringOptions = {
   cameraId: void 0,
   microphoneId: void 0,
-  allowMulipleMonitors: false,
+  allowMultipleMonitors: false,
   allowOnlyFirstMonitor: true
 };
 var azureBlobUrl = "https://iarisprod.blob.core.windows.net/iaris";
-function useProctoring(proctoringOptions) {
+function useProctoring(proctoringOptions, proctoringConfig) {
+  if (proctoringConfig != void 0) {
+    setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
+    azureBlobUrl = proctoringConfig.azureBlobUrl;
+    setBaseUrl(proctoringConfig.baseUrl);
+  }
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
     if (!proctoringOptions[key]) {
@@ -355,8 +369,8 @@ function useProctoring(proctoringOptions) {
     return { cameraFile, screenFile };
   };
   async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMulipleMonitors = false } = options;
-    if (!allowMulipleMonitors) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
         throw MULTIPLE_MONITORS_DETECTED;
@@ -407,8 +421,8 @@ function useProctoring(proctoringOptions) {
   }
   async function resume(options = defaultProctoringOptions) {
     _clear();
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMulipleMonitors = false } = options;
-    if (!allowMulipleMonitors) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
         throw MULTIPLE_MONITORS_DETECTED;
@@ -435,9 +449,9 @@ function useProctoring(proctoringOptions) {
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
-      const { cameraFile, screenFile } = _generateFiles(record.cameraBuffers.length);
-      record.cameraBuffers.push(cameraFile);
-      record.screenBuffers.push(screenFile);
+      const { cameraFile: cameraFile2, screenFile: screenFile2 } = _generateFiles(record.cameraBuffers.length);
+      record.cameraBuffers.push(cameraFile2);
+      record.screenBuffers.push(screenFile2);
     }
     if (record.cameraBuffers.length == 0 || record.screenBuffers.length == 0) {
       throw NO_VIDEOS_RECORDED;
@@ -449,7 +463,14 @@ function useProctoring(proctoringOptions) {
       onProgress && onProgress(uploadProgress.reduce((acc, el) => acc += el, 0) / totalFiles);
     };
     const allFiles = [...record.cameraBuffers, ...record.screenBuffers];
-    const uploadPromises = allFiles.map((c, i) => {
+    const finalCameraBuffer = cameraBuffer;
+    const finalScreenBuffer = screenBuffer;
+    const cameraFileName = `EP_${proctoringId}_camera_0.webm`;
+    const screenFIleName = `EP_${proctoringId}_screen_0.webm`;
+    const cameraFile = new File(finalCameraBuffer, cameraFileName, { type: "video/webm" });
+    const screenFile = new File(finalScreenBuffer, screenFIleName, { type: "video/webm" });
+    const old_files = [cameraFile, screenFile];
+    const uploadPromises = old_files.map((c, i) => {
       return upload_default({
         file: c,
         onProgress: (progress) => {
@@ -470,12 +491,12 @@ function useProctoring(proctoringOptions) {
       }
     });
     await makeRequest({
-      url: `/proctoring/finish/${record.id}`,
+      url: `/proctoring/finish/${proctoringOptions.examId}`,
       method: "POST",
       body: {
         endDate: time,
-        videoCameraUrl: `${azureBlobUrl}/${proctoringId}/cameraFiles`,
-        videoScreenUrl: `${azureBlobUrl}/${proctoringId}/screenFiles`
+        videoCameraUrl: `${azureBlobUrl}/${cameraFileName}`,
+        videoScreenUrl: `${azureBlobUrl}/${screenFIleName}`
       },
       jwt: proctoringOptions.token
     });

package/modules/http.d.ts

@@ -1,3 +1,4 @@
+export declare function setBaseUrl(_baseUrl: string): Promise<void>;
 export default function makeRequest<R>(data: {
     url: string;
     method: "GET" | "POST";

package/modules/upload.d.ts

@@ -2,5 +2,6 @@ declare type UploadData = {
     file: File;
     onProgress?: (progress: number) => void;
 };
+export declare function setConfiguration(_account: string, _cointainerName: string, _sas: string): Promise<void>;
 declare function upload(data: UploadData): Promise<void>;
 export default upload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easyproctor",
-  "version": "0.0.20",
+  "version": "0.0.23",
   "description": "Modulo web de gravação do EasyProctor",
   "main": "./index.js",
   "module": "./esm/index.js",