⬆️ Bumped dep versions and socket.io-redis upgrade

This commit is contained in:
2023-03-21 21:38:07 -04:00
parent 65c762d689
commit 7b59f5f94d
6 changed files with 4013 additions and 16217 deletions

View File

@@ -7,8 +7,10 @@ module.exports = {
ignorePatterns: [ "test/*"],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: "esnext",
project: "tsconfig.json",
sourceType: "module"
sourceType: "module",
ecmaVersion: "latest",
},
plugins: ["prefer-arrow", "import", "@typescript-eslint"],
rules: {

View File

@@ -1,13 +1,14 @@
const path = require("path");
const mkdir = require("mkdirp").sync;
const DbService = require("moleculer-db");
const MongoAdapter = require("moleculer-db-adapter-mongoose");
export const DbMixin = (collection, model) => {
if(process.env.MONGO_URI) {
if (process.env.MONGO_URI) {
const MongooseAdapter = require("moleculer-db-adapter-mongoose");
return {
mixins: [DbService],
adapter: new MongoAdapter(process.env.MONGO_URI, {
adapter: new MongooseAdapter(process.env.MONGO_URI, {
user: process.env.MONGO_INITDB_ROOT_USERNAME,
pass: process.env.MONGO_INITDB_ROOT_PASSWORD,
keepAlive: true,
@@ -15,7 +16,6 @@ export const DbMixin = (collection, model) => {
family: 4,
}),
model,
collection,
};
}
mkdir(path.resolve("./data"));

20183
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,20 +24,21 @@
"@npcz/magic": "^1.3.14",
"@socket.io/redis-adapter": "^8.1.0",
"@types/lodash": "^4.14.168",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.32.0",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"eslint": "^8.36.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-prefer-arrow": "^1.2.2",
"install": "^0.13.0",
"jest": "^27.5.1",
"jest-cli": "^27.5.1",
"jest": "^29.5.0",
"jest-cli": "^29.5.0",
"moleculer-repl": "^0.7.0",
"node-calibre": "^2.1.1",
"npm": "^8.4.1",
"ts-jest": "^27.1.4",
"ts-node": "^8.8.1",
"typescript": "^4.6.4"
"redis": "^4.6.5",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^5.0.2"
},
"dependencies": {
"@bluelovers/fast-glob": "https://github.com/rishighan/fast-glob-v2-api.git",
@@ -67,11 +68,11 @@
"moleculer": "^0.14.29",
"moleculer-bull": "github:rishighan/moleculer-bull#1.0.0",
"moleculer-db": "^0.8.23",
"moleculer-db-adapter-mongo": "^0.4.17",
"moleculer-db-adapter-mongoose": "^0.9.2",
"moleculer-io": "^2.2.0",
"moleculer-web": "^0.10.5",
"mongoosastic-ts": "^6.0.3",
"mongoose": "^6.10.4",
"mongoose-paginate-v2": "^1.3.18",
"nats": "^1.3.2",
"opds-extra": "^3.0.9",

View File

@@ -75,6 +75,7 @@ export default class ImportService extends Service {
return await walkFolder(ctx.params.basePathToWalk, [
".cbz",
".cbr",
".cb7",
]);
},
},

View File

@@ -1,10 +1,16 @@
"use strict";
import { Service, ServiceBroker, ServiceSchema } from "moleculer";
import { createClient } from "redis";
import { createAdapter } from "@socket.io/redis-adapter";
const SocketIOService = require("moleculer-io");
const redisAdapter = require("socket.io-redis");
const redisURL = new URL(process.env.REDIS_URI);
console.log(redisURL.hostname);
// console.log(redisURL.hostname);
const pubClient = createClient({ url: `redis://${redisURL.hostname}:6379` });
(async () => {
await pubClient.connect();
})();
const subClient = pubClient.duplicate();
export default class SocketService extends Service {
// @ts-ignore
public constructor(
@@ -66,10 +72,7 @@ export default class SocketService extends Service {
},
},
options: {
adapter: redisAdapter({
host: redisURL.hostname,
port: 6379,
}),
adapter: createAdapter(pubClient, subClient),
},
},
},