Commit c0aee412 authored by Grant's avatar Grant
Browse files

add ignore files + minor tests

parent 6a86bdf4

packages/server/.eslintrc.json

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    "eslint:recommended",

    "plugin:@typescript-eslint/recommended-type-checked"

  ],

  "ignorePatterns": ["coverage/**/*", "jest.config.js"],

  "overrides": [

    {

      "env": {

packages/server/package.json

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    "tool": "dotenv -e .env.local -- ./tool.sh",

    "pretest_old": "if [ ! -f .env.test ]; then echo '.env.test not found'; exit 1; fi; dotenv -e .env.test -- prisma migrate reset --force",

    "pretest": "prisma generate",

    "test": "dotenv -e .env.test -- jest --coverage --detectOpenHandles",

    "test": "dotenv -e .env.test -- jest --detectOpenHandles",

    "test:ci": "jest --ci --coverage --testTimeout=30000"

  },

  "keywords": [],

packages/server/src/workers/canvas_cache.ts

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ let Logger = getLogger("CANVAS_WORK"); 
 * We run the connection directly instead of via class functions to prevent side effects

 */

const redis = Redis.get().client;

redis.connect().then(() => {

void redis.connect().then(() => {

  Logger.info("Connected to Redis");

});
@@ -44,10 +44,10 @@ parentPort?.on("message", (msg: Message) => { 
      workerId = msg.workerId;

      Logger = getLogger("CANVAS_WORK", workerId);

      Logger.info("Received worker ID assignment: " + workerId);

      startWriteQueue().then(() => {});

      void startWriteQueue();

      break;

    case "cache":

      doCache(msg.start, msg.end).then(() => {

      void doCache(msg.start, msg.end).then(() => {

        parentPort?.postMessage({

          type: "callback",

          callbackId: msg.callbackId,
@@ -88,7 +88,7 @@ const startWriteQueue = async () => { 
    // rewriting the workers system to use bullmq would be the solution to this

    // eslint-disable-next-line no-restricted-globals

    setTimeout(() => {

      startWriteQueue();

      void startWriteQueue();

    }, 250);

    return;

  }
@@ -115,7 +115,7 @@ const startWriteQueue = async () => { 
    pixels.join(",")

  );



  startWriteQueue();

  void startWriteQueue();

};



const doCache = async (

packages/server/src/workers/worker.ts

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ export const spawnWorker = (file: string, wkOpts: WorkerOptions = {}) => { 
    if (!wkOpts.workerData) {

      wkOpts.workerData = {};

    }



    // this is used to load typescript directly while in development

    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access

    wkOpts.workerData.__filename = path.join(__dirname, file);

    return new Worker(

      `