easyproctor 0.0.63 → 0.0.65

package/esm/index.js

@@ -42181,6 +42181,33 @@ var trackers = {
   registerUploadVideo: (proctoringId, success, description, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, uploadTime })
 };
 
+// src/modules/http.ts
+var baseUrl = "https://proctoring-api.easyproctor.tech/api";
+async function setBaseUrl(homol) {
+  console.log("homol -> ", homol);
+  if (homol)
+    baseUrl = "https://proctoring-api-hml.easyproctor.tech/api";
+}
+async function makeRequest(data) {
+  const { url, method, body, jwt } = data;
+  const resp = await fetch(baseUrl + url, {
+    method,
+    body: body != null ? JSON.stringify(body) : void 0,
+    headers: {
+      Authorization: `Bearer ${jwt}`,
+      "Content-Type": "application/json",
+      "Access-Control-Allow-Origin": "*"
+    }
+  });
+  if (resp.status >= 400) {
+    throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+  }
+  const content = resp.headers.get("content-type");
+  const isJson = content ? content.includes("application/json") : false;
+  const responseData = isJson ? await resp.json() : null;
+  return responseData;
+}
+
 // node_modules/@aws-sdk/client-s3/node_modules/tslib/modules/index.js
 var import_tslib = __toESM(require_tslib(), 1);
 var {
@@ -49426,6 +49453,7 @@ var sas = "";
 var blobServiceClient;
 var message = "";
 var loadingInterval;
+var loadingBoolean = true;
 async function setConfiguration(_account, _cointainerName, _sas) {
   account = _account;
   containerName = _cointainerName;
@@ -49435,7 +49463,7 @@ async function setConfiguration(_account, _cointainerName, _sas) {
 function sendError(proctoringId) {
   trackers.registerError(proctoringId, message);
 }
-async function upload(data, proctoringId, config2) {
+async function upload(data, proctoringId, config2, proctoringToken) {
   try {
     const { file, onProgress } = data;
     message += `Upload: ${file.type}
@@ -49471,30 +49499,30 @@ async function upload(data, proctoringId, config2) {
     });
     message += "Blob: Step 5\n";
   } catch (err) {
-    await uploadBackup(data, config2).catch(async () => {
+    await uploadBackup(data, config2, proctoringToken).catch(async () => {
       sendError(proctoringId);
       throw err;
     });
   }
 }
-async function uploadBackup(data, config2) {
+async function uploadBackup(data, config2, proctoringToken) {
   try {
-    console.log("DENTRO DO CATCH");
     const { file, onProgress } = data;
     const uploadParams = {
       Bucket: "iarisprod",
       Key: file.name,
       Body: file
     };
+    console.log("file");
+    console.log(file);
     const s3Client = new S3Client({
       region: "us-east-1",
       credentials: {
-        accessKeyId: "here",
+        accessKeyId: config2.accessKeyId,
         secretAccessKey: config2.secretAccessKey
       }
     });
     try {
-      let loadingBoolean = true;
       let i = 0;
       onProgress && onProgress(Math.round(0));
       loadingInterval = setInterval(() => {
@@ -49506,10 +49534,16 @@ async function uploadBackup(data, config2) {
           }
         }
       }, 3e3);
-      const data2 = await s3Client.send(new PutObjectCommand(uploadParams)).then(() => {
+      const data2 = await s3Client.send(new PutObjectCommand(uploadParams)).then(async () => {
         loadingBoolean = false;
         clearInterval(loadingInterval);
         onProgress && onProgress(Math.round(100));
+        await makeRequest({
+          url: `/Proctoring/aws-to-azure`,
+          method: "POST",
+          jwt: proctoringToken,
+          body: `${file.name}`
+        });
       }).catch((err) => {
         throw err;
       });
@@ -49520,15 +49554,16 @@ async function uploadBackup(data, config2) {
     message += "\n\u2022 Error on AWS upload\n	";
     message += err;
     try {
-      download(data.file);
+      download(data);
     } catch (err2) {
       throw err2;
     }
     throw err;
   }
 }
-function download(file) {
+function download(data) {
   try {
+    const { file, onProgress } = data;
     const url = URL.createObjectURL(file);
     const a = document.createElement("a");
     document.body.appendChild(a);
@@ -49537,41 +49572,17 @@ function download(file) {
     a.download = file.name;
     a.click();
     window.URL.revokeObjectURL(url);
+    loadingBoolean = false;
+    clearInterval(loadingInterval);
+    onProgress && onProgress(Math.round(100));
   } catch (err) {
     message += `
-\u2022 Error on machine download -> ${file.name}
+\u2022 Error on machine download -> ${data.file.name}
 	`;
     throw err;
   }
 }
 
-// src/modules/http.ts
-var baseUrl = "https://proctoring-api.easyproctor.tech/api";
-async function setBaseUrl(homol) {
-  console.log("homol -> ", homol);
-  if (homol)
-    baseUrl = "https://proctoring-api-hml.easyproctor.tech/api";
-}
-async function makeRequest(data) {
-  const { url, method, body, jwt } = data;
-  const resp = await fetch(baseUrl + url, {
-    method,
-    body: body != null ? JSON.stringify(body) : void 0,
-    headers: {
-      Authorization: `Bearer ${jwt}`,
-      "Content-Type": "application/json",
-      "Access-Control-Allow-Origin": "*"
-    }
-  });
-  if (resp.status >= 400) {
-    throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
-  }
-  const content = resp.headers.get("content-type");
-  const isJson = content ? content.includes("application/json") : false;
-  const responseData = isJson ? await resp.json() : null;
-  return responseData;
-}
-
 // src/modules/enumarateDevices.ts
 async function enumarateDevices() {
   const mediaDevices = await navigator.mediaDevices.enumerateDevices();
@@ -49830,6 +49841,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     init(config.insights);
   }
   async function start(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
+    console.log(lastClick);
     if (lastClick >= Date.now() - delay)
       throw PROCTORING_ALREADY_STARTED;
     lastClick = Date.now();
@@ -49876,6 +49888,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
         sessions: []
       });
       proctoringId = resp.id;
+      console.log("proctoringId", proctoringId);
       trackers.registerStart(proctoringId, true, "");
       _addListeners();
       return resp;
@@ -49889,27 +49902,34 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     const { start: start2 } = await startAudioCapture();
     start2();
   }
-  async function startTest(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
+  async function finishAudio() {
+    const { buffer, blob } = await stopRecord();
+    return { buffer, blob };
+  }
+  async function checkDevices(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
     const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
     checkPermissions();
     startAudio();
     const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType }, videoOptions);
+    console.log("Recording...");
+    return { cameraStream, _screenStream };
   }
-  async function finishAudio() {
-    const { buffer, blob } = await stopRecord();
-    return { buffer, blob };
-  }
-  async function finishTest() {
+  async function closeCheckDevices() {
+    console.log("Stoping record...");
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
     }
     _removeListeners();
     await clearBuffers("exams");
+    const cameraBlob = cameraBuffer;
+    const screenBlob = screenBuffer;
     cameraBuffer = [];
     screenBuffer = [];
     alerts = [];
     cancelCallback = null;
+    console.log("Finish record");
+    return { cameraBlob, screenBlob };
   }
   async function pause() {
     const record = await getRecord("exams");
@@ -49984,6 +50004,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
       trackers.registerError(proctoringId, "N\xE3o foi poss\xEDvel requisitar a data do servidor!");
     }
     proctoringId = record.id;
+    console.log("procotoringId resume", proctoringId);
     startDate = serverTime ? new Date(serverTime.toString()) : new Date();
     startTime = startDate.getTime();
     return { cameraStream, _screenStream };
@@ -50104,7 +50125,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
             uploadProgress[i] = progress;
             handleOnProgress();
           }
-        }, proctoringId, config);
+        }, proctoringId, config, proctoringOptions.token);
       });
       const timeAfter = performance.now();
       await Promise.all(uploadPromises);
@@ -50130,7 +50151,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
   function onLostFocus(cb) {
     onLostFocusCallback = cb;
   }
-  return { start, startAudio, startTest, finish, finishAudio, finishTest, pause, resume, onFocus, onLostFocus, enumarateDevices, checkPermissions, checkIfhasMultipleMonitors, onStopSharingScreen };
+  return { start, startAudio, checkDevices, finish, finishAudio, closeCheckDevices, pause, resume, onFocus, onLostFocus, enumarateDevices, checkPermissions, checkIfhasMultipleMonitors, onStopSharingScreen };
 }
 if (typeof window !== "undefined") {
   window.useProctoring = useProctoring;

package/index.d.ts

@@ -20,10 +20,13 @@ export declare function useProctoring(proctoringOptions: {
         height?: number;
     }) => Promise<StartProctoringResponse>;
     startAudio: () => Promise<void>;
-    startTest: (options?: ProctoringOptions, videoOptions?: {
+    checkDevices: (options?: ProctoringOptions, videoOptions?: {
         width?: number;
         height?: number;
-    }) => Promise<void>;
+    }) => Promise<{
+        cameraStream: MediaStream;
+        _screenStream: MediaStream | undefined;
+    }>;
     finish: (options?: {
         onProgress?: ((percentage: number) => void) | undefined;
     }) => Promise<void>;
@@ -31,7 +34,10 @@ export declare function useProctoring(proctoringOptions: {
         buffer: any;
         blob: any;
     }>;
-    finishTest: () => Promise<void>;
+    closeCheckDevices: () => Promise<{
+        cameraBlob: Blob[];
+        screenBlob: Blob[];
+    }>;
     pause: () => Promise<void>;
     resume: (options: ProctoringOptions | undefined, examId: string, videoOptions?: {
         width?: number;

package/index.js

@@ -74178,6 +74178,33 @@ var trackers = {
   registerUploadVideo: (proctoringId, success, description, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, uploadTime })
 };
 
+// src/modules/http.ts
+var baseUrl = "https://proctoring-api.easyproctor.tech/api";
+async function setBaseUrl(homol) {
+  console.log("homol -> ", homol);
+  if (homol)
+    baseUrl = "https://proctoring-api-hml.easyproctor.tech/api";
+}
+async function makeRequest(data) {
+  const { url, method, body, jwt } = data;
+  const resp = await fetch(baseUrl + url, {
+    method,
+    body: body != null ? JSON.stringify(body) : void 0,
+    headers: {
+      Authorization: `Bearer ${jwt}`,
+      "Content-Type": "application/json",
+      "Access-Control-Allow-Origin": "*"
+    }
+  });
+  if (resp.status >= 400) {
+    throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+  }
+  const content = resp.headers.get("content-type");
+  const isJson = content ? content.includes("application/json") : false;
+  const responseData = isJson ? await resp.json() : null;
+  return responseData;
+}
+
 // src/modules/upload.ts
 var import_client_s3 = __toESM(require_dist_cjs61());
 var import_client_s32 = __toESM(require_dist_cjs61());
@@ -74187,6 +74214,7 @@ var sas = "";
 var blobServiceClient;
 var message = "";
 var loadingInterval;
+var loadingBoolean = true;
 async function setConfiguration(_account, _cointainerName, _sas) {
   account = _account;
   containerName = _cointainerName;
@@ -74196,7 +74224,7 @@ async function setConfiguration(_account, _cointainerName, _sas) {
 function sendError(proctoringId) {
   trackers.registerError(proctoringId, message);
 }
-async function upload(data, proctoringId, config2) {
+async function upload(data, proctoringId, config2, proctoringToken) {
   try {
     const { file, onProgress } = data;
     message += `Upload: ${file.type}
@@ -74232,30 +74260,30 @@ async function upload(data, proctoringId, config2) {
     });
     message += "Blob: Step 5\n";
   } catch (err) {
-    await uploadBackup(data, config2).catch(async () => {
+    await uploadBackup(data, config2, proctoringToken).catch(async () => {
       sendError(proctoringId);
       throw err;
     });
   }
 }
-async function uploadBackup(data, config2) {
+async function uploadBackup(data, config2, proctoringToken) {
   try {
-    console.log("DENTRO DO CATCH");
     const { file, onProgress } = data;
     const uploadParams = {
       Bucket: "iarisprod",
       Key: file.name,
       Body: file
     };
+    console.log("file");
+    console.log(file);
     const s3Client = new import_client_s32.S3Client({
       region: "us-east-1",
       credentials: {
-        accessKeyId: "here",
+        accessKeyId: config2.accessKeyId,
         secretAccessKey: config2.secretAccessKey
       }
     });
     try {
-      let loadingBoolean = true;
       let i = 0;
       onProgress && onProgress(Math.round(0));
       loadingInterval = setInterval(() => {
@@ -74267,10 +74295,16 @@ async function uploadBackup(data, config2) {
           }
         }
       }, 3e3);
-      const data2 = await s3Client.send(new import_client_s3.PutObjectCommand(uploadParams)).then(() => {
+      const data2 = await s3Client.send(new import_client_s3.PutObjectCommand(uploadParams)).then(async () => {
         loadingBoolean = false;
         clearInterval(loadingInterval);
         onProgress && onProgress(Math.round(100));
+        await makeRequest({
+          url: `/Proctoring/aws-to-azure`,
+          method: "POST",
+          jwt: proctoringToken,
+          body: `${file.name}`
+        });
       }).catch((err) => {
         throw err;
       });
@@ -74281,15 +74315,16 @@ async function uploadBackup(data, config2) {
     message += "\n\u2022 Error on AWS upload\n	";
     message += err;
     try {
-      download(data.file);
+      download(data);
     } catch (err2) {
       throw err2;
     }
     throw err;
   }
 }
-function download(file) {
+function download(data) {
   try {
+    const { file, onProgress } = data;
     const url = URL.createObjectURL(file);
     const a = document.createElement("a");
     document.body.appendChild(a);
@@ -74298,41 +74333,17 @@ function download(file) {
     a.download = file.name;
     a.click();
     window.URL.revokeObjectURL(url);
+    loadingBoolean = false;
+    clearInterval(loadingInterval);
+    onProgress && onProgress(Math.round(100));
   } catch (err) {
     message += `
-\u2022 Error on machine download -> ${file.name}
+\u2022 Error on machine download -> ${data.file.name}
 	`;
     throw err;
   }
 }
 
-// src/modules/http.ts
-var baseUrl = "https://proctoring-api.easyproctor.tech/api";
-async function setBaseUrl(homol) {
-  console.log("homol -> ", homol);
-  if (homol)
-    baseUrl = "https://proctoring-api-hml.easyproctor.tech/api";
-}
-async function makeRequest(data) {
-  const { url, method, body, jwt } = data;
-  const resp = await fetch(baseUrl + url, {
-    method,
-    body: body != null ? JSON.stringify(body) : void 0,
-    headers: {
-      Authorization: `Bearer ${jwt}`,
-      "Content-Type": "application/json",
-      "Access-Control-Allow-Origin": "*"
-    }
-  });
-  if (resp.status >= 400) {
-    throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
-  }
-  const content = resp.headers.get("content-type");
-  const isJson = content ? content.includes("application/json") : false;
-  const responseData = isJson ? await resp.json() : null;
-  return responseData;
-}
-
 // src/modules/enumarateDevices.ts
 async function enumarateDevices() {
   const mediaDevices = await navigator.mediaDevices.enumerateDevices();
@@ -74591,6 +74602,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     init(config.insights);
   }
   async function start(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
+    console.log(lastClick);
     if (lastClick >= Date.now() - delay)
       throw PROCTORING_ALREADY_STARTED;
     lastClick = Date.now();
@@ -74637,6 +74649,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
         sessions: []
       });
       proctoringId = resp.id;
+      console.log("proctoringId", proctoringId);
       trackers.registerStart(proctoringId, true, "");
       _addListeners();
       return resp;
@@ -74650,27 +74663,34 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     const { start: start2 } = await startAudioCapture();
     start2();
   }
-  async function startTest(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
+  async function finishAudio() {
+    const { buffer, blob } = await stopRecord();
+    return { buffer, blob };
+  }
+  async function checkDevices(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
     const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
     checkPermissions();
     startAudio();
     const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType }, videoOptions);
+    console.log("Recording...");
+    return { cameraStream, _screenStream };
   }
-  async function finishAudio() {
-    const { buffer, blob } = await stopRecord();
-    return { buffer, blob };
-  }
-  async function finishTest() {
+  async function closeCheckDevices() {
+    console.log("Stoping record...");
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
     }
     _removeListeners();
     await clearBuffers("exams");
+    const cameraBlob = cameraBuffer;
+    const screenBlob = screenBuffer;
     cameraBuffer = [];
     screenBuffer = [];
     alerts = [];
     cancelCallback = null;
+    console.log("Finish record");
+    return { cameraBlob, screenBlob };
   }
   async function pause() {
     const record = await getRecord("exams");
@@ -74745,6 +74765,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
       trackers.registerError(proctoringId, "N\xE3o foi poss\xEDvel requisitar a data do servidor!");
     }
     proctoringId = record.id;
+    console.log("procotoringId resume", proctoringId);
     startDate = serverTime ? new Date(serverTime.toString()) : new Date();
     startTime = startDate.getTime();
     return { cameraStream, _screenStream };
@@ -74865,7 +74886,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
             uploadProgress[i] = progress;
             handleOnProgress();
           }
-        }, proctoringId, config);
+        }, proctoringId, config, proctoringOptions.token);
       });
       const timeAfter = performance.now();
       await Promise.all(uploadPromises);
@@ -74891,7 +74912,7 @@ function useProctoring(proctoringOptions, homolConfig = false) {
   function onLostFocus(cb) {
     onLostFocusCallback = cb;
   }
-  return { start, startAudio, startTest, finish, finishAudio, finishTest, pause, resume, onFocus, onLostFocus, enumarateDevices, checkPermissions, checkIfhasMultipleMonitors, onStopSharingScreen };
+  return { start, startAudio, checkDevices, finish, finishAudio, closeCheckDevices, pause, resume, onFocus, onLostFocus, enumarateDevices, checkPermissions, checkIfhasMultipleMonitors, onStopSharingScreen };
 }
 if (typeof window !== "undefined") {
   window.useProctoring = useProctoring;

package/modules/upload.d.ts

@@ -4,5 +4,5 @@ declare type UploadData = {
     onProgress?: (progress: number) => void;
 };
 export declare function setConfiguration(_account: string, _cointainerName: string, _sas: string): Promise<void>;
-export default function upload(data: UploadData, proctoringId: string, config: ProctoringConfig): Promise<void>;
+export default function upload(data: UploadData, proctoringId: string, config: ProctoringConfig, proctoringToken: string): Promise<void>;
 export {};

package/package.json

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