update code

Signed-off-by: Matheus Sampaio Queiroga <srherobrine20@gmail.com>

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+  // Use o IntelliSense para saber mais sobre os atributos possíveis.
+  // Focalizar para exibir as descrições dos atributos existentes.
+  // Para obter mais informações, acesse: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Iniciar a API",
+      "skipFiles": [ "<node_internals>/**" ],
+      "program": "${workspaceFolder}\\src\\index.ts",
+      "env": {
+        "NODE_OPTIONS": "--require ts-node/register --loader ts-node/esm"
+      }
+    }
+  ]
+}

src/atividades.ts

@@ -25,7 +25,11 @@ export type Activity = {
   }[];
 }|{
   type: "Conteúdo Web";
-  files: { title: string; url: string }[];
+  files: {
+    title: string;
+    id: string;
+    url: string;
+  }[];
 }|{
   type: "Web Aula";
 }|{
@@ -34,7 +38,13 @@ export type Activity = {
   type: "Prova Presencial";
 }|{
   type: "Avaliação Virtual";
-  asks: string[];
+  asks: (string[])|{
+    ask: string;
+    select: {
+      title: string;
+      value: string;
+    }[];
+  }[];
 }|{
   type: "Fórum";
 }|{
@@ -157,8 +167,12 @@ export async function insertActivitysToCollection(got: Got, semestre: string, id
           id, description: title,
           files: Array.from(document.querySelectorAll("#detalhe > a")).map(s => {
             const page = s.getAttribute("href");
-            s.querySelector("p").textContent;
-            return { title: s.querySelector("p").textContent.trim(), url: (new URL(page, webExtIndex.url)).toString() };
+            const atividadeOfertaId = ((s.getAttribute("onclick")||"").trim().split("\n").map(s => s.trim()).join("")).slice((s.getAttribute("onclick")||"").indexOf("(")+1, (s.getAttribute("onclick")||"").indexOf(")")).split(",").map(s => ((s = s.trim()).startsWith("\"")||s.startsWith("'")) ? s.slice(1, -1) : s)[0];
+            return {
+              title: s.querySelector("p").textContent.trim(),
+              id: atividadeOfertaId,
+              url: (new URL(page, webExtIndex.url)).toString(),
+            };
           }),
         });
       } else throw new Error(doc.serialize());

src/index.ts

@@ -6,16 +6,16 @@ import crypto from "node:crypto";
 import { activity } from "./atividades.js";
 import path from "node:path";
 import { ActivityType, AtividadeRoot, BoletimColaborar } from "./lib/sync.js";
+import { tmpdir } from "node:os";
 
 const app = neste();
-app.use(parseBody());
 declare module "neste" {
   export interface Request {
     User: User;
   }
 }
 
-app.post("/login", async (req, res) => {
+app.post("/login", parseBody(), async (req, res) => {
   const { username, password } = req.body;
   const dbUser = await user.findOne({ "colaborar.user": username });
   if (!dbUser) return res.status(400).json({ errors: [ { type: "user", message: "Usuario não foi cadastrado no nosso sistema" } ] });
@@ -30,7 +30,7 @@ app.post("/login", async (req, res) => {
   return res.status(200).json({ sessionid });
 });
 
-app.post("/register", async (req, res) => {
+app.post("/register", parseBody(), async (req, res) => {
   if (!req.body) return res.status(400).json({ errors: [ { type: "body", message: "require body!" } ] });
   const { username, password } = req.body;
   if (!(typeof username === "string" && typeof password === "string")) return res.status(400).json({ errors: [ { type: "body", message: "Invalid body!" }, { type: "username",  message: "require string username" }, { type: "password", message: "require string password" } ] });
@@ -111,7 +111,7 @@ app.use(async (req, res, next) => {
       }
     ]
   });
-});
+}, parseBody({ formEncoded: { limit: -1, limitResponse: false }, formData: { tmpFolder: path.join(tmpdir(), String().concat("colaborar_data")) } })); 
 
 // Cursos
 app.get("/", async (req, res) => {
@@ -130,6 +130,12 @@ app.use("/:matricula", async (req, res, next) => req.User.aulas[req.params.matri
 // Aulas
 app.get("/:matricula", async (req, res) => res.json(Object.keys(req.User.aulas[req.params.matricula]).map(id => ({name: req.User.aulas[req.params.matricula][id].name, id}))));
 
+// Sync semestre
+app.post("/:matricula/sync", async (req, res) => {
+  const ids = await syncUser(req.User.userID, req.params.matricula);
+  return res.status(201).json(ids.aulas[req.params.matricula]);
+});
+
 // Get activity's
 app.get("/:matricula/:disciplina", async (req, res, next) => {
   if (!(req.User.aulas[req.params.matricula][req.params.disciplina])) return next();
@@ -156,7 +162,7 @@ app.get("/:matricula/:disciplina/teleaula/:id", async (req, res) => {
   const act = await activity.findOne({ id: req.params.id });
   if (!act || act.type !== "Tele Aula") return res.status(400).json({ error: [ { type: "activity", message: "Aula não existe" } ].concat(act.type !== "Tele Aula" ? { type: "activity", message: "ID invalido" } : undefined) });
   const { got } = await remoteRequest(req.User.colaborar.user, req.User.colaborar.password);
-  
+
   const videos = await Promise.all(act.videoIDs.map(async d => {
     const currentTime: number = JSON.parse((await got("https://www.colaboraread.com.br/aluno/videoAnotacao/getStatusExemplar", {
       method: "POST",
@@ -348,5 +354,17 @@ app.get("/:matricula/:disciplina/boletim", async (req, res) => {
   });
 });
 
+app.get("/:matricula/:disciplina/:id", async (req, res) => {
+  const { matricula, disciplina, id } = req.params;
+  if (!(req.User.aulas[matricula][disciplina].ids.includes(id))) return res.status(404).json({ errors: [ { type: "material", message: "Conteudo não liberado" } ] });
+  const act = await activity.findOne({ id });
+  return res.json(act);
+});
+
+app.use((req, res) => {
+  console.log(req.path);
+  res.sendStatus(404);
+});
+
 // Listen
 app.listen(process.env.PORT||3000, () => { const addr = app.address(); console.log("HTTP Listen on %s", typeof addr === "object" ? addr.port : addr); })

src/lib/sync.ts

@@ -516,4 +516,25 @@ export async function VideoAulaProgress(got: Got, videoID: string, matriculaId:
       });
     }
   };
+}
+
+export async function saveProgressoEngajamento(got: Got, matriculaId: string, atividadeOfertaId: string, progresso: number) {
+  await got(new URL("https://colaboraread.com.br/aluno/timeline/saveProgressoEngajamento"), {
+    method: "post",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({
+      matriculaId,
+      atividadeOfertaId: atividadeOfertaId,
+      progresso: progresso,
+      isAluno: true
+    }),
+  });
+}
+
+export async function syncActivity(got: Got, semestreID: string, atividadeDisciplinaId: string) {
+  // https://www.colaboraread.com.br/aluno/avaliacao/form/{semestre}?atividadeDisciplinaId={actID}
+  const actUrl = new URL(path.posix.join("/aluno/avaliacao/form", semestreID), "https://www.colaboraread.com.br");
+  actUrl.searchParams.set("atividadeDisciplinaId", atividadeDisciplinaId);
+
+  return actUrl.toString();
 }

src/user.ts

@@ -25,16 +25,25 @@ export type User = {
 
 export const user = database.collection<User>("User");
 
-export async function syncUser(userID: string) {
+export async function syncUser(userID: string, semestre?: string) {
   const userData = await user.findOne({ userID });
   if (!userData) throw new Error("");
   const { got } = await colab(userData.colaborar.user, userData.colaborar.password);
-  for (const curso of await Cursos(got)) {
-    for (const { semestreID } of curso.semestres) {
-      userData.aulas[semestreID] = {};
-      for (const aula of (await Aulas(got, semestreID)).aulas) {
-        const ids = await insertActivitysToCollection(got, semestreID, aula.id);
-        userData.aulas[semestreID][aula.id] = { name: aula.title, ids };
+  const cursos = await Cursos(got)
+  if (typeof semestre === "string" && semestre.length > 0) {
+    userData.aulas[semestre] = {};
+    for (const aula of (await Aulas(got, semestre)).aulas) {
+      const ids = await insertActivitysToCollection(got, semestre, aula.id);
+      userData.aulas[semestre][aula.id] = { name: aula.title, ids };
+    }
+  } else {
+    for (const curso of cursos) {
+      for (const { semestreID } of curso.semestres) {
+        userData.aulas[semestreID] = {};
+        for (const aula of (await Aulas(got, semestreID)).aulas) {
+          const ids = await insertActivitysToCollection(got, semestreID, aula.id);
+          userData.aulas[semestreID][aula.id] = { name: aula.title, ids };
+        }
       }
     }
   }