ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

more path.resolve fixes

Browse Source
This commit is contained in:
HF 2023-12-29 14:28:13 +01:00
parent 8b85528b8a
commit e3f9c92a3b
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/Tile.js
View File

@ -242,7 +242,7 @@ function addIndexedSubtiletoTile(
*/ */
function tileFileName(canvasTileFolder, cell) { function tileFileName(canvasTileFolder, cell) {
const [z, x, y] = cell; const [z, x, y] = cell;
const filename = path.resolve(`${canvasTileFolder}/${z}/${x}/${y}.webp`); const filename = path.resolve(canvasTileFolder, z, x, `${y}.webp`);
try { try {
const mtime = new Date(fs.statSync(filename).mtime).getTime(); const mtime = new Date(fs.statSync(filename).mtime).getTime();
if (Date.now() - mtime < 120000) { if (Date.now() - mtime < 120000) {
@ -471,7 +471,7 @@ async function createEmptyTile(
// eslint-disable-next-line prefer-destructuring // eslint-disable-next-line prefer-destructuring
tileRGBBuffer[i++] = palette.rgb[2]; tileRGBBuffer[i++] = palette.rgb[2];
} }
const filename = path.resolve(`${canvasTileFolder}/emptytile.webp`); const filename = path.resolve(canvasTileFolder, 'emptytile.webp');
try { try {
await sharp(tileRGBBuffer, { await sharp(tileRGBBuffer, {
raw: { raw: {
@ -572,7 +572,7 @@ export async function createTexture(
deleteSubtilefromTile(TILE_SIZE, palette, amount, element, textureBuffer); deleteSubtilefromTile(TILE_SIZE, palette, amount, element, textureBuffer);
}); });
const filename = path.resolve(`${canvasTileFolder}/texture.webp`); const filename = path.resolve(canvasTileFolder, 'texture.webp');
try { try {
await sharp(textureBuffer, { await sharp(textureBuffer, {
raw: { raw: {
@ -616,21 +616,19 @@ export async function initializeTiles(
await createEmptyTile(canvasTileFolder, palette); await createEmptyTile(canvasTileFolder, palette);
// base zoomlevel // base zoomlevel
let zoom = maxTiledZoom - 1; let zoom = maxTiledZoom - 1;
let zoomDir = `${canvasTileFolder}/${zoom}`; let zoomDir = path.resolve(canvasTileFolder, zoom);
console.log(`Tiling: Checking zoomlevel ${zoomDir}`); console.log(`Tiling: Checking zoomlevel ${zoomDir}`);
if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir); if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir);
let cnt = 0; let cnt = 0;
let cnts = 0; let cnts = 0;
const maxBase = TILE_ZOOM_LEVEL ** zoom; const maxBase = TILE_ZOOM_LEVEL ** zoom;
for (let cx = 0; cx < maxBase; cx += 1) { for (let cx = 0; cx < maxBase; cx += 1) {
const tileDir = `${canvasTileFolder}/${zoom}/${cx}`; const tileDir = path.resolve(canvasTileFolder, zoom, cx);
if (!fs.existsSync(tileDir)) { if (!fs.existsSync(tileDir)) {
fs.mkdirSync(tileDir); fs.mkdirSync(tileDir);
} }
for (let cy = 0; cy < maxBase; cy += 1) { for (let cy = 0; cy < maxBase; cy += 1) {
const filename = path.resolve( const filename = path.resolve(canvasTileFolder, zoom, cx, `${cy}.webp`);
`${canvasTileFolder}/${zoom}/${cx}/${cy}.webp`,
);
if (force || !fs.existsSync(filename)) { if (force || !fs.existsSync(filename)) {
const ret = await createZoomTileFromChunk( const ret = await createZoomTileFromChunk(
canvasId, canvasId,
@ -651,18 +649,18 @@ export async function initializeTiles(
for (zoom = maxTiledZoom - 2; zoom >= 0; zoom -= 1) { for (zoom = maxTiledZoom - 2; zoom >= 0; zoom -= 1) {
cnt = 0; cnt = 0;
cnts = 0; cnts = 0;
zoomDir = `${canvasTileFolder}/${zoom}`; zoomDir = path.resolve(canvasTileFolder, zoom);
console.log(`Tiling: Checking zoomlevel ${zoomDir}`); console.log(`Tiling: Checking zoomlevel ${zoomDir}`);
if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir); if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir);
const maxZ = TILE_ZOOM_LEVEL ** zoom; const maxZ = TILE_ZOOM_LEVEL ** zoom;
for (let cx = 0; cx < maxZ; cx += 1) { for (let cx = 0; cx < maxZ; cx += 1) {
const tileDir = `${canvasTileFolder}/${zoom}/${cx}`; const tileDir = path.resolve(canvasTileFolder, zoom, cx);
if (!fs.existsSync(tileDir)) { if (!fs.existsSync(tileDir)) {
fs.mkdirSync(tileDir); fs.mkdirSync(tileDir);
} }
for (let cy = 0; cy < maxZ; cy += 1) { for (let cy = 0; cy < maxZ; cy += 1) {
const filename = path.resolve( const filename = path.resolve(
`${canvasTileFolder}/${zoom}/${cx}/${cy}.webp`, canvasTileFolder, zoom, cx, `${cy}.webp`,
); );
if (force || !fs.existsSync(filename)) { if (force || !fs.existsSync(filename)) {
const ret = await createZoomedTile( const ret = await createZoomedTile(

2
src/core/captchaserver.js
View File

@ -12,7 +12,7 @@ const MAX_WAIT = 30 * 1000;
/* /*
* worker thread * worker thread
*/ */
const worker = new Worker(path.resolve('./workers/captchaloader.js')); const worker = new Worker(path.resolve('workers', 'captchaloader.js'));
/* /*
* queue of captcha-generation tasks * queue of captcha-generation tasks

2
src/core/config.js
View File

@ -20,7 +20,7 @@ export const MAIL_ADDRESS = process.env.MAIL_ADDRESS
|| 'donotreply@pixelplanet.fun'; || 'donotreply@pixelplanet.fun';
const TILE_FOLDER_REL = process.env.TILE_FOLDER || 'tiles'; const TILE_FOLDER_REL = process.env.TILE_FOLDER || 'tiles';
export const TILE_FOLDER = path.join(__dirname, `./${TILE_FOLDER_REL}`); export const TILE_FOLDER = path.resolve(TILE_FOLDER_REL);
export const USE_XREALIP = !!process.env.USE_XREALIP; export const USE_XREALIP = !!process.env.USE_XREALIP;

6
src/core/tileserver.js
View File

@ -24,7 +24,7 @@ const CanvasUpdaters = {};
/* /*
* worker thread * worker thread
*/ */
const worker = new Worker(path.resolve('./workers/tilewriter.js')); const worker = new Worker(path.resolve('workers', 'tilewriter.js'));
/* /*
* queue of tasks that is worked on in FIFO * queue of tasks that is worked on in FIFO
@ -61,7 +61,7 @@ class CanvasUpdater {
this.TileLoadingQueues = []; this.TileLoadingQueues = [];
this.id = id; this.id = id;
this.canvas = canvases[id]; this.canvas = canvases[id];
this.canvasTileFolder = `${TILE_FOLDER}/${id}`; this.canvasTileFolder = path.resolve(TILE_FOLDER, id);
this.firstZoomtileWidth = this.canvas.size / TILE_SIZE / TILE_ZOOM_LEVEL; this.firstZoomtileWidth = this.canvas.size / TILE_SIZE / TILE_ZOOM_LEVEL;
this.maxTiledZoom = getMaxTiledZoom(this.canvas.size); this.maxTiledZoom = getMaxTiledZoom(this.canvas.size);
} }
@ -194,7 +194,7 @@ socketEvents.on('chunkUpdate', (canvasId, chunk) => {
* starting update loops for canvases * starting update loops for canvases
*/ */
export default function startAllCanvasLoops() { export default function startAllCanvasLoops() {
if (!fs.existsSync(`${TILE_FOLDER}`)) fs.mkdirSync(`${TILE_FOLDER}`); if (!fs.existsSync(TILE_FOLDER)) fs.mkdirSync(TILE_FOLDER);
const ids = Object.keys(canvases); const ids = Object.keys(canvases);
for (let i = 0; i < ids.length; i += 1) { for (let i = 0; i < ids.length; i += 1) {
const id = parseInt(ids[i], 10); const id = parseInt(ids[i], 10);

8
src/data/redis/client.js
View File

@ -12,7 +12,7 @@ import { REDIS_URL, SHARD_NAME } from '../../core/config';
const scripts = { const scripts = {
placePxl: defineScript({ placePxl: defineScript({
NUMBER_OF_KEYS: 9, NUMBER_OF_KEYS: 9,
SCRIPT: fs.readFileSync(path.resolve('./workers/lua/placePixel.lua')), SCRIPT: fs.readFileSync(path.resolve('workers', 'lua', 'placePixel.lua')),
transformArguments(...args) { transformArguments(...args) {
return args.map((a) => ((typeof a === 'string') ? a : a.toString())); return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
}, },
@ -20,7 +20,7 @@ const scripts = {
}), }),
allowedChat: defineScript({ allowedChat: defineScript({
NUMBER_OF_KEYS: 3, NUMBER_OF_KEYS: 3,
SCRIPT: fs.readFileSync(path.resolve('./workers/lua/allowedChat.lua')), SCRIPT: fs.readFileSync(path.resolve('workers', 'lua', 'allowedChat.lua')),
transformArguments(...args) { transformArguments(...args) {
return args.map((a) => ((typeof a === 'string') ? a : a.toString())); return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
}, },
@ -28,7 +28,7 @@ const scripts = {
}), }),
getUserRanks: defineScript({ getUserRanks: defineScript({
NUMBER_OF_KEYS: 2, NUMBER_OF_KEYS: 2,
SCRIPT: fs.readFileSync(path.resolve('./workers/lua/getUserRanks.lua')), SCRIPT: fs.readFileSync(path.resolve('workers', 'lua', 'getUserRanks.lua')),
transformArguments(...args) { transformArguments(...args) {
return args.map((a) => ((typeof a === 'string') ? a : a.toString())); return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
}, },
@ -36,7 +36,7 @@ const scripts = {
}), }),
zmRankRev: defineScript({ zmRankRev: defineScript({
NUMBER_OF_KEYS: 1, NUMBER_OF_KEYS: 1,
SCRIPT: fs.readFileSync(path.resolve('./workers/lua/zmRankRev.lua')), SCRIPT: fs.readFileSync(path.resolve('workers', 'lua', 'zmRankRev.lua')),
transformArguments(key, uids) { transformArguments(key, uids) {
return [ return [
key, key,