Chore #53 (PR #55)

Author: challet

package.json

@@ -38,7 +38,7 @@
   "devDependencies": {
     "husky": "~8.0.3",
     "lint-staged": "~13.2.2",
-    "vercel": "^37.4.0"
+    "vercel": "^37.4.2"
   },
   "packageManager": "[email protected]",
   "engines": {

packages/foundry/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "dotenv": "~16.3.1",
     "envfile": "~6.18.0",
-    "ethers": "~5.7.1",
+    "ethers": "^6.13.2",
     "prettier": "~2.8.8",
     "qrcode": "~1.5.3",
     "toml": "~3.0.0"

packages/indexer/package.json

@@ -12,7 +12,7 @@
     "@types/pg": "^8",
     "tsc": "^2.0.4",
     "tslib": "^2.6.3",
-    "tsx": "^4.16.5",
+    "tsx": "^4.19.0",
     "typescript": "^5.5.4"
   },
   "dependencies": {

packages/nextjs/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

packages/nextjs/package.json

@@ -26,7 +26,7 @@
     "burner-connector": "~0.0.8",
     "daisyui": "4.5.0",
     "leaflet": "^1.9.4",
-    "next": "~14.0.4",
+    "next": "^14.2.9",
     "next-themes": "~0.2.1",
     "nprogress": "~0.2.0",
     "qrcode.react": "~3.1.0",
@@ -38,12 +38,12 @@
     "swr": "^2.2.5",
     "use-debounce": "~8.0.4",
     "usehooks-ts": "2.13.0",
-    "viem": "2.17.4",
-    "wagmi": "2.10.10",
+    "viem": "^2.21.5",
+    "wagmi": "^2.12.10",
     "zustand": "~4.1.2"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "~4.3.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/jest": "^29.5.12",
     "@types/leaflet": "^1.9.12",
     "@types/node": "^17.0.45",
@@ -54,19 +54,18 @@
     "abitype": "1.0.5",
     "autoprefixer": "~10.4.12",
     "eslint": "~8.24.0",
-    "eslint-config-next": "~14.0.4",
+    "eslint-config-next": "^14.2.10",
     "eslint-config-prettier": "~9.1.0",
     "eslint-plugin-prettier": "~5.1.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "postcss": "~8.4.16",
     "prettier": "~3.3.2",
-    "tailwindcss": "~3.4.3",
+    "tailwindcss": "^3.4.11",
     "text-image": "^0.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "type-fest": "~4.6.0",
-    "typescript": "5.5.3",
-    "vercel": "~32.4.1"
+    "typescript": "5.5.3"
   }
 }

packages/tileserver/package.json

@@ -11,11 +11,11 @@
   "dependencies": {
     "@10tance/db": "workspace:packages/db",
     "@10tance/map": "workspace:packages/map",
+    "@janishutz/colorthief": "^3.0.1",
     "@vercel/blob": "^0.23.4",
-    "colorthief": "^2.4.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "jimp": "^1.1.2",
     "leaflet": "^1.9.4",
     "pg": "^8.12.0",
@@ -30,8 +30,7 @@
     "@types/node": "^22.1.0",
     "@types/pg": "^8",
     "tslib": "^2.6.3",
-    "tsx": "^4.16.5",
-    "typescript": "^5.5.4",
-    "vercel": "^37.2.1"
+    "tsx": "^4.19.0",
+    "typescript": "^5.5.4"
   }
 }

packages/tileserver/src/routes/tiles.ts

@@ -1,10 +1,9 @@
 import { Request, Response } from "express";
 import { initDb } from '@10tance/db';
-import { Op, type FindAttributeOptions, type ModelCtor  } from "sequelize";
-import { getColor } from "colorthief";
 import File from "../services/files";
 import type { EVMObjectType } from "@10tance/db";
 import createImage, { type pixelInfluencer } from "../services/image";
+import { getColor } from "@janishutz/colorthief";
 
 const tilesRoute = async (req: Request, res: Response) => {
   const { x, y, z } = res.locals.tile.coords;
@@ -29,9 +28,12 @@ const tilesRoute = async (req: Request, res: Response) => {
       let color;
       // TODO color pickcing could be done once and stored in the db
       try {
-        color = await getColor(d.meta.icon_url!);
+        const imageFetch = await fetch(d.meta.icon_url!);
+        const imageBuffer = await imageFetch.arrayBuffer();
+        color = await getColor(imageBuffer);
       } catch(e) {
         // can happen for "webp" images not supported by node-pixels
+        console.error(e);
         color = null;
       }
       return {

packages/tileserver/src/types/colorthief.d.ts

@@ -1,17 +1,24 @@
-// colorthief.d.ts
+// color-thief-node.d.ts
 
-declare module 'colorthief' {
-  import type getPixels from "get-pixels";
-  // Colorthief (node verions) uses get-pixels to load the image
-  type imgArg = Parameters<typeof getPixels>[0];
-  export type RGBColor = [number, number, number];
-  export function getColor(
-    img: imgArg,
-    quality: number = 10
-  ): Promise<RGBColor | null>;
-  export function getPalette(
-    img: imgArg,
-    colorCount: number = 10,
-    quality: number = 10
-  ): Promise<RGBColor[] | null>;
+declare module '@janishutz/colorthief' {
+  type ColorThiefResult = [number, number, number];
+  type input = 
+    | Buffer
+    | ArrayBuffer
+    | Uint8Array
+    | Uint8ClampedArray
+    | Int8Array
+    | Uint16Array
+    | Int16Array
+    | Uint32Array
+    | Int32Array
+    | Float32Array
+    | Float64Array
+    | string;
+  export function getColor( img: input, quality: number = 10 ): Promise<ColorThiefResult>;
+  export function getPalette( img: input, colorCount: number = 10, quality: number = 10 ): Promise<ColorThiefResult[]>;
 }
+
+
+
+