Merge pull request #45 from toiki-org/feat/common

feat: add common library

.github/workflows/build_deploy.yaml

@@ -23,12 +23,15 @@ jobs:
           filters: |
             bot:
               - 'bot/**'
+              - 'common/**'
               - '.github/workflows/**'
             server:
               - 'server/**'
+              - 'common/**'
               - '.github/workflows/**'
             client:
               - 'client/**'
+              - 'common/**'
               - '.github/workflows/**'
             nginx:
               - 'nginx/**'
@@ -44,6 +47,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build toiki-common
+        if: steps.filter.outputs.common == 'true'
+        uses: docker/build-push-action@v2
+        with:
+          tags: ghcr.io/toiki-org/toiki-common:latest
+          push: true
+          context: ./common
+          cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-common:latest
+          cache-to: type=inline
+
       - name: Build toiki-build
         if: steps.filter.outputs.client == 'true'
         uses: docker/build-push-action@v2

.github/workflows/test.yaml

@@ -14,6 +14,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build common
+        uses: docker/build-push-action@v2
+        with:
+          tags: toiki-common
+          push: false
+          context: ./common
+          cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-common:latest
+          cache-to: type=inline
+
       - name: Build client
         uses: docker/build-push-action@v2
         with:
@@ -23,8 +39,8 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-build:latest
           cache-to: type=inline
           build-args: |
-            ARCH=linux/amd64
             VITE_API_URL=${{ secrets.API_URL }}
+            COMMON_IMAGE=toiki-common:latest
 
       - name: Build server
         uses: docker/build-push-action@v2
@@ -34,6 +50,8 @@ jobs:
           context: ./server
           cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-backend:latest
           cache-to: type=inline
+          build-args: |
+            COMMON_IMAGE=toiki-common:latest
 
       - name: Build bot
         uses: docker/build-push-action@v2
@@ -43,3 +61,5 @@ jobs:
           context: ./bot
           cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-bot:latest
           cache-to: type=inline
+          build-args: |
+            COMMON_IMAGE=toiki-common:latest

bot/Dockerfile

@@ -1,5 +1,10 @@
-FROM node:18-alpine as build
+ARG COMMON_IMAGE=ghcr.io/toiki-org/toiki-common:latest
+
+FROM $COMMON_IMAGE as common
+
+FROM node:20-alpine as build
 WORKDIR /app
+COPY --from=common /app /common
 COPY package.json ./
 COPY yarn.lock ./
 RUN yarn --frozen-lockfile
@@ -9,6 +14,7 @@ RUN yarn build
 # stage to install only production deps
 FROM node:18-alpine as deps
 WORKDIR /app
+COPY --from=common /app /common
 ENV NODE_ENV=production
 COPY package.json ./
 COPY yarn.lock ./

bot/package.json

@@ -16,6 +16,7 @@
     "axios": "^1.6.7",
     "discord.js": "^14.12.1",
     "dotenv": "^16.0.3",
+    "toiki-common": "../common",
     "yup": "^0.32.11"
   },
   "devDependencies": {

bot/src/lib/core/processUrl.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { isYoutubeOrSpotify } from '../../utils/isYoutubeOrSpotify';
+import { isYoutubeOrSpotify } from 'toiki-common';
 import { convertUrl } from '../../api/convertUrl';
 import { ActionRowBuilder, ButtonBuilder } from 'discord.js';
 import { interactionButtons } from '../interactions';